conflict_resolution
stringlengths
27
16k
<<<<<<< Synchronizer = Config.UseTor.Value ? new WasabiSynchronizer(Network, BitcoinStore, () => Config.GetCurrentBackendUri(), Config.GetTorSocks5EndPoint()) : new WasabiSynchronizer(Network, BitcoinStore, Config.GetFallbackBackendUri(), null); ======= if (Config.UseTor.Value) { Synchronizer = n...
<<<<<<< private NavigationStateViewModel _navigationState; ======= >>>>>>> private NavigationStateViewModel _navigationState; <<<<<<< _walletDictionary = new Dictionary<Wallet, WalletViewModelBase>(); SelectedItem = new HomePageViewModel(_navigationState); ======= var addWalletPage = new AddWalletPa...
<<<<<<< CoinReceived?.Invoke(this, coin); if (coin.Unspent && coin.Label == "ZeroLink Change" && ChaumianClient.OnePiece != null) ======= if (coin.Unspent && coin.Label == "ZeroLink Change" && !(ChaumianClient.OnePiece is null)) >>>>>>> CoinReceived?.Invoke(this, coin); if (coin.Unspent && c...
<<<<<<< using System.Reactive; ======= using AvalonStudio.Extensibility.Theme; >>>>>>> using System.Reactive; using AvalonStudio.Extensibility.Theme;
<<<<<<< if (seps.Count != 0) { throw new ArgumentException( string.Format("Cannot provide key/value separators for Options taking {0} value(s).", MaxValueCount), ======= throw new ArgumentException( $"Cannot provide key/value separators for Options taking {MaxValueCount} value(s).", >>>>>...
<<<<<<< public ReactiveCommand<Unit, Unit> SaveQRCodeCommand { get; } ======= public ReactiveCommand<Unit, Unit> DisplayAddressOnHwCommand { get; } public ReactiveCommand<Unit, Unit> GenerateCommand { get; } >>>>>>> public ReactiveCommand<Unit, Unit> DisplayAddressOnHwCommand { get; } public Reactive...
<<<<<<< this.sessionFTPLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ======= this.rPGRLAToEmbeddedSQLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); >>>>>>> this.sessionFTPLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();...
<<<<<<< public WebsiteTorifier WebsiteTorifier { get; } public Global Global { get; } public IMemoryCache Cache { get; } public InitConfigStartupTask(Global global, IMemoryCache cache, IWebHostEnvironment hostingEnvironment) ======= public InitConfigStartupTask(Global global, IWebHostEnvironment hostingEnv...
<<<<<<< ======= else { Version coldCardVersion = new Version(coldCardVersionString); if (coldCardVersion == new Version("2.1.0")) // Should never happen though. { reverseByteOrder = true; } } HDFingerprint mfp = NBitcoinHelpers.BetterParseHDFingerprint(mfpS...
<<<<<<< bool cliException = false; ======= Exception? appException = null; >>>>>>> Exception? appException = null; bool cliException = false; <<<<<<< if (!cliException) { Global.CrashReporter.SetException(ex); } throw; } finally { DisposeAsync().GetAwaiter().GetResult...
<<<<<<< UIBarButtonItem barButtonItem; var xamarinSidebarMenu = ViewController as IMvxSidebarMenu; if (xamarinSidebarMenu != null) { sidebarController.HasShadowing = xamarinSidebarMenu.HasShadowing; sidebarController.MenuWidth = xamarinSi...
<<<<<<< } public abstract class MvxSearchSupportFragment<TViewModel> : MvxSearchSupportFragment , IMvxFragmentView<TViewModel> where TViewModel : class, IMvxViewModel { protected MvxSearchSupportFragment() { } protected MvxSearchSupportFragment(IntPtr javaReference, JniHandleOwnership transfer) : base...
<<<<<<< using Cirrious.MvvmCross.Interfaces.IoC; using Cirrious.MvvmCross.Interfaces.Platform; using Cirrious.MvvmCross.Interfaces.Plugins; ======= using Cirrious.MvvmCross.Interfaces.Platform.Diagnostics; >>>>>>> using Cirrious.MvvmCross.Interfaces.IoC; using Cirrious.MvvmCross.Interfaces.Platform; using Cirrious.M...
<<<<<<< using System.Windows.Input; ======= using Cirrious.MvvmCross.Interfaces.Commands; using System; >>>>>>> using System.Windows.Input; using System; <<<<<<< public ICommand Command { get; private set; } ======= public IMvxCommand Command { get; private set; } #region IDisposable implemen...
<<<<<<< using Foundation; using MvvmCross.Binding.ExtensionMethods; using MvvmCross.Binding.iOS.Views; using MvvmCross.Platform.Core; using System; using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; using UIKit; namespace MvvmCross.iOS.Support.Views { public abstract class ...
<<<<<<< GetSemiStaticInlineSerializerForCache[key] = ret = (Action<TextWriter, ForType, int>)builder.Invoke(null, new object[] { cacheType, opts.ShouldPrettyPrint, opts.ShouldExcludeNulls, opts.IsJSONP, opts.UseDateTimeFormat, opts.ShouldIncludeInherited, opts.UseUnspecifiedDateTimeKindBehavior, opts.Se...
<<<<<<< internal InlineSerializer(Type recusionLookupType, bool pretty, bool excludeNulls, bool jsonp, DateTimeFormat dateFormat, bool includeInherited, bool callOutOnPossibleDynamic, bool buildToString) ======= internal InlineSerializer(Type recusionLookupOptionsType, bool pretty, bool excludeNulls, ...
<<<<<<< if (marginsCollapsingEnabled && result.GetStatus() != LayoutResult.NOTHING) { marginsCollapseHandler.EndChildMarginsHandling(layoutBox); } if (FloatingHelper.IsRendererFloating(childRenderer)) { waitingFl...
<<<<<<< ApplyLayoutAttributes(role, renderer, doc.GetTagStructureContext().GetAutoTaggingPointer()); } public static void ApplyLayoutAttributes(PdfName role, AbstractRenderer renderer, TagTreePointer taggingPointer ) { ======= PdfDictionary layoutAttributes = GetLa...
<<<<<<< MinMaxWidth minMaxWidth = new MinMaxWidth(0, layoutBox.GetWidth()); AbstractWidthHandler widthHandler = new MaxSumWidthHandler(minMaxWidth); BaseDirection? baseDirection = this.GetProperty<BaseDirection?>(Property.BASE_DIRECTION); foreach (IRenderer renderer in ch...
<<<<<<< ttfBytes = ttf.GetSubset(new HashSet<int>(longTag), true); ======= try { ttfBytes = ttf.GetSubset(new LinkedHashSet<int>(longTag.Keys), true); } catch (iText.IO.IOExc...
<<<<<<< OverflowPropertyValue? overflowX = this.GetProperty<OverflowPropertyValue?>(Property.OVERFLOW_X); float? blockMaxHeight = RetrieveMaxHeight(); OverflowPropertyValue? overflowY = (null == blockMaxHeight || blockMaxHeight > parentBBox.GetHeight()) && !wasParent...
<<<<<<< GetBackingElem().SetLang(new PdfString(language)); ======= backingElem.SetLang(new PdfString(language, PdfEncodings.UNICODE_BIG)); >>>>>>> GetBackingElem().SetLang(new PdfString(language, PdfEncodings.UNICODE_BIG)); <<<<<<< GetBackingElem().SetActualText(new P...
<<<<<<< // CompareResult.cs // Script#/Libraries/Knockout // This source code is subject to terms and conditions of the Apache License, Version 2.0. // using System; using System.Runtime.CompilerServices; namespace KnockoutApi { [ScriptImport] [ScriptIgnoreNamespace] public class CompareResult<T> { ...
<<<<<<< return CreateGoToR(fileSpec, destination).Put(PdfName.NewWindow, new PdfBoolean(newWindow)); ======= return new iText.Kernel.Pdf.Action.PdfAction().Put(PdfName.S, PdfName.GoToR).Put(PdfName.F, fileSpec.GetPdfObject ()).Put(PdfName.D, destination.GetPdfObject()).Put(PdfN...
<<<<<<< UpdateHeightsOnSplit(wasHeightClipped, overflowRenderer); CorrectFixedLayout(layoutBox); ======= UpdateHeightsOnSplit(wasHeightClipped, splitRenderer, overflowRenderer); CorrectPosit...
<<<<<<< IIngestManifest ingestManifest = CreateManifestWithAssetsAndVerifyIt(_mediaContext); VerifyAssetStateAndDelete(IngestManifestState.Activating, ingestManifest.Id); ======= IIngestManifest ingestManifest = CreateManifestWithAssetsAndVerifyIt(_context); VerifyAsset...
<<<<<<< accessibleElement = (IAccessibleElement)GetModelElement(); PdfName role = accessibleElement.GetRole(); if (role != null && !PdfName.Artifact.Equals(role)) { tagPointer = document.GetTagStructureContext().GetAutoTaggingPointer(); ...
<<<<<<< /// NeedAppearances has been deprecated in PDF 2.0. /// <p> ======= /// <br /> >>>>>>> /// NeedAppearances has been deprecated in PDF 2.0. /// <br /> <<<<<<< /// NeedAppearances has been deprecated in PDF 2.0. /// <p> ======= /// <br /> >>>>...
<<<<<<< var types = new List<Type>(); Array.ForEach( assemblies, a => { try { types.AddRange(a.GetTypes() .Where(t => !t.IsValueType && ...
<<<<<<< var section = Configure.ConfigurationSource.GetConfiguration<GatewayConfig>(); if (section != null) { sites = section.SitesAsDictionary(); } ======= var section = Configure.GetConfigSection<GatewayConfig>(); if(section != ...
<<<<<<< using System; using NServiceBus.Configuration.AdvancedExtensibility; using NServiceBus.Settings; using NServiceBus.Transport; ======= >>>>>>> using NServiceBus.Configuration.AdvancedExtensibility; using NServiceBus.Settings; using NServiceBus.Transport;
<<<<<<< using Config; ======= using Unicast.Transport; >>>>>>> using Config; using Unicast.Transport; <<<<<<< InMemoryFaultManager = new Faults.InMemory.FaultManager(); TransportBuilder = new FakeTransportBuilder(); ======= InMemoryFaultManager = new NService...
<<<<<<< Log.DebugFormat("Started {0}.", name); } catch (Exception ex) { ConfigureCriticalErrorAction.RaiseCriticalError(String.Format("{0} could not be started.", name), ex); } }, TaskCreationOptions.Long...
<<<<<<< internal static readonly Dictionary<Type, Dictionary<Type, SagaToMessageMap>> SagaEntityToMessageToPropertyLookup = new Dictionary<Type, Dictionary<Type, SagaToMessageMap>>(); ======= internal static readonly Dictionary<Type, Dictionary<Type, KeyValuePair<PropertyInfo, PropertyInfo>>> SagaEnti...
<<<<<<< static ILog Logger = LogManager.GetLogger<RecoverabilityComponent>(); private TransportSeam transportSeam; ======= >>>>>>> private TransportSeam transportSeam;
<<<<<<< namespace NServiceBus.Timeout.Tests { using System.Transactions; using Core; using NUnit.Framework; [TestFixture] public class When_removing_timeouts_from_the_storage : WithRavenTimeoutPersister { [Test] public void Should_remove_timeouts_by_id() { v...
<<<<<<< config = Configure.With(o => o.EndpointName(endpointName) .EnableInstallers()) ======= config = Configure.With(o => o.EndpointName(endpointName).DiscardFailedMessagesInsteadOfSendingToErrorQueue()) >>>>>>> config = Configure.With(o...
<<<<<<< AssetFileData data = (AssetFileData)t.AsyncState; return data; ======= AssetFileData data = (AssetFileData)t.Result.AsyncState; IAssetFile file = this._cloudMediaContext.Files.Where(c => c.Id == data.Id).First(); ...
<<<<<<< { var message = new TransportMessage(); foreach (var header in from) { message.Headers[header.Key] = header.Value; } return message; } ======= { return new ...
<<<<<<< using MessageMutator; public class GatewayHeaderManager : IMutateTransportMessages, INeedInitialization { public void MutateIncoming(TransportMessage transportMessage) { returnInfo = null; if (!transportMessage.Headers.ContainsKey(Headers.HttpFrom) && ...
<<<<<<< using System.Transactions; ======= >>>>>>> using System.Transactions; <<<<<<< using NServiceBus.Unicast.Transport; using NServiceBus.Unicast.Transport.Transactional; using NServiceBus.Utils; ======= using Unicast.Transport; >>>>>>> using NServiceBus.Unicast.Transport.Trans...
<<<<<<< namespace NServiceBus.Timeout.Hosting.Windows { using System; using Core; using Faults; using ObjectBuilder; using Unicast.Queuing; using Unicast.Queuing.Msmq; using Unicast.Transport; using Unicast.Transport.Transactional; public class TimeoutMessageProcessor : IWantToRunW...
<<<<<<< Directory.CreateDirectory(Path.Combine(path, ".committed")); bodyDir = Path.Combine(path, BodyDirName); ======= >>>>>>> Directory.CreateDirectory(Path.Combine(path, ".committed")); bodyDir = Path.Combine(path, BodyDirName);
<<<<<<< #region Tests that are producing diagnostics [TestCategory("Detect")] [TestMethod] public async Task XssFromCSharpExpressionBody() { const string cSharpTest = @" using System.Web; class Vulnerable { public static HttpResponse Response = null; public ...
<<<<<<< using System; using System.Collections.Concurrent; ======= using System.Collections.Concurrent; using Servicecomb.Saga.Omega.Abstractions.Transaction; >>>>>>> using System; using System.Collections.Concurrent; using Servicecomb.Saga.Omega.Abstractions.Transaction;
<<<<<<< typeMapper[typeof(ConvolutionFilterNode)] = typeof(ConvolutionFilterNodePresenter); ======= typeMapper[typeof(Matrix2Node)] = typeof(Matrix2NodePresenter); typeMapper[typeof(Matrix3Node)] = typeof(Matrix3NodePresenter); typeMapper[typeof(Matrix4Node)] = typeof(M...
<<<<<<< var graph = graphObject.graph as UnityEngine.MaterialGraph.MaterialGraph; ======= var graph = inMemoryAsset as IShaderGraph; >>>>>>> var graph = graphObject.graph as IShaderGraph;
<<<<<<< else if (property is IntegerShaderProperty) m_ValueAction = IntegerField; else if (property is SliderShaderProperty) m_ValueAction = SliderField; ======= else if (property is BooleanShaderProperty) m_ValueAction = BooleanField...
<<<<<<< using System.Linq; ======= using UnityEngine; >>>>>>> using System.Linq; using UnityEngine;
<<<<<<< gm.AddItem(new GUIContent("HDR Color"), false, () => AddProperty(new ColorShaderProperty(true))); gm.AddItem(new GUIContent("Integer"), false, () => AddProperty(new IntegerShaderProperty())); gm.AddItem(new GUIContent("Slider"), false, () => AddProperty(new SliderShaderProper...
<<<<<<< return string.Format("inline void {0} ({1} {2}, {3} {4}, out {5} {6})", GetFunctionName(), ConvertConcreteSlotValueTypeToString(precision, FindInputSlot<MaterialSlot>(InputSlot1Id).concreteValueType), argIn1, ConvertConcreteSlotValueTypeToString(precision, FindInput...
<<<<<<< Label m_PathLabel; TextField m_PathLabelTextField; bool m_EditPathCancelled = false; public Action onDragFinished { get { return m_WindowDraggable.OnDragFinished; } set { m_WindowDraggable.OnDragFinished = value; } } ======= //pu...
<<<<<<< MasterNodeView m_MasterNodeView; ======= private EditorWindow m_EditorWindow; >>>>>>> MasterNodeView m_MasterNodeView; private EditorWindow m_EditorWindow; <<<<<<< ======= m_GraphInspectorView.AddManipulator(new Draggable(OnMouseDrag, true)); ...
<<<<<<< [CategoryResources(nameof(SchemaFolderOptions) + "Active")] [DisplayNameResources(nameof(SchemaFolderOptions) + nameof(Enabled))] [DescriptionResources(nameof(SchemaFolderOptions) + nameof(Enabled))] ======= [Category("Active")] [DisplayName("Enabled")] [Descrip...
<<<<<<< var assignment = SyntaxFactory.IdentifierName(variable.Identifier.ToString()).Assign(variable.Initializer.Value); currentState.Add(Cs.Express(assignment)); ======= var assignment = Syntax.IdentifierName(variable.Identifier.ToString()).Assign(variable...
<<<<<<< "ALTROGUEASSASSINATION" => new RogueAssassination2(ObjectManager, CharacterManager, HookManager, PathfindingHandler, MovemenEngine), "SHAMANELEMENTAL" => new ShamanElemental(ObjectManager, CharacterManager, HookManager), ======= "SHAMANELEMENTAL"...
<<<<<<< TaskExecutor.ExecuteLater(scheduledTaskManager.GetTask(scheduledTask)); TaskExecutor.StartExecuting(); ======= TaskExecutor.ExecuteTask(scheduledTaskManager.GetTask(scheduledTask)); >>>>>>> TaskExecutor.ExecuteTask(scheduledTaskManager.GetTask(sche...
<<<<<<< this._updateScrollInput(); ======= if (this._textInput != null) { this._textInput.keyboardManager.Update(); } >>>>>>> this._updateScrollInput(); if (this._textInput != null) { ...
<<<<<<< } ======= public override int GetHashCode() { unchecked { var hashCode = (this.top != null ? this.top.GetHashCode() : 0); hashCode = (hashCode * 397) ^ (this.right != null ? this.right.GetHashCode() : 0); hashCode = (hashCode * 397) ^ (t...
<<<<<<< CardTheme cardTheme = null, ======= ChipThemeData chipTheme = null, >>>>>>> CardTheme cardTheme = null, ChipThemeData chipTheme = null, <<<<<<< cardTheme = cardTheme ?? new CardTheme(); ======= chipTheme = chipTheme ?? ChipThemeData.f...
<<<<<<< VerifyAndDownloadAsset(refreshedAsset,1,_smallWmv,true,false); ======= VerifyAndDownloadAsset(refreshedAsset, 1, false); >>>>>>> VerifyAndDownloadAsset(refreshedAsset,1,_smallWmv,true,false); <<<<<<< VerifyAndDownloadAsset(asset, 1,_smallWmv,true,false); ====...
<<<<<<< return texAlpha(layer, paint, mesh, null, tex); } public static PictureFlusher.RenderDraw texAlpha(PictureFlusher.RenderLayer layer, Paint paint, TextBlobMesh textMesh, Texture tex) { return texAlpha(layer, paint, null, textMesh, tex); } ...
<<<<<<< using UIWidgets.service; ======= using UIWidgets.rendering; >>>>>>> using UIWidgets.service; using UIWidgets.rendering; <<<<<<< public override TextInput textInput { get { return _textInput; } } ======= public void attachRootRenderBox(RenderBox root) { ...
<<<<<<< public WindowPadding viewPadding { get { return this._displayMetrics.viewPadding; } } public WindowPadding viewInsets { get { return this._displayMetrics.viewInsets; } } protected override void OnDisable() { D.assert(this._windowAdapt...
<<<<<<< [Theory] [DisplayTestMethodName] [InlineData(null)] [InlineData("123")] [InlineData("jøbber-nå")] public void Should_return_string_representation_of_message(string id) { var message = new Message(); if (id != null) { ...
<<<<<<< #endif ======= using Microsoft.Azure.Devices.Client.Exceptions; using Microsoft.Azure.Devices.Client.Extensions; >>>>>>> using Microsoft.Azure.Devices.Client.Exceptions; using Microsoft.Azure.Devices.Client.Extensions; <<<<<<< #if !WINDOWS_UWP readonly string hostName; readon...
<<<<<<< this.hubScopeRefreshTokenTimer = new IOThreadTimer(s => ((IotHubConnection)s).OnRefreshTokenAsync(), this, false); this.iotHubLinkRefreshTokenTimers = new ConcurrentDictionary<string, IotHubLinkRefreshTokenTimer>(); this.useWebSocketOnly = useWebSocketOnly; ======= ...
<<<<<<< volatile bool closeCalled; #if !WINDOWS_UWP ======= #if !PCL >>>>>>> volatile bool closeCalled; #if !PCL <<<<<<< #if WINDOWS_UWP return Create(hostname, authenticationMethod, TransportType.Http1); #else ======= #if WINDOWS_UWP || PCL return Create(hostname, authenti...
<<<<<<< }); ======= }, pipelineBuilder); #endif >>>>>>> }, pipelineBuilder); <<<<<<< return CreateFromConnectionString(connectionString, new ITransportSettings[] { new Http1TransportSettings() });...
<<<<<<< #if !WINDOWS_UWP public X509Certificate2 ClientCertificate { get; set; } #endif ======= public AmqpConnectionPoolSettings AmqpConnectionPoolSettings { get; set; } void SetOperationTimeout(TimeSpan operationTimeout) { if (operationTimeout > TimeSpan.Zero) ...
<<<<<<< #if !WINDOWS_UWP ======= #if !PCL >>>>>>> this.serializedAmqpMessage = null; } /// <summary> /// Default constructor with no requestId and status data /// </summary> internal MethodResponseInternal(string requestId, int status) { #if !NETMF ...
<<<<<<< /// <summary> /// Checks if the part and its children can be grabbed and reports the errors. /// </summary> /// <remarks>Also, collects <seealso cref="grabbedMass"/> and /// <seealso cref="grabbedPartsCount"/> of the attempted hierarchy.</remarks> /// <param ...
<<<<<<< //public bool isWaitMainTask = true; private bool isSubAccountHokan = true; private bool isRtmpMain = false; ======= public bool isWaitMainTask = true; >>>>>>> b77d287f700e628ca0b621134ab8ddd993dbb4fc public RecordFromUrl(RecordingManager rm) { this.rm = rm; //CookieContainer container = ne...
<<<<<<< const string modelFace = "face-detection-adas-0001.bin"; const string modelFaceTxt = "face-detection-adas-0001.xml"; ======= const string modelFace = "face-detection-adas-0001.bin"; const string modelFaceTxt = "face-detection-adas-0001.xml"; >>>>>>> con...
<<<<<<< public static void ApplyCustomAttributes(this OpenApiSchema schema, IEnumerable<object> customAttributes) => ApplyCustomAttributes(schema, null, customAttributes); public static void ApplyCustomAttributes(this OpenApiSchema schema, SchemaRepository schemaRepository, IEnumerable<object> customAt...
<<<<<<< using System.Collections.Generic; using System.Linq; ======= using System.Linq; >>>>>>> using System.Collections.Generic; using System.Linq; <<<<<<< using Microsoft.AspNetCore.Mvc.Controllers; using Newtonsoft.Json; using Swashbuckle.AspNetCore.Swagger; ======= using Microsoft.AspNetCore.Mvc.Controller...
<<<<<<< //this should happen when Dismiss is called, but it happens AFTER the animation ends // so sometimes, the cancel button is left on :( if (CancelHudButton != null) { CancelHudButton.RemoveFromSuperview (); CancelHudButton = null; } if (!BTProgressHUD.IsVisible) BTProgressHUD.Show (...
<<<<<<< Text, Interface ======= Text, Int64 >>>>>>> Text, Interface, Int64 <<<<<<< case AddTypeEnum.Interface: return new InterfaceProperty(name); ======= case AddTypeEnum.Int64:...
<<<<<<< public RelayCommand CopyPropertyNameCommand { get; } ======= /// <summary> /// Gets or sets the index of this property in an array /// Leave null for properties outside arrays /// </summary> public string Index { get; set; } >>>>>>> public RelayComman...
<<<<<<< using System.Globalization; using PogoLocationFeeder.Repository; ======= using static PogoLocationFeeder.DiscordWebReader; >>>>>>> using System.Globalization; using PogoLocationFeeder.Repository; using static PogoLocationFeeder.DiscordWebReader; <<<<<<< ======= private DiscordChannelParser channel...
<<<<<<< /// <summary> /// Updates on your current account balance and margin requirements /// </summary> /// <param name="act">Your Action when socket get data</param> /// <returns>Margin Subscription info</returns> public static BitmexApiSubscriptionInfo<IEnumerable<Mar...
<<<<<<< using Microsoft.Health.Fhir.Shared.Api.UnitTests; ======= using Microsoft.Health.Fhir.Core.Features.Security; >>>>>>> using Microsoft.Health.Fhir.Core.Features.Security; using Microsoft.Health.Fhir.Shared.Api.UnitTests;
<<<<<<< private readonly IPasvAddressResolver _addressResolver; ======= [CanBeNull] >>>>>>> private readonly IPasvAddressResolver _addressResolver; [CanBeNull] <<<<<<< public PasvListenerFactory(IPasvAddressResolver addressResolver, ILogger<PasvListenerFactory> logger) =====...
<<<<<<< [Fact] public void ShouldUseLocalTimeZoneOverride() { //var all = TimeZoneInfo.GetSystemTimeZones(); //var skip = new[] //{ // "Dateline Standard Time", // "UTC-11", // "Hawaiian Standard Time" /...
<<<<<<< using Jint.Parser.Ast; using Jint.Runtime.Descriptors; ======= >>>>>>> using Jint.Runtime.Descriptors;
<<<<<<< using Jint.Native.Object; using Jint.Parser.Ast; ======= >>>>>>> using Jint.Native.Object; <<<<<<< return literal.CachedValue; } if (literal.Type == SyntaxNodes.RegularExpressionLiteral) { var regexp = _engine.RegExp.Construct(literal.Raw); if (r...
<<<<<<< public virtual object Convert(object value, Type type, IFormatProvider formatProvider) { ======= public object Convert(object value, Type type, IFormatProvider formatProvider) { if (value == null) { if (TypeIsNullable(type)) ...
<<<<<<< public abstract SqlProvider FormatSum(LambdaExpression sumExpression); public abstract SqlProvider FormatUpdateSelect<T>(Expression<Func<T, T>> updator); /// <summary> /// 业务公共抽离模块 /// </summary> [ThreadStatic] public static AopProvider Aop = new AopProvider(); /// <summary> /// 获取表名称 /// ...
<<<<<<< using System.Reflection; using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows; // 有关程序集的常规信息通过以下 // 特性集控制。更改这些特性值可修改 // 与程序集关联的信息。 [assembly: AssemblyTitle("Wox")] [assembly: AssemblyDescription("https://github.com/qianlifeng/Wox")] [assembl...
<<<<<<< ======= using Wox.Core.UserSettings; using Wox.Helper; >>>>>>> using Wox.Helper; <<<<<<< if (IsContextMenuVisible) ======= if (ContextMenuVisibility.IsVisible()) >>>>>>> if (ContextMenuVisibility.IsVisible()) <<<<<<< if (IsContextMenuVisib...
<<<<<<< private const string POWERTOYNAME = "Launcher"; ======= >>>>>>> <<<<<<< if (SettingsUtils.SettingsExists()) { generalSettings = SettingsUtils.GetSettings<GeneralSettings>(string.Empty); } else { generalSetti...
<<<<<<< ======= private bool _isVisible; private bool _isResultListBoxVisible; private bool _isContextMenuVisible; private bool _isProgressBarVisible; >>>>>>> <<<<<<< this.InitializeResultListBox(); this.InitializeContextMenu(); this.InitializeKe...
<<<<<<< public void UpdateSettings(PowerLauncherSettings settings) { } ======= void InitializeFileWatchers() { // Create a new FileSystemWatcher and set its properties. _watcher = new FileSystemWatcher(); var resolvedPath = Environment.Expa...
<<<<<<< Output.ToHtml.WhenCallMatches(x => x.Method.HasAttribute<HtmlEndpointAttribute>()); Output.ToJson.WhenCallMatches(x => x.Method.HasAttribute<JsonEndpointAttribute>()); ======= Output.ToHtml.WhenCallMatches(x => x.Method.HasCustomAttribute<HtmlEndpointAttribute>()); ...
<<<<<<< ======= [Test] public void request_history_cache_is_registered() { registeredTypeIs<IRequestHistoryCache, RequestHistoryCache>(); } >>>>>>> [Test] public void request_history_cache_is_registered() { registeredTypeIs<IRequestH...
<<<<<<< ======= using FubuMVC.UI; using FubuValidation; using FubuValidation.Strategies; >>>>>>> using FubuValidation; using FubuValidation.Strategies;
<<<<<<< public static T Create<T>(this Type type) { return (T) type.Create(); } public static object Create(this Type type) { return Activator.CreateInstance(type); } ======= >>>>>>> public static T Create<T>(this Type type) ...
<<<<<<< var expression = new RenderPartialExpression<TInputModel>(page, page.Get<IPartialRenderer>(), page.Get<IFubuRequest>()) ======= return new RenderPartialExpression<TInputModel>(page.Model, page, page.Get<IPartialRenderer>()) >>>>>>> var expression = new RenderPartialExpress...
<<<<<<< // Smoke test various options { var dbname = "test-options"; if (Directory.Exists(dbname)) Directory.Delete(dbname, true); var optsTest = (DbOptions)new RocksDbSharp.DbOptions() .SetCreateIfMissing(true...