conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
// タグテーブルに種別を追加
migrationBuilder.AddColumn<int>(
name: "Type",
table: "Tags",
nullable: false,
defaultValue: 0);
// 登録済みのタグはすべてデータ管理から登録されたものとする。
migrationBuilder.Sql("UPDATE \"Tags\" SET \"Type\" =... |
<<<<<<<
/// <summary>
/// マウントした学習ID
/// tensorboard起動時に追加した学習IDが入る
/// </summary>
public string MountTrainingHistoryIds { get; set; }
=======
/// <summary>
/// タグ
/// </summary>
public IEnumerable<string> Tags
{
get
... |
<<<<<<<
/// <summary>
/// If Debounce Interval is null or 0, Value should change immediately
/// </summary>
[Test]
public void WithNoDebounceIntervalValueShouldChangeImmediatelyTest()
{
//Arrange
using var ctx = new Bunit.TestContext();
... |
<<<<<<<
using System;
using System.Globalization;
=======
using System.Collections.Generic;
using System.Globalization;
>>>>>>>
using System;
using System.Collections.Generic;
using System.Globalization;
<<<<<<<
[Inject] public IJSRuntime JSRuntime { get; set; }
protected bool _settingText;
====... |
<<<<<<<
services.AddMudBlazorScrollManager();
services.AddMudBlazorScrollListener();
=======
services.AddSingleton<IApiLinkService, ApiLinkService>();
services.AddSingleton<IMenuService,MenuService>();
services.AddScoped<IDocsNavigationService,DocsNavigatio... |
<<<<<<<
using MudBlazor.Docs.Services;
=======
using MudBlazor.Docs.Services;
>>>>>>>
using MudBlazor.Docs.Services;
<<<<<<<
services.AddScoped<IDocsNavigationService,DocsNavigationService>();
services.AddScoped<IMenuService,MenuService>();
=======
services.AddSi... |
<<<<<<<
public const string DialogBodyScrollableExample = @"<MudDialog DisableSidePadding=""true"">
<DialogContent>
<MudContainer Style=""max-height: 300px; overflow-y: scroll"">
<MudText Class=""mb-5"" Typo=""Typo.body1"">Copyright (c) 2020 - The MudBlazor Team and Contributors</MudText>
... |
<<<<<<<
.UseDefaultHostingConfiguration(args)
=======
// We set the server by name before default args so that command line arguments can override it.
// This is used to allow deployers to choose the server for testing.
.UseServer("Microsoft.AspNetCore.S... |
<<<<<<<
static char[] split = { ' ' };
public override void onMsg(ref MessageBase msg)
=======
public new void onMsg(ref MessageBase msg)
>>>>>>>
static char[] split = { ' ' };
public new void onMsg(ref MessageBase msg) |
<<<<<<<
=======
banManager = new BanManager();
base.onInitFilter += manager => manager.AddFilters(banManager.GetClientFliter(), banManager.GetServerFliter());
base.onInitPlugin += () => Sync.Tools.ConsoleWriter.WriteColor(Name + " By " + Author, ConsoleColor.DarkCyan);
>>>>>>>
... |
<<<<<<<
private void InitAdvance()
{
if (!Directory.Exists(OsuFolderPath))
return;
try
{
var currentDatabase = OsuDb.Read(OsuFolderPath + "osu!.db");
CurrentBeatmapList = currentDatabase.Beatmaps;
Curren... |
<<<<<<<
[Fact]
public void VerifyDeduplication() {
var client = new ExceptionlessClient();
var errorPlugin = new ErrorPlugin();
using (var duplicateCheckerPlugin = new DuplicateCheckerPlugin(TimeSpan.FromMilliseconds(20))) {
for (int index = 0; index ... |
<<<<<<<
using Newtonsoft.Json;
using System;
namespace WebVella.ERP.Api.Models
{
public class DateField : Field
{
[JsonProperty(PropertyName = "fieldType")]
public static FieldType FieldType { get { return FieldType.DateField; } }
[JsonProperty(PropertyName = "defaultValue")]
... |
<<<<<<<
using System;
using System.Collections.Generic;
using MongoDB.Bson.Serialization.Attributes;
namespace WebVella.ERP.Storage.Mongo
{
public class MongoEntity : IEntity
{
[BsonId]
public Guid Id { get; set; }
public string Name { get; set; }
public bool System { get; se... |
<<<<<<<
namespace WpfMath
{
public enum TexDelimeterType
{
Over = 0,
Under = 1
}
public enum TexAtomType
{
None = -1,
Ordinary = 0,
BigOperator = 1,
BinaryOperator = 2,
Relation = 3,
Opening = 4,
Closing = 5,
Punctuatio... |
<<<<<<<
=======
EntityManager entMan = new EntityManager();
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
return Json(response);
}
[AcceptVerbs(new[] { "POST" }, Route = "api/v1/en_US/meta/entity/{Id}/field")]
public IActionResult CreateField(string Id, [FromBody]InputField submitObj)
{
FieldResponse response = new FieldResponse();
Guid entityId;... |
<<<<<<<
Assert.AreEqual(5, TestUtils.Evaluate("delete $; $ = 5; $"));
Assert.AreEqual(6, TestUtils.Evaluate("delete dung; d\\u0075ng = 6; dung"));
Assert.AreEqual(7, TestUtils.Evaluate("delete another; \\u0061nother = 7; another"));
Assert.AreEqual("SyntaxError", TestUtil... |
<<<<<<<
/// <param name="thisObject"> The string that is being operated on. </param>
=======
/// <param name="thisObject"> The object that is being operated on. </param>
>>>>>>>
/// <param name="thisObject"> The string that is being operated on. </param>
<<<<<<<
/// <param name="this... |
<<<<<<<
public static Branch FindBranch(this IRepository repository, string branchName)
{
var exact = repository.Branches.FirstOrDefault(x => x.Name == branchName);
if (exact != null)
{
return exact;
}
return repository.Branche... |
<<<<<<<
using GitTools.Git;
=======
>>>>>>>
using GitTools.Git;
<<<<<<<
=======
>>>>>>>
<<<<<<<
private static void CloneRepository(string repositoryUrl, string gitDirectory, AuthenticationInfo authentication)
=======
static void CloneRepository(string repositoryUrl, string gitDirect... |
<<<<<<<
namespace GitVersionExe.Tests
{
using System;
=======
using System;
using System.Collections.Generic;
>>>>>>>
using System;
<<<<<<<
fileSystem.Exists("C:\\Testing\\AssemblyInfo.cs").Returns(true);
fileSystem.ReadAllText("C:\\Testing\\AssemblyInfo.cs").... |
<<<<<<<
/// <summary>
/// The list of weighted goal maps. Can be used to add or remove goal maps, or change their weights.
/// </summary>
/// <remarks>
/// When adding a new goal map, its Height and Width should be identical to the Height and
/// Width of the GoalMapCombiner.
/// </remarks>
public reado... |
<<<<<<<
[TestMethod, TestCategory("Lite"), TestCategory("Behavior"), TestCategory("Strict")]
public void ShouldAssertStrictMock()
{
var mock = Mock.Create<IFoo>(Behavior.Strict);
Mock.Assert(mock);
try
{
mock.GetGuid();
}
catch (Exception) { }
var message = Assert.Throws<AssertionExcep... |
<<<<<<<
#if NETCORE
using Debug = Telerik.JustMock.Diagnostics.JMDebug;
#else
using Debug = System.Diagnostics.Debug;
#endif
=======
using System.Reflection.Emit;
>>>>>>>
using System.Reflection.Emit;
#if NETCORE
using Debug = Telerik.JustMock.Diagnostics.JMDebug;
#else
using Debug = System.Diagnostics.De... |
<<<<<<<
using LiveSplit.Web;
=======
using LiveSplit.Utils;
>>>>>>>
using LiveSplit.Web;
using LiveSplit.Utils;
<<<<<<<
var gameNames = CompositeGameList.Instance.GetGameNames().ToArray();
Action invokation = () =>
=======
var gameNames = Spe... |
<<<<<<<
[ClientTestFixture(
CertificateClientOptions.ServiceVersion.V7_0,
CertificateClientOptions.ServiceVersion.V7_1_Preview)]
=======
[ClientTestFixture(
CertificateClientOptions.ServiceVersion.V7_0,
CertificateClientOptions.ServiceVersion.V7_1)]
>>>>>>>
[ClientTestFixt... |
<<<<<<<
=======
this.symbols = new DebugSymbols(this.client);
this.isPointer64Bit = this.control.IsPointer64Bit;
>>>>>>>
this.symbols = new DebugSymbols(this.client); |
<<<<<<<
return new SSymbolNameAndDisplacement() { Module = module.Name, Name = name, Displacement = displacement };
=======
return new SSymbolNameResultAndDisplacement() {
Symbol = new SSymbolNameResult() {
Module = module.Nam... |
<<<<<<<
using TechTalk.SpecFlow.IdeIntegration.Options;
using TechTalk.SpecFlow.IdeIntegration.Tracing;
=======
>>>>>>>
using TechTalk.SpecFlow.IdeIntegration.Options;
<<<<<<<
private readonly IIdeTracer _tracer;
private readonly IntegrationOptions _integrationOptions;
=======
>>>>>>> |
<<<<<<<
AddSpatialData(info, currentAnimation.Timelines[objectRefFirst.TimelineId], currentAnimation.Entity.Spriter, frameData);
=======
AddSpatialData(info, currentAnimation.Timelines[objectRefFirst.TimelineId], currentAnimation.Entity.Spriter, targetTime, deltaTime, frameData);
>>>>... |
<<<<<<<
FrameData.Clear();
Metadata.Clear();
=======
FrameData frameData;
FrameMetadata metaData = null;
>>>>>>>
FrameData.Clear();
Metadata.Clear();
<<<<<<<
SpriterProcessor.UpdateFrameData(FrameData, CurrentAnimation, Time);... |
<<<<<<<
States.State = new DisconnectedState();
States.Execute();
=======
States.State = new ClosedState();
States.State.Execute(null);
>>>>>>>
States.State = new DisconnectedState();
States.State.Execute(null); |
<<<<<<<
_result.Body = SafeJsonConvert.DeserializeObject<Profile>(_responseContent, this.Client.DeserializationSettings);
=======
string _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
_result.Body = SafeJsonConvert.... |
<<<<<<<
public string TryParse<TIn>(string source, ref int index, out JsonPathExpression expression)
=======
public string TryParse<T>(string source, ref int index, out ExpressionTreeNode<T> node)
>>>>>>>
public string TryParse<T>(string source, ref int index, out JsonPathExpression expression) |
<<<<<<<
using UnityEngine.FrameRecorder;
using UnityEngine.SceneManagement;
=======
using UnityEngine.Recorder;
using UnityEngine.SceneManagement;
>>>>>>>
using UnityEngine.Recorder;
<<<<<<<
//protected SerializedProperty m_Inputs;
=======
>>>>>>>
<<<<<<<
void BuildInputEditors()
{
... |
<<<<<<<
private FlowControlEventHandler m_flowControl;
=======
private BasicRecoverOkEventHandler m_basicRecoverOk;
>>>>>>>
private FlowControlEventHandler m_flowControl;
private BasicRecoverOkEventHandler m_basicRecoverOk;
<<<<<<<
public event FlowControlEventHandler FlowCon... |
<<<<<<<
using System.Linq;
=======
using System.Globalization;
>>>>>>>
using System.Linq;
using System.Globalization; |
<<<<<<<
#if !NETFX_CORE
using System.Net.Security;
#endif
using RabbitMQ.Client.Exceptions;
using RabbitMQ.Client.Framing.Impl;
using RabbitMQ.Client.Impl;
=======
>>>>>>>
#if !NETFX_CORE
using System.Net.Security;
#endif |
<<<<<<<
IList<ShutdownReportEntry> ShutdownReport { get; }
=======
IList ShutdownReport { get; }
///<summary>Handle incoming Connection.Blocked methods.</summary>
void HandleConnectionBlocked(string reason);
///<summary>Handle incoming Connection.Unblocked methods.</summary>... |
<<<<<<<
rabbind.Transport.Password = this.Password;
rabbind.Transport.Username = this.Username;
rabbind.Transport.VirtualHost = this.VirtualHost;
=======
rabbind.Transport.ConnectionFactory.Password = this.Password;
rabbind.Transport.ConnectionFactory.UserNa... |
<<<<<<<
[Fact]
public void Should_Allow_Using_Aliases_with_Dot()
{
var contact = new Entity("contact") { Id = Guid.NewGuid() };
contact["firstname"] = "Jordi";
var account = new Entity("account") { Id = Guid.NewGuid() };
account["primarycontactid... |
<<<<<<<
}
public event FlowControlEventHandler FlowControl
{
add
{
lock (m_eventLock)
{
m_flowControl += value;
}
}
remove
{
lock (m_eventLock)
... |
<<<<<<<
public IDictionary m_clientProperties;
=======
public IDictionary m_serverProperties;
>>>>>>>
public IDictionary m_clientProperties;
public IDictionary m_serverProperties;
<<<<<<<
public IDictionary ClientProperties
{
get
{
... |
<<<<<<<
m_flowControlBlock.Reset();
_Private_ChannelFlowOk(active);
OnFlowControl(new FlowControlEventArgs(active));
=======
{
lock (m_flowSendLock)
{
m_flowControlBlock.Reset();
_Private_Channe... |
<<<<<<<
if (validate && record.Id == Guid.Empty)
=======
/*
if (record.Id == Guid.Empty)
>>>>>>>
/*
if (validate && record.Id == Guid.Empty)
<<<<<<<
=======
*/
>>>>>>>
*/ |
<<<<<<<
public const bool VerifyServerCert = true;
=======
public const bool UseElasticTraceparentHeader = true;
>>>>>>>
public const bool UseElasticTraceparentHeader = true;
public const bool VerifyServerCert = true;
<<<<<<<
public const string VerifyServerCert = Prefix + "VERIFY_SERVER_CERT";
====... |
<<<<<<<
public bool VerifyServerCert => _wrapped.VerifyServerCert;
=======
public bool UseElasticTraceparentHeader => _wrapped.UseElasticTraceparentHeader;
>>>>>>>
public bool UseElasticTraceparentHeader => _wrapped.UseElasticTraceparentHeader;
public bool VerifyServerCert => _wrapped.VerifyServerCert; |
<<<<<<<
private readonly string _verifyServerCert;
=======
private readonly string _useElasticTraceparentHeader;
>>>>>>>
private readonly string _useElasticTraceparentHeader;
private readonly string _verifyServerCert;
<<<<<<<
string disableMetrics = null,
string verifyServerCert = null
=======
st... |
<<<<<<<
var configReader = configuration != null ? new MicrosoftExtensionsConfig(configuration) : null;
var service = GetService(configReader);
=======
var configReader = configuration == null
? new EnvironmentConfigurationReader()
: new MicrosoftExtensionsConfig(configuration) as IConfigurationReade... |
<<<<<<<
public static readonly int PropertyMaxLength = 1024;
=======
public static string IntakeV2Events = "intake/v2/events";
>>>>>>>
public static readonly int PropertyMaxLength = 1024;
public static string IntakeV2Events = "intake/v2/events"; |
<<<<<<<
=======
using Elastic.Apm.Metrics;
>>>>>>>
using Elastic.Apm.Metrics;
<<<<<<<
if (PayloadSender is IDisposable disposable) disposable.Dispose();
=======
if (MetricsCollector is IDisposable disposableMetricsCollector)
{
disposableMetricsCollector.Dispose();
}
if (PayloadSender is IDispo... |
<<<<<<<
AddPackageReference(projectManager, package, ignoreDependencies, allowPrereleaseVersions);
});
}
=======
AddPackageReference(projectManager, package, ignoreDependencies, allowPrereleaseVersions);
});
}
... |
<<<<<<<
=======
using PackageUtility = NuGet.Test.PackageUtility;
>>>>>>>
using PackageUtility = NuGet.Test.PackageUtility; |
<<<<<<<
packageBuilder.Files.Add(CreatePackageFile(@"content\test1.txt"));
=======
if (licenseUrl != null)
{
packageBuilder.LicenseUrl = licenseUrl;
}
var dependencies = new PackageDependency("Dummy");
packageBuilder.DependencySe... |
<<<<<<<
/// Added 'requiredMinVersion' attribute
/// Allows XDT transformation
=======
/// Added 'minClientVersion' attribute
>>>>>>>
/// Added 'minClientVersion' attribute
/// Allows XDT transformation |
<<<<<<<
public void Disable() {
Invoke(_impl.Disable);
}
public void WriteProgress(ProgressData data) {
Invoke(()=>_impl.WriteProgress(data));
}
public void SetExecutionMode(bool isExecuting) {
Invoke(() => _im... |
<<<<<<<
List<IPackageAssemblyReference> assemblyReferences = Project.GetCompatibleItemsCore(package.AssemblyReferences).ToList();
List<FrameworkAssemblyReference> frameworkReferences = Project.GetCompatibleItemsCore(package.FrameworkAssemblies).ToList();
List<IPackageFile> contentFil... |
<<<<<<<
=======
// Convert files to a list
>>>>>>>
// Convert files to a list
<<<<<<<
// Ignore uninstall transform file during installation
string truncatedPath;
IPackageFileTransformer uninstallTransformer ... |
<<<<<<<
/// <param name="console">The console requesting the initialization.</param>
void Initialize(IConsole console);
=======
void Initialize();
/// <summary>
/// Sets the default runspace from the console
/// </summary>
void SetDefaultRunspace();
>>>>>>>
... |
<<<<<<<
private IPackageRepositoryFactory RepositoryFactory { get; set; }
=======
[Option(typeof(NuGetCommand), "InstallCommandRequireConsent")]
public bool RequireConsent { get; set; }
public IPackageRepositoryFactory RepositoryFactory { get; private set; }
>>>>>>>
private I... |
<<<<<<<
=======
[Fact(Skip = "Bug in Moq when running in multi-threaded paths.")]
public void InstallCommandFromConfigListsAllMessagesInAggregateException()
{
// Arrange
var fileSystem = new MockFileSystem();
fileSystem.AddFile(@"X:\test\packages.config", @"... |
<<<<<<<
public bool ShowDisclaimerHeader {
get {
return true;
}
}
public bool ExecuteInitScriptOnStartup {
get {
return true;
}
}
=======
>>>>>>>
publ... |
<<<<<<<
private readonly IPackageRepository _cacheRepository;
private readonly List<string> _sources = new List<string>();
private static readonly bool _isMonoRuntime = Type.GetType("Mono.Runtime") != null;
private PackageFileTypes _saveOnExpand;
[Option(typeof(NuGetCo... |
<<<<<<<
#if !FAKE_XRM_EASY
[Fact]
public void Can_Filter_Using_Entity_Name_Without_Alias()
{
XrmFakedContext context = new XrmFakedContext();
IOrganizationService service = context.GetOrganizationService();
Entity e = new Entity("contact")
{
... |
<<<<<<<
Dictionary<string, HostInfo> _hostInfos;
=======
internal event EventHandler ActiveHostChanged;
>>>>>>>
<<<<<<<
=======
public IEnumerable<string> Hosts {
get { return HostProviders.Select(p => p.Metadata.HostName); }
}
public string ActiveHost {
... |
<<<<<<<
public CCTransitionFlipAngular() { }
public CCTransitionFlipAngular(float t, CCScene s, tOrientation o) : base(t, s, o)
=======
public CCTransitionFlipAngular(float t, CCScene s, CCTransitionOrientation o) : base(t, s, o)
>>>>>>>
public CCTransitionFlipAngular() { }
... |
<<<<<<<
public CCTexture2D AddImage(Stream imageStream, string assetName)
{
Debug.Assert(imageStream == null, "TextureCache: imageStream MUST not be NULL");
CCTexture2D texture;
lock (m_pDictLock)
{
string pathKey = assetName;... |
<<<<<<<
// public static b2ContactVelocityConstraint Default = b2ContactVelocityConstraint.Create();
=======
>>>>>>>
<<<<<<<
// public static b2ContactPositionConstraint Default = b2ContactPositionConstraint.Create();
=======
>>>>>>>
public static b2ContactPositionConstraint Default = b2Con... |
<<<<<<<
=======
else if (BackupFont != null)
{
if (HasShadow)
{
renderArgs.DrawString(RenderPosition + TextShadowOffset, BackupFont, text, TextColor.BackgroundColor, Scale, Rotation, RotationOrigin);
}
renderArgs.DrawString(Rende... |
<<<<<<<
renderArgs.DrawString(Font, text, Position, TextColor, HasShadow, Rotation, RotationOrigin, Scale);
}
else if (FontRenderer != null)
{
if (HasShadow)
=======
if (HasShadow)
>>>>>>>
renderArgs.DrawString(Font, text, Position, TextColor, HasShadow, Rot... |
<<<<<<<
public UiManager UiManager { get; private set; }
=======
>>>>>>>
public UiManager UiManager { get; private set; }
<<<<<<<
UiManager = new UiManager(this);
=======
IsFixedTimeStep = false;
// _graphics.ToggleFullScreen();
Username = "";
>>>>>>> |
<<<<<<<
using Alex.API.Gui;
using Alex.API.Gui.Elements;
using Alex.API.Gui.Rendering;
=======
using System;
using Alex.Gamestates.Gui;
using Alex.Graphics.Gui;
using Alex.Graphics.Gui.Elements;
using Alex.Graphics.Gui.Rendering;
using Alex.Graphics.UI.Common;
using Alex.Rendering.UI;
using Alex.Utils;
>>>>>>>
us... |
<<<<<<<
Assert.Equal("0.0.0." + repo.Head.Commits.First().GetIdAsVersion().Revision, buildResult.BuildVersion);
Assert.Equal("0.0.0+" + repo.Head.Commits.First().Id.Sha.Substring(0, 10), buildResult.AssemblyInformationalVersion);
=======
Assert.Equal("0.0.1." + repo.Head.Commits.First().GetIdA... |
<<<<<<<
static readonly string[] fsItemKinds = { "FILE", "FOLDER" };
readonly AmazonDrive amazon;
readonly NodeTreeCache nodeTreeCache = new NodeTreeCache();
readonly SmallFileCache smallFileCache;
=======
static readonly string[] fsItemKinds = { "FILE", "FOLDER" };
i... |
<<<<<<<
private readonly IEnumerable<ISectionContentService> _sectionContentServices;
public SectionContentService()
{
_sectionContentServices = Loader.ResolveAll<ISectionContentService>();
}
public override void Add(SectionContent item)
{
base.Add... |
<<<<<<<
&& x.VersionHeightOffset == y.VersionHeightOffset;
=======
&& ReleaseOptions.EqualWithDefaultsComparer.Singleton.Equals(x.ReleaseOrDefault, y.ReleaseOrDefault)
&& x.BuildNumberOffset == y.BuildNumberOffset;
>>>>>>>
&& ReleaseOpti... |
<<<<<<<
this.textBoxGlobalPassword = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.lbFilezillaLocation = new System.Windows.Forms.Label();
=======
this.checkBoxPersistTsHistory = new System.Windows.Forms.CheckBox();
... |
<<<<<<<
this.textBoxRemotePathSesion.Text = Session.RemotePath;
this.textBoxLocalPathSesion.Text = Session.LocalPath;
=======
this.textBoxSPSLScriptFile.Text = Session.SPSLFileName;
>>>>>>>
this.textBoxSPSLScriptFile.Text = Session.SPSLFileName;
... |
<<<<<<<
if (String.IsNullOrEmpty(SingletonSesionPasswordManager.Instance.getMasterPassword()))
{
this.textBoxGlobalPassword.Text = "";
}
else {
this.textBoxGlobalPassword.Text = textSimulePassword;
}
=======
this... |
<<<<<<<
this.label17 = new System.Windows.Forms.Label();
=======
this.lbFilezillaLocation = new System.Windows.Forms.Label();
this.label17 = new System.Windows.Forms.Label();
>>>>>>>
this.label17 = new System.Windows.Forms.Label();
this.lbFilezillaLocation ... |
<<<<<<<
using SuperPutty.Utils;
=======
using System.Drawing.Design;
using System.Drawing;
>>>>>>>
using System.Drawing.Design;
using System.Drawing;
using SuperPutty.Utils;
<<<<<<<
get {
if (String.IsNullOrEmpty(_Password)){
// search if ExtraArgs contains the passwo... |
<<<<<<<
public static double GetDouble(this TableRow row, string id)
{
return AValueWithThisIdExists(row, id) && TheValueIsNotEmpty(row, id)
? Convert.ToDouble(row[id])
: double.MinValue;
}
public static Enum GetEnum<T>(this Tabl... |
<<<<<<<
private ICredentials credentials;
public override Uri ResolveUri(Uri baseUri, string relativeUri)
{
if (baseUri == null)
{
if (relativeUri == null)
throw new ArgumentNullException ("Either baseUri or relativeUri are required.");
if (relativeUri.StartsWith ("resource:")... |
<<<<<<<
_contextManager.InitializeScenarioContext(scenarioInfo);
=======
contextManager.InitializeScenarioContext(scenarioInfo);
}
public void OnScenarioStart()
{
>>>>>>>
_contextManager.InitializeScenarioContext(scenarioInfo);
}
public vo... |
<<<<<<<
public class PluginWithCustomTestThreadDependencies : IRuntimePlugin
{
private readonly Action<ObjectContainer> _specificTestRunnerDependencies;
public PluginWithCustomTestThreadDependencies(Action<ObjectContainer> specificTestRunnerDependencies)
{
... |
<<<<<<<
using FluentAssertions;
using Xunit;
=======
using System.Globalization;
using System.Threading;
using FluentAssertions;
using NUnit.Framework;
>>>>>>>
using FluentAssertions;
using Xunit;
using System.Globalization;
using System.Threading;
<<<<<<<
[Fact]
=======
[Test]
public void Ret... |
<<<<<<<
SpecFlowUnitTestConverter converter = new SpecFlowUnitTestConverter(new NUnitTestConverter(), true);
var compileUnit = converter.GenerateUnitTestFixture(feature, "TestClassName", "Target.Namespace");
=======
SpecFlowUnitTestConverter converter = new SpecFlowUnitTestConverte... |
<<<<<<<
[Fact]
=======
[Test]
public void Should_allow_the_addition_of_default_components_at_the_end_of_the_list_via_generic_overload()
{
var sut = new ServiceComponentList<ITestComponent>();
var registeredFirst = new TestComponentImpl();
var registe... |
<<<<<<<
using FluentAssertions;
using Xunit;
=======
using System.Globalization;
using System.Threading;
using FluentAssertions;
using NUnit.Framework;
>>>>>>>
using FluentAssertions;
using Xunit;
<<<<<<<
[Fact]
public void Returns_a_long_when_passed_a_long_value()
{
var retrie... |
<<<<<<<
[Import]
internal IBindingSkeletonProviderFactory BindingSkeletonProviderFactory = null;
[Import]
internal IBiDiContainerProvider ContainerProvider = null;
=======
>>>>>>>
[Import]
internal IBiDiContainerProvider ContainerProvider = null; |
<<<<<<<
return new TestClassGenerationContext(null, ParserHelper.CreateAnyFeature(new []{ tag }), null, null, null, null, null, null, null, null, null, true, false);
=======
return new TestClassGenerationContext(null, new Feature { Tags = new Tags(new Tag(tag)) }, null, null, null, null, null,... |
<<<<<<<
xslt.Load(xsltReader, xsltSettings, resourceResolver);
=======
resourceResolver = new XmlResourceResolver();
xslt.Load(xsltReader, xsltSettings, resourceResolver);
>>>>>>>
resourceResolver = new XmlResourceResolver();
xslt.Load(xsltReader, x... |
<<<<<<<
=======
using System.Text;
>>>>>>>
<<<<<<<
using Nest.Resolvers;
=======
>>>>>>> |
<<<<<<<
}
public class GeoDistanceAgg : BucketAgg, IGeoDistanceAggregator
{
public Field Field { get; set; }
public string Origin { get; set; }
=======
>>>>>>>
<<<<<<<
Field IGeoDistanceAggregator.Field { get; set; }
=======
FieldName IGeoDistanceAggregation.Field { get; set; }
>>>>>>>
Field IGeoD... |
<<<<<<<
using System.Linq;
=======
using System.Collections.Generic;
using System.Linq;
using System.Text;
>>>>>>>
using System.Collections.Generic;
using System.Linq; |
<<<<<<<
[JsonProperty("percentile_ranks")]
IPercentileRanksAggregaor PercentileRanks { get; set; }
=======
[JsonProperty("top_hits")]
ITopHitsAggregator TopHits { get; set; }
>>>>>>>
[JsonProperty("percentile_ranks")]
IPercentileRanksAggregaor PercentileRanks { get; set; }
[JsonProperty("top_hits")]... |
<<<<<<<
using System.Diagnostics.CodeAnalysis;
#if DOTNETCORE
using System.Net;
using System.Net.Http;
#endif
=======
using System.Threading;
>>>>>>>
using System.Diagnostics.CodeAnalysis;
using System.Threading;
#if DOTNETCORE
using System.Net;
using System.Net.Http;
#endif
<<<<<<<
public static TimeSpan D... |
<<<<<<<
}
}";
Assert.True(json.JsonEquals(expected), json);
}
[Test]
public void FunctionScoreQueryConditionless()
{
var s = new SearchDescriptor<ElasticsearchProject>().From(0).Size(10)
.Query(q => q
.FunctionScore(fs => fs
.Query(qq => qq.Term("", ""))
.Functions(
f... |
<<<<<<<
IList<KeyValuePair<Field, ISort>> ITopHitsAggregator.Sort { get; set; }
=======
IList<KeyValuePair<FieldName, ISort>> ITopHitsAggregation.Sort { get; set; }
>>>>>>>
IList<KeyValuePair<Field, ISort>> ITopHitsAggregation.Sort { get; set; }
<<<<<<<
IEnumerable<Field> ITopHitsAggregator.FieldDataFields ... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.