conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
// タグテーブルに種別を追加
migrationBuilder.AddColumn<int>(
name: "Type",
table: "Tags",
nullable: false,
defaultValue: 0);
// 登録済みのタグはすべてデータ管理から登録されたものとする。
migrationBuilder.Sql("UPDATE \"Tags\" SET \"Type\" = 1;");
=======
// ノートブック履歴に実行コマンドカラムを追加
migrationBuilder.AddColumn<string>(
name: "EntryPoint",
table: "NotebookHistories",
nullable: true);
>>>>>>>
// ノートブック履歴に実行コマンドカラムを追加
migrationBuilder.AddColumn<string>(
name: "EntryPoint",
table: "NotebookHistories",
nullable: true);
// タグテーブルに種別を追加
migrationBuilder.AddColumn<int>(
name: "Type",
table: "Tags",
nullable: false,
defaultValue: 0);
// 登録済みのタグはすべてデータ管理から登録されたものとする。
migrationBuilder.Sql("UPDATE \"Tags\" SET \"Type\" = 1;");
<<<<<<<
// タグテーブルから TypeがTraining のレコードを削除
migrationBuilder.Sql($"DELETE FROM \"Tags\" WHERE \"Type\" = {(int)TagType.Training};");
// タグテーブルから種別を削除
migrationBuilder.DropColumn(
name: "Type",
table: "Tags");
=======
// ノートブック履歴から実行コマンドカラムを削除
migrationBuilder.DropColumn(
name: "EntryPoint",
table: "NotebookHistories");
>>>>>>>
// ノートブック履歴から実行コマンドカラムを削除
migrationBuilder.DropColumn(
name: "EntryPoint",
table: "NotebookHistories");
// タグテーブルから TypeがTraining のレコードを削除
migrationBuilder.Sql($"DELETE FROM \"Tags\" WHERE \"Type\" = {(int)TagType.Training};");
// タグテーブルから種別を削除
migrationBuilder.DropColumn(
name: "Type",
table: "Tags"); |
<<<<<<<
/// <summary>
/// マウントした学習ID
/// tensorboard起動時に追加した学習IDが入る
/// </summary>
public string MountTrainingHistoryIds { get; set; }
=======
/// <summary>
/// タグ
/// </summary>
public IEnumerable<string> Tags
{
get
{
if (TagMaps == null)
{
return null;
}
return TagMaps.Select(tm => tm.Tag?.Name);
}
}
>>>>>>>
/// <summary>
/// マウントした学習ID
/// tensorboard起動時に追加した学習IDが入る
/// </summary>
public string MountTrainingHistoryIds { get; set; }
/// タグ
/// </summary>
public IEnumerable<string> Tags
{
get
{
if (TagMaps == null)
{
return null;
}
return TagMaps.Select(tm => tm.Tag?.Name);
}
} |
<<<<<<<
/// <summary>
/// If Debounce Interval is null or 0, Value should change immediately
/// </summary>
[Test]
public void WithNoDebounceIntervalValueShouldChangeImmediatelyTest()
{
//Arrange
using var ctx = new Bunit.TestContext();
//no interval passed, so, by default is 0
// We pass the Immediate parameter set to true, in order to bind to oninput
var immediate = Parameter(nameof(MudTextField<string>.Immediate), true);
var comp = ctx.RenderComponent<MudTextField<string>>(immediate);
var textField = comp.Instance;
var input = comp.Find("input");
//Act
input.Input(new ChangeEventArgs() { Value = "Some Value" });
//Assert
//input value has changed, DebounceInterval is 0, so Value should change in TextField immediately
textField.Value.Should().Be("Some Value");
}
/// <summary>
/// Value should not change immediately. Should respect the Debounce Interval
/// </summary>
[Test]
public async Task ShouldRespectDebounceIntervalPropertyInTextFieldTest()
{
//Arrange
using var ctx = new Bunit.TestContext();
var interval = Parameter(nameof(MudTextField<string>.DebounceInterval), 1000d);
var comp = ctx.RenderComponent<MudTextField<string>>(interval);
var textField = comp.Instance;
var input = comp.Find("input");
//Act
input.Input(new ChangeEventArgs() { Value = "Some Value" });
//Assert
//if DebounceInterval is set, Immediate should be true by default
textField.Immediate.Should().BeTrue();
//input value has changed, but elapsed time is 0, so Value should not change in TextField
textField.Value.Should().BeNull();
//DebounceInterval is 1000 ms, so at 500 ms Value should not change in TextField
await Task.Delay(500);
textField.Value.Should().BeNull();
//More than 1000 ms had elapsed, so Value should be updated
await Task.Delay(510);
textField.Value.Should().Be("Some Value");
}
=======
/// <summary>
/// Setting the value to null should not cause a validation error
/// </summary>
[Test]
public async Task TextFieldWithNullableTypes()
{
using var ctx = new Bunit.TestContext();
//ctx.Services.AddSingleton<NavigationManager>(new MockNavigationManager());
var comp = ctx.RenderComponent<MudTextField<int?>>(ComponentParameter.CreateParameter("Value", 17));
// print the generated html
Console.WriteLine(comp.Markup);
var textfield = comp.Instance;
await comp.InvokeAsync(()=>textfield.Value=null);
comp.Find("input").Blur();
comp.FindAll("div.mud-input-error").Count.Should().Be(0);
await comp.InvokeAsync(() => textfield.Text = "");
comp.Find("input").Blur();
comp.FindAll("div.mud-input-error").Count.Should().Be(0);
}
/// <summary>
/// Setting an invalid number should show the conversion error message
/// </summary>
[Test]
public async Task TextFieldConversionError()
{
using var ctx = new Bunit.TestContext();
//ctx.Services.AddSingleton<NavigationManager>(new MockNavigationManager());
var comp = ctx.RenderComponent<MudTextField<int?>>();
// print the generated html
Console.WriteLine(comp.Markup);
var textfield = comp.Instance;
await comp.InvokeAsync(() => textfield.Text = "seventeen");
comp.Find("input").Blur();
comp.FindAll("div.mud-input-error").Count.Should().Be(1);
comp.Find("div.mud-input-error").TextContent.Trim().Should().Be("Not a valid number");
}
>>>>>>>
/// <summary>
/// Setting the value to null should not cause a validation error
/// </summary>
[Test]
public async Task TextFieldWithNullableTypes()
{
using var ctx = new Bunit.TestContext();
//ctx.Services.AddSingleton<NavigationManager>(new MockNavigationManager());
var comp = ctx.RenderComponent<MudTextField<int?>>(ComponentParameter.CreateParameter("Value", 17));
// print the generated html
Console.WriteLine(comp.Markup);
var textfield = comp.Instance;
await comp.InvokeAsync(()=>textfield.Value=null);
comp.Find("input").Blur();
comp.FindAll("div.mud-input-error").Count.Should().Be(0);
await comp.InvokeAsync(() => textfield.Text = "");
comp.Find("input").Blur();
comp.FindAll("div.mud-input-error").Count.Should().Be(0);
}
/// <summary>
/// Setting an invalid number should show the conversion error message
/// </summary>
[Test]
public async Task TextFieldConversionError()
{
using var ctx = new Bunit.TestContext();
//ctx.Services.AddSingleton<NavigationManager>(new MockNavigationManager());
var comp = ctx.RenderComponent<MudTextField<int?>>();
// print the generated html
Console.WriteLine(comp.Markup);
var textfield = comp.Instance;
await comp.InvokeAsync(() => textfield.Text = "seventeen");
comp.Find("input").Blur();
comp.FindAll("div.mud-input-error").Count.Should().Be(1);
comp.Find("div.mud-input-error").TextContent.Trim().Should().Be("Not a valid number");
}
/// <summary>
/// If Debounce Interval is null or 0, Value should change immediately
/// </summary>
[Test]
public void WithNoDebounceIntervalValueShouldChangeImmediatelyTest()
{
//Arrange
using var ctx = new Bunit.TestContext();
//no interval passed, so, by default is 0
// We pass the Immediate parameter set to true, in order to bind to oninput
var immediate = Parameter(nameof(MudTextField<string>.Immediate), true);
var comp = ctx.RenderComponent<MudTextField<string>>(immediate);
var textField = comp.Instance;
var input = comp.Find("input");
//Act
input.Input(new ChangeEventArgs() { Value = "Some Value" });
//Assert
//input value has changed, DebounceInterval is 0, so Value should change in TextField immediately
textField.Value.Should().Be("Some Value");
}
/// <summary>
/// Value should not change immediately. Should respect the Debounce Interval
/// </summary>
[Test]
public async Task ShouldRespectDebounceIntervalPropertyInTextFieldTest()
{
//Arrange
using var ctx = new Bunit.TestContext();
var interval = Parameter(nameof(MudTextField<string>.DebounceInterval), 1000d);
var comp = ctx.RenderComponent<MudTextField<string>>(interval);
var textField = comp.Instance;
var input = comp.Find("input");
//Act
input.Input(new ChangeEventArgs() { Value = "Some Value" });
//Assert
//if DebounceInterval is set, Immediate should be true by default
textField.Immediate.Should().BeTrue();
//input value has changed, but elapsed time is 0, so Value should not change in TextField
textField.Value.Should().BeNull();
//DebounceInterval is 1000 ms, so at 500 ms Value should not change in TextField
await Task.Delay(500);
textField.Value.Should().BeNull();
//More than 1000 ms had elapsed, so Value should be updated
await Task.Delay(510);
textField.Value.Should().Be("Some Value");
} |
<<<<<<<
using System;
using System.Globalization;
=======
using System.Collections.Generic;
using System.Globalization;
>>>>>>>
using System;
using System.Collections.Generic;
using System.Globalization;
<<<<<<<
[Inject] public IJSRuntime JSRuntime { get; set; }
protected bool _settingText;
=======
>>>>>>>
[Inject] public IJSRuntime JSRuntime { get; set; }
<<<<<<<
/// Focuses the element
/// </summary>
/// <returns>The ValueTask</returns>
public abstract ValueTask FocusAsync();
public abstract ValueTask SelectAsnyc();
public abstract ValueTask SelectRangeAsync(int pos1, int pos2);
/// <summary>
/// Text change hook for descendants
=======
/// Text change hook for descendants. Called when Text needs to be refreshed from current Value property.
>>>>>>>
/// Focuses the element
/// </summary>
/// <returns>The ValueTask</returns>
public abstract ValueTask FocusAsync();
public abstract ValueTask SelectAsnyc();
public abstract ValueTask SelectRangeAsync(int pos1, int pos2);
/// <summary>
/// Text change hook for descendants. Called when Text needs to be refreshed from current Value property. |
<<<<<<<
services.AddMudBlazorScrollManager();
services.AddMudBlazorScrollListener();
=======
services.AddSingleton<IApiLinkService, ApiLinkService>();
services.AddSingleton<IMenuService,MenuService>();
services.AddScoped<IDocsNavigationService,DocsNavigationService>();
>>>>>>>
services.AddSingleton<IApiLinkService, ApiLinkService>();
services.AddSingleton<IMenuService,MenuService>();
services.AddScoped<IDocsNavigationService,DocsNavigationService>();
services.AddMudBlazorScrollManager();
services.AddMudBlazorScrollListener(); |
<<<<<<<
using MudBlazor.Docs.Services;
=======
using MudBlazor.Docs.Services;
>>>>>>>
using MudBlazor.Docs.Services;
<<<<<<<
services.AddScoped<IDocsNavigationService,DocsNavigationService>();
services.AddScoped<IMenuService,MenuService>();
=======
services.AddSingleton<IApiLinkService, ApiLinkService>();
>>>>>>>
services.AddSingleton<IApiLinkService, ApiLinkService>();
services.AddScoped<IDocsNavigationService,DocsNavigationService>();
services.AddScoped<IMenuService,MenuService>(); |
<<<<<<<
public const string DialogBodyScrollableExample = @"<MudDialog DisableSidePadding=""true"">
<DialogContent>
<MudContainer Style=""max-height: 300px; overflow-y: scroll"">
<MudText Class=""mb-5"" Typo=""Typo.body1"">Copyright (c) 2020 - The MudBlazor Team and Contributors</MudText>
@if (Loading)
{
<MudProgressCircular Indeterminate=""true""></MudProgressCircular>
}
else
{
<MudText Style=""white-space: pre-wrap;"">@LicenseText</MudText>
}
</MudContainer>
</DialogContent>
<DialogActions>
<MudButton Color=""Color.Primary"" OnClick=""Ok"">Accept</MudButton>
</DialogActions>
</MudDialog>
@code {
[CascadingParameter] MudDialogInstance MudDialog { get; set; }
protected override async Task OnInitializedAsync()
{
Loading = true;
var bytes = await new WebClient().DownloadDataTaskAsync(new Uri(""https://raw.githubusercontent.com/Garderoben/MudBlazor/master/LICENSE""));
LicenseText = Encoding.UTF8.GetString(bytes);
Loading = false;
await base.OnInitializedAsync();
}
string LicenseText;
bool Loading = false;
void Ok()
{
MudDialog.Close(DialogResult.Ok(true));
}
}";
=======
public const string DatePickeViewsExample = @"<MudDatePicker Label=""Year"" OpenTo=""OpenTo.Year"" Value=""2020-10-19""/>
<MudDatePicker Label=""Month"" OpenTo=""OpenTo.Month"" Value=""2020-10-19"" />
<MudDatePicker Label=""Date"" Value=""2020-10-19"" />";
>>>>>>>
public const string DatePickeViewsExample = @"<MudDatePicker Label=""Year"" OpenTo=""OpenTo.Year"" Value=""2020-10-19""/>
<MudDatePicker Label=""Month"" OpenTo=""OpenTo.Month"" Value=""2020-10-19"" />
<MudDatePicker Label=""Date"" Value=""2020-10-19"" />";
public const string DialogBodyScrollableExample = @"<MudDialog DisableSidePadding=""true"">
<DialogContent>
<MudContainer Style=""max-height: 300px; overflow-y: scroll"">
<MudText Class=""mb-5"" Typo=""Typo.body1"">Copyright (c) 2020 - The MudBlazor Team and Contributors</MudText>
@if (Loading)
{
<MudProgressCircular Indeterminate=""true""></MudProgressCircular>
}
else
{
<MudText Style=""white-space: pre-wrap;"">@LicenseText</MudText>
}
</MudContainer>
</DialogContent>
<DialogActions>
<MudButton Color=""Color.Primary"" OnClick=""Ok"">Accept</MudButton>
</DialogActions>
</MudDialog>
@code {
[CascadingParameter] MudDialogInstance MudDialog { get; set; }
protected override async Task OnInitializedAsync()
{
Loading = true;
var bytes = await new WebClient().DownloadDataTaskAsync(new Uri(""https://raw.githubusercontent.com/Garderoben/MudBlazor/master/LICENSE""));
LicenseText = Encoding.UTF8.GetString(bytes);
Loading = false;
await base.OnInitializedAsync();
}
string LicenseText;
bool Loading = false;
void Ok()
{
MudDialog.Close(DialogResult.Ok(true));
}
}"; |
<<<<<<<
.UseDefaultHostingConfiguration(args)
=======
// We set the server by name before default args so that command line arguments can override it.
// This is used to allow deployers to choose the server for testing.
.UseServer("Microsoft.AspNetCore.Server.Kestrel")
.UseConfiguration(config)
>>>>>>>
.UseConfiguration(config) |
<<<<<<<
static char[] split = { ' ' };
public override void onMsg(ref MessageBase msg)
=======
public new void onMsg(ref MessageBase msg)
>>>>>>>
static char[] split = { ' ' };
public new void onMsg(ref MessageBase msg) |
<<<<<<<
=======
banManager = new BanManager();
base.onInitFilter += manager => manager.AddFilters(banManager.GetClientFliter(), banManager.GetServerFliter());
base.onInitPlugin += () => Sync.Tools.ConsoleWriter.WriteColor(Name + " By " + Author, ConsoleColor.DarkCyan);
>>>>>>>
banManager = new BanManager();
base.onInitFilter += manager => manager.AddFilters(banManager.GetClientFliter(), banManager.GetServerFliter());
base.onInitPlugin += () => Sync.Tools.ConsoleWriter.WriteColor(Name + " By " + Author, ConsoleColor.DarkCyan); |
<<<<<<<
private void InitAdvance()
{
if (!Directory.Exists(OsuFolderPath))
return;
try
{
var currentDatabase = OsuDb.Read(OsuFolderPath + "osu!.db");
CurrentBeatmapList = currentDatabase.Beatmaps;
CurrentOsuFilesWatcher = new FileSystemWatcher(OsuFolderPath + @"Songs", "*.osu");
CurrentOsuFilesWatcher.EnableRaisingEvents = true;
CurrentOsuFilesWatcher.IncludeSubdirectories = true;
CurrentOsuFilesWatcher.Changed += CurrentOsuFilesWatcher_Changed;
}
catch
{
CurrentBeatmapList = null;
}
}
private void CurrentOsuFilesWatcher_Changed(object sender, FileSystemEventArgs e)
{
BeatmapEntry beatmap = OsuFileParser.ParseText(File.ReadAllText(e.FullPath));
var select_beatmaps = CurrentBeatmapList.AsParallel().Where((enum_beatmap) =>
{
if (((enum_beatmap.Title.Trim() == beatmap.Title.Trim())) && enum_beatmap.Difficulty == beatmap.Difficulty && ((enum_beatmap.Artist.Trim() == beatmap.Artist.Trim())))
return true;
return false;
});
if (select_beatmaps.Count() != 0)
{
CurrentBeatmapList.Remove(select_beatmaps.First());
}
CurrentBeatmapList.Add(beatmap);
#if DEBUG
IO.CurrentIO.WriteColor($"file {e.Name} was modified/created.beatmap :{beatmap.ArtistUnicode??beatmap.Artist} - {beatmap.TitleUnicode??beatmap.Title}", ConsoleColor.Green);
#endif
}
private void NowPlaying_onInitPlugin()
=======
private void NowPlaying_onInitPlugin(PluginEvents.InitPluginEvent @event)
>>>>>>>
private void InitAdvance()
{
if (!Directory.Exists(OsuFolderPath))
return;
try
{
var currentDatabase = OsuDb.Read(OsuFolderPath + "osu!.db");
CurrentBeatmapList = currentDatabase.Beatmaps;
CurrentOsuFilesWatcher = new FileSystemWatcher(OsuFolderPath + @"Songs", "*.osu");
CurrentOsuFilesWatcher.EnableRaisingEvents = true;
CurrentOsuFilesWatcher.IncludeSubdirectories = true;
CurrentOsuFilesWatcher.Changed += CurrentOsuFilesWatcher_Changed;
}
catch
{
CurrentBeatmapList = null;
}
}
private void CurrentOsuFilesWatcher_Changed(object sender, FileSystemEventArgs e)
{
BeatmapEntry beatmap = OsuFileParser.ParseText(File.ReadAllText(e.FullPath));
var select_beatmaps = CurrentBeatmapList.AsParallel().Where((enum_beatmap) =>
{
if (((enum_beatmap.Title.Trim() == beatmap.Title.Trim())) && enum_beatmap.Difficulty == beatmap.Difficulty && ((enum_beatmap.Artist.Trim() == beatmap.Artist.Trim())))
return true;
return false;
});
if (select_beatmaps.Count() != 0)
{
CurrentBeatmapList.Remove(select_beatmaps.First());
}
CurrentBeatmapList.Add(beatmap);
#if DEBUG
IO.CurrentIO.WriteColor($"file {e.Name} was modified/created.beatmap :{beatmap.ArtistUnicode??beatmap.Artist} - {beatmap.TitleUnicode??beatmap.Title}", ConsoleColor.Green);
#endif
}
private void NowPlaying_onInitPlugin(PluginEvents.InitPluginEvent e)
<<<<<<<
return true;
=======
>>>>>>>
return; |
<<<<<<<
[Fact]
public void VerifyDeduplication() {
var client = new ExceptionlessClient();
var errorPlugin = new ErrorPlugin();
using (var duplicateCheckerPlugin = new DuplicateCheckerPlugin(TimeSpan.FromMilliseconds(20))) {
for (int index = 0; index < 2; index++) {
var builder = GetException().ToExceptionless();
var context = new EventPluginContext(client, builder.Target, builder.PluginContextData);
errorPlugin.Run(context);
duplicateCheckerPlugin.Run(context);
if (index == 0) {
Assert.False(context.Cancel);
Assert.Null(context.Event.Value);
} else {
Assert.True(context.Cancel);
Thread.Sleep(50);
Assert.Equal(1, context.Event.Value);
}
}
}
}
private Exception GetException(string message = "Test") {
try {
throw new Exception(message);
} catch (Exception ex) {
return ex;
}
}
=======
[Fact]
public void RunBenchmark() {
var summary = BenchmarkRunner.Run<DeduplicationBenchmarks>();
foreach (var benchmark in summary.Benchmarks) {
var report = summary.Reports[benchmark];
_writer.WriteLine(report.ToString());
var benchmarkMedianMilliseconds = report.ResultStatistics.Median / 1000000;
_writer.WriteLine($"{benchmark.ShortInfo} - {benchmarkMedianMilliseconds:0.00}ms");
}
}
>>>>>>>
[Fact]
public void VerifyDeduplication() {
var client = new ExceptionlessClient();
var errorPlugin = new ErrorPlugin();
using (var duplicateCheckerPlugin = new DuplicateCheckerPlugin(TimeSpan.FromMilliseconds(20))) {
for (int index = 0; index < 2; index++) {
var builder = GetException().ToExceptionless();
var context = new EventPluginContext(client, builder.Target, builder.PluginContextData);
errorPlugin.Run(context);
duplicateCheckerPlugin.Run(context);
if (index == 0) {
Assert.False(context.Cancel);
Assert.Null(context.Event.Value);
} else {
Assert.True(context.Cancel);
Thread.Sleep(50);
Assert.Equal(1, context.Event.Value);
}
}
}
}
private Exception GetException(string message = "Test") {
try {
throw new Exception(message);
} catch (Exception ex) {
return ex;
}
}
[Fact]
public void RunBenchmark() {
var summary = BenchmarkRunner.Run<DeduplicationBenchmarks>();
foreach (var benchmark in summary.Benchmarks) {
var report = summary.Reports[benchmark];
_writer.WriteLine(report.ToString());
var benchmarkMedianMilliseconds = report.ResultStatistics.Median / 1000000;
_writer.WriteLine($"{benchmark.ShortInfo} - {benchmarkMedianMilliseconds:0.00}ms");
}
} |
<<<<<<<
using Newtonsoft.Json;
using System;
namespace WebVella.ERP.Api.Models
{
public class DateField : Field
{
[JsonProperty(PropertyName = "fieldType")]
public static FieldType FieldType { get { return FieldType.DateField; } }
[JsonProperty(PropertyName = "defaultValue")]
public DateTime? DefaultValue { get; set; }
[JsonProperty(PropertyName = "format")]
public string Format { get; set; }
public DateField()
{
}
public DateField(Field field) : base(field)
{
}
public DateField(InputField field) : base(field)
{
DefaultValue = (DateTime?)field["defaultValue"];
Format = (string)field["format"];
}
}
public class DateFieldMeta : DateField, IFieldMeta
{
[JsonProperty(PropertyName = "entityId")]
public Guid EntityId { get; set; }
[JsonProperty(PropertyName = "entityName")]
public string EntityName { get; set; }
[JsonProperty(PropertyName = "parentFieldName")]
public string ParentFieldName { get; set; }
public DateFieldMeta(Guid entityId, string entityName, DateField field, string parentFieldName = null) : base(field)
{
EntityId = entityId;
EntityName = entityName;
DefaultValue = field.DefaultValue;
Format = field.Format;
ParentFieldName = parentFieldName;
}
}
=======
using Newtonsoft.Json;
using System;
namespace WebVella.ERP.Api.Models
{
public class DateField : Field
{
[JsonProperty(PropertyName = "fieldType")]
public static FieldType FieldType { get { return FieldType.DateField; } }
[JsonProperty(PropertyName = "defaultValue")]
public DateTime? DefaultValue { get; set; }
[JsonProperty(PropertyName = "format")]
public string Format { get; set; }
[JsonProperty(PropertyName = "useCurrentTimeAsDefaultValue")]
public bool? UseCurrentTimeAsDefaultValue { get; set; }
public DateField()
{
}
public DateField(InputField field) : base(field)
{
DefaultValue = (DateTime?)field["defaultValue"];
Format = (string)field["format"];
UseCurrentTimeAsDefaultValue = (bool?)field["useCurrentTimeAsDefaultValue"];
}
}
public class DateFieldMeta : DateField, IFieldMeta
{
[JsonProperty(PropertyName = "entityId")]
public Guid EntityId { get; set; }
[JsonProperty(PropertyName = "entityName")]
public string EntityName { get; set; }
[JsonProperty(PropertyName = "parentFieldName")]
public string ParentFieldName { get; set; }
public DateFieldMeta(Guid entityId, string entityName, DateField field, string parentFieldName = null)
{
EntityId = entityId;
EntityName = entityName;
DefaultValue = field.DefaultValue;
Format = field.Format;
UseCurrentTimeAsDefaultValue = field.UseCurrentTimeAsDefaultValue;
ParentFieldName = parentFieldName;
}
}
>>>>>>>
using Newtonsoft.Json;
using System;
namespace WebVella.ERP.Api.Models
{
public class DateField : Field
{
[JsonProperty(PropertyName = "fieldType")]
public static FieldType FieldType { get { return FieldType.DateField; } }
[JsonProperty(PropertyName = "defaultValue")]
public DateTime? DefaultValue { get; set; }
[JsonProperty(PropertyName = "format")]
public string Format { get; set; }
[JsonProperty(PropertyName = "useCurrentTimeAsDefaultValue")]
public bool? UseCurrentTimeAsDefaultValue { get; set; }
public DateField()
{
}
public DateField(Field field) : base(field)
{
}
public DateField(InputField field) : base(field)
{
DefaultValue = (DateTime?)field["defaultValue"];
Format = (string)field["format"];
UseCurrentTimeAsDefaultValue = (bool?)field["useCurrentTimeAsDefaultValue"];
}
}
public class DateFieldMeta : DateField, IFieldMeta
{
[JsonProperty(PropertyName = "entityId")]
public Guid EntityId { get; set; }
[JsonProperty(PropertyName = "entityName")]
public string EntityName { get; set; }
[JsonProperty(PropertyName = "parentFieldName")]
public string ParentFieldName { get; set; }
public DateFieldMeta(Guid entityId, string entityName, DateField field, string parentFieldName = null) : base(field)
{
EntityId = entityId;
EntityName = entityName;
DefaultValue = field.DefaultValue;
Format = field.Format;
UseCurrentTimeAsDefaultValue = field.UseCurrentTimeAsDefaultValue;
ParentFieldName = parentFieldName;
}
} |
<<<<<<<
using System;
using System.Collections.Generic;
using MongoDB.Bson.Serialization.Attributes;
namespace WebVella.ERP.Storage.Mongo
{
public class MongoEntity : IEntity
{
[BsonId]
public Guid Id { get; set; }
public string Name { get; set; }
public bool System { get; set; }
public List<IField> Fields { get; set; }
}
=======
using System;
using System.Collections.Generic;
using MongoDB.Bson.Serialization.Attributes;
namespace WebVella.ERP.Storage.Mongo
{
public class MongoEntity : MongoDocumentBase, IEntity
{
public string Name { get; set; }
public List<IField> Fields { get; set; }
}
>>>>>>>
using System;
using System.Collections.Generic;
using MongoDB.Bson.Serialization.Attributes;
namespace WebVella.ERP.Storage.Mongo
{
public class MongoEntity : MongoDocumentBase, IEntity
{
public string Name { get; set; }
public bool System { get; set; }
public List<IField> Fields { get; set; }
} |
<<<<<<<
namespace WpfMath
{
public enum TexDelimeterType
{
Over = 0,
Under = 1
}
public enum TexAtomType
{
None = -1,
Ordinary = 0,
BigOperator = 1,
BinaryOperator = 2,
Relation = 3,
Opening = 4,
Closing = 5,
Punctuation = 6,
Inner = 7,
Accent = 10,
}
public enum TexAlignment
{
Left = 0,
Right = 1,
Center = 2,
Top = 3,
Bottom = 4
}
/// <remarks>The numbers here correspond to the indices in <see cref="TexFormulaParser.DelimiterNames"/>.</remarks>
public enum TexDelimiter
{
Brace = 0,
Parenthesis = 1,
Bracket = 2,
LeftArrow = 3,
RightArrow = 4,
LeftRightArrow = 5,
DoubleLeftArrow = 6,
DoubleRightArrow = 7,
DoubleLeftRightArrow = 8,
SingleLine = 9,
DoubleLine = 10,
}
public enum TexStyle
{
Display = 0,
Text = 2,
Script = 4,
ScriptScript = 6,
}
public enum TexUnit
{
Em = 0,
Ex = 1,
Pixel = 2,
Point = 3,
Pica = 4,
Mu = 5
}
}
=======
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace WpfMath
{
public enum HorizontalAlignment
{
Center,
Left,
Right,
}
public enum TexDelimeterType
{
Over = 0,
Under = 1
}
/// <summary>
/// Indicates the type of atom a mathematical symbol is.
/// </summary>
public enum TexAtomType
{
None = -1,
/// <summary>
/// The atom is an ordinary atom like "Ω" or "ℜ".
/// </summary>
Ordinary = 0,
/// <summary>
/// The atom is a large operator like "∑" or "∬".
/// </summary>
BigOperator = 1,
/// <summary>
/// The atom is a binary operation atom like "÷" or "×".
/// </summary>
BinaryOperator = 2,
/// <summary>
/// The atom is a relational atom like "≌" or "≋".
/// </summary>
Relation = 3,
/// <summary>
/// The atom is an opening atom like "⟦" or "{".
/// </summary>
Opening = 4,
/// <summary>
/// The atom is a closing atom like "⟧" or "}".
/// </summary>
Closing = 5,
/// <summary>
/// The atom is a punctuation atom like "," or ":".
/// </summary>
Punctuation = 6,
Inner = 7,
/// <summary>
/// The atom is an accented atom like "X̆" or "Ö".
/// </summary>
Accent = 10,
}
public enum TexAlignment
{
Left = 0,
Right = 1,
Center = 2,
Top = 3,
Bottom = 4
}
public enum TexDelimeter
{
Brace = 0,
SquareBracket = 1,
Bracket = 2,
LeftArrow = 3,
RightArrow = 4,
LeftRightArrow = 5,
DoubleLeftArrow = 6,
DoubleRightArrow = 7,
DoubleLeftRightArrow = 8,
SingleLine = 9,
DoubleLine = 10,
}
public enum TexStyle
{
Display = 0,
Text = 2,
Script = 4,
ScriptScript = 6,
}
public enum TexUnit
{
Em = 0,
Ex = 1,
Pixel = 2,
Point = 3,
Pica = 4,
Mu = 5
}
public enum VerticalAlignment
{
Bottom,
Center,
Top,
}
}
>>>>>>>
namespace WpfMath
{
public enum HorizontalAlignment
{
Center,
Left,
Right,
}
public enum TexDelimeterType
{
Over = 0,
Under = 1
}
/// <summary>
/// Indicates the type of atom a mathematical symbol is.
/// </summary>
public enum TexAtomType
{
None = -1,
/// <summary>
/// The atom is an ordinary atom like "Ω" or "ℜ".
/// </summary>
Ordinary = 0,
/// <summary>
/// The atom is a large operator like "∑" or "∬".
/// </summary>
BigOperator = 1,
/// <summary>
/// The atom is a binary operation atom like "÷" or "×".
/// </summary>
BinaryOperator = 2,
/// <summary>
/// The atom is a relational atom like "≌" or "≋".
/// </summary>
Relation = 3,
/// <summary>
/// The atom is an opening atom like "⟦" or "{".
/// </summary>
Opening = 4,
/// <summary>
/// The atom is a closing atom like "⟧" or "}".
/// </summary>
Closing = 5,
/// <summary>
/// The atom is a punctuation atom like "," or ":".
/// </summary>
Punctuation = 6,
Inner = 7,
/// <summary>
/// The atom is an accented atom like "X̆" or "Ö".
/// </summary>
Accent = 10,
}
public enum TexAlignment
{
Left = 0,
Right = 1,
Center = 2,
Top = 3,
Bottom = 4
}
/// <remarks>The numbers here correspond to the indices in <see cref="TexFormulaParser.DelimiterNames"/>.</remarks>
public enum TexDelimiter
{
Brace = 0,
Parenthesis = 1,
Bracket = 2,
LeftArrow = 3,
RightArrow = 4,
LeftRightArrow = 5,
DoubleLeftArrow = 6,
DoubleRightArrow = 7,
DoubleLeftRightArrow = 8,
SingleLine = 9,
DoubleLine = 10,
}
public enum TexStyle
{
Display = 0,
Text = 2,
Script = 4,
ScriptScript = 6,
}
public enum TexUnit
{
Em = 0,
Ex = 1,
Pixel = 2,
Point = 3,
Pica = 4,
Mu = 5
}
public enum VerticalAlignment
{
Bottom,
Center,
Top,
}
} |
<<<<<<<
=======
EntityManager entMan = new EntityManager();
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
return Json(response);
}
[AcceptVerbs(new[] { "POST" }, Route = "api/v1/en_US/meta/entity/{Id}/field")]
public IActionResult CreateField(string Id, [FromBody]InputField submitObj)
{
FieldResponse response = new FieldResponse();
Guid entityId;
if (!Guid.TryParse(Id, out entityId))
{
response.Errors.Add(new ErrorModel("Id", Id, "Id parameter is not valid Guid value"));
Context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
return Json(response);
}
Field field = Field.Convert(submitObj);
EntityManager manager = new EntityManager(service.StorageService);
response = manager.CreateField(entityId, field);
if (response.Errors.Count > 0)
Context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
return Json(response);
}
}
=======
// return Json(response);
//}
// Create an entity
// POST: api/v1/en_US/meta/entity
[AcceptVerbs(new[] { "POST" }, Route = "api/v1/en_US/meta/entity")]
public IActionResult CreateEntity([FromBody]EntityRecord obj )
{
var h = obj.GetProperties();
var t = Json(obj);
return Json(obj);
}
}
>>>>>>>
// return Json(response);
//}
// Create an entity
// POST: api/v1/en_US/meta/entity
[AcceptVerbs(new[] { "POST" }, Route = "api/v1/en_US/meta/entity")]
public IActionResult CreateEntity([FromBody]EntityRecord obj )
{
var h = obj.GetProperties();
var t = Json(obj);
return Json(obj);
}
[AcceptVerbs(new[] { "POST" }, Route = "api/v1/en_US/meta/entity/{Id}/field")]
public IActionResult CreateField(string Id, [FromBody]InputField submitObj)
{
FieldResponse response = new FieldResponse();
Guid entityId;
if (!Guid.TryParse(Id, out entityId))
{
response.Errors.Add(new ErrorModel("Id", Id, "Id parameter is not valid Guid value"));
Context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
return Json(response);
}
Field field = Field.Convert(submitObj);
EntityManager manager = new EntityManager(service.StorageService);
response = manager.CreateField(entityId, field);
if (response.Errors.Count > 0)
Context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
return Json(response);
}
} |
<<<<<<<
Assert.AreEqual(5, TestUtils.Evaluate("delete $; $ = 5; $"));
Assert.AreEqual(6, TestUtils.Evaluate("delete dung; d\\u0075ng = 6; dung"));
Assert.AreEqual(7, TestUtils.Evaluate("delete another; \\u0061nother = 7; another"));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType("ident\\u0020ifier"));
Assert.AreEqual(12, TestUtils.Evaluate(@"delete \u{20BB7}; \u{20BB7} = 12; \u{20BB7}"));
Assert.AreEqual(13, TestUtils.Evaluate(@"delete Te\u{20BB7}st; Te\u{20BB7}st = 13; Te\u{20BB7}st"));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType(@"ident\u{20}ifier"));
=======
Assert.AreEqual(5, Evaluate("delete $; $ = 5; $"));
Assert.AreEqual(6, Evaluate("delete dung; d\\u0075ng = 6; dung"));
Assert.AreEqual(7, Evaluate("delete another; \\u0061nother = 7; another"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("ident\\u0020ifier"));
>>>>>>>
Assert.AreEqual(5, Evaluate("delete $; $ = 5; $"));
Assert.AreEqual(6, Evaluate("delete dung; d\\u0075ng = 6; dung"));
Assert.AreEqual(7, Evaluate("delete another; \\u0061nother = 7; another"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("ident\\u0020ifier"));
Assert.AreEqual(12, Evaluate(@"delete \u{20BB7}; \u{20BB7} = 12; \u{20BB7}"));
Assert.AreEqual(13, Evaluate(@"delete Te\u{20BB7}st; Te\u{20BB7}st = 13; Te\u{20BB7}st"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType(@"ident\u{20}ifier"));
<<<<<<<
Assert.AreEqual(255, TestUtils.Evaluate("0xff"));
Assert.AreEqual(241, TestUtils.Evaluate("0xF1"));
Assert.AreEqual(244837814094590.0, TestUtils.Evaluate("0xdeadbeefcafe"));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType("0xgg"));
// ES6 binary literals.
Assert.AreEqual(21, TestUtils.Evaluate("0b10101"));
Assert.AreEqual(1, TestUtils.Evaluate("0b1"));
Assert.AreEqual(-21, TestUtils.Evaluate("-0B10101"));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType("0b2"));
// ES6 octal literals.
Assert.AreEqual(61, TestUtils.Evaluate("0o75"));
Assert.AreEqual(4095, TestUtils.Evaluate("0O7777"));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType("0o80"));
=======
Assert.AreEqual(255, Evaluate("0xff"));
Assert.AreEqual(241, Evaluate("0xF1"));
Assert.AreEqual(244837814094590.0, Evaluate("0xdeadbeefcafe"));
>>>>>>>
Assert.AreEqual(255, Evaluate("0xff"));
Assert.AreEqual(241, Evaluate("0xF1"));
Assert.AreEqual(244837814094590.0, Evaluate("0xdeadbeefcafe"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("0xgg"));
// ES6 binary literals.
Assert.AreEqual(21, Evaluate("0b10101"));
Assert.AreEqual(1, Evaluate("0b1"));
Assert.AreEqual(-21, Evaluate("-0B10101"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("0b2"));
// ES6 octal literals.
Assert.AreEqual(61, Evaluate("0o75"));
Assert.AreEqual(4095, Evaluate("0O7777"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("0o80"));
<<<<<<<
Assert.AreEqual(double.PositiveInfinity, TestUtils.Evaluate("1.8e+308"));
Assert.AreEqual(double.PositiveInfinity, TestUtils.Evaluate("1e+309"));
Assert.AreEqual(double.PositiveInfinity, TestUtils.Evaluate("1.79876543210987654321e+308"));
Assert.AreEqual(double.PositiveInfinity, TestUtils.Evaluate("1e+9999999999"));
Assert.AreEqual(double.NegativeInfinity, TestUtils.Evaluate("-1.8e+308"));
Assert.AreEqual(5e-324, TestUtils.Evaluate("3e-324"));
Assert.AreEqual(0, TestUtils.Evaluate("2e-324"));
Assert.AreEqual(0, TestUtils.Evaluate("9e-325"));
Assert.AreEqual(0, TestUtils.Evaluate("2.1234567890123456789e-324"));
Assert.AreEqual(0, TestUtils.Evaluate("1e-9999999999"));
=======
Assert.AreEqual(double.PositiveInfinity, Evaluate("1.8e+308"));
Assert.AreEqual(double.PositiveInfinity, Evaluate("1e+309"));
Assert.AreEqual(double.PositiveInfinity, Evaluate("1.79876543210987654321e+308"));
Assert.AreEqual(double.PositiveInfinity, Evaluate("1e+9999999999"));
Assert.AreEqual(double.NegativeInfinity, Evaluate("-1.8e+308"));
Assert.AreEqual(5e-324, Evaluate("3e-324"));
Assert.AreEqual(0, Evaluate("2e-324"));
Assert.AreEqual(0, Evaluate("9e-325"));
Assert.AreEqual(0, Evaluate("2.1234567890123456789e-324"));
Assert.AreEqual(0, Evaluate("1e-9999999999"));
Assert.AreEqual(1.11111111111111111E+308, Evaluate("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"));
Assert.AreEqual(double.PositiveInfinity, Evaluate("1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"));
Assert.AreEqual(-1.11111111111111111E+308, Evaluate("-111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"));
Assert.AreEqual(double.NegativeInfinity, Evaluate("-1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"));
>>>>>>>
Assert.AreEqual(double.PositiveInfinity, Evaluate("1.8e+308"));
Assert.AreEqual(double.PositiveInfinity, Evaluate("1e+309"));
Assert.AreEqual(double.PositiveInfinity, Evaluate("1.79876543210987654321e+308"));
Assert.AreEqual(double.PositiveInfinity, Evaluate("1e+9999999999"));
Assert.AreEqual(double.NegativeInfinity, Evaluate("-1.8e+308"));
Assert.AreEqual(5e-324, Evaluate("3e-324"));
Assert.AreEqual(0, Evaluate("2e-324"));
Assert.AreEqual(0, Evaluate("9e-325"));
Assert.AreEqual(0, Evaluate("2.1234567890123456789e-324"));
Assert.AreEqual(0, Evaluate("1e-9999999999"));
<<<<<<<
Assert.AreEqual("nine", TestUtils.Evaluate("'nine'"));
Assert.AreEqual("eight", TestUtils.Evaluate("\"eight\""));
Assert.AreEqual(" \x08 \x09 \x0a \x0b \x0c \x0d \x22 \x27 \x5c \x00 ", TestUtils.Evaluate(@"' \b \t \n \v \f \r \"" \' \\ \0 '"));
Assert.AreEqual("ÿ", TestUtils.Evaluate(@"'\xfF'"));
Assert.AreEqual("①ffl", TestUtils.Evaluate(@"'\u2460\ufB04'"));
Assert.AreEqual("line-\r\ncon\rtin\nuation", TestUtils.Evaluate(@"'line-\r\ncon\rtin\nuation'"));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType("'unterminated"));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType("'unterminated\r\n"));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType(@"'sd\xfgf'"));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType(@"'te\ufffg'"));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType("'te\r\nst'"));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType("'test\""));
Assert.AreEqual("SyntaxError", TestUtils.EvaluateExceptionType("\"test'"));
Assert.AreEqual("test", TestUtils.Evaluate(@"'te\1st'"));
// ECMAScript 6
Assert.AreEqual("𠮷", TestUtils.Evaluate(@"'\u{20BB7}'"));
=======
Assert.AreEqual("nine", Evaluate("'nine'"));
Assert.AreEqual("eight", Evaluate("\"eight\""));
Assert.AreEqual(" \x08 \x09 \x0a \x0b \x0c \x0d \x22 \x27 \x5c \x00 ", Evaluate(@"' \b \t \n \v \f \r \"" \' \\ \0 '"));
Assert.AreEqual("ÿ", Evaluate(@"'\xfF'"));
Assert.AreEqual("①ffl", Evaluate(@"'\u2460\ufB04'"));
Assert.AreEqual("line-\r\ncon\rtin\nuation", Evaluate(@"'line-\r\ncon\rtin\nuation'"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("'unterminated"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("'unterminated\r\n"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType(@"'sd\xfgf'"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType(@"'te\ufffg'"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("'te\r\nst'"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("'test\""));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("\"test'"));
Assert.AreEqual("test", Evaluate(@"'te\1st'"));
>>>>>>>
Assert.AreEqual("nine", Evaluate("'nine'"));
Assert.AreEqual("eight", Evaluate("\"eight\""));
Assert.AreEqual(" \x08 \x09 \x0a \x0b \x0c \x0d \x22 \x27 \x5c \x00 ", Evaluate(@"' \b \t \n \v \f \r \"" \' \\ \0 '"));
Assert.AreEqual("ÿ", Evaluate(@"'\xfF'"));
Assert.AreEqual("①ffl", Evaluate(@"'\u2460\ufB04'"));
Assert.AreEqual("line-\r\ncon\rtin\nuation", Evaluate(@"'line-\r\ncon\rtin\nuation'"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("'unterminated"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("'unterminated\r\n"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType(@"'sd\xfgf'"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType(@"'te\ufffg'"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("'te\r\nst'"));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("'test\""));
Assert.AreEqual("SyntaxError", EvaluateExceptionType("\"test'"));
Assert.AreEqual("test", Evaluate(@"'te\1st'"));
// ECMAScript 6
Assert.AreEqual("𠮷", Evaluate(@"'\u{20BB7}'")); |
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="engine"> The current ScriptEngine instance. </param>
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="engine"> The current script environment. </param>
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="engine"> The current script environment. </param>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="engine"> The current ScriptEngine instance. </param>
/// <param name="thisObject"> The string that is being operated on. </param>
/// <param name="substrOrRegExp"> The substring to search for. </param>
=======
/// <param name="engine"> The current script environment. </param>
/// <param name="thisObject"> The object that is being operated on. </param>
/// <param name="substrOrRegExp"> The substring or regular expression to search for. </param>
>>>>>>>
/// <param name="engine"> The current script environment. </param>
/// <param name="thisObject"> The string that is being operated on. </param>
/// <param name="substrOrRegExp"> The substring or regular expression to search for. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="engine"> The current ScriptEngine instance. </param>
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="engine"> The current script environment. </param>
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="engine"> The current script environment. </param>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="engine"> The current ScriptEngine instance. </param>
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="engine"> The current script environment. </param>
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="engine"> The current script environment. </param>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
/// <param name="href"></param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
/// <param name="href"> The hyperlink URL. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
/// <param name="href"> The hyperlink URL. </param> |
<<<<<<<
public static Branch FindBranch(this IRepository repository, string branchName)
{
var exact = repository.Branches.FirstOrDefault(x => x.Name == branchName);
if (exact != null)
{
return exact;
}
return repository.Branches.FirstOrDefault(x => x.Name == "origin/" + branchName);
}
public static IEnumerable<SemanticVersion> GetVersionTagsOnBranch(this Branch branch, IRepository repository, string tagPrefixRegex)
=======
public static SemanticVersion LastVersionTagOnBranch(this Branch branch, IRepository repository, string tagPrefixRegex)
>>>>>>>
public static IEnumerable<SemanticVersion> GetVersionTagsOnBranch(this Branch branch, IRepository repository, string tagPrefixRegex)
<<<<<<<
}).Where(b => b != null && b.mergeBaseCommit != null).OrderByDescending(b => b.mergeBaseCommit.Committer.When).ToList();
=======
}).Where(b => b.mergeBaseCommit != null).OrderByDescending(b => b.mergeBaseCommit.Committer.When).ToList();
>>>>>>>
}).Where(b => b != null && b.mergeBaseCommit != null).OrderByDescending(b => b.mergeBaseCommit.Committer.When).ToList(); |
<<<<<<<
using GitTools.Git;
=======
>>>>>>>
using GitTools.Git;
<<<<<<<
=======
>>>>>>>
<<<<<<<
private static void CloneRepository(string repositoryUrl, string gitDirectory, AuthenticationInfo authentication)
=======
static void CloneRepository(string repositoryUrl, string gitDirectory, Authentication authentication)
>>>>>>>
static void CloneRepository(string repositoryUrl, string gitDirectory, AuthenticationInfo authentication) |
<<<<<<<
namespace GitVersionExe.Tests
{
using System;
=======
using System;
using System.Collections.Generic;
>>>>>>>
using System;
<<<<<<<
fileSystem.Exists("C:\\Testing\\AssemblyInfo.cs").Returns(true);
fileSystem.ReadAllText("C:\\Testing\\AssemblyInfo.cs").Returns(assemblyInfoFile);
var config = new Config()
{
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch
};
var variable = VariableProvider.GetVariablesFor(version, config.AssemblyVersioningScheme, VersioningMode.ContinuousDelivery);
var args = new Arguments
{
UpdateAssemblyInfo = true,
UpdateAssemblyInfoFileName = "AssemblyInfo.cs"
};
using (new AssemblyInfoFileUpdate(args, workingDir, variable, fileSystem))
{
const string expected = @"AssemblyVersion(""2.3.0.0"");
=======
fileSystem.Exists("C:\\Testing\\AssemblyInfo.cs").Returns(true);
fileSystem.ReadAllText("C:\\Testing\\AssemblyInfo.cs").Returns(assemblyInfoFile);
var config = new Config
{
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch
};
var variable = VariableProvider.GetVariablesFor(version, config);
var args = new Arguments
{
UpdateAssemblyInfo = true,
UpdateAssemblyInfoFileName = "AssemblyInfo.cs"
};
using (new AssemblyInfoFileUpdate(args, workingDir, variable, fileSystem))
{
const string expected = @"AssemblyVersion(""2.3.0.0"");
>>>>>>>
fileSystem.Exists("C:\\Testing\\AssemblyInfo.cs").Returns(true);
fileSystem.ReadAllText("C:\\Testing\\AssemblyInfo.cs").Returns(assemblyInfoFile);
var config = new Config
{
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch
};
var variable = VariableProvider.GetVariablesFor(version, config.AssemblyVersioningScheme, VersioningMode.ContinuousDelivery);
var args = new Arguments
{
UpdateAssemblyInfo = true,
UpdateAssemblyInfoFileName = "AssemblyInfo.cs"
};
using (new AssemblyInfoFileUpdate(args, workingDir, variable, fileSystem))
{
const string expected = @"AssemblyVersion(""2.3.0.0"");
<<<<<<<
fileSystem.Exists("C:\\Testing\\AssemblyInfo.cs").Returns(true);
fileSystem.ReadAllText("C:\\Testing\\AssemblyInfo.cs").Returns(assemblyInfoFile);
var config = new Config()
{
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch
};
var variable = VariableProvider.GetVariablesFor(version, config.AssemblyVersioningScheme, VersioningMode.ContinuousDelivery);
var args = new Arguments
{
UpdateAssemblyInfo = true,
UpdateAssemblyInfoFileName = "AssemblyInfo.cs"
};
using (new AssemblyInfoFileUpdate(args, workingDir, variable, fileSystem))
{
const string expected = @"AssemblyVersion(""2.3.0.0"");
=======
fileSystem.Exists("C:\\Testing\\AssemblyInfo.cs").Returns(true);
fileSystem.ReadAllText("C:\\Testing\\AssemblyInfo.cs").Returns(assemblyInfoFile);
var config = new Config
{
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch
};
var variable = VariableProvider.GetVariablesFor(version, config);
var args = new Arguments
{
UpdateAssemblyInfo = true,
UpdateAssemblyInfoFileName = "AssemblyInfo.cs"
};
using (new AssemblyInfoFileUpdate(args, workingDir, variable, fileSystem))
{
const string expected = @"AssemblyVersion(""2.3.0.0"");
>>>>>>>
fileSystem.Exists("C:\\Testing\\AssemblyInfo.cs").Returns(true);
fileSystem.ReadAllText("C:\\Testing\\AssemblyInfo.cs").Returns(assemblyInfoFile);
var config = new Config
{
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch
};
var variable = VariableProvider.GetVariablesFor(version, config.AssemblyVersioningScheme, VersioningMode.ContinuousDelivery);
var args = new Arguments
{
UpdateAssemblyInfo = true,
UpdateAssemblyInfoFileName = "AssemblyInfo.cs"
};
using (new AssemblyInfoFileUpdate(args, workingDir, variable, fileSystem))
{
const string expected = @"AssemblyVersion(""2.3.0.0""); |
<<<<<<<
/// <summary>
/// The list of weighted goal maps. Can be used to add or remove goal maps, or change their weights.
/// </summary>
/// <remarks>
/// When adding a new goal map, its Height and Width should be identical to the Height and
/// Width of the GoalMapCombiner.
/// </remarks>
public readonly Dictionary<IMapView<double?>, double> Weights;
=======
>>>>>>>
/// <summary>
/// The list of weighted goal maps. Can be used to add or remove goal maps, or change their weights.
/// </summary>
/// <remarks>
/// When adding a new goal map, its Height and Width should be identical to the Height and
/// Width of the GoalMapCombiner.
/// </remarks>
public readonly Dictionary<IMapView<double?>, double> Weights; |
<<<<<<<
[TestMethod, TestCategory("Lite"), TestCategory("Behavior"), TestCategory("Strict")]
public void ShouldAssertStrictMock()
{
var mock = Mock.Create<IFoo>(Behavior.Strict);
Mock.Assert(mock);
try
{
mock.GetGuid();
}
catch (Exception) { }
var message = Assert.Throws<AssertionException>(() => Mock.Assert(mock)).Message;
Assert.Equal("Called unarranged member 'System.Guid GetGuid()' on strict mock of type 'Telerik.JustMock.Tests.BehaviorFixture+IFoo'", message.Trim());
}
[TestMethod, TestCategory("Lite"), TestCategory("Behavior"), TestCategory("Strict")]
public void ShouldAssertStrictDelegateMock()
{
var mock = Mock.Create<Action>(Behavior.Strict);
Mock.Assert(mock);
try
{
mock();
}
catch (Exception) { }
var message = Assert.Throws<AssertionException>(() => Mock.Assert(mock)).Message;
Assert.Equal("Called unarranged member 'Void Invoke()' on strict mock of type 'Castle.Proxies.Delegates.System_Action'", message.Trim());
}
=======
[TestMethod, TestCategory("Lite"), TestCategory("Behavior"), TestCategory("Task")]
public async Task ShouldAutoArrangeResultOfAsyncMethodOnRecursiveLooseMock()
{
var mock = Mock.Create<IAsyncTest>();
var result = await mock.GetAsync();
Assert.NotNull(result);
}
[TestMethod, TestCategory("Lite"), TestCategory("Behavior"), TestCategory("Task")]
public async Task ShouldAutoArrangeResultOfAsyncMethodOnLooseMock()
{
var mock = Mock.Create<IAsyncTest>(Behavior.Loose);
var result = await mock.GetAsync();
Assert.Null(result);
}
[TestMethod, TestCategory("Lite"), TestCategory("Behavior"), TestCategory("Task")]
public async Task ShouldArrangeTaskResultOfAsyncMethod()
{
var mock = Mock.Create<IAsyncTest>();
Mock.Arrange(() => mock.GetIntAsync()).TaskResult(5);
var result = await mock.GetIntAsync();
Assert.Equal(5, result);
}
public interface IAsyncTest
{
Task<IDisposable> GetAsync();
Task<int> GetIntAsync();
}
>>>>>>>
[TestMethod, TestCategory("Lite"), TestCategory("Behavior"), TestCategory("Strict")]
public void ShouldAssertStrictMock()
{
var mock = Mock.Create<IFoo>(Behavior.Strict);
Mock.Assert(mock);
try
{
mock.GetGuid();
}
catch (Exception) { }
var message = Assert.Throws<AssertionException>(() => Mock.Assert(mock)).Message;
Assert.Equal("Called unarranged member 'System.Guid GetGuid()' on strict mock of type 'Telerik.JustMock.Tests.BehaviorFixture+IFoo'", message.Trim());
}
[TestMethod, TestCategory("Lite"), TestCategory("Behavior"), TestCategory("Strict")]
public void ShouldAssertStrictDelegateMock()
{
var mock = Mock.Create<Action>(Behavior.Strict);
Mock.Assert(mock);
try
{
mock();
}
catch (Exception) { }
var message = Assert.Throws<AssertionException>(() => Mock.Assert(mock)).Message;
Assert.Equal("Called unarranged member 'Void Invoke()' on strict mock of type 'Castle.Proxies.Delegates.System_Action'", message.Trim());
}
[TestMethod, TestCategory("Lite"), TestCategory("Behavior"), TestCategory("Task")]
public async Task ShouldAutoArrangeResultOfAsyncMethodOnRecursiveLooseMock()
{
var mock = Mock.Create<IAsyncTest>();
var result = await mock.GetAsync();
Assert.NotNull(result);
}
[TestMethod, TestCategory("Lite"), TestCategory("Behavior"), TestCategory("Task")]
public async Task ShouldAutoArrangeResultOfAsyncMethodOnLooseMock()
{
var mock = Mock.Create<IAsyncTest>(Behavior.Loose);
var result = await mock.GetAsync();
Assert.Null(result);
}
[TestMethod, TestCategory("Lite"), TestCategory("Behavior"), TestCategory("Task")]
public async Task ShouldArrangeTaskResultOfAsyncMethod()
{
var mock = Mock.Create<IAsyncTest>();
Mock.Arrange(() => mock.GetIntAsync()).TaskResult(5);
var result = await mock.GetIntAsync();
Assert.Equal(5, result);
}
public interface IAsyncTest
{
Task<IDisposable> GetAsync();
Task<int> GetIntAsync();
} |
<<<<<<<
#if NETCORE
using Debug = Telerik.JustMock.Diagnostics.JMDebug;
#else
using Debug = System.Diagnostics.Debug;
#endif
=======
using System.Reflection.Emit;
>>>>>>>
using System.Reflection.Emit;
#if NETCORE
using Debug = Telerik.JustMock.Diagnostics.JMDebug;
#else
using Debug = System.Diagnostics.Debug;
#endif |
<<<<<<<
using LiveSplit.Web;
=======
using LiveSplit.Utils;
>>>>>>>
using LiveSplit.Web;
using LiveSplit.Utils;
<<<<<<<
var gameNames = CompositeGameList.Instance.GetGameNames().ToArray();
Action invokation = () =>
=======
var gameNames = SpeedrunCom.Instance.GetGameNames().ToArray();
this.InvokeIfRequired(() =>
>>>>>>>
var gameNames = CompositeGameList.Instance.GetGameNames().ToArray();
this.InvokeIfRequired(() => |
<<<<<<<
[ClientTestFixture(
CertificateClientOptions.ServiceVersion.V7_0,
CertificateClientOptions.ServiceVersion.V7_1_Preview)]
=======
[ClientTestFixture(
CertificateClientOptions.ServiceVersion.V7_0,
CertificateClientOptions.ServiceVersion.V7_1)]
>>>>>>>
[ClientTestFixture(
CertificateClientOptions.ServiceVersion.V7_0,
CertificateClientOptions.ServiceVersion.V7_1)]
<<<<<<<
=======
CertificateClientOptions options = new CertificateClientOptions(_serviceVersion)
{
Diagnostics =
{
IsLoggingContentEnabled = Debugger.IsAttached,
}
};
>>>>>>>
CertificateClientOptions options = new CertificateClientOptions(_serviceVersion)
{
Diagnostics =
{
IsLoggingContentEnabled = Debugger.IsAttached,
}
}; |
<<<<<<<
=======
this.symbols = new DebugSymbols(this.client);
this.isPointer64Bit = this.control.IsPointer64Bit;
>>>>>>>
this.symbols = new DebugSymbols(this.client); |
<<<<<<<
return new SSymbolNameAndDisplacement() { Module = module.Name, Name = name, Displacement = displacement };
=======
return new SSymbolNameResultAndDisplacement() {
Symbol = new SSymbolNameResult() {
Module = module.Name,
Name = name
},
Displacement = (ulong)(rva - symbol.relativeVirtualAddress)
};
>>>>>>>
return new SSymbolNameAndDisplacement() {
Module = module.Name,
Name = name,
Displacement = (ulong)(rva - symbol.relativeVirtualAddress)
}; |
<<<<<<<
using TechTalk.SpecFlow.IdeIntegration.Options;
using TechTalk.SpecFlow.IdeIntegration.Tracing;
=======
>>>>>>>
using TechTalk.SpecFlow.IdeIntegration.Options;
<<<<<<<
private readonly IIdeTracer _tracer;
private readonly IntegrationOptions _integrationOptions;
=======
>>>>>>> |
<<<<<<<
AddSpatialData(info, currentAnimation.Timelines[objectRefFirst.TimelineId], currentAnimation.Entity.Spriter, frameData);
=======
AddSpatialData(info, currentAnimation.Timelines[objectRefFirst.TimelineId], currentAnimation.Entity.Spriter, targetTime, deltaTime, frameData);
>>>>>>>
AddSpatialData(info, currentAnimation.Timelines[objectRefFirst.TimelineId], currentAnimation.Entity.Spriter, deltaTime, frameData);
<<<<<<<
AddSpatialData(interpolated, animation.Timelines[objectRef.TimelineId], animation.Entity.Spriter, frameData);
=======
AddSpatialData(interpolated, animation.Timelines[objectRef.TimelineId], animation.Entity.Spriter, targetTime, deltaTime, frameData);
>>>>>>>
AddSpatialData(interpolated, animation.Timelines[objectRef.TimelineId], animation.Entity.Spriter, deltaTime, frameData);
<<<<<<<
private static void AddSpatialData(SpriterObject info, SpriterTimeline timeline, Spriter spriter, FrameData frameData)
=======
private static void AddSpatialData(SpriterObject info, SpriterTimeline timeline, Spriter spriter, float targetTime, float deltaTime, FrameData frameData)
>>>>>>>
private static void AddSpatialData(SpriterObject info, SpriterTimeline timeline, Spriter spriter, float deltaTime, FrameData frameData) |
<<<<<<<
FrameData.Clear();
Metadata.Clear();
=======
FrameData frameData;
FrameMetadata metaData = null;
>>>>>>>
FrameData.Clear();
Metadata.Clear();
<<<<<<<
SpriterProcessor.UpdateFrameData(FrameData, CurrentAnimation, Time);
SpriterProcessor.UpdateFrameMetadata(Metadata, CurrentAnimation, Time, deltaTime);
=======
frameData = SpriterProcessor.GetFrameData(CurrentAnimation, Time);
if (SpriterConfig.MetadataEnabled) metaData = SpriterProcessor.GetFrameMetadata(CurrentAnimation, Time, deltaTime);
>>>>>>>
SpriterProcessor.UpdateFrameData(FrameData, CurrentAnimation, Time);
if (SpriterConfig.MetadataEnabled) SpriterProcessor.UpdateFrameMetadata(Metadata, CurrentAnimation, Time, deltaTime);
<<<<<<<
SpriterProcessor.UpdateFrameData(FrameData, CurrentAnimation, NextAnimation, Time, factor);
SpriterProcessor.GetFrameMetadata(Metadata, CurrentAnimation, NextAnimation, Time, deltaTime, factor);
=======
frameData = SpriterProcessor.GetFrameData(CurrentAnimation, NextAnimation, Time, factor);
if (SpriterConfig.MetadataEnabled) metaData = SpriterProcessor.GetFrameMetadata(CurrentAnimation, NextAnimation, Time, deltaTime, factor);
>>>>>>>
SpriterProcessor.UpdateFrameData(FrameData, CurrentAnimation, NextAnimation, Time, factor);
if (SpriterConfig.MetadataEnabled) SpriterProcessor.GetFrameMetadata(Metadata, CurrentAnimation, NextAnimation, Time, deltaTime, factor);
<<<<<<<
foreach (SpriterSound info in Metadata.Sounds)
=======
if (SpriterConfig.MetadataEnabled)
>>>>>>>
if (SpriterConfig.MetadataEnabled) |
<<<<<<<
States.State = new DisconnectedState();
States.Execute();
=======
States.State = new ClosedState();
States.State.Execute(null);
>>>>>>>
States.State = new DisconnectedState();
States.State.Execute(null); |
<<<<<<<
_result.Body = SafeJsonConvert.DeserializeObject<Profile>(_responseContent, this.Client.DeserializationSettings);
=======
string _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
_result.Body = SafeJsonConvert.DeserializeObject<Endpoint>(_responseContent, this.Client.DeserializationSettings);
>>>>>>>
_result.Body = SafeJsonConvert.DeserializeObject<Endpoint>(_responseContent, this.Client.DeserializationSettings); |
<<<<<<<
public string TryParse<TIn>(string source, ref int index, out JsonPathExpression expression)
=======
public string TryParse<T>(string source, ref int index, out ExpressionTreeNode<T> node)
>>>>>>>
public string TryParse<T>(string source, ref int index, out JsonPathExpression expression) |
<<<<<<<
using UnityEngine.FrameRecorder;
using UnityEngine.SceneManagement;
=======
using UnityEngine.Recorder;
using UnityEngine.SceneManagement;
>>>>>>>
using UnityEngine.Recorder;
<<<<<<<
//protected SerializedProperty m_Inputs;
=======
>>>>>>>
<<<<<<<
void BuildInputEditors()
{
var rs = target as RecorderSettings;
if (!rs.inputsSettings.hasBrokenBindings && rs.inputsSettings.Count == m_InputEditors.Count)
return;
if (rs.inputsSettings.hasBrokenBindings)
rs.BindSceneInputSettings();
foreach (var editor in m_InputEditors)
UnityHelpers.Destroy(editor.editor);
m_InputEditors.Clear();
foreach (var input in rs.inputsSettings)
m_InputEditors.Add( new InputEditorState(GetFieldDisplayState, input) { visible = true} );
}
=======
void BuildInputEditors()
{
var rs = target as RecorderSettings;
if (rs.inputsSettings.hasBrokenBindings)
rs.BindSceneInputSettings();
foreach (var editor in m_InputEditors)
UnityHelpers.Destroy(editor.editor);
m_InputEditors.Clear();
foreach (var input in rs.inputsSettings)
m_InputEditors.Add( new InputEditorState(GetFieldDisplayState, input) { visible = true} );
}
>>>>>>>
void BuildInputEditors()
{
var rs = target as RecorderSettings;
if (!rs.inputsSettings.hasBrokenBindings && rs.inputsSettings.Count == m_InputEditors.Count)
return;
if (rs.inputsSettings.hasBrokenBindings)
rs.BindSceneInputSettings();
foreach (var editor in m_InputEditors)
UnityHelpers.Destroy(editor.editor);
m_InputEditors.Clear();
foreach (var input in rs.inputsSettings)
m_InputEditors.Add( new InputEditorState(GetFieldDisplayState, input) { visible = true} );
}
<<<<<<<
RecorderSettings.m_Verbose = EditorGUILayout.Toggle( "Verbose logging", RecorderSettings.m_Verbose );
=======
>>>>>>>
<<<<<<<
=======
settingsTarget.SelfAdjustSettings();
>>>>>>>
(target as RecorderSettings).SelfAdjustSettings(); |
<<<<<<<
private FlowControlEventHandler m_flowControl;
=======
private BasicRecoverOkEventHandler m_basicRecoverOk;
>>>>>>>
private FlowControlEventHandler m_flowControl;
private BasicRecoverOkEventHandler m_basicRecoverOk;
<<<<<<<
public event FlowControlEventHandler FlowControl
{
add
{
lock (m_eventLock)
{
m_flowControl += value;
}
}
remove
{
lock (m_eventLock)
{
m_flowControl -= value;
}
}
}
=======
public event BasicRecoverOkEventHandler BasicRecoverOk
{
add
{
lock (m_eventLock)
{
m_basicRecoverOk += value;
}
}
remove
{
lock (m_eventLock)
{
m_basicRecoverOk -= value;
}
}
}
>>>>>>>
public event FlowControlEventHandler FlowControl
{
add
{
lock (m_eventLock)
{
m_flowControl += value;
}
}
remove
{
lock (m_eventLock)
{
m_flowControl -= value;
}
}
}
public event BasicRecoverOkEventHandler BasicRecoverOk
{
add
{
lock (m_eventLock)
{
m_basicRecoverOk += value;
}
}
remove
{
lock (m_eventLock)
{
m_basicRecoverOk -= value;
}
}
}
<<<<<<<
public virtual void OnFlowControl(FlowControlEventArgs args)
{
FlowControlEventHandler handler;
lock (m_eventLock)
{
handler = m_flowControl;
}
if (handler != null)
{
foreach (FlowControlEventHandler h in handler.GetInvocationList())
{
try
{
h(this, args);
}
catch (Exception e)
{
Console.WriteLine("exception while running flow control event handler");
Console.WriteLine(e + e.StackTrace);
}
}
}
}
=======
public virtual void OnBasicRecoverOk(EventArgs args)
{
BasicRecoverOkEventHandler handler;
lock (m_eventLock)
{
handler = m_basicRecoverOk;
}
if (handler != null)
{
foreach (BasicRecoverOkEventHandler h in handler.GetInvocationList())
{
try
{
h(this, args);
}
catch (Exception e)
{
CallbackExceptionEventArgs exnArgs = new CallbackExceptionEventArgs(e);
exnArgs.Detail["context"] = "OnBasicRecoverOk";
OnCallbackException(exnArgs);
}
}
}
}
>>>>>>>
public virtual void OnFlowControl(FlowControlEventArgs args)
{
FlowControlEventHandler handler;
lock (m_eventLock)
{
handler = m_flowControl;
}
if (handler != null)
{
foreach (FlowControlEventHandler h in handler.GetInvocationList())
{
try
{
h(this, args);
}
catch (Exception e)
{
Console.WriteLine("exception while running flow control event handler");
Console.WriteLine(e + e.StackTrace);
}
}
}
}
public virtual void OnBasicRecoverOk(EventArgs args)
{
BasicRecoverOkEventHandler handler;
lock (m_eventLock)
{
handler = m_basicRecoverOk;
}
if (handler != null)
{
foreach (BasicRecoverOkEventHandler h in handler.GetInvocationList())
{
try
{
h(this, args);
}
catch (Exception e)
{
CallbackExceptionEventArgs exnArgs = new CallbackExceptionEventArgs(e);
exnArgs.Detail["context"] = "OnBasicRecoverOk";
OnCallbackException(exnArgs);
}
}
}
} |
<<<<<<<
using System.Linq;
=======
using System.Globalization;
>>>>>>>
using System.Linq;
using System.Globalization; |
<<<<<<<
#if !NETFX_CORE
using System.Net.Security;
#endif
using RabbitMQ.Client.Exceptions;
using RabbitMQ.Client.Framing.Impl;
using RabbitMQ.Client.Impl;
=======
>>>>>>>
#if !NETFX_CORE
using System.Net.Security;
#endif |
<<<<<<<
IList<ShutdownReportEntry> ShutdownReport { get; }
=======
IList ShutdownReport { get; }
///<summary>Handle incoming Connection.Blocked methods.</summary>
void HandleConnectionBlocked(string reason);
///<summary>Handle incoming Connection.Unblocked methods.</summary>
void HandleConnectionUnblocked();
>>>>>>>
IList<ShutdownReportEntry> ShutdownReport { get; }
///<summary>Handle incoming Connection.Blocked methods.</summary>
void HandleConnectionBlocked(string reason);
///<summary>Handle incoming Connection.Unblocked methods.</summary>
void HandleConnectionUnblocked(); |
<<<<<<<
rabbind.Transport.Password = this.Password;
rabbind.Transport.Username = this.Username;
rabbind.Transport.VirtualHost = this.VirtualHost;
=======
rabbind.Transport.ConnectionFactory.Password = this.Password;
rabbind.Transport.ConnectionFactory.UserName = this.Username;
rabbind.Transport.ConnectionFactory.VirtualHost = this.VirtualHost;
rabbind.Transport.MaxReceivedMessageSize = this.MaxMessageSize;
>>>>>>>
rabbind.Transport.Password = this.Password;
rabbind.Transport.Username = this.Username;
rabbind.Transport.VirtualHost = this.VirtualHost;
rabbind.Transport.MaxReceivedMessageSize = this.MaxMessageSize; |
<<<<<<<
[Fact]
public void Should_Allow_Using_Aliases_with_Dot()
{
var contact = new Entity("contact") { Id = Guid.NewGuid() };
contact["firstname"] = "Jordi";
var account = new Entity("account") { Id = Guid.NewGuid() };
account["primarycontactid"] = contact.ToEntityReference();
account["name"] = "Dynamics Value";
var context = new XrmFakedContext();
context.Initialize(new Entity[] { contact, account });
var service = context.GetOrganizationService();
QueryExpression query = new QueryExpression("account");
query.ColumnSet = new ColumnSet("name");
var link = query.AddLink("contact", "contactid", "primarycontactid");
link.EntityAlias = "primary.contact";
link.Columns = new ColumnSet("firstname");
var accounts = service.RetrieveMultiple(query);
Assert.True(accounts.Entities.First().Contains("primary.contact.firstname"));
Assert.Equal("Jordi", accounts.Entities.First().GetAttributeValue<AliasedValue>("primary.contact.firstname").Value);
}
=======
#if !FAKE_XRM_EASY
[Fact]
public void Can_Filter_Using_Entity_Name_Without_Alias()
{
XrmFakedContext context = new XrmFakedContext();
IOrganizationService service = context.GetOrganizationService();
Entity e = new Entity("contact")
{
Id = Guid.NewGuid(),
["retrieve"] = true
};
Entity e2 = new Entity("account")
{
Id = Guid.NewGuid(),
["contactid"] = e.ToEntityReference()
};
context.Initialize(new Entity[] { e, e2 });
QueryExpression query = new QueryExpression("account");
query.Criteria.AddCondition("contact", "retrieve", ConditionOperator.Equal, true);
query.AddLink("contact", "contactid", "contactid");
EntityCollection result = service.RetrieveMultiple(query);
Assert.Equal(1, result.Entities.Count);
}
[Fact]
public void Can_Filter_Using_Entity_Name_With_Alias()
{
XrmFakedContext context = new XrmFakedContext();
IOrganizationService service = context.GetOrganizationService();
Entity e = new Entity("contact")
{
Id = Guid.NewGuid(),
["retrieve"] = true
};
Entity e2 = new Entity("account")
{
Id = Guid.NewGuid(),
["contactid"] = e.ToEntityReference()
};
context.Initialize(new Entity[] { e, e2 });
QueryExpression query = new QueryExpression("account");
query.Criteria.AddCondition("mycontact", "retrieve", ConditionOperator.Equal, true);
query.AddLink("contact", "contactid", "contactid").EntityAlias="mycontact";
EntityCollection result = service.RetrieveMultiple(query);
Assert.Equal(1, result.Entities.Count);
}
#endif
>>>>>>>
[Fact]
public void Should_Allow_Using_Aliases_with_Dot()
{
var contact = new Entity("contact") { Id = Guid.NewGuid() };
contact["firstname"] = "Jordi";
var account = new Entity("account") { Id = Guid.NewGuid() };
account["primarycontactid"] = contact.ToEntityReference();
account["name"] = "Dynamics Value";
var context = new XrmFakedContext();
context.Initialize(new Entity[] { contact, account });
var service = context.GetOrganizationService();
QueryExpression query = new QueryExpression("account");
query.ColumnSet = new ColumnSet("name");
var link = query.AddLink("contact", "contactid", "primarycontactid");
link.EntityAlias = "primary.contact";
link.Columns = new ColumnSet("firstname");
var accounts = service.RetrieveMultiple(query);
Assert.True(accounts.Entities.First().Contains("primary.contact.firstname"));
Assert.Equal("Jordi", accounts.Entities.First().GetAttributeValue<AliasedValue>("primary.contact.firstname").Value);
}
#if !FAKE_XRM_EASY
[Fact]
public void Can_Filter_Using_Entity_Name_Without_Alias()
{
XrmFakedContext context = new XrmFakedContext();
IOrganizationService service = context.GetOrganizationService();
Entity e = new Entity("contact")
{
Id = Guid.NewGuid(),
["retrieve"] = true
};
Entity e2 = new Entity("account")
{
Id = Guid.NewGuid(),
["contactid"] = e.ToEntityReference()
};
context.Initialize(new Entity[] { e, e2 });
QueryExpression query = new QueryExpression("account");
query.Criteria.AddCondition("contact", "retrieve", ConditionOperator.Equal, true);
query.AddLink("contact", "contactid", "contactid");
EntityCollection result = service.RetrieveMultiple(query);
Assert.Equal(1, result.Entities.Count);
}
[Fact]
public void Can_Filter_Using_Entity_Name_With_Alias()
{
XrmFakedContext context = new XrmFakedContext();
IOrganizationService service = context.GetOrganizationService();
Entity e = new Entity("contact")
{
Id = Guid.NewGuid(),
["retrieve"] = true
};
Entity e2 = new Entity("account")
{
Id = Guid.NewGuid(),
["contactid"] = e.ToEntityReference()
};
context.Initialize(new Entity[] { e, e2 });
QueryExpression query = new QueryExpression("account");
query.Criteria.AddCondition("mycontact", "retrieve", ConditionOperator.Equal, true);
query.AddLink("contact", "contactid", "contactid").EntityAlias="mycontact";
EntityCollection result = service.RetrieveMultiple(query);
Assert.Equal(1, result.Entities.Count);
}
#endif |
<<<<<<<
}
public event FlowControlEventHandler FlowControl
{
add
{
lock (m_eventLock)
{
m_flowControl += value;
}
}
remove
{
lock (m_eventLock)
{
m_flowControl -= value;
}
}
}
public event BasicRecoverOkEventHandler BasicRecoverOk
{
add
{
lock (m_eventLock)
{
m_basicRecoverOk += value;
}
}
remove
{
lock (m_eventLock)
{
m_basicRecoverOk -= value;
}
}
}
=======
}
>>>>>>>
}
public event FlowControlEventHandler FlowControl
{
add
{
lock (m_eventLock)
{
m_flowControl += value;
}
}
remove
{
lock (m_eventLock)
{
m_flowControl -= value;
}
}
}
public event BasicRecoverOkEventHandler BasicRecoverOk
{
add
{
lock (m_eventLock)
{
m_basicRecoverOk += value;
}
}
remove
{
lock (m_eventLock)
{
m_basicRecoverOk -= value;
}
}
}
<<<<<<<
=======
public void ExchangeDeclare(string exchange, string type, bool durable, bool autoDelete, IDictionary arguments)
{
_Private_ExchangeDeclare(exchange, type, false, durable, autoDelete, false, false, arguments);
}
>>>>>>>
public void ExchangeDeclare(string exchange, string type, bool durable, bool autoDelete, IDictionary arguments)
{
_Private_ExchangeDeclare(exchange, type, false, durable, autoDelete, false, false, arguments);
}
<<<<<<<
public abstract void ExchangeBind(string destination,
string source,
string routingKey,
bool nowait,
IDictionary arguments);
public abstract void ExchangeUnbind(string destination,
string source,
string routingKey,
bool nowait,
IDictionary arguments);
=======
public void ExchangeDelete(string exchange)
{
ExchangeDelete(exchange, false, false);
}
>>>>>>>
public void ExchangeDelete(string exchange)
{
ExchangeDelete(exchange, false, false);
}
public abstract void ExchangeBind(string destination,
string source,
string routingKey,
bool nowait,
IDictionary arguments);
public abstract void ExchangeUnbind(string destination,
string source,
string routingKey,
bool nowait,
IDictionary arguments);
<<<<<<<
public void ConfirmSelect(bool multiple) {
ConfirmSelect(multiple, false);
}
public void ConfirmSelect(bool multiple, bool nowait) {
m_pubMsgCount = 0;
_Private_ConfirmSelect(multiple, nowait);
}
public abstract void _Private_ConfirmSelect(bool multiple,
bool nowait);
=======
public uint QueueDelete(string queue)
{
return QueueDelete(queue, false, false, false);
}
>>>>>>>
public uint QueueDelete(string queue)
{
return QueueDelete(queue, false, false, false);
}
public void ConfirmSelect(bool multiple) {
ConfirmSelect(multiple, false);
}
public void ConfirmSelect(bool multiple, bool nowait) {
m_pubMsgCount = 0;
_Private_ConfirmSelect(multiple, nowait);
}
public abstract void _Private_ConfirmSelect(bool multiple,
bool nowait); |
<<<<<<<
public IDictionary m_clientProperties;
=======
public IDictionary m_serverProperties;
>>>>>>>
public IDictionary m_clientProperties;
public IDictionary m_serverProperties;
<<<<<<<
public IDictionary ClientProperties
{
get
{
return new Hashtable(m_clientProperties);
}
set
{
m_clientProperties = value;
}
}
=======
public IDictionary ServerProperties
{
get
{
return m_serverProperties;
}
set
{
m_serverProperties = value;
}
}
>>>>>>>
public IDictionary ClientProperties
{
get
{
return new Hashtable(m_clientProperties);
}
set
{
m_clientProperties = value;
}
}
public IDictionary ServerProperties
{
get
{
return m_serverProperties;
}
set
{
m_serverProperties = value;
}
} |
<<<<<<<
m_flowControlBlock.Reset();
_Private_ChannelFlowOk(active);
OnFlowControl(new FlowControlEventArgs(active));
=======
{
lock (m_flowSendLock)
{
m_flowControlBlock.Reset();
_Private_ChannelFlowOk(active);
}
}
>>>>>>>
{
lock (m_flowSendLock)
{
m_flowControlBlock.Reset();
_Private_ChannelFlowOk(active);
}
}
OnFlowControl(new FlowControlEventArgs(active)); |
<<<<<<<
if (validate && record.Id == Guid.Empty)
=======
/*
if (record.Id == Guid.Empty)
>>>>>>>
/*
if (validate && record.Id == Guid.Empty)
<<<<<<<
=======
*/
>>>>>>>
*/ |
<<<<<<<
public const bool VerifyServerCert = true;
=======
public const bool UseElasticTraceparentHeader = true;
>>>>>>>
public const bool UseElasticTraceparentHeader = true;
public const bool VerifyServerCert = true;
<<<<<<<
public const string VerifyServerCert = Prefix + "VERIFY_SERVER_CERT";
=======
public const string UseElasticTraceparentHeader = Prefix + "USE_ELASTIC_TRACEPARENT_HEADER";
>>>>>>>
public const string UseElasticTraceparentHeader = Prefix + "USE_ELASTIC_TRACEPARENT_HEADER";
public const string VerifyServerCert = Prefix + "VERIFY_SERVER_CERT";
<<<<<<<
public const string VerifyServerCert = "ElasticApm:VerifyServerCert";
=======
public const string UseElasticTraceparentheader = "ElasticApm:UseElasticTraceparentHeder";
>>>>>>>
public const string UseElasticTraceparentheader = "ElasticApm:UseElasticTraceparentHeder";
public const string VerifyServerCert = "ElasticApm:VerifyServerCert"; |
<<<<<<<
public bool VerifyServerCert => _wrapped.VerifyServerCert;
=======
public bool UseElasticTraceparentHeader => _wrapped.UseElasticTraceparentHeader;
>>>>>>>
public bool UseElasticTraceparentHeader => _wrapped.UseElasticTraceparentHeader;
public bool VerifyServerCert => _wrapped.VerifyServerCert; |
<<<<<<<
private readonly string _verifyServerCert;
=======
private readonly string _useElasticTraceparentHeader;
>>>>>>>
private readonly string _useElasticTraceparentHeader;
private readonly string _verifyServerCert;
<<<<<<<
string disableMetrics = null,
string verifyServerCert = null
=======
string disableMetrics = null,
string useElasticTraceparentHeader = null
>>>>>>>
string disableMetrics = null,
string verifyServerCert = null,
string useElasticTraceparentHeader = null
<<<<<<<
_verifyServerCert = verifyServerCert;
=======
_useElasticTraceparentHeader = useElasticTraceparentHeader;
>>>>>>>
_verifyServerCert = verifyServerCert;
_useElasticTraceparentHeader = useElasticTraceparentHeader;
<<<<<<<
public bool VerifyServerCert =>
ParseVerifyServerCert(Kv(ConfigConsts.EnvVarNames.VerifyServerCert, _verifyServerCert, Origin));
=======
public bool UseElasticTraceparentHeader =>
ParseUseElasticTraceparentHeader(Kv(ConfigConsts.EnvVarNames.UseElasticTraceparentHeader, _useElasticTraceparentHeader, Origin));
>>>>>>>
public bool UseElasticTraceparentHeader =>
ParseUseElasticTraceparentHeader(Kv(ConfigConsts.EnvVarNames.UseElasticTraceparentHeader, _useElasticTraceparentHeader, Origin));
public bool VerifyServerCert =>
ParseVerifyServerCert(Kv(ConfigConsts.EnvVarNames.VerifyServerCert, _verifyServerCert, Origin)); |
<<<<<<<
var configReader = configuration != null ? new MicrosoftExtensionsConfig(configuration) : null;
var service = GetService(configReader);
=======
var configReader = configuration == null
? new EnvironmentConfigurationReader()
: new MicrosoftExtensionsConfig(configuration) as IConfigurationReader;
var service = Service.GetDefaultService((configReader));
service.Framework = new Framework { Name = "ASP.NET Core", Version = "2.1" }; //TODO: Get version
service.Language = new Language { Name = "C#" }; //TODO
>>>>>>>
var configReader = configuration == null
? new EnvironmentConfigurationReader()
: new MicrosoftExtensionsConfig(configuration) as IConfigurationReader;
var service = GetService(configReader); |
<<<<<<<
public static readonly int PropertyMaxLength = 1024;
=======
public static string IntakeV2Events = "intake/v2/events";
>>>>>>>
public static readonly int PropertyMaxLength = 1024;
public static string IntakeV2Events = "intake/v2/events"; |
<<<<<<<
=======
using Elastic.Apm.Metrics;
>>>>>>>
using Elastic.Apm.Metrics;
<<<<<<<
if (PayloadSender is IDisposable disposable) disposable.Dispose();
=======
if (MetricsCollector is IDisposable disposableMetricsCollector)
{
disposableMetricsCollector.Dispose();
}
if (PayloadSender is IDisposable disposablePayloadSender)
{
disposablePayloadSender.Dispose();
}
>>>>>>>
if (MetricsCollector is IDisposable disposableMetricsCollector)
{
disposableMetricsCollector.Dispose();
}
if (PayloadSender is IDisposable disposablePayloadSender)
{
disposablePayloadSender.Dispose();
} |
<<<<<<<
AddPackageReference(projectManager, package, ignoreDependencies, allowPrereleaseVersions);
});
}
=======
AddPackageReference(projectManager, package, ignoreDependencies, allowPrereleaseVersions);
});
}
finally
{
ClearLogger(projectManager);
}
>>>>>>>
AddPackageReference(projectManager, package, ignoreDependencies, allowPrereleaseVersions);
});
}
}
finally
{
ClearLogger(projectManager);
} |
<<<<<<<
=======
using PackageUtility = NuGet.Test.PackageUtility;
>>>>>>>
using PackageUtility = NuGet.Test.PackageUtility; |
<<<<<<<
packageBuilder.Files.Add(CreatePackageFile(@"content\test1.txt"));
=======
if (licenseUrl != null)
{
packageBuilder.LicenseUrl = licenseUrl;
}
var dependencies = new PackageDependency("Dummy");
packageBuilder.DependencySets.Add(new PackageDependencySet(null, new[] { dependencies }));
>>>>>>>
if (licenseUrl != null)
{
packageBuilder.LicenseUrl = licenseUrl;
}
packageBuilder.Files.Add(CreatePackageFile(@"content\test1.txt")); |
<<<<<<<
/// Added 'requiredMinVersion' attribute
/// Allows XDT transformation
=======
/// Added 'minClientVersion' attribute
>>>>>>>
/// Added 'minClientVersion' attribute
/// Allows XDT transformation |
<<<<<<<
public void Disable() {
Invoke(_impl.Disable);
}
public void WriteProgress(ProgressData data) {
Invoke(()=>_impl.WriteProgress(data));
}
public void SetExecutionMode(bool isExecuting) {
Invoke(() => _impl.SetExecutionMode(isExecuting));
}
=======
>>>>>>>
public void WriteProgress(ProgressData data) {
Invoke(()=>_impl.WriteProgress(data));
}
<<<<<<<
public void Disable() {
if (_content != null) {
_content.DisableToolBar();
}
}
public void SetExecutionMode(bool isExecuting) {
if (_content != null) {
_content.SetExecutionMode(isExecuting);
}
}
public void WriteProgress(ProgressData data) {
if (_content != null) {
_content.ShowProgress(data);
}
}
=======
>>>>>>>
}
}
public void WriteProgress(ProgressData data) {
if (_content != null) {
_content.ShowProgress(data); |
<<<<<<<
List<IPackageAssemblyReference> assemblyReferences = Project.GetCompatibleItemsCore(package.AssemblyReferences).ToList();
List<FrameworkAssemblyReference> frameworkReferences = Project.GetCompatibleItemsCore(package.FrameworkAssemblies).ToList();
List<IPackageFile> contentFiles = Project.GetCompatibleItemsCore(package.GetContentFiles()).ToList();
=======
List<IPackageAssemblyReference> assemblyReferences = Project.GetCompatibleItemsCore(package.AssemblyReferences).ToList();
IList<FrameworkAssemblyReference> frameworkReferences = Project.GetCompatibleItemsCore(package.FrameworkAssemblies).ToList();
IList<IPackageFile> contentFiles = Project.GetCompatibleItemsCore(package.GetContentFiles()).ToList();
>>>>>>>
List<IPackageAssemblyReference> assemblyReferences = Project.GetCompatibleItemsCore(package.AssemblyReferences).ToList();
List<FrameworkAssemblyReference> frameworkReferences = Project.GetCompatibleItemsCore(package.FrameworkAssemblies).ToList();
List<IPackageFile> contentFiles = Project.GetCompatibleItemsCore(package.GetContentFiles()).ToList();
<<<<<<<
var contentFilesToDelete = GetCompatibleItemsForPackage(package.Id, package.GetContentFiles())
.Except(otherContentFiles, PackageFileComparer.Default).ToList();
// Look up the .targets and .props import files.
var importFiles = new List<IPackageFile>(2);
foreach (var extension in ImportFileExtensions)
{
string importFileName = package.Id + extension;
IPackageFile importFile = contentFilesToDelete.Find(p => p.EffectivePath.Equals(importFileName, StringComparison.OrdinalIgnoreCase));
if (importFile != null)
{
// import file was not added to project in the first place, so no need to remove it
contentFilesToDelete.Remove(importFile);
importFiles.Add(importFile);
}
}
=======
var contentFilesToDelete = GetCompatibleInstalledItemsForPackage(package.Id, package.GetContentFiles())
.Except(otherContentFiles, PackageFileComparer.Default);
>>>>>>>
var contentFilesToDelete = GetCompatibleInstalledItemsForPackage(package.Id, package.GetContentFiles())
.Except(otherContentFiles, PackageFileComparer.Default).ToList();
// Look up the .targets and .props import files.
var importFiles = new List<IPackageFile>(2);
foreach (var extension in ImportFileExtensions)
{
string importFileName = package.Id + extension;
IPackageFile importFile = contentFilesToDelete.Find(p => p.EffectivePath.Equals(importFileName, StringComparison.OrdinalIgnoreCase));
if (importFile != null)
{
// import file was not added to project in the first place, so no need to remove it
contentFilesToDelete.Remove(importFile);
importFiles.Add(importFile);
}
} |
<<<<<<<
=======
// Convert files to a list
>>>>>>>
// Convert files to a list
<<<<<<<
// Ignore uninstall transform file during installation
string truncatedPath;
IPackageFileTransformer uninstallTransformer =
FindFileTransformer(fileTransformers, fte => fte.UninstallExtension, file.EffectivePath, out truncatedPath);
if (uninstallTransformer != null)
{
continue;
}
project.AddFileWithCheck(path, file.GetStream);
=======
TryAddFile(project, file, path);
>>>>>>>
// Ignore uninstall transform file during installation
string truncatedPath;
IPackageFileTransformer uninstallTransformer =
FindFileTransformer(fileTransformers, fte => fte.UninstallExtension, file.EffectivePath, out truncatedPath);
if (uninstallTransformer != null)
{
continue;
}
TryAddFile(project, file, path);
<<<<<<<
[SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling")]
=======
/// <summary>
/// Try to add the specified the project with the target path. If there's an existing file in the project with the same name,
/// it will ask the logger for the resolution, which has 4 choices: Overwrite|Ignore|Overwrite All|Ignore All
/// </summary>
/// <param name="project"></param>
/// <param name="file"></param>
/// <param name="path"></param>
public static void TryAddFile(IProjectSystem project, IPackageFile file, string path)
{
if (project.FileExists(path) && project.FileExistsInProject(path))
{
// file exists in project, ask user if he wants to overwrite or ignore
string conflictMessage = String.Format(CultureInfo.CurrentCulture, NuGetResources.FileConflictMessage, path, project.ProjectName);
FileConflictResolution resolution = project.Logger.ResolveFileConflict(conflictMessage);
if (resolution == FileConflictResolution.Overwrite || resolution == FileConflictResolution.OverwriteAll)
{
// overwrite
project.Logger.Log(MessageLevel.Info, NuGetResources.Info_OverwriteExistingFile, path);
project.AddFile(path, file.GetStream());
}
else
{
// ignore
project.Logger.Log(MessageLevel.Info, NuGetResources.Warning_FileAlreadyExists, path);
}
}
else
{
project.AddFile(path, file.GetStream());
}
}
>>>>>>>
/// <summary>
/// Try to add the specified the project with the target path. If there's an existing file in the project with the same name,
/// it will ask the logger for the resolution, which has 4 choices: Overwrite|Ignore|Overwrite All|Ignore All
/// </summary>
/// <param name="project"></param>
/// <param name="file"></param>
/// <param name="path"></param>
public static void TryAddFile(IProjectSystem project, IPackageFile file, string path)
{
if (project.FileExists(path) && project.FileExistsInProject(path))
{
// file exists in project, ask user if he wants to overwrite or ignore
string conflictMessage = String.Format(CultureInfo.CurrentCulture, NuGetResources.FileConflictMessage, path, project.ProjectName);
FileConflictResolution resolution = project.Logger.ResolveFileConflict(conflictMessage);
if (resolution == FileConflictResolution.Overwrite || resolution == FileConflictResolution.OverwriteAll)
{
// overwrite
project.Logger.Log(MessageLevel.Info, NuGetResources.Info_OverwriteExistingFile, path);
project.AddFile(path, file.GetStream());
}
else
{
// ignore
project.Logger.Log(MessageLevel.Info, NuGetResources.Warning_FileAlreadyExists, path);
}
}
else
{
project.AddFile(path, file.GetStream());
}
}
[SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling")] |
<<<<<<<
/// <param name="console">The console requesting the initialization.</param>
void Initialize(IConsole console);
=======
void Initialize();
/// <summary>
/// Sets the default runspace from the console
/// </summary>
void SetDefaultRunspace();
>>>>>>>
/// <param name="console">The console requesting the initialization.</param>
void Initialize(IConsole console);
/// <summary>
/// Sets the default runspace from the console
/// </summary>
void SetDefaultRunspace(); |
<<<<<<<
private IPackageRepositoryFactory RepositoryFactory { get; set; }
=======
[Option(typeof(NuGetCommand), "InstallCommandRequireConsent")]
public bool RequireConsent { get; set; }
public IPackageRepositoryFactory RepositoryFactory { get; private set; }
>>>>>>>
private IPackageRepositoryFactory RepositoryFactory { get; set; }
<<<<<<<
// Do a very quick check of whether a package in installed by checking whether the nupkg file exists
private static bool IsPackageInstalled(LocalPackageRepository packageRepository, IFileSystem fileSystem, string packageId, SemanticVersion version)
=======
// Do a very quick check of whether a package in installed by checked whether the nupkg file exists
private bool IsPackageInstalled(IPackageRepository repository, IFileSystem fileSystem, string packageId, SemanticVersion version)
>>>>>>>
// Do a very quick check of whether a package in installed by checking whether the nupkg file exists
private bool IsPackageInstalled(IPackageRepository repository, IFileSystem fileSystem, string packageId, SemanticVersion version) |
<<<<<<<
=======
[Fact(Skip = "Bug in Moq when running in multi-threaded paths.")]
public void InstallCommandFromConfigListsAllMessagesInAggregateException()
{
// Arrange
var fileSystem = new MockFileSystem();
fileSystem.AddFile(@"X:\test\packages.config", @"<?xml version=""1.0"" encoding=""utf-8""?>
<packages>
<package id=""Abc"" version=""1.0.0"" />
<package id=""Efg"" version=""2.0.0"" />
<package id=""Pqr"" version=""3.0.0"" />
</packages>");
fileSystem.AddFile("Foo.1.8.nupkg");
var pathResolver = new DefaultPackagePathResolver(fileSystem);
var packageManager = new Mock<IPackageManager>(MockBehavior.Strict);
var repository = new MockPackageRepository();
packageManager.Setup(p => p.InstallPackage("Efg", new SemanticVersion("2.0.0"), true, true)).Throws(new Exception("Efg exception!!"));
packageManager.Setup(p => p.InstallPackage("Pqr", new SemanticVersion("3.0.0"), true, true)).Throws(new Exception("No package restore consent for you!"));
packageManager.SetupGet(p => p.PathResolver).Returns(pathResolver);
packageManager.SetupGet(p => p.LocalRepository).Returns(new LocalPackageRepository(pathResolver, fileSystem));
packageManager.SetupGet(p => p.FileSystem).Returns(fileSystem);
packageManager.SetupGet(p => p.SourceRepository).Returns(repository);
var repositoryFactory = new Mock<IPackageRepositoryFactory>();
repositoryFactory.Setup(r => r.CreateRepository("My Source")).Returns(repository);
var packageSourceProvider = new Mock<IPackageSourceProvider>(MockBehavior.Strict);
var console = new MockConsole();
// Act and Assert
var installCommand = new TestInstallCommand(repositoryFactory.Object, packageSourceProvider.Object, fileSystem, packageManager.Object);
installCommand.Arguments.Add(@"X:\test\packages.config");
installCommand.Console = console;
ExceptionAssert.Throws<AggregateException>(installCommand.Execute);
Assert.Contains("No package restore consent for you!", console.Output);
Assert.Contains("Efg exception!!", console.Output);
}
[Fact]
public void InstallCommandDoesNotPromptForConsentIfRequireConsentIsNotSet()
{
// Arrange
var fileSystem = new MockFileSystem();
fileSystem.AddFile(@"X:\test\packages.config", @"<?xml version=""1.0"" encoding=""utf-8""?>
<packages>
<package id=""Abc"" version=""1.0.0"" />
</packages>");
var pathResolver = new DefaultPackagePathResolver(fileSystem);
var packageManager = new Mock<IPackageManager>(MockBehavior.Strict);
var repository = new MockPackageRepository { PackageUtility.CreatePackage("Abc") };
packageManager.SetupGet(p => p.PathResolver).Returns(pathResolver);
packageManager.SetupGet(p => p.LocalRepository).Returns(new LocalPackageRepository(pathResolver, fileSystem));
packageManager.SetupGet(p => p.FileSystem).Returns(fileSystem);
packageManager.SetupGet(p => p.SourceRepository).Returns(repository);
packageManager.Setup(p => p.InstallPackage("Abc", new SemanticVersion("1.0.0"), true, true)).Verifiable();
var repositoryFactory = new Mock<IPackageRepositoryFactory>();
repositoryFactory.Setup(r => r.CreateRepository("My Source")).Returns(repository);
var packageSourceProvider = new Mock<IPackageSourceProvider>(MockBehavior.Strict);
var console = new MockConsole();
var installCommand = new TestInstallCommand(repositoryFactory.Object, packageSourceProvider.Object, fileSystem, packageManager.Object, allowPackageRestore: false);
installCommand.Arguments.Add(@"X:\test\packages.config");
installCommand.Console = console;
// Act
installCommand.Execute();
// Assert
packageManager.Verify();
}
[Fact]
public void InstallCommandPromptsForConsentIfRequireConsentIsSet()
{
// Arrange
var fileSystem = new MockFileSystem();
fileSystem.AddFile(@"X:\test\packages.config", @"<?xml version=""1.0"" encoding=""utf-8""?>
<packages>
<package id=""Abc"" version=""1.0.0"" />
</packages>");
var pathResolver = new DefaultPackagePathResolver(fileSystem);
var packageManager = new Mock<IPackageManager>(MockBehavior.Strict);
var repository = new MockPackageRepository { PackageUtility.CreatePackage("Abc") };
packageManager.SetupGet(p => p.PathResolver).Returns(pathResolver);
packageManager.SetupGet(p => p.LocalRepository).Returns(new LocalPackageRepository(pathResolver, fileSystem));
packageManager.SetupGet(p => p.FileSystem).Returns(fileSystem);
packageManager.SetupGet(p => p.SourceRepository).Returns(repository);
var repositoryFactory = new Mock<IPackageRepositoryFactory>();
repositoryFactory.Setup(r => r.CreateRepository("My Source")).Returns(repository);
var packageSourceProvider = new Mock<IPackageSourceProvider>(MockBehavior.Strict);
var console = new MockConsole();
var installCommand = new TestInstallCommand(repositoryFactory.Object, packageSourceProvider.Object, fileSystem, packageManager.Object, allowPackageRestore: false);
installCommand.Arguments.Add(@"X:\test\packages.config");
installCommand.Console = console;
installCommand.RequireConsent = true;
// Act
var exception = Assert.Throws<AggregateException>(() => installCommand.Execute());
// Assert
Assert.Equal("Package restore is disabled by default. To give consent, open the Visual Studio Options dialog, click on Package Manager node and check 'Allow NuGet to download missing packages during build.' You can also give consent by setting the environment variable 'EnableNuGetPackageRestore' to 'true'.",
exception.InnerException.Message);
}
>>>>>>>
[Fact]
public void InstallCommandDoesNotPromptForConsentIfRequireConsentIsNotSet()
{
// Arrange
var fileSystem = new MockFileSystem();
fileSystem.AddFile(@"X:\test\packages.config", @"<?xml version=""1.0"" encoding=""utf-8""?>
<packages>
<package id=""Abc"" version=""1.0.0"" />
</packages>");
var pathResolver = new DefaultPackagePathResolver(fileSystem);
var packageManager = new Mock<IPackageManager>(MockBehavior.Strict);
var repository = new MockPackageRepository { PackageUtility.CreatePackage("Abc") };
packageManager.SetupGet(p => p.PathResolver).Returns(pathResolver);
packageManager.SetupGet(p => p.LocalRepository).Returns(new LocalPackageRepository(pathResolver, fileSystem));
packageManager.SetupGet(p => p.FileSystem).Returns(fileSystem);
packageManager.SetupGet(p => p.SourceRepository).Returns(repository);
packageManager.Setup(p => p.InstallPackage("Abc", new SemanticVersion("1.0.0"), true, true)).Verifiable();
var repositoryFactory = new Mock<IPackageRepositoryFactory>();
repositoryFactory.Setup(r => r.CreateRepository("My Source")).Returns(repository);
var packageSourceProvider = new Mock<IPackageSourceProvider>(MockBehavior.Strict);
var console = new MockConsole();
var installCommand = new TestInstallCommand(repositoryFactory.Object, packageSourceProvider.Object, fileSystem, packageManager.Object, allowPackageRestore: false);
installCommand.Arguments.Add(@"X:\test\packages.config");
installCommand.Console = console;
// Act
installCommand.Execute();
// Assert
packageManager.Verify();
}
[Fact]
public void InstallCommandPromptsForConsentIfRequireConsentIsSet()
{
// Arrange
var fileSystem = new MockFileSystem();
fileSystem.AddFile(@"X:\test\packages.config", @"<?xml version=""1.0"" encoding=""utf-8""?>
<packages>
<package id=""Abc"" version=""1.0.0"" />
</packages>");
var pathResolver = new DefaultPackagePathResolver(fileSystem);
var packageManager = new Mock<IPackageManager>(MockBehavior.Strict);
var repository = new MockPackageRepository { PackageUtility.CreatePackage("Abc") };
packageManager.SetupGet(p => p.PathResolver).Returns(pathResolver);
packageManager.SetupGet(p => p.LocalRepository).Returns(new LocalPackageRepository(pathResolver, fileSystem));
packageManager.SetupGet(p => p.FileSystem).Returns(fileSystem);
packageManager.SetupGet(p => p.SourceRepository).Returns(repository);
var repositoryFactory = new Mock<IPackageRepositoryFactory>();
repositoryFactory.Setup(r => r.CreateRepository("My Source")).Returns(repository);
var packageSourceProvider = new Mock<IPackageSourceProvider>(MockBehavior.Strict);
var console = new MockConsole();
var installCommand = new TestInstallCommand(repositoryFactory.Object, packageSourceProvider.Object, fileSystem, packageManager.Object, allowPackageRestore: false);
installCommand.Arguments.Add(@"X:\test\packages.config");
installCommand.Console = console;
installCommand.RequireConsent = true;
// Act
var exception = Assert.Throws<AggregateException>(() => installCommand.Execute());
// Assert
Assert.Equal("Package restore is disabled by default. To give consent, open the Visual Studio Options dialog, click on Package Manager node and check 'Allow NuGet to download missing packages during build.' You can also give consent by setting the environment variable 'EnableNuGetPackageRestore' to 'true'.",
exception.InnerException.Message);
} |
<<<<<<<
public bool ShowDisclaimerHeader {
get {
return true;
}
}
public bool ExecuteInitScriptOnStartup {
get {
return true;
}
}
=======
>>>>>>>
public bool ShowDisclaimerHeader {
get {
return true;
}
} |
<<<<<<<
private readonly IPackageRepository _cacheRepository;
private readonly List<string> _sources = new List<string>();
private static readonly bool _isMonoRuntime = Type.GetType("Mono.Runtime") != null;
private PackageFileTypes _saveOnExpand;
[Option(typeof(NuGetCommand), "InstallCommandSourceDescription")]
public ICollection<string> Source
{
get { return _sources; }
}
=======
>>>>>>>
private PackageFileTypes _saveOnExpand;
<<<<<<<
[Option(typeof(NuGetCommand), "InstallCommandDisableParallel")]
public bool DisableParallel { get; set; }
[Option(typeof(NuGetCommand), "InstallCommandSaveOnExpand")]
public string SaveOnExpand { get; set; }
/// <remarks>
/// Meant for unit testing.
/// </remarks>
protected IPackageRepository CacheRepository
{
get { return _cacheRepository; }
}
=======
>>>>>>>
[Option(typeof(NuGetCommand), "InstallCommandSaveOnExpand")]
public string SaveOnExpand { get; set; } |
<<<<<<<
#if !FAKE_XRM_EASY
[Fact]
public void Can_Filter_Using_Entity_Name_Without_Alias()
{
XrmFakedContext context = new XrmFakedContext();
IOrganizationService service = context.GetOrganizationService();
Entity e = new Entity("contact")
{
Id = Guid.NewGuid(),
["retrieve"] = true
};
Entity e2 = new Entity("account")
{
Id = Guid.NewGuid(),
["contactid"] = e.ToEntityReference()
};
context.Initialize(new Entity[] { e, e2 });
QueryExpression query = new QueryExpression("account");
query.Criteria.AddCondition("contact", "retrieve", ConditionOperator.Equal, true);
query.AddLink("contact", "contactid", "contactid");
EntityCollection result = service.RetrieveMultiple(query);
Assert.Equal(1, result.Entities.Count);
}
[Fact]
public void Can_Filter_Using_Entity_Name_With_Alias()
{
XrmFakedContext context = new XrmFakedContext();
IOrganizationService service = context.GetOrganizationService();
Entity e = new Entity("contact")
{
Id = Guid.NewGuid(),
["retrieve"] = true
};
Entity e2 = new Entity("account")
{
Id = Guid.NewGuid(),
["contactid"] = e.ToEntityReference()
};
context.Initialize(new Entity[] { e, e2 });
QueryExpression query = new QueryExpression("account");
query.Criteria.AddCondition("mycontact", "retrieve", ConditionOperator.Equal, true);
query.AddLink("contact", "contactid", "contactid").EntityAlias="mycontact";
EntityCollection result = service.RetrieveMultiple(query);
Assert.Equal(1, result.Entities.Count);
}
#endif
=======
[Fact]
public void Should_Allow_Using_Aliases_with_Dot()
{
var contact = new Entity("contact") { Id = Guid.NewGuid() };
contact["firstname"] = "Jordi";
var account = new Entity("account") { Id = Guid.NewGuid() };
account["primarycontactid"] = contact.ToEntityReference();
account["name"] = "Dynamics Value";
var context = new XrmFakedContext();
context.Initialize(new Entity[] { contact, account });
var service = context.GetOrganizationService();
QueryExpression query = new QueryExpression("account");
query.ColumnSet = new ColumnSet("name");
var link = query.AddLink("contact", "contactid", "primarycontactid");
link.EntityAlias = "primary.contact";
link.Columns = new ColumnSet("firstname");
var accounts = service.RetrieveMultiple(query);
Assert.True(accounts.Entities.First().Contains("primary.contact.firstname"));
Assert.Equal("Jordi", accounts.Entities.First().GetAttributeValue<AliasedValue>("primary.contact.firstname").Value);
}
>>>>>>>
#if !FAKE_XRM_EASY
[Fact]
public void Can_Filter_Using_Entity_Name_Without_Alias()
{
XrmFakedContext context = new XrmFakedContext();
IOrganizationService service = context.GetOrganizationService();
Entity e = new Entity("contact")
{
Id = Guid.NewGuid(),
["retrieve"] = true
};
Entity e2 = new Entity("account")
{
Id = Guid.NewGuid(),
["contactid"] = e.ToEntityReference()
};
context.Initialize(new Entity[] { e, e2 });
QueryExpression query = new QueryExpression("account");
query.Criteria.AddCondition("contact", "retrieve", ConditionOperator.Equal, true);
query.AddLink("contact", "contactid", "contactid");
EntityCollection result = service.RetrieveMultiple(query);
Assert.Equal(1, result.Entities.Count);
}
[Fact]
public void Can_Filter_Using_Entity_Name_With_Alias()
{
XrmFakedContext context = new XrmFakedContext();
IOrganizationService service = context.GetOrganizationService();
Entity e = new Entity("contact")
{
Id = Guid.NewGuid(),
["retrieve"] = true
};
Entity e2 = new Entity("account")
{
Id = Guid.NewGuid(),
["contactid"] = e.ToEntityReference()
};
context.Initialize(new Entity[] { e, e2 });
QueryExpression query = new QueryExpression("account");
query.Criteria.AddCondition("mycontact", "retrieve", ConditionOperator.Equal, true);
query.AddLink("contact", "contactid", "contactid").EntityAlias="mycontact";
EntityCollection result = service.RetrieveMultiple(query);
Assert.Equal(1, result.Entities.Count);
}
#endif
[Fact]
public void Should_Allow_Using_Aliases_with_Dot()
{
var contact = new Entity("contact") { Id = Guid.NewGuid() };
contact["firstname"] = "Jordi";
var account = new Entity("account") { Id = Guid.NewGuid() };
account["primarycontactid"] = contact.ToEntityReference();
account["name"] = "Dynamics Value";
var context = new XrmFakedContext();
context.Initialize(new Entity[] { contact, account });
var service = context.GetOrganizationService();
QueryExpression query = new QueryExpression("account");
query.ColumnSet = new ColumnSet("name");
var link = query.AddLink("contact", "contactid", "primarycontactid");
link.EntityAlias = "primary.contact";
link.Columns = new ColumnSet("firstname");
var accounts = service.RetrieveMultiple(query);
Assert.True(accounts.Entities.First().Contains("primary.contact.firstname"));
Assert.Equal("Jordi", accounts.Entities.First().GetAttributeValue<AliasedValue>("primary.contact.firstname").Value);
} |
<<<<<<<
Dictionary<string, HostInfo> _hostInfos;
=======
internal event EventHandler ActiveHostChanged;
>>>>>>>
<<<<<<<
=======
public IEnumerable<string> Hosts {
get { return HostProviders.Select(p => p.Metadata.HostName); }
}
public string ActiveHost {
get {
// If _activeHost is invalid (e.g., a previous provider is uninstalled),
// simply use a random available host
if (string.IsNullOrEmpty(_activeHost) || !HostInfos.ContainsKey(_activeHost)) {
_activeHost = HostInfos.Keys.FirstOrDefault();
}
return _activeHost;
}
set {
if (!string.Equals(_activeHost, value) && HostInfos.ContainsKey(value)) {
_activeHost = value;
_activeHostInfo = null;
ActiveHostChanged.Raise(this);
}
}
}
// represent the default feed
>>>>>>>
// represent the default feed
<<<<<<<
=======
public void Start() {
ActiveHostInfo.WpfConsole.Dispatcher.Start();
}
public void SetDefaultRunspace() {
ActiveHostInfo.WpfConsole.Host.SetDefaultRunspace();
}
>>>>>>>
public void Start() {
ActiveHostInfo.WpfConsole.Dispatcher.Start();
}
public void SetDefaultRunspace() {
ActiveHostInfo.WpfConsole.Host.SetDefaultRunspace();
} |
<<<<<<<
public CCTransitionFlipAngular() { }
public CCTransitionFlipAngular(float t, CCScene s, tOrientation o) : base(t, s, o)
=======
public CCTransitionFlipAngular(float t, CCScene s, CCTransitionOrientation o) : base(t, s, o)
>>>>>>>
public CCTransitionFlipAngular() { }
public CCTransitionFlipAngular(float t, CCScene s, CCTransitionOrientation o) : base(t, s, o) |
<<<<<<<
public CCTexture2D AddImage(Stream imageStream, string assetName)
{
Debug.Assert(imageStream == null, "TextureCache: imageStream MUST not be NULL");
CCTexture2D texture;
lock (m_pDictLock)
{
string pathKey = assetName;
bool bHasTexture = m_pTextures.TryGetValue(pathKey, out texture);
if(!bHasTexture || texture == null)
{
// Create a new one only if the current one does not exist
texture = new CCTexture2D();
}
if(!texture.IsTextureDefined)
{
// Either we are creating a new one or else we need to refresh the current one.
// CCLog.Log("Loading texture {0}", fileimage);
var graphicsDeviceService = CCApplication.SharedApplication.Content.ServiceProvider.GetService(typeof(IGraphicsDeviceService)) as IGraphicsDeviceService;
if (graphicsDeviceService == null)
{
throw new InvalidOperationException("No Graphics Device Service");
}
var textureXna = Texture2D.FromStream(graphicsDeviceService.GraphicsDevice, imageStream);
bool isInited = texture.InitWithTexture(textureXna);
if (isInited)
{
texture.IsManaged = true;
texture.ContentFile = assetName;
m_pTextures[pathKey] = texture;
m_pTextureRefNames[texture] = assetName;
}
else
{
Debug.Assert(false, "cocos2d: Couldn't add image:" + assetName + " in CCTextureCache");
return null;
}
}
}
return texture;
}
=======
public CCTexture2D AddImage(Stream imageStream, string assetName)
{
Debug.Assert(imageStream == null, "TextureCache: imageStream MUST not be NULL");
CCTexture2D texture;
lock (m_pDictLock)
{
string pathKey = assetName;
bool bHasTexture = m_pTextures.TryGetValue(pathKey, out texture);
if(!bHasTexture || texture == null)
{
// Create a new one only if the current one does not exist
texture = new CCTexture2D();
}
if(!texture.IsTextureDefined)
{
// Either we are creating a new one or else we need to refresh the current one.
// CCLog.Log("Loading texture {0}", fileimage);
Texture2D textureXna = Texture2D.FromStream(CCApplication.SharedApplication.GraphicsDevice, imageStream);
bool isInited = texture.InitWithTexture(textureXna);
if (isInited)
{
// Can only be true if the content manager loads the texture.
texture.IsManaged = false;
texture.ContentFile = assetName;
m_pTextures[pathKey] = texture;
m_pTextureRefNames[texture] = assetName;
}
else
{
Debug.Assert(false, "cocos2d: Couldn't add image:" + assetName + " in CCTextureCache");
return null;
}
}
}
return texture;
}
>>>>>>>
public CCTexture2D AddImage(Stream imageStream, string assetName)
{
Debug.Assert(imageStream == null, "TextureCache: imageStream MUST not be NULL");
CCTexture2D texture;
lock (m_pDictLock)
{
string pathKey = assetName;
bool bHasTexture = m_pTextures.TryGetValue(pathKey, out texture);
if(!bHasTexture || texture == null)
{
// Create a new one only if the current one does not exist
texture = new CCTexture2D();
}
if(!texture.IsTextureDefined)
{
// Either we are creating a new one or else we need to refresh the current one.
// CCLog.Log("Loading texture {0}", fileimage);
var graphicsDeviceService = CCApplication.SharedApplication.Content.ServiceProvider.GetService(typeof(IGraphicsDeviceService)) as IGraphicsDeviceService;
if (graphicsDeviceService == null)
{
throw new InvalidOperationException("No Graphics Device Service");
}
var textureXna = Texture2D.FromStream(graphicsDeviceService.GraphicsDevice, imageStream);
bool isInited = texture.InitWithTexture(textureXna);
if (isInited)
{
// Can only be true if the content manager loads the texture.
texture.IsManaged = false;
texture.ContentFile = assetName;
m_pTextures[pathKey] = texture;
m_pTextureRefNames[texture] = assetName;
}
else
{
Debug.Assert(false, "cocos2d: Couldn't add image:" + assetName + " in CCTextureCache");
return null;
}
}
}
return texture;
} |
<<<<<<<
// public static b2ContactVelocityConstraint Default = b2ContactVelocityConstraint.Create();
=======
>>>>>>>
<<<<<<<
// public static b2ContactPositionConstraint Default = b2ContactPositionConstraint.Create();
=======
>>>>>>>
public static b2ContactPositionConstraint Default = b2ContactPositionConstraint.Create(); |
<<<<<<<
=======
else if (BackupFont != null)
{
if (HasShadow)
{
renderArgs.DrawString(RenderPosition + TextShadowOffset, BackupFont, text, TextColor.BackgroundColor, Scale, Rotation, RotationOrigin);
}
renderArgs.DrawString(RenderPosition, BackupFont, text, TextColor.ForegroundColor, Scale, Rotation, RotationOrigin);
}
>>>>>>>
<<<<<<<
if (Font != null && !string.IsNullOrWhiteSpace(text))
=======
if (string.IsNullOrWhiteSpace(text))
{
_renderText = string.Empty;
Width = 0;
Height = 0;
}
else if ((Font != null || BackupFont != null))
>>>>>>>
if (Font != null && !string.IsNullOrWhiteSpace(text))
if (string.IsNullOrWhiteSpace(text))
{
_renderText = string.Empty;
Width = 0;
Height = 0;
}
else if (Font != null)
<<<<<<<
InvalidateLayout();
=======
>>>>>>> |
<<<<<<<
renderArgs.DrawString(Font, text, Position, TextColor, HasShadow, Rotation, RotationOrigin, Scale);
}
else if (FontRenderer != null)
{
if (HasShadow)
=======
if (HasShadow)
>>>>>>>
renderArgs.DrawString(Font, text, Position, TextColor, HasShadow, Rotation, RotationOrigin, Scale);
}
else if (FontRenderer != null)
{
if (HasShadow)
<<<<<<<
{
if ((Font != null || FontRenderer != null || BackupFont != null) && !string.IsNullOrWhiteSpace(Text))
{
var size = Font?.MeasureString(Text, new Vector2(Scale)) ?? FontRenderer?.GetStringSize(Text, new Vector2(Scale)) ?? (BackupFont.MeasureString(Text) * Scale);
=======
{
string text = _text;
if ((Font != null || BackupFont != null) && !string.IsNullOrWhiteSpace(text))
{
var scale = new Vector2(Scale, Scale);
>>>>>>>
{
string text = _text;
if ((Font != null || FontRenderer != null || BackupFont != null) && !string.IsNullOrWhiteSpace(text))
{
var scale = new Vector2(Scale, Scale); |
<<<<<<<
public UiManager UiManager { get; private set; }
=======
>>>>>>>
public UiManager UiManager { get; private set; }
<<<<<<<
UiManager = new UiManager(this);
=======
IsFixedTimeStep = false;
// _graphics.ToggleFullScreen();
Username = "";
>>>>>>> |
<<<<<<<
using Alex.API.Gui;
using Alex.API.Gui.Elements;
using Alex.API.Gui.Rendering;
=======
using System;
using Alex.Gamestates.Gui;
using Alex.Graphics.Gui;
using Alex.Graphics.Gui.Elements;
using Alex.Graphics.Gui.Rendering;
using Alex.Graphics.UI.Common;
using Alex.Rendering.UI;
using Alex.Utils;
>>>>>>>
using System;
using Alex.Gamestates.Gui;
using Alex.API.Gui;
using Alex.API.Gui.Elements;
using Alex.API.Gui.Rendering;
using Alex.Rendering.UI;
using Alex.Utils;
<<<<<<<
_screen.UpdateProgress((int)(100d * (gameTime.TotalGameTime.TotalMilliseconds / 2500)), "Loaddinnggg Stuffffssss....");
=======
_screen.UpdateProgress(percentage);
_screen.Text = statusMessage;
>>>>>>>
_screen.UpdateProgress(percentage);
_screen.Text = statusMessage;
<<<<<<<
=======
_progressBar = new GuiProgressBar()
{
Width = 300,
Height = 9,
Y = -50,
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Bottom,
};
AddChild(_progressBar);
_textDisplay = new GuiTextElement()
{
Text = Text,
Font = Alex.Font,
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Top,
Scale = 0.5f
};
_progressBar.AddChild(_textDisplay);
_percentageDisplay = new GuiTextElement()
{
Text = Text,
Font = Alex.Font,
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Bottom,
Scale = 0.50f
};
_progressBar.AddChild(_percentageDisplay);
>>>>>>>
_progressBar = new GuiProgressBar()
{
Width = 300,
Height = 9,
Y = -50,
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Bottom,
};
AddChild(_progressBar);
_textDisplay = new GuiTextElement()
{
Text = Text,
Font = Alex.Font,
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Top,
Scale = 0.5f
};
_progressBar.AddChild(_textDisplay);
_percentageDisplay = new GuiTextElement()
{
Text = Text,
Font = Alex.Font,
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Bottom,
Scale = 0.50f
};
_progressBar.AddChild(_percentageDisplay);
<<<<<<<
_statusText.Text = status;
=======
_percentageDisplay.Text = $"{value}%";
_percentageDisplay.Y = _percentageDisplay.Height;
>>>>>>>
_percentageDisplay.Text = $"{value}%";
_percentageDisplay.Y = _percentageDisplay.Height; |
<<<<<<<
Assert.Equal("0.0.0." + repo.Head.Commits.First().GetIdAsVersion().Revision, buildResult.BuildVersion);
Assert.Equal("0.0.0+" + repo.Head.Commits.First().Id.Sha.Substring(0, 10), buildResult.AssemblyInformationalVersion);
=======
Assert.Equal("0.0.1." + repo.Head.Commits.First().GetIdAsVersion().Revision, buildResult.BuildVersion);
Assert.Equal("0.0.1+" + repo.Head.Commits.First().Id.Sha.Substring(0, VersionOptions.DefaultGitCommitIdShortFixedLength), buildResult.AssemblyInformationalVersion);
>>>>>>>
Assert.Equal("0.0.0." + repo.Head.Commits.First().GetIdAsVersion().Revision, buildResult.BuildVersion);
Assert.Equal("0.0.0+" + repo.Head.Commits.First().Id.Sha.Substring(0, VersionOptions.DefaultGitCommitIdShortFixedLength), buildResult.AssemblyInformationalVersion); |
<<<<<<<
static readonly string[] fsItemKinds = { "FILE", "FOLDER" };
readonly AmazonDrive amazon;
readonly NodeTreeCache nodeTreeCache = new NodeTreeCache();
readonly SmallFileCache smallFileCache;
=======
static readonly string[] fsItemKinds = { "FILE", "FOLDER" };
internal readonly AmazonDrive Amazon;
readonly NodeTreeCache nodeTreeCache = new NodeTreeCache();
internal SmallFileCache SmallFileCache { get; private set; }
string cachePath;
public string CachePath
{
get
{
SmallFileCache.CachePath = cachePath;
return cachePath;
}
set
{
cachePath = value;
SmallFileCache.CachePath = value;
}
}
>>>>>>>
static readonly string[] fsItemKinds = { "FILE", "FOLDER" };
internal readonly AmazonDrive Amazon;
readonly NodeTreeCache nodeTreeCache = new NodeTreeCache();
internal SmallFileCache SmallFileCache { get; private set; }
string cachePath;
public string CachePath
{
get
{
SmallFileCache.CachePath = cachePath;
return cachePath;
}
set
{
cachePath = value;
SmallFileCache.CachePath = value;
}
}
<<<<<<<
this.amazon = amazon;
smallFileCache = SmallFileCache.GetInstance(amazon);
=======
this.Amazon = amazon;
SmallFileCache = new SmallFileCache(amazon);
>>>>>>>
this.Amazon = amazon;
SmallFileCache = new SmallFileCache(amazon);
<<<<<<<
public long TotalUsedSpace => amazon.Account.GetUsage().Result.total.total.bytes;
public string VolumeName => FileSystemName;
public string FileSystemName => "Amazon Cloud Drive";
public static IList<char> GetFreeDriveLettes()
=======
public string VolumeName => "Cloud Drive";
public static IList<char> GetFreeDriveLettes()
>>>>>>>
public string VolumeName => FileSystemName;
public string FileSystemName => "Amazon Cloud Drive";
public static IList<char> GetFreeDriveLettes()
<<<<<<<
var node = GetItem(filePath);
if (node != null)
{
if (node.IsDir) throw new InvalidOperationException("Not file");
amazon.Nodes.Delete(node.Id).Wait();
nodeTreeCache.DeleteFile(filePath);
}
=======
var node = GetItem(filePath);
if (node != null)
{
if (node.IsDir) throw new InvalidOperationException("Not file");
Amazon.Nodes.Delete(node.Id).Wait();
nodeTreeCache.DeleteFile(filePath);
}
>>>>>>>
var node = GetItem(filePath);
if (node != null)
{
if (node.IsDir) throw new InvalidOperationException("Not file");
Amazon.Nodes.Delete(node.Id).Wait();
nodeTreeCache.DeleteFile(filePath);
}
<<<<<<<
var name = Path.GetFileName(filePath);
var node = amazon.Nodes.CreateFolder(dirNode.Id, name).Result;
nodeTreeCache.Add(FSItem.FromNode(filePath, node));
=======
var name = Path.GetFileName(filePath);
var node = Amazon.Nodes.CreateFolder(dirNode.Id, name).Result;
nodeTreeCache.Add(FSItem.FromNode(filePath, node));
>>>>>>>
var name = Path.GetFileName(filePath);
var node = Amazon.Nodes.CreateFolder(dirNode.Id, name).Result;
nodeTreeCache.Add(FSItem.FromNode(filePath, node));
<<<<<<<
if (fileAccess == FileAccess.ReadWrite) return null;
var node = GetItem(filePath);
if (fileAccess == FileAccess.Read)
{
if (node == null) return null;
return smallFileCache.OpenRead(node);
}
if (mode == FileMode.CreateNew || (mode == FileMode.Create && (node == null || node.Length == 0)))
{
var dir = Path.GetDirectoryName(filePath);
var name = Path.GetFileName(filePath);
var dirNode = GetItem(dir);
var uploader = new NewBlockFileUploader(dirNode, node, filePath, amazon);
node = uploader.Node;
nodeTreeCache.Add(node);
uploader.OnUpload = (parent, newnode) =>
{
File.Move(Path.Combine(SmallFileCache.CachePath, node.Id), Path.Combine(SmallFileCache.CachePath, newnode.id));
node.Id = newnode.id;
node.Length = newnode.Length;
node.NotFake();
};
uploader.OnUploadFailed = (parent, path, id) =>
{
nodeTreeCache.DeleteFile(path);
};
return uploader;
}
return null;
=======
if (fileAccess == FileAccess.ReadWrite) return null;
var node = GetItem(filePath);
if (fileAccess == FileAccess.Read)
{
if (node == null) return null;
return SmallFileCache.OpenRead(node);
}
if (mode == FileMode.CreateNew || (mode == FileMode.Create && (node == null || node.Length == 0)))
{
var dir = Path.GetDirectoryName(filePath);
var name = Path.GetFileName(filePath);
var dirNode = GetItem(dir);
var uploader = new NewBlockFileUploader(dirNode, node, filePath, this);
node = uploader.Node;
nodeTreeCache.Add(node);
uploader.OnUpload = (parent, newnode) =>
{
File.Move(Path.Combine(SmallFileCache.CachePath, node.Id), Path.Combine(SmallFileCache.CachePath, newnode.id));
node.Id = newnode.id;
node.Length = newnode.Length;
node.NotFake();
};
uploader.OnUploadFailed = (parent, path, id) =>
{
nodeTreeCache.DeleteFile(path);
};
return uploader;
}
return null;
>>>>>>>
if (fileAccess == FileAccess.ReadWrite) return null;
var node = GetItem(filePath);
if (fileAccess == FileAccess.Read)
{
if (node == null) return null;
return SmallFileCache.OpenRead(node);
}
if (mode == FileMode.CreateNew || (mode == FileMode.Create && (node == null || node.Length == 0)))
{
var dir = Path.GetDirectoryName(filePath);
var name = Path.GetFileName(filePath);
var dirNode = GetItem(dir);
var uploader = new NewBlockFileUploader(dirNode, node, filePath, this);
node = uploader.Node;
nodeTreeCache.Add(node);
uploader.OnUpload = (parent, newnode) =>
{
File.Move(Path.Combine(SmallFileCache.CachePath, node.Id), Path.Combine(SmallFileCache.CachePath, newnode.id));
node.Id = newnode.id;
node.Length = newnode.Length;
node.NotFake();
};
uploader.OnUploadFailed = (parent, path, id) =>
{
nodeTreeCache.DeleteFile(path);
};
return uploader;
}
return null;
<<<<<<<
var node = GetItem(filePath);
if (node != null)
{
if (!node.IsDir) throw new InvalidOperationException("Not dir");
amazon.Nodes.Delete(node.Id).Wait();
nodeTreeCache.DeleteDir(filePath);
}
=======
var node = GetItem(filePath);
if (node != null)
{
if (!node.IsDir) throw new InvalidOperationException("Not dir");
Amazon.Nodes.Delete(node.Id).Wait();
nodeTreeCache.DeleteDir(filePath);
}
>>>>>>>
var node = GetItem(filePath);
if (node != null)
{
if (!node.IsDir) throw new InvalidOperationException("Not dir");
Amazon.Nodes.Delete(node.Id).Wait();
nodeTreeCache.DeleteDir(filePath);
}
<<<<<<<
var cached = nodeTreeCache.GetDir(folderPath);
if (cached != null) return cached.ToList();
var folderNode = GetItem(folderPath);
var nodes = await amazon.Nodes.GetChildren(folderNode?.Id);
var items = new List<FSItem>(nodes.Count);
var curdir = folderPath;
if (curdir == "\\") curdir = "";
=======
var cached = nodeTreeCache.GetDir(folderPath);
if (cached != null) return cached.ToList();
var folderNode = GetItem(folderPath);
var nodes = await Amazon.Nodes.GetChildren(folderNode?.Id);
var items = new List<FSItem>(nodes.Count);
var curdir = folderPath;
if (curdir == "\\") curdir = "";
>>>>>>>
var cached = nodeTreeCache.GetDir(folderPath);
if (cached != null) return cached.ToList();
var folderNode = GetItem(folderPath);
var nodes = await Amazon.Nodes.GetChildren(folderNode?.Id);
var items = new List<FSItem>(nodes.Count);
var curdir = folderPath;
if (curdir == "\\") curdir = "";
<<<<<<<
if (itemPath == "\\" || itemPath == "") return FSItem.FromRoot(await amazon.Nodes.GetRoot());
var cached = nodeTreeCache.GetNode(itemPath);
if (cached != null) return cached;
=======
if (itemPath == "\\" || itemPath == "") return FSItem.FromRoot(await Amazon.Nodes.GetRoot());
var cached = nodeTreeCache.GetNode(itemPath);
if (cached != null) return cached;
>>>>>>>
if (itemPath == "\\" || itemPath == "") return FSItem.FromRoot(await Amazon.Nodes.GetRoot());
var cached = nodeTreeCache.GetNode(itemPath);
if (cached != null) return cached;
<<<<<<<
item = nodeTreeCache.GetNode(curpath);
} while (item == null);
if (item == null) item = FSItem.FromRoot(await amazon.Nodes.GetRoot());
=======
item = nodeTreeCache.GetNode(curpath);
} while (item == null);
if (item == null) item = FSItem.FromRoot(await Amazon.Nodes.GetRoot());
>>>>>>>
item = nodeTreeCache.GetNode(curpath);
} while (item == null);
if (item == null) item = FSItem.FromRoot(await Amazon.Nodes.GetRoot());
<<<<<<<
var newnode = await amazon.Nodes.GetChild(item.Id, name);
if (newnode == null) return null;
if (curpath == "\\") curpath = "";
=======
var newnode = await Amazon.Nodes.GetChild(item.Id, name);
if (newnode == null) return null;
if (curpath == "\\") curpath = "";
>>>>>>>
var newnode = await Amazon.Nodes.GetChild(item.Id, name);
if (newnode == null) return null;
if (curpath == "\\") curpath = "";
<<<<<<<
if (oldPath == newPath) return;
var oldDir = Path.GetDirectoryName(oldPath);
var oldName = Path.GetFileName(oldPath);
var newDir = Path.GetDirectoryName(newPath);
var newName = Path.GetFileName(newPath);
var node = GetItem(oldPath);
if (oldName != newName)
{
node = FSItem.FromNode(Path.Combine(oldDir, newName), amazon.Nodes.Rename(node.Id, newName).Result);
if (node == null) throw new InvalidOperationException("Can not rename");
}
if (oldDir != newDir)
{
var oldDirNodeTask = FetchNode(oldDir);
var newDirNodeTask = FetchNode(newDir);
Task.WaitAll(oldDirNodeTask, newDirNodeTask);
node = FSItem.FromNode(newPath, amazon.Nodes.Move(node.Id, oldDirNodeTask.Result.Id, newDirNodeTask.Result.Id).Result);
if (node == null) throw new InvalidOperationException("Can not move");
}
if (node.IsDir)
nodeTreeCache.MoveDir(oldPath, node);
else
nodeTreeCache.MoveFile(oldPath, node);
=======
if (oldPath == newPath) return;
var oldDir = Path.GetDirectoryName(oldPath);
var oldName = Path.GetFileName(oldPath);
var newDir = Path.GetDirectoryName(newPath);
var newName = Path.GetFileName(newPath);
var node = GetItem(oldPath);
if (oldName != newName)
{
node = FSItem.FromNode(Path.Combine(oldDir, newName), Amazon.Nodes.Rename(node.Id, newName).Result);
if (node == null) throw new InvalidOperationException("Can not rename");
}
if (oldDir != newDir)
{
var oldDirNodeTask = FetchNode(oldDir);
var newDirNodeTask = FetchNode(newDir);
Task.WaitAll(oldDirNodeTask, newDirNodeTask);
node = FSItem.FromNode(newPath, Amazon.Nodes.Move(node.Id, oldDirNodeTask.Result.Id, newDirNodeTask.Result.Id).Result);
if (node == null) throw new InvalidOperationException("Can not move");
}
if (node.IsDir)
nodeTreeCache.MoveDir(oldPath, node);
else
nodeTreeCache.MoveFile(oldPath, node);
>>>>>>>
if (oldPath == newPath) return;
var oldDir = Path.GetDirectoryName(oldPath);
var oldName = Path.GetFileName(oldPath);
var newDir = Path.GetDirectoryName(newPath);
var newName = Path.GetFileName(newPath);
var node = GetItem(oldPath);
if (oldName != newName)
{
node = FSItem.FromNode(Path.Combine(oldDir, newName), Amazon.Nodes.Rename(node.Id, newName).Result);
if (node == null) throw new InvalidOperationException("Can not rename");
}
if (oldDir != newDir)
{
var oldDirNodeTask = FetchNode(oldDir);
var newDirNodeTask = FetchNode(newDir);
Task.WaitAll(oldDirNodeTask, newDirNodeTask);
node = FSItem.FromNode(newPath, Amazon.Nodes.Move(node.Id, oldDirNodeTask.Result.Id, newDirNodeTask.Result.Id).Result);
if (node == null) throw new InvalidOperationException("Can not move");
}
if (node.IsDir)
nodeTreeCache.MoveDir(oldPath, node);
else
nodeTreeCache.MoveFile(oldPath, node); |
<<<<<<<
private readonly IEnumerable<ISectionContentService> _sectionContentServices;
public SectionContentService()
{
_sectionContentServices = Loader.ResolveAll<ISectionContentService>();
}
public override void Add(SectionContent item)
{
base.Add(item);
_sectionContentServices.First(m => (int)m.ContentType == item.SectionContentType).AddContent(item);
}
public override bool Update(SectionContent item, params object[] primaryKeys)
{
base.Update(item, primaryKeys);
_sectionContentServices.First(m => (int)m.ContentType == item.SectionContentType).UpdateContent(item);
return true;
}
public override int Delete(params object[] primaryKeys)
{
var content = base.Get(primaryKeys);
base.Delete(primaryKeys);
_sectionContentServices.First(m => (int)m.ContentType == content.SectionContentType).DeleteContent(content.ID);
return 1;
}
public SectionContent FillContent(SectionContent content)
{
return
content.InitContent(
_sectionContentServices.First(m => (int) m.ContentType == content.SectionContentType)
.GetContent(content.ID));
}
=======
public override int Delete(params object[] primaryKeys)
{
var content = Get(primaryKeys);
switch ((SectionContent.Types)content.SectionContentType)
{
case SectionContent.Types.CallToAction:
{
new SectionContentCallToActionService().Delete(content.SectionContentId);
break;
}
case SectionContent.Types.Image:
{
new SectionContentImageService().Delete(content.SectionContentId);
break;
}
case SectionContent.Types.Paragraph:
{
new SectionContentParagraphService().Delete(content.SectionContentId);
break;
}
case SectionContent.Types.Title:
{
new SectionContentTitleService().Delete(content.SectionContentId);
break;
}
}
return base.Delete(primaryKeys);
}
>>>>>>>
private readonly IEnumerable<ISectionContentService> _sectionContentServices;
public SectionContentService()
{
_sectionContentServices = Loader.ResolveAll<ISectionContentService>();
}
public override void Add(SectionContent item)
{
base.Add(item);
_sectionContentServices.First(m => (int)m.ContentType == item.SectionContentType).AddContent(item);
}
public override int Delete(params object[] primaryKeys)
{
var content = base.Get(primaryKeys);
base.Delete(primaryKeys);
_sectionContentServices.First(m => (int)m.ContentType == content.SectionContentType).DeleteContent(content.ID);
return 1;
}
public SectionContent FillContent(SectionContent content)
{
return
content.InitContent(
_sectionContentServices.First(m => (int)m.ContentType == content.SectionContentType)
.GetContent(content.ID));
} |
<<<<<<<
&& x.VersionHeightOffset == y.VersionHeightOffset;
=======
&& ReleaseOptions.EqualWithDefaultsComparer.Singleton.Equals(x.ReleaseOrDefault, y.ReleaseOrDefault)
&& x.BuildNumberOffset == y.BuildNumberOffset;
>>>>>>>
&& ReleaseOptions.EqualWithDefaultsComparer.Singleton.Equals(x.ReleaseOrDefault, y.ReleaseOrDefault)
&& x.VersionHeightOffset == y.VersionHeightOffset; |
<<<<<<<
this.textBoxGlobalPassword = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.lbFilezillaLocation = new System.Windows.Forms.Label();
=======
this.checkBoxPersistTsHistory = new System.Windows.Forms.CheckBox();
this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
>>>>>>>
this.checkBoxPersistTsHistory = new System.Windows.Forms.CheckBox();
this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
this.checkBoxAllowPuttyPWArg = new System.Windows.Forms.CheckBox();
<<<<<<<
this.textBoxRootDirPrefix = new System.Windows.Forms.TextBox();
=======
this.textBoxRootDirPrefix = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
>>>>>>>
this.textBoxRootDirPrefix = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
<<<<<<<
=======
this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.keyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.modifiersDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.shortcutStringDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.keyboardShortcutBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.groupBox9 = new System.Windows.Forms.GroupBox();
this.checkBoxAllowPuttyPWArg = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
>>>>>>>
((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
<<<<<<<
// textBoxGlobalPassword
//
this.textBoxGlobalPassword.Location = new System.Drawing.Point(79, 26);
this.textBoxGlobalPassword.Name = "textBoxGlobalPassword";
this.textBoxGlobalPassword.Size = new System.Drawing.Size(217, 20);
this.textBoxGlobalPassword.TabIndex = 1;
this.toolTip.SetToolTip(this.textBoxGlobalPassword, "Password for encrypt/decrypt the session password. If it\'s empty the session pass" +
"word isn\'t will encrypted / decrypted when you save the sessions.");
//
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(10, 49);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(104, 13);
this.label17.TabIndex = 2;
this.label17.Text = "Root Directory Prefix";
//
// lbFilezillaLocation
//
this.lbFilezillaLocation.AutoSize = true;
this.lbFilezillaLocation.Font = new System.Drawing.Font("Segoe UI", 9F);
this.lbFilezillaLocation.Location = new System.Drawing.Point(4, 189);
this.lbFilezillaLocation.Name = "lbFilezillaLocation";
this.lbFilezillaLocation.Size = new System.Drawing.Size(116, 15);
this.lbFilezillaLocation.TabIndex = 2;
this.lbFilezillaLocation.Text = "FileZilla.exe Location";
//
=======
// checkBoxPersistTsHistory
//
this.checkBoxPersistTsHistory.AutoSize = true;
this.checkBoxPersistTsHistory.Location = new System.Drawing.Point(6, 21);
this.checkBoxPersistTsHistory.Name = "checkBoxPersistTsHistory";
this.checkBoxPersistTsHistory.Size = new System.Drawing.Size(88, 17);
this.checkBoxPersistTsHistory.TabIndex = 0;
this.checkBoxPersistTsHistory.Text = "Save History";
this.toolTip.SetToolTip(this.checkBoxPersistTsHistory, "Persist command bar history between program restarts");
this.checkBoxPersistTsHistory.UseVisualStyleBackColor = true;
//
// numericUpDown1
//
this.numericUpDown1.Location = new System.Drawing.Point(121, 20);
this.numericUpDown1.Name = "numericUpDown1";
this.numericUpDown1.Size = new System.Drawing.Size(48, 22);
this.numericUpDown1.TabIndex = 1;
this.toolTip.SetToolTip(this.numericUpDown1, "The number of days to save history for. Entries older than the selected number of" +
" days will be automatically deleted.");
this.numericUpDown1.Value = new decimal(new int[] {
7,
0,
0,
0});
//
>>>>>>>
// checkBoxPersistTsHistory
//
this.checkBoxPersistTsHistory.AutoSize = true;
this.checkBoxPersistTsHistory.Location = new System.Drawing.Point(6, 21);
this.checkBoxPersistTsHistory.Name = "checkBoxPersistTsHistory";
this.checkBoxPersistTsHistory.Size = new System.Drawing.Size(88, 17);
this.checkBoxPersistTsHistory.TabIndex = 0;
this.checkBoxPersistTsHistory.Text = "Save History";
this.toolTip.SetToolTip(this.checkBoxPersistTsHistory, "Persist command bar history between program restarts");
this.checkBoxPersistTsHistory.UseVisualStyleBackColor = true;
//
// numericUpDown1
//
this.numericUpDown1.Location = new System.Drawing.Point(121, 20);
this.numericUpDown1.Name = "numericUpDown1";
this.numericUpDown1.Size = new System.Drawing.Size(48, 22);
this.numericUpDown1.TabIndex = 1;
this.toolTip.SetToolTip(this.numericUpDown1, "The number of days to save history for. Entries older than the selected number of" +
" days will be automatically deleted.");
this.numericUpDown1.Value = new decimal(new int[] {
7,
0,
0,
0});
//
// checkBoxAllowPuttyPWArg
//
this.checkBoxAllowPuttyPWArg.AutoSize = true;
this.checkBoxAllowPuttyPWArg.Location = new System.Drawing.Point(6, 21);
this.checkBoxAllowPuttyPWArg.Name = "checkBoxAllowPuttyPWArg";
this.checkBoxAllowPuttyPWArg.Size = new System.Drawing.Size(286, 17);
this.checkBoxAllowPuttyPWArg.TabIndex = 0;
this.checkBoxAllowPuttyPWArg.Text = "Allow plain text passwords on putty command line";
this.toolTip.SetToolTip(this.checkBoxAllowPuttyPWArg, "Enabling this will allow plain text passwords to be cached and shown on the comma" +
"nd line. It is Recommended you do NOT enable this");
this.checkBoxAllowPuttyPWArg.UseVisualStyleBackColor = true;
//
<<<<<<<
this.tabControl.Size = new System.Drawing.Size(604, 333);
=======
this.tabControl.Size = new System.Drawing.Size(604, 359);
>>>>>>>
this.tabControl.Size = new System.Drawing.Size(604, 359);
<<<<<<<
this.tabPageGeneral.Size = new System.Drawing.Size(596, 307);
=======
this.tabPageGeneral.Size = new System.Drawing.Size(596, 333);
>>>>>>>
this.tabPageGeneral.Size = new System.Drawing.Size(596, 333);
<<<<<<<
this.tabPageGUI.Size = new System.Drawing.Size(596, 307);
=======
this.tabPageGUI.Size = new System.Drawing.Size(596, 333);
>>>>>>>
this.tabPageGUI.Size = new System.Drawing.Size(596, 333);
<<<<<<<
// textBoxRootDirPrefix
//
this.textBoxRootDirPrefix.Location = new System.Drawing.Point(125, 46);
this.textBoxRootDirPrefix.Name = "textBoxRootDirPrefix";
this.textBoxRootDirPrefix.Size = new System.Drawing.Size(100, 20);
this.textBoxRootDirPrefix.TabIndex = 3;
//
=======
// textBoxRootDirPrefix
//
this.textBoxRootDirPrefix.Location = new System.Drawing.Point(125, 46);
this.textBoxRootDirPrefix.Name = "textBoxRootDirPrefix";
this.textBoxRootDirPrefix.Size = new System.Drawing.Size(100, 22);
this.textBoxRootDirPrefix.TabIndex = 3;
//
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(10, 49);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(112, 13);
this.label17.TabIndex = 2;
this.label17.Text = "Root Directory Prefix";
//
>>>>>>>
// textBoxRootDirPrefix
//
this.textBoxRootDirPrefix.Location = new System.Drawing.Point(125, 46);
this.textBoxRootDirPrefix.Name = "textBoxRootDirPrefix";
this.textBoxRootDirPrefix.Size = new System.Drawing.Size(100, 22);
this.textBoxRootDirPrefix.TabIndex = 3;
//
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(10, 49);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(112, 13);
this.label17.TabIndex = 2;
this.label17.Text = "Root Directory Prefix";
//
<<<<<<<
this.tabPageShortcuts.Size = new System.Drawing.Size(596, 307);
=======
this.tabPageShortcuts.Size = new System.Drawing.Size(596, 333);
>>>>>>>
this.tabPageShortcuts.Size = new System.Drawing.Size(596, 333);
<<<<<<<
this.dataGridViewShortcuts.Size = new System.Drawing.Size(596, 307);
=======
this.dataGridViewShortcuts.Size = new System.Drawing.Size(596, 333);
>>>>>>>
this.dataGridViewShortcuts.Size = new System.Drawing.Size(596, 333);
<<<<<<<
this.tabPageAdvanced.Size = new System.Drawing.Size(596, 307);
=======
this.tabPageAdvanced.Size = new System.Drawing.Size(596, 333);
>>>>>>>
this.tabPageAdvanced.Size = new System.Drawing.Size(596, 333);
<<<<<<<
this.panelBottom.Location = new System.Drawing.Point(5, 338);
=======
this.panelBottom.Location = new System.Drawing.Point(5, 364);
>>>>>>>
this.panelBottom.Location = new System.Drawing.Point(5, 364);
<<<<<<<
=======
// nameDataGridViewTextBoxColumn
//
this.nameDataGridViewTextBoxColumn.DataPropertyName = "Name";
this.nameDataGridViewTextBoxColumn.HeaderText = "Name";
this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
this.nameDataGridViewTextBoxColumn.ReadOnly = true;
this.nameDataGridViewTextBoxColumn.Width = 200;
//
// keyDataGridViewTextBoxColumn
//
this.keyDataGridViewTextBoxColumn.DataPropertyName = "Key";
this.keyDataGridViewTextBoxColumn.HeaderText = "Key";
this.keyDataGridViewTextBoxColumn.Name = "keyDataGridViewTextBoxColumn";
this.keyDataGridViewTextBoxColumn.ReadOnly = true;
this.keyDataGridViewTextBoxColumn.Visible = false;
//
// modifiersDataGridViewTextBoxColumn
//
this.modifiersDataGridViewTextBoxColumn.DataPropertyName = "Modifiers";
this.modifiersDataGridViewTextBoxColumn.HeaderText = "Modifiers";
this.modifiersDataGridViewTextBoxColumn.Name = "modifiersDataGridViewTextBoxColumn";
this.modifiersDataGridViewTextBoxColumn.ReadOnly = true;
this.modifiersDataGridViewTextBoxColumn.Visible = false;
//
// shortcutStringDataGridViewTextBoxColumn
//
this.shortcutStringDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.shortcutStringDataGridViewTextBoxColumn.DataPropertyName = "ShortcutString";
this.shortcutStringDataGridViewTextBoxColumn.HeaderText = "Shortcut";
this.shortcutStringDataGridViewTextBoxColumn.Name = "shortcutStringDataGridViewTextBoxColumn";
this.shortcutStringDataGridViewTextBoxColumn.ReadOnly = true;
//
// keyboardShortcutBindingSource
//
this.keyboardShortcutBindingSource.DataSource = typeof(SuperPutty.Data.KeyboardShortcut);
//
// groupBox9
//
this.groupBox9.Controls.Add(this.checkBoxAllowPuttyPWArg);
this.groupBox9.Location = new System.Drawing.Point(3, 283);
this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(349, 44);
this.groupBox9.TabIndex = 44;
this.groupBox9.TabStop = false;
this.groupBox9.Text = "Security";
//
// checkBoxAllowPuttyPWArg
//
this.checkBoxAllowPuttyPWArg.AutoSize = true;
this.checkBoxAllowPuttyPWArg.Location = new System.Drawing.Point(6, 21);
this.checkBoxAllowPuttyPWArg.Name = "checkBoxAllowPuttyPWArg";
this.checkBoxAllowPuttyPWArg.Size = new System.Drawing.Size(286, 17);
this.checkBoxAllowPuttyPWArg.TabIndex = 0;
this.checkBoxAllowPuttyPWArg.Text = "Allow plain text passwords on putty command line";
this.toolTip.SetToolTip(this.checkBoxAllowPuttyPWArg, "Enabling this will allow plain text passwords to be cached and shown on the comma" +
"nd line. It is Recommended you do NOT enable this");
this.checkBoxAllowPuttyPWArg.UseVisualStyleBackColor = true;
//
>>>>>>>
<<<<<<<
this.ClientSize = new System.Drawing.Size(614, 370);
=======
this.ClientSize = new System.Drawing.Size(614, 396);
>>>>>>>
this.ClientSize = new System.Drawing.Size(614, 396);
<<<<<<<
=======
private System.Windows.Forms.GroupBox groupBox8;
private System.Windows.Forms.CheckBox checkBoxPersistTsHistory;
private System.Windows.Forms.Label label20;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.NumericUpDown numericUpDown1;
private System.Windows.Forms.GroupBox groupBox9;
private System.Windows.Forms.CheckBox checkBoxAllowPuttyPWArg;
>>>>>>>
private System.Windows.Forms.GroupBox groupBox8;
private System.Windows.Forms.CheckBox checkBoxPersistTsHistory;
private System.Windows.Forms.Label label20;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.NumericUpDown numericUpDown1;
private System.Windows.Forms.GroupBox groupBox9;
private System.Windows.Forms.CheckBox checkBoxAllowPuttyPWArg;
private System.Windows.Forms.Button buttonBrowseFilezilla;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.TextBox textBoxFilezillaLocation;
private System.Windows.Forms.Button buttonBrowseWinSCP;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.TextBox textBoxWinSCPLocation; |
<<<<<<<
this.textBoxRemotePathSesion.Text = Session.RemotePath;
this.textBoxLocalPathSesion.Text = Session.LocalPath;
=======
this.textBoxSPSLScriptFile.Text = Session.SPSLFileName;
>>>>>>>
this.textBoxSPSLScriptFile.Text = Session.SPSLFileName;
this.textBoxRemotePathSesion.Text = Session.RemotePath;
this.textBoxLocalPathSesion.Text = Session.LocalPath;
<<<<<<<
if (!String.IsNullOrEmpty(CommandLineOptions.getcommand(textBoxExtraArgs.Text, "-pw")))
{
if (MessageBox.Show("SuperPutty encrypts the password in Sessions.xml file with the master password, but using a password in 'Extra PuTTY Arguments' is very insecure.\nFor a secure connection use SSH authentication with Pageant. \nSelect yes, if you want save the password", "Are you sure that you want to save the password?",
MessageBoxButtons.OKCancel,
MessageBoxIcon.Warning,
MessageBoxDefaultButton.Button1)==DialogResult.Cancel){
return;
}
}
Session.SessionName = textBoxSessionName.Text.Trim();
=======
Session.SessionName = textBoxSessionName.Text.Trim();
>>>>>>>
if (!String.IsNullOrEmpty(CommandLineOptions.getcommand(textBoxExtraArgs.Text, "-pw")))
{
if (MessageBox.Show("SuperPutty save the password in Sessions.xml file in plain text.\nUse a password in 'Extra PuTTY Arguments' is very insecure.\nFor a secure connection use SSH authentication with Pageant. \nSelect yes, if you want save the password", "Are you sure that you want to save the password?",
MessageBoxButtons.OKCancel,
MessageBoxIcon.Warning,
MessageBoxDefaultButton.Button1)==DialogResult.Cancel){
return;
}
}
Session.SessionName = textBoxSessionName.Text.Trim();
<<<<<<<
Session.Host = textBoxHostname.Text.Trim();
Session.ExtraArgs = textBoxExtraArgs.Text.Trim();
Session.RemotePath = textBoxRemotePathSesion.Text.Trim();
Session.LocalPath = textBoxLocalPathSesion.Text.Trim();
Session.Port = int.Parse(textBoxPort.Text.Trim());
Session.Username = textBoxUsername.Text.Trim();
Session.SessionId = SessionData.CombineSessionIds(SessionData.GetSessionParentId(Session.SessionId), Session.SessionName);
Session.ImageKey = buttonImageSelect.ImageKey;
=======
Session.Host = textBoxHostname.Text.Trim();
Session.ExtraArgs = textBoxExtraArgs.Text.Trim();
Session.Port = int.Parse(textBoxPort.Text.Trim());
Session.Username = textBoxUsername.Text.Trim();
Session.SessionId = SessionData.CombineSessionIds(SessionData.GetSessionParentId(Session.SessionId), Session.SessionName);
Session.ImageKey = buttonImageSelect.ImageKey;
Session.SPSLFileName = textBoxSPSLScriptFile.Text.Trim();
>>>>>>>
Session.Host = textBoxHostname.Text.Trim();
Session.ExtraArgs = textBoxExtraArgs.Text.Trim();
Session.Port = int.Parse(textBoxPort.Text.Trim());
Session.Username = textBoxUsername.Text.Trim();
Session.SessionId = SessionData.CombineSessionIds(SessionData.GetSessionParentId(Session.SessionId), Session.SessionName);
Session.ImageKey = buttonImageSelect.ImageKey;
Session.SPSLFileName = textBoxSPSLScriptFile.Text.Trim();
Session.RemotePath = textBoxRemotePathSesion.Text.Trim();
Session.LocalPath = textBoxLocalPathSesion.Text.Trim();
<<<<<<<
private void checkBox1_CheckedChanged(object sender, EventArgs e)
{
if (checkBoxShowHidePW.Checked)
{
textBoxExtraArgs.PasswordChar = '*';
}
else
{
textBoxExtraArgs.PasswordChar='\0';
}
}
private void dlgEditSession_Load(object sender, EventArgs e)
{
if (!String.IsNullOrEmpty(CommandLineOptions.getcommand(this.Session.ExtraArgs, "-pw")))
{
checkBoxShowHidePW.Checked = true;
textBoxExtraArgs.PasswordChar = '*';
}
else
{
textBoxExtraArgs.PasswordChar = '\0';
}
}
private void textBoxExtraArgs_TextChanged(object sender, EventArgs e)
{
//if extra Args contains a password, change the backgroudn
if (!String.IsNullOrEmpty(CommandLineOptions.getcommand(textBoxExtraArgs.Text, "-pw")))
{
textBoxExtraArgs.BackColor = Color.LightCoral;
}
else {
textBoxExtraArgs.BackColor = Color.White;
}
}
=======
private void buttonBrowse_Click(object sender, EventArgs e)
{
DialogResult dlgResult = this.openFileDialog1.ShowDialog();
if (dlgResult == DialogResult.OK)
{
textBoxSPSLScriptFile.Text = this.openFileDialog1.FileName;
}
}
private void buttonClearSPSLFile_Click(object sender, EventArgs e)
{
Session.SPSLFileName = textBoxSPSLScriptFile.Text = String.Empty;
}
>>>>>>>
private void buttonBrowse_Click(object sender, EventArgs e)
{
DialogResult dlgResult = this.openFileDialog1.ShowDialog();
if (dlgResult == DialogResult.OK)
{
textBoxSPSLScriptFile.Text = this.openFileDialog1.FileName;
}
}
private void buttonClearSPSLFile_Click(object sender, EventArgs e)
{
Session.SPSLFileName = textBoxSPSLScriptFile.Text = String.Empty;
}
private void buttonBrowseLocalPath_Click(object sender, EventArgs e)
{
if (Directory.Exists(textBoxLocalPathSesion.Text))
{
folderBrowserDialog1.SelectedPath = textBoxLocalPathSesion.Text;
}
if (folderBrowserDialog1.ShowDialog(this) == DialogResult.OK)
{
if (!String.IsNullOrEmpty(folderBrowserDialog1.SelectedPath))
textBoxLocalPathSesion.Text = folderBrowserDialog1.SelectedPath;
}
}
private void textBoxExtraArgs_TextChanged(object sender, EventArgs e)
{
//if extra Args contains a password, change the backgroudn
if (!String.IsNullOrEmpty(CommandLineOptions.getcommand(textBoxExtraArgs.Text, "-pw")))
{
textBoxExtraArgs.BackColor = Color.LightCoral;
}
else {
textBoxExtraArgs.BackColor = Color.White;
}
} |
<<<<<<<
if (String.IsNullOrEmpty(SingletonSesionPasswordManager.Instance.getMasterPassword()))
{
this.textBoxGlobalPassword.Text = "";
}
else {
this.textBoxGlobalPassword.Text = textSimulePassword;
}
=======
this.textBoxGlobalPassword.Text = SuperPuTTY.Settings.PasswordImportExport;
this.textBoxRootDirPrefix.Text = SuperPuTTY.Settings.PscpRootHomePrefix;
>>>>>>>
if (String.IsNullOrEmpty(SingletonSesionPasswordManager.Instance.getMasterPassword()))
{
this.textBoxGlobalPassword.Text = "";
}
else {
this.textBoxGlobalPassword.Text = textSimulePassword;
}
this.textBoxRootDirPrefix.Text = SuperPuTTY.Settings.PscpRootHomePrefix;
<<<<<<<
SuperPuTTY.Settings.PscpHomePrefix = this.textBoxHomeDirPrefix.Text;
// only save the password if has changed
// the MasterPassword is never visible, superputty works with the hash of password,
// and is only accesible for the current user, if the user change is needed rewrite the password.
if (!this.textBoxGlobalPassword.Text.Equals(textSimulePassword))
{
SingletonSesionPasswordManager.Instance.setMasterPassword(this.textBoxGlobalPassword.Text);
this.textBoxGlobalPassword.Text = textSimulePassword;
//save sessions for force encript with new password
SuperPuTTY.SaveSessions();
}
=======
SuperPuTTY.Settings.PscpHomePrefix = this.textBoxHomeDirPrefix.Text;
SuperPuTTY.Settings.PasswordImportExport = this.textBoxGlobalPassword.Text;
SuperPuTTY.Settings.PscpRootHomePrefix = this.textBoxRootDirPrefix.Text;
>>>>>>>
SuperPuTTY.Settings.PscpHomePrefix = this.textBoxHomeDirPrefix.Text;
SuperPuTTY.Settings.PscpRootHomePrefix = this.textBoxRootDirPrefix.Text;
// only save the password if has changed
// the MasterPassword is never visible, superputty works with the hash of password,
// and is only accesible for the current user, if the user change is needed rewrite the password.
if (!this.textBoxGlobalPassword.Text.Equals(textSimulePassword))
{
SingletonSesionPasswordManager.Instance.setMasterPassword(this.textBoxGlobalPassword.Text);
this.textBoxGlobalPassword.Text = textSimulePassword;
//save sessions for force encript with new password
SuperPuTTY.SaveSessions();
} |
<<<<<<<
this.label17 = new System.Windows.Forms.Label();
=======
this.lbFilezillaLocation = new System.Windows.Forms.Label();
this.label17 = new System.Windows.Forms.Label();
>>>>>>>
this.label17 = new System.Windows.Forms.Label();
this.lbFilezillaLocation = new System.Windows.Forms.Label();
<<<<<<<
// textBoxGlobalPassword
//
this.textBoxGlobalPassword.Location = new System.Drawing.Point(79, 26);
this.textBoxGlobalPassword.Name = "textBoxGlobalPassword";
this.textBoxGlobalPassword.Size = new System.Drawing.Size(217, 20);
this.textBoxGlobalPassword.TabIndex = 1;
this.toolTip.SetToolTip(this.textBoxGlobalPassword, "Password for encrypt/decrypt the session password. If it\'s empty the session pass" +
"word isn\'t will encrypted / decrypted when you save the sessions.");
//
// label17
//
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label17.Location = new System.Drawing.Point(4, 189);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(112, 15);
this.label17.TabIndex = 36;
this.label17.Text = "filezilla.exe Location";
//
=======
// textBoxGlobalPassword
//
this.textBoxGlobalPassword.Location = new System.Drawing.Point(79, 26);
this.textBoxGlobalPassword.Name = "textBoxGlobalPassword";
this.textBoxGlobalPassword.Size = new System.Drawing.Size(217, 20);
this.textBoxGlobalPassword.TabIndex = 1;
this.toolTip.SetToolTip(this.textBoxGlobalPassword, "Password to Encrypt and Decrypt the session password. If it\'s empty the session p" +
"assword isn\'t will encrypted / decrypted when you Import or export the sessions." +
"");
//
// lbFilezillaLocation
//
this.lbFilezillaLocation.AutoSize = true;
this.lbFilezillaLocation.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbFilezillaLocation.Location = new System.Drawing.Point(6, 189);
this.lbFilezillaLocation.Name = "lbFilezillaLocation";
this.lbFilezillaLocation.Size = new System.Drawing.Size(116, 15);
this.lbFilezillaLocation.TabIndex = 2;
this.lbFilezillaLocation.Text = "FileZilla.exe Location";
//
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(10, 49);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(104, 13);
this.label17.TabIndex = 2;
this.label17.Text = "Root Directory Prefix";
//
>>>>>>>
// textBoxGlobalPassword
//
this.textBoxGlobalPassword.Location = new System.Drawing.Point(79, 26);
this.textBoxGlobalPassword.Name = "textBoxGlobalPassword";
this.textBoxGlobalPassword.Size = new System.Drawing.Size(217, 20);
this.textBoxGlobalPassword.TabIndex = 1;
this.toolTip.SetToolTip(this.textBoxGlobalPassword, "Password for encrypt/decrypt the session password. If it\'s empty the session pass" +
"word isn\'t will encrypted / decrypted when you save the sessions.");
//
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(10, 49);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(104, 13);
this.label17.TabIndex = 2;
this.label17.Text = "Root Directory Prefix";
//
// lbFilezillaLocation
//
this.lbFilezillaLocation.AutoSize = true;
this.lbFilezillaLocation.Location = new System.Drawing.Point(6, 189);
this.lbFilezillaLocation.Name = "lbFilezillaLocation";
this.lbFilezillaLocation.Size = new System.Drawing.Size(116, 15);
this.lbFilezillaLocation.TabIndex = 2;
this.lbFilezillaLocation.Text = "FileZilla.exe Location";
// |
<<<<<<<
using SuperPutty.Utils;
=======
using System.Drawing.Design;
using System.Drawing;
>>>>>>>
using System.Drawing.Design;
using System.Drawing;
using SuperPutty.Utils;
<<<<<<<
get {
if (String.IsNullOrEmpty(_Password)){
// search if ExtraArgs contains the password
_Password = CommandLineOptions.getcommand(this.ExtraArgs, "-pw");
}
return _Password;
}
set { _Password = value; }
=======
get { return _Password; }
set
{
UpdateField(ref _Password, value, "Password");
}
>>>>>>>
get {
if (String.IsNullOrEmpty(_Password)){
// search if ExtraArgs contains the password
UpdateField(ref _Password, CommandLineOptions.getcommand(this.ExtraArgs, "-pw"), "Password");
}
return _Password;
}
set
{
UpdateField(ref _Password, value, "Password");
} |
<<<<<<<
public static double GetDouble(this TableRow row, string id)
{
return AValueWithThisIdExists(row, id) && TheValueIsNotEmpty(row, id)
? Convert.ToDouble(row[id])
: double.MinValue;
}
public static Enum GetEnum<T>(this TableRow row, string id)
{
var value = row[id].Replace(" ", string.Empty);
var p = (from property in typeof(T).GetProperties()
where property.PropertyType.IsEnum &&
EnumValueIsDefinedCaseInsensitve(property.PropertyType, value)
select property.PropertyType).ToList();
if (p.Count == 1)
return Enum.Parse(p[0], value, true) as Enum;
if (p.Count == 0)
throw new InvalidOperationException(string.Format("No enum with value {0} found in type {1}", value, typeof(T).Name));
throw new InvalidOperationException(string.Format("Found sevral enums with the value {0} in type {1}", value, typeof(T).Name));
}
private static bool EnumValueIsDefinedCaseInsensitve(Type @enum, string value)
{
Enum parsedEnum = null;
try
{
parsedEnum = Enum.Parse(@enum, value, true) as Enum;
}
catch
{
// just catch it
}
return parsedEnum != null;
}
=======
public static Guid GetGuid(this TableRow row, string id)
{
return AValueWithThisIdExists(row, id) && TheValueIsNotEmpty(row, id)
? new Guid(row[id])
: new Guid();
}
>>>>>>>
public static double GetDouble(this TableRow row, string id)
{
return AValueWithThisIdExists(row, id) && TheValueIsNotEmpty(row, id)
? Convert.ToDouble(row[id])
: double.MinValue;
}
public static Enum GetEnum<T>(this TableRow row, string id)
{
var value = row[id].Replace(" ", string.Empty);
var p = (from property in typeof(T).GetProperties()
where property.PropertyType.IsEnum &&
EnumValueIsDefinedCaseInsensitve(property.PropertyType, value)
select property.PropertyType).ToList();
if (p.Count == 1)
return Enum.Parse(p[0], value, true) as Enum;
if (p.Count == 0)
throw new InvalidOperationException(string.Format("No enum with value {0} found in type {1}", value, typeof(T).Name));
throw new InvalidOperationException(string.Format("Found sevral enums with the value {0} in type {1}", value, typeof(T).Name));
}
private static bool EnumValueIsDefinedCaseInsensitve(Type @enum, string value)
{
Enum parsedEnum = null;
try
{
parsedEnum = Enum.Parse(@enum, value, true) as Enum;
}
catch
{
// just catch it
}
return parsedEnum != null;
}
public static Guid GetGuid(this TableRow row, string id)
{
return AValueWithThisIdExists(row, id) && TheValueIsNotEmpty(row, id)
? new Guid(row[id])
: new Guid();
} |
<<<<<<<
private ICredentials credentials;
public override Uri ResolveUri(Uri baseUri, string relativeUri)
{
if (baseUri == null)
{
if (relativeUri == null)
throw new ArgumentNullException ("Either baseUri or relativeUri are required.");
if (relativeUri.StartsWith ("resource:"))
{
return new Uri(relativeUri);
}
else
{
return base.ResolveUri(baseUri, relativeUri);
}
}
return base.ResolveUri(baseUri, relativeUri);
}
public override object GetEntity(Uri absoluteUri, string role, Type ofObjectToReturn)
=======
public override object GetEntity(Uri absoluteUri, string role, Type ofObjectToReturn)
>>>>>>>
//public override Uri ResolveUri(Uri baseUri, string relativeUri)
//{
// if (baseUri == null)
// {
// if (relativeUri == null)
// throw new ArgumentNullException ("Either baseUri or relativeUri are required.");
//
// if (relativeUri.StartsWith ("resource:"))
// {
// return new Uri(relativeUri);
// }
// else
// {
// return base.ResolveUri(baseUri, relativeUri);
// }
// }
// return base.ResolveUri(baseUri, relativeUri);
//}
public override object GetEntity(Uri absoluteUri, string role, Type ofObjectToReturn)
<<<<<<<
public override ICredentials Credentials
{
set { credentials = value; }
}
private static Assembly GetAssemblyFor(string host)
{
Assembly locatedAssembly = null;
foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
{
AssemblyName assemblyName = assembly.GetName();
if (!assemblyName.Name.Equals(host, StringComparison.CurrentCultureIgnoreCase))
continue;
locatedAssembly = assembly;
}
return locatedAssembly;
}
=======
>>>>>>>
private static Assembly GetAssemblyFor(string host)
{
Assembly locatedAssembly = null;
foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
{
AssemblyName assemblyName = assembly.GetName();
if (!assemblyName.Name.Equals(host, StringComparison.CurrentCultureIgnoreCase))
continue;
locatedAssembly = assembly;
}
return locatedAssembly;
} |
<<<<<<<
_contextManager.InitializeScenarioContext(scenarioInfo);
=======
contextManager.InitializeScenarioContext(scenarioInfo);
}
public void OnScenarioStart()
{
>>>>>>>
_contextManager.InitializeScenarioContext(scenarioInfo);
}
public void OnScenarioStart()
{ |
<<<<<<<
public class PluginWithCustomTestThreadDependencies : IRuntimePlugin
{
private readonly Action<ObjectContainer> _specificTestRunnerDependencies;
public PluginWithCustomTestThreadDependencies(Action<ObjectContainer> specificTestRunnerDependencies)
{
_specificTestRunnerDependencies = specificTestRunnerDependencies;
}
public void Initialize(RuntimePluginEvents runtimePluginEvents, RuntimePluginParameters runtimePluginParameters, UnitTestProviderConfiguration unitTestProviderConfiguration)
{
runtimePluginEvents.CustomizeTestThreadDependencies += (sender, args) => { _specificTestRunnerDependencies(args.ObjectContainer); };
}
}
public class PluginWithCustomScenarioDependencies : IRuntimePlugin
{
private readonly Action<ObjectContainer> _specificScenarioDependencies;
public PluginWithCustomScenarioDependencies(Action<ObjectContainer> specificScenarioDependencies)
{
_specificScenarioDependencies = specificScenarioDependencies;
}
public void Initialize(RuntimePluginEvents runtimePluginEvents, RuntimePluginParameters runtimePluginParameters, UnitTestProviderConfiguration unitTestProviderConfiguration)
{
runtimePluginEvents.CustomizeScenarioDependencies += (sender, args) => { _specificScenarioDependencies(args.ObjectContainer); };
}
=======
public class PluginWithCustomScenarioDependencies : IRuntimePlugin
{
private readonly Action<ObjectContainer> _specificScenarioDependencies;
public PluginWithCustomScenarioDependencies(Action<ObjectContainer> specificScenarioDependencies)
{
_specificScenarioDependencies = specificScenarioDependencies;
}
public void Initialize(RuntimePluginEvents runtimePluginEvents, RuntimePluginParameters runtimePluginParameters)
{
runtimePluginEvents.CustomizeScenarioDependencies += (sender, args) => { _specificScenarioDependencies(args.ObjectContainer); };
}
}
public class PluginWithCustomFeatureDependencies : IRuntimePlugin
{
private readonly Action<ObjectContainer> _specificFeatureDependencies;
public PluginWithCustomFeatureDependencies(Action<ObjectContainer> specificFeatureDependencies)
{
_specificFeatureDependencies = specificFeatureDependencies;
}
public void Initialize(RuntimePluginEvents runtimePluginEvents, RuntimePluginParameters runtimePluginParameters)
{
runtimePluginEvents.CustomizeFeatureDependencies += (sender, args) => { _specificFeatureDependencies(args.ObjectContainer); };
}
>>>>>>>
public class PluginWithCustomTestThreadDependencies : IRuntimePlugin
{
private readonly Action<ObjectContainer> _specificTestRunnerDependencies;
public PluginWithCustomTestThreadDependencies(Action<ObjectContainer> specificTestRunnerDependencies)
{
_specificTestRunnerDependencies = specificTestRunnerDependencies;
}
public void Initialize(RuntimePluginEvents runtimePluginEvents, RuntimePluginParameters runtimePluginParameters, UnitTestProviderConfiguration unitTestProviderConfiguration)
{
runtimePluginEvents.CustomizeTestThreadDependencies += (sender, args) => { _specificTestRunnerDependencies(args.ObjectContainer); };
}
}
public class PluginWithCustomScenarioDependencies : IRuntimePlugin
{
private readonly Action<ObjectContainer> _specificScenarioDependencies;
public PluginWithCustomScenarioDependencies(Action<ObjectContainer> specificScenarioDependencies)
{
_specificScenarioDependencies = specificScenarioDependencies;
}
public void Initialize(RuntimePluginEvents runtimePluginEvents, RuntimePluginParameters runtimePluginParameters, UnitTestProviderConfiguration unitTestProviderConfiguration)
{
runtimePluginEvents.CustomizeScenarioDependencies += (sender, args) => { _specificScenarioDependencies(args.ObjectContainer); };
}
}
public class PluginWithCustomFeatureDependencies : IRuntimePlugin
{
private readonly Action<ObjectContainer> _specificFeatureDependencies;
public PluginWithCustomFeatureDependencies(Action<ObjectContainer> specificFeatureDependencies)
{
_specificFeatureDependencies = specificFeatureDependencies;
}
public void Initialize(RuntimePluginEvents runtimePluginEvents, RuntimePluginParameters runtimePluginParameters, UnitTestProviderConfiguration unitTestProviderConfiguration)
{
runtimePluginEvents.CustomizeFeatureDependencies += (sender, args) => { _specificFeatureDependencies(args.ObjectContainer); };
}
<<<<<<<
[Fact]
=======
[Test]
>>>>>>>
[Fact]
<<<<<<<
=======
customDependency.Should().BeOfType(typeof(CustomDependency));
}
[Test]
public void Should_be_able_to_register_feature_dependencies_from_a_plugin()
{
StringConfigProvider configurationHolder = GetConfigWithPlugin();
ContainerBuilder.DefaultDependencyProvider = new TestDefaultDependencyProvider(new PluginWithCustomFeatureDependencies(oc => oc.RegisterTypeAs<CustomDependency, ICustomDependency>()));
var container = TestObjectFactories.CreateDefaultFeatureContainer(configurationHolder);
var customDependency = container.Resolve<ICustomDependency>();
customDependency.Should().BeOfType(typeof(CustomDependency));
}
}
>>>>>>> |
<<<<<<<
using FluentAssertions;
using Xunit;
=======
using System.Globalization;
using System.Threading;
using FluentAssertions;
using NUnit.Framework;
>>>>>>>
using FluentAssertions;
using Xunit;
using System.Globalization;
using System.Threading;
<<<<<<<
[Fact]
=======
[Test]
public void Returns_a_byte_when_passed_a_byte_value_if_culture_is_fr_Fr()
{
Thread.CurrentThread.CurrentCulture = new CultureInfo("fr-FR");
var retriever = new ByteValueRetriever();
retriever.GetValue("30,0").Should().Be(30);
}
[Test]
>>>>>>>
[Fact]
public void Returns_a_byte_when_passed_a_byte_value_if_culture_is_fr_Fr()
{
Thread.CurrentThread.CurrentCulture = new CultureInfo("fr-FR");
var retriever = new ByteValueRetriever();
retriever.GetValue("30,0").Should().Be(30);
}
[Fact] |
<<<<<<<
SpecFlowUnitTestConverter converter = new SpecFlowUnitTestConverter(new NUnitTestConverter(), true);
var compileUnit = converter.GenerateUnitTestFixture(feature, "TestClassName", "Target.Namespace");
=======
SpecFlowUnitTestConverter converter = new SpecFlowUnitTestConverter(new NUnitTestConverter());
var codeNamespace = converter.GenerateUnitTestFixture(feature, "TestClassName", "Target.Namespace");
>>>>>>>
SpecFlowUnitTestConverter converter = new SpecFlowUnitTestConverter(new NUnitTestConverter(), true);
var codeNamespace = converter.GenerateUnitTestFixture(feature, "TestClassName", "Target.Namespace"); |
<<<<<<<
[Fact]
=======
[Test]
public void Should_allow_the_addition_of_default_components_at_the_end_of_the_list_via_generic_overload()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault<AnotherImpl>();
sut.Last().Should().BeOfType<AnotherImpl>();
}
[Test]
public void Should_allow_the_replacement_of_default_components_at_the_end_of_the_list()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
var @default = new TestComponentImpl();
var @default2 = new AnotherImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault(@default);
sut.SetDefault(@default2);
sut.Should().Equal(registeredLast, registeredFirst, @default2);
}
[Test]
public void Should_allow_the_replacement_of_default_components_at_the_end_of_the_list_via_generic_overload()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault<TestComponentImpl>();
sut.SetDefault<AnotherImpl>();
sut.Last().Should().BeOfType<AnotherImpl>();
}
[Test]
public void Should_allow_the_clearing_of_default_components()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
var @default = new TestComponentImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault(@default);
sut.ClearDefault();
sut.Should().Equal(registeredLast, registeredFirst);
}
[Test]
public void Should_allow_the_removal_of_default_component_via_generic_unregistration()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
sut.Register(registeredFirst);
sut.SetDefault<AnotherImpl>();
sut.Unregister<ITestComponent>();
sut.Should().BeEmpty();
}
[Test]
public void Should_allow_the_unregistration_of_default_components()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
var @default = new TestComponentImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault(@default);
sut.Unregister(@default);
sut.Should().Equal(registeredLast, registeredFirst);
}
[Test]
>>>>>>>
[Fact]
public void Should_allow_the_addition_of_default_components_at_the_end_of_the_list_via_generic_overload()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault<AnotherImpl>();
sut.Last().Should().BeOfType<AnotherImpl>();
}
[Fact]
public void Should_allow_the_replacement_of_default_components_at_the_end_of_the_list()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
var @default = new TestComponentImpl();
var @default2 = new AnotherImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault(@default);
sut.SetDefault(@default2);
sut.Should().Equal(registeredLast, registeredFirst, @default2);
}
[Fact]
public void Should_allow_the_replacement_of_default_components_at_the_end_of_the_list_via_generic_overload()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault<TestComponentImpl>();
sut.SetDefault<AnotherImpl>();
sut.Last().Should().BeOfType<AnotherImpl>();
}
[Fact]
public void Should_allow_the_clearing_of_default_components()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
var @default = new TestComponentImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault(@default);
sut.ClearDefault();
sut.Should().Equal(registeredLast, registeredFirst);
}
[Fact]
public void Should_allow_the_removal_of_default_component_via_generic_unregistration()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
sut.Register(registeredFirst);
sut.SetDefault<AnotherImpl>();
sut.Unregister<ITestComponent>();
sut.Should().BeEmpty();
}
[Fact]
public void Should_allow_the_unregistration_of_default_components()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
var @default = new TestComponentImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault(@default);
sut.Unregister(@default);
sut.Should().Equal(registeredLast, registeredFirst);
}
[Fact]
<<<<<<<
[Fact]
=======
[Test]
public void Should_allow_clearing_all_components()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
var @default = new TestComponentImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault(@default);
sut.Clear();
sut.Should().BeEmpty();
}
[Test]
>>>>>>>
[Fact]
public void Should_allow_clearing_all_components()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registeredLast = new TestComponentImpl();
var @default = new TestComponentImpl();
sut.Register(registeredFirst);
sut.Register(registeredLast);
sut.SetDefault(@default);
sut.Clear();
sut.Should().BeEmpty();
}
[Fact] |
<<<<<<<
using FluentAssertions;
using Xunit;
=======
using System.Globalization;
using System.Threading;
using FluentAssertions;
using NUnit.Framework;
>>>>>>>
using FluentAssertions;
using Xunit;
<<<<<<<
[Fact]
public void Returns_a_long_when_passed_a_long_value()
{
var retriever = new LongValueRetriever();
=======
[Test]
public void Returns_a_long_when_passed_a_long_value()
{
Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
var retriever = new LongValueRetriever();
>>>>>>>
[Fact]
public void Returns_a_long_when_passed_a_long_value()
{
Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
var retriever = new LongValueRetriever();
<<<<<<<
[Fact]
=======
[Test]
>>>>>>>
[Fact] |
<<<<<<<
[Import]
internal IBindingSkeletonProviderFactory BindingSkeletonProviderFactory = null;
[Import]
internal IBiDiContainerProvider ContainerProvider = null;
=======
>>>>>>>
[Import]
internal IBiDiContainerProvider ContainerProvider = null; |
<<<<<<<
return new TestClassGenerationContext(null, ParserHelper.CreateAnyFeature(new []{ tag }), null, null, null, null, null, null, null, null, null, true, false);
=======
return new TestClassGenerationContext(null, new Feature { Tags = new Tags(new Tag(tag)) }, null, null, null, null, null, null, null, null, null, null, true);
>>>>>>>
return new TestClassGenerationContext(null, ParserHelper.CreateAnyFeature(new []{ tag }), null, null, null, null, null, null, null, null, null, true); |
<<<<<<<
xslt.Load(xsltReader, xsltSettings, resourceResolver);
=======
resourceResolver = new XmlResourceResolver();
xslt.Load(xsltReader, xsltSettings, resourceResolver);
>>>>>>>
resourceResolver = new XmlResourceResolver();
xslt.Load(xsltReader, xsltSettings, resourceResolver);
<<<<<<<
=======
private static XmlReader GetTemplateReader(Type reportType, string reportName, string xsltFile)
{
if (string.IsNullOrEmpty(xsltFile))
return new ResourceXmlReader(reportType, reportName + ".xslt");
return new XmlTextReader(xsltFile);
}
private static void Transform(this XslCompiledTransform xslt, XmlReader input, XsltArgumentList arguments, Stream results, XmlResolver documentResolver)
{
var command = xslt.GetType().GetField("command", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(xslt);
var executeMethod = command.GetType().GetMethod("Execute", new Type[] { typeof(XmlReader), typeof(XmlResolver), typeof(XsltArgumentList), typeof(Stream) });
try
{
executeMethod.Invoke(command, new object[] {input, documentResolver, arguments, results});
}
catch (TargetInvocationException invEx)
{
var ex = invEx.InnerException;
ex.PreserveStackTrace();
throw ex;
}
}
>>>>>>>
private static XmlReader GetTemplateReader(Type reportType, string reportName, string xsltFile)
{
if (string.IsNullOrEmpty(xsltFile))
return new ResourceXmlReader(reportType, reportName + ".xslt");
return new XmlTextReader(xsltFile);
} |
<<<<<<<
=======
using System.Text;
>>>>>>>
<<<<<<<
using Nest.Resolvers;
=======
>>>>>>> |
<<<<<<<
}
public class GeoDistanceAgg : BucketAgg, IGeoDistanceAggregator
{
public Field Field { get; set; }
public string Origin { get; set; }
=======
>>>>>>>
<<<<<<<
Field IGeoDistanceAggregator.Field { get; set; }
=======
FieldName IGeoDistanceAggregation.Field { get; set; }
>>>>>>>
Field IGeoDistanceAggregation.Field { get; set; } |
<<<<<<<
using System.Linq;
=======
using System.Collections.Generic;
using System.Linq;
using System.Text;
>>>>>>>
using System.Collections.Generic;
using System.Linq; |
<<<<<<<
[JsonProperty("percentile_ranks")]
IPercentileRanksAggregaor PercentileRanks { get; set; }
=======
[JsonProperty("top_hits")]
ITopHitsAggregator TopHits { get; set; }
>>>>>>>
[JsonProperty("percentile_ranks")]
IPercentileRanksAggregaor PercentileRanks { get; set; }
[JsonProperty("top_hits")]
ITopHitsAggregator TopHits { get; set; }
<<<<<<<
private IPercentileRanksAggregaor _percentileRanks;
=======
private ITopHitsAggregator _topHits;
>>>>>>>
private IPercentileRanksAggregaor _percentileRanks;
private ITopHitsAggregator _topHits; |
<<<<<<<
using System.Diagnostics.CodeAnalysis;
#if DOTNETCORE
using System.Net;
using System.Net.Http;
#endif
=======
using System.Threading;
>>>>>>>
using System.Diagnostics.CodeAnalysis;
using System.Threading;
#if DOTNETCORE
using System.Net;
using System.Net.Http;
#endif
<<<<<<<
public static TimeSpan DefaultTimeout = TimeSpan.FromMinutes(1);
public static TimeSpan DefaultPingTimeout = TimeSpan.FromSeconds(2);
public static TimeSpan DefaultPingTimeoutOnSSL = TimeSpan.FromSeconds(5);
=======
public static readonly TimeSpan DefaultTimeout = TimeSpan.FromMinutes(1);
public static readonly TimeSpan DefaultPingTimeout = TimeSpan.FromSeconds(2);
public static readonly TimeSpan DefaultPingTimeoutOnSSL = TimeSpan.FromSeconds(5);
>>>>>>>
public static readonly TimeSpan DefaultTimeout = TimeSpan.FromMinutes(1);
public static readonly TimeSpan DefaultPingTimeout = TimeSpan.FromSeconds(2);
public static readonly TimeSpan DefaultPingTimeoutOnSSL = TimeSpan.FromSeconds(5);
<<<<<<<
private IElasticsearchSerializer _serializer;
=======
private readonly IElasticsearchSerializer _serializer;
>>>>>>>
private readonly IElasticsearchSerializer _serializer;
<<<<<<<
this._connectionPool = connectionPool;
#if DOTNETCORE
if (connection != null)
{
this._connection = connection;
}
else
{
this._connectionHandler = new HttpClientHandler();
this._client = new HttpClient(_connectionHandler, false);
this._connection = new HttpConnection(_client);
}
#else
this._connection = connection ?? new HttpConnection();
#endif
this._serializerFactory = serializerFactory ?? (c=>this.DefaultSerializer((T)this));
// ReSharper disable once VirtualMemberCallInContructor
this._serializer = this._serializerFactory((T)this);
=======
this._connectionPool = connectionPool;
this._connection = connection ?? new HttpConnection();
serializerFactory = serializerFactory ?? (c=>this.DefaultSerializer((T)this));
// ReSharper disable once VirtualMemberCallInContructor
this._serializer = serializerFactory((T)this);
>>>>>>>
this._connectionPool = connectionPool;
#if DOTNETCORE
if (connection != null)
{
this._connection = connection;
}
else
{
this._connectionHandler = new HttpClientHandler();
this._client = new HttpClient(_connectionHandler, false);
this._connection = new HttpConnection(_client);
}
#else
this._connection = connection ?? new HttpConnection();
#endif
this._serializerFactory = serializerFactory ?? (c=>this.DefaultSerializer((T)this));
// ReSharper disable once VirtualMemberCallInContructor
this._serializer = _serializerFactory((T)this);
<<<<<<<
public T ConnectionStatusHandler(Action<IApiCallDetails> handler) =>
Assign(a => a._apiCallHandler += handler ?? DefaultApiCallHandler);
=======
public T OnRequestCompleted(Action<IApiCallDetails> handler) =>
Assign(a => a._completedRequestHandler += handler ?? DefaultCompletedRequestHandler);
>>>>>>>
public T OnRequestCompleted(Action<IApiCallDetails> handler) =>
Assign(a => a._completedRequestHandler += handler ?? DefaultCompletedRequestHandler); |
<<<<<<<
}
}";
Assert.True(json.JsonEquals(expected), json);
}
[Test]
public void FunctionScoreQueryConditionless()
{
var s = new SearchDescriptor<ElasticsearchProject>().From(0).Size(10)
.Query(q => q
.FunctionScore(fs => fs
.Query(qq => qq.Term("", ""))
.Functions(
f => f.Gauss(x => x.StartedOn, d => d.Scale("42w")),
f => f.Linear(x => x.FloatValue, d => d.Scale("0.3")),
f => f.Exp(x => x.DoubleValue, d => d.Scale("0.5")),
f => f.BoostFactor(2)
)
.ScoreMode(FunctionScoreMode.sum)
.BoostMode(FunctionBoostMode.replace)
)
).Fields(x => x.Content);
var json = TestElasticClient.Serialize(s);
=======
},
fields: [""content""]
}";
Assert.True(json.JsonEquals(expected), json);
}
[Test]
public void FunctionScoreQueryConditionless()
{
var s = new SearchDescriptor<ElasticsearchProject>().From(0).Size(10)
.Query(q => q
.FunctionScore(fs => fs
.Query(qq => qq.Term("", ""))
.Functions(
f => f.Gauss(x => x.StartedOn, d => d.Scale("42w")),
f => f.Linear(x => x.FloatValue, d => d.Scale("0.3")),
f => f.Exp(x => x.DoubleValue, d => d.Scale("0.5")),
f => f.BoostFactor(2),
f => f.FieldValueFactor(db => db.Field(fa => fa.DoubleValue).Factor(3.4).Modifier(FieldValueFactorModifier.ln))
)
.ScoreMode(FunctionScoreMode.sum)
.BoostMode(FunctionBoostMode.replace)
)
).Fields(x => x.Content);
var json = TestElasticClient.Serialize(s);
>>>>>>>
}
}";
Assert.True(json.JsonEquals(expected), json);
}
[Test]
public void FunctionScoreQueryConditionless()
{
var s = new SearchDescriptor<ElasticsearchProject>().From(0).Size(10)
.Query(q => q
.FunctionScore(fs => fs
.Query(qq => qq.Term("", ""))
.Functions(
f => f.Gauss(x => x.StartedOn, d => d.Scale("42w")),
f => f.Linear(x => x.FloatValue, d => d.Scale("0.3")),
f => f.Exp(x => x.DoubleValue, d => d.Scale("0.5")),
f => f.BoostFactor(2),
f => f.FieldValueFactor(db => db.Field(fa => fa.DoubleValue).Factor(3.4).Modifier(FieldValueFactorModifier.ln))
)
.ScoreMode(FunctionScoreMode.sum)
.BoostMode(FunctionBoostMode.replace)
)
).Fields(x => x.Content);
var json = TestElasticClient.Serialize(s);
<<<<<<<
}
}";
Assert.True(json.JsonEquals(expected), json);
}
}
=======
},
fields: [""content""]
}";
Assert.True(json.JsonEquals(expected), json);
}
[Test]
public void ConditionlessFieldValueFactor()
{
Assert.Throws<DslException>(() => new SearchDescriptor<ElasticsearchProject>().From(0).Size(10)
.Query(q => q
.FunctionScore(fs => fs
.Query(qq => qq.Term("", ""))
.Functions(
f => f.FieldValueFactor(db => db.Factor(3.4).Modifier(FieldValueFactorModifier.ln))
))
));
}
}
>>>>>>>
}
}";
Assert.True(json.JsonEquals(expected), json);
}
[Test]
public void ConditionlessFieldValueFactor()
{
Assert.Throws<DslException>(() => new SearchDescriptor<ElasticsearchProject>().From(0).Size(10)
.Query(q => q
.FunctionScore(fs => fs
.Query(qq => qq.Term("", ""))
.Functions(
f => f.FieldValueFactor(db => db.Factor(3.4).Modifier(FieldValueFactorModifier.ln))
))
));
}
} |
<<<<<<<
IList<KeyValuePair<Field, ISort>> ITopHitsAggregator.Sort { get; set; }
=======
IList<KeyValuePair<FieldName, ISort>> ITopHitsAggregation.Sort { get; set; }
>>>>>>>
IList<KeyValuePair<Field, ISort>> ITopHitsAggregation.Sort { get; set; }
<<<<<<<
IEnumerable<Field> ITopHitsAggregator.FieldDataFields { get; set; }
=======
IEnumerable<FieldName> ITopHitsAggregation.FieldDataFields { get; set; }
>>>>>>>
IEnumerable<Field> ITopHitsAggregation.FieldDataFields { get; set; }
<<<<<<<
public TopHitsAggregatorDescriptor<T> FieldDataFields(params Field[] fields) =>
=======
public TopHitsAggregationDescriptor<T> FieldDataFields(params FieldName[] fields) =>
>>>>>>>
public TopHitsAggregationDescriptor<T> FieldDataFields(params Field[] fields) =>
<<<<<<<
public TopHitsAggregatorDescriptor<T> FieldDataFields(params Expression<Func<T, object>>[] objectPaths) =>
Assign(a => a.FieldDataFields = objectPaths?.Select(e => (Field) e).ToListOrNullIfEmpty());
=======
public TopHitsAggregationDescriptor<T> FieldDataFields(params Expression<Func<T, object>>[] objectPaths) =>
Assign(a => a.FieldDataFields = objectPaths?.Select(e => (FieldName) e).ToListOrNullIfEmpty());
>>>>>>>
public TopHitsAggregationDescriptor<T> FieldDataFields(params Expression<Func<T, object>>[] objectPaths) =>
Assign(a => a.FieldDataFields = objectPaths?.Select(e => (Field) e).ToListOrNullIfEmpty()); |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.