conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
using System.Diagnostics;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
=======
using VsTestCase = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase;
using ExtensionUriAttribute = Microsoft.VisualStudio.TestPlatform.ObjectModel.ExtensionUriAttribute;
>>>>>>>
using VsTestCase = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestCase;
using ExtensionUriAttribute = Microsoft.VisualStudio.TestPlatform.ObjectModel.ExtensionUriAttribute;
using System.Diagnostics;
<<<<<<<
Stopwatch stopwatch = Stopwatch.StartNew();
InitTestEnvironment(runContext.RunSettings, frameworkHandle);
=======
InitOrRefreshTestEnvironment(runContext.RunSettings, frameworkHandle);
>>>>>>>
Stopwatch stopwatch = Stopwatch.StartNew();
InitOrRefreshTestEnvironment(runContext.RunSettings, frameworkHandle);
<<<<<<<
ICollection<Model.TestCase> testCasesToRun =
allTestCasesInExecutables.Where(tc => vsTestCasesToRun.Any(vtc => tc.FullyQualifiedName == vtc.FullyQualifiedName)).ToArray();
=======
IEnumerable<TestCase> testCasesToRun =
allTestCasesInExecutables.Where(tc => vsTestCasesToRun.Any(vtc => tc.FullyQualifiedName == vtc.FullyQualifiedName)).ToList();
>>>>>>>
ICollection<TestCase> testCasesToRun =
allTestCasesInExecutables.Where(tc => vsTestCasesToRun.Any(vtc => tc.FullyQualifiedName == vtc.FullyQualifiedName)).ToArray();
<<<<<<<
Stopwatch stopwatch = Stopwatch.StartNew();
InitTestEnvironment(runContext.RunSettings, frameworkHandle);
=======
InitOrRefreshTestEnvironment(runContext.RunSettings, frameworkHandle);
>>>>>>>
Stopwatch stopwatch = Stopwatch.StartNew();
InitOrRefreshTestEnvironment(runContext.RunSettings, frameworkHandle);
<<<<<<<
ICollection<Model.TestCase> testCasesToRun = vsTestCasesToRun.Select(DataConversionExtensions.ToTestCase).ToArray();
DoRunTests(allTestCasesInExecutables, testCasesToRun, runContext, frameworkHandle, stopwatch);
=======
IEnumerable<TestCase> testCasesToRun = vsTestCasesToRun.Select(DataConversionExtensions.ToTestCase);
DoRunTests(allTestCasesInExecutables, testCasesToRun, runContext, frameworkHandle);
>>>>>>>
ICollection<TestCase> testCasesToRun = vsTestCasesToRun.Select(DataConversionExtensions.ToTestCase).ToArray();
DoRunTests(allTestCasesInExecutables, testCasesToRun, runContext, frameworkHandle, stopwatch);
<<<<<<<
IEnumerable<Model.TestCase> allTestCasesInExecutables, ICollection<Model.TestCase> testCasesToRun,
IRunContext runContext, IFrameworkHandle frameworkHandle, Stopwatch stopwatch)
=======
IEnumerable<TestCase> allTestCasesInExecutables, IEnumerable<TestCase> testCasesToRun,
IRunContext runContext, IFrameworkHandle frameworkHandle)
>>>>>>>
IEnumerable<TestCase> allTestCasesInExecutables, ICollection<TestCase> testCasesToRun,
IRunContext runContext, IFrameworkHandle frameworkHandle, Stopwatch stopwatch) |
<<<<<<<
using System.Linq;
=======
using System.Diagnostics.CodeAnalysis;
>>>>>>>
using System.Linq;
using System.Diagnostics.CodeAnalysis; |
<<<<<<<
this.itemsControl.SetBinding(ItemsControl.ItemsSourceProperty, new Binding { Source = this, Path = new PropertyPath("ItemsSource") });
=======
itemsControl.SetBinding(ItemsControl.ItemsSourceProperty, new Binding { Source = this, Path = new PropertyPath("ItemsSource") });
this.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
{
foreach (var disabledItem in this.disabledItemsCache)
{
this.UpdateSegmentIsEnabled(disabledItem, false);
}
this.disabledItemsCache.Clear();
});
>>>>>>>
this.itemsControl.SetBinding(ItemsControl.ItemsSourceProperty, new Binding { Source = this, Path = new PropertyPath("ItemsSource") });
this.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
{
foreach (var disabledItem in this.disabledItemsCache)
{
this.UpdateSegmentIsEnabled(disabledItem, false);
}
this.disabledItemsCache.Clear();
}); |
<<<<<<<
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool FirstRun {
get {
return ((bool)(this["FirstRun"]));
}
set {
this["FirstRun"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool UseMetadataFullPaths {
get {
return ((bool)(this["UseMetadataFullPaths"]));
}
set {
this["UseMetadataFullPaths"] = value;
}
}
=======
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool MeshplorerViewRotating {
get {
return ((bool)(this["MeshplorerViewRotating"]));
}
set {
this["MeshplorerViewRotating"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool MeshplorerViewWireframeEnabled {
get {
return ((bool)(this["MeshplorerViewWireframeEnabled"]));
}
set {
this["MeshplorerViewWireframeEnabled"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool MeshplorerViewSolidEnabled {
get {
return ((bool)(this["MeshplorerViewSolidEnabled"]));
}
set {
this["MeshplorerViewSolidEnabled"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool MeshplorerViewFirstPerson {
get {
return ((bool)(this["MeshplorerViewFirstPerson"]));
}
set {
this["MeshplorerViewFirstPerson"] = value;
}
}
>>>>>>>
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool FirstRun {
get {
return ((bool)(this["FirstRun"]));
}
set {
this["FirstRun"] = value;
}
}
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool MeshplorerViewRotating {
get {
return ((bool)(this["MeshplorerViewRotating"]));
}
set {
this["MeshplorerViewRotating"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool MeshplorerViewWireframeEnabled {
get {
return ((bool)(this["MeshplorerViewWireframeEnabled"]));
}
set {
this["MeshplorerViewWireframeEnabled"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool UseMetadataFullPaths {
get {
return ((bool)(this["UseMetadataFullPaths"]));
}
set {
this["UseMetadataFullPaths"] = value;
}
}
public bool MeshplorerViewSolidEnabled {
get {
return ((bool)(this["MeshplorerViewSolidEnabled"]));
}
set {
this["MeshplorerViewSolidEnabled"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool MeshplorerViewFirstPerson {
get {
return ((bool)(this["MeshplorerViewFirstPerson"]));
}
set {
this["MeshplorerViewFirstPerson"] = value;
}
} |
<<<<<<<
using System.Threading.Tasks;
=======
using Gibbed.IO;
>>>>>>>
using System.Threading.Tasks;
using Gibbed.IO; |
<<<<<<<
this.dataGridView1 = new System.Windows.Forms.DataGridView();
=======
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.panel1 = new System.Windows.Forms.Panel();
this.Label_CellCoordinate = new System.Windows.Forms.Label();
this.Label_CellType = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
>>>>>>>
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.panel1 = new System.Windows.Forms.Panel();
this.Label_CellCoordinate = new System.Windows.Forms.Label();
this.Label_CellType = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
<<<<<<<
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
=======
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
this.splitContainer2.Panel1.SuspendLayout();
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel1.SuspendLayout();
>>>>>>>
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
this.splitContainer2.Panel1.SuspendLayout();
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel1.SuspendLayout();
<<<<<<<
//
// exportButton
//
this.exportButton.Name = "exportButton";
this.exportButton.Size = new System.Drawing.Size(23, 24);
=======
//
// exportButton
//
this.exportButton.Name = "exportButton";
this.exportButton.Size = new System.Drawing.Size(23, 22);
>>>>>>>
//
// exportButton
//
this.exportButton.Name = "exportButton";
this.exportButton.Size = new System.Drawing.Size(23, 22);
<<<<<<<
//
// addArrayElementButton
//
this.addArrayElementButton.Name = "addArrayElementButton";
this.addArrayElementButton.Size = new System.Drawing.Size(23, 4);
//
// deleteArrayElementButton
//
this.deleteArrayElementButton.Name = "deleteArrayElementButton";
this.deleteArrayElementButton.Size = new System.Drawing.Size(23, 4);
//
// moveUpButton
//
this.moveUpButton.Name = "moveUpButton";
this.moveUpButton.Size = new System.Drawing.Size(23, 4);
//
// moveDownButton
//
this.moveDownButton.Name = "moveDownButton";
this.moveDownButton.Size = new System.Drawing.Size(23, 4);
//
// addPropButton
//
this.addPropButton.Name = "addPropButton";
this.addPropButton.Size = new System.Drawing.Size(23, 4);
=======
//
// addArrayElementButton
//
this.addArrayElementButton.Name = "addArrayElementButton";
this.addArrayElementButton.Size = new System.Drawing.Size(23, 22);
//
// deleteArrayElementButton
//
this.deleteArrayElementButton.Name = "deleteArrayElementButton";
this.deleteArrayElementButton.Size = new System.Drawing.Size(23, 22);
//
// moveUpButton
//
this.moveUpButton.Name = "moveUpButton";
this.moveUpButton.Size = new System.Drawing.Size(23, 22);
//
// moveDownButton
//
this.moveDownButton.Name = "moveDownButton";
this.moveDownButton.Size = new System.Drawing.Size(23, 22);
//
// addPropButton
//
this.addPropButton.Name = "addPropButton";
this.addPropButton.Size = new System.Drawing.Size(23, 22);
>>>>>>>
//
// addArrayElementButton
//
this.addArrayElementButton.Name = "addArrayElementButton";
this.addArrayElementButton.Size = new System.Drawing.Size(23, 4);
//
// deleteArrayElementButton
//
this.deleteArrayElementButton.Name = "deleteArrayElementButton";
this.deleteArrayElementButton.Size = new System.Drawing.Size(23, 4);
//
// moveUpButton
//
this.moveUpButton.Name = "moveUpButton";
this.moveUpButton.Size = new System.Drawing.Size(23, 22);
//
// moveDownButton
//
this.moveDownButton.Name = "moveDownButton";
this.moveDownButton.Size = new System.Drawing.Size(23, 4);
//
// addPropButton
//
this.addPropButton.Name = "addPropButton";
this.addPropButton.Size = new System.Drawing.Size(23, 4);
<<<<<<<
//
// viewModeDropDownList
//
this.viewModeDropDownList.Name = "viewModeDropDownList";
this.viewModeDropDownList.Size = new System.Drawing.Size(121, 23);
//
// exportToExcelButton
//
this.exportToExcelButton.Image = ((System.Drawing.Image)(resources.GetObject("exportToExcelButton.Image")));
this.exportToExcelButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.exportToExcelButton.Name = "exportToExcelButton";
this.exportToExcelButton.Size = new System.Drawing.Size(143, 20);
this.exportToExcelButton.Text = "Export table to xlsx file";
this.exportToExcelButton.Click += new System.EventHandler(this.exportToExcel_Click);
=======
//
// viewModeDropDownList
//
this.viewModeDropDownList.Name = "viewModeDropDownList";
this.viewModeDropDownList.Size = new System.Drawing.Size(121, 25);
>>>>>>>
//
// viewModeDropDownList
//
this.viewModeDropDownList.Name = "viewModeDropDownList";
this.viewModeDropDownList.Size = new System.Drawing.Size(121, 23);
//
// exportToExcelButton
//
this.exportToExcelButton.Image = ((System.Drawing.Image)(resources.GetObject("exportToExcelButton.Image")));
this.exportToExcelButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.exportToExcelButton.Name = "exportToExcelButton";
this.exportToExcelButton.Size = new System.Drawing.Size(143, 20);
this.exportToExcelButton.Text = "Export table to xlsx file";
this.exportToExcelButton.Click += new System.EventHandler(this.exportToExcel_Click);
<<<<<<<
this.splitContainer1.Panel2.Controls.Add(this.dataGridView1);
this.splitContainer1.Size = new System.Drawing.Size(992, 349);
=======
this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
this.splitContainer1.Size = new System.Drawing.Size(992, 351);
>>>>>>>
this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
this.splitContainer1.Size = new System.Drawing.Size(992, 351);
<<<<<<<
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
=======
this.splitContainer2.Panel1.ResumeLayout(false);
this.splitContainer2.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
>>>>>>>
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.splitContainer2.Panel1.ResumeLayout(false);
this.splitContainer2.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
<<<<<<<
private ToolStripButton exportToExcelButton;
=======
private SplitContainer splitContainer2;
private Panel panel1;
private Label Label_CellCoordinate;
private Label Label_CellType;
private Label label2;
private Label label1;
>>>>>>>
private ToolStripButton exportToExcelButton;
private SplitContainer splitContainer2;
private Panel panel1;
private Label Label_CellCoordinate;
private Label Label_CellType;
private Label label2;
private Label label1; |
<<<<<<<
return CreateTheme(descriptor);
=======
return new Theme {
Author = descriptor.Author ?? String.Empty,
Description = descriptor.Description ?? String.Empty,
DisplayName = descriptor.DisplayName ?? String.Empty,
HomePage = descriptor.WebSite ?? String.Empty,
ThemeName = descriptor.Name,
Version = descriptor.Version ?? String.Empty,
Tags = descriptor.Tags ?? String.Empty,
Zones = descriptor.Zones ?? String.Empty,
};
>>>>>>>
return CreateTheme(descriptor);
Zones = descriptor.Zones ?? String.Empty,
<<<<<<<
if (!String.Equals(descriptor.ExtensionType, "Theme", StringComparison.OrdinalIgnoreCase)) {
continue;
}
ITheme theme = CreateTheme(descriptor);
if (!theme.Tags.Contains("hidden")) {
themes.Add(theme);
=======
if (String.Equals(descriptor.ExtensionType, "Theme", StringComparison.OrdinalIgnoreCase)) {
Theme theme = new Theme {
Author = descriptor.Author ?? String.Empty,
Description = descriptor.Description ?? String.Empty,
DisplayName = descriptor.DisplayName ?? String.Empty,
HomePage = descriptor.WebSite ?? String.Empty,
ThemeName = descriptor.Name,
Version = descriptor.Version ?? String.Empty,
Tags = descriptor.Tags ?? String.Empty,
Zones = descriptor.Zones ?? String.Empty,
};
if (!theme.Tags.Contains("hidden")) {
themes.Add(theme);
}
>>>>>>>
if (!String.Equals(descriptor.ExtensionType, "Theme", StringComparison.OrdinalIgnoreCase)) {
continue;
}
ITheme theme = CreateTheme(descriptor);
Zones = descriptor.Zones ?? String.Empty,
if (!theme.Tags.Contains("hidden")) {
themes.Add(theme); |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- AWS Marketplace Commerce Analytics. The AWS Marketplace Commerce Analytics service allows marketplace partners to programmatically request business intelligence data from AWS Marketplace. This service provides the same data that was previously only available through the AWS Marketplace Management Portal, but offers the data in a fully-machine-readable format and available in fine-grained data sets rather than large reports.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- AWS Marketplace Commerce Analytics. The AWS Marketplace Commerce Analytics service allows marketplace partners to programmatically request business intelligence data from AWS Marketplace. This service provides the same data that was previously only available through the AWS Marketplace Management Portal, but offers the data in a fully-machine-readable format and available in fine-grained data sets rather than large reports.")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - AWS Marketplace Commerce Analytics. The AWS Marketplace Commerce Analytics service allows marketplace partners to programmatically request business intelligence data from AWS Marketplace. This service provides the same data that was previously only available through the AWS Marketplace Management Portal, but offers the data in a fully-machine-readable format and available in fine-grained data sets rather than large reports.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - AWS Marketplace Commerce Analytics. The AWS Marketplace Commerce Analytics service allows marketplace partners to programmatically request business intelligence data from AWS Marketplace. This service provides the same data that was previously only available through the AWS Marketplace Management Portal, but offers the data in a fully-machine-readable format and available in fine-grained data sets rather than large reports.")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - AWS Marketplace Commerce Analytics. The AWS Marketplace Commerce Analytics service allows marketplace partners to programmatically request business intelligence data from AWS Marketplace. This service provides the same data that was previously only available through the AWS Marketplace Management Portal, but offers the data in a fully-machine-readable format and available in fine-grained data sets rather than large reports.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - AWS Marketplace Commerce Analytics. The AWS Marketplace Commerce Analytics service allows marketplace partners to programmatically request business intelligence data from AWS Marketplace. This service provides the same data that was previously only available through the AWS Marketplace Management Portal, but offers the data in a fully-machine-readable format and available in fine-grained data sets rather than large reports.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- AWS Marketplace Commerce Analytics. The AWS Marketplace Commerce Analytics service allows marketplace partners to programmatically request business intelligence data from AWS Marketplace. This service provides the same data that was previously only available through the AWS Marketplace Management Portal, but offers the data in a fully-machine-readable format and available in fine-grained data sets rather than large reports.")]
<<<<<<<
[assembly: AssemblyVersion("3.2")]
[assembly: AssemblyFileVersion("3.2.2.0")]
=======
[assembly: AssemblyVersion("3.1")]
[assembly: AssemblyFileVersion("3.1.2.0")]
>>>>>>>
[assembly: AssemblyVersion("3.2")]
[assembly: AssemblyFileVersion("3.2.2.0")] |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- AWS IoT. AWS IoT allows you to leverage AWS to build your Internet of Things.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- AWS IoT. AWS IoT allows you to leverage AWS to build your Internet of Things.")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - AWS IoT. AWS IoT allows you to leverage AWS to build your Internet of Things.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - AWS IoT. AWS IoT allows you to leverage AWS to build your Internet of Things.")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - AWS IoT. AWS IoT allows you to leverage AWS to build your Internet of Things.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - AWS IoT. AWS IoT allows you to leverage AWS to build your Internet of Things.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- AWS IoT. AWS IoT allows you to leverage AWS to build your Internet of Things.")]
<<<<<<<
[assembly: AssemblyVersion("3.2")]
[assembly: AssemblyFileVersion("3.2.2.0")]
=======
[assembly: AssemblyVersion("3.1")]
[assembly: AssemblyFileVersion("3.1.1.0")]
>>>>>>>
[assembly: AssemblyVersion("3.2")]
[assembly: AssemblyFileVersion("3.2.2.0")] |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Amazon CloudSearch. Amazon CloudSearch is a managed service in the AWS Cloud that makes it simple and cost-effective to set up, manage, and scale a search solution for your website or application.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- Amazon CloudSearch. Amazon CloudSearch is a managed service in the AWS Cloud that makes it simple and cost-effective to set up, manage, and scale a search solution for your website or application.")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - Amazon CloudSearch. Amazon CloudSearch is a managed service in the AWS Cloud that makes it simple and cost-effective to set up, manage, and scale a search solution for your website or application.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - Amazon CloudSearch. Amazon CloudSearch is a managed service in the AWS Cloud that makes it simple and cost-effective to set up, manage, and scale a search solution for your website or application.")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - Amazon CloudSearch. Amazon CloudSearch is a managed service in the AWS Cloud that makes it simple and cost-effective to set up, manage, and scale a search solution for your website or application.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - Amazon CloudSearch. Amazon CloudSearch is a managed service in the AWS Cloud that makes it simple and cost-effective to set up, manage, and scale a search solution for your website or application.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- Amazon CloudSearch. Amazon CloudSearch is a managed service in the AWS Cloud that makes it simple and cost-effective to set up, manage, and scale a search solution for your website or application.")] |
<<<<<<<
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "12.0.0.0")]
=======
#line 1 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "12.0.0.0")]
>>>>>>>
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "14.0.0.0")]
<<<<<<<
#line 9 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 9 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 9 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 16 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 16 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 16 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 33 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 33 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 35 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 35 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 35 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 51 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 74 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 74 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 74 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 93 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 93 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 93 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 99 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 99 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 99 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 114 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 114 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 114 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 129 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 129 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 129 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 145 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 149 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 149 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 149 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 153 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 153 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 153 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 167 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 167 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 167 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 230 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 230 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 230 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 240 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 240 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 240 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 244 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 244 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 244 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 274 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 274 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 274 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 351 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 351 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 351 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 356 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 356 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 356 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 358 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 358 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 358 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 366 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 366 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 366 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 367 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 367 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 367 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 367 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 372 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 372 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 372 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 378 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 378 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 378 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 383 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 383 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 383 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 481 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 481 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 481 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 485 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 485 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 485 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 495 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 495 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 495 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 743 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 743 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 743 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 748 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 748 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 748 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 754 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 754 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 754 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt" |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - CodePipeline Service. CodePipeline Service")]
#elif PCL
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- CodePipeline Service. CodePipeline Service")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- CodePipeline Service. CodePipeline Service")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - CodePipeline Service. AWS CodePipeline is a continuous delivery service for fast and reliable application updates.")]
#elif PCL
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Core Runtime")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - CodePipeline Service. AWS CodePipeline is a continuous delivery service for fast and reliable application updates.")]
#elif PCL
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- CodePipeline Service. CodePipeline Service")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- CodePipeline Service. CodePipeline Service")]
<<<<<<<
[assembly: AssemblyVersion("3.0")]
[assembly: AssemblyFileVersion("3.0.0.1")]
=======
[assembly: AssemblyVersion("3.1")]
[assembly: AssemblyFileVersion("3.1.0.0")]
>>>>>>>
[assembly: AssemblyVersion("3.1")]
[assembly: AssemblyFileVersion("3.1.0.0")] |
<<<<<<<
#line 1 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 1 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 10 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 10 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 10 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 11 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 11 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 11 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 12 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 12 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 12 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 12 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 12 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 12 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 14 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 14 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 14 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 16 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 16 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 16 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 18 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 18 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 18 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 18 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 18 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 18 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 20 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 20 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 20 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 23 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 23 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 23 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 24 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 24 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 24 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 29 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 29 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 29 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 34 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 34 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 34 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 42 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 42 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 42 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 62 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 62 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 62 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 65 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 65 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 65 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 77 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 77 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 77 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 78 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 78 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 78 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 95 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 95 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 95 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 100 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 100 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 100 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 113 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 124 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 124 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 116 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 127 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 127 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 117 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 128 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 128 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 118 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 129 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 129 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 120 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 131 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 131 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 121 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 132 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 132 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 122 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 133 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 133 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 124 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 135 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 135 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 128 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 139 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 129 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 140 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 140 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 130 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 141 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 141 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 137 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 162 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 153 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 138 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 163 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 154 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 139 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 164 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 155 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 140 "C:\d\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 165 "D:\workspace\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 156 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" |
<<<<<<<
protected override void OnDisplaying(MarkdownElement element, ElementDisplayingContext context) {
context.ElementShape.ProcessedContent = ToHtml(element.Content);
}
private string ToHtml(string markdown) {
return new MarkdownSharp.Markdown().Transform(markdown);
=======
protected override void OnDisplaying(MarkdownElement element, ElementDisplayContext context) {
context.ElementShape.ProcessedContent = _processor.ProcessContent(element.Content, "markdown", context.GetTokenData());
>>>>>>>
protected override void OnDisplaying(MarkdownElement element, ElementDisplayingContext context) {
context.ElementShape.ProcessedContent = _processor.ProcessContent(element.Content, "markdown", context.GetTokenData()); |
<<<<<<<
public static string DownloadStringContent(Uri uri)
{
#if DNX
using (var client = new System.Net.Http.HttpClient())
{
var task = client.GetStringAsync(uri);
return task.Result;
}
#else
HttpWebRequest request = HttpWebRequest.Create(uri) as HttpWebRequest;
var asyncResult = request.BeginGetResponse(null, null);
using (HttpWebResponse response = request.EndGetResponse(asyncResult) as HttpWebResponse)
using (StreamReader reader = new StreamReader(response.GetResponseStream()))
{
return reader.ReadToEnd();
}
#endif
}
public static Stream OpenStream(Uri uri)
{
#if DNX
using (var client = new System.Net.Http.HttpClient())
{
var task = client.GetStreamAsync(uri);
return task.Result;
}
#else
HttpWebRequest request = WebRequest.Create(uri) as HttpWebRequest;
var asynResult = request.BeginGetResponse(null, null);
HttpWebResponse response = request.EndGetResponse(asynResult) as HttpWebResponse;
return response.GetResponseStream();
#endif
}
=======
/// <summary>
/// Returns true if the string has any bidirectional control characters.
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public static bool HasBidiControlCharacters(string input)
{
if (string.IsNullOrEmpty(input))
return false;
foreach(var c in input)
{
if (IsBidiControlChar(c))
return true;
}
return false;
}
private static bool IsBidiControlChar(char c)
{
// check general range
if (c < '\u200E' || c > '\u202E')
return false;
// check specific characters
return (
c == '\u200E' || // LRM
c == '\u200F' || // RLM
c == '\u202A' || // LRE
c == '\u202B' || // RLE
c == '\u202C' || // PDF
c == '\u202D' || // LRO
c == '\u202E' // RLO
);
}
>>>>>>>
/// <summary>
/// Returns true if the string has any bidirectional control characters.
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public static bool HasBidiControlCharacters(string input)
{
if (string.IsNullOrEmpty(input))
return false;
foreach(var c in input)
{
if (IsBidiControlChar(c))
return true;
}
return false;
}
private static bool IsBidiControlChar(char c)
{
// check general range
if (c < '\u200E' || c > '\u202E')
return false;
// check specific characters
return (
c == '\u200E' || // LRM
c == '\u200F' || // RLM
c == '\u202A' || // LRE
c == '\u202B' || // RLE
c == '\u202C' || // PDF
c == '\u202D' || // LRO
c == '\u202E' // RLO
);
}
public static string DownloadStringContent(Uri uri)
{
#if DNX
using (var client = new System.Net.Http.HttpClient())
{
var task = client.GetStringAsync(uri);
return task.Result;
}
#else
HttpWebRequest request = HttpWebRequest.Create(uri) as HttpWebRequest;
var asyncResult = request.BeginGetResponse(null, null);
using (HttpWebResponse response = request.EndGetResponse(asyncResult) as HttpWebResponse)
using (StreamReader reader = new StreamReader(response.GetResponseStream()))
{
return reader.ReadToEnd();
}
#endif
}
public static Stream OpenStream(Uri uri)
{
#if DNX
using (var client = new System.Net.Http.HttpClient())
{
var task = client.GetStreamAsync(uri);
return task.Result;
}
#else
HttpWebRequest request = WebRequest.Create(uri) as HttpWebRequest;
var asynResult = request.BeginGetResponse(null, null);
HttpWebResponse response = request.EndGetResponse(asynResult) as HttpWebResponse;
return response.GetResponseStream();
#endif
} |
<<<<<<<
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
=======
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
>>>>>>>
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
<<<<<<<
#line 239 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 261 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 261 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 267 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 289 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 289 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 278 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 300 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 300 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 280 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 302 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 302 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 285 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 307 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 307 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 291 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 313 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 313 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 296 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 318 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 318 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 313 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 335 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 335 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 320 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 342 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 342 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 338 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 360 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 360 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 338 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 360 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 360 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 341 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 363 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 363 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 346 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 368 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 368 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 355 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 377 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 377 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 370 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 392 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 392 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 389 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 411 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 411 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 389 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 411 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 411 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 391 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 413 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 413 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 405 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 427 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 427 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 420 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 442 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 442 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
<<<<<<<
#line 424 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
=======
#line 446 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt"
>>>>>>>
#line 446 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceClients45.tt" |
<<<<<<<
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 1 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 6 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 6 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 6 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 13 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 13 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 13 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 16 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 16 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 16 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 18 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 21 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 21 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 21 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 24 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 24 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 27 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 30 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 30 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 31 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 34 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 34 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 35 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 38 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 38 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 39 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 42 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 42 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 42 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 45 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 46 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 49 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 49 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 54 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 57 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 57 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 58 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 61 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 61 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 65 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 68 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 68 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 68 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 71 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 71 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 76 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 79 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 79 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 78 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 81 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 81 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 78 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 81 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 81 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 80 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 83 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 83 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
<<<<<<<
#line 87 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
=======
#line 162 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt"
>>>>>>>
#line 162 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ExceptionClass.tt" |
<<<<<<<
#if PCL || DNX
=======
#if PCL|| UNITY
>>>>>>>
#if PCL|| UNITY || DNX |
<<<<<<<
#if BCL45 || DNX
/// <summary>
/// Writes the content of the ResponseStream a file indicated by the filePath argument.
/// </summary>
/// <param name="filePath">The location where to write the ResponseStream</param>
/// <param name="append">Whether or not to append to the file if it exists</param>
/// <param name="cancellationToken">Cancellation token which can be used to cancel this operation.</param>
public async System.Threading.Tasks.Task WriteResponseStreamToFileAsync(string filePath, bool append, System.Threading.CancellationToken cancellationToken)
{
// Make sure the directory exists to write too.
FileInfo fi = new FileInfo(filePath);
Directory.CreateDirectory(fi.DirectoryName);
Stream downloadStream;
if (append && File.Exists(filePath))
downloadStream = new FileStream(filePath, FileMode.Append, FileAccess.Write, FileShare.Read, S3Constants.DefaultBufferSize);
else
downloadStream = new FileStream(filePath, FileMode.Create, FileAccess.ReadWrite, FileShare.Read, S3Constants.DefaultBufferSize);
try
{
long current = 0;
#if DNX
Stream stream = this.ResponseStream;
#else
Stream stream = new BufferedStream(this.ResponseStream);
#endif
byte[] buffer = new byte[S3Constants.DefaultBufferSize];
int bytesRead = 0;
long totalIncrementTransferred = 0;
while ((bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length)
.ConfigureAwait(continueOnCapturedContext: false)) > 0)
{
cancellationToken.ThrowIfCancellationRequested();
await downloadStream.WriteAsync(buffer, 0, bytesRead)
.ConfigureAwait(continueOnCapturedContext: false);
current += bytesRead;
totalIncrementTransferred += bytesRead;
if (totalIncrementTransferred >= AWSSDKUtils.DefaultProgressUpdateInterval ||
current == this.ContentLength)
{
this.OnRaiseProgressEvent(filePath, totalIncrementTransferred, current, this.ContentLength);
totalIncrementTransferred = 0;
}
}
ValidateWrittenStreamSize(current);
}
finally
{
downloadStream.Dispose();
}
}
#endif
=======
#endif
>>>>>>>
#if BCL45 || DNX
/// <summary>
/// Writes the content of the ResponseStream a file indicated by the filePath argument.
/// </summary>
/// <param name="filePath">The location where to write the ResponseStream</param>
/// <param name="append">Whether or not to append to the file if it exists</param>
/// <param name="cancellationToken">Cancellation token which can be used to cancel this operation.</param>
public async System.Threading.Tasks.Task WriteResponseStreamToFileAsync(string filePath, bool append, System.Threading.CancellationToken cancellationToken)
{
// Make sure the directory exists to write too.
FileInfo fi = new FileInfo(filePath);
Directory.CreateDirectory(fi.DirectoryName);
Stream downloadStream;
if (append && File.Exists(filePath))
downloadStream = new FileStream(filePath, FileMode.Append, FileAccess.Write, FileShare.Read, S3Constants.DefaultBufferSize);
else
downloadStream = new FileStream(filePath, FileMode.Create, FileAccess.ReadWrite, FileShare.Read, S3Constants.DefaultBufferSize);
try
{
long current = 0;
#if DNX
Stream stream = this.ResponseStream;
#else
Stream stream = new BufferedStream(this.ResponseStream);
#endif
byte[] buffer = new byte[S3Constants.DefaultBufferSize];
int bytesRead = 0;
long totalIncrementTransferred = 0;
while ((bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length)
.ConfigureAwait(continueOnCapturedContext: false)) > 0)
{
cancellationToken.ThrowIfCancellationRequested();
await downloadStream.WriteAsync(buffer, 0, bytesRead)
.ConfigureAwait(continueOnCapturedContext: false);
current += bytesRead;
totalIncrementTransferred += bytesRead;
if (totalIncrementTransferred >= AWSSDKUtils.DefaultProgressUpdateInterval ||
current == this.ContentLength)
{
this.OnRaiseProgressEvent(filePath, totalIncrementTransferred, current, this.ContentLength);
totalIncrementTransferred = 0;
}
}
ValidateWrittenStreamSize(current);
}
finally
{
downloadStream.Dispose();
}
}
#endif
#endif |
<<<<<<<
GeneratePlatformSpecificSolution(projectConfig);
=======
GeneratePlatformSpecificSolution(projectType, true);
>>>>>>>
GeneratePlatformSpecificSolution(projectConfig);
}
}
// adds any necessary projects to the collection prior to generating the solution file(s)
private void AddSupportProjects()
{
_allProjects.Add(GeneratorLibProjectName, GeneratorLibProjectConfig);
}
/// <summary>
/// Scans the SDK source and test folder locations to detect existing projects that
/// follow our naming convention, adding them to the set of all projects to be
/// processed into the solution files.
/// </summary>
private void ScanForExistingProjects()
{
const string awssdkProjectNamePattern = "AWSSDK.*.csproj";
var foldersToProcess = new[]
{
Path.Combine(Options.SdkRootFolder, GeneratorDriver.SourceSubFoldername),
Path.Combine(Options.SdkRootFolder, GeneratorDriver.TestsSubFoldername)
};
foreach (var rootFolder in foldersToProcess)
{
foreach (var projectFile in Directory.GetFiles(rootFolder, awssdkProjectNamePattern, SearchOption.AllDirectories))
{
var projectName = Path.GetFileNameWithoutExtension(projectFile);
if (_allProjects.ContainsKey(projectName))
continue;
var projectConfig = new ProjectFileCreator.ProjectConfigurationData
{
ProjectGuid = GetProjectGuid(projectFile),
ConfigurationPlatforms = GetProjectPlatforms(projectName)
};
_allProjects.Add(projectName, projectConfig);
}
}
}
private static string GetProjectGuid(string projectFile)
{
var content = File.ReadAllText(projectFile);
var pos = content.IndexOf("<ProjectGuid>", StringComparison.OrdinalIgnoreCase) + "<ProjectGuid>".Length;
var lastPos = content.IndexOf("</ProjectGuid>", pos, StringComparison.OrdinalIgnoreCase);
var guid = content.Substring(pos, lastPos - pos);
return guid;
}
static IEnumerable<string> GetProjectPlatformsFromFile(string projectFile)
{
var platforms = new List<string>();
var content = File.ReadAllText(projectFile);
var doc = new XmlDocument();
doc.LoadXml(content);
var searchPhrase = "$(Configuration)|$(Platform)";
var propertyGroups = doc.GetElementsByTagName("PropertyGroup");
foreach(XmlNode pg in propertyGroups)
{
var conditionAttrbiute = pg.Attributes["Condition"];
if (conditionAttrbiute != null)
{
var condition = conditionAttrbiute.Value;
if (condition.IndexOf(searchPhrase, StringComparison.Ordinal) >= 0)
{
var thirdQuote = condition.IndexOfNthOccurence('\'', 0, 3);
var fourthQuote = condition.IndexOf('\'', thirdQuote);
var platform = condition.Substring(thirdQuote, fourthQuote - thirdQuote);
platforms.Add(platform);
}
}
}
return platforms;
}
static IEnumerable<string> GetProjectPlatforms(string projectName)
{
var projectTypeStart = projectName.LastIndexOf('.');
var projectType = projectName.Substring(projectTypeStart + 1);
switch (projectType)
{
case ProjectTypes.WinRt:
case ProjectTypes.WinPhone8:
return PhoneRtPlatformConfigurations;
case ProjectTypes.Portable:
case ProjectTypes.Net35:
case ProjectTypes.Net45:
case ProjectTypes.PCL:
return StandardPlatformConfigurations;
}
throw new Exception(string.Format("Unrecognized platform type in project name - '{0}'", projectType));
}
private void GenerateAllPlatformsSolution(IEnumerable<ProjectFileConfiguration> projectFileConfigurations)
{
var session = new Dictionary<string, object>();
Console.WriteLine("...generating all-platforms solution file AWSSDK.sln");
// use an AWSSDK prefix on project names so as to not collect any user-created projects (unless they
// chose to use our naming pattern)
const string awssdkProjectFileNamePattern = "AWSSDK.*.csproj";
var sdkSourceFolder = Path.Combine(Options.SdkRootFolder, GeneratorDriver.SourceSubFoldername);
var coreProjects = new List<Project>();
var coreProjectsRoot = Path.Combine(sdkSourceFolder, GeneratorDriver.CoreSubFoldername);
foreach (var projectFile in Directory.GetFiles(coreProjectsRoot, awssdkProjectFileNamePattern, SearchOption.TopDirectoryOnly))
{
coreProjects.Add(CoreProjectFromFile(projectFile));
}
var serviceSolutionFolders = new List<ServiceSolutionFolder>();
var serviceProjectsRoot = Path.Combine(sdkSourceFolder, GeneratorDriver.ServicesSubFoldername);
foreach (var servicePath in Directory.GetDirectories(serviceProjectsRoot))
{
var di = new DirectoryInfo(servicePath);
var folder = ServiceSolutionFolderFromPath(di.Name);
foreach (var projectFile in Directory.GetFiles(servicePath, awssdkProjectFileNamePattern, SearchOption.TopDirectoryOnly))
{
folder.Projects.Add(ServiceProjectFromFile(di.Name, projectFile));
}
serviceSolutionFolders.Add(folder);
}
var testProjects = new List<Project>
{
GeneratorLibProject
};
var sdkTestsFolder = Path.Combine(Options.SdkRootFolder, GeneratorDriver.TestsSubFoldername);
foreach (var testFoldername in new[] { GeneratorDriver.UnitTestsSubFoldername, GeneratorDriver.IntegrationTestsSubFolderName })
{
var testsFolder = Path.Combine(sdkTestsFolder, testFoldername);
foreach (var projectFile in Directory.GetFiles(testsFolder, awssdkProjectFileNamePattern, SearchOption.TopDirectoryOnly))
{
testProjects.Add(TestProjectFromFile(testFoldername, projectFile));
}
}
foreach(var pfc in projectFileConfigurations)
{
AddExtraTestProjects(pfc, _allProjects, testProjects);
<<<<<<<
private void GeneratePlatformSpecificSolution(ProjectFileConfiguration projectConfig)
=======
private void GeneratePlatformSpecificSolution(string projectType, bool includeTests, string solutionFileName = null)
>>>>>>>
private void GeneratePlatformSpecificSolution(ProjectFileConfiguration projectConfig, bool includeTests, string solutionFileName = null)
<<<<<<<
var solutionName = string.Format("AWSSDK.{0}.sln", projectType);
GeneratorDriver.WriteFile(Options.SdkRootFolder, null, solutionName, content, true, false);
}
private void AddExtraTestProjects(ProjectFileConfiguration projectConfig, Dictionary<string, ProjectFileCreator.ProjectConfigurationData> solutionProjects, List<Project> testProjects)
{
foreach (var extraTestProject in projectConfig.ExtraTestProjects)
{
var projectPath = @"..\..\..\..\sdk\" + extraTestProject;
var projectGuid = GetProjectGuid(projectPath);
var testProject = ProjectFromFile(extraTestProject, projectGuid);
var testProjectConfig = new ProjectFileCreator.ProjectConfigurationData
{
ProjectGuid = projectGuid,
ConfigurationPlatforms = GetProjectPlatformsFromFile(projectPath).ToList()
};
solutionProjects.Add(testProject.Name, testProjectConfig);
testProjects.Add(testProject);
}
=======
if (string.IsNullOrEmpty(solutionFileName))
solutionFileName = string.Format("AWSSDK.{0}.sln", projectType);
GeneratorDriver.WriteFile(Options.SdkRootFolder, null, solutionFileName, content, true, false);
>>>>>>>
if (string.IsNullOrEmpty(solutionFileName))
solutionFileName = string.Format("AWSSDK.{0}.sln", projectType);
GeneratorDriver.WriteFile(Options.SdkRootFolder, null, solutionFileName, content, true, false);
}
private void AddExtraTestProjects(ProjectFileConfiguration projectConfig, Dictionary<string, ProjectFileCreator.ProjectConfigurationData> solutionProjects, List<Project> testProjects)
{
foreach (var extraTestProject in projectConfig.ExtraTestProjects)
{
var projectPath = @"..\..\..\..\sdk\" + extraTestProject;
var projectGuid = GetProjectGuid(projectPath);
var testProject = ProjectFromFile(extraTestProject, projectGuid);
var testProjectConfig = new ProjectFileCreator.ProjectConfigurationData
{
ProjectGuid = projectGuid,
ConfigurationPlatforms = GetProjectPlatformsFromFile(projectPath).ToList()
};
solutionProjects.Add(testProject.Name, testProjectConfig);
testProjects.Add(testProject);
} |
<<<<<<<
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 1 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 6 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 6 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 6 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 16 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 16 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 16 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 19 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 19 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 19 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 24 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 27 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 27 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 27 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 30 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 30 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 36 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 36 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 37 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 40 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 40 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 43 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 46 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 46 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 46 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 49 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 49 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 52 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 55 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 55 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 59 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 62 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 62 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 65 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 68 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 68 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
<<<<<<<
#line 73 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
=======
#line 76 "C:\Codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt"
>>>>>>>
#line 76 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\BaseServiceException.tt" |
<<<<<<<
using Orchard.Autoroute.Models;
using Orchard.Autoroute.Services;
using Orchard.Autoroute.Settings;
using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Models;
=======
using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData;
>>>>>>>
using Orchard.Autoroute.Models;
using Orchard.ContentManagement;
using Orchard.Autoroute.Services;
using Orchard.Autoroute.Settings;
using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Models; |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Amazon Simple Email Service. Amazon SES is an outbound-only email-sending service that provides an easy, cost-effective way for you to send email.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- Amazon Simple Email Service. Amazon SES is an outbound-only email-sending service that provides an easy, cost-effective way for you to send email.")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - Amazon Simple Email Service. Amazon SES is an outbound-only email-sending service that provides an easy, cost-effective way for you to send email.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - Amazon Simple Email Service. Amazon SES is an outbound-only email-sending service that provides an easy, cost-effective way for you to send email.")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - Amazon Simple Email Service. Amazon SES is an outbound-only email-sending service that provides an easy, cost-effective way for you to send email.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - Amazon Simple Email Service. Amazon SES is an outbound-only email-sending service that provides an easy, cost-effective way for you to send email.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- Amazon Simple Email Service. Amazon SES is an outbound-only email-sending service that provides an easy, cost-effective way for you to send email.")]
<<<<<<<
[assembly: AssemblyVersion("3.2")]
[assembly: AssemblyFileVersion("3.2.2.0")]
=======
[assembly: AssemblyVersion("3.1")]
[assembly: AssemblyFileVersion("3.1.2.0")]
>>>>>>>
[assembly: AssemblyVersion("3.2")]
[assembly: AssemblyFileVersion("3.2.2.0")] |
<<<<<<<
using System.Threading.Tasks;
=======
using System.Reflection;
>>>>>>>
using System.Threading.Tasks;
using System.Reflection; |
<<<<<<<
public UnityRequest(Uri requestUri)
{
=======
public UnityWebRequest(Uri requestUri)
{
>>>>>>>
public UnityRequest(Uri requestUri)
{
<<<<<<<
{
foreach (var header in headers)
=======
{
foreach (var item in headers)
>>>>>>>
{
foreach (var header in headers)
<<<<<<<
UnityRequestQueue.Instance.ExecuteOnMainThread(() =>
{
WwwRequest.Dispose();
});
=======
// This class does not have any disposable resources.
}
private StreamReadTracker Tracker { get; set; }
/// <summary>
/// Sets up the progress listeners
/// </summary>
/// <param name="originalStream">The content stream</param>
/// <param name="progressUpdateInterval">The interval at which progress needs to be published</param>
/// <param name="sender">The objects which is trigerring the progress changes</param>
/// <param name="callback">The callback which will be invoked when the progress changed event is trigerred</param>
/// <returns>an <see cref="EventStream"/> object, incase the progress is setup, else returns the original stream</returns>
public Stream SetupProgressListeners(Stream originalStream, long progressUpdateInterval, object sender, EventHandler<StreamTransferProgressArgs> callback)
{
this.Tracker = new StreamReadTracker(sender, callback, originalStream.Length,
progressUpdateInterval);
return originalStream;
}
/// <summary>
/// Track upload progress changes
/// </summary>
/// <param name="progress"></param>
internal void OnUploadProgressChanged(float progress)
{
if (this.Tracker != null)
{
this.Tracker.UpdateProgress(progress);
}
}
}
/// <summary>
/// Represents a simplified async result that stores the result from a completed operation.
/// It does not provide an implemention of the AsyncWaitHandle property
/// as the internal consumers of this class don't use this property.
/// </summary>
internal class SimpleAsyncResult : IAsyncResult
{
public SimpleAsyncResult(object state)
{
this.AsyncState = state;
}
public object AsyncState { get; private set; }
public System.Threading.WaitHandle AsyncWaitHandle
{
get { throw new NotSupportedException(); }
}
public bool CompletedSynchronously
{
get { return true; }
}
public bool IsCompleted
{
get { return true; }
>>>>>>>
UnityRequestQueue.Instance.ExecuteOnMainThread(() =>
{
WwwRequest.Dispose();
});
}
private StreamReadTracker Tracker { get; set; }
/// <summary>
/// Sets up the progress listeners
/// </summary>
/// <param name="originalStream">The content stream</param>
/// <param name="progressUpdateInterval">The interval at which progress needs to be published</param>
/// <param name="sender">The objects which is trigerring the progress changes</param>
/// <param name="callback">The callback which will be invoked when the progress changed event is trigerred</param>
/// <returns>an <see cref="EventStream"/> object, incase the progress is setup, else returns the original stream</returns>
public Stream SetupProgressListeners(Stream originalStream, long progressUpdateInterval, object sender, EventHandler<StreamTransferProgressArgs> callback)
{
this.Tracker = new StreamReadTracker(sender, callback, originalStream.Length,
progressUpdateInterval);
return originalStream;
}
/// <summary>
/// Track upload progress changes
/// </summary>
/// <param name="progress"></param>
public void OnUploadProgressChanged(float progress)
{
if (this.Tracker != null)
{
this.Tracker.UpdateProgress(progress);
} |
<<<<<<<
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "12.0.0.0")]
=======
#line 1 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "14.0.0.0")]
>>>>>>>
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "12.0.0.0")]
<<<<<<<
#line 9 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 9 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 9 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 16 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 16 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 16 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 33 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 33 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 35 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 35 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 35 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 51 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 69 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 93 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 93 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 75 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 99 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 99 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 90 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 114 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 114 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 105 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 129 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 129 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 121 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 145 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 125 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 149 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 149 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 129 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 153 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 153 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 143 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 167 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 167 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 184 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 244 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 244 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 374 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 481 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 481 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 378 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 485 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 485 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 388 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 495 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 495 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 519 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 743 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 743 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 524 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 748 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 748 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
<<<<<<<
#line 530 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
=======
#line 754 "C:\d\cc\unitywebrequest\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt"
>>>>>>>
#line 754 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\BaseGenerator.tt" |
<<<<<<<
using System.Linq;
using System.Web.Mvc;
using JetBrains.Annotations;
=======
using System.Web.Mvc;
>>>>>>>
using System.Linq;
using System.Web.Mvc;
<<<<<<<
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public ActionResult Index(Pager pager, string q = "") {
var searchFields = CurrentSite.As<SearchSettingsPart>().SearchedFields;
=======
public ActionResult Index(string q, int page = 1, int pageSize = 10) {
var searchFields = Services.WorkContext.CurrentSite.As<SearchSettingsPart>().SearchedFields;
>>>>>>>
public ActionResult Index(Pager pager, string q = "") {
var searchFields = Services.WorkContext.CurrentSite.As<SearchSettingsPart>().SearchedFields;
<<<<<<<
searchHits = _searchService.Query(q, pager.Page, pager.PageSize,
CurrentSite.As<SearchSettingsPart>().Record.FilterCulture,
=======
searchHits = _searchService.Query(q, page, pageSize,
Services.WorkContext.CurrentSite.As<SearchSettingsPart>().Record.FilterCulture,
>>>>>>>
searchHits = _searchService.Query(q, pager.Page, pager.PageSize,
Services.WorkContext.CurrentSite.As<SearchSettingsPart>().Record.FilterCulture, |
<<<<<<<
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
=======
// This code was generated by JetBrains T4 Processor
>>>>>>>
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
<<<<<<<
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
=======
#line 1 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("JetBrains.ForTea.TextTemplating", "42.42.42.42")]
>>>>>>>
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
<<<<<<<
#line 7 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
=======
#line 7 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
>>>>>>>
#line 7 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
<<<<<<<
#line 17 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
=======
#line 18 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
>>>>>>>
#line 18 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
<<<<<<<
#line 18 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
=======
#line 19 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
>>>>>>>
#line 19 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
<<<<<<<
#line 19 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
=======
#line 20 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
>>>>>>>
#line 20 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
<<<<<<<
#line 29 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
=======
#line 30 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
>>>>>>>
#line 30 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
<<<<<<<
#line 32 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
=======
#line 33 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
>>>>>>>
#line 33 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
<<<<<<<
#line 59 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
=======
#line 59 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
>>>>>>>
#line 59 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
<<<<<<<
#line 67 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
=======
#line 75 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(exception.Name));
#line default
#line hidden
this.Write("MarshallTest()\r\n {\r\n var operation = service_model.FindOperation(\"");
#line 77 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(operation.Name));
#line default
#line hidden
this.Write("\");\r\n\r\n var request = InstantiateClassGenerator.Execute<");
#line 79 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(operation.Name));
#line default
#line hidden
this.Write("Request>();\r\n var marshaller = new ");
#line 80 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(operation.Name));
#line default
#line hidden
this.Write("RequestMarshaller();\r\n var internalRequest = marshaller.Marshall(request);\r\n\r\n var validator = new AWSQueryValidator(internalRequest.Parameters, request, service_model, operation);\r\n validator.Validate();\r\n\r\n var exception = operation.Exceptions.First(e => e.Name.Equals(\"");
#line 86 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(exception.Name));
#line default
#line hidden
this.Write("\"));\r\n var payloadResponse = new XmlSampleGenerator(service_model, operation).Execute(exception);\r\n var context = new XmlUnmarshallerContext(Utils.CreateStreamFromString(payloadResponse), true, null, true);\r\n var response = ");
#line 89 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(operation.Name));
#line default
#line hidden
this.Write("ResponseUnmarshaller.Instance.UnmarshallException(context, null, System.Net.HttpStatusCode.OK);\r\n\r\n InstantiateClassGenerator.ValidateObjectFullyInstantiated(response);\r\n }\r\n");
#line 93 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
}
}
>>>>>>>
#line 75 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(exception.Name));
#line default
#line hidden
this.Write("MarshallTest()\r\n {\r\n var operation = service_model.FindOperatio" +
"n(\"");
#line 77 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(operation.Name));
#line default
#line hidden
this.Write("\");\r\n\r\n var request = InstantiateClassGenerator.Execute<");
#line 79 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(operation.Name));
#line default
#line hidden
this.Write("Request>();\r\n var marshaller = new ");
#line 80 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(operation.Name));
#line default
#line hidden
this.Write(@"RequestMarshaller();
var internalRequest = marshaller.Marshall(request);
var validator = new AWSQueryValidator(internalRequest.Parameters, request, service_model, operation);
validator.Validate();
var exception = operation.Exceptions.First(e => e.Name.Equals(""");
#line 86 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(exception.Name));
#line default
#line hidden
this.Write(@"""));
var payloadResponse = new XmlSampleGenerator(service_model, operation).Execute(exception);
var context = new XmlUnmarshallerContext(Utils.CreateStreamFromString(payloadResponse), true, null, true);
var response = ");
#line 89 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(operation.Name));
#line default
#line hidden
this.Write("ResponseUnmarshaller.Instance.UnmarshallException(context, null, System.Net.HttpS" +
"tatusCode.OK);\r\n\r\n InstantiateClassGenerator.ValidateObjectFullyInsta" +
"ntiated(response);\r\n }\r\n");
#line 93 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\AWSQueryMarshallingTests.tt"
}
} |
<<<<<<<
=======
using Orchard.Localization.Services;
using Orchard.Search.Models;
>>>>>>>
using Orchard.Localization.Services; |
<<<<<<<
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
=======
// This code was generated by JetBrains T4 Processor
>>>>>>>
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
<<<<<<<
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
=======
#line 1 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("JetBrains.ForTea.TextTemplating", "42.42.42.42")]
>>>>>>>
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
<<<<<<<
#line 7 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
=======
#line 7 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
>>>>>>>
#line 7 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
<<<<<<<
#line 17 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
=======
#line 18 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
>>>>>>>
#line 18 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
<<<<<<<
#line 18 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
=======
#line 19 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
>>>>>>>
#line 19 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
<<<<<<<
#line 19 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
=======
#line 20 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
>>>>>>>
#line 20 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
<<<<<<<
#line 29 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
=======
#line 30 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
>>>>>>>
#line 30 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
<<<<<<<
#line 32 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
=======
#line 33 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
>>>>>>>
#line 33 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
<<<<<<<
#line 52 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
=======
#line 53 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
>>>>>>>
#line 53 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
<<<<<<<
#line 54 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
=======
#line 55 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt"
>>>>>>>
#line 55 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\TestFiles\JsonMarshallingTests.tt" |
<<<<<<<
private readonly ICultureManager _cultureManager;
private readonly IHttpContextAccessor _httpContextAccessor;
=======
private readonly IAliasStorage _aliasStorage;
>>>>>>>
private readonly ICultureManager _cultureManager;
private readonly IAliasStorage _aliasStorage;
private readonly IHttpContextAccessor _httpContextAccessor;
<<<<<<<
IRouteEvents routeEvents,
ICultureManager cultureManager,
IHttpContextAccessor httpContextAccessor) {
_aliasService = aliasService;
_tokenizer = tokenizer;
_contentDefinitionManager = contentDefinitionManager;
=======
IRouteEvents routeEvents,
IAliasStorage aliasStorage) {
_aliasService = aliasService;
_tokenizer = tokenizer;
_contentDefinitionManager = contentDefinitionManager;
>>>>>>>
IRouteEvents routeEvents,
ICultureManager cultureManager,
IHttpContextAccessor httpContextAccessor,
IAliasStorage aliasStorage) {
_aliasService = aliasService;
_tokenizer = tokenizer;
_contentDefinitionManager = contentDefinitionManager;
<<<<<<<
_cultureManager = cultureManager;
_httpContextAccessor = httpContextAccessor;
Logger = NullLogger.Instance;
T = NullLocalizer.Instance;
=======
_aliasStorage = aliasStorage;
>>>>>>>
_aliasStorage = aliasStorage;
_cultureManager = cultureManager;
_httpContextAccessor = httpContextAccessor;
<<<<<<<
var itemCulture = _cultureManager.GetSiteCulture();
//if we are editing an existing content item
if (part.Record.Id != 0) {
ContentItem contentItem = _contentManager.Get(part.Record.ContentItemRecord.Id);
var aspect = contentItem.As<ILocalizableAspect>();
if (aspect != null) {
itemCulture = aspect.Culture;
}
}
//if we are creating from a form post we use the form value for culture
HttpContextBase context = _httpContextAccessor.Current();
if (context.Request.Form["Localization.SelectedCulture"] != null) {
itemCulture = context.Request.Form["Localization.SelectedCulture"].ToString();
}
string pattern = GetDefaultPattern(part.ContentItem.ContentType, itemCulture).Pattern;
// String.Empty forces pattern based generation. "/" forces homepage
if (part.UseCustomPattern
=======
var pattern = GetDefaultPattern(part.ContentItem.ContentType).Pattern;
// String.Empty forces pattern based generation. "/" forces homepage.
if (part.UseCustomPattern
>>>>>>>
var itemCulture = _cultureManager.GetSiteCulture();
//if we are editing an existing content item
if (part.Record.Id != 0) {
ContentItem contentItem = _contentManager.Get(part.Record.ContentItemRecord.Id);
var aspect = contentItem.As<ILocalizableAspect>();
if (aspect != null) {
itemCulture = aspect.Culture;
}
}
//if we are creating from a form post we use the form value for culture
HttpContextBase context = _httpContextAccessor.Current();
if (context.Request.Form["Localization.SelectedCulture"] != null) {
itemCulture = context.Request.Form["Localization.SelectedCulture"].ToString();
}
string pattern = GetDefaultPattern(part.ContentItem.ContentType, itemCulture).Pattern;
// String.Empty forces pattern based generation. "/" forces homepage.
if (part.UseCustomPattern
<<<<<<<
// removing trailing slashes in case the container is empty, and tokens are base on it (e.g. home page)
while (path.StartsWith("/")) {
=======
// Removing trailing slashes in case the container is empty, and tokens are base on it (e.g. home page).
while (path.StartsWith("/")) {
>>>>>>>
// Removing trailing slashes in case the container is empty, and tokens are base on it (e.g. home page).
while (path.StartsWith("/")) { |
<<<<<<<
namespace Orchard.Environment {
=======
namespace Orchard.Environment {
>>>>>>>
namespace Orchard.Environment {
<<<<<<<
}
}
=======
void ResetSiteCompilation();
}
}
>>>>>>>
} |
<<<<<<<
=======
using Orchard.Users.Drivers;
using Orchard.Users.Events;
>>>>>>>
using Orchard.Users.Events;
<<<<<<<
return _contentManager.Create<UserPart>("User", init =>
{
init.Record.UserName = createUserParams.Username;
init.Record.Email = createUserParams.Email;
init.Record.NormalizedUserName = createUserParams.Username.ToLower();
init.Record.HashAlgorithm = "SHA1";
SetPassword(init.Record, createUserParams.Password);
});
=======
var registrationSettings = CurrentSite.As<RegistrationSettingsPart>();
var user = _contentManager.New<UserPart>(UserPartDriver.ContentType.Name);
user.Record.UserName = createUserParams.Username;
user.Record.Email = createUserParams.Email;
user.Record.NormalizedUserName = createUserParams.Username.ToLower();
user.Record.HashAlgorithm = "SHA1";
SetPassword(user.Record, createUserParams.Password);
if ( registrationSettings != null ) {
user.Record.RegistrationStatus = registrationSettings.UsersAreModerated ? UserStatus.Pending : UserStatus.Approved;
user.Record.EmailStatus = registrationSettings.UsersMustValidateEmail ? UserStatus.Pending : UserStatus.Approved;
}
if(createUserParams.IsApproved) {
user.Record.RegistrationStatus = UserStatus.Approved;
user.Record.EmailStatus = UserStatus.Approved;
}
var userContext = new UserContext {User = user, Cancel = false};
foreach(var userEventHandler in _userEventHandlers) {
userEventHandler.Creating(userContext);
}
if(userContext.Cancel) {
return null;
}
_contentManager.Create(user);
foreach ( var userEventHandler in _userEventHandlers ) {
userEventHandler.Created(userContext);
}
if ( registrationSettings != null && registrationSettings.UsersAreModerated && registrationSettings.NotifyModeration && !createUserParams.IsApproved ) {
var superUser = GetUser(CurrentSite.SuperUser);
if(superUser != null)
_messageManager.Send(superUser.ContentItem.Record, MessageTypes.Moderation);
}
return user;
>>>>>>>
var registrationSettings = CurrentSite.As<RegistrationSettingsPart>();
var user = _contentManager.New<UserPart>("User");
user.Record.UserName = createUserParams.Username;
user.Record.Email = createUserParams.Email;
user.Record.NormalizedUserName = createUserParams.Username.ToLower();
user.Record.HashAlgorithm = "SHA1";
SetPassword(user.Record, createUserParams.Password);
if ( registrationSettings != null ) {
user.Record.RegistrationStatus = registrationSettings.UsersAreModerated ? UserStatus.Pending : UserStatus.Approved;
user.Record.EmailStatus = registrationSettings.UsersMustValidateEmail ? UserStatus.Pending : UserStatus.Approved;
}
if(createUserParams.IsApproved) {
user.Record.RegistrationStatus = UserStatus.Approved;
user.Record.EmailStatus = UserStatus.Approved;
}
var userContext = new UserContext {User = user, Cancel = false};
foreach(var userEventHandler in _userEventHandlers) {
userEventHandler.Creating(userContext);
}
if(userContext.Cancel) {
return null;
}
_contentManager.Create(user);
foreach ( var userEventHandler in _userEventHandlers ) {
userEventHandler.Created(userContext);
}
if ( registrationSettings != null && registrationSettings.UsersAreModerated && registrationSettings.NotifyModeration && !createUserParams.IsApproved ) {
var superUser = GetUser(CurrentSite.SuperUser);
if(superUser != null)
_messageManager.Send(superUser.ContentItem.Record, MessageTypes.Moderation);
}
return user; |
<<<<<<<
public const string GenerateUnmarshallerKey = "generateUnmarshaller";
=======
public const string ExamplesKey = "examples";
>>>>>>>
public const string ExamplesKey = "examples";
public const string GenerateUnmarshallerKey = "generateUnmarshaller"; |
<<<<<<<
if (Options.Clean && !Configuration.IsChildConfig)
=======
this.FilesWrittenToGeneratorFolder.Clear();
if (Options.Clean && this.Configuration.ParentConfig == null)
>>>>>>>
this.FilesWrittenToGeneratorFolder.Clear();
if (Options.Clean && !Configuration.IsChildConfig) |
<<<<<<<
#line 1 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 9 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 9 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 9 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 10 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 10 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 10 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 11 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 11 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 11 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 11 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 11 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 11 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 13 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 13 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 13 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 17 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 17 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 17 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 17 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 17 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 17 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 20 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 21 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 20 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 33 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 29 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 52 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
}
#line default
#line hidden
#line 55 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 52 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
}
#line default
#line hidden
#line 55 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 67 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 57 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 67 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 68 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 58 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 68 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 76 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 66 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 76 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 85 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 75 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 85 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 90 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 80 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 90 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 106 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 93 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["CodeAnalysisServiceFolder"]));
#line default
#line hidden
this.Write(@"\bin\Release\*.dll"" target=""analyzers\dotnet\cs"" exclude=""**\Microsoft.CodeAnalysis.*;**\System.Collections.Immutable.*;**\System.Reflection.Metadata.*;**\System.Composition.*"" />
<file src=""..\..\..\code-analysis\NuGetInstallScripts\*.ps1"" target=""tools\"" />
<file src="".\bin\Release\net35\");
#line 96 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 103 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Session["CodeAnalysisServiceFolder"]));
#line default
#line hidden
this.Write(@"\bin\Release\*.dll"" target=""analyzers\dotnet\cs"" exclude=""**\Microsoft.CodeAnalysis.*;**\System.Collections.Immutable.*;**\System.Reflection.Metadata.*;**\System.Composition.*"" />
<file src=""..\..\..\code-analysis\NuGetInstallScripts\*.ps1"" target=""tools\"" />
<file src="".\bin\Release\net35\");
#line 106 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 107 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 97 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 107 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 108 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 98 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 108 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 110 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 100 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 110 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 111 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 101 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 111 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 112 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 102 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 112 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 118 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 104 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 118 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 119 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 105 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 119 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 120 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 106 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 120 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 121 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 107 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 121 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 128 "C:\git-repros\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 114 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 128 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" |
<<<<<<<
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
=======
// This code was generated by JetBrains T4 Processor
>>>>>>>
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
<<<<<<<
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
=======
#line 1 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("JetBrains.ForTea.TextTemplating", "42.42.42.42")]
>>>>>>>
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
<<<<<<<
#line 6 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 6 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 6 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 11 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 11 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 11 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 14 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 14 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 14 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 25 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 25 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 25 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
this.Write("\t\t[System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Usage\", \"CA1801:Rev" +
"iewUnusedParameters\", MessageId=\"response\")]\r\n");
#line 54 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
this.Write("\t\t[System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Usage\", \"CA1801:ReviewUnusedParameters\", MessageId=\"response\")]\r\n");
#line 54 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
this.Write("\t\t[System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Usage\", \"CA1801:Rev" +
"iewUnusedParameters\", MessageId=\"response\")]\r\n");
#line 54 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 77 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 77 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 77 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 79 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 79 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 79 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 79 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 79 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 79 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
this.Write("Unmarshaller.Instance.Unmarshall(context);\r\n continue;\r\n " +
" }\r\n");
#line 82 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
this.Write("Unmarshaller.Instance.Unmarshall(context);\r\n continue;\r\n }\r\n");
#line 82 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
this.Write("Unmarshaller.Instance.Unmarshall(context);\r\n continue;\r\n " +
" }\r\n");
#line 82 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 90 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 90 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 90 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 93 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 93 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 93 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 99 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 99 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 99 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 104 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 104 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 104 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 105 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 105 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 105 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 110 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 110 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 110 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
this.Write(@" }
}
return;
}
/// <summary>
/// Unmarshaller error response to exception.
/// </summary>
/// <param name=""context""></param>
/// <param name=""innerException""></param>
/// <param name=""statusCode""></param>
/// <returns></returns>
public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
{
ErrorResponse errorResponse = ErrorResponseUnmarshaller.GetInstance().Unmarshall(context);
");
#line 132 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
this.Write(" } \r\n }\r\n\r\n return;\r\n }\r\n\r\n\r\n /// <summary>\r\n /// Unmarshaller error response to exception.\r\n /// </summary> \r\n /// <param name=\"context\"></param>\r\n /// <param name=\"innerException\"></param>\r\n /// <param name=\"statusCode\"></param>\r\n /// <returns></returns>\r\n public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)\r\n {\r\n ErrorResponse errorResponse = ErrorResponseUnmarshaller.GetInstance().Unmarshall(context);\r\n errorResponse.InnerException = innerException;\r\n errorResponse.StatusCode = statusCode;\r\n\r\n var responseBodyBytes = context.GetResponseBodyBytes();\r\n\r\n using (var streamCopy = new MemoryStream(responseBodyBytes))\r\n using (var contextCopy = new XmlUnmarshallerContext(streamCopy, false, null))\r\n {\r\n");
#line 140 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
this.Write(@" }
}
return;
}
/// <summary>
/// Unmarshaller error response to exception.
/// </summary>
/// <param name=""context""></param>
/// <param name=""innerException""></param>
/// <param name=""statusCode""></param>
/// <returns></returns>
public override AmazonServiceException UnmarshallException(XmlUnmarshallerContext context, Exception innerException, HttpStatusCode statusCode)
{
ErrorResponse errorResponse = ErrorResponseUnmarshaller.GetInstance().Unmarshall(context);
errorResponse.InnerException = innerException;
errorResponse.StatusCode = statusCode;
var responseBodyBytes = context.GetResponseBodyBytes();
using (var streamCopy = new MemoryStream(responseBodyBytes))
using (var contextCopy = new XmlUnmarshallerContext(streamCopy, false, null))
{
");
#line 140 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 136 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 144 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 144 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 138 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 146 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 146 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
this.Write("(errorResponse.Message, innerException, errorResponse.Type, errorResponse.Code, e" +
"rrorResponse.RequestId, statusCode);\r\n }\r\n");
#line 140 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
this.Write("Unmarshaller.Instance.Unmarshall(contextCopy, errorResponse);\r\n }\r\n");
#line 148 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
this.Write("Unmarshaller.Instance.Unmarshall(contextCopy, errorResponse);\r\n }\r" +
"\n");
#line 148 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
#line 143 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
#line 152 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
#line 152 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
<<<<<<<
this.Write("(errorResponse.Message, innerException, errorResponse.Type, errorResponse.Code, e" +
"rrorResponse.RequestId, statusCode);\r\n }\r\n");
#line 145 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
=======
this.Write("(errorResponse.Message, innerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, statusCode);\r\n }\r\n");
#line 154 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt"
>>>>>>>
this.Write("(errorResponse.Message, innerException, errorResponse.Type, errorResponse.Code, e" +
"rrorResponse.RequestId, statusCode);\r\n }\r\n");
#line 154 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\AWSQueryResponseUnmarshaller.tt" |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Amazon Cognito Identity. Amazon Cognito is a service that makes it easy to save user data, such as app preferences or game state, in the AWS Cloud without writing any backend code or managing any infrastructure. With Amazon Cognito, you can focus on creating great app experiences instead of having to worry about building and managing a backend solution to handle identity management, network state, storage, and sync.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- Amazon Cognito Identity. Amazon Cognito is a service that makes it easy to save user data, such as app preferences or game state, in the AWS Cloud without writing any backend code or managing any infrastructure. With Amazon Cognito, you can focus on creating great app experiences instead of having to worry about building and managing a backend solution to handle identity management, network state, storage, and sync.")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - Amazon Cognito Identity. Amazon Cognito is a service that makes it easy to save user data, such as app preferences or game state, in the AWS Cloud without writing any backend code or managing any infrastructure. With Amazon Cognito, you can focus on creating great app experiences instead of having to worry about building and managing a backend solution to handle identity management, network state, storage, and sync.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - Amazon Cognito Identity. Amazon Cognito is a service that makes it easy to save user data, such as app preferences or game state, in the AWS Cloud without writing any backend code or managing any infrastructure. With Amazon Cognito, you can focus on creating great app experiences instead of having to worry about building and managing a backend solution to handle identity management, network state, storage, and sync.")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - Amazon Cognito Identity. Amazon Cognito is a service that makes it easy to save user data, such as app preferences or game state, in the AWS Cloud without writing any backend code or managing any infrastructure. With Amazon Cognito, you can focus on creating great app experiences instead of having to worry about building and managing a backend solution to handle identity management, network state, storage, and sync.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - Amazon Cognito Identity. Amazon Cognito is a service that makes it easy to save user data, such as app preferences or game state, in the AWS Cloud without writing any backend code or managing any infrastructure. With Amazon Cognito, you can focus on creating great app experiences instead of having to worry about building and managing a backend solution to handle identity management, network state, storage, and sync.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- Amazon Cognito Identity. Amazon Cognito is a service that makes it easy to save user data, such as app preferences or game state, in the AWS Cloud without writing any backend code or managing any infrastructure. With Amazon Cognito, you can focus on creating great app experiences instead of having to worry about building and managing a backend solution to handle identity management, network state, storage, and sync.")]
<<<<<<<
[assembly: AssemblyVersion("3.2")]
[assembly: AssemblyFileVersion("3.2.2.0")]
=======
[assembly: AssemblyVersion("3.1")]
[assembly: AssemblyFileVersion("3.1.0.7")]
>>>>>>>
[assembly: AssemblyVersion("3.2")]
[assembly: AssemblyFileVersion("3.2.2.0")] |
<<<<<<<
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
=======
// This code was generated by JetBrains T4 Processor
>>>>>>>
// This code was generated by a tool.
// Runtime Version: 16.0.0.0
//
<<<<<<<
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
=======
#line 1 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("JetBrains.ForTea.TextTemplating", "42.42.42.42")]
>>>>>>>
#line 1 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
<<<<<<<
#line 6 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 6 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 6 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 12 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 12 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 12 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 15 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 15 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 15 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 26 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 26 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 26 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 27 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 27 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 27 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 34 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 34 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 34 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 41 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 41 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 41 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 46 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 46 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 46 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
this.Write("\t\t[System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Usage\", \"CA1801:Rev" +
"iewUnusedParameters\", MessageId=\"response\")]\r\n");
#line 51 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
this.Write("\t\t[System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Usage\", \"CA1801:ReviewUnusedParameters\", MessageId=\"response\")]\r\n");
#line 51 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
this.Write("\t\t[System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Usage\", \"CA1801:Rev" +
"iewUnusedParameters\", MessageId=\"response\")]\r\n");
#line 51 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 64 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 64 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 64 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
this.Write("\r\n while (context.Read())\r\n {\r\n\t\t\t\tif (context.IsStartEleme" +
"nt || context.IsAttribute)\r\n {\r\n");
#line 72 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
this.Write("\r\n while (context.Read())\r\n {\r\n\t\t\t\tif (context.IsStartElement || context.IsAttribute)\r\n {\r\n");
#line 72 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
this.Write("\r\n while (context.Read())\r\n {\r\n\t\t\t\tif (context.IsStartEleme" +
"nt || context.IsAttribute)\r\n {\r\n");
#line 72 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 79 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 79 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 79 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 79 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 79 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 79 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 85 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 85 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 85 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 90 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 90 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 90 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 96 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 96 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 96 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 103 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 103 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 103 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 105 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 105 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 105 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 106 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 106 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 106 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 109 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 109 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 109 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 139 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 147 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 147 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 141 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 149 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 149 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
this.Write("(errorResponse.Message, innerException, errorResponse.Type, errorResponse.Code, e" +
"rrorResponse.RequestId, statusCode);\r\n }\r\n");
#line 143 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
this.Write("Unmarshaller.Instance.Unmarshall(contextCopy, errorResponse);\r\n }\r\n");
#line 151 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
this.Write("Unmarshaller.Instance.Unmarshall(contextCopy, errorResponse);\r\n }\r" +
"\n");
#line 151 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
#line 146 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
#line 155 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
#line 155 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
<<<<<<<
this.Write("(errorResponse.Message, innerException, errorResponse.Type, errorResponse.Code, e" +
"rrorResponse.RequestId, statusCode);\r\n }\r\n\r\n");
#line 149 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
=======
this.Write("(errorResponse.Message, innerException, errorResponse.Type, errorResponse.Code, errorResponse.RequestId, statusCode);\r\n }\r\n\r\n");
#line 158 "C:\Dev\Repos\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
>>>>>>>
this.Write("(errorResponse.Message, innerException, errorResponse.Type, errorResponse.Code, e" +
"rrorResponse.RequestId, statusCode);\r\n }\r\n\r\n");
#line 158 "C:\Users\costleya\Work\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt" |
<<<<<<<
#if !PCL && !DNX
=======
#if !PCL && !UNITY
>>>>>>>
#if !PCL && !UNITY && !DNX
<<<<<<<
#if !PCL && !DNX
=======
#if !PCL && !UNITY
>>>>>>>
#if !PCL && !UNITY && !DNX |
<<<<<<<
#if PCL || DNX
=======
#if PCL ||UNITY
>>>>>>>
#if PCL || UNITY || DNX
<<<<<<<
#if PCL || DNX
=======
#if PCL || UNITY
>>>>>>>
#if PCL || UNITY || DNX |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- AWS Directory Service. AWS Directory Service is a managed service that allows you to connect your AWS resources with an existing on-premises Microsoft Active Directory or to set up a new, stand-alone directory in the AWS Cloud.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- AWS Directory Service. AWS Directory Service is a managed service that allows you to connect your AWS resources with an existing on-premises Microsoft Active Directory or to set up a new, stand-alone directory in the AWS Cloud.")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - AWS Directory Service. AWS Directory Service is a managed service that allows you to connect your AWS resources with an existing on-premises Microsoft Active Directory or to set up a new, stand-alone directory in the AWS Cloud.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - AWS Directory Service. AWS Directory Service is a managed service that allows you to connect your AWS resources with an existing on-premises Microsoft Active Directory or to set up a new, stand-alone directory in the AWS Cloud.")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - AWS Directory Service. AWS Directory Service is a managed service that allows you to connect your AWS resources with an existing on-premises Microsoft Active Directory or to set up a new, stand-alone directory in the AWS Cloud.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - AWS Directory Service. AWS Directory Service is a managed service that allows you to connect your AWS resources with an existing on-premises Microsoft Active Directory or to set up a new, stand-alone directory in the AWS Cloud.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- AWS Directory Service. AWS Directory Service is a managed service that allows you to connect your AWS resources with an existing on-premises Microsoft Active Directory or to set up a new, stand-alone directory in the AWS Cloud.")] |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AWS Transfer for SFTP. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AWS Transfer Family. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
#elif PCL
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - AWS Transfer Family. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - AWS Transfer Family. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AWS Transfer Family. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 1.3) - AWS Transfer for SFTP. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 1.3)- AWS Transfer Family. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 1.3) - AWS Transfer Family. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0) - AWS Transfer for SFTP. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
#elif NETCOREAPP31
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (.NET Core 3.1) - AWS Transfer for SFTP. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0)- AWS Transfer Family. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (NetStandard 2.0) - AWS Transfer Family. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
#elif NETCOREAPP31
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (.NET Core 3.1) - AWS Transfer Family. AWS Transfer for SFTP is a fully managed service that enables transfer of secure data over the internet into and out of Amazon S3. SFTP is deeply embedded in data exchange workflows across different industries such as financial services, healthcare, advertising, and retail, among others.")]
<<<<<<<
[assembly: AssemblyFileVersion("3.5.0.0")]
=======
[assembly: AssemblyFileVersion("3.3.106.26")]
>>>>>>>
[assembly: AssemblyFileVersion("3.5.0.0")] |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Amazon Route 53 Domains. Amazon Route 53 is a highly available and scalable cloud Domain Name System (DNS) web service.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- Amazon Route 53 Domains. Amazon Route 53 is a highly available and scalable cloud Domain Name System (DNS) web service.")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - Amazon Route 53 Domains. Amazon Route 53 is a highly available and scalable cloud Domain Name System (DNS) web service.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - Amazon Route 53 Domains. Amazon Route 53 is a highly available and scalable cloud Domain Name System (DNS) web service.")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - Amazon Route 53 Domains. Amazon Route 53 is a highly available and scalable cloud Domain Name System (DNS) web service.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - Amazon Route 53 Domains. Amazon Route 53 is a highly available and scalable cloud Domain Name System (DNS) web service.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- Amazon Route 53 Domains. Amazon Route 53 is a highly available and scalable cloud Domain Name System (DNS) web service.")] |
<<<<<<<
#line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 42 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 42 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 52 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
}
#line default
#line hidden
#line 55 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 62 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
}
#line default
#line hidden
#line 65 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 62 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
}
#line default
#line hidden
#line 65 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 67 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 77 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 77 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 68 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 78 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 78 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 76 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 86 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 86 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 85 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 95 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 95 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 90 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 100 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 100 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 103 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 113 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 113 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 106 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 116 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 116 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 107 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 117 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 117 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 108 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 118 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 118 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 110 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 120 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 120 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 111 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 121 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 121 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 119 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 141 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 129 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
<<<<<<<
#line 120 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
=======
#line 142 "C:\a\merged\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt"
>>>>>>>
#line 130 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\NuGet\Nuspec.tt" |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- AWS Direct Connect. AWS Direct Connect makes it easy to establish a dedicated network connection from your premises to AWS. Using AWS Direct Connect, you can establish private connectivity between AWS and your datacenter, office, or colocation environment, which in many cases can reduce your network costs, increase bandwidth throughput, and provide a more consistent network experience than Internet-based connections.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- AWS Direct Connect. AWS Direct Connect makes it easy to establish a dedicated network connection from your premises to AWS. Using AWS Direct Connect, you can establish private connectivity between AWS and your datacenter, office, or colocation environment, which in many cases can reduce your network costs, increase bandwidth throughput, and provide a more consistent network experience than Internet-based connections.")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - AWS Direct Connect. AWS Direct Connect makes it easy to establish a dedicated network connection from your premises to AWS. Using AWS Direct Connect, you can establish private connectivity between AWS and your datacenter, office, or colocation environment, which in many cases can reduce your network costs, increase bandwidth throughput, and provide a more consistent network experience than Internet-based connections.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - AWS Direct Connect. AWS Direct Connect makes it easy to establish a dedicated network connection from your premises to AWS. Using AWS Direct Connect, you can establish private connectivity between AWS and your datacenter, office, or colocation environment, which in many cases can reduce your network costs, increase bandwidth throughput, and provide a more consistent network experience than Internet-based connections.")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL) - AWS Direct Connect. AWS Direct Connect makes it easy to establish a dedicated network connection from your premises to AWS. Using AWS Direct Connect, you can establish private connectivity between AWS and your datacenter, office, or colocation environment, which in many cases can reduce your network costs, increase bandwidth throughput, and provide a more consistent network experience than Internet-based connections.")]
#elif UNITY
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Unity) - AWS Direct Connect. AWS Direct Connect makes it easy to establish a dedicated network connection from your premises to AWS. Using AWS Direct Connect, you can establish private connectivity between AWS and your datacenter, office, or colocation environment, which in many cases can reduce your network costs, increase bandwidth throughput, and provide a more consistent network experience than Internet-based connections.")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- AWS Direct Connect. AWS Direct Connect makes it easy to establish a dedicated network connection from your premises to AWS. Using AWS Direct Connect, you can establish private connectivity between AWS and your datacenter, office, or colocation environment, which in many cases can reduce your network costs, increase bandwidth throughput, and provide a more consistent network experience than Internet-based connections.")] |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AWS CodeCommit. AWS CodeCommit")]
#elif PCL
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- AWS CodeCommit. AWS CodeCommit")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- AWS CodeCommit. AWS CodeCommit")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AWS CodeCommit. AWS CodeCommit is a fully-managed source control service that makes it easy for companies to host secure and highly scalable private Git repositories.")]
#elif PCL
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Core Runtime")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - AWS CodeCommit. AWS CodeCommit is a fully-managed source control service that makes it easy for companies to host secure and highly scalable private Git repositories.")]
#elif PCL
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- AWS CodeCommit. AWS CodeCommit")]
#elif DNX
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (DNX)- AWS CodeCommit. AWS CodeCommit")]
<<<<<<<
[assembly: AssemblyVersion("3.0")]
[assembly: AssemblyFileVersion("3.0.0.1")]
=======
[assembly: AssemblyVersion("3.1")]
[assembly: AssemblyFileVersion("3.1.0.0")]
>>>>>>>
[assembly: AssemblyVersion("3.1")]
[assembly: AssemblyFileVersion("3.1.0.0")] |
<<<<<<<
if (_instance == null)
{
_instance = new DefaultInstanceProfileAWSCredentials();
// force a fetch of credentials the very first time & schedule a timer task.
_instance.RenewCredentials(null);
}
=======
_instance = new DefaultInstanceProfileAWSCredentials();
>>>>>>>
if (_instance == null)
{
_instance = new DefaultInstanceProfileAWSCredentials();
} |
<<<<<<<
public class ExamplesOperationFilter : IOperationFilter
{
private static IServiceProvider _services;
public ExamplesOperationFilter(IServiceProvider services = null)
{
_services = services;
}
public void Apply(Operation operation, OperationFilterContext context)
{
SetRequestModelExamples(operation, context.SchemaRegistry, context.ApiDescription);
SetResponseModelExamples(operation, context.ApiDescription);
}
public void Apply(Operation operation, SchemaRegistry schemaRegistry, ApiDescription apiDescription)
{
SetRequestModelExamples(operation, schemaRegistry, apiDescription);
SetResponseModelExamples(operation, apiDescription);
}
private static void SetRequestModelExamples(Operation operation, ISchemaRegistry schemaRegistry, ApiDescription apiDescription)
{
var actionAttributes = apiDescription.ActionAttributes();
var swaggerRequestAttributes = actionAttributes.Where(r => r.GetType() == typeof(SwaggerRequestExampleAttribute));
foreach (var attribute in swaggerRequestAttributes)
{
var attr = (SwaggerRequestExampleAttribute)attribute;
var schema = schemaRegistry.GetOrRegister(attr.RequestType);
var request = operation.Parameters.FirstOrDefault(p => p.In == "body"/* && p.schema.@ref == schema.@ref */);
if (request != null)
{
var provider = _services == null
? (IExamplesProvider)Activator.CreateInstance(attr.ExamplesProviderType)
: (IExamplesProvider)_services.GetService(attr.ExamplesProviderType)
?? (IExamplesProvider)Activator.CreateInstance(attr.ExamplesProviderType);
var parts = schema.Ref.Split('/');
var name = parts.Last();
var definitionToUpdate = schemaRegistry.Definitions[name];
if (definitionToUpdate != null)
{
var serializerSettings = new JsonSerializerSettings
{
ContractResolver = attr.ContractResolver,
NullValueHandling = NullValueHandling.Ignore // ignore null values because swagger does not support null objects https://github.com/OAI/OpenAPI-Specification/issues/229
};
definitionToUpdate.Example = ((dynamic)FormatAsJson(provider, serializerSettings))["application/json"];
}
}
}
}
private static void SetResponseModelExamples(Operation operation, ApiDescription apiDescription)
{
var actionAttributes = apiDescription.ActionAttributes();
var swaggerResponseExampleAttributes = actionAttributes.Where(r => r.GetType() == typeof(SwaggerResponseExampleAttribute));
foreach (var attribute in swaggerResponseExampleAttributes)
{
var attr = (SwaggerResponseExampleAttribute)attribute;
var statusCode = attr.StatusCode.ToString();
var response = operation.Responses.FirstOrDefault(r => r.Key == statusCode);
if (response.Equals(default(KeyValuePair<string, Response>)) == false)
{
if (response.Value != null)
{
var provider = _services == null
? (IExamplesProvider)Activator.CreateInstance(attr.ExamplesProviderType)
: (IExamplesProvider)_services.GetService(attr.ExamplesProviderType)
?? (IExamplesProvider)Activator.CreateInstance(attr.ExamplesProviderType);
var serializerSettings = new JsonSerializerSettings { ContractResolver = attr.ContractResolver };
response.Value.Examples = FormatAsJson(provider, serializerSettings);
}
}
}
}
private static object ConvertToDesiredCase(Dictionary<string, object> examples, JsonSerializerSettings serializerSettings)
{
var jsonString = JsonConvert.SerializeObject(examples, serializerSettings);
return JsonConvert.DeserializeObject(jsonString);
}
private static object FormatAsJson(IExamplesProvider provider, JsonSerializerSettings serializerSettings)
{
var examples = new Dictionary<string, object>
{
{
"application/json", provider.GetExamples()
}
};
return ConvertToDesiredCase(examples, serializerSettings);
}
}
=======
public class ExamplesOperationFilter : IOperationFilter
{
public void Apply(Operation operation, OperationFilterContext context)
{
SetRequestModelExamples(operation, context.SchemaRegistry, context.ApiDescription);
SetResponseModelExamples(operation, context.ApiDescription);
}
public void Apply(Operation operation, SchemaRegistry schemaRegistry, ApiDescription apiDescription)
{
SetRequestModelExamples(operation, schemaRegistry, apiDescription);
SetResponseModelExamples(operation, apiDescription);
}
private static void SetRequestModelExamples(Operation operation, ISchemaRegistry schemaRegistry, ApiDescription apiDescription)
{
var actionAttributes = apiDescription.ActionAttributes();
var swaggerRequestAttributes = actionAttributes.Where(r => r.GetType() == typeof(SwaggerRequestExampleAttribute));
foreach (var attribute in swaggerRequestAttributes)
{
var attr = (SwaggerRequestExampleAttribute)attribute;
var schema = schemaRegistry.GetOrRegister(attr.RequestType);
var request = operation.Parameters.FirstOrDefault(p => p.In == "body"/* && p.schema.@ref == schema.@ref */);
if (request != null)
{
var provider = (IExamplesProvider)Activator.CreateInstance(attr.ExamplesProviderType);
var parts = schema.Ref?.Split('/');
if (parts == null)
{
continue;
}
var name = parts.Last();
var definitionToUpdate = schemaRegistry.Definitions[name];
if (definitionToUpdate != null)
{
var serializerSettings = new JsonSerializerSettings
{
ContractResolver = attr.ContractResolver,
NullValueHandling = NullValueHandling.Ignore // ignore null values because swagger does not support null objects https://github.com/OAI/OpenAPI-Specification/issues/229
};
definitionToUpdate.Example = ((dynamic)FormatAsJson(provider, serializerSettings))["application/json"];
}
}
}
}
private static void SetResponseModelExamples(Operation operation, ApiDescription apiDescription)
{
var actionAttributes = apiDescription.ActionAttributes();
var swaggerResponseExampleAttributes = actionAttributes.Where(r => r.GetType() == typeof(SwaggerResponseExampleAttribute));
foreach (var attribute in swaggerResponseExampleAttributes)
{
var attr = (SwaggerResponseExampleAttribute)attribute;
var statusCode = attr.StatusCode.ToString();
var response = operation.Responses.FirstOrDefault(r => r.Key == statusCode);
if (response.Equals(default(KeyValuePair<string, Response>)) == false)
{
if (response.Value != null)
{
var provider = (IExamplesProvider)Activator.CreateInstance(attr.ExamplesProviderType);
var serializerSettings = new JsonSerializerSettings { ContractResolver = attr.ContractResolver, NullValueHandling = NullValueHandling.Ignore };
response.Value.Examples = FormatAsJson(provider, serializerSettings);
}
}
}
}
private static object ConvertToDesiredCase(Dictionary<string, object> examples, JsonSerializerSettings serializerSettings)
{
var jsonString = JsonConvert.SerializeObject(examples, serializerSettings);
return JsonConvert.DeserializeObject(jsonString);
}
private static object FormatAsJson(IExamplesProvider provider, JsonSerializerSettings serializerSettings)
{
var examples = new Dictionary<string, object>
{
{
"application/json", provider.GetExamples()
}
};
return ConvertToDesiredCase(examples, serializerSettings);
}
}
>>>>>>>
public class ExamplesOperationFilter : IOperationFilter
{
private static IServiceProvider _services;
public ExamplesOperationFilter(IServiceProvider services = null)
{
_services = services;
}
public void Apply(Operation operation, OperationFilterContext context)
{
SetRequestModelExamples(operation, context.SchemaRegistry, context.ApiDescription);
SetResponseModelExamples(operation, context.ApiDescription);
}
public void Apply(Operation operation, SchemaRegistry schemaRegistry, ApiDescription apiDescription)
{
SetRequestModelExamples(operation, schemaRegistry, apiDescription);
SetResponseModelExamples(operation, apiDescription);
}
private static void SetRequestModelExamples(Operation operation, ISchemaRegistry schemaRegistry, ApiDescription apiDescription)
{
var actionAttributes = apiDescription.ActionAttributes();
var swaggerRequestAttributes = actionAttributes.Where(r => r.GetType() == typeof(SwaggerRequestExampleAttribute));
foreach (var attribute in swaggerRequestAttributes)
{
var attr = (SwaggerRequestExampleAttribute)attribute;
var schema = schemaRegistry.GetOrRegister(attr.RequestType);
var request = operation.Parameters.FirstOrDefault(p => p.In == "body"/* && p.schema.@ref == schema.@ref */);
if (request != null)
{
var provider = _services == null
? (IExamplesProvider)Activator.CreateInstance(attr.ExamplesProviderType)
: (IExamplesProvider)_services.GetService(attr.ExamplesProviderType)
?? (IExamplesProvider)Activator.CreateInstance(attr.ExamplesProviderType);
var parts = schema.Ref?.Split('/');
if (parts == null)
{
continue;
}
var name = parts.Last();
var definitionToUpdate = schemaRegistry.Definitions[name];
if (definitionToUpdate != null)
{
var serializerSettings = new JsonSerializerSettings
{
ContractResolver = attr.ContractResolver,
NullValueHandling = NullValueHandling.Ignore // ignore null values because swagger does not support null objects https://github.com/OAI/OpenAPI-Specification/issues/229
};
definitionToUpdate.Example = ((dynamic)FormatAsJson(provider, serializerSettings))["application/json"];
}
}
}
}
private static void SetResponseModelExamples(Operation operation, ApiDescription apiDescription)
{
var actionAttributes = apiDescription.ActionAttributes();
var swaggerResponseExampleAttributes = actionAttributes.Where(r => r.GetType() == typeof(SwaggerResponseExampleAttribute));
foreach (var attribute in swaggerResponseExampleAttributes)
{
var attr = (SwaggerResponseExampleAttribute)attribute;
var statusCode = attr.StatusCode.ToString();
var response = operation.Responses.FirstOrDefault(r => r.Key == statusCode);
if (response.Equals(default(KeyValuePair<string, Response>)) == false)
{
if (response.Value != null)
{
var provider = _services == null
? (IExamplesProvider)Activator.CreateInstance(attr.ExamplesProviderType)
: (IExamplesProvider)_services.GetService(attr.ExamplesProviderType)
?? (IExamplesProvider)Activator.CreateInstance(attr.ExamplesProviderType);
var serializerSettings = new JsonSerializerSettings { ContractResolver = attr.ContractResolver, NullValueHandling = NullValueHandling.Ignore };
response.Value.Examples = FormatAsJson(provider, serializerSettings);
}
}
}
}
private static object ConvertToDesiredCase(Dictionary<string, object> examples, JsonSerializerSettings serializerSettings)
{
var jsonString = JsonConvert.SerializeObject(examples, serializerSettings);
return JsonConvert.DeserializeObject(jsonString);
}
private static object FormatAsJson(IExamplesProvider provider, JsonSerializerSettings serializerSettings)
{
var examples = new Dictionary<string, object>
{
{
"application/json", provider.GetExamples()
}
};
return ConvertToDesiredCase(examples, serializerSettings);
}
} |
<<<<<<<
//var s = GenerateSourceXML();
if (plcBlock is FB)
=======
var s = Export(ExportFormat.Xml);
if (s.Contains("<Type>FB</Type>"))
>>>>>>>
if (plcBlock is FB) |
<<<<<<<
public int alarmQueryAlarm_S(byte[] buffer, int length, ref int alarmCount)
{
throw new NotImplementedException();
}
=======
public int daveReadPLCTime(out DateTime dateTime)
{
throw new NotImplementedException();
}
>>>>>>>
public int alarmQueryAlarm_S(byte[] buffer, int length, ref int alarmCount)
{
throw new NotImplementedException();
}
public int daveReadPLCTime(out DateTime dateTime)
{
throw new NotImplementedException();
} |
<<<<<<<
void WriteMultipleStreamsInParallel()
{
Enumerable.Range(1, 50).AsParallel()
.ForAll(streamIndex =>
{
var stream = new Stream(string.Concat(Partition, "-", streamIndex));
Console.WriteLine("Writing to new stream in partition '{0}'", stream.Partition);
var stopwatch = Stopwatch.StartNew();
for (int i = 1; i <= 3; i++)
{
var events = Enumerable.Range(1, 10)
.Select(_ => Event(new InventoryItemCheckedIn(Partition, i * 1000 + streamIndex)))
.ToArray();
var result = Stream.Write(Table, stream, events);
stream = result.Stream;
}
stopwatch.Stop();
Console.WriteLine("Finished writing 300 events to new stream in partition '{0}' in {1}ms", stream.Partition, stopwatch.ElapsedMilliseconds);
});
}
static Event Event(object e)
=======
static EventData Event(object e)
>>>>>>>
void WriteMultipleStreamsInParallel()
{
Enumerable.Range(1, 50).AsParallel()
.ForAll(streamIndex =>
{
var stream = new Stream(string.Concat(Partition, "-", streamIndex));
Console.WriteLine("Writing to new stream in partition '{0}'", stream.Partition);
var stopwatch = Stopwatch.StartNew();
for (int i = 1; i <= 3; i++)
{
var events = Enumerable.Range(1, 10)
.Select(_ => Event(new InventoryItemCheckedIn(Partition, i * 1000 + streamIndex)))
.ToArray();
var result = Stream.Write(Table, stream, events);
stream = result.Stream;
}
stopwatch.Stop();
Console.WriteLine("Finished writing 300 events to new stream in partition '{0}' in {1}ms", stream.Partition, stopwatch.ElapsedMilliseconds);
});
}
static EventData Event(object e) |
<<<<<<<
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
FormAbout about = new FormAbout(CurrentVersion);
about.ShowDialog();
}
=======
private void WarpWorldSettingsToolStripMenuItem_Click(object sender, EventArgs e)
{
if (warpworldForm.IsDisposed)
{
warpworldForm = new FormWarpWorld();
}
warpworldForm.Show();
warpworldForm.BringToFront();
}
>>>>>>>
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
FormAbout about = new FormAbout(CurrentVersion);
about.ShowDialog();
}
private void WarpWorldSettingsToolStripMenuItem_Click(object sender, EventArgs e)
{
if (warpworldForm.IsDisposed)
{
warpworldForm = new FormWarpWorld();
}
warpworldForm.Show();
warpworldForm.BringToFront();
} |
<<<<<<<
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.warpWorldSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
>>>>>>>
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.warpWorldSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
<<<<<<<
=======
// clearLevelFileToolStripMenuItem
//
this.clearLevelFileToolStripMenuItem.Name = "clearLevelFileToolStripMenuItem";
this.clearLevelFileToolStripMenuItem.Size = new System.Drawing.Size(294, 34);
this.clearLevelFileToolStripMenuItem.Text = "Clear Level File";
this.clearLevelFileToolStripMenuItem.Click += new System.EventHandler(this.clearLevelFileToolStripMenuItem_Click_1);
//
>>>>>>>
<<<<<<<
=======
// settingsToolStripMenuItem
//
this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.jSONFileLocationToolStripMenuItem,
this.warpWorldSettingsToolStripMenuItem});
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(92, 29);
this.settingsToolStripMenuItem.Text = "Settings";
//
// jSONFileLocationToolStripMenuItem
//
this.jSONFileLocationToolStripMenuItem.Name = "jSONFileLocationToolStripMenuItem";
this.jSONFileLocationToolStripMenuItem.Size = new System.Drawing.Size(278, 34);
this.jSONFileLocationToolStripMenuItem.Text = "JSON File Location...";
this.jSONFileLocationToolStripMenuItem.Click += new System.EventHandler(this.jSONFileLocationToolStripMenuItem_Click);
//
>>>>>>>
<<<<<<<
// toolStripMenuItem2
//
this.toolStripMenuItem2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.aboutToolStripMenuItem});
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(44, 20);
this.toolStripMenuItem2.Text = "Help";
//
// aboutToolStripMenuItem
//
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
this.aboutToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.aboutToolStripMenuItem.Text = "About";
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
//
=======
// warpWorldSettingsToolStripMenuItem
//
this.warpWorldSettingsToolStripMenuItem.Name = "warpWorldSettingsToolStripMenuItem";
this.warpWorldSettingsToolStripMenuItem.Size = new System.Drawing.Size(278, 34);
this.warpWorldSettingsToolStripMenuItem.Text = "Warp World Settings";
this.warpWorldSettingsToolStripMenuItem.Click += new System.EventHandler(this.WarpWorldSettingsToolStripMenuItem_Click);
//
>>>>>>>
// toolStripMenuItem2
//
this.toolStripMenuItem2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.aboutToolStripMenuItem});
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(44, 20);
this.toolStripMenuItem2.Text = "Help";
//
// settingsToolStripMenuItem
//
this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.warpWorldSettingsToolStripMenuItem});
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(92, 29);
this.settingsToolStripMenuItem.Text = "Settings";
//
// aboutToolStripMenuItem
//
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
this.aboutToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.aboutToolStripMenuItem.Text = "About";
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
// warpWorldSettingsToolStripMenuItem
//
this.warpWorldSettingsToolStripMenuItem.Name = "warpWorldSettingsToolStripMenuItem";
this.warpWorldSettingsToolStripMenuItem.Size = new System.Drawing.Size(278, 34);
this.warpWorldSettingsToolStripMenuItem.Text = "Warp World Settings";
this.warpWorldSettingsToolStripMenuItem.Click += new System.EventHandler(this.WarpWorldSettingsToolStripMenuItem_Click);
//
<<<<<<<
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
=======
private System.Windows.Forms.ToolStripMenuItem warpWorldSettingsToolStripMenuItem;
>>>>>>>
private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem warpWorldSettingsToolStripMenuItem; |
<<<<<<<
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - Amazon DynamoDB Streams. Amazon DynamoDB Streams")]
#elif (WIN_RT && WINDOWS_PHONE)
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Portable)- Amazon DynamoDB Streams. Amazon DynamoDB Streams")]
#elif WIN_RT
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Windows RT) - Amazon DynamoDB Streams. Amazon DynamoDB Streams")]
#elif WINDOWS_PHONE
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (Windows Phone 8)- Amazon DynamoDB Streams. Amazon DynamoDB Streams")]
=======
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - Amazon DynamoDB. Amazon DynamoDB is a fast and flexible NoSQL database service for all applications that need consistent, single-digit millisecond latency at any scale.")]
#elif PCL
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Core Runtime")]
>>>>>>>
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (4.5) - Amazon DynamoDB Streams. Amazon DynamoDB Streams")]
#elif PCL
[assembly: AssemblyDescription("The Amazon Web Services SDK for .NET (PCL)- Core Runtime")] |
<<<<<<<
using NAudio.Wave;
using DSharpPlus.Interactivity;
=======
//using NAudio.Wave;
>>>>>>>
//using NAudio.Wave;
using DSharpPlus.Interactivity; |
<<<<<<<
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
=======
var siteContext = generator.BuildContext(@"C:\TestSite", false);
>>>>>>>
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
<<<<<<<
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
=======
var siteContext = generator.BuildContext(@"C:\TestSite", false);
>>>>>>>
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
<<<<<<<
[Fact(Skip = "The call to SanityCheck can provoke some errors")]
public void file_with_1_ioexception_is_processed_and_have_no_metadata()
{
// arrange
string filePath = Path.Combine(Path.GetTempPath(), "SomeFile.md");
bool alreadyOccured = false;
var fileSubstitute = Substitute.For<FileBase>();
fileSubstitute.OpenText(Arg.Any<string>()).Returns(x =>
{
if (alreadyOccured)
{
return new StreamReader(new MemoryStream(0));
}
else
{
alreadyOccured = true;
throw new IOException();
}
});
fileSubstitute.Exists(filePath).Returns(true);
var directorySubstitute = Substitute.For<DirectoryBase>();
directorySubstitute.GetFiles(Arg.Any<string>(), "*.*", SearchOption.AllDirectories).Returns(new[] { @"C:\TestSite\SomeFile.md" });
var fileInfoSubstitute = Substitute.For<FileInfoBase>();
fileInfoSubstitute.Name.Returns("SomeFile.md");
var fileInfoFactorySubstitute = Substitute.For<IFileInfoFactory>();
fileInfoFactorySubstitute.FromFileName(Arg.Any<string>()).Returns(fileInfoSubstitute);
var fileSystemSubstitute = Substitute.For<System.IO.Abstractions.IFileSystem>();
fileSystemSubstitute.File.Returns(fileSubstitute);
fileSystemSubstitute.Directory.Returns(directorySubstitute);
fileSystemSubstitute.FileInfo.Returns(fileInfoFactorySubstitute);
var generator = new SiteContextGenerator(fileSystemSubstitute, Enumerable.Empty<IContentTransform>());
// act
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
// assert
Assert.Equal(1, siteContext.Pages.Count);
Assert.Equal(0, siteContext.Pages[0].Bag.Count);
// Check if the temp file have been deleted
fileSubstitute.Received().Delete(filePath);
}
[Fact(Skip = "The call to SanityCheck can provoke some errors")]
public void file_with_2_ioexception_is_not_processed_and_throw_ioexception()
{
// arrange
string filePath = Path.Combine(Path.GetTempPath(), "SomeFile.md");
var fileSubstitute = Substitute.For<FileBase>();
fileSubstitute.OpenText(Arg.Any<string>()).Returns(x =>
{
throw new IOException();
});
fileSubstitute.Exists(filePath).Returns(true);
var directorySubstitute = Substitute.For<DirectoryBase>();
directorySubstitute.GetFiles(Arg.Any<string>(), "*.*", SearchOption.AllDirectories).Returns(new[] { @"C:\TestSite\SomeFile.md" });
var fileInfoSubstitute = Substitute.For<FileInfoBase>();
fileInfoSubstitute.Name.Returns("SomeFile.md");
var fileInfoFactorySubstitute = Substitute.For<IFileInfoFactory>();
fileInfoFactorySubstitute.FromFileName(Arg.Any<string>()).Returns(fileInfoSubstitute);
var fileSystemSubstitute = Substitute.For<System.IO.Abstractions.IFileSystem>();
fileSystemSubstitute.File.Returns(fileSubstitute);
fileSystemSubstitute.Directory.Returns(directorySubstitute);
fileSystemSubstitute.FileInfo.Returns(fileInfoFactorySubstitute);
var generator = new SiteContextGenerator(fileSystemSubstitute, Enumerable.Empty<IContentTransform>());
// act & assert
Assert.Throws<IOException>(() => generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false));
// Check if the temp file have been deleted
fileSubstitute.Received().Delete(filePath);
}
=======
>>>>>>>
<<<<<<<
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
=======
var siteContext = generator.BuildContext(@"C:\TestSite", false);
>>>>>>>
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
<<<<<<<
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
=======
var siteContext = generator.BuildContext(@"C:\TestSite", false);
>>>>>>>
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
<<<<<<<
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
=======
var siteContext = generator.BuildContext(@"C:\TestSite", false);
>>>>>>>
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
<<<<<<<
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false);
=======
var siteContext = generator.BuildContext(@"C:\TestSite", false);
>>>>>>>
var siteContext = generator.BuildContext(@"C:\TestSite", @"C:\TestSite\_site", false); |
<<<<<<<
public Recipe(IFileSystem fileSystem, string engine, string directory, IEnumerable<IAdditionalIngredient> additionalIngredients)
=======
public Recipe(IFileSystem fileSystem, string engine, string directory, bool withProject)
>>>>>>>
public Recipe(IFileSystem fileSystem, string engine, string directory, IEnumerable<IAdditionalIngredient> additionalIngredients, bool withProject)
<<<<<<<
this.additionalIngredients = additionalIngredients;
=======
this.withProject = withProject;
>>>>>>>
this.additionalIngredients = additionalIngredients;
this.withProject = withProject;
<<<<<<<
private readonly IEnumerable<IAdditionalIngredient> additionalIngredients;
=======
private readonly bool withProject;
>>>>>>>
private readonly IEnumerable<IAdditionalIngredient> additionalIngredients;
private readonly bool withProject; |
<<<<<<<
private const string PageContents = "---\r\ntest: value\r\n---#{{ page.title }}\r\n{% include foobar.html %}";
private const string IncludePageContents = "foo {{ page.test }} bar";
private const string ExpectedfileContents = "<h1>My Web Site</h1><p>foo value bar</p>";
=======
const string PageContents = "---\r\ntest: value\r\n---# {{ page.title }}\r\n{% include foobar.html %}";
const string IncludePageContents = "foo {{ page.test }} bar";
const string ExpectedfileContents = "<h1>My Web Site</h1><p>foo value bar</p>";
>>>>>>>
private const string PageContents = "---\r\ntest: value\r\n---# {{ page.title }}\r\n{% include foobar.html %}";
private const string IncludePageContents = "foo {{ page.test }} bar";
private const string ExpectedfileContents = "<h1>My Web Site</h1><p>foo value bar</p>";
<<<<<<<
private const string PageContents = "---\r\ntest: value\r\n---#{{ page.title }}\r\n{% include foobar.html %}";
private const string ExpectedfileContents = "<h1>My Web Site</h1><p></p>";
=======
const string PageContents = "---\r\ntest: value\r\n---# {{ page.title }}\r\n{% include foobar.html %}";
const string ExpectedfileContents = "<h1>My Web Site</h1><p></p>";
>>>>>>>
private const string PageContents = "---\r\ntest: value\r\n---# {{ page.title }}\r\n{% include foobar.html %}";
private const string ExpectedfileContents = "<h1>My Web Site</h1><p></p>";
<<<<<<<
private const string PageContents = "---\r\npermalink: /pages/\r\n---#{{ page.title }}";
private const string ExpectedfileContents = "<h1>My Web Site</h1>";
=======
const string PageContents = "---\r\npermalink: /pages/\r\n---# {{ page.title }}";
const string ExpectedfileContents = "<h1>My Web Site</h1>";
>>>>>>>
private const string PageContents = "---\r\npermalink: /pages/\r\n---# {{ page.title }}";
private const string ExpectedfileContents = "<h1>My Web Site</h1>";
<<<<<<<
public class Given_Engin_Has_Custom_Tag : BakingEnvironment<LiquidEngine>
{
private const string PageContent = "---\r\n \r\n---\r\n{% customtag %}";
private const string ExpectedPageContents = "<p>custom tag</p>";
public override LiquidEngine Given()
{
return new LiquidEngine();
}
public override void When()
{
FileSystem.AddFile(@"C:\website\index.md", new MockFileData(PageContent));
var generator = new SiteContextGenerator(FileSystem, Enumerable.Empty<IContentTransform>());
var context = generator.BuildContext(@"C:\website\", false);
Subject.FileSystem = FileSystem;
Subject.Tags = new List<DotLiquid.Tag> { new CustomTag() };
Subject.Process(context);
}
[Fact]
public void Page_should_contain_custom_tag()
{
Assert.Equal(ExpectedPageContents, FileSystem.File.ReadAllText(@"C:\website\_site\index.html").RemoveWhiteSpace());
}
public class CustomTag : DotLiquid.Tag
{
public override void Render(DotLiquid.Context context, TextWriter result)
{
result.WriteLine("custom tag");
}
}
}
=======
public class Given_Page_Has_Code_Block : BakingEnvironment<LiquidEngine>
{
const string PageContents = "---\r\n layout: nil \r\n---\r\n\r\n```cs\r\nMy code1\r\nMy code2\r\n```\r\n";
const string ExpectedfileContents = "<pre><code class=\"language-cs\">My code1My code2</code></pre>";
public override LiquidEngine Given()
{
var engine = new LiquidEngine();
engine.Initialize();
return engine;
}
public override void When()
{
FileSystem.AddFile(@"C:\website\index.md", new MockFileData(PageContents));
var generator = new SiteContextGenerator(FileSystem, Enumerable.Empty<IContentTransform>());
var context = generator.BuildContext(@"C:\website\", false);
Subject.FileSystem = FileSystem;
Subject.Process(context);
}
[Fact]
public void The_Filter_And_Block_Have_Been_Correctly_Interpreted()
{
Assert.Equal(ExpectedfileContents, FileSystem.File.ReadAllText(@"C:\website\_site\index.html").RemoveWhiteSpace());
}
}
>>>>>>>
public class Given_Engin_Has_Custom_Tag : BakingEnvironment<LiquidEngine>
{
private const string PageContent = "---\r\n \r\n---\r\n{% customtag %}";
private const string ExpectedPageContents = "<p>custom tag</p>";
public override LiquidEngine Given()
{
return new LiquidEngine();
}
public override void When()
{
FileSystem.AddFile(@"C:\website\index.md", new MockFileData(PageContent));
var generator = new SiteContextGenerator(FileSystem, Enumerable.Empty<IContentTransform>());
var context = generator.BuildContext(@"C:\website\", false);
Subject.FileSystem = FileSystem;
Subject.Tags = new List<DotLiquid.Tag> { new CustomTag() };
Subject.Process(context);
}
[Fact]
public void Page_should_contain_custom_tag()
{
Assert.Equal(ExpectedPageContents, FileSystem.File.ReadAllText(@"C:\website\_site\index.html").RemoveWhiteSpace());
}
public class CustomTag : DotLiquid.Tag
{
public override void Render(DotLiquid.Context context, TextWriter result)
{
result.WriteLine("custom tag");
}
}
}
public class Given_Page_Has_Code_Block : BakingEnvironment<LiquidEngine>
{
private const string PageContents = "---\r\n layout: nil \r\n---\r\n\r\n```cs\r\nMy code1\r\nMy code2\r\n```\r\n";
private const string ExpectedfileContents = "<pre><code class=\"language-cs\">My code1My code2</code></pre>";
public override LiquidEngine Given()
{
var engine = new LiquidEngine();
engine.Initialize();
return engine;
}
public override void When()
{
FileSystem.AddFile(@"C:\website\index.md", new MockFileData(PageContents));
var generator = new SiteContextGenerator(FileSystem, Enumerable.Empty<IContentTransform>());
var context = generator.BuildContext(@"C:\website\", false);
Subject.FileSystem = FileSystem;
Subject.Process(context);
}
[Fact]
public void The_Filter_And_Block_Have_Been_Correctly_Interpreted()
{
Assert.Equal(ExpectedfileContents, FileSystem.File.ReadAllText(@"C:\website\_site\index.html").RemoveWhiteSpace());
}
}
public class Given_Page_Has_HTML_Code_Block : BakingEnvironment<LiquidEngine>
{
private const string PageContents = "---\r\n layout: nil \r\n---\r\n\r\n```html\r\n<span>word</span>\r\n```\r\n";
private const string ExpectedfileContents = "<pre><code class=\"language-html\"><span>word</span></code></pre>";
public override LiquidEngine Given()
{
var engine = new LiquidEngine();
engine.Initialize();
return engine;
}
public override void When()
{
FileSystem.AddFile(@"C:\website\index.md", new MockFileData(PageContents));
var generator = new SiteContextGenerator(FileSystem, Enumerable.Empty<IContentTransform>());
var context = generator.BuildContext(@"C:\website\", false);
Subject.FileSystem = FileSystem;
Subject.Process(context);
}
[Fact]
public void The_Filter_And_Block_Have_Been_Correctly_Interpreted()
{
Assert.Equal(ExpectedfileContents, FileSystem.File.ReadAllText(@"C:\website\_site\index.html").RemoveWhiteSpace());
}
} |
<<<<<<<
private readonly IFileSystem _fileSystem;
private IEnumerable<FileInfo> _files;
private string _outputPath;
=======
private readonly static Regex IMPORT_PATTERN = new Regex(@"@import +url\(([""']){0,1}(.*?)\1{0,1}\);", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private readonly IFileSystem fileSystem;
private readonly IEnumerable<FileInfo> files;
private readonly string outputPath;
>>>>>>>
private readonly IFileSystem fileSystem;
private readonly IEnumerable<FileInfo> files;
private readonly string outputPath; |
<<<<<<<
public class Given_Page_And_Posts_Have_Custom_Metadatas : BakingEnvironment<LiquidEngine>
{
const string Page1Contents = "---\r\n title: index\r\n show: true \r\n---\r\n\r\n{% for post in site.posts %}\r\n{{ post.title }}/{{ post.show }}-\r\n{% endfor %}";
const string ExpectedPage1Contents = "<p>post2/false-post1/true-</p>";
const string Page2Contents = "---\r\n title: pages\r\n show: false \r\n---\r\n\r\n{% for page in site.pages %}\r\n{{ page.title }}/{{ page.show }}-\r\n{% endfor %}";
const string ExpectedPage2Contents = "<p>index/true-pages/false-</p>";
const string Post1Contents = "---\r\n title: post1\r\n show: true \r\n---\r\n# Title1\r\nContent1";
const string Post2Contents = "---\r\n title: post2\r\n show: false \r\n---\r\n# Title2\r\nContent2";
public override LiquidEngine Given()
{
var engine = new LiquidEngine();
engine.Initialize();
return engine;
}
public override void When()
{
FileSystem.AddFile(@"C:\website\index.md", new MockFileData(Page1Contents));
FileSystem.AddFile(@"C:\website\pages.md", new MockFileData(Page2Contents));
FileSystem.AddFile(@"C:\website\_posts\2015-02-02-post1.md", new MockFileData(Post1Contents));
FileSystem.AddFile(@"C:\website\_posts\2015-02-03-post2.md", new MockFileData(Post2Contents));
var generator = new SiteContextGenerator(FileSystem, Enumerable.Empty<IContentTransform>());
var context = generator.BuildContext(@"C:\website\", false);
Subject.FileSystem = FileSystem;
Subject.Process(context);
}
[Fact]
public void Pages_And_Posts_Should_Have_The_Metadatas_Displayed()
{
Assert.Equal(ExpectedPage1Contents, FileSystem.File.ReadAllText(@"C:\website\_site\index.html").RemoveWhiteSpace());
Assert.Equal(ExpectedPage2Contents, FileSystem.File.ReadAllText(@"C:\website\_site\pages.html").RemoveWhiteSpace());
}
}
=======
public class Given_Page_Has_Category : BakingEnvironment<LiquidEngine>
{
private SiteContext Context;
const string ContentWithCategory = "---\r\n category: mycategory \r\n---\r\n";
public override LiquidEngine Given()
{
return new LiquidEngine();
}
public override void When()
{
FileSystem.AddFile(@"C:\website\_posts\ContentWithCategory.md", new MockFileData(ContentWithCategory));
var generator = new SiteContextGenerator(FileSystem, Enumerable.Empty<IContentTransform>());
Context = generator.BuildContext(@"C:\website\", false);
Subject.FileSystem = FileSystem;
}
[Fact]
public void Layout_With_Bad_Header_Should_Not_Throw_Exception()
{
Assert.Equal(Context.Posts.Count, 1);
Assert.Equal(Context.Posts[0].Categories.Count(), 1);
Assert.Equal(Context.Posts[0].Categories.First(), "mycategory");
}
}
>>>>>>>
public class Given_Page_And_Posts_Have_Custom_Metadatas : BakingEnvironment<LiquidEngine>
{
const string Page1Contents = "---\r\n title: index\r\n show: true \r\n---\r\n\r\n{% for post in site.posts %}\r\n{{ post.title }}/{{ post.show }}-\r\n{% endfor %}";
const string ExpectedPage1Contents = "<p>post2/false-post1/true-</p>";
const string Page2Contents = "---\r\n title: pages\r\n show: false \r\n---\r\n\r\n{% for page in site.pages %}\r\n{{ page.title }}/{{ page.show }}-\r\n{% endfor %}";
const string ExpectedPage2Contents = "<p>index/true-pages/false-</p>";
const string Post1Contents = "---\r\n title: post1\r\n show: true \r\n---\r\n# Title1\r\nContent1";
const string Post2Contents = "---\r\n title: post2\r\n show: false \r\n---\r\n# Title2\r\nContent2";
public override LiquidEngine Given()
{
var engine = new LiquidEngine();
engine.Initialize();
return engine;
}
public override void When()
{
FileSystem.AddFile(@"C:\website\index.md", new MockFileData(Page1Contents));
FileSystem.AddFile(@"C:\website\pages.md", new MockFileData(Page2Contents));
FileSystem.AddFile(@"C:\website\_posts\2015-02-02-post1.md", new MockFileData(Post1Contents));
FileSystem.AddFile(@"C:\website\_posts\2015-02-03-post2.md", new MockFileData(Post2Contents));
var generator = new SiteContextGenerator(FileSystem, Enumerable.Empty<IContentTransform>());
var context = generator.BuildContext(@"C:\website\", false);
Subject.FileSystem = FileSystem;
Subject.Process(context);
}
[Fact]
public void Pages_And_Posts_Should_Have_The_Metadatas_Displayed()
{
Assert.Equal(ExpectedPage1Contents, FileSystem.File.ReadAllText(@"C:\website\_site\index.html").RemoveWhiteSpace());
Assert.Equal(ExpectedPage2Contents, FileSystem.File.ReadAllText(@"C:\website\_site\pages.html").RemoveWhiteSpace());
}
}
public class Given_Page_Has_Category : BakingEnvironment<LiquidEngine>
{
private SiteContext Context;
const string ContentWithCategory = "---\r\n category: mycategory \r\n---\r\n";
public override LiquidEngine Given()
{
return new LiquidEngine();
}
public override void When()
{
FileSystem.AddFile(@"C:\website\_posts\ContentWithCategory.md", new MockFileData(ContentWithCategory));
var generator = new SiteContextGenerator(FileSystem, Enumerable.Empty<IContentTransform>());
Context = generator.BuildContext(@"C:\website\", false);
Subject.FileSystem = FileSystem;
}
[Fact]
public void Layout_With_Bad_Header_Should_Not_Throw_Exception()
{
Assert.Equal(Context.Posts.Count, 1);
Assert.Equal(Context.Posts[0].Categories.Count(), 1);
Assert.Equal(Context.Posts[0].Categories.First(), "mycategory");
}
} |
<<<<<<<
public BasicAuthPage GoToBasicAuthPage()
{
this.Driver.GetElement(this.linkLocator.Evaluate("basic_auth")).Click();
return new BasicAuthPage(this.DriverContext);
}
=======
public MultipleWindowsPage GoToMultipleWindowsPage()
{
this.Driver.GetElement(this.linkLocator.Evaluate("windows")).Click();
return new MultipleWindowsPage(this.DriverContext);
}
public void PressDownKey(string key)
{
switch (key.ToLower(CultureInfo.InvariantCulture))
{
case "esc":
this.Driver.Actions().KeyDown(Keys.Escape);
break;
case "f2":
this.Driver.Actions().KeyDown(Keys.F2);
break;
case "1":
this.Driver.Actions().KeyDown(Keys.NumberPad1);
break;
case "tab":
this.Driver.Actions().KeyDown(Keys.Tab);
break;
}
this.Driver.Actions().KeyDown(Keys.Escape);
}
>>>>>>>
public MultipleWindowsPage GoToMultipleWindowsPage()
{
this.Driver.GetElement(this.linkLocator.Evaluate("windows")).Click();
return new MultipleWindowsPage(this.DriverContext);
}
public void PressDownKey(string key)
{
switch (key.ToLower(CultureInfo.InvariantCulture))
{
case "esc":
this.Driver.Actions().KeyDown(Keys.Escape);
break;
case "f2":
this.Driver.Actions().KeyDown(Keys.F2);
break;
case "1":
this.Driver.Actions().KeyDown(Keys.NumberPad1);
break;
case "tab":
this.Driver.Actions().KeyDown(Keys.Tab);
break;
}
this.Driver.Actions().KeyDown(Keys.Escape);
}
public BasicAuthPage GoToBasicAuthPage()
{
this.Driver.GetElement(this.linkLocator.Evaluate("basic_auth")).Click();
return new BasicAuthPage(this.DriverContext);
}
<<<<<<<
private string GetUrlValueWithUserCredentials()
{
return string.Format(
CultureInfo.CurrentCulture,
"{0}://{1}:{2}@{3}{4}",
BaseConfiguration.Protocol,
BaseConfiguration.Username,
BaseConfiguration.Password,
BaseConfiguration.Host,
BaseConfiguration.Url);
}
=======
>>>>>>>
private string GetUrlValueWithUserCredentials()
{
return string.Format(
CultureInfo.CurrentCulture,
"{0}://{1}:{2}@{3}{4}",
BaseConfiguration.Protocol,
BaseConfiguration.Username,
BaseConfiguration.Password,
BaseConfiguration.Host,
BaseConfiguration.Url);
} |
<<<<<<<
if (!(dependencyObject is MultiSelectComboBox control))
return;
=======
if (!(dependencyObject is MultiSelectComboBox control))
{
return;
}
if (control.MultiSelectComboBoxGrid == null)
{
return;
}
>>>>>>>
if (!(dependencyObject is MultiSelectComboBox control))
{
return;
} |
<<<<<<<
/// <para>Defines that the client should attempt to reconnect indefinitely.</para>
/// <para>This is typically a very bad idea to set to <c>true</c>, as it will swallow all connection errors.</para>
/// <para>Defaults to false.</para>
/// </summary>
public bool ReconnectIndefinitely { internal get; set; } = false;
/// <summary>
=======
/// <para>Sets the timeout for HTTP requests</para>
/// <para>Defaults to 10 seconds. Set to <see cref="System.Threading.Timeout.InfiniteTimeSpan"/> to disable timeouts.</para>
/// </summary>
public TimeSpan HttpTimeout { internal get; set; } = TimeSpan.FromSeconds(10);
/// <summary>
>>>>>>>
/// <para>Defines that the client should attempt to reconnect indefinitely.</para>
/// <para>This is typically a very bad idea to set to <c>true</c>, as it will swallow all connection errors.</para>
/// <para>Defaults to false.</para>
/// </summary>
public bool ReconnectIndefinitely { internal get; set; } = false;
/// <summary>
/// <para>Sets the timeout for HTTP requests</para>
/// <para>Defaults to 10 seconds. Set to <see cref="System.Threading.Timeout.InfiniteTimeSpan"/> to disable timeouts.</para>
/// </summary>
public TimeSpan HttpTimeout { internal get; set; } = TimeSpan.FromSeconds(10);
/// <summary>
<<<<<<<
this.ReconnectIndefinitely = other.ReconnectIndefinitely;
=======
this.Proxy = other.Proxy;
this.HttpTimeout = other.HttpTimeout;
>>>>>>>
this.ReconnectIndefinitely = other.ReconnectIndefinitely;
this.Proxy = other.Proxy;
this.HttpTimeout = other.HttpTimeout; |
<<<<<<<
if (MessageBox.Show(this,
"The command to run git is not configured correct." + Environment.NewLine +
"You need to set the correct path to be able to use GitExtensions." + Environment.NewLine +
Environment.NewLine + "Do you want to set the correct command now?", "Incorrect path",
=======
if (
MessageBox.Show(this, _cantFindGitMessage.Text, _cantFindGitMessageCaption.Text,
>>>>>>>
if (MessageBox.Show(this, _cantFindGitMessage.Text, _cantFindGitMessageCaption.Text,
<<<<<<<
if (MessageBox.Show(this,
"There is no difftool configured. Do you want to configure kdiff3 as your difftool?" +
Environment.NewLine + "Select no if you want to configure a different difftool yourself.",
"Mergetool", MessageBoxButtons.YesNo) == DialogResult.Yes)
=======
if (
MessageBox.Show(this, _noDiffTool2Configured.Text, _noDiffTool2ConfiguredCaption.Text,
MessageBoxButtons.YesNo) == DialogResult.Yes)
>>>>>>>
if (MessageBox.Show(this, _noDiffTool2Configured.Text, _noDiffTool2ConfiguredCaption.Text,
MessageBoxButtons.YesNo) == DialogResult.Yes)
<<<<<<<
MessageBox.Show(this, "Path to kdiff3 could not be found automatically." + Environment.NewLine +
"Please make sure KDiff3 is installed or set path manually.");
tabControl1.SelectTab("tpGlobalSettings");
=======
MessageBox.Show(this, _kdiff3NotFoundAuto.Text);
tabControl1.SelectTab("GlobalSettingsPage");
>>>>>>>
MessageBox.Show(this, _kdiff3NotFoundAuto.Text);
tabControl1.SelectTab("tpGlobalSettings");
<<<<<<<
MessageBox.Show(this, "Path to kdiff3 could not be found automatically." + Environment.NewLine +
"Please make sure KDiff3 is installed or set path manually.");
tabControl1.SelectTab("tpGlobalSettings");
=======
MessageBox.Show(this, _kdiff3NotFoundAuto.Text);
tabControl1.SelectTab("GlobalSettingsPage");
>>>>>>>
MessageBox.Show(this, _kdiff3NotFoundAuto.Text);
tabControl1.SelectTab("tpGlobalSettings");
<<<<<<<
MessageBox.Show(this,
"The path to linux tools (sh) could not be found automatically." + Environment.NewLine +
"Please make sure there are linux tools installed (through msysgit or cygwin) or set the correct path manually.",
"Locate linux tools");
tabControl1.SelectTab("tpGit");
=======
MessageBox.Show(this, _linuxToolsShNotFound.Text, _linuxToolsShNotFoundCaption.Text);
tabControl1.SelectTab("TabPageGit");
>>>>>>>
MessageBox.Show(this, _linuxToolsShNotFound.Text, _linuxToolsShNotFoundCaption.Text);
tabControl1.SelectTab("tpGit");
<<<<<<<
=======
private void BrowseMergeTool_Click(object sender, EventArgs e)
{
if (GlobalMergeTool.Text.Equals("kdiff3", StringComparison.CurrentCultureIgnoreCase))
{
MergetoolPath.Text = SelectFile(".", "kdiff3.exe (kdiff3.exe)|kdiff3.exe", MergetoolPath.Text);
}
else if (GlobalMergeTool.Text.Equals("p4merge", StringComparison.CurrentCultureIgnoreCase))
MergetoolPath.Text = SelectFile(".", "p4merge.exe (p4merge.exe)|p4merge.exe", MergetoolPath.Text);
else if (GlobalMergeTool.Text.Equals("TortoiseMerge", StringComparison.CurrentCultureIgnoreCase))
MergetoolPath.Text = SelectFile(".", "TortoiseMerge.exe (TortoiseMerge.exe)|TortoiseMerge.exe",
MergetoolPath.Text);
else
MergetoolPath.Text = SelectFile(".", "*.exe (*.exe)|*.exe", MergetoolPath.Text);
}
private void MergeToolCmdSuggest_Click(object sender, EventArgs e)
{
if (!Settings.RunningOnWindows())
return;
if (GlobalMergeTool.Text.Equals("kdiff3", StringComparison.CurrentCultureIgnoreCase))
{
string kdiff3path = Settings.Module.GetGlobalSetting("mergetool.kdiff3.path");
string regkdiff3path = GetRegistryValue(Registry.LocalMachine, "SOFTWARE\\KDiff3", "") + "\\kdiff3.exe";
MergetoolPath.Text = FindFileInFolders("kdiff3.exe", kdiff3path,
@"c:\Program Files\KDiff3\",
@"c:\Program Files (x86)\KDiff3\",
regkdiff3path);
}
else if (GlobalMergeTool.Text.Equals("winmerge", StringComparison.CurrentCultureIgnoreCase))
{
string winmergepath = Settings.Module.GetGlobalSetting("mergetool.winmerge.path");
MergetoolPath.Text = FindFileInFolders("winmergeu.exe", winmergepath,
@"c:\Program Files\winmerge\",
@"c:\Program Files (x86)\winmerge\");
}
AutoConfigMergeToolcmd();
}
private static string FindFileInFolders(string fileName, params string[] locations)
{
foreach (string location in locations)
{
if (!string.IsNullOrEmpty(location) && File.Exists(location))
return location;
if (!string.IsNullOrEmpty(location) && File.Exists(location + fileName))
return location + fileName;
if (!string.IsNullOrEmpty(location) && File.Exists(location + "\\" + fileName))
return location + "\\" + fileName;
}
return "";
}
private void AutoConfigMergeToolcmd()
{
if (GlobalMergeTool.Text.Equals("BeyondCompare3", StringComparison.CurrentCultureIgnoreCase))
{
if (MergetoolPath.Text.Contains("kdiff3") || MergetoolPath.Text.Contains("TortoiseMerge"))
MergetoolPath.Text = "";
if (string.IsNullOrEmpty(MergetoolPath.Text) || !File.Exists(MergetoolPath.Text))
{
MergetoolPath.Text = @"C:\Program Files\Beyond Compare 3\bcomp.exe";
MergetoolPath.Text = FindFileInFolders("bcomp.exe",
@"C:\Program Files\Beyond Compare 3 (x86)\",
@"C:\Program Files\Beyond Compare 3\");
if (!File.Exists(MergetoolPath.Text))
{
MergetoolPath.Text = "";
MessageBox.Show(this, _setPathForBeyondCompare.Text, _setPathForBeyondCompareCaption.Text);
return;
}
}
MergeToolCmd.Text = "\"" + MergetoolPath.Text + "\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"";
return;
}
if (GlobalMergeTool.Text.Equals("p4merge", StringComparison.CurrentCultureIgnoreCase))
{
if (MergetoolPath.Text.Contains("kdiff3") || MergetoolPath.Text.Contains("TortoiseMerge"))
MergetoolPath.Text = "";
if (string.IsNullOrEmpty(MergetoolPath.Text) || !File.Exists(MergetoolPath.Text))
{
MergetoolPath.Text = @"c:\Program Files\Perforce\p4merge.exe";
MergetoolPath.Text = FindFileInFolders("p4merge.exe",
@"c:\Program Files (x86)\Perforce\",
@"c:\Program Files\Perforce\");
if (!File.Exists(MergetoolPath.Text))
{
MergetoolPath.Text = "";
MessageBox.Show(this, _setPathForP4Merge.Text, _setPathForP4MergeCaption.Text);
return;
}
}
MergeToolCmd.Text = "\"" + MergetoolPath.Text + "\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
return;
}
if (GlobalMergeTool.Text.Equals("Araxis", StringComparison.CurrentCultureIgnoreCase))
{
if (MergetoolPath.Text.Contains("kdiff3") || MergetoolPath.Text.Contains("TortoiseMerge"))
MergetoolPath.Text = "";
if (string.IsNullOrEmpty(MergetoolPath.Text) || !File.Exists(MergetoolPath.Text))
{
MergetoolPath.Text = FindFileInFolders("Compare.exe",
@"C:\Program Files (x86)\Araxis\Araxis Merge\",
@"C:\Program Files\Araxis\Araxis Merge\",
@"C:\Program Files\Araxis 6.5\Araxis Merge\");
if (!File.Exists(MergetoolPath.Text))
{
MergetoolPath.Text = "";
MessageBox.Show(this, _setPathForCompare.Text, _setPathForCompareCaption.Text);
return;
}
}
MergeToolCmd.Text = "\"" + MergetoolPath.Text +
"\" -wait -merge -3 -a1 \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
return;
}
if (GlobalMergeTool.Text.Equals("TortoiseMerge", StringComparison.CurrentCultureIgnoreCase))
{
string command = "";
if (MergetoolPath.Text.ToLower().Contains("kdiff3") || MergetoolPath.Text.ToLower().Contains("p4merge"))
MergetoolPath.Text = "";
if (string.IsNullOrEmpty(MergetoolPath.Text) || !File.Exists(MergetoolPath.Text))
{
string path = FindFileInFolders("TortoiseMerge.exe",
@"c:\Program Files (x86)\TortoiseSVN\bin\",
@"c:\Program Files\TortoiseSVN\bin\");
command = "\"" + path +
"\" /base:\"$BASE\" /mine:\"$LOCAL\" /theirs:\"$REMOTE\" /merged:\"$MERGED\"";
if (string.IsNullOrEmpty(path))
{
path = FindFileInFolders("TortoiseMerge.exe",
@"c:\Program Files (x86)\TortoiseGit\bin\",
@"c:\Program Files\TortoiseGit\bin\");
command = "\"" + path +
"\" -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"";
}
if (!File.Exists(path))
{
MergetoolPath.Text = "";
MessageBox.Show(this, _setPathForTortoise.Text, _setPathForTortoiseCaption.Text);
return;
}
MergetoolPath.Text = path;
}
MergeToolCmd.Text = command;
return;
}
if (GlobalMergeTool.Text.Equals("DiffMerge", StringComparison.CurrentCultureIgnoreCase))
{
if (MergetoolPath.Text.ToLower().Contains("kdiff3") || MergetoolPath.Text.ToLower().Contains("p4merge"))
MergetoolPath.Text = "";
if (string.IsNullOrEmpty(MergetoolPath.Text) || !File.Exists(MergetoolPath.Text))
{
MergetoolPath.Text = FindFileInFolders("DiffMerge.exe",
@"C:\Program Files (x86)\SourceGear\DiffMerge\",
@"C:\Program Files\SourceGear\DiffMerge\");
if (!File.Exists(MergetoolPath.Text))
{
MergetoolPath.Text = "";
MessageBox.Show(this, _setPathForDiffMerge.Text, _setPathForDiffMergeCaption.Text);
return;
}
}
// /m /r=%merged /t1=%yname /t2=%bname /t3=%tname /c=%mname %mine %base %theirs
MergeToolCmd.Text = "\"" + MergetoolPath.Text + "\" /m /r=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"";
}
}
>>>>>>>
<<<<<<<
DiffTool.BackColor = Color.LightSalmon;
DiffTool_Fix.Visible = true;
DiffTool.Text = "You should configure a diff tool to show file diff in external program (kdiff3 for example).";
=======
DiffTool2.BackColor = Color.LightSalmon;
DiffTool2_Fix.Visible = true;
DiffTool2.Text = _adviceDiffToolConfiguration.Text;
>>>>>>>
DiffTool.BackColor = Color.LightSalmon;
DiffTool_Fix.Visible = true;
DiffTool.Text = _adviceDiffToolConfiguration.Text;
<<<<<<<
DiffTool.BackColor = Color.LightGreen;
DiffTool.Text = "There is a difftool configured: " + difftool;
DiffTool_Fix.Visible = false;
=======
DiffTool2.BackColor = Color.LightGreen;
DiffTool2.Text = String.Format(_diffToolXConfigured.Text, difftool);
DiffTool2_Fix.Visible = false;
>>>>>>>
DiffTool.BackColor = Color.LightGreen;
DiffTool.Text = String.Format(_diffToolXConfigured.Text, difftool);
DiffTool_Fix.Visible = false;
<<<<<<<
MergeTool.BackColor = Color.LightSalmon;
MergeTool.Text = "You need to configure merge tool in order to solve mergeconflicts (kdiff3 for example).";
MergeTool_Fix.Visible = true;
=======
DiffTool.BackColor = Color.LightSalmon;
DiffTool.Text = _noMergeToolConfigured.Text;
DiffTool_Fix.Visible = true;
>>>>>>>
MergeTool.BackColor = Color.LightSalmon;
MergeTool.Text = _noMergeToolConfigured.Text;
MergeTool_Fix.Visible = true; |
<<<<<<<
_backgroundLoader.LoadAsync(() => _getCandidates(_selectedText), SearchForCandidates);
=======
_backgroundLoader.Load(() => _getCandidates(selectedText), SearchForCandidates);
>>>>>>>
_backgroundLoader.LoadAsync(() => _getCandidates(selectedText), SearchForCandidates); |
<<<<<<<
using (var frm = new FormProcess(GitCommandHelpers.CherryPickCmd(Revision.Guid, AutoCommit.Checked, string.Join(" ", argumentsList.ToArray())))) frm.ShowDialog(this);
MergeConflictHandler.HandleMergeConflicts(this);
=======
new FormProcess(GitCommandHelpers.CherryPickCmd(Revision.Guid, AutoCommit.Checked, string.Join(" ", argumentsList.ToArray()))).ShowDialog(this);
MergeConflictHandler.HandleMergeConflicts(this, AutoCommit.Checked);
>>>>>>>
using (var frm = new FormProcess(GitCommandHelpers.CherryPickCmd(Revision.Guid, AutoCommit.Checked, string.Join(" ", argumentsList.ToArray())))) frm.ShowDialog(this);
MergeConflictHandler.HandleMergeConflicts(this, AutoCommit.Checked); |
<<<<<<<
if (files.Length > 0)
using (Process process1 = gitCommand.CmdStartProcess(AppSettings.GitCommand, amCommand))
=======
if (files.Length == 0)
return "";
var output = "";
using (Process process1 = gitCommand.CmdStartProcess(Settings.GitCommand, amCommand))
{
foreach (var file in files)
>>>>>>>
if (files.Length == 0)
return "";
var output = "";
using (Process process1 = gitCommand.CmdStartProcess(AppSettings.GitCommand, amCommand))
{
foreach (var file in files) |
<<<<<<<
// settingsToolStripMenuItem1
//
this.settingsToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.gitMaintenanceToolStripMenuItem,
this.toolStripSeparator4,
this.editgitignoreToolStripMenuItem1,
this.editgitattributesToolStripMenuItem,
this.editmailmapToolStripMenuItem,
this.editbuildserverToolStripMenuItem,
this.toolStripSeparator13,
this.settingsToolStripMenuItem2});
this.settingsToolStripMenuItem1.Name = "settingsToolStripMenuItem1";
this.settingsToolStripMenuItem1.Size = new System.Drawing.Size(61, 20);
this.settingsToolStripMenuItem1.Text = "Settings";
//
=======
>>>>>>>
<<<<<<<
private ToolStripMenuItem reportAnIssueToolStripMenuItem;
private ToolStripMenuItem editbuildserverToolStripMenuItem;
private TabPage BuildReportTabPage;
private WebBrowser BuildReportWebBrowser;
=======
private ToolStripMenuItem reportAnIssueToolStripMenuItem;
private ToolStripSeparator toolStripSeparator40;
private ToolStripSeparator toolStripSeparator41;
private ToolStripSeparator toolStripSeparator42;
private ToolStripSeparator toolStripSeparator43;
private ToolStripSeparator toolStripSeparator44;
private ToolStripSeparator toolStripSeparator45;
private ToolStripSeparator toolStripSeparator46;
>>>>>>>
private ToolStripMenuItem reportAnIssueToolStripMenuItem;
private ToolStripMenuItem editbuildserverToolStripMenuItem;
private TabPage BuildReportTabPage;
private WebBrowser BuildReportWebBrowser;
private ToolStripSeparator toolStripSeparator40;
private ToolStripSeparator toolStripSeparator41;
private ToolStripSeparator toolStripSeparator42;
private ToolStripSeparator toolStripSeparator43;
private ToolStripSeparator toolStripSeparator44;
private ToolStripSeparator toolStripSeparator45;
private ToolStripSeparator toolStripSeparator46; |
<<<<<<<
private void SplitButtonMenuItem_Click(object sender, EventArgs e)
{
//reset bold item to regular
ToolStripMenuItem item = (ToolStripMenuItem)contextMenuStrip_SplitButton.Items.OfType<ToolStripMenuItem>().First(s => s.Font.Bold == true);
item.Font = new Font(contextMenuStrip_SplitButton.Font, FontStyle.Regular);
//make new item bold
((ToolStripMenuItem)sender).Font = new Font(((ToolStripMenuItem)sender).Font, FontStyle.Bold);
//set new image on button
sbtn_icon.Image = (Image) ResizeBitmap((Bitmap)((ToolStripMenuItem)sender).Image, 12, 12);
IconName = ((ToolStripMenuItem)sender).Text;
//store variables
ScriptInfoEdit_Validating(sender, new System.ComponentModel.CancelEventArgs());
}
private void scriptEvent_SelectedIndexChanged(object sender, EventArgs e)
{
if (scriptEvent.Text == ScriptEvent.ShowInUserMenuBar.ToString())
{
/*
string icon_name = IconName;
if (ScriptList.RowCount > 0)
{
ScriptInfo scriptInfo = ScriptList.SelectedRows[0].DataBoundItem as ScriptInfo;
icon_name = scriptInfo.Icon;
}*/
sbtn_icon.Visible = true;
lbl_icon.Visible = true;
}
else
{
//not a menubar item, so hide the text label and dropdown button
sbtn_icon.Visible = false;
lbl_icon.Visible = false;
}
}
=======
private void BrowseCommitTemplate_Click(object sender, EventArgs e)
{
CommitTemplatePath.Text = SelectFile(".", "*.txt (*.txt)|*.txt", CommitTemplatePath.Text);
}
>>>>>>>
private void BrowseCommitTemplate_Click(object sender, EventArgs e)
{
CommitTemplatePath.Text = SelectFile(".", "*.txt (*.txt)|*.txt", CommitTemplatePath.Text);
}
private void SplitButtonMenuItem_Click(object sender, EventArgs e)
{
//reset bold item to regular
ToolStripMenuItem item = (ToolStripMenuItem)contextMenuStrip_SplitButton.Items.OfType<ToolStripMenuItem>().First(s => s.Font.Bold == true);
item.Font = new Font(contextMenuStrip_SplitButton.Font, FontStyle.Regular);
//make new item bold
((ToolStripMenuItem)sender).Font = new Font(((ToolStripMenuItem)sender).Font, FontStyle.Bold);
//set new image on button
sbtn_icon.Image = (Image) ResizeBitmap((Bitmap)((ToolStripMenuItem)sender).Image, 12, 12);
IconName = ((ToolStripMenuItem)sender).Text;
//store variables
ScriptInfoEdit_Validating(sender, new System.ComponentModel.CancelEventArgs());
}
private void scriptEvent_SelectedIndexChanged(object sender, EventArgs e)
{
if (scriptEvent.Text == ScriptEvent.ShowInUserMenuBar.ToString())
{
/*
string icon_name = IconName;
if (ScriptList.RowCount > 0)
{
ScriptInfo scriptInfo = ScriptList.SelectedRows[0].DataBoundItem as ScriptInfo;
icon_name = scriptInfo.Icon;
}*/
sbtn_icon.Visible = true;
lbl_icon.Visible = true;
}
else
{
//not a menubar item, so hide the text label and dropdown button
sbtn_icon.Visible = false;
lbl_icon.Visible = false;
}
} |
<<<<<<<
new FormProcess("checkout \"" + GetRevision(LastRow).Guid + "\"");
=======
new FormProcess("checkout \"" + RevisionList[LastRow].Guid + "\"").ShowDialog();
>>>>>>>
new FormProcess("checkout \"" + GetRevision(LastRow).Guid + "\"").ShowDialog(); |
<<<<<<<
private void fileHistoryDiffToolstripMenuItem_Click(object sender, EventArgs e)
{
GitItemStatus item = DiffFiles.SelectedItem;
if (item.IsTracked)
GitUICommands.Instance.StartFileHistoryDialog(item.Name);
}
=======
private void saveAsToolStripMenuItem1_Click(object sender, EventArgs e)
{
IList<GitRevision> revisions = RevisionGrid.GetRevisions();
if (revisions.Count == 0)
return;
if (DiffFiles.SelectedItem == null)
return;
GitItemStatus item = DiffFiles.SelectedItem;
if (item == null)
return;
var fileDialog =
new SaveFileDialog
{
InitialDirectory = Settings.WorkingDir,
FileName = item.Name.Replace(Settings.PathSeparatorWrong, Settings.PathSeparator),
AddExtension = true
};
fileDialog.DefaultExt = GitCommandHelpers.GetFileExtension(fileDialog.FileName);
fileDialog.Filter =
"Current format (*." +
GitCommandHelpers.GetFileExtension(fileDialog.FileName) + ")|*." +
GitCommandHelpers.GetFileExtension(fileDialog.FileName) +
"|All files (*.*)|*.*";
if (fileDialog.ShowDialog() == DialogResult.OK)
{
File.WriteAllText(fileDialog.FileName,
GitCommandHelpers.RunCmd(
Settings.GitCommand,
string.Format("cat-file blob {0}:\"{1}\"", revisions[0].Guid, item.Name)));
}
}
private void toolStripBranches_TextUpdate(object sender, EventArgs e)
{
UpdateBranchFilterItems();
}
private void toolStripBranches_KeyUp(object sender, KeyEventArgs e)
{
if (e.KeyValue == (char)Keys.Enter)
{
ApplyBranchFilter();
}
}
private void toolStripBranches_DropDown(object sender, EventArgs e)
{
InitToolStripBranchFilter(localToolStripMenuItem.Checked, remoteToolStripMenuItem.Checked);
UpdateBranchFilterItems();
}
private void toolStripStatusLabel1_Click(object sender, EventArgs e)
{
statusStrip.Hide();
}
private void toolStripBranches_Leave(object sender, EventArgs e)
{
ApplyBranchFilter();
}
private void openWithToolStripMenuItem_Click(object sender, EventArgs e)
{
var item = GitTree.SelectedNode.Tag;
if (item is GitItem)
if (((GitItem)item).ItemType == "blob")
{
string fileName = ((GitItem)item).FileName;
fileName = Settings.WorkingDir + fileName;
OpenWith.OpenAs(fileName.Replace(Settings.PathSeparatorWrong, Settings.PathSeparator));
}
}
private void pluginsToolStripMenuItem_DropDownOpening(object sender, EventArgs e)
{
LoadPluginsInPluginMenu();
}
private void bisectToolStripMenuItem_Click(object sender, EventArgs e)
{
new FormBisect().ShowDialog();
Initialize();
}
private void BisectClick(object sender, EventArgs e)
{
new FormBisect().ShowDialog();
Initialize();
}
>>>>>>>
private void saveAsToolStripMenuItem1_Click(object sender, EventArgs e)
{
IList<GitRevision> revisions = RevisionGrid.GetRevisions();
if (revisions.Count == 0)
return;
if (DiffFiles.SelectedItem == null)
return;
GitItemStatus item = DiffFiles.SelectedItem;
if (item == null)
return;
var fileDialog =
new SaveFileDialog
{
InitialDirectory = Settings.WorkingDir,
FileName = item.Name.Replace(Settings.PathSeparatorWrong, Settings.PathSeparator),
AddExtension = true
};
fileDialog.DefaultExt = GitCommandHelpers.GetFileExtension(fileDialog.FileName);
fileDialog.Filter =
"Current format (*." +
GitCommandHelpers.GetFileExtension(fileDialog.FileName) + ")|*." +
GitCommandHelpers.GetFileExtension(fileDialog.FileName) +
"|All files (*.*)|*.*";
if (fileDialog.ShowDialog() == DialogResult.OK)
{
File.WriteAllText(fileDialog.FileName,
GitCommandHelpers.RunCmd(
Settings.GitCommand,
string.Format("cat-file blob {0}:\"{1}\"", revisions[0].Guid, item.Name)));
}
}
private void toolStripBranches_TextUpdate(object sender, EventArgs e)
{
UpdateBranchFilterItems();
}
private void toolStripBranches_KeyUp(object sender, KeyEventArgs e)
{
if (e.KeyValue == (char)Keys.Enter)
{
ApplyBranchFilter();
}
}
private void toolStripBranches_DropDown(object sender, EventArgs e)
{
InitToolStripBranchFilter(localToolStripMenuItem.Checked, remoteToolStripMenuItem.Checked);
UpdateBranchFilterItems();
}
private void toolStripStatusLabel1_Click(object sender, EventArgs e)
{
statusStrip.Hide();
}
private void toolStripBranches_Leave(object sender, EventArgs e)
{
ApplyBranchFilter();
}
private void openWithToolStripMenuItem_Click(object sender, EventArgs e)
{
var item = GitTree.SelectedNode.Tag;
if (item is GitItem)
if (((GitItem)item).ItemType == "blob")
{
string fileName = ((GitItem)item).FileName;
fileName = Settings.WorkingDir + fileName;
OpenWith.OpenAs(fileName.Replace(Settings.PathSeparatorWrong, Settings.PathSeparator));
}
}
private void pluginsToolStripMenuItem_DropDownOpening(object sender, EventArgs e)
{
LoadPluginsInPluginMenu();
}
private void bisectToolStripMenuItem_Click(object sender, EventArgs e)
{
new FormBisect().ShowDialog();
Initialize();
}
private void BisectClick(object sender, EventArgs e)
{
new FormBisect().ShowDialog();
Initialize();
}
private void fileHistoryDiffToolstripMenuItem_Click(object sender, EventArgs e)
{
GitItemStatus item = DiffFiles.SelectedItem;
if (item.IsTracked)
GitUICommands.Instance.StartFileHistoryDialog(item.Name);
} |
<<<<<<<
commitAuthorStatus.ToolTipText = _commitCommitterToolTip.Text;
=======
toolAuthor.Control.PreviewKeyDown += ToolAuthor_PreviewKeyDown;
}
void ToolAuthor_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
{
if (e.Alt)
e.IsInputKey = true;
>>>>>>>
commitAuthorStatus.ToolTipText = _commitCommitterToolTip.Text;
toolAuthor.Control.PreviewKeyDown += ToolAuthor_PreviewKeyDown;
}
void ToolAuthor_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
{
if (e.Alt)
e.IsInputKey = true;
<<<<<<<
commitMessageToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] {
toolStripMenuItem1,
generateListOfChangesInSubmodulesChangesToolStripMenuItem});
=======
foreach (var localLastCommitMessage in prevMsgs)
{
AddCommitMessageToMenu(localLastCommitMessage);
>>>>>>>
foreach (var localLastCommitMessage in prevMsgs)
{
AddCommitMessageToMenu(localLastCommitMessage); |
<<<<<<<
private GitCommandsInstance gitGetGraphCommand;
private Thread backgroundThread;
private volatile bool abortThread = false;
=======
>>>>>>>
<<<<<<<
if (backgroundThread != null)
{
abortThread = true;
Thread.Sleep(50);
backgroundThread.Abort();
backgroundThread = null;
}
if (gitGetGraphCommand != null)
{
gitGetGraphCommand.Kill();
gitGetGraphCommand = null;
}
=======
backgroundLoader.Cancel();
>>>>>>>
backgroundLoader.Cancel();
<<<<<<<
if (backgroundThread != null)
{
abortThread = true;
Thread.Sleep(50);
backgroundThread.Abort();
}
abortThread = false;
backgroundThread = new Thread(execute) { IsBackground = true };
backgroundThread.Start();
=======
backgroundLoader.Load(execute, executed);
>>>>>>>
backgroundLoader.Load(execute, executed); |
<<<<<<<
Volatile.Write(ref this._wsPing, tdelta);
this.Discord.Logger.LogDebug(VoiceNextEvents.VoiceKeepalive, "Received UDP keepalive {0} (ping {1}ms)", keepalive, tdelta);
=======
Volatile.Write(ref this._udpPing, tdelta);
this.Discord.DebugLogger.LogMessage(LogLevel.Debug, "VNext UDP", $"Received UDP keepalive {keepalive}, ping {tdelta}ms", DateTime.Now);
>>>>>>>
this.Discord.Logger.LogDebug(VoiceNextEvents.VoiceKeepalive, "Received UDP keepalive {0} (ping {1}ms)", keepalive, tdelta);
Volatile.Write(ref this._udpPing, tdelta); |
<<<<<<<
this.editbuildserverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.BuildReportTabPage = new System.Windows.Forms.TabPage();
this.BuildReportWebBrowser = new System.Windows.Forms.WebBrowser();
>>>>>>>
this.BuildReportTabPage = new System.Windows.Forms.TabPage();
this.BuildReportWebBrowser = new System.Windows.Forms.WebBrowser();
<<<<<<<
// toolStripSeparator30
//
=======
// toolStripSeparator30
//
>>>>>>>
// toolStripSeparator30
//
<<<<<<<
private ToolStripMenuItem reportAnIssueToolStripMenuItem;
private ToolStripMenuItem editbuildserverToolStripMenuItem;
=======
private ToolStripMenuItem reportAnIssueToolStripMenuItem;
private TabPage BuildReportTabPage;
private WebBrowser BuildReportWebBrowser;
>>>>>>>
private ToolStripMenuItem reportAnIssueToolStripMenuItem;
private ToolStripMenuItem editbuildserverToolStripMenuItem;
private TabPage BuildReportTabPage;
private WebBrowser BuildReportWebBrowser; |
<<<<<<<
CommitData data;
if (_revision != null)
{
data = CommitData.CreateFromRevision(_revision);
CommitData.UpdateCommitMessage(data, Module, _revisionGuid, ref error);
_revision.Body = data.Body;
ThreadPool.QueueUserWorkItem(_ => loadLinksForRevision(_revision));
}
else
data = CommitData.GetCommitData(Module, _revisionGuid, ref error);
=======
CommitData data = CommitData.CreateFromRevision(_revision);
if (_revision.Body == null)
CommitData.UpdateCommitMessage(data, Module, _revision.Guid, ref error);
>>>>>>>
CommitData data = CommitData.CreateFromRevision(_revision);
if (_revision.Body == null)
{
CommitData.UpdateCommitMessage(data, Module, _revision.Guid, ref error);
_revision.Body = data.Body;
ThreadPool.QueueUserWorkItem(_ => loadLinksForRevision(_revision));
} |
<<<<<<<
using Settings = GitCommands.AppSettings;
using GitUI.HelperDialogs;
=======
using Settings = GitCommands.Settings;
>>>>>>>
using Settings = GitCommands.AppSettings; |
<<<<<<<
if (changes == Settings.LocalChanges.Stash && Module.IsDirtyDir())
UICommands.Stash(_owner);
=======
//Stash local changes, but only if the setting CheckForUncommittedChangesInCheckoutBranch is true
if (Settings.CheckForUncommittedChangesInCheckoutBranch &&
changes == Settings.LocalChanges.Stash && GitModule.Current.IsDirtyDir())
{
GitUICommands.Instance.Stash(_owner);
}
>>>>>>>
//Stash local changes, but only if the setting CheckForUncommittedChangesInCheckoutBranch is true
if (Settings.CheckForUncommittedChangesInCheckoutBranch &&
changes == Settings.LocalChanges.Stash && Module.IsDirtyDir())
{
UICommands.Stash(_owner);
} |
<<<<<<<
diffViewer.ViewChangesAsync(RevisionGrid.GetSelectedRevisions(), DiffFiles.SelectedItem, String.Empty);
=======
diffViewer.ViewChanges(RevisionGrid.GetSelectedRevisions(), DiffFiles.SelectedItem, string.Empty);
>>>>>>>
diffViewer.ViewChangesAsync(RevisionGrid.GetSelectedRevisions(), DiffFiles.SelectedItem, string.Empty); |
<<<<<<<
private CookieContainer GetTeamCityNtlmAuthCookie (string serverUrl)
{
string url = serverUrl + "ntlmLogin.html";
var cookieContainer = new CookieContainer();
var request = (HttpWebRequest)HttpWebRequest.Create (url);
request.CookieContainer = cookieContainer;
request.Credentials = CredentialCache.DefaultCredentials;
request.PreAuthenticate = true;
request.GetResponse();
return cookieContainer;
}
=======
public string LogAsGuestUrlParameter { get; set; }
>>>>>>>
private CookieContainer GetTeamCityNtlmAuthCookie (string serverUrl)
{
string url = serverUrl + "ntlmLogin.html";
var cookieContainer = new CookieContainer();
var request = (HttpWebRequest)HttpWebRequest.Create (url);
request.CookieContainer = cookieContainer;
request.Credentials = CredentialCache.DefaultCredentials;
request.PreAuthenticate = true;
request.GetResponse();
return cookieContainer;
}
public string LogAsGuestUrlParameter { get; set; }
<<<<<<<
BuildIdFilter = new Regex(config.GetString("BuildIdFilter", ""), RegexOptions.Compiled);
HostName = config.GetString("BuildServerUrl", null);
if (!string.IsNullOrEmpty(HostName))
{
CreateNewHttpClient(HostName);
UpdateHttpClientOptionsGuestAuth();
=======
var buildIdFilerSetting = config.GetString("BuildIdFilter", "");
if (!BuildServerSettingsHelper.IsRegexValid(buildIdFilerSetting))
{
return;
}
BuildIdFilter = new Regex(buildIdFilerSetting, RegexOptions.Compiled);
var hostName = config.GetString("BuildServerUrl", null);
LogAsGuestUrlParameter = config.GetBool("LogAsGuest", false) ? "&guest=1" : string.Empty;
if (!string.IsNullOrEmpty(hostName))
{
InitializeHttpClient(hostName, () => buildServerWatcher.GetBuildServerCredentials(this, true));
>>>>>>>
var buildIdFilerSetting = config.GetString("BuildIdFilter", "");
if (!BuildServerSettingsHelper.IsRegexValid(buildIdFilerSetting))
{
return;
}
BuildIdFilter = new Regex(buildIdFilerSetting, RegexOptions.Compiled);
HostName = config.GetString("BuildServerUrl", null);
LogAsGuestUrlParameter = config.GetBool("LogAsGuest", false) ? "&guest=1" : string.Empty;
if (!string.IsNullOrEmpty(HostName))
{
CreateNewHttpClient(HostName);
UpdateHttpClientOptionsGuestAuth();
InitializeHttpClient(hostName, () => buildServerWatcher.GetBuildServerCredentials(this, true));
<<<<<<<
private void CreateNewHttpClient(string hostName)
{
httpClientHandler = new HttpClientHandler();
httpClient = new HttpClient(httpClientHandler)
{
Timeout = TimeSpan.FromMinutes(2),
BaseAddress = hostName.Contains("://")
? new Uri(hostName, UriKind.Absolute)
: new Uri(string.Format("{0}://{1}", Uri.UriSchemeHttp, hostName), UriKind.Absolute)
};
httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
}
=======
public void InitializeHttpClient(string hostName, Func<IBuildServerCredentials> getBuildServerCredentials = null)
{
SetHttpClient(hostName);
UpdateHttpClientOptions(getBuildServerCredentials != null ? getBuildServerCredentials() : null);
}
private void SetHttpClient(string hostName)
{
httpClient = new HttpClient
{
Timeout = TimeSpan.FromMinutes(2),
BaseAddress = hostName.Contains("://")
? new Uri(hostName, UriKind.Absolute)
: new Uri(string.Format("{0}://{1}", Uri.UriSchemeHttp, hostName), UriKind.Absolute)
};
httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
}
>>>>>>>
public void InitializeHttpClient(string hostName, Func<IBuildServerCredentials> getBuildServerCredentials = null)
{
SetHttpClient(hostName);
UpdateHttpClientOptions(getBuildServerCredentials != null ? getBuildServerCredentials() : null);
}
private void SetHttpClient(string hostName)
{
httpClient = new HttpClient
{
Timeout = TimeSpan.FromMinutes(2),
BaseAddress = hostName.Contains("://")
? new Uri(hostName, UriKind.Absolute)
: new Uri(string.Format("{0}://{1}", Uri.UriSchemeHttp, hostName), UriKind.Absolute)
};
httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
}
private void CreateNewHttpClient(string hostName)
{
httpClientHandler = new HttpClientHandler();
httpClient = new HttpClient(httpClientHandler)
{
Timeout = TimeSpan.FromMinutes(2),
BaseAddress = hostName.Contains("://")
? new Uri(hostName, UriKind.Absolute)
: new Uri(string.Format("{0}://{1}", Uri.UriSchemeHttp, hostName), UriKind.Absolute)
};
httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
} |
<<<<<<<
_task.LoadAsync(() => GetBranches(branchType), (branches) => { Branches.Add(branchType, branches); DisplayBranchDatas(); });
=======
_task.Load(() => GetBranches(branchType), branches =>
{
Branches.Add(branchType, branches);
DisplayBranchDatas();
});
>>>>>>>
_task.LoadAsync(() => GetBranches(branchType), branches =>
{
Branches.Add(branchType, branches);
DisplayBranchDatas();
}); |
<<<<<<<
remote = newString;
newString = module.GetSetting(string.Format(SettingKeyString.RemoteUrl, remote));
url = module.GetSetting(string.Format(SettingKeyString.RemoteUrl, remote));
newString = GetRemotePath(url);
=======
remote = selectedRemotes.Count == 1
? selectedRemotes[0]
: AskToSpecify(selectedRemotes, revisionGrid);
url = module.GetSetting(string.Format(SettingKeyString.RemoteUrl, remote));
newString = GetRemotePath(url);
>>>>>>>
remote = newString;
url = module.GetSetting(string.Format(SettingKeyString.RemoteUrl, remote));
newString = GetRemotePath(url); |
<<<<<<<
if (IsDisposed)
{
return;
}
=======
if (_customUnderlines.IsImeStartingComposition)
return;
>>>>>>>
if (IsDisposed)
{
return;
}
if (_customUnderlines.IsImeStartingComposition)
{
return;
} |
<<<<<<<
// localToolStripMenuItem
//
this.localToolStripMenuItem.Checked = true;
this.localToolStripMenuItem.CheckOnClick = true;
this.localToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
this.localToolStripMenuItem.Name = "localToolStripMenuItem";
this.localToolStripMenuItem.Size = new System.Drawing.Size(115, 22);
this.localToolStripMenuItem.Text = "Local";
//
// remoteToolStripMenuItem
//
this.remoteToolStripMenuItem.CheckOnClick = true;
this.remoteToolStripMenuItem.Name = "remoteToolStripMenuItem";
this.remoteToolStripMenuItem.Size = new System.Drawing.Size(115, 22);
this.remoteToolStripMenuItem.Text = "Remote";
//
=======
>>>>>>>
<<<<<<<
// commitToolStripMenuItem1
//
this.commitToolStripMenuItem1.Checked = true;
this.commitToolStripMenuItem1.CheckOnClick = true;
this.commitToolStripMenuItem1.CheckState = System.Windows.Forms.CheckState.Checked;
this.commitToolStripMenuItem1.Name = "commitToolStripMenuItem1";
this.commitToolStripMenuItem1.Size = new System.Drawing.Size(184, 22);
this.commitToolStripMenuItem1.Text = "Commit";
//
// committerToolStripMenuItem
//
this.committerToolStripMenuItem.CheckOnClick = true;
this.committerToolStripMenuItem.Name = "committerToolStripMenuItem";
this.committerToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
this.committerToolStripMenuItem.Text = "Committer";
//
// authorToolStripMenuItem
//
this.authorToolStripMenuItem.CheckOnClick = true;
this.authorToolStripMenuItem.Name = "authorToolStripMenuItem";
this.authorToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
this.authorToolStripMenuItem.Text = "Author";
//
// diffContainsToolStripMenuItem
//
this.diffContainsToolStripMenuItem.CheckOnClick = true;
this.diffContainsToolStripMenuItem.Name = "diffContainsToolStripMenuItem";
this.diffContainsToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
this.diffContainsToolStripMenuItem.Text = "Diff contains (SLOW)";
this.diffContainsToolStripMenuItem.Click += new System.EventHandler(this.diffContainsToolStripMenuItem_Click);
//
=======
>>>>>>>
<<<<<<<
this.FileTreeContextMenu.Size = new System.Drawing.Size(269, 192);
=======
this.FileTreeContextMenu.Size = new System.Drawing.Size(265, 236);
>>>>>>>
this.FileTreeContextMenu.Size = new System.Drawing.Size(265, 236);
<<<<<<<
this.DiffContextMenu.Size = new System.Drawing.Size(261, 158);
=======
this.DiffContextMenu.Size = new System.Drawing.Size(252, 180);
>>>>>>>
this.DiffContextMenu.Size = new System.Drawing.Size(252, 180);
<<<<<<<
this.openWithDifftoolToolStripMenuItem.Size = new System.Drawing.Size(260, 22);
=======
this.openWithDifftoolToolStripMenuItem.Size = new System.Drawing.Size(251, 22);
>>>>>>>
this.openWithDifftoolToolStripMenuItem.Size = new System.Drawing.Size(251, 22);
<<<<<<<
this.copyFilenameToClipboardToolStripMenuItem1.Size = new System.Drawing.Size(260, 22);
=======
this.copyFilenameToClipboardToolStripMenuItem1.Size = new System.Drawing.Size(251, 22);
>>>>>>>
this.copyFilenameToClipboardToolStripMenuItem1.Size = new System.Drawing.Size(251, 22);
<<<<<<<
this.saveAsToolStripMenuItem1.Size = new System.Drawing.Size(260, 22);
=======
this.saveAsToolStripMenuItem1.Size = new System.Drawing.Size(251, 22);
>>>>>>>
this.saveAsToolStripMenuItem1.Size = new System.Drawing.Size(251, 22);
<<<<<<<
this.fileHistoryDiffToolstripMenuItem.Size = new System.Drawing.Size(260, 22);
=======
this.fileHistoryDiffToolstripMenuItem.Size = new System.Drawing.Size(251, 22);
>>>>>>>
this.fileHistoryDiffToolstripMenuItem.Size = new System.Drawing.Size(251, 22);
<<<<<<<
this.openContainingFolderToolStripMenuItem.Size = new System.Drawing.Size(260, 22);
=======
this.openContainingFolderToolStripMenuItem.Size = new System.Drawing.Size(251, 22);
>>>>>>>
this.openContainingFolderToolStripMenuItem.Size = new System.Drawing.Size(251, 22);
<<<<<<<
this.goToToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.G)));
this.goToToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
=======
this.goToToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.G)));
this.goToToolStripMenuItem.Size = new System.Drawing.Size(216, 22);
>>>>>>>
this.goToToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.G)));
this.goToToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
<<<<<<<
this.manageSubmodulesToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
=======
this.manageSubmodulesToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
>>>>>>>
this.manageSubmodulesToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
<<<<<<<
this.toolStripSeparator8.Size = new System.Drawing.Size(218, 6);
=======
this.toolStripSeparator8.Size = new System.Drawing.Size(212, 6);
>>>>>>>
this.toolStripSeparator8.Size = new System.Drawing.Size(212, 6);
<<<<<<<
this.updateAllSubmodulesToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
=======
this.updateAllSubmodulesToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
>>>>>>>
this.updateAllSubmodulesToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
<<<<<<<
this.synchronizeAllSubmodulesToolStripMenuItem.Name = "synchronizeAllSubmodulesToolStripMenuItem";
this.synchronizeAllSubmodulesToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
=======
this.synchronizeAllSubmodulesToolStripMenuItem.Name = "synchronizeAllSubmodulesToolStripMenuItem";
this.synchronizeAllSubmodulesToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
>>>>>>>
this.synchronizeAllSubmodulesToolStripMenuItem.Name = "synchronizeAllSubmodulesToolStripMenuItem";
this.synchronizeAllSubmodulesToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
<<<<<<<
this.toolStripSeparator10.Size = new System.Drawing.Size(218, 6);
=======
this.toolStripSeparator10.Size = new System.Drawing.Size(212, 6);
>>>>>>>
this.toolStripSeparator10.Size = new System.Drawing.Size(212, 6);
<<<<<<<
this.openSubmoduleToolStripMenuItem.Size = new System.Drawing.Size(221, 22);
=======
this.openSubmoduleToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
>>>>>>>
this.openSubmoduleToolStripMenuItem.Size = new System.Drawing.Size(215, 22); |
<<<<<<<
GitUICommands.Instance.Stash(this);
stashed = true;
=======
new FormProcess("stash save").ShowDialog(this);
return true;
>>>>>>>
GitUICommands.Instance.Stash(this);
return true;
<<<<<<<
if (stashed &&
process != null &&
!process.ErrorOccurred() &&
!Settings.Module.InTheMiddleOfConflictedMerge() &&
!Settings.Module.InTheMiddleOfRebase() &&
MessageBox.Show(this, _applyShashedItemsAgain.Text, _applyShashedItemsAgainCaption.Text, MessageBoxButtons.YesNo) == DialogResult.Yes)
{
new FormProcess("stash pop").ShowDialog(this);
MergeConflictHandler.HandleMergeConflicts(this);
}
ScriptManager.RunEventScripts(ScriptEvent.AfterPull);
=======
return Branches.Text;
>>>>>>>
return Branches.Text; |
<<<<<<<
url = data[1];
var result = new Uri(url);
if (result.Scheme == "gitext")
=======
>>>>>>> |
<<<<<<<
=======
this.chkConsoleEmulator = new System.Windows.Forms.CheckBox();
this.tooltip = new System.Windows.Forms.ToolTip(this.components);
>>>>>>>
this.chkRememberIgnoreWhiteSpacePreference = new System.Windows.Forms.CheckBox();
this.chkConsoleEmulator = new System.Windows.Forms.CheckBox();
this.tooltip = new System.Windows.Forms.ToolTip(this.components);
<<<<<<<
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel2.Size = new System.Drawing.Size(443, 337);
=======
this.tableLayoutPanel2.Size = new System.Drawing.Size(443, 283);
>>>>>>>
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel2.Size = new System.Drawing.Size(443, 337);
<<<<<<<
this.GeneralGB.Size = new System.Drawing.Size(437, 118);
=======
this.GeneralGB.Size = new System.Drawing.Size(437, 163);
>>>>>>>
this.GeneralGB.Size = new System.Drawing.Size(437, 163);
<<<<<<<
this.tableLayoutPanel1.Size = new System.Drawing.Size(223, 75);
=======
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(361, 120);
>>>>>>>
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(361, 120);
<<<<<<<
=======
// chkConsoleEmulator
//
this.chkConsoleEmulator.AutoSize = true;
this.chkConsoleEmulator.Dock = System.Windows.Forms.DockStyle.Top;
this.chkConsoleEmulator.Location = new System.Drawing.Point(3, 103);
this.chkConsoleEmulator.Name = "chkConsoleEmulator";
this.chkConsoleEmulator.Size = new System.Drawing.Size(355, 14);
this.chkConsoleEmulator.TabIndex = 4;
this.chkConsoleEmulator.Text = "Use Console Emulator for console output in command dialogs";
this.tooltip.SetToolTip(this.chkConsoleEmulator, resources.GetString("chkConsoleEmulator.ToolTip"));
this.chkConsoleEmulator.UseVisualStyleBackColor = true;
//
// tooltip
//
this.tooltip.AutoPopDelay = 30000;
this.tooltip.InitialDelay = 500;
this.tooltip.ReshowDelay = 100;
//
>>>>>>>
// chkRememberIgnoreWhiteSpacePreference
//
this.chkRememberIgnoreWhiteSpacePreference.AutoSize = true;
this.chkRememberIgnoreWhiteSpacePreference.Location = new System.Drawing.Point(3, 78);
this.chkRememberIgnoreWhiteSpacePreference.Name = "chkRememberIgnoreWhiteSpacePreference";
this.chkRememberIgnoreWhiteSpacePreference.Size = new System.Drawing.Size(269, 19);
this.chkRememberIgnoreWhiteSpacePreference.TabIndex = 4;
this.chkRememberIgnoreWhiteSpacePreference.Text = "Remember the ignore-white-space preference";
this.chkRememberIgnoreWhiteSpacePreference.UseVisualStyleBackColor = true;
//
// chkConsoleEmulator
//
this.chkConsoleEmulator.AutoSize = true;
this.chkConsoleEmulator.Dock = System.Windows.Forms.DockStyle.Top;
this.chkConsoleEmulator.Location = new System.Drawing.Point(3, 103);
this.chkConsoleEmulator.Name = "chkConsoleEmulator";
this.chkConsoleEmulator.Size = new System.Drawing.Size(355, 14);
this.chkConsoleEmulator.TabIndex = 4;
this.chkConsoleEmulator.Text = "Use Console Emulator for console output in command dialogs";
this.tooltip.SetToolTip(this.chkConsoleEmulator, resources.GetString("chkConsoleEmulator.ToolTip"));
this.chkConsoleEmulator.UseVisualStyleBackColor = true;
// tooltip
//
this.tooltip.AutoPopDelay = 30000;
this.tooltip.InitialDelay = 500;
this.tooltip.ReshowDelay = 100;
//
<<<<<<<
this.Size = new System.Drawing.Size(1371, 575);
=======
this.Size = new System.Drawing.Size(1758, 956);
>>>>>>>
this.Size = new System.Drawing.Size(1758, 956);
<<<<<<<
private System.Windows.Forms.CheckBox chkOmitUninterestingDiff;
=======
private System.Windows.Forms.CheckBox chkConsoleEmulator;
private System.Windows.Forms.ToolTip tooltip;
>>>>>>>
private System.Windows.Forms.CheckBox chkOmitUninterestingDiff;
private System.Windows.Forms.CheckBox chkConsoleEmulator;
private System.Windows.Forms.ToolTip tooltip; |
<<<<<<<
private static ProcessStartInfo CreateStartInfo(string command, string arguments, string workingDir, Encoding encoding = null)
{
return new ProcessStartInfo
{
UseShellExecute = false,
ErrorDialog = false,
CreateNoWindow = true,
RedirectStandardInput = true,
RedirectStandardOutput = true,
RedirectStandardError = true,
StandardOutputEncoding = encoding,
StandardErrorEncoding = encoding,
FileName = command,
Arguments = arguments,
WorkingDirectory = workingDir
};
}
public static Process RunGitEx(string command, string filename)
=======
private static string GetRegistryValue(RegistryKey root, string subkey, string key)
{
try
{
RegistryKey rk;
rk = root.OpenSubKey(subkey, false);
string value = "";
if (rk != null && rk.GetValue(key) is string)
{
value = rk.GetValue(key).ToString();
rk.Flush();
rk.Close();
}
return value;
}
catch (UnauthorizedAccessException)
{
MessageBox.Show("GitExtensions has insufficient permissions to check the registry.");
}
return "";
}
private static string GetGitExRegValue(string key)
{
string result = GetRegistryValue(Registry.CurrentUser, "Software\\GitExtensions", key);
if (string.IsNullOrEmpty(result))
result = GetRegistryValue(Registry.Users, "Software\\GitExtensions", key);
return result;
}
public static void RunGitEx(string command, string filename)
>>>>>>>
private static string GetRegistryValue(RegistryKey root, string subkey, string key)
{
try
{
RegistryKey rk;
rk = root.OpenSubKey(subkey, false);
string value = "";
if (rk != null && rk.GetValue(key) is string)
{
value = rk.GetValue(key).ToString();
rk.Flush();
rk.Close();
}
return value;
}
catch (UnauthorizedAccessException)
{
MessageBox.Show("GitExtensions has insufficient permissions to check the registry.");
}
return "";
}
private static string GetGitExRegValue(string key)
{
string result = GetRegistryValue(Registry.CurrentUser, "Software\\GitExtensions", key);
if (string.IsNullOrEmpty(result))
result = GetRegistryValue(Registry.Users, "Software\\GitExtensions", key);
return result;
}
private static ProcessStartInfo CreateStartInfo(string command, string arguments, string workingDir, Encoding encoding = null)
{
return new ProcessStartInfo
{
UseShellExecute = false,
ErrorDialog = false,
CreateNoWindow = true,
RedirectStandardInput = true,
RedirectStandardOutput = true,
RedirectStandardError = true,
StandardOutputEncoding = encoding,
StandardErrorEncoding = encoding,
FileName = command,
Arguments = arguments,
WorkingDirectory = workingDir
};
}
public static Process RunGitEx(string command, string filename)
<<<<<<<
private static string GetRegistryValue(RegistryKey root, string subkey, string key)
{
try
{
RegistryKey rk;
rk = root.OpenSubKey(subkey, false);
string value = "";
if (rk != null && rk.GetValue(key) is string)
{
value = rk.GetValue(key).ToString();
rk.Flush();
rk.Close();
}
return value;
}
catch (UnauthorizedAccessException)
{
MessageBox.Show("GitExtensions has insufficient permisions to check the registry.");
}
return "";
}
private static string GetGitExRegValue(string key)
{
string result = GetRegistryValue(Registry.CurrentUser, "Software\\GitExtensions\\GitExtensions", key);
if (string.IsNullOrEmpty(result))
result = GetRegistryValue(Registry.Users, "Software\\GitExtensions\\GitExtensions", key);
return result;
}
=======
private static void SetupProcessStartInfo(ProcessStartInfo startInfo, string command, string arguments, string workingDir, bool useUTF8, bool show)
{
startInfo.UseShellExecute = false;
startInfo.ErrorDialog = false;
startInfo.RedirectStandardInput = true;
startInfo.RedirectStandardOutput = true;
startInfo.RedirectStandardError = true;
if (useUTF8)
{
startInfo.StandardOutputEncoding = Encoding.UTF8;
startInfo.StandardErrorEncoding = Encoding.UTF8;
}
startInfo.CreateNoWindow = true;
startInfo.LoadUserProfile = true;
startInfo.FileName = command;
startInfo.Arguments = arguments;
startInfo.WorkingDirectory = workingDir;
if (show)
startInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal;
}
private static void Run(string cmd, string arguments)
{
try
{
//process used to execute external commands
System.Diagnostics.Process process = new System.Diagnostics.Process();
SetupProcessStartInfo(process.StartInfo, cmd, arguments, "", true, true);
process.Start();
}
catch
{
}
}
>>>>>>> |
<<<<<<<
=======
Remote = remote;
>>>>>>>
Remote = remote;
<<<<<<<
ParseName();
=======
>>>>>>>
ParseName(); |
<<<<<<<
String s = new GitModule("").RunGitCmd(arguments, Encoding.UTF8);
=======
int exitCode;
String s = new GitModule("").RunGitCmd(arguments, out exitCode, Encoding.UTF8);
>>>>>>>
String s = new GitModule("").RunGitCmd(arguments, Encoding.UTF8);
<<<<<<<
}
=======
}
>>>>>>>
}
<<<<<<<
public CmdResult RunCmdResult(string cmd, string arguments, Encoding encoding = null, byte[] stdInput = null)
=======
public string RunCmd(string cmd, string arguments, Encoding encoding = null, byte[] stdInput = null)
{
int exitCode;
return RunCmd(cmd, arguments, out exitCode, encoding, stdInput);
}
/// <summary>
/// Run command, console window is hidden, wait for exit, redirect output
/// </summary>
[PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
public string RunCmd(string cmd, string arguments, out int exitCode, Encoding encoding = null, byte[] stdInput = null)
>>>>>>>
public CmdResult RunCmdResult(string cmd, string arguments, Encoding encoding = null, byte[] stdInput = null)
<<<<<<<
process.Value.StandardInput.Close();
process.Value.WaitForExit();
wereErrors = wereErrors || process.Value.ExitCode != 0;
if (!string.IsNullOrEmpty(output))
output += Environment.NewLine;
output += process.Value.StandardOutput.ReadToEnd().Trim();
=======
process.Value.StandardInput.Close();
process.Value.WaitForExit();
wereErrors = wereErrors || process.Value.ExitCode != 0;
if (!string.IsNullOrEmpty(output))
output += Environment.NewLine;
output += process.Value.StandardOutput.ReadToEnd().Trim();
>>>>>>>
process.Value.StandardInput.Close();
process.Value.WaitForExit();
wereErrors = wereErrors || process.Value.ExitCode != 0;
if (!string.IsNullOrEmpty(output))
output += Environment.NewLine;
output += process.Value.StandardOutput.ReadToEnd().Trim();
<<<<<<<
public IList<GitItemStatus> GitStatus(UntrackedFilesMode untrackedFilesMode, IgnoreSubmodulesMode ignoreSubmodulesMode = 0)
{
=======
public IList<GitItemStatus> GitStatus(UntrackedFilesMode untrackedFilesMode, IgnoreSubmodulesMode ignoreSubmodulesMode = 0)
{
>>>>>>>
public IList<GitItemStatus> GitStatus(UntrackedFilesMode untrackedFilesMode, IgnoreSubmodulesMode ignoreSubmodulesMode = 0)
{
<<<<<<<
var result = RunGitCmdResult(revparseCommand);
return result.ExitCode == 0? result.StdOutput.Split('\n')[0] : "";
=======
int exitCode;
string[] resultStrings = RunGitCmd(revparseCommand, out exitCode).Split('\n');
return exitCode == 0 ? resultStrings[0] : "";
>>>>>>>
var result = RunGitCmdResult(revparseCommand);
return result.ExitCode == 0? result.StdOutput.Split('\n')[0] : "";
<<<<<<<
var result = RunGitCmdResult(string.Format("check-ref-format --branch \"{0}\"", branchName));
return result.ExitCode == 0;
=======
int exitCode;
RunGitCmd(string.Format("check-ref-format --branch \"{0}\"", branchName), out exitCode);
return exitCode == 0;
>>>>>>>
var result = RunGitCmdResult(string.Format("check-ref-format --branch \"{0}\"", branchName));
return result.ExitCode == 0;
<<<<<<<
// Get processes by "ps" command.
var cmd = Path.Combine(AppSettings.GitBinDir, "ps");
var arguments = "x";
=======
>>>>>>> |
<<<<<<<
=======
//Administrator / Everything (FIX ME)
Administrator = 8,
>>>>>>>
//Administrator / Everything
Administrator = 8, |
<<<<<<<
this.workingToolStripMenuItem.Size = new System.Drawing.Size(174, 23);
=======
this.workingToolStripMenuItem.Size = new System.Drawing.Size(133, 20);
>>>>>>>
this.workingToolStripMenuItem.Size = new System.Drawing.Size(133, 20);
<<<<<<<
this.showIgnoredFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24);
=======
this.showIgnoredFilesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
>>>>>>>
this.showIgnoredFilesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
<<<<<<<
this.showUntrackedFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24);
=======
this.showUntrackedFilesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
>>>>>>>
this.showUntrackedFilesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
<<<<<<<
this.toolStripSeparator3.Size = new System.Drawing.Size(252, 6);
=======
this.toolStripSeparator3.Size = new System.Drawing.Size(202, 6);
>>>>>>>
this.toolStripSeparator3.Size = new System.Drawing.Size(202, 6);
<<<<<<<
this.deleteSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24);
=======
this.deleteSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
>>>>>>>
this.deleteSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
<<<<<<<
this.resetSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24);
=======
this.resetSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
>>>>>>>
this.resetSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
<<<<<<<
this.resetAlltrackedChangesToolStripMenuItem.Size = new System.Drawing.Size(255, 24);
=======
this.resetAlltrackedChangesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
>>>>>>>
this.resetAlltrackedChangesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
<<<<<<<
this.toolStripSeparator1.Size = new System.Drawing.Size(252, 6);
=======
this.toolStripSeparator1.Size = new System.Drawing.Size(202, 6);
>>>>>>>
this.toolStripSeparator1.Size = new System.Drawing.Size(202, 6);
<<<<<<<
this.editGitIgnoreToolStripMenuItem.Size = new System.Drawing.Size(255, 24);
=======
this.editGitIgnoreToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
>>>>>>>
this.editGitIgnoreToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
<<<<<<<
this.deleteAllUntrackedFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24);
=======
this.deleteAllUntrackedFilesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
>>>>>>>
this.deleteAllUntrackedFilesToolStripMenuItem.Size = new System.Drawing.Size(205, 22);
<<<<<<<
this.closeDialogAfterEachCommitToolStripMenuItem.Size = new System.Drawing.Size(380, 24);
=======
this.closeDialogAfterEachCommitToolStripMenuItem.Size = new System.Drawing.Size(290, 22);
>>>>>>>
this.closeDialogAfterEachCommitToolStripMenuItem.Size = new System.Drawing.Size(290, 22);
<<<<<<<
this.closeDialogAfterAllFilesCommittedToolStripMenuItem.Size = new System.Drawing.Size(380, 24);
=======
this.closeDialogAfterAllFilesCommittedToolStripMenuItem.Size = new System.Drawing.Size(290, 22);
>>>>>>>
this.closeDialogAfterAllFilesCommittedToolStripMenuItem.Size = new System.Drawing.Size(290, 22);
<<<<<<<
this.refreshDialogOnFormFocusToolStripMenuItem.Size = new System.Drawing.Size(380, 24);
=======
this.refreshDialogOnFormFocusToolStripMenuItem.Size = new System.Drawing.Size(290, 22);
>>>>>>>
this.refreshDialogOnFormFocusToolStripMenuItem.Size = new System.Drawing.Size(290, 22);
<<<<<<<
this.toolStripSeparator2.Size = new System.Drawing.Size(377, 6);
=======
this.toolStripSeparator2.Size = new System.Drawing.Size(287, 6);
>>>>>>>
this.toolStripSeparator2.Size = new System.Drawing.Size(287, 6);
<<<<<<<
this.toolAuthorLabelItem.Size = new System.Drawing.Size(380, 24);
=======
this.toolAuthorLabelItem.Size = new System.Drawing.Size(290, 22);
>>>>>>>
this.toolAuthorLabelItem.Size = new System.Drawing.Size(290, 22);
<<<<<<<
private LinkLabel llShowPreview;
=======
private ToolStripSeparator toolStripMenuItem2;
private ToolStripContainer toolStripContainer1;
private ToolStrip toolbarSelectionFilter;
private ToolStripLabel toolStripLabel1;
private ToolStripComboBox selectionFilter;
private ToolStripMenuItem selectionFilterToolStripMenuItem;
>>>>>>>
private ToolStripSeparator toolStripMenuItem2;
private ToolStripContainer toolStripContainer1;
private ToolStrip toolbarSelectionFilter;
private ToolStripLabel toolStripLabel1;
private ToolStripComboBox selectionFilter;
private ToolStripMenuItem selectionFilterToolStripMenuItem;
private LinkLabel llShowPreview; |
<<<<<<<
this._NO_TRANSLATE_filesWillBeIgnored.Location = new System.Drawing.Point(449, 211);
this._NO_TRANSLATE_filesWillBeIgnored.Name = "_NO_TRANSLATE_filesWillBeIgnored";
this._NO_TRANSLATE_filesWillBeIgnored.Size = new System.Drawing.Size(0, 12);
=======
this._NO_TRANSLATE_filesWillBeIgnored.Dock = System.Windows.Forms.DockStyle.Right;
this._NO_TRANSLATE_filesWillBeIgnored.Location = new System.Drawing.Point(455, 0);
this._NO_TRANSLATE_filesWillBeIgnored.Name = "_NO_TRANSLATE_filesWillBeIgnored";
this._NO_TRANSLATE_filesWillBeIgnored.Size = new System.Drawing.Size(120, 15);
>>>>>>>
this._NO_TRANSLATE_filesWillBeIgnored.Dock = System.Windows.Forms.DockStyle.Right;
this._NO_TRANSLATE_filesWillBeIgnored.Location = new System.Drawing.Point(455, 0);
this._NO_TRANSLATE_filesWillBeIgnored.Name = "_NO_TRANSLATE_filesWillBeIgnored";
this._NO_TRANSLATE_filesWillBeIgnored.Size = new System.Drawing.Size(120, 15);
<<<<<<<
this._NO_TRANSLATE_Preview.ItemHeight = 12;
this._NO_TRANSLATE_Preview.Location = new System.Drawing.Point(12, 22);
this._NO_TRANSLATE_Preview.Name = "_NO_TRANSLATE_Preview";
this._NO_TRANSLATE_Preview.Size = new System.Drawing.Size(528, 186);
=======
this._NO_TRANSLATE_Preview.ItemHeight = 15;
this._NO_TRANSLATE_Preview.Location = new System.Drawing.Point(12, 24);
this._NO_TRANSLATE_Preview.Name = "_NO_TRANSLATE_Preview";
this._NO_TRANSLATE_Preview.Size = new System.Drawing.Size(575, 180);
>>>>>>>
this._NO_TRANSLATE_Preview.ItemHeight = 12;
this._NO_TRANSLATE_Preview.Location = new System.Drawing.Point(12, 22);
this._NO_TRANSLATE_Preview.Name = "_NO_TRANSLATE_Preview";
this._NO_TRANSLATE_Preview.Size = new System.Drawing.Size(575, 180);
<<<<<<<
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(12, 19);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(129, 12);
this.label1.TabIndex = 5;
this.label1.Text = "Enter a file pattern to ignore:";
//
=======
>>>>>>>
<<<<<<<
this.FilePattern.Size = new System.Drawing.Size(202, 21);
=======
this.FilePattern.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.FilePattern.Size = new System.Drawing.Size(575, 71);
>>>>>>>
this.FilePattern.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.FilePattern.Size = new System.Drawing.Size(575, 71); |
<<<<<<<
this.Revisions.TabIndex = 0;
=======
this.Revisions.Scroll += new System.Windows.Forms.ScrollEventHandler(this.Revisions_Scroll);
>>>>>>>
<<<<<<<
=======
this.Revisions.CellContextMenuStripChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.Revisions_CellContextMenuStripChanged);
this.Revisions.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Revisions_CellContentClick);
//
// Graph
//
resources.ApplyResources(this.Graph, "Graph");
this.Graph.Name = "Graph";
this.Graph.ReadOnly = true;
>>>>>>>
<<<<<<<
this.deleteTagToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
=======
resources.ApplyResources(this.deleteTagToolStripMenuItem, "deleteTagToolStripMenuItem");
this.deleteTagToolStripMenuItem.Click += new System.EventHandler(this.deleteTagToolStripMenuItem_Click);
>>>>>>>
resources.ApplyResources(this.deleteTagToolStripMenuItem, "deleteTagToolStripMenuItem");
<<<<<<<
this.deleteBranchToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
=======
resources.ApplyResources(this.deleteBranchToolStripMenuItem, "deleteBranchToolStripMenuItem");
this.deleteBranchToolStripMenuItem.Click += new System.EventHandler(this.deleteBranchToolStripMenuItem_Click);
>>>>>>>
resources.ApplyResources(this.deleteBranchToolStripMenuItem, "deleteBranchToolStripMenuItem");
<<<<<<<
this.label1.Size = new System.Drawing.Size(315, 104);
this.label1.TabIndex = 0;
=======
this.label1.Click += new System.EventHandler(this.label1_Click);
>>>>>>>
<<<<<<<
this.Size = new System.Drawing.Size(585, 204);
=======
this.Load += new System.EventHandler(this.RevisionGrid_Load);
>>>>>>> |
<<<<<<<
InitializeComponent();
=======
InitializeComponent(); Translate();
Revisions.Columns[0].Width = 40;
>>>>>>>
InitializeComponent(); Translate(); |
<<<<<<<
using System.Collections.Generic;
namespace GitUIPluginInterfaces
{
public interface IGitModule
{
IEnumerable<IGitSubmodule> GetSubmodules();
string RunGit(string arguments);
string RunGit(string arguments, out int exitCode);
string RunBatchFile(string batchFile);
string GitWorkingDir { get; }
string GetGitDirectory();
bool IsValidGitWorkingDir();
string GitCommand { get; }
string GitVersion { get; }
string GravatarCacheDir { get; }
IList<string> GetSubmodulesLocalPathes();
IGitModule GetISubmodule(string submoduleName);
string[] GetRemotes(bool allowEmpty);
string GetISetting(string setting);
bool StartPageantForRemote(string remote);
string RunCmd(string cmd, string arguments);
string RunCmd(string cmd, string arguments, byte[] stdIn);
string GetSelectedBranch();
bool IsBareRepository();
bool IsRunningGitProcess();
}
}
=======
using System;
using System.Collections.Generic;
namespace GitUIPluginInterfaces
{
public interface IGitModule
{
IEnumerable<IGitSubmodule> GetSubmodules();
string RunGit(string arguments);
string RunGit(string arguments, out int exitCode);
string RunBatchFile(string batchFile);
string GitWorkingDir { get; }
string GetGitDirectory();
bool IsValidGitWorkingDir(string workingDir);
string GitCommand { get; }
Version AppVersion { get; }
string GravatarCacheDir { get; }
IList<string> GetSubmodulesLocalPathes();
IGitModule GetISubmodule(string submoduleName);
string[] GetRemotes(bool allowEmpty);
string GetISetting(string setting);
bool StartPageantForRemote(string remote);
string RunCmd(string cmd, string arguments);
string RunCmd(string cmd, string arguments, byte[] stdIn);
string GetSelectedBranch();
bool IsBareRepository();
}
}
>>>>>>>
using System;
using System.Collections.Generic;
namespace GitUIPluginInterfaces
{
public interface IGitModule
{
IEnumerable<IGitSubmodule> GetSubmodules();
string RunGit(string arguments);
string RunGit(string arguments, out int exitCode);
string RunBatchFile(string batchFile);
string GitWorkingDir { get; }
string GetGitDirectory();
bool IsValidGitWorkingDir();
string GitCommand { get; }
Version AppVersion { get; }
string GravatarCacheDir { get; }
IList<string> GetSubmodulesLocalPathes();
IGitModule GetISubmodule(string submoduleName);
string[] GetRemotes(bool allowEmpty);
string GetISetting(string setting);
bool StartPageantForRemote(string remote);
string RunCmd(string cmd, string arguments);
string RunCmd(string cmd, string arguments, byte[] stdIn);
string GetSelectedBranch();
bool IsBareRepository();
bool IsRunningGitProcess();
}
} |
<<<<<<<
[JsonConverter(typeof(OptionalJsonConverter))]
public struct Optional<T> : IEquatable<Optional<T>>, IEquatable<T>
=======
public readonly struct Optional<T> : IEquatable<Optional<T>>, IEquatable<T>
>>>>>>>
[JsonConverter(typeof(OptionalJsonConverter))]
public readonly struct Optional<T> : IEquatable<Optional<T>>, IEquatable<T> |
<<<<<<<
if (!Settings.Module.IsBareRepository()) return;
MessageBox.Show(noWorkingDir.Text);
=======
if (!Settings.IsBareRepository()) return;
MessageBox.Show(noWorkingDir.Text, _noWorkingDirCaption.Text);
>>>>>>>
if (!Settings.Module.IsBareRepository()) return;
MessageBox.Show(noWorkingDir.Text, _noWorkingDirCaption.Text); |
<<<<<<<
this.tableLayoutPanel3.SetRowSpan(this.panelCurrentSettingsPage, 2);
this.panelCurrentSettingsPage.Size = new System.Drawing.Size(724, 554);
=======
this.panelCurrentSettingsPage.Size = new System.Drawing.Size(724, 557);
>>>>>>>
this.tableLayoutPanel3.SetRowSpan(this.panelCurrentSettingsPage, 2);
this.panelCurrentSettingsPage.Size = new System.Drawing.Size(724, 557); |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.