conflict_resolution
stringlengths
27
16k
<<<<<<< using Elasticsearch.Net; using System; using System.Collections.Generic; ======= using System; >>>>>>> using Elasticsearch.Net; using System;
<<<<<<< /// <inheritdoc /> IExistsResponse AliasExists(Func<AliasExistsDescriptor, AliasExistsDescriptor> selector); /// <inheritdoc /> IExistsResponse AliasExists(IAliasExistsRequest AliasRequest); /// <inheritdoc /> Task<IExistsResponse> AliasExistsAsync(Func<AliasExistsDescriptor, AliasExistsDescripto...
<<<<<<< { Parser.Min, 11 } ======= { Parser.Top, 12 }, >>>>>>> { Parser.Min, 11 }, { Parser.Top, 12 }, <<<<<<< case 11: aggregate = GetBoxplotAggregate(ref reader, formatterResolver, meta); break; ======= case 12: aggregate = GetTopMetricsAggregate(ref reader, formatterReso...
<<<<<<< internal static IEnumerable<T> EmptyIfNull<T>(this IEnumerable<T> xs) => xs ?? new T[0]; ======= >>>>>>>
<<<<<<< ======= using Nest.Resolvers.Converters; using Newtonsoft.Json; >>>>>>> using Nest.Resolvers.Converters; using Newtonsoft.Json;
<<<<<<< public StatsAgg(string name, Field field) : base(name, field) { } ======= internal StatsAggregation() { } public StatsAggregation(string name, FieldName field) : base(name, field) { } >>>>>>> internal StatsAggregation() { } public StatsAggregation(string name, Field field) : base(name, field) { }
<<<<<<< void Visit(IBoxplotAggregation aggregation); ======= void Visit(ITopMetricsAggregation aggregation); >>>>>>> void Visit(IBoxplotAggregation aggregation); void Visit(ITopMetricsAggregation aggregation); <<<<<<< public virtual void Visit(IBoxplotAggregation aggregation) { } ======= public v...
<<<<<<< public CardinalityAgg(string name, Field field) : base(name, field) { } ======= public CardinalityAggregation(string name, FieldName field) : base(name, field) { } >>>>>>> public CardinalityAggregation(string name, Field field) : base(name, field) { }
<<<<<<< [JsonProperty("children")] IChildrenAggregator Children { get; set; } ======= [JsonProperty("scripted_metric")] IScriptedMetricAggregator ScriptedMetric { get; set; } >>>>>>> [JsonProperty("children")] IChildrenAggregator Children { get; set; } [JsonProperty("scripted_metric")] IScriptedMe...
<<<<<<< /// <inheritdoc /> IExistsResponse TemplateExists(Func<TemplateExistsDescriptor, TemplateExistsDescriptor> selector); /// <inheritdoc /> IExistsResponse TemplateExists(ITemplateExistsRequest templateRequest); /// <inheritdoc /> Task<IExistsResponse> TemplateExistsAsync(Func<TemplateExistsDescript...
<<<<<<< Do("POST", "/mydefaultindex/doc/_percolate", c => c.Percolate<Doc>(p => p.Document(new Doc {Id = "1"}))); Do("POST", "/mydefaultindex/otherdoc/_percolate", c => c.Percolate<OtherDoc>(p => p.Document(new OtherDoc {Name = "hello"}))); Do("POST", "/mycustomindex/mycustomtype/_percolate", c => c.Perco...
<<<<<<< var ndexResponse = _client.Index<IngestedAttachment>(Document, i => i ======= var ndexResponse = _client.Index(Document, i => i >>>>>>> var indexResponse = _client.Index(Document, i => i <<<<<<< var ndexResponse = _client.Index<IngestedAttachment>(ingestedAttachment, i => i ======= var ndex...
<<<<<<< public MaxAgg(string name, Field field) : base(name, field) { } ======= internal MaxAggregation() { } public MaxAggregation(string name, FieldName field) : base(name, field) { } >>>>>>> internal MaxAggregation() { } public MaxAggregation(string name, Field field) : base(name, field) { }
<<<<<<< using Elasticsearch.Net; ======= using System; using System.Collections.Generic; using System.Linq; using System.Text; using Elasticsearch.Net; using Newtonsoft.Json; >>>>>>> using Elasticsearch.Net; using Newtonsoft.Json;
<<<<<<< [InterfaceDataContract] ======= /// <summary> /// Metadata about a hit matching a query /// </summary> /// <typeparam name="TDocument">The type of the source document</typeparam> [InterfaceDataContract] >>>>>>> /// <summary> /// Metadata about a hit matching a query /// </summary> /// <typeparam na...
<<<<<<< using System; using System.Collections.Generic; using System.Linq; using System.Text; using NUnit.Framework; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Nest; using Newtonsoft.Json.Converters; using Nest.Resolvers.Converters; using Nest.Tests.MockData.Domain; using FluentAssertions; namespace Nes...
<<<<<<< ======= using System.Linq; using System.Linq.Expressions; using System.Text; >>>>>>> using System.Linq.Expressions; <<<<<<< using Newtonsoft.Json; ======= using Nest.Resolvers; using Newtonsoft.Json; >>>>>>> using Newtonsoft.Json;
<<<<<<< await audit.TraceCall(new ClientCall { { SniffOnStartup}, { SniffFailure, 9200}, { SniffFailure, 9201}, { SniffSuccess, 9202}, { PingSuccess , 9200}, { HealthyResponse, 9200} ======= await audit.TraceCall(new CallTrace { { AuditEvent.SniffOnStartup}, { AuditEvent.SniffF...
<<<<<<< /// <summary> /// Basic access authorization credentials to specify with this request. /// Overrides any credentials that are set at the global IConnectionSettings level. /// </summary> BasicAuthorizationCredentials BasicAuthorizationCredentials { get; set; } ======= /// <summary> /// Whether or...
<<<<<<< using Elasticsearch.Net; ======= using System; using System.Collections.Generic; using System.Linq; using System.Text; using Elasticsearch.Net; using Newtonsoft.Json; >>>>>>> using Elasticsearch.Net; using Newtonsoft.Json;
<<<<<<< /// <inheritdoc /> ISearchShardsResponse SearchShards<T>(Func<SearchShardsDescriptor<T>, SearchShardsDescriptor<T>> searchSelector) where T : class; ISearchShardsResponse SearchShards(ISearchShardsRequest request); /// <inheritdoc /> Task<ISearchShardsResponse> SearchShardsAsync<T>(Func<SearchShard...
<<<<<<< using System.Reflection; using Elasticsearch.Net; ======= using Elasticsearch.Net.CrossPlatform; using Elasticsearch.Net.Utf8Json; >>>>>>> using Elasticsearch.Net.CrossPlatform; using System.Reflection; using Elasticsearch.Net.Utf8Json;
<<<<<<< using Elasticsearch.Net; ======= using System; using System.Collections.Generic; using System.Linq; using System.Text; using Elasticsearch.Net; using Newtonsoft.Json; >>>>>>> using Elasticsearch.Net; using Newtonsoft.Json;
<<<<<<< .Consistency(ConsistencyOptions.Quorum) .Index<ElasticsearchProject>(i => i.Document(new ElasticsearchProject {Id = 2})) .Create<ElasticsearchProject>(i => i.Document(new ElasticsearchProject { Id = 3 })) .Delete<ElasticsearchProject>(i => i.Document(new ElasticsearchProject { Id = 4 })) ======...
<<<<<<< ======= using System.Linq; using System.Text; >>>>>>> <<<<<<< ======= using Nest.Resolvers.Converters; using Newtonsoft.Json; >>>>>>> using Nest.Resolvers.Converters; using Newtonsoft.Json;
<<<<<<< internal override ApiUrls ApiUrls => GetPrivilegesRequest.Urls; ======= ///<summary>/_security/privilege</summary> public GetPrivilegesDescriptor() : base(){} ///<summary>/_security/privilege/{application}</summary> ///<param name="application">Optional, accepts null</param> public GetPrivilegesDe...
<<<<<<< public BulkError Error { get; internal set; } ======= public Error Error { get; internal set; } >>>>>>> public Error Error { get; internal set; } <<<<<<< ======= >>>>>>>
<<<<<<< using System.Linq; using Elasticsearch.Net.ConnectionPool; using Elasticsearch.Net.Serialization; using Elasticsearch.Net.Connection.Security; using System.Diagnostics.CodeAnalysis; ======= >>>>>>> using System.Diagnostics.CodeAnalysis; <<<<<<< [SuppressMessage( "Potential Code Quality Issues", "RECS00...
<<<<<<< var timeout = TimeSpan.FromSeconds(60); #if DOTNETCORE var handle = new Signal(false); #else var handle = new ManualResetEvent(false); #endif ======= var timeout = TimeSpan.FromMinutes(1); var handle = new ManualResetEvent(false); >>>>>>> var timeout = TimeSpan.FromMinutes(1); #if DOTNE...
<<<<<<< ======= using System.Text; >>>>>>> <<<<<<< ======= using Newtonsoft.Json; >>>>>>> using Newtonsoft.Json;
<<<<<<< using Elasticsearch.Net; ======= using System; using System.Collections.Generic; using System.Linq; using System.Text; using Elasticsearch.Net; using Newtonsoft.Json; >>>>>>> using Elasticsearch.Net; using Newtonsoft.Json;
<<<<<<< private IPercentileRanksAggregaor _percentileRanks; ======= >>>>>>> private IPercentileRanksAggregaor _percentileRanks;
<<<<<<< public TestMode Mode { get; } = TestMode.Unit; public string ElasticsearchVersion { get; } = "2.0.0-rc1"; public virtual bool ForceReseed { get; } public virtual bool DoNotSpawnIfAlreadyRunning { get; } ======= public TestMode Mode { get; private set; } = TestMode.Unit; public string Elasticsearch...
<<<<<<< //TODO NOT Readonly [Collection(IntegrationContext.ReadOnly)] public abstract class PutMapping : ApiIntegrationTestBase<IIndicesResponse, IPutMappingRequest, PutMappingDescriptor<Project>, PutMappingRequest<Project>> ======= [Collection(IntegrationContext.Indexing)] public class PutMappingApiTests : ApiT...
<<<<<<< public GeoUnit? Unit { get; set; } public GeoDistanceType? DistanceType { get; set; } public IEnumerable<Range<double>> Ranges { get; set; } ======= internal GeoDistanceAggregation() { } >>>>>>> internal GeoDistanceAggregation() { } <<<<<<< GeoDistanceType? IGeoDistanceAggregator.DistanceType ...
<<<<<<< /// <inheritdoc /> IEmptyResponse ClearScroll(Func<ClearScrollDescriptor, ClearScrollDescriptor> clearScrollSelector); /// <inheritdoc /> Task<IEmptyResponse> ClearScrollAsync(Func<ClearScrollDescriptor, ClearScrollDescriptor> clearScrollSelector); ======= /// <summary> /// The suggest feature ...
<<<<<<< Expression expression = Expression.Call(TypeUtils.GetMethod(() => Queryable.Sum(default (IQueryable<double ? >))), source.Expression); return await ((IQueryProvider)source.Provider).ExecuteExAsync<decimal ? >(expression, cancellationToken).ConfigureAwait(false); ======= Exp...
<<<<<<< public class JobsConfiguration { private readonly string _authToken; public JobsConfiguration(string authToken) { _authToken = authToken; } public bool IsValidAuthToken(string authToken) { return string.IsNullOrEmpty(_authToken) == false && _authToken == authToken; } } ===...
<<<<<<< if (instance.Netcom != null) { Instance.Netcom.ClientDisconnected -= new EventHandler<DisconnectedEventArgs>(Netcom_ClientDisconnected); } ======= //Client.Avatars.AvatarAnimation -= new EventHandler<AvatarAnimationEventArgs>(AvatarAnimationChang...
<<<<<<< Imgui.SameLine(350); if (!CoopClient.Instance.ClientPlaying) ======= if (!CoopClient.Instance.Connected) >>>>>>> if (!CoopClient.Instance.ClientPlaying)
<<<<<<< if (Campaign.Current == null) { throw new Exception("Unable to initialize game entities: Unexpected state. No game loaded?"); } room.AddNewEntity<WorldEntityServer>(); ======= WorldEntityServer = room.AddNewEntity<WorldEntityServer>(...
<<<<<<< [JSReplacement("Array.prototype.sort.call($array)")] public static void Sort (AnyType[] array) { throw new InvalidOperationException(); } [JSReplacement("Array.prototype.sort.call($array)")] public static void Sort<T> (T[] array) { throw new Inva...
<<<<<<< ======= using System; using System.Diagnostics; using System.IO; using Helpers; >>>>>>> using Helpers; <<<<<<< services.Configure<AppSettings> (Configuration.GetSection ("AppSettingsSectionName")); services.AddApplicationInsightsTelemetry (Configuration); ...
<<<<<<< this.tableLayoutPanel1.Size = new System.Drawing.Size(731, 478); ======= this.tableLayoutPanel1.Size = new System.Drawing.Size(581, 479); >>>>>>> this.tableLayoutPanel1.Size = new System.Drawing.Size(731, 478); <<<<<<< this.tableLayoutPanel10.Size = new System...
<<<<<<< HotFix = GameFrameworkMode.GetModule<HotFixManager>(); ======= Localization = GameFrameworkMode.GetModule<LocalizationManager>(); >>>>>>> HotFix = GameFrameworkMode.GetModule<HotFixManager>(); Localization = GameFrameworkMode.GetModule<LocalizationManager>();
<<<<<<< UnitTest.RegisterAllMethods<ArrayTest>(); ======= UnitTest.RegisterAllMethods<ZeroArgumentTest>(); >>>>>>> UnitTest.RegisterAllMethods<ZeroArgumentTest>(); UnitTest.RegisterAllMethods<ArrayTest>();
<<<<<<< public override MachineType MachineType { get { return MachineType.IA_64; } } ======= /// <value> /// The type of the elf machine. /// </value> public override MachineType MachineType { get { return MachineType.Intel386; } } >>>>>>> public override MachineType MachineType { get { return MachineTy...
<<<<<<< using System; using System.Linq; using System.Text.RegularExpressions; using System.Xml.Linq; namespace SimpleBrowser { internal class HtmlElement { private readonly XElement _element; public HtmlElement(XElement element) { _element = element; } private XAttribute GetAttribute(string name) ...
<<<<<<< else if (property is IntegerShaderProperty) { AddSlot(new Vector1MaterialSlot(OutputSlotId, "Out", "Out", SlotType.Output, 0)); RemoveSlotsNameNotMatching(new[] { OutputSlotId }); } else if (property is SliderShaderProperty) ...
<<<<<<< WaitForSqlAvailabilityAsync(loggerFactory, app).Wait(); ======= OrderingContextSeed.SeedAsync(app).Wait(); ConfigureEventBus(app); >>>>>>> WaitForSqlAvailabilityAsync(loggerFactory, app).Wait(); ConfigureEventBus(app);
<<<<<<< using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; ======= using Identity.API.Certificate; using Autofac.Extensions.DependencyInjection; using Autofac; >>>>>>> using Identity.API.Certificate; using Auto...
<<<<<<< services.AddScoped<IOrderingService, OrderingService>(); services.AddGrpcClient<OrderingGrpc.OrderingGrpcClient>((services, options) => { var orderingApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcOrdering; options.Address...
<<<<<<< WaitForSqlAvailabilityAsync(loggerFactory, app).Wait(); ======= OrderingContextSeed.SeedAsync(app).Wait(); ConfigureEventBus(app); >>>>>>> WaitForSqlAvailabilityAsync(loggerFactory, app).Wait(); ConfigureEventBus(app);
<<<<<<< using eShopOnContainers.Core.Services.Dependency; using eShopOnContainers.Core.Services.Settings; using eShopOnContainers.Core.Services.FixUri; using Xamarin.Forms; ======= using TinyIoC; >>>>>>> using eShopOnContainers.Core.Services.Dependency; using eShopOnContainers.Core.Services.Settings; using eShopOnCo...
<<<<<<< private readonly IBuyerRepository _buyerRepository; private readonly IOrderRepository _orderRepository; ======= private readonly IOrderRepository<Order> _orderRepository; >>>>>>> private readonly IOrderRepository _orderRepository; <<<<<<< public CreateOrderCommandHand...
<<<<<<< ======= var identityUrl = Configuration.GetValue<string>("IdentityUrl"); var callBackUrl = Configuration.GetValue<string>("CallBackUrl"); var useLoadTest = Configuration.GetValue<bool>("UseLoadTest"); >>>>>>>
<<<<<<< using global::Catalog.API.Infrastructure.Filters; using global::Catalog.API.IntegrationEvents; ======= >>>>>>> using global::Catalog.API.Infrastructure.Filters; using global::Catalog.API.IntegrationEvents; <<<<<<< var sqlConnection = new SqlConnection(Configuration["ConnectionStr...
<<<<<<< services.AddScoped<IOrderingService, OrderingService>(); services.AddGrpcClient<OrderingGrpc.OrderingGrpcClient>((services, options) => { var orderingApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcOrdering; options.Address...
<<<<<<< private readonly Mock<IBuyerRepository> _buyerRepositoryMock; private readonly Mock<IOrderRepository> _orderRepositoryMock; ======= private readonly Mock<IOrderRepository<Order>> _orderRepositoryMock; >>>>>>> private readonly Mock<IOrderRepository> _orderRepositoryMock; <<<<<...
<<<<<<< ======= using StackExchange.Redis; using System; using System.Linq; using System.Net; >>>>>>> using StackExchange.Redis; using System; using System.Linq; using System.Net; <<<<<<< using StackExchange.Redis; using Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus; using Microsoft.Azure.ServiceBus...
<<<<<<< public bool UseCustomizationData { get; set; } ======= public bool AzureStorageEnabled { get; set; } >>>>>>> public bool UseCustomizationData { get; set; } public bool AzureStorageEnabled { get; set; }
<<<<<<< Task<CustomerBasket> GetBasketAsync(string customerId); Task<CustomerBasket> UpdateBasketAsync(CustomerBasket basket); Task<bool> DeleteBasketAsync(string id); ======= Task<CustomerBasket> GetBasket(string customerId); Task<IEnumerable<string>> GetUsers(); Task<...
<<<<<<< services.AddScoped<IOrderingService, OrderingService>(); services.AddGrpcClient<OrderingGrpc.OrderingGrpcClient>((services, options) => { var orderingApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcOrdering; options.Address...
<<<<<<< #region Transform Rotation [PublicAPI] public static Tweener<Vector3, Transform> tweenLocalRotation( this Transform t, Vector3 from, Vector3 to, Ease ease, float duration ) => tweenTransformVector(t, from, to, ease, duration, TweenMutators.localEulerAngles); #endregion #region Tra...
<<<<<<< [PublicAPI] public static Either<string, A> load<A>(PathStr loadPath) where A : Object { var path = loadPath.unityPath; var csr = Resources.Load<ResourceReference<A>>(path); return csr ? F.right<string, A>(csr.reference) : F.left<string, A>(notFound(path)); } [...
<<<<<<< foreach (var customValidationResults in customValidator(containingComponent, o)) { yield return createCustomError(hierarchyToString(fieldHierarchy), customValidationResults); ======= foreach (var _err in customValidator(o)) { yield return createCusto...
<<<<<<< routes.MapRoute("60", "feed", new { controller = "Feed", action = "Feed", feedName = (string)null }); routes.MapRoute("61", "feeds/{*feedName}", new { controller = "Feed", action = "Feed" }); routes.MapRoute("62", "commentfeed", new { controller = "Feed", action = "CommentFee...
<<<<<<< using Terraria.Audio; using Terraria.ModLoader.Audio; using Terraria.Localization; using log4net; using System.Linq; using Terraria.ModLoader.Config; ======= >>>>>>> using Terraria.Audio; using Terraria.ModLoader.Audio; using Terraria.Localization; using log4net; using System.Linq; using Terraria.ModLoader.C...
<<<<<<< private void LoadTexture(string path, int len, BinaryReader reader, bool rawimg) { try { var texTask = rawimg ? ImageIO.RawToTexture2DAsync(Main.instance.GraphicsDevice, reader) : ImageIO.PngToTexture2DAsync(Main.instance.GraphicsDevice, new MemoryStream(reader.ReadBytes(len)));//needs a...
<<<<<<< this.buttonSetupDebugging = new System.Windows.Forms.Button(); this.patchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exactToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.offsetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this....
<<<<<<< Utility.PopulateEntityReferenceNames(toReturn, db); toReturn.Id = entity.Id; toReturn.EntityState = entity.EntityState; ======= toReturn.Id = entity.Id; toReturn.EntityState = entity.EntityState; >>>>>>> toReturn....
<<<<<<< [TestMethod] public void TestQueryExpressionIn() { var query = new QueryExpression("lead") { ColumnSet = new ColumnSet(true) }; var filter = new FilterExpression(LogicalOperator.And); filter.AddCondition(new Co...
<<<<<<< [Fact] public void RetrieveMultipleBeginsWith() { var query = new QueryExpression("account") { ColumnSet = new ColumnSet(true) }; query.Criteria.AddCondition("address1_postalcode", ConditionOperator.BeginsWith, "MK11"); ...
<<<<<<< private static Boolean IsValidForFormattedValues(AttributeMetadata attributeMetadata) { return attributeMetadata is PicklistAttributeMetadata || attributeMetadata is BooleanAttributeMetadata || attributeMetadata is MoneyAttributeMetada...
<<<<<<< ======= if (Win32Helper.IsRunningOnMono()) return; m_localWindowsHook = new LocalWindowsHook(Win32.HookType.WH_CALLWNDPROCRET); >>>>>>> if (Win32Helper.IsRunningOnMono()) return; <<<<<<< ...
<<<<<<< private Lazy<string> _template; private bool _templateCompileException; private bool _templateCompiled; ======= private readonly SettingsImpl _configuration; >>>>>>> private Lazy<string> _template; private readonly SettingsImpl _configuration; private b...
<<<<<<< if (inputFrame.FrameReference.SourceKind == MediaFrameSourceKind.Depth) { // Use a special pseudo color to render 16 bits depth frame. var depthScale = (float)inputFrame.DepthMediaFrame.DepthFormat.DepthScale...
<<<<<<< internal void ResetBackoff() { // Logger.Debug("resetting backoff for " + context.PackageName); Context context = Android.App.Application.Context; SetBackoff(DefaultBackOffMilliseconds); } internal int GetBackoff() ...
<<<<<<< using (var reader = assembly.GetManifestResourceStream("aggregator.cli.Rules.function.json")) ======= using (var stream = assembly.GetManifestResourceStream("aggregator.cli.Rules.function.json")) >>>>>>> using (var stream = assembly.GetManifestResourceStream("aggregator....
<<<<<<< [Fact] public async Task CustomStringField_HasValue_Succeeds() { int workItemId = 42; WorkItem workItem = new WorkItem { Id = workItemId, Fields = new Dictionary<string, object> { { "...
<<<<<<< using System.Linq; ======= >>>>>>> using System.Linq; <<<<<<< else { _logger.WriteError($"{response.ReasonPhrase} {await response.Content.ReadAsStringAsync()}"); return new KuduFunction[0]; } ======= l...
<<<<<<< ======= CleanupRuleFiles(baseDirPath); logger.WriteInfo($"Cleaned local working directory."); >>>>>>> <<<<<<< private async Task<bool> UploadRuleFilesAsync(InstanceName instance, string name, IDictionary<string, string> inMemoryFiles) ======= void CleanupRuleFile...
<<<<<<< public static bool SubStringTest() { string main = "abcdefghi"; string sub1 = main.Substring(6); string sub2 = main.Substring(0, 3); return string.Equals("ghi", sub1) && string.Equals("abc", sub2); } public static bool IndexOfTest() { string main = "abcdefghi"; return main.IndexOf(...
<<<<<<< text = text ?? string.Empty; style.SetPainter("self", StyleState.Normal); //textInfo = new TextInfo2(new TextSpan2(text, style.GetTextStyle())); // textInfo.UpdateSpan(0, text); // textInfo.Layout(); ======= >>>>>>> text = text ?? string...
<<<<<<< ======= int soundCount = 0; >>>>>>> int soundCount = 0; <<<<<<< if (optionName == nameof(AnimationOptions.duration)) { options.duration = (int) StylePropertyMappers.MapNumber(value, context); ======= switch (option...
<<<<<<< using UIForia.Layout; using UIForia.Parsing.Expression; ======= using UIForia.Layout; using UIForia.Parsing; using UIForia.Parsing.Expressions; >>>>>>> using UIForia.Layout; using UIForia.Parsing; using UIForia.Parsing.Expressions; <<<<<<< internal int frameId; protected internal readonly Li...
<<<<<<< using UIForia.Layout; using UIForia.Parsing; ======= using UIForia.Parsing.Expression; >>>>>>> using UIForia.Layout; using UIForia.Parsing; <<<<<<< protected LinqBindingSystem linqBindingSystem; ======= protected UISoundSystem m_UISoundSystem; >>>>>>> protected UISoundSystem m_UIS...
<<<<<<< private static readonly EnumAliasSource<UIForia.Layout.AlignmentBehavior> s_EnumSource_AlignmentBehavior = new EnumAliasSource<UIForia.Layout.AlignmentBehavior>(); ======= private static readonly EnumAliasSource<UIForia.Layout.AlignmentTarget> s_EnumSource_AlignmentTarget = new EnumAliasSource...
<<<<<<< application = new GameApplication(applicationId); view = application.AddView(new Rect(0, 0, Screen.width, Screen.height), type); application.SetCamera(camera); ======= view = Application.Game.AddView(new Rect(0, 0, Screen.width, Screen.height), type); ...
<<<<<<< [Test] public void MockFile_Delete_Should_RemoveFiles() { const string filePath = @"c:\something\demo.txt"; const string fileContent = "this is some content"; var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>{{filePath, new Mock...
<<<<<<< readonly PathBase path; ======= readonly IDirectoryInfoFactory directoryInfoFactory; >>>>>>> readonly PathBase path; readonly IDirectoryInfoFactory directoryInfoFactory; <<<<<<< path = new MockPath(); ======= directoryInfoFactory = new MockDirectoryI...
<<<<<<< TaskManager = new TaskManager(UIScheduler); ======= CancellationTokenSource = new CancellationTokenSource(); // accessing Environment triggers environment initialization if it hasn't happened yet Platform = new Platform(Environment, Environment.FileSystem); >>>...
<<<<<<< using System.Linq; ======= using System.Reflection; >>>>>>> using System.Linq; using System.Reflection;
<<<<<<< [NonSerialized] private bool isBusy; [SerializeField] private bool isPublished; ======= [SerializeField] private UserSettingsView userSettingsView = new UserSettingsView(); [SerializeField] private GitPathView gitPathView = new GitPathView(); [SerializeField] ...
<<<<<<< public ITask Fetch() { return repositoryManager.Fetch(CurrentRemote.Value.Name); } ======= public ITask Revert(string changeset) { return repositoryManager.Revert(changeset); } >>>>>>> public ITask Fetch() { ...
<<<<<<< repositoryManagerListener.DidNotReceive().GitAheadBehindStatusUpdated(Args.GitAheadBehindStatus); repositoryManagerListener.DidNotReceive().GitStatusUpdated(Args.GitStatus); ======= repositoryManagerListener.Received().GitStatusUpdated(Args.GitStatus); >>>>>>> ...
<<<<<<< public string Name { get { return "Project Evaluation"; } } ======= >>>>>>>
<<<<<<< var command = new StringBuilder("publish -r "); command.Append(repositoryName); ======= var command = new StringBuilder("publish -r \""); command.Append(newRepository.Name); command.Append("\""); >>>>>>> var comma...
<<<<<<< ======= private bool showLocalBranches = true; private bool showRemoteBranches = true; >>>>>>> <<<<<<< [NonSerialized] private bool favoritesHasChanged; [NonSerialized] private List<string> favoritesList; ======= >>>>>>> [NonSerialized] private List<string> favori...
<<<<<<< private const string NoRepoTitle = "To begin using GitHub, initialize a git repository"; ======= private const string NoRepoTitle = "No Git repository found for this project"; private const string NoRepoDescription = "Initialize a Git repository to track changes and collaborate with ot...