conflict_resolution
stringlengths
27
16k
<<<<<<< var tfa = Substitute.For<ITwoFactorChallengeHandler>(); var oauthListener = Substitute.For<IOAuthCallbackListener>(); ======= var tfa = new Lazy<ITwoFactorChallengeHandler>(() => Substitute.For<ITwoFactorChallengeHandler>()); >>>>>>> var tfa = new Lazy<ITwoFacto...
<<<<<<< using NullGuard; ======= using NLog; >>>>>>> <<<<<<< using System.Collections.ObjectModel; using GitHub.Collections; using GitHub.UI; using GitHub.Extensions.Reactive; using GitHub.Infrastructure; using Serilog; ======= >>>>>>> using Serilog; <<<<<<< IObservable<Unit> OnCloneRepository(object s...
<<<<<<< public const string InlineReviewsPackageId = "248325BE-4A2D-4111-B122-E7D59BF73A35"; ======= public const string TeamExplorerWelcomeMessage = "C529627F-8AA6-4FDB-82EB-4BFB7DB753C3"; >>>>>>> public const string InlineReviewsPackageId = "248325BE-4A2D-4111-B122-E7D59BF73A35"; pu...
<<<<<<< Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de> ======= Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-online.de> >>>>>>> Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-online.de> <<<<<<< get { return GetLazyTime(ref m_tLastModLazy, ref m_tLastMod); } set ...
<<<<<<< string AvatarUrl { get; } BitmapImage Avatar { get; } ======= /// <summary> /// Gets the type of check run, Status/Check. /// </summary> PullRequestCheckType CheckType { get; } /// <summary> /// Gets the id of the check run. /// </summ...
<<<<<<< IExportFactoryProvider SetupFactory(IServiceProvider provider) { var factory = provider.GetExportFactoryProvider(); factory.GetViewModel(GitHub.Exports.UIViewType.Login).Returns(new ExportLifetimeContext<IViewModel>(Substitute.For<IViewModel>(), () => { })); f...
<<<<<<< public partial class RepositoryCreationControl : GenericRepositoryCreationControl ======= [PartCreationPolicy(CreationPolicy.NonShared)] public partial class RepositoryCreationControl : SimpleViewUserControl, IViewFor<IRepositoryCreationViewModel>, IView >>>>>>> [PartCreationPolicy(CreationPo...
<<<<<<< ======= using GitHub.Logging; using System.Threading.Tasks; using ILoginCache = GitHub.Caches.ILoginCache; >>>>>>> <<<<<<< public ApiClientFactory(IKeychain keychain, IProgram program, ILoggingConfiguration config) ======= public ApiClientFactory(ILoginCache loginCache, IProgram program) ...
<<<<<<< var list = GetObjectsForFlow(activeFlow); foreach (var i in list.Values) i.ClearHandlers(); if (activeFlow == mainFlow) { uiProvider.RemoveService(typeof(IConnection)); completion?.OnNext(success); c...
<<<<<<< // You do not need to add suppressions to this file manually. using System.Diagnostics.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "GitHub.ViewModels.CreateRepoViewModel.#ResetState()")] [assembly: SuppressMessage("Microsoft.Naming...
<<<<<<< using GitHub.Extensions; ======= using GitHub.Primitives; >>>>>>> using GitHub.Extensions; using GitHub.Primitives; <<<<<<< public static Uri GetUriFromRepository(this Repository repo) ======= public static UriString GetUri(this Repository repo) >>>>>>> public static Uri GetUriFro...
<<<<<<< if (!customIconId.EqualsValue(PwUuid.Zero)) { return getIconDrawable (res, db, customIconId); } else { return getIconDrawable (res, icon); ======= if (customIconId != PwUuid.Zero) { return GetIconDrawable (res, db, customIconId); >>>>>>> if (!customIconId.EqualsValue(PwUuid.Zero)) ...
<<<<<<< async Task<string> GetFileFromRepositoryOrApi( ILocalRepositoryModel repository, IRepository repo, IModelService modelService, string commitSha, string fileName, string fileSha) { return await gitClient.ExtractFi...
<<<<<<< public Guid Guid { get; set; } public DateTimeOffset Date { get; set; } ======= public Guid Guid { get; set; } public bool IsGitHubUser { get; set; } public bool IsEnterpriseUser { get; set; } >>>>>>> public Guid Guid { get; set; } public DateTimeOffset...
<<<<<<< using System.Reactive.Subjects; using GitHub.Primitives; using System.Collections.Specialized; using System.ComponentModel; ======= using System.Collections.ObjectModel; >>>>>>> using System.Reactive.Subjects; using GitHub.Primitives; using System.Collections.Specialized; using System.ComponentModel; using S...
<<<<<<< var provider = Substitutes.ServiceProvider; var gitservice = provider.GetGitService(); var repo = Substitute.For<IRepository>(); var path = Directory.CreateSubdirectory("repo-name"); gitservice.GetUri(path.FullName).Returns((UriString)null); ...
<<<<<<< using GitHub.InlineReviews.Commands; using Microsoft.VisualStudio.ComponentModelHost; using Microsoft.VisualStudio.TextManager.Interop; using System.Text; ======= >>>>>>> using Microsoft.VisualStudio.TextManager.Interop; using System.Text; <<<<<<< var rightFile = workingDirectory ? ViewModel...
<<<<<<< using System; using System.Collections.Generic; ======= using System.Collections.Generic; using System.Globalization; >>>>>>> using System; using System.Collections.Generic; using System.Globalization;
<<<<<<< using System.ComponentModel.Composition.Hosting; using System.ComponentModel.Composition.Primitives; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.IO; ======= >>>>>>> using System.IO; <<<<<<< using GitHub.Info; using GitHub.Infrastructure; =======...
<<<<<<< /// Compares two commits. /// </summary> /// <param name="repository">The repository</param> /// <param name="sha1">The SHA of the first commit.</param> /// <param name="sha2">The SHA of the second commit.</param> /// <param name="detectRenames">Whether to detect ...
<<<<<<< ======= using Octokit; >>>>>>> <<<<<<< using static System.FormattableString; ======= using Serilog; >>>>>>> using Serilog; using static System.FormattableString; <<<<<<< readonly IConnection connection; ======= static readonly ILogger log = LogManager.ForContext<RepositoryHosts>(); ...
<<<<<<< Gist, ======= PRList, PRDetail, PRCreation, >>>>>>> Gist, PRList, PRDetail, PRCreation,
<<<<<<< await vm.InitializeAsync(session, annotationModels, file, thread.Comments[0].Review, thread, true); ======= await vm.InitializeAsync(session, file, thread, true); >>>>>>> await vm.InitializeAsync(session, annotationModels, file, thread, true);
<<<<<<< .Where(annotation => annotation.Path == relativePath && annotation.AnnotationLevel.HasValue) .Select(annotation => new InlineAnnotationModel(arg.checkSuite, arg.checkRun, annotation))) ======= .Where(annotation => annotation.Path == relat...
<<<<<<< using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Reactive; ======= using System.ComponentModel.Composition; using System.Threading.Tasks; >>>>>>> using System.Collections.Generic; using System.ComponentModel.Composition; using System.Threading.Tasks; <<<<...
<<<<<<< Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de> Modified to be used with Mono for Android. Changes Copyright (C) 2013 Philipp Crocoll ======= Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-online.de> >>>>>>> Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-onl...
<<<<<<< this.mainContainer1.MinimizeBox = false; ======= this.mainContainer1.Dock = System.Windows.Forms.DockStyle.Fill; this.mainContainer1.Location = new System.Drawing.Point(0, 0); this.mainContainer1.Margin = new System.Windows.Forms.Padding(0); this.mai...
<<<<<<< private void PictureBoxButtonCustom6_Click(object sender, EventArgs e) { using (var x = new FriendsForm()) { x.ShowDialog(); } } ======= private void UpdateDiagModeToolStripFromConfig() { if (Program.User...
<<<<<<< Copyright (C) 2003-2012 Dominik Reichl <dominik.reichl@t-online.de> Modified to be used with Mono for Android. Changes Copyright (C) 2013 Philipp Crocoll ======= Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de> >>>>>>> Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-onl...
<<<<<<< private readonly object songLock; private readonly HashSet<LocalSong> songs; ======= private readonly ReaderWriterLockSlim songLock; private readonly HashSet<Song> songs; >>>>>>> private readonly ReaderWriterLockSlim songLock; private readonly HashSet<LocalSong...
<<<<<<< var path = !string.IsNullOrWhiteSpace(LegacyBootstrapper.UserConfig?.GameFilesPath) ? LegacyBootstrapper.UserConfig?.GameFilesPath : GameScannnerApi.GetGameFilesRootPath(); ======= var path = !string.IsNullOrWhiteSpace(Program.UserConfig?...
<<<<<<< Copyright (C) 2003-2012 Dominik Reichl <dominik.reichl@t-online.de> Modified to be used with Mono for Android. Changes Copyright (C) 2013 Philipp Crocoll ======= Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de> >>>>>>> Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-onl...
<<<<<<< Console.WriteLine($"Processing file:"); foreach (string filePath in args) { Console.WriteLine($"Processing file: {filePath}"); var success = ProcessAssembly(rewriter, filePath); if (!success) { Environment.ExitCode = 3; } =...
<<<<<<< using System; using System.Diagnostics; ======= using System; >>>>>>> using System; <<<<<<< static class Program ======= public class Program >>>>>>> public static class Program <<<<<<< var message = messageEventArgs.Message; if (message == null || message.Type != ...
<<<<<<< this.tbxChangelog = new System.Windows.Forms.TextBox(); this.lblChangelog = new System.Windows.Forms.Label(); this.btnUpateInstall = new System.Windows.Forms.Button(); this.timFetch = new System.Windows.Forms.Timer(this.components); ======= >>>>>>> ...
<<<<<<< {"15.0.1236.3", "Exchange 2013 SP1 CU14"}, {"15.0.1263.5", "Exchange 2013 SP1 CU15"}, {"15.0.1293.2", "Exchange 2013 SP1 CU16"}, {"15.0.1320.4", "Exchange 2013 SP1 CU17"}, {"15.1.225.17", "Exchange 2016 Preview"}, ======= {"15.0.1236.3", "Exchange 2013 SP1 CU14"}, ...
<<<<<<< Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de> Modified to be used with Mono for Android. Changes Copyright (C) 2013 Philipp Crocoll ======= Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-online.de> >>>>>>> Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-onl...
<<<<<<< public static readonly string PoptipDemoCtl = nameof(PoptipDemoCtl); ======= public static readonly string RangeSliderDemoCtl = nameof(RangeSliderDemoCtl); >>>>>>> public static readonly string PoptipDemoCtl = nameof(PoptipDemoCtl); public static readonly string R...
<<<<<<< public SystemVersionInfo(int major, int minor, int build, int revision = 0) ======= public static SystemVersionInfo Windows10_1903 => new SystemVersionInfo(10, 0, 18362); public SystemVersionInfo(int major, int minor, int build) >>>>>>> public static SystemVersionInfo Windows...
<<<<<<< /// Looks up a localized string similar to 格式错误. ======= /// 查找类似 查找 的本地化字符串。 /// </summary> public static string Find { get { return ResourceManager.GetString("Find", resourceCulture); } } /// <summary> ...
<<<<<<< this.horizontalLayout1 = new DiabloInterface.Gui.Controls.HorizontalLayout(); this.verticalLayout2 = new DiabloInterface.Gui.Controls.VerticalLayout(); ======= this.loadConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.frwLabel = new System.Win...
<<<<<<< var paymentRequest = MockPosApiRequest.CreatePosPaymentRequest("Request"); var client = CreateMockTestClientPosCloudApiRequest("Mocks/terminalapi/pospayment-success.json"); ======= var paymentRequest = MockPosApiRequest.CreatePosPaymentRequest(); ...
<<<<<<< //Set security protocol. Only TLS1.2 ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; var httpWebRequest = GetHttpWebRequest(endpoint, config, isApiKeyRequired, idempotencyKey); ======= var httpWebRequest = GetHttpWebRequest(endpoint...
<<<<<<< this.library.RemovePlaylist(this.CurrentPlaylist.Model); ======= this.CurrentPlaylist.Dispose(); this.library.RemovePlaylist(this.CurrentPlaylist.Name); >>>>>>> this.CurrentPlaylist.Dispose(); ...
<<<<<<< Copyright (C) 2003-2012 Dominik Reichl <dominik.reichl@t-online.de> Modified to be used with Mono for Android. Changes Copyright (C) 2013 Philipp Crocoll ======= Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de> >>>>>>> Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-onl...
<<<<<<< public bool CanStartAnotherINstance() { throw new NotImplementedException(); } public bool CanStartAnotherInstance(out string errorMessage) { switch(mBrowserTpe) { case eBrowserType.IE: errorMessage ...
<<<<<<< SetActionDetails(act); App.AutomateTabGingerRunner.PrepActionVE(act); ApplicationAgent ag = App.AutomateTabGingerRunner.ApplicationAgents.Where(x => x.AppName == App.BusinessFlow.CurrentActivity.TargetApplication).FirstOrDefault(); ======= App.AutomateTabGingerR...
<<<<<<< Copyright (C) 2003-2012 Dominik Reichl <dominik.reichl@t-online.de> Modified to be used with Mono for Android. Changes Copyright (C) 2013 Philipp Crocoll ======= Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-online.de> >>>>>>> Copyright (C) 2003-2013 Dominik Reichl <dominik.reichl@t-onl...
<<<<<<< GingerLoadingInfo, StaticStatusMessage, StaticStatusProcess, PasteProcess, ======= GingerLoadingInfo, NewVersionAvailable >>>>>>> GingerLoadingInfo, StaticStatusMessage, StaticStatusProcess, PasteProcess, NewVersionAvailable
<<<<<<< if ( WorkSpace.UserProfile.Solution != null) { mVariablesParentObj = WorkSpace.UserProfile.Solution; ((Solution)mVariablesParentObj).PropertyChanged -= Solution_PropertyChanged; (...
<<<<<<< if (elNode != null) { EI.ElementObject = elNode; } ======= >>>>>>> <<<<<<< list.Add(new ControlProperty() { Name = "RelXPath", Value = ((HTMLElementInfo)ElementInfo).RelXpath }); ======= list.Add(new ControlPropert...
<<<<<<< using Amdocs.Ginger.Plugin.Core.Attributes; using Amdocs.Ginger.Plugin.Core.Drivers; ======= >>>>>>> using Amdocs.Ginger.Plugin.Core.Attributes; using Amdocs.Ginger.Plugin.Core.Drivers; <<<<<<< // Scan once and cache Console.WriteLine("Scanning Service: " + mService.GetTy...
<<<<<<< using Couchbase.Utils; ======= using GingerCore.ALM.QC; using OctaneSDK.Services.Queries; using System.Text.RegularExpressions; using System.Reflection; using System.Web; using QCRestClient; using QCTestSet = QCRestClient.QCTestSet; >>>>>>> using GingerCore.ALM.QC; using OctaneSDK.Services.Queries; using Sys...
<<<<<<< ======= >>>>>>> <<<<<<< ======= >>>>>>> <<<<<<< exitingFields.Append(mergedFields); ======= exitingFields.Append(mergedFields); } } internal ObservableList<ExternalItemFieldBase> GetUpdatedFields(Observabl...
<<<<<<< [TestMethod] ======= [TestMethod] [Timeout(60000)] [Ignore] >>>>>>> [TestMethod] [Timeout(60000)]
<<<<<<< using GingerCore.DataSource; ======= using GingerCore.Environments; >>>>>>> using GingerCore.Environments; using GingerCore.DataSource;
<<<<<<< WindowControlsTreeView.TreeGrid.RowDefinitions[0].Height = new GridLength(0); mContext = Context; ======= mContext = context; >>>>>>> WindowControlsTreeView.TreeGrid.RowDefinitions[0].Height = new GridLength(0); ...
<<<<<<< using Amdocs.Ginger.Common.Enums; ======= using Amdocs.Ginger.CoreNET; using GingerCore.Actions.Common; >>>>>>> using Amdocs.Ginger.Common.Enums; using Amdocs.Ginger.CoreNET; using GingerCore.Actions.Common;
<<<<<<< public AutomatePage(BusinessFlow businessFlow) ======= public AutomatePage() >>>>>>> public AutomatePage(BusinessFlow businessFlow) <<<<<<< App.AutomateBusinessFlowEvent += App_AutomateBusinessFlowEvent; WorkSpace.UserProfile.PropertyChanged += UserProfileProp...
<<<<<<< var httpClient = new HttpClient(new ServiceClientRouteHandler(r => Assert.AreEqual(r.Headers.UserAgent.ToString(), UserAgent + "/v32"))); var forceClient = new ForceClient("http://localhost:1899", "accessToken", "v32", httpClient, new HttpClient()); ======= var httpClient =...
<<<<<<< using System; using System.Collections.Generic; using Amdocs.Ginger.Common.InterfacesLib; using GingerCore.Variables; using Amdocs.Ginger.CoreNET.Execution; ======= #region License /* Copyright © 2014-2018 European Support Limited Licensed under the Apache License, Version 2.0 (the "License") you may not us...
<<<<<<< ======= return mVERefrences; } set { mVERefrences = value; } } public static BusinessFlow Businessflow { get; set; } >>>>>>> return mVERefrences; } set ...
<<<<<<< using Files.Views; ======= using Files.Helpers; >>>>>>> using Files.Views; using Files.Helpers;
<<<<<<< private void xActionLogConfigExpander_Expanded(object sender, RoutedEventArgs e) { ActionDetailsRow.Height = new GridLength(220); } private void xActionLogConfigExpander_Collapsed(object sender, RoutedEventArgs e) { ActionDetailsRow.Height= new G...
<<<<<<< public void CollectOriginalElementsDataForDeltaCheck(ObservableList<ElementInfo> originalList) { throw new NotImplementedException(); } public ElementInfo GetMatchingElement(ElementInfo latestElement, ObservableList<ElementInfo> originalElements) { ...
<<<<<<< using (var httpClient = new ServiceHttpClient("http://localhost:1899", "v36", "accessToken", client)) ======= using (var httpClient = new JsonHttpClient("http://localhost:1899", "v34", "accessToken", client)) >>>>>>> using (var httpClient = new JsonHttpClient("http://local...
<<<<<<< using System.IO; ======= using Ginger.Reports.GingerExecutionReport; >>>>>>> using Ginger.Reports.GingerExecutionReport; using System.IO;
<<<<<<< mConversionProcess.BusinessFlowsActionsConversion(ListOfBusinessFlow); }); ======= xContinue.Visibility = Visibility.Collapsed; mWizard.BusinessFlowsActionsConversion(ListOfBusinessFlow); }); >>>>>>> xContinue....
<<<<<<< private JsonHttpClient _jsonHttpClient; ======= private readonly ServiceHttpClient _serviceHttpClient; private readonly string _itemsOrElements = "feed-items"; >>>>>>> private readonly JsonHttpClient _jsonHttpClient; private readonly string _itemsOrElements = "feed-items"; <<...
<<<<<<< using (var httpClient = new JsonHttpClient("http://localhost:1899", "v32", "accessToken", client)) ======= using (var httpClient = new ServiceHttpClient("http://localhost:1899", "v34", "accessToken", client)) >>>>>>> using (var httpClient = new JsonHttpClient("http://local...
<<<<<<< UpdateOutputValuesTabHeader(); mAction.OnPropertyChanged(nameof(Act.ReturnValuesInfo)); this.Dispatcher.Invoke(() => { if (mAction.ActReturnValues.Count > 0) { xOutputValuesExpander.IsExpanded = true; ...
<<<<<<< ======= using Ginger.DataSource; using GingerCore.DataSource; using Ginger.Actions; using Ginger.UserControlsLib.TextEditor; using Ginger.Variables; using Ginger.Environments; using System.Reflection; using Amdocs.Ginger.CoreNET.ValueExpression; using Amdocs.Ginger.Repository; using amdocs.ginger.GingerCoreN...
<<<<<<< using GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib; using Amdocs.Ginger.Common; using Amdocs.Ginger.Common.InterfacesLib; using Amdocs.Ginger.Common.Enums; ======= using System.IO; using System.Linq; >>>>>>> using GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib...
<<<<<<< Task<string> GetFieldsCommaSeparatedListAsync(string objectName); ======= Task<T> ExecuteAnonymousAsync<T>(string apex); >>>>>>> Task<string> GetFieldsCommaSeparatedListAsync(string objectName); Task<T> ExecuteAnonymousAsync<T>(string apex);
<<<<<<< MainPage.sideBarItems.Add(new LocationItem { Text = ResourceController.GetTranslation("SidebarHome"), Glyph = "\uE737", IsDefaultLocation = true, Path = "Home" }); ======= App.sideBarItems.Add(new LocationItem { Text = ResourceController.GetTranslation("SidebarHome"), Font = App.Curren...
<<<<<<< ======= >>>>>>> <<<<<<< ======= >>>>>>> <<<<<<< LoadInfoFromJSON(); PluginID = PluginPackageInfo.Id; ======= LoadInfo(); PluginId = PluginPackageInfo.Id; >>>>>>> LoadInfoFromJS...
<<<<<<< using Amdocs.Ginger.Common.Enums; ======= using Amdocs.Ginger.CoreNET; using GingerCore.Actions.WebServices; >>>>>>> using Amdocs.Ginger.CoreNET; using GingerCore.Actions.WebServices; using Amdocs.Ginger.Common.Enums;
<<<<<<< private const string UserAgent = "forcedotcom-libraries-dotnet"; ======= private static string _userAgent = "forcedotcom-toolkit-dotnet"; >>>>>>> private const string UserAgent = "forcedotcom-toolkit-dotnet"; <<<<<<< if (string.IsNullOrEmpty(objectName)...
<<<<<<< /// <return> /// A response object containing the response body and response headers. /// </return> public async Task<HttpOperationResponse<Pet>> GetPetByIdWithHttpMessagesAsync(long? petId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToke...
<<<<<<< /// <return> /// A response object containing the response body and response headers. /// </return> public async Task<HttpOperationResponse> PutTrueWithHttpMessagesAsync(bool? boolBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = d...
<<<<<<< /// <return> /// A response object containing the response body and response headers. /// </return> public async Task<HttpOperationResponse> ParamIntegerWithHttpMessagesAsync(string scenario, int? value, Dictionary<string, List<string>> customHeaders = null, CancellationToken can...
<<<<<<< /// <return> /// A response object containing the response body and response headers. /// </return> public async Task<HttpOperationResponse> PutPositiveDurationWithHttpMessagesAsync(TimeSpan? durationBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken c...
<<<<<<< this.Responses.ForEach(r => imports.AddRange(r.Value.Body.ImportFrom(ServiceClient.Namespace))); imports.AddRange(DefaultResponse.Body.ImportFrom(ServiceClient.Namespace)); ======= this.Responses.ForEach(r => imports.AddRange(r.Value.ImportFrom(ServiceClient.Nam...
<<<<<<< /// <return> /// A response object containing the response body and response headers. /// </return> public async Task<HttpOperationResponse> PutBigFloatWithHttpMessagesAsync(double? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationT...
<<<<<<< /// <return> /// A response object containing the response body and response headers. /// </return> public async Task<HttpOperationResponse> PutMax32WithHttpMessagesAsync(int? intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = de...
<<<<<<< /// <return> /// A response object containing the response body and response headers. /// </return> public async Task<AzureOperationResponse<bool?>> Head200WithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(C...
<<<<<<< /// <return> /// A response object containing the response body and response headers. /// </return> public async Task<HttpOperationResponse> PutTrueWithHttpMessagesAsync(bool? boolBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = d...
<<<<<<< method.Documentation = _operation.Description; method.ContentType = "application/json"; if (this._effectiveProduces != null && this._effectiveProduces.Count > 0) { method.ContentType = this._effectiveProduces[0]; } if (meth...
<<<<<<< ======= private UPnPWrapper _upnp; >>>>>>> private UPnPWrapper _upnp; <<<<<<< panel2.Enabled = true; listener = new UdpConnectionListener(new NetworkEndPoint(IPAddress.Any, (int) numericUpDown2.Value)); ======= int port = (int...
<<<<<<< this.label7.Location = new System.Drawing.Point(10, 17); ======= this.label7.Location = new System.Drawing.Point(46, 17); >>>>>>> this.label7.Location = new System.Drawing.Point(46, 17); <<<<<<< this.numericUpDown3.Location = new System.Drawing.Point(119, 14);...
<<<<<<< using System.Net; ======= using System.Threading; >>>>>>> using System.Net; using System.Threading; <<<<<<< RestResponse<Collection> resp = await req.ExecuteGet<Collection>().ConfigureAwait(false); Collection item = await resp.GetDataObject().ConfigureAwait(false); ======= ...
<<<<<<< ======= /// <summary> /// Country ISO code ex. US /// </summary> public List<string> OriginCountry { get; set; } public string OriginalLanguage { get; set; } >>>>>>> /// <summary> /// Country ISO code ex. US /// </summary> public List...
<<<<<<< [TestMethod] public void TestADOTabularCSDLVisitorMeasures() { var c = new ADOTabularConnection(@"Data Source=.\sql2014tb", AdomdType.AnalysisServices); var v = new MetaDataVisitorCSDL(c); var m = new ADOTabularModel(c, "AdventureWorks", "...
<<<<<<< return new ScriptExecuteCommand(args.ScriptName, _scriptServiceRoot.FileSystem, _scriptServiceRoot.PackageAssemblyResolver, _scriptServiceRoot.Executor, _scriptServiceRoot.ScriptPackResolver, _scriptServiceRoot.Logger); ======= var executeCommand = new Exec...
<<<<<<< ======= using System.Reflection; using ScriptCs.Contracts; >>>>>>> using ScriptCs.Contracts;
<<<<<<< using DaxStudio.UI.Extensions; ======= using DaxStudio.UI.Interfaces; >>>>>>> using DaxStudio.UI.Extensions; using DaxStudio.UI.Interfaces;
<<<<<<< // Arrange var args = new ScriptCsArgs { AllowPreRelease = false, Install = "", ScriptName = "test.csx" }; fileSystem.SetupGet(x => x.CurrentDirectory).Returns(CurrentDirectory); // Act factory.CreateCommand(args, new string[0]).E...
<<<<<<< using System.Globalization; using log4net.Core; ======= [ArgExample("scriptcs server.csx -debug", "Shows how to start the script with debug mode switched on")] >>>>>>> [ArgExample("scriptcs server.csx -debug", "Shows how to start the script with debug mode switched on")] <<<<<<< ...
<<<<<<< using Common.Logging; ======= using System.Reflection; >>>>>>> using System.Reflection; using Common.Logging; <<<<<<< _logger.Debug("Retrieving script packs contexts"); var contexts = scriptPackSession.ScriptPacks.Select(x => x.GetContext()); _logger.Debug("C...
<<<<<<< public ScriptExecutor(IFileSystem fileSystem, IFilePreProcessor filePreProcessor, IScriptEngine scriptEngine, IScriptHostFactory scriptHostFactory) ======= [ImportingConstructor] public ScriptExecutor(IFileSystem fileSystem, [Import(Constants.RunContractName)]IFilePreProcessor filePreP...