conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
public static readonly string MINIMUM_PROTOCOL_VERSION = "1.5.3.1";
=======
public static readonly string GITHUB_USERNAME = "ciribob";
public static readonly string GITHUB_REPOSITORY = "DCS-SimpleRadioStandalone";
// Required for all requests against the GitHub API, as per http... |
<<<<<<<
public RiderInitialiseOnLoadCctorDetector(ISolution solution,
SettingsStore settingsStore, UnityCodeInsightFieldUsageProvider fieldUsageProvider,
UnitySolutionTracker solutionTracker, ConnectionTracker connectionTracker,
IconHost iconHost, UnityProblemAnalyzerContex... |
<<<<<<<
if (IsEventHandler(unityApi, method) ||
IsRequiredSignatureMethod(method) ||
IsAnimationEvent(solution, method))
=======
if (IsEventHandler(unityApi, method) || IsRequiredSignatureMethod(method) ||
... |
<<<<<<<
public RiderTypeDetector(ISolution solution, SettingsStore settingsStore, UnityApi unityApi,
AssetIndexingSupport assetIndexingSupport, UnityUsagesCodeVisionProvider usagesCodeVisionProvider, UnityCodeInsightProvider codeInsightProvider, AssetScriptUsagesElementContainer assetScriptUsagesEle... |
<<<<<<<
AdviseRunMethod(model);
=======
GetInitTime(model);
>>>>>>>
AdviseRunMethod(model);
GetInitTime(model);
<<<<<<<
private static void AdviseRunMethod(EditorPluginModel model)
{
model.RunMethodInUnity.Set((lifetime, data) =>
... |
<<<<<<<
public static readonly string MarkId = "Unity.PerformanceCriticalContext";
public static readonly CallGraphRootMarksProviderId ProviderId = new CallGraphRootMarksProviderId(nameof(PerformanceCriticalCodeCallGraphMarksProvider));
=======
public const string MarkId = "Unity.PerformanceCr... |
<<<<<<<
if (!method.GetSolution().GetComponent<UnityYamlSupport>().IsUnityYamlParsingEnabled.Value)
return false;
if (!method.GetSolution().GetComponent<AssetSerializationMode>().IsForceText)
return false;
var cach... |
<<<<<<<
using System;
=======
using JetBrains.Collections;
>>>>>>>
using System;
using JetBrains.Collections;
<<<<<<<
private readonly IDaemonProcess myDaemonProcess;
public YamlCollectUsagesPsiFileProcessor(IDaemonProcess daemonProcess)
{
myDaemonProcess = daemonProcess;
... |
<<<<<<<
using JetBrains.ProjectModel.DataContext;
=======
using JetBrains.ReSharper.Daemon.CSharp.CallGraph;
using JetBrains.ReSharper.Daemon.UsageChecking;
>>>>>>>
<<<<<<<
protected readonly UnityProblemAnalyzerContextSystem ContextSystem;
protected readonly IContextBoundSettingsStore Settings;
... |
<<<<<<<
using JetBrains.ProjectModel.DataContext;
=======
using JetBrains.ReSharper.Daemon.CSharp.CallGraph;
using JetBrains.ReSharper.Daemon.UsageChecking;
>>>>>>>
<<<<<<<
protected readonly ISolution Solution;
=======
protected readonly CallGraphSwaExtensionProvider CallGraphSwaExtensionProvider... |
<<<<<<<
ourModel = new RProperty<EditorPluginModel>();
var logSender = new UnityEventLogSender(ourModel);
logSender.UnityLogRegisterCallBack();
=======
ourLogEventCollector = new UnityEventCollector();
>>>>>>>
ourLogEventCollector = new UnityEventCollector();
<<<<<<<
... |
<<<<<<<
IconHost iconHost, IElementIdProvider provider)
: base(solution, settingsStore, callGraphSwaExtensionProvider, cache, marksProvider, provider)
=======
IconHost iconHost, AssetSerializationMode assetSerializationMode)
: base(solution, swa, settingsStore, callGr... |
<<<<<<<
using JetBrains.ReSharper.Plugins.Unity.CSharp.Daemon.Stages.PerformanceCriticalCodeAnalysis.CallGraph;
using JetBrains.ReSharper.Plugins.Unity.CSharp.Feature.Services.QuickFixes.CallGraph.ExpensiveCodeAnalysis;
=======
>>>>>>>
using JetBrains.ReSharper.Plugins.Unity.CSharp.Feature.Services.QuickFixes.CallGr... |
<<<<<<<
=======
RouteTable.Routes.MapRoute(
name: "DocumentViewerController",
url: "DocumentViewer",
defaults: new { controller = "DocumentViewer", action = "Index", id = UrlParameter.Optional }
);
RouteTable.Routes.MapRou... |
<<<<<<<
{ "shuffle", StandardFunctions.Shuffle },
=======
{ "regex", StandardFunctions.Regex },
{ "lerp", StandardFunctions.Lerp },
{ "clamp", StandardFunctions.Clamp }
>>>>>>>
{ "shuffle", StandardFunctions.Shuffle },
{ "regex", StandardFunctio... |
<<<<<<<
=======
if (History.Count == 0)
{
MessageBox.Show("Please, do a test first.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
Loading.Start(" Obtaining computer configuration...", Bounds);
>>>>>>>
... |
<<<<<<<
=======
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
>>>>>>>
<<<<<<<
RpcEngine.RpcEndpoint? _inboundEndpoint;
OutboundTcpEndpoint? _outboundEndpoint;
FramePump? _pump;
Thread? _pumpThread;
Action? _attachTracerAction;
=======
... |
<<<<<<<
using BrickPile.Core.Mvc;
=======
using BrickPile.Core.Identity;
>>>>>>>
using BrickPile.Core.Identity;
using BrickPile.Core.Mvc;
<<<<<<<
[EditorControls(Disable = true)]
=======
[AllowAnonymous]
>>>>>>>
[EditorControls(Disable = true)]
[AllowAnonymous]
<<<<<<<
public ActionResu... |
<<<<<<<
using System.IO;
using System.Threading.Tasks;
using Microsoft.Bot.Connector;
=======
using System.Threading.Tasks;
#pragma warning disable 649
using Autofac;
>>>>>>>
using System.IO;
using System.Threading.Tasks;
#pragma warning disable 649
using Autofac;
<<<<<<<
using System.Collections.Generic;
===... |
<<<<<<<
/// <summary>
/// Gets the instance of the request factory.
/// </summary>
protected IRequestFactory Factory
{
get { return _factory; }
}
private string GrantType { get; set; }
=======
>>>>>>>
/// <summary>
/// Gets the ... |
<<<<<<<
=======
/// <inheritdoc/>
protected override void PositionContent(Point2D position)
{
foreach (var child in Children)
child.Position(position);
base.PositionContent(position);
}
/// <inheritdoc/>
protected override UIEle... |
<<<<<<<
/// <summary>
/// Gets or sets a value indicating whether the content presenter's content is unconstrained in its width.
/// If this property is <c>true</c>, a value of <see cref="Double.PositiveInfinity"/> is passed to the presenter's
/// content during the measure phase of layo... |
<<<<<<<
/// Occurs when something happens which requires the element to invalidate any
/// cached layout information, such as changing the element's visual or logical parent.
/// </summary>
protected virtual void OnLayoutCacheInvalidated()
{
}
/// <summary>
... |
<<<<<<<
private List<PartSim> dontStageParts;
private List<List<PartSim>> dontStagePartsLists = new List<List<PartSim>>();
private HashSet<PartSim> drainingParts;
private HashSet<int> drainingResources;
=======
private List<PartSim> dontStageParts = new List<PartSim>();
... |
<<<<<<<
log.buf.AppendLine("CreateEngineSims for " + this.name);
for (int i = 0; i < this.part.Modules.Count; i++)
=======
log.buf.AppendLine("CreateEngineSims for " + name);
foreach (PartModule partMod in part.Modules)
>>>>>>>
log.buf.... |
<<<<<<<
=======
//private readonly EncounterSettings Settings;
>>>>>>>
<<<<<<<
if (Mode == EncounterMode.VerticalLine) await SetStick(LEFT, 0, -30000, 2500, token).ConfigureAwait(false);
else if (Mode == EncounterMode.HorizontalLine) await SetStick(LEFT, -30000, 0, 2500, toke... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Text;
using PKHeX.Core;
using PKHeX.Core.AutoMod;
namespace SysBot.Pokemon.Twitch
=======
namespace SysBot.Pokemon.Twitch
>>>>>>>
using System;
using System.Collections.Generic;
using System.Text;
using PKHeX.Core;
using PKHeX.Core.AutoMod;
nam... |
<<<<<<<
private int CompletedEncounters;
private int CompletedDudu;
=======
private int CompletedSeedChecks;
>>>>>>>
private int CompletedEncounters;
private int CompletedSeedChecks; |
<<<<<<<
retv = Inject (retv, binding.Type != InjectionBindingType.VALUE);
if (binding.Type == InjectionBindingType.SINGLETON || binding.Type == InjectionBindingType.VALUE)
{
//prevent double-injection
binding.ToInject(false);
}
=======
retv = Inject (retv, binding.type != InjectionBindin... |
<<<<<<<
object value = getValueInjection(attr.type, attr.name, target);
injectValueIntoPoint(value, target, attr.propertyInfo);
=======
KeyValuePair<Type, PropertyInfo> pair = reflection.setters [a];
object value = getValueInjection(pair.Key, reflection.setterNames[a], target, pair.Value);
injectV... |
<<<<<<<
override protected void resolver(IBinding binding)
{
base.resolver (binding);
if (usePooling && (binding as ICommandBinding).isPooled)
{
if (binding.value != null)
{
object[] values = binding.value as object[];
foreach (Type value in values)
{
if (pools.ContainsKey (va... |
<<<<<<<
override protected IBinding performKeyValueBindings(List<object> keyList, List<object> valueList)
{
IBinding binding = null;
// Bind in order
foreach (object key in keyList)
{
Type keyType = Type.GetType (key as string);
if (keyType == null)
{
throw new BinderException ("A run... |
<<<<<<<
=======
using Windows.Storage;
using Windows.System;
>>>>>>>
using Windows.Storage;
using Windows.System;
<<<<<<<
=======
private void BackButton_Click(object sender, RoutedEventArgs e)
{
BackRequested();
}
private bool WhetherUserRateAppInPast()
{
... |
<<<<<<<
using System.Threading;
=======
using System.Linq;
using System.Threading;
>>>>>>>
using System.Linq;
using System.Threading;
<<<<<<<
DbCommand command = connection.CreateCommand();
command.CommandText = "SELECT name FROM sys.databases ORDER BY database_id ASC";
command.C... |
<<<<<<<
/// Creates a mock db command that returns a predefined result set
/// </summary>
public static DbCommand CreateTestCommand(Dictionary<string, string>[][] data)
{
var commandMock = new Mock<DbCommand> { CallBase = true };
var commandMockSetup = commandMock... |
<<<<<<<
var jobQueueDto = CreateJobQueueDto(database, QueueName1, false);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, false);
var jobQueueDto3 = CreateJobQueueDto(database, QueueName1, false);
=======
var jobQueueDto1 = CreateJobQueueDto(c... |
<<<<<<<
JobDto job = database.Job.Find(Builders<JobDto>.Filter.Eq(_ => _.Id, jobId))
=======
JobDto job = connection.Job.Find(Builders<JobDto>.Filter.Eq(_ => _.Id, ObjectId.Parse(jobId)))
>>>>>>>
JobDto job = database.Job.Find(Builders<JobDto>.Filter.Eq(_ => _.Id, Obje... |
<<<<<<<
internal static readonly TimeSpan DefaultTimeout = TimeSpan.FromSeconds(15);
internal static readonly int WriteRetryLimit = 1000;
=======
// Minimum support for Windows 7 is assumed.
internal static readonly bool IsWin8orLater;
static Utilities()
{
... |
<<<<<<<
this.cheShowPasswordsPowershellMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.saasExportRDMConnectionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
>>>>>>>
this.cheShowPasswordsPowershellMenuItem = new System.Windows.Forms.ToolStr... |
<<<<<<<
private int _userCanceled;
public Http1UpgradeMessageBody(Http1Connection context)
: base(context)
=======
public Http1UpgradeMessageBody(Http1Connection context, bool keepAlive)
: base(context, keepAlive)
>>>>>>>
private int _userCanceled;
pu... |
<<<<<<<
private TestInteropPerson() { }
private static readonly TestInteropPerson defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestInteropPerson defaultInstance = new TestInteropPerson().MakeReadOnly();
>>>>>>>
private TestInteropPerson() { }
private static read... |
<<<<<<<
private CSharpFileOptions() { }
private static readonly CSharpFileOptions defaultInstance = new Builder().BuildPartial();
private static readonly string[] _cSharpFileOptionsFieldNames = new string[] { "add_serializable", "cls_compliance", "code_contracts", "expand_namespace_directories", "file_exten... |
<<<<<<<
private TestMessage() { }
private static readonly TestMessage defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestMessage defaultInstance = new TestMessage().MakeReadOnly();
>>>>>>>
private TestMessage() { }
private static readonly TestMessage defaultInstan... |
<<<<<<<
result.file_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.file_);
>>>>>>>
PrepareBuilder();
result.file_.Add(values);
<<<<<<<
result.dependency_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.depend... |
<<<<<<<
result.options_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.options_);
>>>>>>>
PrepareBuilder();
result.options_.Add(values);
<<<<<<<
result.options_.Add(values);
=======
PrepareBuilder();
base.AddRange(val... |
<<<<<<<
result.repeatedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt32_);
>>>>>>>
PrepareBuilder();
result.repeatedInt32_.Add(values);
<<<<<<<
result.repeatedInt64_.Add(values);
=======
PrepareBuilder();
base.... |
<<<<<<<
private SizeMessage1() { }
private static readonly SizeMessage1 defaultInstance = new Builder().BuildPartial();
=======
private static readonly SizeMessage1 defaultInstance = new SizeMessage1().MakeReadOnly();
>>>>>>>
private SizeMessage1() { }
private static readonly SizeMessage1 default... |
<<<<<<<
private FileDescriptorSet() { }
private static readonly FileDescriptorSet defaultInstance = new Builder().BuildPartial();
=======
private static readonly FileDescriptorSet defaultInstance = new FileDescriptorSet().MakeReadOnly();
>>>>>>>
private FileDescriptorSet() { }
private static read... |
<<<<<<<
result.repeatedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt32_);
>>>>>>>
PrepareBuilder();
result.repeatedInt32_.Add(values);
<<<<<<<
result.repeatedInt64_.Add(values);
=======
PrepareBuilder();
base.... |
<<<<<<<
private TestMessageWithCustomOptions() { }
private static readonly TestMessageWithCustomOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestMessageWithCustomOptions defaultInstance = new TestMessageWithCustomOptions().MakeReadOnly();
>>>>>>>
private Tes... |
<<<<<<<
private TestMessageSet() { }
private static readonly TestMessageSet defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestMessageSet defaultInstance = new TestMessageSet().MakeReadOnly();
>>>>>>>
private TestMessageSet() { }
private static readonly TestMessag... |
<<<<<<<
result.field5_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.field5_);
>>>>>>>
PrepareBuilder();
result.field5_.Add(values);
<<<<<<<
result.field14_.Add(values);
=======
PrepareBuilder();
base.AddRange(values... |
<<<<<<<
result.codes_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.codes_);
>>>>>>>
PrepareBuilder();
result.codes_.Add(values);
<<<<<<<
result.phone_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.phone_);... |
<<<<<<<
result.repeatedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt32_);
>>>>>>>
PrepareBuilder();
result.repeatedInt32_.Add(values);
<<<<<<<
result.repeatedInt64_.Add(values);
=======
PrepareBuilder();
base.... |
<<<<<<<
private TestOptimizedForSize() { }
private static readonly TestOptimizedForSize defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestOptimizedForSize defaultInstance = new TestOptimizedForSize().MakeReadOnly();
>>>>>>>
private TestOptimizedForSize() { }
priv... |
<<<<<<<
result.codes_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.codes_);
>>>>>>>
PrepareBuilder();
result.codes_.Add(values);
<<<<<<<
result.phone_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.phone_);... |
<<<<<<<
result.criteria_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.criteria_);
>>>>>>>
PrepareBuilder();
result.criteria_.Add(values);
<<<<<<<
result.results_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, resu... |
<<<<<<<
writer.WriteLine(" result.{0}_.Add(values);", Name);
=======
writer.WriteLine(" PrepareBuilder();");
writer.WriteLine(" base.AddRange(values, result.{0}_);", Name);
>>>>>>>
writer.WriteLine(" PrepareBuilder();");
writer.WriteLine(" result.{0}_.... |
<<<<<<<
private SearchRequest() { }
private static readonly SearchRequest defaultInstance = new Builder().BuildPartial();
=======
private static readonly SearchRequest defaultInstance = new SearchRequest().MakeReadOnly();
>>>>>>>
private SearchRequest() { }
private static readonly SearchRequest d... |
<<<<<<<
private SpeedMessage1() { }
private static readonly SpeedMessage1 defaultInstance = new Builder().BuildPartial();
=======
private static readonly SpeedMessage1 defaultInstance = new SpeedMessage1().MakeReadOnly();
>>>>>>>
private SpeedMessage1() { }
private static readonly SpeedMessage1 d... |
<<<<<<<
private TestAllTypesLite() { }
private static readonly TestAllTypesLite defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestAllTypesLite defaultInstance = new TestAllTypesLite().MakeReadOnly();
>>>>>>>
private TestAllTypesLite() { }
private static readonly ... |
<<<<<<<
=======
/// <summary>
/// Configure application logger
/// </summary>
/// <returns></returns>
private static ILogger ConfigureLogger()
{
var appConfiguration = GetAppConfiguration();
var loggerConfiguration = new LoggerConfiguration()
... |
<<<<<<<
public static class UnityAttach
{
static readonly Dictionary<string, string> targetNameToProcessName = new Dictionary<string,string>
{
{ "unity editor", "Unity Editor" },
{ "osx player", "OSXPlayer" },
{ "windows player", "WindowsPlayer" },
{ "linux player", "LinuxPlayer" },
{ "ios player"... |
<<<<<<<
// Example: Set AUTO-ACK to true
if (request.Url.IndexOf("autoAcknowledge=true", 0, StringComparison.InvariantCultureIgnoreCase) >= 0)
{
// This request will be auto-acknowledged when taken out of RabbitMQ.
// When there is a problem with SignalR or the OnPremiseConnector, this request may not ... |
<<<<<<<
=======
//TODO : Uncomment to reveal memory leak in debug window : you will see multiple instance of the RefreshableListViewTest page
//CompositionTarget.Rendering += CompositionTarget_Rendering;
>>>>>>>
<<<<<<<
{
CompositionTarg... |
<<<<<<<
// Parse the dataset and create the network
(var training, var test) = DataParser.LoadDatasets();
INeuralNetwork network = NetworkManager.NewSequential(TensorInfo.Image<Alpha8>(28, 28),
CuDnnNetworkLayers.Convolutional(ConvolutionInfo.Default, (5, 5), 20, Acti... |
<<<<<<<
(var training, var test) = DataParser.LoadDatasets();
INeuralNetwork network = NetworkManager.NewSequential(TensorInfo.Image<Alpha8>(28, 28),
=======
// Create the network
INeuralNetwork network = NetworkManager.NewSequential(TensorInfo.CreateForGrayscaleImage(2... |
<<<<<<<
using System;
=======
using System.Drawing;
>>>>>>>
using System;
using System.Drawing;
<<<<<<<
void CreateImgdAndComparePixelData(
byte[] pixelData,
Func<byte[], Imgd> imgdFactory
)
{
var imgd = imgdFactory(pixelData);
var temp = new... |
<<<<<<<
internal static extern unsafe void git_config_free(git_config* cfg);
=======
internal static extern int git_config_find_programdata(GitBuf programdata_config_path);
[DllImport(libgit2)]
internal static extern void git_config_free(IntPtr cfg);
>>>>>>>
internal static e... |
<<<<<<<
internal static extern int git_repository_new(
out RepositorySafeHandle repository);
[DllImport(libgit2)]
internal static extern int git_repository_odb(out ObjectDatabaseSafeHandle odb, RepositorySafeHandle repo);
=======
internal static extern unsafe int git_repos... |
<<<<<<<
public static unsafe ConfigurationEntry<T> git_config_get_entry<T>(ConfigurationHandle config, string key)
=======
public static FilePath git_config_find_programdata()
{
return ConvertPath(NativeMethods.git_config_find_programdata);
}
public static void git... |
<<<<<<<
public static void SetStrictHashVerification(bool enabled)
{
Proxy.git_libgit2_opts_enable_strict_hash_verification(enabled);
}
=======
/// <summary>
/// Enable or disable the libgit2 cache
/// </summary>
/// <param name="enabled">true to e... |
<<<<<<<
internal static Rcomplex SerializeComplexToRComplex(Complex value)
{
var data = new Rcomplex() {r = value.Real, i = value.Imaginary};
return data;
}
=======
/// <summary> Deserialize complex from double.</summary>
///
/// <exception cref... |
<<<<<<<
Assert.Single(second);
Assert.Equal("foo", second[0]);
=======
Assert.AreEqual(1, second.Length);
Assert.AreEqual("foo", second[0]);
Assert.AreEqual("foo", vector[1]);
>>>>>>>
Assert.Single(second);
Assert.Equal("foo", second... |
<<<<<<<
QuickCommander = new QuickCommanderViewModel();
=======
OnSolutionChanged = Observable.FromEventPattern<SolutionChangedEventArgs>(this, nameof(SolutionChanged)).Select(s => s.EventArgs.NewValue);
_taskRunner = new WorkspaceTaskRunner();
>>>>>>>
OnSolutionCha... |
<<<<<<<
#nullable enable
=======
using Microsoft.AspNetCore.Diagnostics;
>>>>>>>
using Microsoft.AspNetCore.Diagnostics;
#nullable enable
<<<<<<<
public RequestDelegate? ExceptionHandler { get; set; }
=======
/// <summary>
/// The <see cref="RequestDelegate" /> that will handle the excep... |
<<<<<<<
if (!_justOpened && intellisenseControl.IsVisible && caretIndex <= intellisenseStartedAt)
{
=======
if (intellisenseControl.IsVisible && caretIndex <= intellisenseStartedAt && e.Key != Key.LeftShift && e.Key != Key.RightShift && e.Key != Key.Up && e.... |
<<<<<<<
public class BreakPointMargin : TextViewMargin
{
private readonly BreakpointStore _manager;
private int previewLine;
private bool previewPointVisible;
static BreakPointMargin()
{
FocusableProperty.OverrideDefaultValue(typeof (BreakPointMargin), true);
}
public BreakPointMargin(BreakpointSt... |
<<<<<<<
=======
{ "TargetExt", Path.GetExtension(project.Executable) },
{ "TargetFileName", Path.GetFileName(project.Executable) },
{ "TargetName", Path.GetFileNameWithoutExtension(project.Executable) },
>>>>>>> |
<<<<<<<
public Task<string> StartWorkflow<TData>(string workflowId, TData data = null)
where TData : class, new()
=======
public Task<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference=null)
where TData : class
>>>>>>>
public Task<strin... |
<<<<<<<
start[60] = 60;
start[62] = 61;
start[40] = 22;
start[41] = 23;
=======
start[40] = 21;
start[41] = 22;
start[60] = 59;
start[62] = 60;
start[46] = 61;
>>>>>>>
start[40] = 21;
start[41] = 22;
start[60] = 60;
start[62] = 61;
<<<<<<<
case "as": t.kind = 13; break;
... |
<<<<<<<
List<Expr> inferredSelectEqualities = new List<Expr>();
foreach (Variable v in path.varToExpr.Keys)
=======
foreach (Variable v in path.varToExpr.Keys.Except(postExistVars))
>>>>>>>
List<Expr> inferredSelectEqualities = new List<Expr>();
foreach (V... |
<<<<<<<
if (d is ModuleDecl) {
if (!(nw is ModuleDecl)) {
reporter.Error(nw, "a module ({0}) must refine another module", nw.Name);
} else if (!(d is AbstractModuleDecl)) {
reporter.Error(nw, "a module ({0}) can only refine abstract modules", nw.Name);
... |
<<<<<<<
List<Block> bs = new List<Block> { blocks[0] };
List<string> ls = new List<string> { blocks[0].Label };
var initBlock = new Block(Token.NoToken, $"{first.proc.Name}_{second.proc.Name}_init", transitionRelationComputation.TriggerAssumes(), new GotoCmd(Token.NoToken... |
<<<<<<<
Contract.Invariant(-1 <= this.bracketIdsInVC && this.bracketIdsInVC <= 1);
Contract.Invariant(cce.NonNullElements(ProverOptions));
=======
Contract.Invariant(-1 <= BracketIdsInVC && BracketIdsInVC < 2);
Contract.Invariant(cce.NonNullElements(this.proverOptions));
>>>>>>>
Contrac... |
<<<<<<<
var domain = linearTypeChecker.linearDomains[domainName];
Formal f = new Formal(Token.NoToken, new TypedIdent(Token.NoToken, domainName + "_in", new MapType(Token.NoToken, new List<TypeVariable>(), new List<Type> { domain.elementType }, Type.Bool)), true);
=======
... |
<<<<<<<
var expr = conjuncts.Length == 1 ? conjuncts[0] : ("(or " + conjuncts.Concat(" ") + ")");
if (!conjuncts.Any())
{
expr = "false";
}
=======
string expr;
if (conjuncts.Length == 0)
expr = "false";
... |
<<<<<<<
/// <summary>
/// Type of futures income
/// </summary>
public enum IncomeType
{
/// <summary>
/// Transfer into account
/// </summary>
Transfer,
/// <summary>
/// Futures welcome bonus
/// </summary>
WelcomeBonus,
/// ... |
<<<<<<<
private void CapturePartitionStateUpdated(string partition, PartitionState oldState, PartitionState newState)
{
if (_partitionStateUpdateManager == null)
_partitionStateUpdateManager = new PartitionStateUpdateManager(_namingBuilder);
_partitionStateUpdateM... |
<<<<<<<
=======
// ready for checkpoint is sent directly to the core projection by a checkpoint object
public void Handle(ProjectionMessage.Projections.ReadyForCheckpoint message)
{
EnsureState(State.Running | State.Paused | State.Stopping | State.FaultedStopping);
if ... |
<<<<<<<
=======
[Test, ExpectedException(typeof (ArgumentNullException))]
public void null_ceckpoint_handler_throws_argument_null_exception()
{
var ps = new EventReorderingProjectionSubscription(
Guid.NewGuid(), Guid.NewGuid(), CheckpointTag.FromPosition(0, -1),
... |
<<<<<<<
var projectionSubscription = message.CheckpointStrategy.CreateProjectionSubscription(_publisher,
fromCheckpointTag, message.CorrelationId, message.SubscriptionId, message.CheckpointUnhandledBytesThreshold,
message.StopOnEof);
=======
var projectionSubsc... |
<<<<<<<
CheckpointStrategy checkpointStrategy, long? checkpointUnhandledBytesThreshold, int processingLagMs,
=======
IHandle<ProjectionSubscriptionMessage.CommittedEventReceived> eventHandler,
IHandle<ProjectionSubscriptionMessage.CheckpointSuggested> checkpointHandler,
... |
<<<<<<<
IHandle<ProjectionMessage.CoreService.Management.Create>,
IHandle<ProjectionMessage.CoreService.Management.Dispose>,
IHandle<ProjectionMessage.Projections.Management.Start>,
... |
<<<<<<<
public void Build(bool buildMemTable = true)
=======
private void ReturnSeqReader(ITransactionFileSequentialReader seqReader)
{
_seqReaders.Push(seqReader);
}
public void Build()
>>>>>>>
private void ReturnSeqReader(ITransactionFileSequentialReader... |
<<<<<<<
using EventStore.Projections.Core.Messages;
using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
=======
>>>>>>> |
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.CreateStream(new Guid(dto.CorrelationId),
envelope,
dto.EventStreamId,
... |
<<<<<<<
=======
private readonly ICompatibilityMode _compatibilityMode;
>>>>>>>
<<<<<<<
/// <param name="compatibilityMode"></param>
public HttpAsyncClient(TimeSpan timeout, HttpMessageHandler clientHandler = null) {
=======
/// <param name="compatibilityMode"></param>
public HttpAsyncClient(TimeSpan ti... |
<<<<<<<
var p = CoreProjection.CreateAndPrepapre(
null, new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler, _defaultProjectionConfig,
_readDispatcher, _writeDispatcher, null);
=======
var p = CoreProjection.CreateAndPrepa... |
<<<<<<<
var vnode = new ClusterVNodeSettings(Guid.NewGuid(),
GetLoopbackForPort(tcpIntPort), null,
GetLoopbackForPort(tcpExtPort), null,
GetLoopbackForPort(http... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.