conflict_resolution
stringlengths
27
16k
<<<<<<< // Special case for home page if (SPContext.Current.ListItem != null && web.RootFolder.WelcomePage == SPContext.Current.ListItem.Url) { return new Uri(label.TopWebUrl.ToString()); } ======= >>>>>>> <<<<<<< retur...
<<<<<<< /* * Copyright (C) 2007, Robin Rosenberg <robin.rosenberg@dewire.com> * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org> * Copyright (C) 2008, Kevin Thompson <kevin.thompson@theautomaters.com> * Copyright (C) 2009, Henon <meinrad.recheis@gmail.com> * * All rights reserved. * * Redistribution a...
<<<<<<< using Microsoft.Toolkit.Uwp.UI.Animations; ======= using Microsoft.Toolkit.Uwp.UI.Brushes; >>>>>>> using Microsoft.Toolkit.Uwp.UI.Animations; using Microsoft.Toolkit.Uwp.UI.Brushes; <<<<<<< // Search in Microsoft.Toolkit.Uwp.UI.Animations var animationsProxyType = EasingType.Default;...
<<<<<<< return File.Exists(fileSystemInfo.FullName); } public static FileSystemInfo[] ListFiles(this FileSystemInfo fileInfo) { if (fileInfo.IsFile()) { return null; } return Directory.GetFileSystemEntries(fileInfo.Ful...
<<<<<<< ======= o.Dispose(); >>>>>>> <<<<<<< ======= o.Dispose(); >>>>>>>
<<<<<<< using System.IO; using GitSharp.RevWalk; using GitSharp.Transport; using NUnit.Framework; ======= >>>>>>> <<<<<<< [Test] public void test001_Write() { byte[] bundle = makeBundle("refs/heads/firstcommit", "42e4e7c5e507e113ebbb7801b16b52cf867b7ce1", null); Re...
<<<<<<< /// <summary> /// Invoked whenever application code or internal processes (such as a rebuilding /// layout pass) call ApplyTemplate. In simplest terms, this means the method is /// called just before a UI element displays in your app. Override this method to /// influence...
<<<<<<< /// <summary> /// Pack file signature that occurs at file header - identifies file as Git /// packfile formatted. /// <para /> /// <b>This constant is fixed and is defined by the Git packfile format.</b> /// </summary> public static readonly byte[] PACK_SIGNATURE = { (byte)...
<<<<<<< data.Add("sessionid", steamWeb.SessionId); ======= data.Add("sessionid", SessionId); data.Add("serverid", "1"); >>>>>>> data.Add("sessionid", steamWeb.SessionId); data.Add("serverid", "1"); <<<<<<< data.Add("sessionid", steamWeb.Session...
<<<<<<< protected string _botName; public LogLevel OutputLevel; public LogLevel FileLogLevel; ======= protected string _Bot; public LogLevel OutputToConsole; public LogLevel OutputToLogfile; >>>>>>> protected string _botName; public LogLevel OutputLevel...
<<<<<<< public HttpWebResponse Request(string url, string method, NameValueCollection data = null, bool ajax = true) ======= public static HttpWebResponse Request (string url, string method, NameValueCollection data = null, CookieContainer cookies = null, bool ajax = true, string referer = "") >>>>>>...
<<<<<<< new Bot(info, config.ApiKey, (Bot bot, SteamID sid) => { return new SimpleUserHandler(bot, sid); }, true); ======= try { ...
<<<<<<< Admins = config.Admins; this.apiKey = apiKey; ======= SchemaLang = config.SchemaLang != null && config.SchemaLang.Length == 2 ? config.SchemaLang.ToLower() : "en"; Admins = config.Admins; this.ApiKey = !String.IsNullOrEmpty(config.ApiKey...
<<<<<<< public const String HideSystemTray = nameof(HideSystemTray); ======= public const String ShowReadme = nameof(ShowReadme); >>>>>>> public const String HideSystemTray = nameof(HideSystemTray); public const String ShowReadme = nameof(ShowReadme);
<<<<<<< private async void syncWithGoogle(SyncCommand syncCommand) ======= private void syncWithGoogle(SyncCommand syncCommand, bool autoSync) >>>>>>> private async void syncWithGoogle(SyncCommand syncCommand, bool autoSync) <<<<<<< // Get Access Token / Authorization UserCredential myCredential = awa...
<<<<<<< private System.Tuple<List<LogEventInfo>, List<AsyncContinuation>> _reusableLogEvents; private bool _missingServiceTypes; ======= private Tuple<List<LogEventInfo>, List<AsyncContinuation>> _reusableLogEvents; private AsyncHelpersTask? _flushEventsInQueueDelegate; >>>>>>> ...
<<<<<<< private void ParseTargetElement(Target target, ValidatedConfigurationElement targetElement, Dictionary<string, ValidatedConfigurationElement> typeNameToDefaultTargetParameters = null) ======= private Target CreateTargetType(string targetTypeName) { Target newTar...
<<<<<<< Initialize(); } } private void Initialize() { try { ======= PropertyHelper.CheckRequiredParameters(this); >>>>>>> Initialize(); } } private void Initialize() { ...
<<<<<<< countdownEvent.Wait(8000); ======= countdownEvent.Wait(20000); //we need some extra time for completion Thread.Sleep(1000); >>>>>>> countdownEvent.Wait(8000); //we need some extra time for completion ...
<<<<<<< using NLog.LayoutRenderers; ======= using System.Linq; >>>>>>> <<<<<<< ======= private readonly Dictionary<string, string> variables = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); >>>>>>> private readonly Dictionary<string, string> variables = new Dictionary<stri...
<<<<<<< var todo = ((Position > text.Length) ? Text.Substring(Position + 1) : ""); return $"done: '{done}'. current: '{current}'. todo: '{todo}'"; ======= var todo = ((Position > _text.Length) ? Text.Substring(Position + 1) : ""); return string.Forma...
<<<<<<< using System; using System.IO; using System.Runtime.CompilerServices; using NLog.Internal; ======= >>>>>>> <<<<<<< string name = !StringHelpers.IsNullOrWhiteSpace(callerFilePath) ? Path.GetFileNameWithoutExtension(callerFilePath) : null; var logger = StringHelpers.IsNullOrWhiteSpace...
<<<<<<< if (File.Exists(tempFile)) File.Delete(tempFile); ======= LogManager.Configuration = null; if (File.Exists(logFile)) File.Delete(logFile); if (Directory.Exists(tempPath)) Directory.Delet...
<<<<<<< using (var scope = new InternalLoggerScope()) { CreateConfigurationFromString(@" <nlog internalLogFile='c:\file.txt' internalLogLevel='Trace' internalLogToConsole='true' internalLogToConsoleError='true' globalThreshold='Warn' throwExceptions='true' internalLogToDiagnostic...
<<<<<<< #if NETCOREAPP3_1 || NET5_0 [MethodImpl(MethodImplOptions.AggressiveOptimization)] #endif ======= >>>>>>> <<<<<<< #if NETCOREAPP3_1 || NET5_0 [MethodImpl(MethodImplOptions.AggressiveOptimization)] #endif ======= >>>>>>>
<<<<<<< /// Gets the logger with the name of the current class. ======= /// Gets or sets the default culture to use. /// </summary> /// <remarks>This property was marked as obsolete before NLog 4.3.11 and it may be removed in a future release.</remarks> [Obsolete("Use Configu...
<<<<<<< if (File.Exists(tempFile)) File.Delete(tempFile); ======= LogManager.Configuration = null; if (File.Exists(logFile)) File.Delete(logFile); >>>>>>> if (File.Exists(logFile)) File.Delete(...
<<<<<<< var logFile = Path.GetTempFileName(); ======= get { bool[] boolValues = new[] { false, true }; return from useHeader in boolValues from useFooter in boolValues select new object[] { ...
<<<<<<< [Obsolete("Replaced by ScopeContext.PushProperty or Logger.PushScopeProperty using ${scopeproperty}. Marked obsolete on NLog 5.0")] ======= public void IncludeGdcNoEmptyJsonProperties() { LogManager.Configuration = XmlLoggingConfiguration.CreateFromXmlString(@" ...
<<<<<<< /// <summary> /// Resolve from DI <see cref="LogFactory.ServiceRepository"/> /// </summary> /// <remarks>Avoid calling this while handling a LogEvent, since random deadlocks can occur.</remarks> protected T ResolveService<T>() where T : class { return...
<<<<<<< #region Compositio unit test [Fact] public void When_WrappedInCompsition_Ignore_Wrapper_Methods_In_Callstack() { //namespace en name of current method const string currentMethodFullName = "NLog.UnitTests.LayoutRenderers.CallSiteTests.When_WrappedInComp...
<<<<<<< /// <summary> /// Gets or sets the log4j:event logger-xml-attribute (Default ${logger}) /// </summary> /// <docgen category='Payload Options' order='10' /> public Layout LoggerName { get => Renderer.LoggerName; set => Renderer.LoggerName = ...
<<<<<<< /* private static MethodInfo _GetMouthCellAtCellM = AccessTools.Method(typeof(OxygenBreather), "GetMouthCellAtCell"); private delegate int GetMouthCellAtCell_Delegate(int cell, CellOffset[] offsets); private static GetMouthCellAtCell_Delegate _GetMouthCellAtCell = (GetMo...
<<<<<<< string buildingName = building.name.Replace("Complete", string.Empty); bool colorAsOffset = ColorHelper.GetComponentMaterialColor(building, out Color color); ======= string buildingName = building.name.Replace("Complete", string.Empty); try { ...
<<<<<<< using Microsoft.Toolkit.Uwp.Helpers; ======= using Microsoft.Toolkit.Uwp.SampleApp.Controls; >>>>>>> using Microsoft.Toolkit.Uwp.Helpers; using Microsoft.Toolkit.Uwp.SampleApp.Controls; <<<<<<< using Windows.UI.Composition; ======= using Windows.System.Threading; >>>>>>> using Windows.UI.Composition; usi...
<<<<<<< using DotVVM.Framework.Binding.Properties; ======= using DotVVM.Framework.Binding; using System.Linq; >>>>>>> using DotVVM.Framework.Binding.Properties; using DotVVM.Framework.Binding; using System.Linq;
<<<<<<< private DoubleAnimation _leftCommandAnimation; private Storyboard _leftCommandStoryboard; private DoubleAnimation _rightCommandAnimation; private Storyboard _rightCommandStoryboard; ======= private bool _justFinishedSwiping; >>>>>>> private DoubleAnimation _lef...
<<<<<<< #if NET5_0 return ref MemoryMarshal.GetArrayDataReference(array); #elif NETCORE_RUNTIME var arrayData = Unsafe.As<RawArrayData>(array); ======= #if NETCORE_RUNTIME var arrayData = Unsafe.As<RawArrayData>(array)!; >>>>>>> #if NET5_0 return ref MemoryMarshal.GetA...
<<<<<<< OneDriveStorageFolder currentFolder = null; SampleController.Current.DisplayWaitRing = true; ======= Services.OneDrive.OneDriveStorageFolder currentFolder = null; Shell.Current.DisplayWaitRing = true; >>>>>>> Services.OneDrive.On...
<<<<<<< config.Markup.AddMarkupControl("sample", "EmbeddedResourceControls_Button", "embedded://EmbeddedResourceControls/Button.dotcontrol"); ======= config.Markup.AddMarkupControl("sample", "ControlWithButton", "Views/ControlSamples/Repeater/SampleControl/ControlWithButton.dotcontrol"); >>...
<<<<<<< [Optional] Vector4 vertexColor; [Optional] float FaceSign; ======= [Optional] Vector4 VertexColor; >>>>>>> [Optional] Vector4 VertexColor; [Optional] float FaceSign; <<<<<<< new Dependency("SurfaceDescriptionInputs.vertexColor", ...
<<<<<<< this.vmMapper = vmMapper; this.staticCommandBindingCompiler = staticCommandBindingCompiler; ======= this.javascriptTranslator = javascriptTranslator; >>>>>>> this.staticCommandBindingCompiler = staticCommandBindingCompiler; this.javascriptTranslator...
<<<<<<< using System; using System.Collections.Generic; ======= #nullable enable >>>>>>> #nullable enable using System; using System.Collections.Generic; <<<<<<< [Obsolete("The DefaultRouteName property is not supported - the classic SPA more (URLs with #/) was removed from DotVVM. See https://www.dotvvm.co...
<<<<<<< if (GetType() == typeof(Literal)) LifecycleRequirements = ControlLifecycleRequirements.None; ======= RenderSpanElement = false; >>>>>>> RenderSpanElement = false; if (GetType() == typeof(Literal)) LifecycleRequirements = ControlLifecycleRequirements.None; <<<<...
<<<<<<< lastStopwatchState = AddTraceData(lastStopwatchState, RequestTracingConstants.CommandExecuted, context, Stopwatch); ======= >>>>>>>
<<<<<<< Parent.GetClosestWithPropertyValue(out numberOfDataContextChanges, control => (bool)control.GetValue(Internal.IsControlBindingTargetProperty)); ======= GetClosestWithPropertyValue(out numberOfDataContextChanges, (control, _) => (bool)control.GetValue(Internal.IsControlBindingTargetProp...
<<<<<<< [Fact] public void Error_InvalidLocationFallback() { RunInAllBrowsers(browser => { browser.NavigateToUrl(SamplesRouteUrls.Errors_InvalidLocationFallback); AssertUI.TextEquals(browser.First(".exceptionType"), "System.NotSupportedException"); ...
<<<<<<< [TestMethod] public void Control_CheckBox_InRepeater() { RunInAllBrowsers(browser => { browser.NavigateToUrl(SamplesRouteUrls.ControlSamples_CheckBox_InRepeater); var repeater = browser.Single("div[data-ui='repeater']"); ...
<<<<<<< using Microsoft.Extensions.DependencyInjection; ======= using DotVVM.Framework.Runtime.Tracing; >>>>>>> using Microsoft.Extensions.DependencyInjection; using DotVVM.Framework.Runtime.Tracing; <<<<<<< private long AddTraceData(long lastStopwatchState, string eventName, IDotvvmRequestContext context, ...
<<<<<<< using Redwood.Framework.Hosting; using Redwood.Framework.Controls; ======= >>>>>>> using Redwood.Framework.Hosting; using Redwood.Framework.Controls; <<<<<<< var redwoodConfiguration = new RedwoodConfiguration() { ApplicationPhysicalPath = applicationPhysicalPath ...
<<<<<<< using DotVVM.Framework.Binding.Expressions; using DotVVM.Framework.Binding.Properties; ======= >>>>>>> using DotVVM.Framework.Binding.Expressions; using DotVVM.Framework.Binding.Properties; <<<<<<< private void DataBind(IDotvvmRequestContext context) ======= private void CallGridViewDataS...
<<<<<<< if (await context.IsGrantedAsync(StoresPermissions.Stores.Manage)) { storeManagementMenuItem.AddItem( new ApplicationMenuItem(StoresMenus.StoreOwner, l["Menu:StoreOwner"], "/EShop/Stores/StoreOwners/StoreOwner") ); } ...
<<<<<<< builder.Entity<StoreOwner>(b => { b.ToTable(options.TablePrefix + "StoreOwners", options.Schema); b.ConfigureByConvention(); /* Configure more properties here */ b.HasIndex(x => new {x.OwnerUserId, x.StoreId}) ...
<<<<<<< using EasyAbp.EShop.Stores.StoreOwners; ======= using EasyAbp.EShop.Stores.Transactions; >>>>>>> using EasyAbp.EShop.Stores.StoreOwners; using EasyAbp.EShop.Stores.Transactions; <<<<<<< options.AddRepository<StoreOwner, StoreOwnerRepository>(); ======= options.AddRepository...
<<<<<<< using Volo.Abp.ObjectExtending; ======= using EasyAbp.EShop.Stores.Transactions; using EasyAbp.EShop.Stores.Transactions.Dtos; using AutoMapper; >>>>>>> using EasyAbp.EShop.Stores.Transactions; using EasyAbp.EShop.Stores.Transactions.Dtos; using Volo.Abp.ObjectExtending; <<<<<<< CreateMap<Store,...
<<<<<<< DbSet<StoreOwner> StoreOwners { get; set; } ======= DbSet<Transaction> Transactions { get; set; } >>>>>>> DbSet<StoreOwner> StoreOwners { get; set; } DbSet<Transaction> Transactions { get; set; }
<<<<<<< ImmutableArray<CodeAnalysisMetricData> children = await ComputeAsync(GetChildSymbols(@namespace), context).ConfigureAwait(false); ======= var wellKnownTypeProvider = WellKnownTypeProvider.GetOrCreate(semanticModelProvider.Compilation); ImmutableArray<CodeAnalys...
<<<<<<< if (isAssertEnabled) { Assert.True(false, string.Format("Expected diagnostic to be on line \"{0}\" was actually on line \"{1}\"\r\n\r\nDiagnostic:\r\n {2}\r\n", expected.Span, actualLin...
<<<<<<< /// Looks up a localized string similar to Uses the unsafe setter of InnerXml property of System.Xml.XmlDocument.. ======= /// Looks up a localized string similar to Providing an insecure XsltSettings instance and an insecure XmlResolver instance to XslCompiledTransform.Load method is pote...
<<<<<<< var osPlatformType = osPlatformTypeArray[0]; var platformSpecificOperations = PooledConcurrentDictionary<IOperation, (SmallDictionary<string, PlatformAttributes> attributes, SmallDictionary<string, PlatformAttributes>? csAttributes)>.GetInstance(); ======= v...
<<<<<<< private static readonly MetadataReference SystemCollectionsImmutableReference = MetadataReference.CreateFromAssembly(typeof(ImmutableArray).Assembly); ======= >>>>>>> private static readonly MetadataReference SystemCollectionsImmutableReference = MetadataReference.CreateFromAssembly(typeof(I...
<<<<<<< private static readonly Lazy<Assembly> s_netstandardAssembly = new Lazy<Assembly>(() => Assembly.Load("netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51")); private static readonly Lazy<MetadataReference> s_netstandardReference = new Lazy<MetadataReference>(() => Met...
<<<<<<< public const string SystemConvert = "System.Convert"; public const string SystemSecurityCryptographySymmetricAlgorithm = "System.Security.Cryptography.SymmetricAlgorithm"; ======= public const string NewtonsoftJsonTypeNameHandling = "Newtonsoft.Json.TypeNameHandling"; >>>>>>> ...
<<<<<<< var wellKnownTypeProvider = WellKnownTypeProvider.GetOrCreate(compilationContext.Compilation); INamedTypeSymbol cancellationTokenType = wellKnownTypeProvider.GetOrCreateTypeByMetadataName(WellKnownTypeNames.SystemThreadingCancellationToken); INamedTypeSymbol iprog...
<<<<<<< [ExcludeFromCodeCoverage] public sealed override TAbstractAnalysisValue VisitUsing(IUsingOperation operation, object argument) ======= public sealed override TAbstractAnalysisValue VisitUsing(IUsingOperation operation, object? argument) >>>>>>> [ExcludeFromCodeCoverage] ...
<<<<<<< public const string SystemSecurityCryptographyRSA = "System.Security.Cryptography.RSA"; public const string SystemSecurityCryptographyDSA = "System.Security.Cryptography.DSA"; public const string SystemSecurityCryptographyAsymmetricAlgorithm = "System.Security.Cryptography.AsymmetricAlgo...
<<<<<<< internal static DiagnosticDescriptor MissingIdRule = new DiagnosticDescriptor( id: MissingId, title: "The analyzer is missing a diagnostic id", messageFormat: "The analyzer '{0}' is missing a diagnostic id", category: "Syntax", defaultSeverity:...
<<<<<<< case StartActionKind.CompilationStartAction: arg2 = "Initialize"; break; case StartActionKind.CodeBlockStartAction: case StartActionKind.OperationBlockStartAction: arg2 = "Initialize, CompilationStartAct...
<<<<<<< public const string SystemEventArgs = "System.EventArgs"; ======= public const string SystemXmlSchemaXmlSchemaCollection = "System.Xml.Schema.XmlSchemaCollection"; >>>>>>> public const string SystemEventArgs = "System.EventArgs"; public const string SystemXmlSchemaXmlSchemaCol...
<<<<<<< case "op_Addition": case "op_AdditonAssignment": return createSingle("Add"); case "op_BitwiseAnd": case "op_BitwiseAndAssignment": return createSingle("BitwiseAnd"); case "op_BitwiseOr": ...
<<<<<<< targetAnalysisData.SetAbstactValueForEntities(newValue, entityBeingAssigned: null); ======= newValue = newValue.WithEntitiesRemoved(entitiesToExclude); >>>>>>> newValue = newValue.WithEntitiesRemoved(entitiesToExc...
<<<<<<< public const string MicrosoftAspNetCoreMvcFiltersFilterCollection = "Microsoft.AspNetCore.Mvc.Filters.FilterCollection"; public const string MicrosoftAspNetCoreMvcController = "Microsoft.AspNetCore.Mvc.Controller"; public const string MicrosoftAspNetCoreMvcControllerBase = "Microsoft.Asp...
<<<<<<< [Theory, WorkItem(4149, "https://github.com/dotnet/roslyn-analyzers/issues/4149")] [InlineData("")] [InlineData("dotnet_code_quality.exclude_structs = true")] [InlineData("dotnet_code_quality.exclude_structs = false")] [InlineData("dotnet_code_quality.CA1051.exclude_struc...
<<<<<<< SystemNavigationManager.GetForCurrentView().BackRequested += OnBackRequested; var frame = GetFrame(); if (frame != null) { frame.Navigating += OnFrameNavigating; } ======= if (DesignMode.DesignModeEnabled == false) ...
<<<<<<< [Fact] [WorkItem(2746, "https://github.com/dotnet/roslyn-analyzers/issues/2746")] public void DisposableObject_FieldAsOutArgument_NotDisposed_NoDiagnostic() { var editorConfigFile = GetEditorConfigFileToDisableInterproceduralAnalysis(DisposeAnalysisKind.AllPaths); ...
<<<<<<< if (appliedImportingConstructorAttribute.ApplicationSyntaxReference != null) { // '{0}' is MEF-exported and should have a single importing constructor of the correct form context.ReportDiagnostic(Diagnostic.Create(Rule, appl...
<<<<<<< ReportDiagnostic(context, MissingInitRule, _analyzerClassSymbol.Locations[0], _analyzerClassSymbol.Name.ToString()); return new CheckInitializeInfo(); ======= ReportDiagnostic(context, MissingInitRule, _analyzerClassSymbol.Locations[0], _analyzerClas...
<<<<<<< public const string SystemTextEncoding = "System.Text.Encoding"; public const string SystemSecurityCryptographyAesGcm = "System.Security.Cryptography.AesGcm"; public const string SystemSecurityCryptographyAesCcm = "System.Security.Cryptography.AesCcm"; ======= public const stri...
<<<<<<< using System; using System.Collections.Immutable; using Microsoft.CodeAnalysis; ======= using System.Net; >>>>>>> using System; using System.Collections.Immutable; using System.Net; using Microsoft.CodeAnalysis; <<<<<<< internal static readonly ImmutableDictionary<string, ReportDiagnostic> Nulla...
<<<<<<< public const string SystemRandom = "System.Random"; ======= public const string SystemNetServicePointManager = "System.Net.ServicePointManager"; >>>>>>> public const string SystemNetServicePointManager = "System.Net.ServicePointManager"; public const string SystemRandom = "Sys...
<<<<<<< await MetricsHelper.ComputeCoupledTypesAndComplexityExcludingMemberDeclsAsync(declarations, property, coupledTypesBuilder, context).ConfigureAwait(false); MetricsHelper.AddCoupledNamedTypes(coupledTypesBuilder, property.Parameters); MetricsHelper.AddCoupledNam...
<<<<<<< LocalM(); if (OperatingSystemHelper.IsOSPlatformVersionAtLeast(""Windows"", 10, 2)) ======= if (OperatingSystem.IsOSPlatformVersionAtLeast(""Windows"", 10, 2)) >>>>>>> LocalM(); if (OperatingSystem.IsOSPlatformVersionAtLeast(""Windows"", 10, 2)) <<<<<<< [|...
<<<<<<< => options.GetSymbolNamesOption(EditorConfigOptionNames.NullCheckValidationMethods, rule, compilation, cancellationToken, namePrefixOpt: "M:"); ======= => options.GetSymbolNamesWithValueOption<Unit>(EditorConfigOptionNames.NullCheckValidationMethods, namePrefixOpt: "M:", rule, compilat...
<<<<<<< public static readonly DiagnosticDescriptor EqualityRule = new DiagnosticDescriptor( ======= public static readonly DiagnosticDescriptor Rule = new( >>>>>>> public static readonly DiagnosticDescriptor EqualityRule = new(
<<<<<<< public const string DefaultableTypeShouldHaveDefaultableFieldsRuleId = "RS0040"; ======= public const string RelaxTestNamingSuppressionRuleId = "RS0039"; >>>>>>> public const string RelaxTestNamingSuppressionRuleId = "RS0039"; public const string DefaultableTypeShouldHaveDefau...
<<<<<<< using System.Threading.Tasks; ======= // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; using Microsoft.CodeAnalysis.Testing; >>>>>>> // Copyright (c) Microsoft. A...
<<<<<<< internal static DiagnosticDescriptor RuleNoArguments = new DiagnosticDescriptor(RuleId, ======= internal static DiagnosticDescriptor Descriptor = DiagnosticDescriptorHelper.Create(RuleId, >>>>>>> internal static DiagnosticDescriptor RuleNoArguments = DiagnosticDescriptorHelper.Create(...
<<<<<<< private static readonly MetadataReference s_corlibReference = MetadataReference.CreateFromFile(typeof(object).Assembly.Location); private static readonly MetadataReference s_systemCoreReference = MetadataReference.CreateFromFile(typeof(Enumerable).Assembly.Location); private static reado...
<<<<<<< private static readonly ConditionalWeakTable<AnalyzerOptions, ICategorizedAnalyzerConfigOptions> s_cachedOptions = new ConditionalWeakTable<AnalyzerOptions, ICategorizedAnalyzerConfigOptions>(); ======= private static readonly ConditionalWeakTable<AnalyzerOptions, CategorizedAnalyz...
<<<<<<< public const string SystemTextEncoding = "System.Text.Encoding"; ======= public const string SystemNetServicePointManager = "System.Net.ServicePointManager"; public const string SystemRandom = "System.Random"; public const string SystemSecurityAuthenticationSslProtocols = "Syst...
<<<<<<< public const string SystemCollectionsConcurrentConcurrentDictionary2 = "System.Collections.Concurrent.ConcurrentDictionary`2"; public const string SystemCollectionsGenericDictionary2 = "System.Collections.Generic.Dictionary`2"; public const string SystemCollectionsGenericHashSet1 = "Syst...
<<<<<<< public static INamedTypeSymbol XmlDocument(Compilation compilation) { return compilation.GetTypeByMetadataName("System.Xml.XmlDocument"); } public static INamedTypeSymbol XPathDocument(Compilation compilation) { return compilation.GetTypeByMetadat...
<<<<<<< NetworkManager.transport.ClientDisconnect(); ======= if (NetworkManager.singleton.transport.ClientConnected()) { NetworkManager.singleton.transport.ClientDisconnect(); } >>>>>>> NetworkManager.singleton.transport.ClientDisconnect()...
<<<<<<< using System.Collections.Generic; using Mono.Cecil; ======= using System; using Mono.CecilX; >>>>>>> using System; using Mono.Cecil; <<<<<<< public TypeReference GetGenericFromBaseClass(TypeDefinition td, int genericArgument, TypeReference baseType) { if (GetGenericBaseType(td, b...
<<<<<<< using Mono.Cecil; ======= using System.Collections.Generic; using Mono.CecilX; >>>>>>> using System.Collections.Generic; using Mono.Cecil;
<<<<<<< // serialize var writer = new NetworkWriter(); message.Serialize(writer); byte[] writerData = writer.ToArray(); ======= byte[] arr = MessagePacker.Pack(message); >>>>>>> byte[] arr = MessagePacker.Pack(message); <<<<<<< var...
<<<<<<< ======= internal static NetworkMessageDelegate MessageHandler<T, C>(Action<C, T> handler, bool requireAuthenication) where T : IMessageBase, new() where C : NetworkConnection => (conn, reader, channelId) => { // protect against DOS attacks if at...
<<<<<<< bool SendToObservers<T>(NetworkIdentity identity, T msg) where T : IMessageBase ======= static bool SendToObservers<T>(NetworkIdentity identity, T msg, int channelId = Channels.DefaultReliable) where T : IMessageBase >>>>>>> bool SendToObservers<T>(NetworkIdentity identity, T msg, int...
<<<<<<< void SerializeAllTo<T>(T fromList, T toList) where T : ISyncObject ======= public static void SerializeAllTo<T>(T fromList, T toList) where T : SyncObject >>>>>>> public static void SerializeAllTo<T>(T fromList, T toList) where T : ISyncObject <<<<<<< void SerializeDeltaTo<T>...
<<<<<<< var reader = new NetworkReader(buffer); if (MessagePacker.UnpackMessage(reader, out int msgType)) ======= NetworkReader networkReader = NetworkReaderPool.GetReader(buffer); if (MessagePacker.UnpackMessage(networkReader, out int msgType)) >>>>>>> var...