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 https://developer.github.com/v3/#user-agent-required
public static readonly string GITHUB_USER_AGENT = $"{GITHUB_USERNAME}_{GITHUB_REPOSITORY}";
public static readonly string MINIMUM_PROTOCOL_VERSION = "1.5.0.0";
>>>>>>>
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 https://developer.github.com/v3/#user-agent-required
public static readonly string GITHUB_USER_AGENT = $"{GITHUB_USERNAME}_{GITHUB_REPOSITORY}";
public static readonly string MINIMUM_PROTOCOL_VERSION = "1.5.3.1"; |
<<<<<<<
public RiderInitialiseOnLoadCctorDetector(ISolution solution,
SettingsStore settingsStore, UnityCodeInsightFieldUsageProvider fieldUsageProvider,
UnitySolutionTracker solutionTracker, ConnectionTracker connectionTracker,
IconHost iconHost, UnityProblemAnalyzerContextSystem contextSystem)
: base(solution, settingsStore, contextSystem)
=======
public RiderInitialiseOnLoadCctorDetector(ISolution solution,
CallGraphSwaExtensionProvider callGraphSwaExtensionProvider,
IApplicationWideContextBoundSettingStore settingsStore,
PerformanceCriticalCodeCallGraphMarksProvider marksProvider,
UnityCodeInsightFieldUsageProvider fieldUsageProvider,
UnitySolutionTracker solutionTracker,
ConnectionTracker connectionTracker,
IconHost iconHost, IElementIdProvider elementIdProvider)
: base(solution, callGraphSwaExtensionProvider, settingsStore, marksProvider, elementIdProvider)
>>>>>>>
public RiderInitialiseOnLoadCctorDetector(ISolution solution,
IApplicationWideContextBoundSettingStore settingsStore,
UnityCodeInsightFieldUsageProvider fieldUsageProvider,
UnitySolutionTracker solutionTracker,
ConnectionTracker connectionTracker,
IconHost iconHost, UnityProblemAnalyzerContextSystem contextSystem)
: base(solution, settingsStore, contextSystem)
<<<<<<<
var iconId = element.HasHotIcon(ContextSystem, Settings, kind)
=======
var iconId = element.HasHotIcon(CallGraphSwaExtensionProvider, SettingsStore.BoundSettingsStore, MarksProvider, kind, ElementIdProvider)
>>>>>>>
var iconId = element.HasHotIcon(ContextSystem, SettingsStore.BoundSettingsStore, kind) |
<<<<<<<
if (IsEventHandler(unityApi, method) ||
IsRequiredSignatureMethod(method) ||
IsAnimationEvent(solution, method))
=======
if (IsEventHandler(unityApi, method) || IsRequiredSignatureMethod(method) ||
IsImplicitlyUsedInterfaceMethod(method))
>>>>>>>
if (IsEventHandler(unityApi, method) ||
IsRequiredSignatureMethod(method) ||
IsAnimationEvent(solution, method) ||
IsImplicitlyUsedInterfaceMethod(method)) |
<<<<<<<
public RiderTypeDetector(ISolution solution, SettingsStore settingsStore, UnityApi unityApi,
AssetIndexingSupport assetIndexingSupport, UnityUsagesCodeVisionProvider usagesCodeVisionProvider, UnityCodeInsightProvider codeInsightProvider, AssetScriptUsagesElementContainer assetScriptUsagesElementContainer,
DeferredCacheController deferredCacheController, UnitySolutionTracker solutionTracker, ConnectionTracker connectionTracker,
IconHost iconHost, AssetSerializationMode assetSerializationMode, UnityProblemAnalyzerContextSystem contextSystem)
: base(solution, settingsStore, unityApi, contextSystem)
=======
public RiderTypeDetector(ISolution solution, CallGraphSwaExtensionProvider callGraphSwaExtensionProvider,
IApplicationWideContextBoundSettingStore settingsStore,
PerformanceCriticalCodeCallGraphMarksProvider marksProvider, UnityApi unityApi,
AssetIndexingSupport assetIndexingSupport,
UnityUsagesCodeVisionProvider usagesCodeVisionProvider,
UnityCodeInsightProvider codeInsightProvider,
AssetScriptUsagesElementContainer assetScriptUsagesElementContainer,
DeferredCacheController deferredCacheController, UnitySolutionTracker solutionTracker,
ConnectionTracker connectionTracker,
IconHost iconHost, AssetSerializationMode assetSerializationMode,
IElementIdProvider elementIdProvider)
: base(solution, callGraphSwaExtensionProvider, settingsStore, unityApi, marksProvider, elementIdProvider)
>>>>>>>
public RiderTypeDetector(ISolution solution,
IApplicationWideContextBoundSettingStore settingsStore,
UnityApi unityApi,
AssetIndexingSupport assetIndexingSupport,
UnityUsagesCodeVisionProvider usagesCodeVisionProvider,
UnityCodeInsightProvider codeInsightProvider,
AssetScriptUsagesElementContainer assetScriptUsagesElementContainer,
DeferredCacheController deferredCacheController, UnitySolutionTracker solutionTracker,
ConnectionTracker connectionTracker,
IconHost iconHost, AssetSerializationMode assetSerializationMode,
UnityProblemAnalyzerContextSystem contextSystem)
: base(solution, settingsStore, unityApi, contextSystem)
<<<<<<<
protected override void AddMonoBehaviourHighlighting(IHighlightingConsumer consumer, IClassLikeDeclaration declaration, string text,
string tooltip, DaemonProcessKind kind)
=======
protected override void AddMonoBehaviourHighlighting(IHighlightingConsumer consumer, IClassLikeDeclaration declaration, string text,
string tooltip, DaemonProcessKind kind)
>>>>>>>
protected override void AddMonoBehaviourHighlighting(IHighlightingConsumer consumer, IClassLikeDeclaration declaration, string text,
string tooltip, DaemonProcessKind kind) |
<<<<<<<
AdviseRunMethod(model);
=======
GetInitTime(model);
>>>>>>>
AdviseRunMethod(model);
GetInitTime(model);
<<<<<<<
private static void AdviseRunMethod(EditorPluginModel model)
{
model.RunMethodInUnity.Set((lifetime, data) =>
{
var task = new RdTask<RunMethodResult>();
MainThreadDispatcher.Instance.Queue(() =>
{
if (!lifetime.IsAlive)
{
task.SetCancelled();
return;
}
try
{
ourLogger.Verbose($"Attempt to execute {data.MethodName}");
var assemblies = AppDomain.CurrentDomain.GetAssemblies();
var assembly = assemblies
.FirstOrDefault(a => a.GetName().Name.Equals(data.AssemblyName));
if (assembly == null)
throw new Exception($"Could not find {data.AssemblyName} assembly in current AppDomain");
var type = assembly.GetType(data.TypeName);
if (type == null)
throw new Exception($"Could not find {data.TypeName} in assembly {data.AssemblyName}.");
var method = type.GetMethod(data.MethodName);
if (method == null)
throw new Exception($"Could not find {data.MethodName} in type {data.TypeName}");
method.Invoke(null, null);
task.Set(new RunMethodResult(true, string.Empty, string.Empty));
}
catch (Exception e)
{
ourLogger.Log(LoggingLevel.WARN, $"Execute {data.MethodName} failed.", e);
task.Set(new RunMethodResult(false, e.Message, e.StackTrace));
}
});
return task;
});
}
=======
private static void GetInitTime(EditorPluginModel model)
{
model.LastInitTime.SetValue(ourInitTime);
if (EditorApplication.isPaused || EditorApplication.isPlaying)
model.LastPlayTime.SetValue(ourInitTime);
}
>>>>>>>
private static void GetInitTime(EditorPluginModel model)
{
model.LastInitTime.SetValue(ourInitTime);
if (EditorApplication.isPaused || EditorApplication.isPlaying)
model.LastPlayTime.SetValue(ourInitTime);
}
private static void AdviseRunMethod(EditorPluginModel model)
{
model.RunMethodInUnity.Set((lifetime, data) =>
{
var task = new RdTask<RunMethodResult>();
MainThreadDispatcher.Instance.Queue(() =>
{
if (!lifetime.IsAlive)
{
task.SetCancelled();
return;
}
try
{
ourLogger.Verbose($"Attempt to execute {data.MethodName}");
var assemblies = AppDomain.CurrentDomain.GetAssemblies();
var assembly = assemblies
.FirstOrDefault(a => a.GetName().Name.Equals(data.AssemblyName));
if (assembly == null)
throw new Exception($"Could not find {data.AssemblyName} assembly in current AppDomain");
var type = assembly.GetType(data.TypeName);
if (type == null)
throw new Exception($"Could not find {data.TypeName} in assembly {data.AssemblyName}.");
var method = type.GetMethod(data.MethodName);
if (method == null)
throw new Exception($"Could not find {data.MethodName} in type {data.TypeName}");
method.Invoke(null, null);
task.Set(new RunMethodResult(true, string.Empty, string.Empty));
}
catch (Exception e)
{
ourLogger.Log(LoggingLevel.WARN, $"Execute {data.MethodName} failed.", e);
task.Set(new RunMethodResult(false, e.Message, e.StackTrace));
}
});
return task;
});
} |
<<<<<<<
public static readonly string MarkId = "Unity.PerformanceCriticalContext";
public static readonly CallGraphRootMarksProviderId ProviderId = new CallGraphRootMarksProviderId(nameof(PerformanceCriticalCodeCallGraphMarksProvider));
=======
public const string MarkId = "Unity.PerformanceCriticalContext";
>>>>>>>
public const string MarkId = "Unity.PerformanceCriticalContext";
public static readonly CallGraphRootMarksProviderId ProviderId = new CallGraphRootMarksProviderId(nameof(PerformanceCriticalCodeCallGraphMarksProvider)); |
<<<<<<<
if (!method.GetSolution().GetComponent<UnityYamlSupport>().IsUnityYamlParsingEnabled.Value)
return false;
if (!method.GetSolution().GetComponent<AssetSerializationMode>().IsForceText)
return false;
var cache = method.GetSolution().GetComponent<UnitySceneDataLocalCache>();
=======
var cache = method.GetSolution().GetComponent<UnityEventHandlerReferenceCache>();
>>>>>>>
var cache = method.GetSolution().GetComponent<UnitySceneDataLocalCache>(); |
<<<<<<<
using System;
=======
using JetBrains.Collections;
>>>>>>>
using System;
using JetBrains.Collections;
<<<<<<<
private readonly IDaemonProcess myDaemonProcess;
public YamlCollectUsagesPsiFileProcessor(IDaemonProcess daemonProcess)
{
myDaemonProcess = daemonProcess;
}
=======
>>>>>>>
private readonly IDaemonProcess myDaemonProcess;
public YamlCollectUsagesPsiFileProcessor(IDaemonProcess daemonProcess)
{
myDaemonProcess = daemonProcess;
}
<<<<<<<
public bool IsProcessingFinished(UsageData context)
{
if (myDaemonProcess.InterruptFlag)
throw new OperationCanceledException();
return false;
}
=======
public bool IsProcessingFinished(IScopeProcessor context) => false;
>>>>>>>
public bool IsProcessingFinished(IScopeProcessor context)
{
if (myDaemonProcess.InterruptFlag)
throw new OperationCanceledException();
return false;
}
<<<<<<<
context.SetElementState(declaredElement, UsageState.USED_MASK);
context.AddUsage(declaredElement, UsageCounterKind.Reference);
if (declaredElement is IAccessor accessor && accessor.OwnerMember is IProperty property)
{
context.SetElementState(property, UsageState.NAME_CAPTURED | UsageState.ASSIGNED);
context.AddUsage(property, UsageCounterKind.Reference);
}
=======
usageData.SetElementState(declaredElement, UsageState.USED_MASK);
usageData.AddUsage(declaredElement, ReferenceCounter.Id);
usageData.AddUsage(declaredElement, UnityEditorUsageCounter.Id);
}
foreach (var (_, swaElement) in context.UsageData.SwaExtensionsData)
{
swaElement.ProcessBeforeInterior(element, context);
swaElement.ProcessNode(element, context);
>>>>>>>
usageData.SetElementState(declaredElement, UsageState.USED_MASK);
usageData.AddUsage(declaredElement, ReferenceCounter.Id);
usageData.AddUsage(declaredElement, UnityEditorUsageCounter.Id);
if (declaredElement is IAccessor accessor && accessor.OwnerMember is IProperty property)
{
usageData.SetElementState(property, UsageState.NAME_CAPTURED | UsageState.ASSIGNED);
usageData.AddUsage(property, ReferenceCounter.Id);
usageData.AddUsage(property, UnityEditorUsageCounter.Id);
}
}
foreach (var (_, swaElement) in context.UsageData.SwaExtensionsData)
{
swaElement.ProcessBeforeInterior(element, context);
swaElement.ProcessNode(element, context); |
<<<<<<<
using JetBrains.ProjectModel.DataContext;
=======
using JetBrains.ReSharper.Daemon.CSharp.CallGraph;
using JetBrains.ReSharper.Daemon.UsageChecking;
>>>>>>>
<<<<<<<
protected readonly UnityProblemAnalyzerContextSystem ContextSystem;
protected readonly IContextBoundSettingsStore Settings;
protected UnityDeclarationHighlightingProviderBase(ISolution solution, SettingsStore settingsStore, UnityProblemAnalyzerContextSystem contextSystem)
=======
protected readonly CallGraphSwaExtensionProvider CallGraphSwaExtensionProvider;
protected readonly PerformanceCriticalCodeCallGraphMarksProvider MarksProvider;
protected readonly IApplicationWideContextBoundSettingStore SettingsStore;
protected readonly IElementIdProvider ElementIdProvider;
protected UnityDeclarationHighlightingProviderBase(ISolution solution,
IApplicationWideContextBoundSettingStore settingsStore,
CallGraphSwaExtensionProvider callGraphSwaExtensionProvider,
PerformanceCriticalCodeCallGraphMarksProvider marksProvider,
IElementIdProvider provider)
>>>>>>>
protected readonly UnityProblemAnalyzerContextSystem ContextSystem;
protected readonly IApplicationWideContextBoundSettingStore SettingsStore;
protected UnityDeclarationHighlightingProviderBase(ISolution solution,
IApplicationWideContextBoundSettingStore settingsStore,
UnityProblemAnalyzerContextSystem contextSystem)
<<<<<<<
ContextSystem = contextSystem;
Settings = settingsStore.BindToContextTransient(ContextRange.Smart(solution.ToDataContext()));
=======
CallGraphSwaExtensionProvider = callGraphSwaExtensionProvider;
MarksProvider = marksProvider;
SettingsStore = settingsStore;
ElementIdProvider = provider;
>>>>>>>
SettingsStore = settingsStore;
ContextSystem = contextSystem;
<<<<<<<
consumer.AddHotHighlighting(ContextSystem, Settings, element, text, tooltip, kind, GetActions(element));
=======
consumer.AddHotHighlighting(CallGraphSwaExtensionProvider, element, MarksProvider,
SettingsStore.BoundSettingsStore, text, tooltip, kind, GetActions(element), ElementIdProvider);
>>>>>>>
consumer.AddHotHighlighting(ContextSystem, element, SettingsStore.BoundSettingsStore, text, tooltip, kind, GetActions(element)); |
<<<<<<<
using JetBrains.ProjectModel.DataContext;
=======
using JetBrains.ReSharper.Daemon.CSharp.CallGraph;
using JetBrains.ReSharper.Daemon.UsageChecking;
>>>>>>>
<<<<<<<
protected readonly ISolution Solution;
=======
protected readonly CallGraphSwaExtensionProvider CallGraphSwaExtensionProvider;
protected readonly PerformanceCriticalCodeCallGraphMarksProvider MarksProvider;
protected readonly IApplicationWideContextBoundSettingStore SettingsStore;
>>>>>>>
protected readonly IApplicationWideContextBoundSettingStore SettingsStore;
<<<<<<<
ContextSystem = contextSystem;
Settings = settingsStore.BindToContextTransient(ContextRange.Smart(solution.ToDataContext()));
=======
SettingsStore = settingsStore;
myProvider = provider;
>>>>>>>
SettingsStore = settingsStore;
ContextSystem = contextSystem;
<<<<<<<
consumer.AddHotHighlighting(ContextSystem, Settings, cSharpDeclaration,
text, GetEventFunctionTooltip(eventFunction), kind, GetEventFunctionActions(cSharpDeclaration));
=======
consumer.AddHotHighlighting(CallGraphSwaExtensionProvider, cSharpDeclaration, MarksProvider,
SettingsStore.BoundSettingsStore, text,
GetEventFunctionTooltip(eventFunction), kind, GetEventFunctionActions(cSharpDeclaration),
myProvider);
>>>>>>>
consumer.AddHotHighlighting(ContextSystem, cSharpDeclaration,
SettingsStore.BoundSettingsStore, text,
GetEventFunctionTooltip(eventFunction), kind, GetEventFunctionActions(cSharpDeclaration));
<<<<<<<
consumer.AddHotHighlighting(ContextSystem, Settings, declaration, text,
tooltip, kind, EnumerableCollection<BulbMenuItem>.Empty, true);
=======
consumer.AddHotHighlighting(CallGraphSwaExtensionProvider, declaration, MarksProvider,
SettingsStore.BoundSettingsStore, text, tooltip, kind, EnumerableCollection<BulbMenuItem>.Empty,
myProvider, true);
>>>>>>>
consumer.AddHotHighlighting(ContextSystem, declaration,
SettingsStore.BoundSettingsStore, text, tooltip, kind, EnumerableCollection<BulbMenuItem>.Empty, true); |
<<<<<<<
ourModel = new RProperty<EditorPluginModel>();
var logSender = new UnityEventLogSender(ourModel);
logSender.UnityLogRegisterCallBack();
=======
ourLogEventCollector = new UnityEventCollector();
>>>>>>>
ourLogEventCollector = new UnityEventCollector();
<<<<<<<
private static readonly RProperty<EditorPluginModel> ourModel;
=======
>>>>>>>
private static readonly RProperty<EditorPluginModel> ourModel;
<<<<<<<
private static void AdviseModel(Lifetime connectionLifetime, EditorPluginModel modelValue)
=======
private static void AdviseUnityEditorState(UnityModel modelValue)
>>>>>>>
private static void AdviseModel(EditorPluginModel modelValue)
<<<<<<<
private static EditorPluginModel CreateModel(Protocol protocol, Lifetime lt)
=======
private static void AdviseUnityActions(UnityModel model, Lifetime connectionLifetime)
>>>>>>>
private static void AdviseUnityActions(EditorPluginModel model, Lifetime connectionLifetime)
<<<<<<<
var model = new EditorPluginModel(lt, protocol);
=======
>>>>>>> |
<<<<<<<
IconHost iconHost, IElementIdProvider provider)
: base(solution, settingsStore, callGraphSwaExtensionProvider, cache, marksProvider, provider)
=======
IconHost iconHost, AssetSerializationMode assetSerializationMode)
: base(solution, swa, settingsStore, callGraphSwaExtensionProvider, assetMethodsElementContainer, analyzer)
>>>>>>>
IconHost iconHost, AssetSerializationMode assetSerializationMode, IElementIdProvider provider)
: base(solution, settingsStore, callGraphSwaExtensionProvider, assetMethodsElementContainer, marksProvider, provider)
<<<<<<<
myProvider = provider;
=======
myAssetSerializationMode = assetSerializationMode;
>>>>>>>
myProvider = provider;
myAssetSerializationMode = assetSerializationMode; |
<<<<<<<
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.CallGraph.ExpensiveCodeAnalysis;
<<<<<<<
private readonly IElementIdProvider myProvider;
private readonly ITextControlManager myTextControlManager;
=======
>>>>>>>
private readonly ITextControlManager myTextControlManager; |
<<<<<<<
=======
RouteTable.Routes.MapRoute(
name: "DocumentViewerController",
url: "DocumentViewer",
defaults: new { controller = "DocumentViewer", action = "Index", id = UrlParameter.Optional }
);
RouteTable.Routes.MapRoute(
name: "EditorController",
url: "Editor",
defaults: new { controller = "Editor", action = "CentreHandler", id = UrlParameter.Optional }
);
>>>>>>>
RouteTable.Routes.MapRoute(
name: "EditorController",
url: "Editor",
defaults: new { controller = "Editor", action = "CentreHandler", id = UrlParameter.Optional }
); |
<<<<<<<
{ "shuffle", StandardFunctions.Shuffle },
=======
{ "regex", StandardFunctions.Regex },
{ "lerp", StandardFunctions.Lerp },
{ "clamp", StandardFunctions.Clamp }
>>>>>>>
{ "shuffle", StandardFunctions.Shuffle },
{ "regex", StandardFunctions.Regex },
{ "lerp", StandardFunctions.Lerp },
{ "clamp", StandardFunctions.Clamp } |
<<<<<<<
=======
if (History.Count == 0)
{
MessageBox.Show("Please, do a test first.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
Loading.Start(" Obtaining computer configuration...", Bounds);
>>>>>>>
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;
=======
Func<Stream, Stream> _createLayers = _ => _;
RpcEngine.RpcEndpoint _inboundEndpoint;
OutboundTcpEndpoint _outboundEndpoint;
FramePump _pump;
Thread _pumpThread;
Action _attachTracerAction;
>>>>>>>
Func<Stream, Stream> _createLayers = _ => _;
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 ActionResult Index(SetupViewModel model) {
if (ModelState.IsValid) {
// Attempt to register the user
MembershipCreateStatus createStatus = _membershipService.CreateUser(model.SetupModel.UserName, model.SetupModel.Password, model.SetupModel.Email);
if (createStatus == MembershipCreateStatus.Success) {
_formsService.SignIn(model.SetupModel.UserName, false /* createPersistentCookie */);
// Create the site configuration
using (var session = _store.OpenSession()) {
var configuration = new Configuration {SiteName = model.Configuration.SiteName};
=======
public async Task<ActionResult> Index(SetupViewModel model)
{
if (!ModelState.IsValid)
{
return View();
}
using (var session = _store.OpenSession()) {
using (var userManager = Startup.UserManagerFactory.Invoke(session)) {
var user = new ApplicationUser
{
UserName = model.SetupModel.UserName,
Email = model.SetupModel.Email
};
var result = await userManager.CreateAsync(user, model.SetupModel.Password);
if (result.Succeeded) {
var identity = await userManager.CreateIdentityAsync(user, DefaultAuthenticationTypes.ApplicationCookie);
identity.AddClaim(new Claim(ClaimTypes.Email, user.Email));
GetAuthenticationManager().SignIn(identity);
IConfiguration configuration = new Configuration
{
SiteName = model.Configuration.SiteName
};
>>>>>>>
public async Task<ActionResult> Index(SetupViewModel model)
{
if (!ModelState.IsValid)
{
return View();
}
using (var session = _store.OpenSession()) {
using (var userManager = Startup.UserManagerFactory.Invoke(session)) {
var user = new ApplicationUser
{
UserName = model.SetupModel.UserName,
Email = model.SetupModel.Email
};
var result = await userManager.CreateAsync(user, model.SetupModel.Password);
if (result.Succeeded) {
var identity = await userManager.CreateIdentityAsync(user, DefaultAuthenticationTypes.ApplicationCookie);
identity.AddClaim(new Claim(ClaimTypes.Email, user.Email));
GetAuthenticationManager().SignIn(identity);
Configuration configuration = new Configuration
{
SiteName = model.Configuration.SiteName
}; |
<<<<<<<
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;
=======
using SimpleSandwichOrder = Microsoft.Bot.Sample.SimpleSandwichBot.SandwichOrder;
>>>>>>>
using SimpleSandwichOrder = Microsoft.Bot.Sample.SimpleSandwichBot.SandwichOrder;
<<<<<<<
builder.Configuration.DefaultPrompt.ChoiceFormat = "{1}";
=======
form.Configuration.DefaultPrompt.ChoiceFormat = "{1}";
form.Configuration.DefaultPrompt.ChoiceCase = CaseNormalization.Lower;
form.Configuration.DefaultPrompt.ChoiceParens = BoolDefault.False;
>>>>>>>
form.Configuration.DefaultPrompt.ChoiceFormat = "{1}";
form.Configuration.DefaultPrompt.ChoiceCase = CaseNormalization.Lower;
form.Configuration.DefaultPrompt.ChoiceParens = BoolDefault.False;
<<<<<<<
[Serializable]
public class MyBot : IDialog
{
async Task IDialog.StartAsync(IDialogContext context)
{
context.Call<TopChoice>(new FormDialog<TopChoice>(new TopChoice()), WhatDoYouWant);
}
public async Task WhatDoYouWant(IDialogContext context, IAwaitable<TopChoice> choices)
{
switch ((await choices).Choice.Value)
{
case TopChoices.Joke:
context.Call<ChooseJoke>(new FormDialog<ChooseJoke>(new ChooseJoke(), options: FormOptions.PromptInStart),
TellAJoke);
break;
default:
await context.PostAsync("I don't understand");
context.Call<TopChoice>(new FormDialog<TopChoice>(new TopChoice(), options: FormOptions.PromptInStart), WhatDoYouWant);
break;
}
}
public async Task TellAJoke(IDialogContext context, IAwaitable<ChooseJoke> joke)
{
switch ((await joke).KindOfJoke)
{
case TypeOfJoke.Funny:
await context.PostAsync("Something funny");
break;
case TypeOfJoke.KnockKnock:
await context.PostAsync("Knock-knock...");
break;
}
context.Call<TopChoice>(new FormDialog<TopChoice>(new TopChoice(), options: FormOptions.PromptInStart), WhatDoYouWant);
}
}
public enum TopChoices { Joke, Weather }
[Serializable]
public class TopChoice
{
public TopChoices? Choice;
}
public enum TypeOfJoke { Funny, KnockKnock };
[Serializable]
public class ChooseJoke
{
public TypeOfJoke? KindOfJoke;
}
[Serializable]
public class NullDialog<T> : IDialog<T>
{
public async Task StartAsync(IDialogContext context)
{
context.Done<T>(default(T));
}
}
=======
>>>>>>>
<<<<<<<
var callJoke = Chain
.From(() => new FormDialog<TopChoice>(new TopChoice(), options: FormOptions.PromptInStart))
.ContinueWith<TopChoice, object>(async (context, result) =>
{
switch ((await result).Choice)
{
case TopChoices.Joke: return new FormDialog<ChooseJoke>(new ChooseJoke(), options: FormOptions.PromptInStart);
default:
await context.PostAsync("I don't understand");
return new NullDialog<object>();
}
})
.ContinueWith<object, object>(async (context, result) =>
{
var choice = await result;
if (choice is ChooseJoke)
{
switch ((choice as ChooseJoke).KindOfJoke)
{
case TypeOfJoke.Funny:
await context.PostAsync("Something funny");
break;
case TypeOfJoke.KnockKnock:
await context.PostAsync("Knock-knock...");
break;
}
}
return new NullDialog<object>();
});
// TestValidate();
=======
// TestValidate();
>>>>>>>
// TestValidate(); |
<<<<<<<
/// <summary>
/// Gets the instance of the request factory.
/// </summary>
protected IRequestFactory Factory
{
get { return _factory; }
}
private string GrantType { get; set; }
=======
>>>>>>>
/// <summary>
/// Gets the instance of the request factory.
/// </summary>
protected IRequestFactory Factory
{
get { return _factory; }
}
<<<<<<<
/// <summary>
/// Defines URI of service which issues access code.
/// </summary>
protected abstract Endpoint AccessCodeServiceEndpoint { get; }
/// <summary>
/// Defines URI of service which issues access token.
/// </summary>
protected abstract Endpoint AccessTokenServiceEndpoint { get; }
/// <summary>
/// Defines URI of service which allows to obtain information about user
/// who is currently logged in.
/// </summary>
protected abstract Endpoint UserInfoServiceEndpoint { get; }
private void CheckErrorAndSetState(ILookup<string, string> parameters)
{
const string errorFieldName = "error";
var error = parameters[errorFieldName].ToList();
if (error.Any(x => !string.IsNullOrEmpty(x)))
throw new UnexpectedResponseException(errorFieldName, string.Join("\n", error));
State = string.Join(",", parameters["state"]);
}
/// <summary>
/// Issues query for access token and parses response.
/// </summary>
/// <param name="parameters">Callback request payload (parameters).</param>
private async Task QueryAccessToken(ILookup<string, string> parameters)
{
var client = _factory.CreateClient(AccessTokenServiceEndpoint);
var request = _factory.CreateRequest(AccessTokenServiceEndpoint, HttpMethod.Post);
BeforeGetAccessToken(new BeforeAfterRequestArgs
{
Client = client,
Request = request,
Parameters = parameters,
Configuration = Configuration
});
var response = await client.ExecuteAndVerify(request);
var content = response.GetContent();
AccessToken = ParseAccessTokenResponse(content);
if (GrantType != GrantTypeRefreshTokenKey)
RefreshToken = ParseStringResponse(content, new[] { RefreshTokenKey })[RefreshTokenKey].FirstOrDefault();
TokenType = ParseStringResponse(content, new[] { TokenTypeKey })[TokenTypeKey].FirstOrDefault();
var expiresIn = ParseStringResponse(content, new[] { ExpiresKey })[ExpiresKey].Select(x => Convert.ToInt32(x, 10)).FirstOrDefault();
ExpiresAt = (expiresIn != 0 ? (DateTime?)DateTime.Now.AddSeconds(expiresIn) : null);
AfterGetAccessToken(new BeforeAfterRequestArgs
{
Response = response,
Parameters = parameters
});
}
/// <summary>
/// Parse the access token response using either JSON or form url encoded parameters
/// </summary>
/// <param name="content"></param>
/// <returns></returns>
protected virtual string ParseAccessTokenResponse(string content)
{
return ParseStringResponse(content, AccessTokenKey);
}
=======
>>>>>>> |
<<<<<<<
=======
/// <inheritdoc/>
protected override void PositionContent(Point2D position)
{
foreach (var child in Children)
child.Position(position);
base.PositionContent(position);
}
/// <inheritdoc/>
protected override UIElement GetNextNavUp(UIElement current)
{
if (Orientation == Orientation.Vertical)
{
var ixCurrent = Children.IndexOf(current);
if (ixCurrent > 0)
{
return Children[ixCurrent - 1];
}
}
return null;
}
/// <inheritdoc/>
protected override UIElement GetNextNavDown(UIElement current)
{
if (Orientation == Orientation.Vertical)
{
var ixCurrent = Children.IndexOf(current);
if (ixCurrent + 1 < Children.Count)
{
return Children[ixCurrent + 1];
}
}
return null;
}
/// <inheritdoc/>
protected override UIElement GetNextNavLeft(UIElement current)
{
if (Orientation == Orientation.Horizontal)
{
var ixCurrent = Children.IndexOf(current);
if (ixCurrent > 0)
{
return Children[ixCurrent - 1];
}
}
return null;
}
/// <inheritdoc/>
protected override UIElement GetNextNavRight(UIElement current)
{
if (Orientation == Orientation.Horizontal)
{
var ixCurrent = Children.IndexOf(current);
if (ixCurrent + 1 < Children.Count)
{
return Children[ixCurrent + 1];
}
}
return null;
}
>>>>>>>
/// <inheritdoc/>
protected override UIElement GetNextNavUp(UIElement current)
{
if (Orientation == Orientation.Vertical)
{
var ixCurrent = Children.IndexOf(current);
if (ixCurrent > 0)
{
return Children[ixCurrent - 1];
}
}
return null;
}
/// <inheritdoc/>
protected override UIElement GetNextNavDown(UIElement current)
{
if (Orientation == Orientation.Vertical)
{
var ixCurrent = Children.IndexOf(current);
if (ixCurrent + 1 < Children.Count)
{
return Children[ixCurrent + 1];
}
}
return null;
}
/// <inheritdoc/>
protected override UIElement GetNextNavLeft(UIElement current)
{
if (Orientation == Orientation.Horizontal)
{
var ixCurrent = Children.IndexOf(current);
if (ixCurrent > 0)
{
return Children[ixCurrent - 1];
}
}
return null;
}
/// <inheritdoc/>
protected override UIElement GetNextNavRight(UIElement current)
{
if (Orientation == Orientation.Horizontal)
{
var ixCurrent = Children.IndexOf(current);
if (ixCurrent + 1 < Children.Count)
{
return Children[ixCurrent + 1];
}
}
return null;
} |
<<<<<<<
/// <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 layout.
/// </summary>
public Boolean UnconstrainedWidth
{
get { return GetValue<Boolean>(UnconstrainedWidthProperty); }
set { SetValue<Boolean>(UnconstrainedWidthProperty, value); }
}
/// <summary>
/// Gets or sets a value indicating whether the content presenter's content is unconstrained in its height.
/// 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 layout.
/// </summary>
public Boolean UnconstrainedHeight
{
get { return GetValue<Boolean>(UnconstrainedHeightProperty); }
set { SetValue<Boolean>(UnconstrainedHeightProperty, value); }
}
/// <summary>
/// Identifies the <see cref="UnconstrainedWidth"/> dependency property.
/// </summary>
public static readonly DependencyProperty UnconstrainedWidthProperty = DependencyProperty.Register("UnconstrainedWidth", typeof(Boolean), typeof(ContentPresenter),
new DependencyPropertyMetadata(HandleUnconstrainedWidthChanged, null, DependencyPropertyOptions.AffectsMeasure));
/// <summary>
/// Identifies the <see cref="UnconstrainedHeight"/> dependency property.
/// </summary>
public static readonly DependencyProperty UnconstrainedHeightProperty = DependencyProperty.Register("UnconstrainedHeight", typeof(Boolean), typeof(ContentPresenter),
new DependencyPropertyMetadata(HandleUnconstrainedHeightChanged, null, DependencyPropertyOptions.AffectsMeasure));
=======
/// <inheritdoc/>
>>>>>>>
/// <inheritdoc/>
<<<<<<<
var text = owner.Content as String;
if (text != null)
{
UpdateTextLayoutCache(finalSize);
var textWidth = Display.PixelsToDips(textLayoutResult.ActualWidth);
var textHeight = Display.PixelsToDips(textLayoutResult.ActualHeight);
return new Size2D(textWidth, textHeight);
}
var content = owner.Content as UIElement;
if (content == null)
return Size2D.Zero;
content.Arrange(new RectangleD(0, 0, finalSize.Width, finalSize.Height), options);
return content.RenderSize;
=======
return Control.OnContentPresenterMeasure(availableSize);
>>>>>>>
var text = owner.Content as String;
if (text != null)
{
UpdateTextLayoutCache(finalSize);
var textWidth = Display.PixelsToDips(textLayoutResult.ActualWidth);
var textHeight = Display.PixelsToDips(textLayoutResult.ActualHeight);
return new Size2D(textWidth, textHeight);
}
var content = owner.Content as UIElement;
if (content == null)
return Size2D.Zero;
content.Arrange(new RectangleD(0, 0, finalSize.Width, finalSize.Height), options);
return content.RenderSize;
<<<<<<<
/// <summary>
/// Occurs when the value of the <see cref="UnconstrainedWidth"/> dependency property changes.
/// </summary>
/// <param name="dobj">The object that raised the event.</param>
private static void HandleUnconstrainedWidthChanged(DependencyObject dobj)
{
var presenter = (ContentPresenter)dobj;
presenter.InvalidateMeasure();
}
/// <summary>
/// Occurs when the value of the <see cref="UnconstrainedHeight"/> dependency property changes.
/// </summary>
/// <param name="dobj">The object that raised the event.</param>
private static void HandleUnconstrainedHeightChanged(DependencyObject dobj)
{
var presenter = (ContentPresenter)dobj;
presenter.InvalidateMeasure();
}
/// <summary>
/// Updates the cache which contains the element's parsed text.
/// </summary>
private void UpdateTextParserCache()
{
textParserResult.Clear();
if (View == null)
return;
var owner = Control as ContentControl;
var content = owner.Content;
var contentElement = content as UIElement;
if (content != null && contentElement == null)
{
var contentAsString = content.ToString();
View.Resources.TextRenderer.Parse(contentAsString, textParserResult);
}
InvalidateArrange();
}
/// <summary>
/// Updates the cache which contains the element's laid-out text.
/// </summary>
/// <param name="availableSize">The amount of space in which the element's text can be laid out.</param>
private void UpdateTextLayoutCache(Size2D availableSize)
{
textLayoutResult.Clear();
if (View == null)
return;
var owner = Control as ContentControl;
if (textParserResult.Count > 0 && Font.IsLoaded)
{
var availableWidth = (Int32)Display.DipsToPixels(availableSize.Width);
var availableHeight = (Int32)Display.DipsToPixels(availableSize.Height);
var flags = LayoutUtil.ConvertAlignmentsToTextFlags(owner.HorizontalContentAlignment, owner.VerticalContentAlignment);
var settings = new TextLayoutSettings(Font, availableWidth, availableHeight, flags, FontStyle);
View.Resources.TextRenderer.CalculateLayout(textParserResult, textLayoutResult, settings);
}
}
// Cached parser/layout results for content text.
private readonly TextParserResult textParserResult = new TextParserResult();
private readonly TextLayoutResult textLayoutResult = new TextLayoutResult();
=======
>>>>>>>
/// <summary>
/// Updates the cache which contains the element's parsed text.
/// </summary>
private void UpdateTextParserCache()
{
textParserResult.Clear();
if (View == null)
return;
var owner = Control as ContentControl;
var content = owner.Content;
var contentElement = content as UIElement;
if (content != null && contentElement == null)
{
var contentAsString = content.ToString();
View.Resources.TextRenderer.Parse(contentAsString, textParserResult);
}
InvalidateArrange();
}
/// <summary>
/// Updates the cache which contains the element's laid-out text.
/// </summary>
/// <param name="availableSize">The amount of space in which the element's text can be laid out.</param>
private void UpdateTextLayoutCache(Size2D availableSize)
{
textLayoutResult.Clear();
if (View == null)
return;
var owner = Control as ContentControl;
if (textParserResult.Count > 0 && Font.IsLoaded)
{
var availableWidth = (Int32)Display.DipsToPixels(availableSize.Width);
var availableHeight = (Int32)Display.DipsToPixels(availableSize.Height);
var flags = LayoutUtil.ConvertAlignmentsToTextFlags(owner.HorizontalContentAlignment, owner.VerticalContentAlignment);
var settings = new TextLayoutSettings(Font, availableWidth, availableHeight, flags, FontStyle);
View.Resources.TextRenderer.CalculateLayout(textParserResult, textLayoutResult, settings);
}
}
// Cached parser/layout results for content text.
private readonly TextParserResult textParserResult = new TextParserResult();
private readonly TextLayoutResult textLayoutResult = new TextLayoutResult(); |
<<<<<<<
/// 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>
/// Occurs when the element's logical parent is changed.
/// </summary>
protected virtual void OnLogicalParentChanged()
{
CacheLayoutParameters();
InvalidateStyle();
}
/// <summary>
=======
/// Raises the <see cref="AutoNavChanged"/> event.
/// </summary>
protected virtual void OnAutoNavChanged()
{
var temp = AutoNavChanged;
if (temp != null)
{
temp(this);
}
}
/// <summary>
>>>>>>>
/// Raises the <see cref="AutoNavChanged"/> event.
/// </summary>
protected virtual void OnAutoNavChanged()
{
var temp = AutoNavChanged;
if (temp != null)
{
temp(this);
}
}
/// <summary>
/// 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>
/// Occurs when the element's logical parent is changed.
/// </summary>
protected virtual void OnLogicalParentChanged()
{
CacheLayoutParameters();
InvalidateStyle();
}
/// <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>();
List<List<PartSim>> dontStagePartsLists = new List<List<PartSim>>();
private HashSet<PartSim> drainingParts = new HashSet<PartSim>();
private HashSet<int> drainingResources = new HashSet<int>();
private HashSet<PartSim> decoupledParts = new HashSet<PartSim>();
>>>>>>>
private List<PartSim> dontStageParts;
private List<List<PartSim>> dontStagePartsLists = new List<List<PartSim>>();
private HashSet<PartSim> drainingParts;
private HashSet<int> drainingResources;
<<<<<<<
private double mach;
=======
private double mach;
private float maxMach;
>>>>>>>
private double mach;
private float maxMach;
<<<<<<<
for (int i = 0; i < this.allParts.Count; i++)
{
PartSim partSim = this.allParts[i];
mass += partSim.GetMass();
=======
for (int i = 0; i < allParts.Count; ++i) {
mass += allParts[i].GetMass(currentStage);
>>>>>>>
for (int i = 0; i < allParts.Count; ++i) {
mass += allParts[i].GetMass(currentStage);
<<<<<<<
// Clear the lists for our simulation parts
this.allParts.Clear();
this.allFuelLines.Clear();
this.drainingParts.Clear();
this.allEngines.Clear();
this.activeEngines.Clear();
this.drainingResources.Clear();
=======
// Clear the lists for our simulation parts
allParts.Clear();
allFuelLines.Clear();
drainingParts.Clear();
allEngines.Clear();
activeEngines.Clear();
drainingResources.Clear();
PartSim.ReleaseAll();
EngineSim.ReleaseAll();
AttachNodeSim.ReleaseAll();
>>>>>>>
// Clear the lists for our simulation parts
allParts.Clear();
allFuelLines.Clear();
drainingParts.Clear();
allEngines.Clear();
activeEngines.Clear();
drainingResources.Clear();
<<<<<<<
PartSim partSim = PartSim.New(part, partId, this.atmosphere, log);
=======
PartSim partSim = PartSim.GetPoolObject().Initialise(part, partId, this.atmosphere, log);
>>>>>>>
PartSim partSim = PartSim.New(part, partId, this.atmosphere, log);
<<<<<<<
for (int i = 0; i < this.allParts.Count; i++)
{
PartSim partSim = this.allParts[i];
partSim.ReleasePart();
=======
for (int i = 0; i < allParts.Count; ++i)
{
allParts[i].ReleasePart();
>>>>>>>
for (int i = 0; i < allParts.Count; ++i)
{
allParts[i].ReleasePart();
<<<<<<<
this.BuildDontStageLists(log);
=======
BuildDontStageLists(log);
>>>>>>>
BuildDontStageLists(log);
<<<<<<<
// Make sure we free them all, even if they should all be free already at this point
public void FreePooledObject()
{
//MonoBehaviour.print("FreePooledObject pool size before = " + PartSim.pool.Count() + " for " + allParts.Count + " parts");
foreach (PartSim part in allParts)
{
part.Release();
}
//MonoBehaviour.print("FreePooledObject pool size after = " + PartSim.pool.Count());
//MonoBehaviour.print("FreePooledObject pool size before = " + EngineSim.pool.Count() + " for " + allEngines.Count + " engines");
foreach (EngineSim engine in allEngines)
{
engine.Release();
}
//MonoBehaviour.print("FreePooledObject pool size after = " + EngineSim.pool.Count());
}
private void BuildDontStageLists(LogMsg log)
=======
private void BuildDontStageLists(LogMsg log)
>>>>>>>
// Make sure we free them all, even if they should all be free already at this point
public void FreePooledObject()
{
//MonoBehaviour.print("FreePooledObject pool size before = " + PartSim.pool.Count() + " for " + allParts.Count + " parts");
foreach (PartSim part in allParts)
{
part.Release();
}
//MonoBehaviour.print("FreePooledObject pool size after = " + PartSim.pool.Count());
//MonoBehaviour.print("FreePooledObject pool size before = " + EngineSim.pool.Count() + " for " + allEngines.Count + " engines");
foreach (EngineSim engine in allEngines)
{
engine.Release();
}
//MonoBehaviour.print("FreePooledObject pool size after = " + EngineSim.pool.Count());
}
private void BuildDontStageLists(LogMsg log)
<<<<<<<
=======
dontStagePartsLists.Clear();
>>>>>>>
dontStagePartsLists.Clear();
<<<<<<<
this.totalStageThrustForce.Reset();
=======
this.totalStageThrustForce.Reset();
>>>>>>>
this.totalStageThrustForce.Reset();
<<<<<<<
for (int j = 0; j < engine.appliedForces.Count; j++)
{
AppliedForce f = engine.appliedForces[j];
this.totalStageThrustForce.AddForce(f);
=======
for (int j = 0; j < engine.appliedForces.Count; ++j)
{
this.totalStageThrustForce.AddForce(engine.appliedForces[j]);
>>>>>>>
for (int j = 0; j < engine.appliedForces.Count; ++j)
{
this.totalStageThrustForce.AddForce(engine.appliedForces[j]);
<<<<<<<
for (int j = 0; j < engine.ResourceConsumptions.Types.Count; j++)
{
int type = engine.ResourceConsumptions.Types[j];
this.drainingResources.Add(type);
=======
for (int j = 0; j < engine.ResourceConsumptions.Types.Count; ++j)
{
drainingResources.Add(engine.ResourceConsumptions.Types[j]);
>>>>>>>
for (int j = 0; j < engine.ResourceConsumptions.Types.Count; ++j)
{
drainingResources.Add(engine.ResourceConsumptions.Types[j]);
<<<<<<<
for (int i = 0; i < this.allParts.Count; i++)
{
PartSim partSim = this.allParts[i];
=======
for (int i = 0; i < allParts.Count; ++i) {
>>>>>>>
for (int i = 0; i < allParts.Count; ++i)
{ |
<<<<<<<
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.AppendLine("CreateEngineSims for " + this.name);
for (int i = 0; i < this.part.Modules.Count; i++)
<<<<<<<
Vector3 thrustvec = this.CalculateThrustVector(vectoredThrust ? engine.thrustTransforms : null, log);
EngineSim engineSim = EngineSim.New(
this,
atmosphere,
mach,
engine.maxFuelFlow,
engine.minFuelFlow,
engine.thrustPercentage,
thrustvec,
engine.atmosphereCurve,
engine.atmChangeFlow,
engine.useAtmCurve ? engine.atmCurve : null,
engine.useVelCurve ? engine.velCurve : null,
engine.currentThrottle,
engine.g,
engine.throttleLocked || fullThrust,
engine.propellants,
engine.isOperational,
correctThrust,
engine.thrustTransforms);
=======
Vector3 thrustvec = CalculateThrustVector(vectoredThrust ? engine.thrustTransforms : null, log);
EngineSim engineSim = EngineSim.GetPoolObject().Initialise(this,
atmosphere,
(float)mach,
engine.maxFuelFlow,
engine.minFuelFlow,
engine.thrustPercentage,
thrustvec,
engine.atmosphereCurve,
engine.atmChangeFlow,
engine.useAtmCurve ? engine.atmCurve : null,
engine.useVelCurve ? engine.velCurve : null,
engine.currentThrottle,
engine.throttleLocked || fullThrust,
engine.propellants,
engine.isOperational,
engine.resultingThrust,
engine.thrustTransforms);
>>>>>>>
Vector3 thrustvec = this.CalculateThrustVector(vectoredThrust ? engine.thrustTransforms : null, log);
EngineSim engineSim = EngineSim.New(
this,
atmosphere,
(float)mach,
engine.maxFuelFlow,
engine.minFuelFlow,
engine.thrustPercentage,
thrustvec,
engine.atmosphereCurve,
engine.atmChangeFlow,
engine.useAtmCurve ? engine.atmCurve : null,
engine.useVelCurve ? engine.velCurve : null,
engine.currentThrottle,
engine.g,
engine.throttleLocked || fullThrust,
engine.propellants,
engine.isOperational,
engine.resultingThrust,
engine.thrustTransforms);
<<<<<<<
if (this.hasModuleEngines)
{
List<ModuleEngines> engines = this.part.GetModules<ModuleEngines>(); // only place that still allocate some memory
for (int i = 0; i < engines.Count; i++)
{
ModuleEngines engine = engines[i];
if (log != null)
{
log.buf.AppendLine("Module: " + engine.moduleName);
}
Vector3 thrustvec = this.CalculateThrustVector(vectoredThrust ? engine.thrustTransforms : null, log);
EngineSim engineSim = EngineSim.New(
this,
atmosphere,
mach,
engine.maxFuelFlow,
engine.minFuelFlow,
engine.thrustPercentage,
thrustvec,
engine.atmosphereCurve,
engine.atmChangeFlow,
engine.useAtmCurve ? engine.atmCurve : null,
engine.useVelCurve ? engine.velCurve : null,
engine.currentThrottle,
engine.g,
engine.throttleLocked || fullThrust,
engine.propellants,
engine.isOperational,
correctThrust,
engine.thrustTransforms);
=======
if (hasModuleEngines)
{
List<ModuleEngines> engines = part.GetModules<ModuleEngines>();
for (int i = 0; i < engines.Count; ++i)
{
ModuleEngines engine = engines[i];
if (log != null)
{
log.buf.AppendLine("Module: " + engine.moduleName);
}
Vector3 thrustvec = CalculateThrustVector(vectoredThrust ? engine.thrustTransforms : null, log);
EngineSim engineSim = EngineSim.GetPoolObject().Initialise(this,
atmosphere,
(float)mach,
engine.maxFuelFlow,
engine.minFuelFlow,
engine.thrustPercentage,
thrustvec,
engine.atmosphereCurve,
engine.atmChangeFlow,
engine.useAtmCurve ? engine.atmCurve : null,
engine.useVelCurve ? engine.velCurve : null,
engine.currentThrottle,
engine.throttleLocked || fullThrust,
engine.propellants,
engine.isOperational,
engine.resultingThrust,
engine.thrustTransforms);
>>>>>>>
if (hasModuleEngines)
{
List<ModuleEngines> engines = part.GetModules<ModuleEngines>();
for (int i = 0; i < engines.Count; ++i)
{
ModuleEngines engine = engines[i];
if (log != null)
{
log.buf.AppendLine("Module: " + engine.moduleName);
}
Vector3 thrustvec = this.CalculateThrustVector(vectoredThrust ? engine.thrustTransforms : null, log);
EngineSim engineSim = EngineSim.New(
this,
atmosphere,
(float)mach,
engine.maxFuelFlow,
engine.minFuelFlow,
engine.thrustPercentage,
thrustvec,
engine.atmosphereCurve,
engine.atmChangeFlow,
engine.useAtmCurve ? engine.atmCurve : null,
engine.useVelCurve ? engine.velCurve : null,
engine.currentThrottle,
engine.g,
engine.throttleLocked || fullThrust,
engine.propellants,
engine.isOperational,
engine.resultingThrust,
engine.thrustTransforms);
<<<<<<<
log.buf.AppendLine(indent + "Returning " + (allSources.Count - lastCount) + " fuel target sources (" + this.name + ":" + this.partId + ")");
=======
log.buf.AppendLine(indent + "Returning " + allSources.Count + " fuel target sources (" + name + ":" + partId + ")");
>>>>>>>
log.buf.AppendLine(indent + "Returning " + (allSources.Count - lastCount) + " fuel target sources (" + this.name + ":" + this.partId + ")");
<<<<<<<
if (
!(this.noCrossFeedNodeKey != null && this.noCrossFeedNodeKey.Length > 0 &&
attachSim.id.Contains(this.noCrossFeedNodeKey)))
=======
if (!(noCrossFeedNodeKey != null && noCrossFeedNodeKey.Length > 0 && attachSim.id.Contains(noCrossFeedNodeKey)))
>>>>>>>
if (
!(this.noCrossFeedNodeKey != null && this.noCrossFeedNodeKey.Length > 0 &&
attachSim.id.Contains(this.noCrossFeedNodeKey)))
<<<<<<<
log.buf.AppendLine(indent + "Returning " + (allSources.Count - lastCount) + " attached sources (" + this.name + ":" + this.partId + ")");
=======
log.buf.AppendLine(indent + "Returning " + allSources.Count + " attached sources (" + name + ":" + partId + ")");
>>>>>>>
log.buf.AppendLine(indent + "Returning " + (allSources.Count - lastCount) + " attached sources (" + this.name + ":" + this.partId + ")");
<<<<<<<
lastCount = allSources.Count;
this.parent.GetSourceSet(type, allParts, visited, allSources, log, indent);
if (allSources.Count > lastCount)
=======
allSources = parent.GetSourceSet(type, allParts, visited, log, indent);
if (allSources.Count > 0)
>>>>>>>
lastCount = allSources.Count;
this.parent.GetSourceSet(type, allParts, visited, allSources, log, indent);
if (allSources.Count > lastCount)
<<<<<<<
log.buf.AppendLine(indent + "Returning " + (allSources.Count - lastCount) + " parent sources (" + this.name + ":" + this.partId + ")");
=======
log.buf.AppendLine(indent + "Returning " + allSources.Count + " parent sources (" + name + ":" + partId + ")");
>>>>>>>
log.buf.AppendLine(indent + "Returning " + (allSources.Count - lastCount) + " parent sources (" + this.name + ":" + this.partId + ")");
<<<<<<<
String newPrefix = prefix + " ";
for (int i = 0; i < allParts.Count; i++)
{
PartSim partSim = allParts[i];
if (partSim.parent == this)
{
partSim.DumpPartToBuffer(buffer, newPrefix, allParts);
}
}
=======
return true;
>>>>>>>
return true; |
<<<<<<<
=======
//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, token).ConfigureAwait(false);
await ResetStick();
=======
await SetStick(LEFT, 0, -30000, 2500, token).ConfigureAwait(false);
await ResetStick(token).ConfigureAwait(false);
>>>>>>>
if (Mode == EncounterMode.VerticalLine) await SetStick(LEFT, 0, -30000, 2500, token).ConfigureAwait(false);
else if (Mode == EncounterMode.HorizontalLine) await SetStick(LEFT, -30000, 0, 2500, token).ConfigureAwait(false);
await ResetStick(token).ConfigureAwait(false);
<<<<<<<
while (!token.IsCancellationRequested && Config.NextRoutineType == PokeRoutineType.EncounterBot)
{
await SetStick(LEFT, 0, 20000, 500, token).ConfigureAwait(false);
await SetStick(LEFT, 0, 0, 1000, token).ConfigureAwait(false);
var pk = new PK8(await Connection.ReadBytesAsync(RaidPokemonOffset, 0x158, token).ConfigureAwait(false));
if (pk.Species == 0)
{
Connection.Log("Invalid data detected. Restarting loop.");
// add stuff for recovering
continue;
}
encounterCount++;
Connection.Log($"Encounter: {encounterCount}:{Environment.NewLine}{ShowdownSet.GetShowdownText(pk)}{Environment.NewLine}{Environment.NewLine}");
Counts.AddCompletedLegends();
if (StopCondition(pk))
{
Connection.Log("Result found! Stopping routine execution; re-start the bot(s) to search again.");
return;
}
if (DumpSetting.Dump && !string.IsNullOrEmpty(DumpSetting.DumpFolder))
DumpPokemon(DumpSetting.DumpFolder, "legends", pk);
Connection.Log("Resetting raid by restarting the game");
// Close out of the game
await Click(HOME, 1600, token).ConfigureAwait(false);
await Click(X, 800, token).ConfigureAwait(false);
await Click(A, 4000, token).ConfigureAwait(false); // Closing software prompt
Connection.Log("Closed out of the game!");
// Open game and select profile
await Click(A, 1000, token).ConfigureAwait(false);
await Click(A, 1000, token).ConfigureAwait(false);
Connection.Log("Restarting the game!");
// Switch Logo lag, skip cutscene, game load screen
await Task.Delay(14000, token).ConfigureAwait(false);
await Click(A, 1000, token).ConfigureAwait(false);
await Task.Delay(3500, token).ConfigureAwait(false);
Connection.Log("Back in the overworld!");
await ResetStick();
}
=======
Log("Not yet implemented!");
await ResetStick(token).ConfigureAwait(false);
>>>>>>>
while (!token.IsCancellationRequested && Config.NextRoutineType == PokeRoutineType.EncounterBot)
{
await SetStick(LEFT, 0, 20000, 500, token).ConfigureAwait(false);
await SetStick(LEFT, 0, 0, 1000, token).ConfigureAwait(false);
var pk = new PK8(await Connection.ReadBytesAsync(RaidPokemonOffset, 0x158, token).ConfigureAwait(false));
if (pk.Species == 0)
{
Connection.Log("Invalid data detected. Restarting loop.");
// add stuff for recovering
continue;
}
encounterCount++;
Connection.Log($"Encounter: {encounterCount}:{Environment.NewLine}{ShowdownSet.GetShowdownText(pk)}{Environment.NewLine}{Environment.NewLine}");
Counts.AddCompletedLegends();
if (StopCondition(pk))
{
Connection.Log("Result found! Stopping routine execution; re-start the bot(s) to search again.");
return;
}
if (DumpSetting.Dump && !string.IsNullOrEmpty(DumpSetting.DumpFolder))
DumpPokemon(DumpSetting.DumpFolder, "legends", pk);
Connection.Log("Resetting raid by restarting the game");
// Close out of the game
await Click(HOME, 1600, token).ConfigureAwait(false);
await Click(X, 800, token).ConfigureAwait(false);
await Click(A, 4000, token).ConfigureAwait(false); // Closing software prompt
Connection.Log("Closed out of the game!");
// Open game and select profile
await Click(A, 1000, token).ConfigureAwait(false);
await Click(A, 1000, token).ConfigureAwait(false);
Connection.Log("Restarting the game!");
// Switch Logo lag, skip cutscene, game load screen
await Task.Delay(14000, token).ConfigureAwait(false);
await Click(A, 1000, token).ConfigureAwait(false);
await Task.Delay(3500, token).ConfigureAwait(false);
Connection.Log("Back in the overworld!");
await ResetStick(token).ConfigureAwait(false);
} |
<<<<<<<
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;
namespace SysBot.Pokemon.Twitch |
<<<<<<<
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 != InjectionBindingType.VALUE);
>>>>>>>
retv = Inject (retv, binding.Type != InjectionBindingType.VALUE); |
<<<<<<<
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);
injectValueIntoPoint (value, target, pair.Value);
>>>>>>>
object value = getValueInjection(attr.type, attr.name, target, attr.propertyInfo);
injectValueIntoPoint(value, target, attr.propertyInfo); |
<<<<<<<
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 (value) == false)
{
var myPool = makePoolFromType (value);
pools [value] = myPool;
}
}
}
}
}
virtual protected Pool makePoolFromType(Type type)
{
Type poolType = typeof(Pool<>).MakeGenericType(type);
injectionBinder.Bind (type).To (type);
injectionBinder.Bind<Pool>().To(poolType).ToName (CommandKeys.COMMAND_POOL);
Pool pool = injectionBinder.GetInstance<Pool> (CommandKeys.COMMAND_POOL) as Pool;
injectionBinder.Unbind<Pool> (CommandKeys.COMMAND_POOL);
return pool;
}
=======
new public virtual ICommandBinding GetBinding<T>()
{
return base.GetBinding<T>() as ICommandBinding;
}
>>>>>>>
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 (value) == false)
{
var myPool = makePoolFromType (value);
pools [value] = myPool;
}
}
}
}
}
virtual protected Pool makePoolFromType(Type type)
{
Type poolType = typeof(Pool<>).MakeGenericType(type);
injectionBinder.Bind (type).To (type);
injectionBinder.Bind<Pool>().To(poolType).ToName (CommandKeys.COMMAND_POOL);
Pool pool = injectionBinder.GetInstance<Pool> (CommandKeys.COMMAND_POOL) as Pool;
injectionBinder.Unbind<Pool> (CommandKeys.COMMAND_POOL);
return pool;
}
new public virtual ICommandBinding GetBinding<T>()
{
return base.GetBinding<T>() as ICommandBinding;
} |
<<<<<<<
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 runtime Injection Binding has resolved to null. Did you forget to register its fully-qualified name?\n Key:" + key, BinderExceptionType.RUNTIME_NULL_VALUE);
}
if (binding == null)
{
binding = Bind (keyType);
}
else
{
binding = binding.Bind (keyType);
}
}
foreach (object value in valueList)
{
Type valueType = Type.GetType (value as string);
if (valueType == null)
{
throw new BinderException ("A runtime Injection Binding has resolved to null. Did you forget to register its fully-qualified name?\n Value:" + value, BinderExceptionType.RUNTIME_NULL_VALUE);
}
binding = binding.To (valueType);
}
return binding;
}
/// Additional options: ToSingleton, CrossContext
override protected IBinding addRuntimeOptions(IBinding b, List<object> options)
{
base.addRuntimeOptions (b, options);
IInjectionBinding binding = b as IInjectionBinding;
if (options.IndexOf ("ToSingleton") > -1)
{
binding.ToSingleton ();
}
if (options.IndexOf ("CrossContext") > -1)
{
binding.CrossContext ();
}
return binding;
}
=======
public IInjectionBinding GetSupplier(Type injectionType, Type targetType)
{
if (suppliers.ContainsKey(targetType))
{
if (suppliers [targetType].ContainsKey(injectionType))
{
return suppliers [targetType][injectionType];
}
}
return null;
}
public void Unsupply(Type injectionType, Type targetType)
{
IInjectionBinding binding = GetSupplier(injectionType, targetType);
if (binding != null)
{
suppliers [targetType].Remove(injectionType);
binding.Unsupply(targetType);
}
}
public void Unsupply<T, U>()
{
Unsupply(typeof(T), typeof(U));
}
override protected void resolver(IBinding binding)
{
IInjectionBinding iBinding = binding as IInjectionBinding;
object [] supply = iBinding.GetSupply ();
if (supply != null)
{
foreach (object a in supply)
{
Type aType = a as Type;
if (suppliers.ContainsKey(aType) == false)
{
suppliers[aType] = new Dictionary<Type, IInjectionBinding>();
}
object[] keys = iBinding.key as object[];
foreach (object key in keys)
{
Type keyType = key as Type;
if (suppliers[aType].ContainsKey(keyType as Type) == false)
{
suppliers[aType][keyType] = iBinding;
}
}
}
}
base.resolver (binding);
}
>>>>>>>
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 runtime Injection Binding has resolved to null. Did you forget to register its fully-qualified name?\n Key:" + key, BinderExceptionType.RUNTIME_NULL_VALUE);
}
if (binding == null)
{
binding = Bind (keyType);
}
else
{
binding = binding.Bind (keyType);
}
}
foreach (object value in valueList)
{
Type valueType = Type.GetType (value as string);
if (valueType == null)
{
throw new BinderException ("A runtime Injection Binding has resolved to null. Did you forget to register its fully-qualified name?\n Value:" + value, BinderExceptionType.RUNTIME_NULL_VALUE);
}
binding = binding.To (valueType);
}
return binding;
}
/// Additional options: ToSingleton, CrossContext
override protected IBinding addRuntimeOptions(IBinding b, List<object> options)
{
base.addRuntimeOptions (b, options);
IInjectionBinding binding = b as IInjectionBinding;
if (options.IndexOf ("ToSingleton") > -1)
{
binding.ToSingleton ();
}
if (options.IndexOf ("CrossContext") > -1)
{
binding.CrossContext ();
}
return binding;
}
public IInjectionBinding GetSupplier(Type injectionType, Type targetType)
{
if (suppliers.ContainsKey(targetType))
{
if (suppliers [targetType].ContainsKey(injectionType))
{
return suppliers [targetType][injectionType];
}
}
return null;
}
public void Unsupply(Type injectionType, Type targetType)
{
IInjectionBinding binding = GetSupplier(injectionType, targetType);
if (binding != null)
{
suppliers [targetType].Remove(injectionType);
binding.Unsupply(targetType);
}
}
public void Unsupply<T, U>()
{
Unsupply(typeof(T), typeof(U));
}
override protected void resolver(IBinding binding)
{
IInjectionBinding iBinding = binding as IInjectionBinding;
object [] supply = iBinding.GetSupply ();
if (supply != null)
{
foreach (object a in supply)
{
Type aType = a as Type;
if (suppliers.ContainsKey(aType) == false)
{
suppliers[aType] = new Dictionary<Type, IInjectionBinding>();
}
object[] keys = iBinding.key as object[];
foreach (object key in keys)
{
Type keyType = key as Type;
if (suppliers[aType].ContainsKey(keyType as Type) == false)
{
suppliers[aType][keyType] = iBinding;
}
}
}
}
base.resolver (binding);
} |
<<<<<<<
=======
using Windows.Storage;
using Windows.System;
>>>>>>>
using Windows.Storage;
using Windows.System;
<<<<<<<
=======
private void BackButton_Click(object sender, RoutedEventArgs e)
{
BackRequested();
}
private bool WhetherUserRateAppInPast()
{
return ApplicationData.Current.LocalSettings.Values["IsRated"] is bool;
}
private void RequestRateApplication()
{
if (WhetherUserRateAppInPast())
{
return;
}
else
{
ApplicationData.Current.LocalSettings.Values["IsRated"] = true;
}
RateTip.IsOpen = true;
RateTip.ActionButtonClick += async(s, e) =>
{
var Result = await Context.RequestRateAndReviewAppAsync();
switch (Result.Status)
{
case StoreRateAndReviewStatus.Succeeded:
ShowRateSucceedNotification();
break;
case StoreRateAndReviewStatus.CanceledByUser:
break;
default:
ShowRateErrorNotification();
break;
}
};
}
private void ShowRateSucceedNotification()
{
var Content = new ToastContent()
{
Scenario = ToastScenario.Default,
Launch = "Updating",
Visual = new ToastVisual()
{
BindingGeneric = new ToastBindingGeneric()
{
Children =
{
new AdaptiveText()
{
Text = "评价成功"
},
new AdaptiveText()
{
Text = "感谢您对此App的评价，帮助我们做得更好。"
}
}
}
},
};
ToastNotificationManager.CreateToastNotifier().Show(new ToastNotification(Content.GetXml()));
}
private void ShowRateErrorNotification()
{
var Content = new ToastContent()
{
Scenario = ToastScenario.Default,
Launch = "Updating",
Visual = new ToastVisual()
{
BindingGeneric = new ToastBindingGeneric()
{
Children =
{
new AdaptiveText()
{
Text = "评价失败"
},
new AdaptiveText()
{
Text = "因网络或其他原因而无法进行评价"
}
}
}
},
};
ToastNotificationManager.CreateToastNotifier().Show(new ToastNotification(Content.GetXml()));
}
>>>>>>>
private bool WhetherUserRateAppInPast()
{
return ApplicationData.Current.LocalSettings.Values["IsRated"] is bool;
}
private void RequestRateApplication()
{
if (WhetherUserRateAppInPast())
{
return;
}
else
{
ApplicationData.Current.LocalSettings.Values["IsRated"] = true;
}
RateTip.IsOpen = true;
RateTip.ActionButtonClick += async(s, e) =>
{
var Result = await Context.RequestRateAndReviewAppAsync();
switch (Result.Status)
{
case StoreRateAndReviewStatus.Succeeded:
ShowRateSucceedNotification();
break;
case StoreRateAndReviewStatus.CanceledByUser:
break;
default:
ShowRateErrorNotification();
break;
}
};
}
private void ShowRateSucceedNotification()
{
var Content = new ToastContent()
{
Scenario = ToastScenario.Default,
Launch = "Updating",
Visual = new ToastVisual()
{
BindingGeneric = new ToastBindingGeneric()
{
Children =
{
new AdaptiveText()
{
Text = "评价成功"
},
new AdaptiveText()
{
Text = "感谢您对此App的评价，帮助我们做得更好。"
}
}
}
},
};
ToastNotificationManager.CreateToastNotifier().Show(new ToastNotification(Content.GetXml()));
}
private void ShowRateErrorNotification()
{
var Content = new ToastContent()
{
Scenario = ToastScenario.Default,
Launch = "Updating",
Visual = new ToastVisual()
{
BindingGeneric = new ToastBindingGeneric()
{
Children =
{
new AdaptiveText()
{
Text = "评价失败"
},
new AdaptiveText()
{
Text = "因网络或其他原因而无法进行评价"
}
}
}
},
};
ToastNotificationManager.CreateToastNotifier().Show(new ToastNotification(Content.GetXml()));
} |
<<<<<<<
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.CommandTimeout = 15;
command.CommandType = CommandType.Text;
var reader = command.ExecuteReader();
=======
>>>>>>> |
<<<<<<<
/// 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.Protected()
.Setup<DbDataReader>("ExecuteDbDataReader", It.IsAny<CommandBehavior>());
commandMockSetup.Returns(new TestDbDataReader(data));
return commandMock.Object;
}
/// <summary>
/// Creates a mock db connection that returns predefined data when queried for a result set
/// </summary>
public DbConnection CreateMockDbConnection(Dictionary<string, string>[][] data)
{
var connectionMock = new Mock<DbConnection> { CallBase = true };
connectionMock.Protected()
.Setup<DbCommand>("CreateDbCommand")
.Returns(CreateTestCommand(data));
return connectionMock.Object;
}
/// <summary>
=======
/// Verify that we can connect to the default database when no database name is
/// provided as a parameter.
/// </summary>
[Theory]
[InlineDataAttribute(null)]
[InlineDataAttribute("")]
public void CanConnectWithEmptyDatabaseName(string databaseName)
{
// Connect
var connectionDetails = TestObjects.GetTestConnectionDetails();
connectionDetails.DatabaseName = databaseName;
var connectionResult =
TestObjects.GetTestConnectionService()
.Connect(new ConnectParams()
{
OwnerUri = "file:///my/test/file.sql",
Connection = connectionDetails
});
// check that a connection was created
Assert.NotEmpty(connectionResult.ConnectionId);
}
/// <summary>
>>>>>>>
/// 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.Protected()
.Setup<DbDataReader>("ExecuteDbDataReader", It.IsAny<CommandBehavior>());
commandMockSetup.Returns(new TestDbDataReader(data));
return commandMock.Object;
}
/// <summary>
/// Creates a mock db connection that returns predefined data when queried for a result set
/// </summary>
public DbConnection CreateMockDbConnection(Dictionary<string, string>[][] data)
{
var connectionMock = new Mock<DbConnection> { CallBase = true };
connectionMock.Protected()
.Setup<DbCommand>("CreateDbCommand")
.Returns(CreateTestCommand(data));
return connectionMock.Object;
}
/// Verify that we can connect to the default database when no database name is
/// provided as a parameter.
/// </summary>
[Theory]
[InlineDataAttribute(null)]
[InlineDataAttribute("")]
public void CanConnectWithEmptyDatabaseName(string databaseName)
{
// Connect
var connectionDetails = TestObjects.GetTestConnectionDetails();
connectionDetails.DatabaseName = databaseName;
var connectionResult =
TestObjects.GetTestConnectionService()
.Connect(new ConnectParams()
{
OwnerUri = "file:///my/test/file.sql",
Connection = connectionDetails
});
// check that a connection was created
Assert.NotEmpty(connectionResult.ConnectionId);
}
/// <summary> |
<<<<<<<
var jobQueueDto = CreateJobQueueDto(database, QueueName1, false);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, false);
var jobQueueDto3 = CreateJobQueueDto(database, QueueName1, false);
=======
var jobQueueDto1 = CreateJobQueueDto(connection, QueueName1, false);
var jobQueueDto2 = CreateJobQueueDto(connection, QueueName1, false);
var jobQueueDto3 = CreateJobQueueDto(connection, QueueName1, false);
>>>>>>>
var jobQueueDto1 = CreateJobQueueDto(database, QueueName1, false);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, false);
var jobQueueDto3 = CreateJobQueueDto(database, QueueName1, false);
<<<<<<<
var jobQueueDto = CreateJobQueueDto(database, QueueName1, false);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, false);
CreateJobQueueDto(database, QueueName2, false);
=======
var jobQueueDto1 = CreateJobQueueDto(connection, QueueName1, false);
var jobQueueDto2 = CreateJobQueueDto(connection, QueueName1, false);
CreateJobQueueDto(connection, QueueName2, false);
>>>>>>>
var jobQueueDto1 = CreateJobQueueDto(database, QueueName1, false);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, false);
CreateJobQueueDto(database, QueueName2, false);
<<<<<<<
var jobQueueDto = CreateJobQueueDto(database, QueueName1, false);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, false);
CreateJobQueueDto(database, QueueName1, false);
=======
var jobQueueDto1 = CreateJobQueueDto(connection, QueueName1, false);
var jobQueueDto2 = CreateJobQueueDto(connection, QueueName1, false);
CreateJobQueueDto(connection, QueueName1, false);
>>>>>>>
var jobQueueDto1 = CreateJobQueueDto(database, QueueName1, false);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, false);
CreateJobQueueDto(database, QueueName1, false);
<<<<<<<
var jobQueueDto = CreateJobQueueDto(database, QueueName1, true);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, true);
var jobQueueDto3 = CreateJobQueueDto(database, QueueName1, true);
=======
var jobQueueDto1 = CreateJobQueueDto(connection, QueueName1, true);
var jobQueueDto2 = CreateJobQueueDto(connection, QueueName1, true);
var jobQueueDto3 = CreateJobQueueDto(connection, QueueName1, true);
>>>>>>>
var jobQueueDto1 = CreateJobQueueDto(database, QueueName1, true);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, true);
var jobQueueDto3 = CreateJobQueueDto(database, QueueName1, true);
<<<<<<<
var jobQueueDto = CreateJobQueueDto(database, QueueName1, true);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, true);
CreateJobQueueDto(database, QueueName2, true);
=======
var jobQueueDto1 = CreateJobQueueDto(connection, QueueName1, true);
var jobQueueDto2 = CreateJobQueueDto(connection, QueueName1, true);
CreateJobQueueDto(connection, QueueName2, true);
>>>>>>>
var jobQueueDto1 = CreateJobQueueDto(database, QueueName1, true);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, true);
CreateJobQueueDto(database, QueueName2, true);
<<<<<<<
var jobQueueDto = CreateJobQueueDto(database, QueueName1, true);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, true);
CreateJobQueueDto(database, QueueName1, true);
=======
var jobQueueDto1 = CreateJobQueueDto(connection, QueueName1, true);
var jobQueueDto2 = CreateJobQueueDto(connection, QueueName1, true);
CreateJobQueueDto(connection, QueueName1, true);
>>>>>>>
var jobQueueDto1 = CreateJobQueueDto(database, QueueName1, true);
var jobQueueDto2 = CreateJobQueueDto(database, QueueName1, true);
CreateJobQueueDto(database, QueueName1, true); |
<<<<<<<
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, ObjectId.Parse(jobId)))
<<<<<<<
private static string[] _statisticsStateNames = new[]
=======
private static readonly string[] StatisticsStateNames = new []
>>>>>>>
private static string[] _statisticsStateNames = new[]
<<<<<<<
var countByStates = database.Job.Aggregate()
.Match(Builders<JobDto>.Filter.In(_ => _.StateName, _statisticsStateNames))
=======
var countByStates = connection.Job.Aggregate()
.Match(Builders<JobDto>.Filter.In(_ => _.StateName, StatisticsStateNames))
>>>>>>>
var countByStates = database.Job.Aggregate()
.Match(Builders<JobDto>.Filter.In(_ => _.StateName, _statisticsStateNames))
<<<<<<<
var jobs = database.Job
.Find(Builders<JobDto>.Filter.In(_ => _.Id, jobIds))
=======
var jobObjectIds = jobIds.Select(ObjectId.Parse);
var jobs = connection.Job
.Find(Builders<JobDto>.Filter.In(_ => _.Id, jobObjectIds))
>>>>>>>
var jobObjectIds = jobIds.Select(ObjectId.Parse);
var jobs = database.Job
.Find(Builders<JobDto>.Filter.In(_ => _.Id, jobObjectIds))
<<<<<<<
var jobs = database.Job
.Find(Builders<JobDto>.Filter.In(_ => _.Id, jobIds))
=======
var jobObjectIds = jobIds.Select(ObjectId.Parse);
var jobs = connection.Job
.Find(Builders<JobDto>.Filter.In(_ => _.Id, jobObjectIds))
>>>>>>>
var jobObjectIds = jobIds.Select(ObjectId.Parse);
var jobs = database.Job
.Find(Builders<JobDto>.Filter.In(_ => _.Id, jobObjectIds))
<<<<<<<
private JobList<TDto> GetJobs<TDto>(HangfireDbContext database, int from, int count, string stateName, Func<JobDetailedDto, Job, Dictionary<string, string>, TDto> selector)
=======
private static JobList<TDto> GetJobs<TDto>(HangfireDbContext connection, int from, int count, string stateName, Func<JobDetailedDto, Job, Dictionary<string, string>, TDto> selector)
>>>>>>>
private static JobList<TDto> GetJobs<TDto>(HangfireDbContext database, int from, int count, string stateName, Func<JobDetailedDto, Job, Dictionary<string, string>, TDto> selector) |
<<<<<<<
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()
{
var win8Version = new Version(6, 2);
IsWin8orLater = (Environment.OSVersion.Version >= win8Version);
}
>>>>>>>
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()
{
var win8Version = new Version(6, 2);
IsWin8orLater = (Environment.OSVersion.Version >= win8Version);
} |
<<<<<<<
this.cheShowPasswordsPowershellMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.saasExportRDMConnectionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
>>>>>>>
this.cheShowPasswordsPowershellMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saasExportRDMConnectionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
<<<<<<<
this.cheInstanceContextMenu.Size = new System.Drawing.Size(238, 200);
=======
this.cheInstanceContextMenu.Size = new System.Drawing.Size(238, 172);
>>>>>>>
this.cheInstanceContextMenu.Size = new System.Drawing.Size(238, 200);
<<<<<<<
this.cheShowPasswordsMenuItem.Size = new System.Drawing.Size(279, 26);
=======
this.cheShowPasswordsMenuItem.Size = new System.Drawing.Size(272, 26);
>>>>>>>
this.cheShowPasswordsMenuItem.Size = new System.Drawing.Size(279, 26);
<<<<<<<
this.cheShowRDPDetailsToolStripMenuItem.Size = new System.Drawing.Size(279, 26);
=======
this.cheShowRDPDetailsToolStripMenuItem.Size = new System.Drawing.Size(272, 26);
>>>>>>>
this.cheShowRDPDetailsToolStripMenuItem.Size = new System.Drawing.Size(279, 26);
<<<<<<<
this.cheExportRDCManConnectionsMenuItem.Size = new System.Drawing.Size(279, 26);
=======
this.cheExportRDCManConnectionsMenuItem.Size = new System.Drawing.Size(272, 26);
>>>>>>>
this.cheExportRDCManConnectionsMenuItem.Size = new System.Drawing.Size(279, 26);
<<<<<<<
this.saasTabPage.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.saasTabPage.Size = new System.Drawing.Size(1306, 597);
=======
this.saasTabPage.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.saasTabPage.Size = new System.Drawing.Size(1306, 594);
>>>>>>>
this.saasTabPage.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.saasTabPage.Size = new System.Drawing.Size(1306, 597);
<<<<<<<
this.saasDataGridView.Size = new System.Drawing.Size(1300, 593);
=======
this.saasDataGridView.Size = new System.Drawing.Size(1300, 590);
>>>>>>>
this.saasDataGridView.Size = new System.Drawing.Size(1300, 593);
<<<<<<<
this.saasInstanceContextMenu.Size = new System.Drawing.Size(238, 148);
=======
this.saasInstanceContextMenu.Size = new System.Drawing.Size(238, 176);
>>>>>>>
this.saasInstanceContextMenu.Size = new System.Drawing.Size(238, 148);
<<<<<<<
// cheShowPasswordsPowershellMenuItem
//
this.cheShowPasswordsPowershellMenuItem.Name = "cheShowPasswordsPowershellMenuItem";
this.cheShowPasswordsPowershellMenuItem.Size = new System.Drawing.Size(279, 26);
this.cheShowPasswordsPowershellMenuItem.Text = "Show passwords (powershell)";
this.cheShowPasswordsPowershellMenuItem.Click += new System.EventHandler(this.cheShowPasswordsPowershellMenuItem_Click);
//
=======
// saasExportRDMConnectionsToolStripMenuItem
//
this.saasExportRDMConnectionsToolStripMenuItem.Name = "saasExportRDMConnectionsToolStripMenuItem";
this.saasExportRDMConnectionsToolStripMenuItem.Size = new System.Drawing.Size(272, 26);
this.saasExportRDMConnectionsToolStripMenuItem.Text = "Export RDM connections";
this.saasExportRDMConnectionsToolStripMenuItem.Click += new System.EventHandler(this.saasExportRDMConnectionsToolStripMenuItem_Click);
//
>>>>>>>
// cheShowPasswordsPowershellMenuItem
//
this.cheShowPasswordsPowershellMenuItem.Name = "cheShowPasswordsPowershellMenuItem";
this.cheShowPasswordsPowershellMenuItem.Size = new System.Drawing.Size(279, 26);
this.cheShowPasswordsPowershellMenuItem.Text = "Show passwords (powershell)";
this.cheShowPasswordsPowershellMenuItem.Click += new System.EventHandler(this.cheShowPasswordsPowershellMenuItem_Click);
// saasExportRDMConnectionsToolStripMenuItem
//
this.saasExportRDMConnectionsToolStripMenuItem.Name = "saasExportRDMConnectionsToolStripMenuItem";
this.saasExportRDMConnectionsToolStripMenuItem.Size = new System.Drawing.Size(272, 26);
this.saasExportRDMConnectionsToolStripMenuItem.Text = "Export RDM connections";
this.saasExportRDMConnectionsToolStripMenuItem.Click += new System.EventHandler(this.saasExportRDMConnectionsToolStripMenuItem_Click);
//
<<<<<<<
private System.Windows.Forms.ToolStripMenuItem cheShowPasswordsPowershellMenuItem;
=======
private System.Windows.Forms.ToolStripMenuItem cheExportRDMConnectionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem saasExportRDMConnectionsToolStripMenuItem;
>>>>>>>
private System.Windows.Forms.ToolStripMenuItem cheShowPasswordsPowershellMenuItem;
private System.Windows.Forms.ToolStripMenuItem cheExportRDMConnectionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem saasExportRDMConnectionsToolStripMenuItem; |
<<<<<<<
private int _userCanceled;
public Http1UpgradeMessageBody(Http1Connection context)
: base(context)
=======
public Http1UpgradeMessageBody(Http1Connection context, bool keepAlive)
: base(context, keepAlive)
>>>>>>>
private int _userCanceled;
public Http1UpgradeMessageBody(Http1Connection context, bool keepAlive)
: base(context, keepAlive)
<<<<<<<
public override ValueTask<ReadResult> ReadAsync(CancellationToken cancellationToken = default)
{
ThrowIfCompleted();
return ReadAsyncInternal(cancellationToken);
}
public override bool TryRead(out ReadResult result)
{
ThrowIfCompleted();
return TryReadInternal(out result);
}
public override void AdvanceTo(SequencePosition consumed)
{
_context.Input.AdvanceTo(consumed);
}
=======
>>>>>>>
public override ValueTask<ReadResult> ReadAsync(CancellationToken cancellationToken = default)
{
ThrowIfCompleted();
return ReadAsyncInternal(cancellationToken);
}
public override bool TryRead(out ReadResult result)
{
ThrowIfCompleted();
return TryReadInternal(out result);
}
public override void AdvanceTo(SequencePosition consumed)
{
_context.Input.AdvanceTo(consumed);
} |
<<<<<<<
private TestInteropPerson() { }
private static readonly TestInteropPerson defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestInteropPerson defaultInstance = new TestInteropPerson().MakeReadOnly();
>>>>>>>
private TestInteropPerson() { }
private static readonly TestInteropPerson defaultInstance = new TestInteropPerson().MakeReadOnly();
<<<<<<<
private PhoneNumber() { }
private static readonly PhoneNumber defaultInstance = new Builder().BuildPartial();
=======
private static readonly PhoneNumber defaultInstance = new PhoneNumber().MakeReadOnly();
>>>>>>>
private PhoneNumber() { }
private static readonly PhoneNumber defaultInstance = new PhoneNumber().MakeReadOnly();
<<<<<<<
private Addresses() { }
private static readonly Addresses defaultInstance = new Builder().BuildPartial();
=======
private static readonly Addresses defaultInstance = new Addresses().MakeReadOnly();
>>>>>>>
private Addresses() { }
private static readonly Addresses defaultInstance = new Addresses().MakeReadOnly();
<<<<<<<
private TestInteropEmployeeId() { }
private static readonly TestInteropEmployeeId defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestInteropEmployeeId defaultInstance = new TestInteropEmployeeId().MakeReadOnly();
>>>>>>>
private TestInteropEmployeeId() { }
private static readonly TestInteropEmployeeId defaultInstance = new TestInteropEmployeeId().MakeReadOnly();
<<<<<<<
private TestMissingFieldsA() { }
private static readonly TestMissingFieldsA defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestMissingFieldsA defaultInstance = new TestMissingFieldsA().MakeReadOnly();
>>>>>>>
private TestMissingFieldsA() { }
private static readonly TestMissingFieldsA defaultInstance = new TestMissingFieldsA().MakeReadOnly();
<<<<<<<
private SubA() { }
private static readonly SubA defaultInstance = new Builder().BuildPartial();
=======
private static readonly SubA defaultInstance = new SubA().MakeReadOnly();
>>>>>>>
private SubA() { }
private static readonly SubA defaultInstance = new SubA().MakeReadOnly();
<<<<<<<
private TestMissingFieldsB() { }
private static readonly TestMissingFieldsB defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestMissingFieldsB defaultInstance = new TestMissingFieldsB().MakeReadOnly();
>>>>>>>
private TestMissingFieldsB() { }
private static readonly TestMissingFieldsB defaultInstance = new TestMissingFieldsB().MakeReadOnly();
<<<<<<<
private SubB() { }
private static readonly SubB defaultInstance = new Builder().BuildPartial();
=======
private static readonly SubB defaultInstance = new SubB().MakeReadOnly();
>>>>>>>
private SubB() { }
private static readonly SubB defaultInstance = new SubB().MakeReadOnly(); |
<<<<<<<
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_extension", "ignore_google_protobuf", "multiple_files", "namespace", "nest_classes", "output_directory", "public_classes", "service_generator_type", "umbrella_classname", "umbrella_namespace" };
private static readonly uint[] _cSharpFileOptionsFieldTags = new uint[] { 72, 64, 48, 56, 1770, 1792, 32, 10, 40, 1786, 24, 1800, 18, 1778 };
=======
private static readonly CSharpFileOptions defaultInstance = new CSharpFileOptions().MakeReadOnly();
private static readonly string[] _cSharpFileOptionsFieldNames = new string[] { "cls_compliance", "code_contracts", "expand_namespace_directories", "file_extension", "ignore_google_protobuf", "multiple_files", "namespace", "nest_classes", "output_directory", "public_classes", "service_generator_type", "umbrella_classname", "umbrella_namespace" };
private static readonly uint[] _cSharpFileOptionsFieldTags = new uint[] { 64, 48, 56, 1770, 1792, 32, 10, 40, 1786, 24, 1800, 18, 1778 };
>>>>>>>
private CSharpFileOptions() { }
private static readonly CSharpFileOptions defaultInstance = new CSharpFileOptions().MakeReadOnly();
private static readonly string[] _cSharpFileOptionsFieldNames = new string[] { "add_serializable", "cls_compliance", "code_contracts", "expand_namespace_directories", "file_extension", "ignore_google_protobuf", "multiple_files", "namespace", "nest_classes", "output_directory", "public_classes", "service_generator_type", "umbrella_classname", "umbrella_namespace" };
private static readonly uint[] _cSharpFileOptionsFieldTags = new uint[] { 72, 64, 48, 56, 1770, 1792, 32, 10, 40, 1786, 24, 1800, 18, 1778 };
<<<<<<<
private CSharpFieldOptions() { }
private static readonly CSharpFieldOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly CSharpFieldOptions defaultInstance = new CSharpFieldOptions().MakeReadOnly();
>>>>>>>
private CSharpFieldOptions() { }
private static readonly CSharpFieldOptions defaultInstance = new CSharpFieldOptions().MakeReadOnly();
<<<<<<<
private CSharpServiceOptions() { }
private static readonly CSharpServiceOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly CSharpServiceOptions defaultInstance = new CSharpServiceOptions().MakeReadOnly();
>>>>>>>
private CSharpServiceOptions() { }
private static readonly CSharpServiceOptions defaultInstance = new CSharpServiceOptions().MakeReadOnly();
<<<<<<<
private CSharpMethodOptions() { }
private static readonly CSharpMethodOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly CSharpMethodOptions defaultInstance = new CSharpMethodOptions().MakeReadOnly();
>>>>>>>
private CSharpMethodOptions() { }
private static readonly CSharpMethodOptions defaultInstance = new CSharpMethodOptions().MakeReadOnly(); |
<<<<<<<
private TestMessage() { }
private static readonly TestMessage defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestMessage defaultInstance = new TestMessage().MakeReadOnly();
>>>>>>>
private TestMessage() { }
private static readonly TestMessage defaultInstance = new TestMessage().MakeReadOnly(); |
<<<<<<<
result.file_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.file_);
>>>>>>>
PrepareBuilder();
result.file_.Add(values);
<<<<<<<
result.dependency_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.dependency_);
>>>>>>>
PrepareBuilder();
result.dependency_.Add(values);
<<<<<<<
result.messageType_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.messageType_);
>>>>>>>
PrepareBuilder();
result.messageType_.Add(values);
<<<<<<<
result.enumType_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.enumType_);
>>>>>>>
PrepareBuilder();
result.enumType_.Add(values);
<<<<<<<
result.service_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.service_);
>>>>>>>
PrepareBuilder();
result.service_.Add(values);
<<<<<<<
result.extension_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.extension_);
>>>>>>>
PrepareBuilder();
result.extension_.Add(values);
<<<<<<<
result.field_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.field_);
>>>>>>>
PrepareBuilder();
result.field_.Add(values);
<<<<<<<
result.extension_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.extension_);
>>>>>>>
PrepareBuilder();
result.extension_.Add(values);
<<<<<<<
result.nestedType_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.nestedType_);
>>>>>>>
PrepareBuilder();
result.nestedType_.Add(values);
<<<<<<<
result.enumType_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.enumType_);
>>>>>>>
PrepareBuilder();
result.enumType_.Add(values);
<<<<<<<
result.extensionRange_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.extensionRange_);
>>>>>>>
PrepareBuilder();
result.extensionRange_.Add(values);
<<<<<<<
result.value_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.value_);
>>>>>>>
PrepareBuilder();
result.value_.Add(values);
<<<<<<<
result.method_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.method_);
>>>>>>>
PrepareBuilder();
result.method_.Add(values);
<<<<<<<
result.uninterpretedOption_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.uninterpretedOption_);
>>>>>>>
PrepareBuilder();
result.uninterpretedOption_.Add(values);
<<<<<<<
result.uninterpretedOption_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.uninterpretedOption_);
>>>>>>>
PrepareBuilder();
result.uninterpretedOption_.Add(values);
<<<<<<<
result.uninterpretedOption_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.uninterpretedOption_);
>>>>>>>
PrepareBuilder();
result.uninterpretedOption_.Add(values);
<<<<<<<
result.uninterpretedOption_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.uninterpretedOption_);
>>>>>>>
PrepareBuilder();
result.uninterpretedOption_.Add(values);
<<<<<<<
result.uninterpretedOption_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.uninterpretedOption_);
>>>>>>>
PrepareBuilder();
result.uninterpretedOption_.Add(values);
<<<<<<<
result.uninterpretedOption_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.uninterpretedOption_);
>>>>>>>
PrepareBuilder();
result.uninterpretedOption_.Add(values);
<<<<<<<
result.uninterpretedOption_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.uninterpretedOption_);
>>>>>>>
PrepareBuilder();
result.uninterpretedOption_.Add(values);
<<<<<<<
result.name_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.name_);
>>>>>>>
PrepareBuilder();
result.name_.Add(values); |
<<<<<<<
result.options_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.options_);
>>>>>>>
PrepareBuilder();
result.options_.Add(values);
<<<<<<<
result.options_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.options_);
>>>>>>>
PrepareBuilder();
result.options_.Add(values);
<<<<<<<
result.numbers_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.numbers_);
>>>>>>>
PrepareBuilder();
result.numbers_.Add(values);
<<<<<<<
result.textlines_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.textlines_);
>>>>>>>
PrepareBuilder();
result.textlines_.Add(values);
<<<<<<<
result.children_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.children_);
>>>>>>>
PrepareBuilder();
result.children_.Add(values); |
<<<<<<<
result.repeatedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt32_);
>>>>>>>
PrepareBuilder();
result.repeatedInt32_.Add(values);
<<<<<<<
result.repeatedInt64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt64_);
>>>>>>>
PrepareBuilder();
result.repeatedInt64_.Add(values);
<<<<<<<
result.repeatedUint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedUint32_);
>>>>>>>
PrepareBuilder();
result.repeatedUint32_.Add(values);
<<<<<<<
result.repeatedUint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedUint64_);
>>>>>>>
PrepareBuilder();
result.repeatedUint64_.Add(values);
<<<<<<<
result.repeatedSint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSint32_);
>>>>>>>
PrepareBuilder();
result.repeatedSint32_.Add(values);
<<<<<<<
result.repeatedSint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSint64_);
>>>>>>>
PrepareBuilder();
result.repeatedSint64_.Add(values);
<<<<<<<
result.repeatedFixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFixed32_);
>>>>>>>
PrepareBuilder();
result.repeatedFixed32_.Add(values);
<<<<<<<
result.repeatedFixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFixed64_);
>>>>>>>
PrepareBuilder();
result.repeatedFixed64_.Add(values);
<<<<<<<
result.repeatedSfixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSfixed32_);
>>>>>>>
PrepareBuilder();
result.repeatedSfixed32_.Add(values);
<<<<<<<
result.repeatedSfixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSfixed64_);
>>>>>>>
PrepareBuilder();
result.repeatedSfixed64_.Add(values);
<<<<<<<
result.repeatedFloat_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFloat_);
>>>>>>>
PrepareBuilder();
result.repeatedFloat_.Add(values);
<<<<<<<
result.repeatedDouble_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedDouble_);
>>>>>>>
PrepareBuilder();
result.repeatedDouble_.Add(values);
<<<<<<<
result.repeatedBool_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedBool_);
>>>>>>>
PrepareBuilder();
result.repeatedBool_.Add(values);
<<<<<<<
result.repeatedString_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedString_);
>>>>>>>
PrepareBuilder();
result.repeatedString_.Add(values);
<<<<<<<
result.repeatedBytes_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedBytes_);
>>>>>>>
PrepareBuilder();
result.repeatedBytes_.Add(values);
<<<<<<<
result.repeatedGroup_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedGroup_);
>>>>>>>
PrepareBuilder();
result.repeatedGroup_.Add(values);
<<<<<<<
result.repeatedNestedMessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedNestedMessage_);
>>>>>>>
PrepareBuilder();
result.repeatedNestedMessage_.Add(values);
<<<<<<<
result.repeatedForeignMessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedForeignMessage_);
>>>>>>>
PrepareBuilder();
result.repeatedForeignMessage_.Add(values);
<<<<<<<
result.repeatedImportMessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedImportMessage_);
>>>>>>>
PrepareBuilder();
result.repeatedImportMessage_.Add(values);
<<<<<<<
result.repeatedNestedEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedNestedEnum_);
>>>>>>>
PrepareBuilder();
result.repeatedNestedEnum_.Add(values);
<<<<<<<
result.repeatedForeignEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedForeignEnum_);
>>>>>>>
PrepareBuilder();
result.repeatedForeignEnum_.Add(values);
<<<<<<<
result.repeatedImportEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedImportEnum_);
>>>>>>>
PrepareBuilder();
result.repeatedImportEnum_.Add(values);
<<<<<<<
result.repeatedStringPiece_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedStringPiece_);
>>>>>>>
PrepareBuilder();
result.repeatedStringPiece_.Add(values);
<<<<<<<
result.repeatedCord_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedCord_);
>>>>>>>
PrepareBuilder();
result.repeatedCord_.Add(values);
<<<<<<<
result.repeatedMessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedMessage_);
>>>>>>>
PrepareBuilder();
result.repeatedMessage_.Add(values);
<<<<<<<
result.nestedmessageRepeatedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.nestedmessageRepeatedInt32_);
>>>>>>>
PrepareBuilder();
result.nestedmessageRepeatedInt32_.Add(values);
<<<<<<<
result.nestedmessageRepeatedForeignmessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.nestedmessageRepeatedForeignmessage_);
>>>>>>>
PrepareBuilder();
result.nestedmessageRepeatedForeignmessage_.Add(values);
<<<<<<<
result.repeatedPrimitiveField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedPrimitiveField_);
>>>>>>>
PrepareBuilder();
result.repeatedPrimitiveField_.Add(values);
<<<<<<<
result.repeatedStringField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedStringField_);
>>>>>>>
PrepareBuilder();
result.repeatedStringField_.Add(values);
<<<<<<<
result.repeatedEnumField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedEnumField_);
>>>>>>>
PrepareBuilder();
result.repeatedEnumField_.Add(values);
<<<<<<<
result.repeatedMessageField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedMessageField_);
>>>>>>>
PrepareBuilder();
result.repeatedMessageField_.Add(values);
<<<<<<<
result.repeatedStringPieceField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedStringPieceField_);
>>>>>>>
PrepareBuilder();
result.repeatedStringPieceField_.Add(values);
<<<<<<<
result.repeatedCordField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedCordField_);
>>>>>>>
PrepareBuilder();
result.repeatedCordField_.Add(values);
<<<<<<<
result.packedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedInt32_);
>>>>>>>
PrepareBuilder();
result.packedInt32_.Add(values);
<<<<<<<
result.packedInt64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedInt64_);
>>>>>>>
PrepareBuilder();
result.packedInt64_.Add(values);
<<<<<<<
result.packedUint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedUint32_);
>>>>>>>
PrepareBuilder();
result.packedUint32_.Add(values);
<<<<<<<
result.packedUint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedUint64_);
>>>>>>>
PrepareBuilder();
result.packedUint64_.Add(values);
<<<<<<<
result.packedSint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSint32_);
>>>>>>>
PrepareBuilder();
result.packedSint32_.Add(values);
<<<<<<<
result.packedSint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSint64_);
>>>>>>>
PrepareBuilder();
result.packedSint64_.Add(values);
<<<<<<<
result.packedFixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedFixed32_);
>>>>>>>
PrepareBuilder();
result.packedFixed32_.Add(values);
<<<<<<<
result.packedFixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedFixed64_);
>>>>>>>
PrepareBuilder();
result.packedFixed64_.Add(values);
<<<<<<<
result.packedSfixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSfixed32_);
>>>>>>>
PrepareBuilder();
result.packedSfixed32_.Add(values);
<<<<<<<
result.packedSfixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSfixed64_);
>>>>>>>
PrepareBuilder();
result.packedSfixed64_.Add(values);
<<<<<<<
result.packedFloat_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedFloat_);
>>>>>>>
PrepareBuilder();
result.packedFloat_.Add(values);
<<<<<<<
result.packedDouble_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedDouble_);
>>>>>>>
PrepareBuilder();
result.packedDouble_.Add(values);
<<<<<<<
result.packedBool_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedBool_);
>>>>>>>
PrepareBuilder();
result.packedBool_.Add(values);
<<<<<<<
result.packedEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedEnum_);
>>>>>>>
PrepareBuilder();
result.packedEnum_.Add(values);
<<<<<<<
result.unpackedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedInt32_);
>>>>>>>
PrepareBuilder();
result.unpackedInt32_.Add(values);
<<<<<<<
result.unpackedInt64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedInt64_);
>>>>>>>
PrepareBuilder();
result.unpackedInt64_.Add(values);
<<<<<<<
result.unpackedUint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedUint32_);
>>>>>>>
PrepareBuilder();
result.unpackedUint32_.Add(values);
<<<<<<<
result.unpackedUint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedUint64_);
>>>>>>>
PrepareBuilder();
result.unpackedUint64_.Add(values);
<<<<<<<
result.unpackedSint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSint32_);
>>>>>>>
PrepareBuilder();
result.unpackedSint32_.Add(values);
<<<<<<<
result.unpackedSint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSint64_);
>>>>>>>
PrepareBuilder();
result.unpackedSint64_.Add(values);
<<<<<<<
result.unpackedFixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedFixed32_);
>>>>>>>
PrepareBuilder();
result.unpackedFixed32_.Add(values);
<<<<<<<
result.unpackedFixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedFixed64_);
>>>>>>>
PrepareBuilder();
result.unpackedFixed64_.Add(values);
<<<<<<<
result.unpackedSfixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSfixed32_);
>>>>>>>
PrepareBuilder();
result.unpackedSfixed32_.Add(values);
<<<<<<<
result.unpackedSfixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSfixed64_);
>>>>>>>
PrepareBuilder();
result.unpackedSfixed64_.Add(values);
<<<<<<<
result.unpackedFloat_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedFloat_);
>>>>>>>
PrepareBuilder();
result.unpackedFloat_.Add(values);
<<<<<<<
result.unpackedDouble_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedDouble_);
>>>>>>>
PrepareBuilder();
result.unpackedDouble_.Add(values);
<<<<<<<
result.unpackedBool_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedBool_);
>>>>>>>
PrepareBuilder();
result.unpackedBool_.Add(values);
<<<<<<<
result.unpackedEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedEnum_);
>>>>>>>
PrepareBuilder();
result.unpackedEnum_.Add(values);
<<<<<<<
result.repeatedExtension_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedExtension_);
>>>>>>>
PrepareBuilder();
result.repeatedExtension_.Add(values);
<<<<<<<
result.packedExtension_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedExtension_);
>>>>>>>
PrepareBuilder();
result.packedExtension_.Add(values);
<<<<<<<
result.repeatedFixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFixed32_);
>>>>>>>
PrepareBuilder();
result.repeatedFixed32_.Add(values);
<<<<<<<
result.repeatedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt32_);
>>>>>>>
PrepareBuilder();
result.repeatedInt32_.Add(values);
<<<<<<<
result.repeatedFixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFixed64_);
>>>>>>>
PrepareBuilder();
result.repeatedFixed64_.Add(values);
<<<<<<<
result.repeatedInt64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt64_);
>>>>>>>
PrepareBuilder();
result.repeatedInt64_.Add(values);
<<<<<<<
result.repeatedFloat_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFloat_);
>>>>>>>
PrepareBuilder();
result.repeatedFloat_.Add(values);
<<<<<<<
result.repeatedUint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedUint64_);
>>>>>>>
PrepareBuilder();
result.repeatedUint64_.Add(values); |
<<<<<<<
private SizeMessage1() { }
private static readonly SizeMessage1 defaultInstance = new Builder().BuildPartial();
=======
private static readonly SizeMessage1 defaultInstance = new SizeMessage1().MakeReadOnly();
>>>>>>>
private SizeMessage1() { }
private static readonly SizeMessage1 defaultInstance = new SizeMessage1().MakeReadOnly();
<<<<<<<
private SizeMessage1SubMessage() { }
private static readonly SizeMessage1SubMessage defaultInstance = new Builder().BuildPartial();
=======
private static readonly SizeMessage1SubMessage defaultInstance = new SizeMessage1SubMessage().MakeReadOnly();
>>>>>>>
private SizeMessage1SubMessage() { }
private static readonly SizeMessage1SubMessage defaultInstance = new SizeMessage1SubMessage().MakeReadOnly();
<<<<<<<
private SizeMessage2() { }
private static readonly SizeMessage2 defaultInstance = new Builder().BuildPartial();
=======
private static readonly SizeMessage2 defaultInstance = new SizeMessage2().MakeReadOnly();
>>>>>>>
private SizeMessage2() { }
private static readonly SizeMessage2 defaultInstance = new SizeMessage2().MakeReadOnly();
<<<<<<<
private Group1() { }
private static readonly Group1 defaultInstance = new Builder().BuildPartial();
=======
private static readonly Group1 defaultInstance = new Group1().MakeReadOnly();
>>>>>>>
private Group1() { }
private static readonly Group1 defaultInstance = new Group1().MakeReadOnly();
<<<<<<<
private SizeMessage2GroupedMessage() { }
private static readonly SizeMessage2GroupedMessage defaultInstance = new Builder().BuildPartial();
=======
private static readonly SizeMessage2GroupedMessage defaultInstance = new SizeMessage2GroupedMessage().MakeReadOnly();
>>>>>>>
private SizeMessage2GroupedMessage() { }
private static readonly SizeMessage2GroupedMessage defaultInstance = new SizeMessage2GroupedMessage().MakeReadOnly(); |
<<<<<<<
private FileDescriptorSet() { }
private static readonly FileDescriptorSet defaultInstance = new Builder().BuildPartial();
=======
private static readonly FileDescriptorSet defaultInstance = new FileDescriptorSet().MakeReadOnly();
>>>>>>>
private FileDescriptorSet() { }
private static readonly FileDescriptorSet defaultInstance = new FileDescriptorSet().MakeReadOnly();
<<<<<<<
private FileDescriptorProto() { }
private static readonly FileDescriptorProto defaultInstance = new Builder().BuildPartial();
=======
private static readonly FileDescriptorProto defaultInstance = new FileDescriptorProto().MakeReadOnly();
>>>>>>>
private FileDescriptorProto() { }
private static readonly FileDescriptorProto defaultInstance = new FileDescriptorProto().MakeReadOnly();
<<<<<<<
private DescriptorProto() { }
private static readonly DescriptorProto defaultInstance = new Builder().BuildPartial();
=======
private static readonly DescriptorProto defaultInstance = new DescriptorProto().MakeReadOnly();
>>>>>>>
private DescriptorProto() { }
private static readonly DescriptorProto defaultInstance = new DescriptorProto().MakeReadOnly();
<<<<<<<
private ExtensionRange() { }
private static readonly ExtensionRange defaultInstance = new Builder().BuildPartial();
=======
private static readonly ExtensionRange defaultInstance = new ExtensionRange().MakeReadOnly();
>>>>>>>
private ExtensionRange() { }
private static readonly ExtensionRange defaultInstance = new ExtensionRange().MakeReadOnly();
<<<<<<<
private FieldDescriptorProto() { }
private static readonly FieldDescriptorProto defaultInstance = new Builder().BuildPartial();
=======
private static readonly FieldDescriptorProto defaultInstance = new FieldDescriptorProto().MakeReadOnly();
>>>>>>>
private FieldDescriptorProto() { }
private static readonly FieldDescriptorProto defaultInstance = new FieldDescriptorProto().MakeReadOnly();
<<<<<<<
private EnumDescriptorProto() { }
private static readonly EnumDescriptorProto defaultInstance = new Builder().BuildPartial();
=======
private static readonly EnumDescriptorProto defaultInstance = new EnumDescriptorProto().MakeReadOnly();
>>>>>>>
private EnumDescriptorProto() { }
private static readonly EnumDescriptorProto defaultInstance = new EnumDescriptorProto().MakeReadOnly();
<<<<<<<
private EnumValueDescriptorProto() { }
private static readonly EnumValueDescriptorProto defaultInstance = new Builder().BuildPartial();
=======
private static readonly EnumValueDescriptorProto defaultInstance = new EnumValueDescriptorProto().MakeReadOnly();
>>>>>>>
private EnumValueDescriptorProto() { }
private static readonly EnumValueDescriptorProto defaultInstance = new EnumValueDescriptorProto().MakeReadOnly();
<<<<<<<
private ServiceDescriptorProto() { }
private static readonly ServiceDescriptorProto defaultInstance = new Builder().BuildPartial();
=======
private static readonly ServiceDescriptorProto defaultInstance = new ServiceDescriptorProto().MakeReadOnly();
>>>>>>>
private ServiceDescriptorProto() { }
private static readonly ServiceDescriptorProto defaultInstance = new ServiceDescriptorProto().MakeReadOnly();
<<<<<<<
private MethodDescriptorProto() { }
private static readonly MethodDescriptorProto defaultInstance = new Builder().BuildPartial();
=======
private static readonly MethodDescriptorProto defaultInstance = new MethodDescriptorProto().MakeReadOnly();
>>>>>>>
private MethodDescriptorProto() { }
private static readonly MethodDescriptorProto defaultInstance = new MethodDescriptorProto().MakeReadOnly();
<<<<<<<
private FileOptions() { }
private static readonly FileOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly FileOptions defaultInstance = new FileOptions().MakeReadOnly();
>>>>>>>
private FileOptions() { }
private static readonly FileOptions defaultInstance = new FileOptions().MakeReadOnly();
<<<<<<<
private MessageOptions() { }
private static readonly MessageOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly MessageOptions defaultInstance = new MessageOptions().MakeReadOnly();
>>>>>>>
private MessageOptions() { }
private static readonly MessageOptions defaultInstance = new MessageOptions().MakeReadOnly();
<<<<<<<
private FieldOptions() { }
private static readonly FieldOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly FieldOptions defaultInstance = new FieldOptions().MakeReadOnly();
>>>>>>>
private FieldOptions() { }
private static readonly FieldOptions defaultInstance = new FieldOptions().MakeReadOnly();
<<<<<<<
private EnumOptions() { }
private static readonly EnumOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly EnumOptions defaultInstance = new EnumOptions().MakeReadOnly();
>>>>>>>
private EnumOptions() { }
private static readonly EnumOptions defaultInstance = new EnumOptions().MakeReadOnly();
<<<<<<<
private EnumValueOptions() { }
private static readonly EnumValueOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly EnumValueOptions defaultInstance = new EnumValueOptions().MakeReadOnly();
>>>>>>>
private EnumValueOptions() { }
private static readonly EnumValueOptions defaultInstance = new EnumValueOptions().MakeReadOnly();
<<<<<<<
private ServiceOptions() { }
private static readonly ServiceOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly ServiceOptions defaultInstance = new ServiceOptions().MakeReadOnly();
>>>>>>>
private ServiceOptions() { }
private static readonly ServiceOptions defaultInstance = new ServiceOptions().MakeReadOnly();
<<<<<<<
private MethodOptions() { }
private static readonly MethodOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly MethodOptions defaultInstance = new MethodOptions().MakeReadOnly();
>>>>>>>
private MethodOptions() { }
private static readonly MethodOptions defaultInstance = new MethodOptions().MakeReadOnly();
<<<<<<<
private UninterpretedOption() { }
private static readonly UninterpretedOption defaultInstance = new Builder().BuildPartial();
=======
private static readonly UninterpretedOption defaultInstance = new UninterpretedOption().MakeReadOnly();
>>>>>>>
private UninterpretedOption() { }
private static readonly UninterpretedOption defaultInstance = new UninterpretedOption().MakeReadOnly();
<<<<<<<
private NamePart() { }
private static readonly NamePart defaultInstance = new Builder().BuildPartial();
=======
private static readonly NamePart defaultInstance = new NamePart().MakeReadOnly();
>>>>>>>
private NamePart() { }
private static readonly NamePart defaultInstance = new NamePart().MakeReadOnly(); |
<<<<<<<
result.repeatedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt32_);
>>>>>>>
PrepareBuilder();
result.repeatedInt32_.Add(values);
<<<<<<<
result.repeatedInt64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt64_);
>>>>>>>
PrepareBuilder();
result.repeatedInt64_.Add(values);
<<<<<<<
result.repeatedUint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedUint32_);
>>>>>>>
PrepareBuilder();
result.repeatedUint32_.Add(values);
<<<<<<<
result.repeatedUint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedUint64_);
>>>>>>>
PrepareBuilder();
result.repeatedUint64_.Add(values);
<<<<<<<
result.repeatedSint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSint32_);
>>>>>>>
PrepareBuilder();
result.repeatedSint32_.Add(values);
<<<<<<<
result.repeatedSint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSint64_);
>>>>>>>
PrepareBuilder();
result.repeatedSint64_.Add(values);
<<<<<<<
result.repeatedFixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFixed32_);
>>>>>>>
PrepareBuilder();
result.repeatedFixed32_.Add(values);
<<<<<<<
result.repeatedFixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFixed64_);
>>>>>>>
PrepareBuilder();
result.repeatedFixed64_.Add(values);
<<<<<<<
result.repeatedSfixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSfixed32_);
>>>>>>>
PrepareBuilder();
result.repeatedSfixed32_.Add(values);
<<<<<<<
result.repeatedSfixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSfixed64_);
>>>>>>>
PrepareBuilder();
result.repeatedSfixed64_.Add(values);
<<<<<<<
result.repeatedFloat_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFloat_);
>>>>>>>
PrepareBuilder();
result.repeatedFloat_.Add(values);
<<<<<<<
result.repeatedDouble_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedDouble_);
>>>>>>>
PrepareBuilder();
result.repeatedDouble_.Add(values);
<<<<<<<
result.repeatedBool_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedBool_);
>>>>>>>
PrepareBuilder();
result.repeatedBool_.Add(values);
<<<<<<<
result.repeatedString_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedString_);
>>>>>>>
PrepareBuilder();
result.repeatedString_.Add(values);
<<<<<<<
result.repeatedBytes_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedBytes_);
>>>>>>>
PrepareBuilder();
result.repeatedBytes_.Add(values);
<<<<<<<
result.repeatedGroup_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedGroup_);
>>>>>>>
PrepareBuilder();
result.repeatedGroup_.Add(values);
<<<<<<<
result.repeatedNestedMessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedNestedMessage_);
>>>>>>>
PrepareBuilder();
result.repeatedNestedMessage_.Add(values);
<<<<<<<
result.repeatedForeignMessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedForeignMessage_);
>>>>>>>
PrepareBuilder();
result.repeatedForeignMessage_.Add(values);
<<<<<<<
result.repeatedImportMessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedImportMessage_);
>>>>>>>
PrepareBuilder();
result.repeatedImportMessage_.Add(values);
<<<<<<<
result.repeatedNestedEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedNestedEnum_);
>>>>>>>
PrepareBuilder();
result.repeatedNestedEnum_.Add(values);
<<<<<<<
result.repeatedForeignEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedForeignEnum_);
>>>>>>>
PrepareBuilder();
result.repeatedForeignEnum_.Add(values);
<<<<<<<
result.repeatedImportEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedImportEnum_);
>>>>>>>
PrepareBuilder();
result.repeatedImportEnum_.Add(values);
<<<<<<<
result.repeatedStringPiece_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedStringPiece_);
>>>>>>>
PrepareBuilder();
result.repeatedStringPiece_.Add(values);
<<<<<<<
result.repeatedCord_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedCord_);
>>>>>>>
PrepareBuilder();
result.repeatedCord_.Add(values);
<<<<<<<
result.repeatedMessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedMessage_);
>>>>>>>
PrepareBuilder();
result.repeatedMessage_.Add(values);
<<<<<<<
result.nestedmessageRepeatedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.nestedmessageRepeatedInt32_);
>>>>>>>
PrepareBuilder();
result.nestedmessageRepeatedInt32_.Add(values);
<<<<<<<
result.nestedmessageRepeatedForeignmessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.nestedmessageRepeatedForeignmessage_);
>>>>>>>
PrepareBuilder();
result.nestedmessageRepeatedForeignmessage_.Add(values);
<<<<<<<
result.repeatedPrimitiveField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedPrimitiveField_);
>>>>>>>
PrepareBuilder();
result.repeatedPrimitiveField_.Add(values);
<<<<<<<
result.repeatedStringField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedStringField_);
>>>>>>>
PrepareBuilder();
result.repeatedStringField_.Add(values);
<<<<<<<
result.repeatedEnumField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedEnumField_);
>>>>>>>
PrepareBuilder();
result.repeatedEnumField_.Add(values);
<<<<<<<
result.repeatedMessageField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedMessageField_);
>>>>>>>
PrepareBuilder();
result.repeatedMessageField_.Add(values);
<<<<<<<
result.repeatedStringPieceField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedStringPieceField_);
>>>>>>>
PrepareBuilder();
result.repeatedStringPieceField_.Add(values);
<<<<<<<
result.repeatedCordField_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedCordField_);
>>>>>>>
PrepareBuilder();
result.repeatedCordField_.Add(values);
<<<<<<<
result.packedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedInt32_);
>>>>>>>
PrepareBuilder();
result.packedInt32_.Add(values);
<<<<<<<
result.packedInt64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedInt64_);
>>>>>>>
PrepareBuilder();
result.packedInt64_.Add(values);
<<<<<<<
result.packedUint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedUint32_);
>>>>>>>
PrepareBuilder();
result.packedUint32_.Add(values);
<<<<<<<
result.packedUint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedUint64_);
>>>>>>>
PrepareBuilder();
result.packedUint64_.Add(values);
<<<<<<<
result.packedSint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSint32_);
>>>>>>>
PrepareBuilder();
result.packedSint32_.Add(values);
<<<<<<<
result.packedSint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSint64_);
>>>>>>>
PrepareBuilder();
result.packedSint64_.Add(values);
<<<<<<<
result.packedFixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedFixed32_);
>>>>>>>
PrepareBuilder();
result.packedFixed32_.Add(values);
<<<<<<<
result.packedFixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedFixed64_);
>>>>>>>
PrepareBuilder();
result.packedFixed64_.Add(values);
<<<<<<<
result.packedSfixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSfixed32_);
>>>>>>>
PrepareBuilder();
result.packedSfixed32_.Add(values);
<<<<<<<
result.packedSfixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSfixed64_);
>>>>>>>
PrepareBuilder();
result.packedSfixed64_.Add(values);
<<<<<<<
result.packedFloat_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedFloat_);
>>>>>>>
PrepareBuilder();
result.packedFloat_.Add(values);
<<<<<<<
result.packedDouble_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedDouble_);
>>>>>>>
PrepareBuilder();
result.packedDouble_.Add(values);
<<<<<<<
result.packedBool_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedBool_);
>>>>>>>
PrepareBuilder();
result.packedBool_.Add(values);
<<<<<<<
result.packedEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedEnum_);
>>>>>>>
PrepareBuilder();
result.packedEnum_.Add(values);
<<<<<<<
result.unpackedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedInt32_);
>>>>>>>
PrepareBuilder();
result.unpackedInt32_.Add(values);
<<<<<<<
result.unpackedInt64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedInt64_);
>>>>>>>
PrepareBuilder();
result.unpackedInt64_.Add(values);
<<<<<<<
result.unpackedUint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedUint32_);
>>>>>>>
PrepareBuilder();
result.unpackedUint32_.Add(values);
<<<<<<<
result.unpackedUint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedUint64_);
>>>>>>>
PrepareBuilder();
result.unpackedUint64_.Add(values);
<<<<<<<
result.unpackedSint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSint32_);
>>>>>>>
PrepareBuilder();
result.unpackedSint32_.Add(values);
<<<<<<<
result.unpackedSint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSint64_);
>>>>>>>
PrepareBuilder();
result.unpackedSint64_.Add(values);
<<<<<<<
result.unpackedFixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedFixed32_);
>>>>>>>
PrepareBuilder();
result.unpackedFixed32_.Add(values);
<<<<<<<
result.unpackedFixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedFixed64_);
>>>>>>>
PrepareBuilder();
result.unpackedFixed64_.Add(values);
<<<<<<<
result.unpackedSfixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSfixed32_);
>>>>>>>
PrepareBuilder();
result.unpackedSfixed32_.Add(values);
<<<<<<<
result.unpackedSfixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSfixed64_);
>>>>>>>
PrepareBuilder();
result.unpackedSfixed64_.Add(values);
<<<<<<<
result.unpackedFloat_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedFloat_);
>>>>>>>
PrepareBuilder();
result.unpackedFloat_.Add(values);
<<<<<<<
result.unpackedDouble_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedDouble_);
>>>>>>>
PrepareBuilder();
result.unpackedDouble_.Add(values);
<<<<<<<
result.unpackedBool_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedBool_);
>>>>>>>
PrepareBuilder();
result.unpackedBool_.Add(values);
<<<<<<<
result.unpackedEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedEnum_);
>>>>>>>
PrepareBuilder();
result.unpackedEnum_.Add(values);
<<<<<<<
result.repeatedExtension_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedExtension_);
>>>>>>>
PrepareBuilder();
result.repeatedExtension_.Add(values);
<<<<<<<
result.packedExtension_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedExtension_);
>>>>>>>
PrepareBuilder();
result.packedExtension_.Add(values);
<<<<<<<
result.repeatedFixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFixed32_);
>>>>>>>
PrepareBuilder();
result.repeatedFixed32_.Add(values);
<<<<<<<
result.repeatedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt32_);
>>>>>>>
PrepareBuilder();
result.repeatedInt32_.Add(values);
<<<<<<<
result.repeatedFixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFixed64_);
>>>>>>>
PrepareBuilder();
result.repeatedFixed64_.Add(values);
<<<<<<<
result.repeatedInt64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt64_);
>>>>>>>
PrepareBuilder();
result.repeatedInt64_.Add(values);
<<<<<<<
result.repeatedFloat_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFloat_);
>>>>>>>
PrepareBuilder();
result.repeatedFloat_.Add(values);
<<<<<<<
result.repeatedUint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedUint64_);
>>>>>>>
PrepareBuilder();
result.repeatedUint64_.Add(values); |
<<<<<<<
private TestMessageWithCustomOptions() { }
private static readonly TestMessageWithCustomOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestMessageWithCustomOptions defaultInstance = new TestMessageWithCustomOptions().MakeReadOnly();
>>>>>>>
private TestMessageWithCustomOptions() { }
private static readonly TestMessageWithCustomOptions defaultInstance = new TestMessageWithCustomOptions().MakeReadOnly();
<<<<<<<
private CustomOptionFooRequest() { }
private static readonly CustomOptionFooRequest defaultInstance = new Builder().BuildPartial();
=======
private static readonly CustomOptionFooRequest defaultInstance = new CustomOptionFooRequest().MakeReadOnly();
>>>>>>>
private CustomOptionFooRequest() { }
private static readonly CustomOptionFooRequest defaultInstance = new CustomOptionFooRequest().MakeReadOnly();
<<<<<<<
private CustomOptionFooResponse() { }
private static readonly CustomOptionFooResponse defaultInstance = new Builder().BuildPartial();
=======
private static readonly CustomOptionFooResponse defaultInstance = new CustomOptionFooResponse().MakeReadOnly();
>>>>>>>
private CustomOptionFooResponse() { }
private static readonly CustomOptionFooResponse defaultInstance = new CustomOptionFooResponse().MakeReadOnly();
<<<<<<<
private DummyMessageContainingEnum() { }
private static readonly DummyMessageContainingEnum defaultInstance = new Builder().BuildPartial();
=======
private static readonly DummyMessageContainingEnum defaultInstance = new DummyMessageContainingEnum().MakeReadOnly();
>>>>>>>
private DummyMessageContainingEnum() { }
private static readonly DummyMessageContainingEnum defaultInstance = new DummyMessageContainingEnum().MakeReadOnly();
<<<<<<<
private DummyMessageInvalidAsOptionType() { }
private static readonly DummyMessageInvalidAsOptionType defaultInstance = new Builder().BuildPartial();
=======
private static readonly DummyMessageInvalidAsOptionType defaultInstance = new DummyMessageInvalidAsOptionType().MakeReadOnly();
>>>>>>>
private DummyMessageInvalidAsOptionType() { }
private static readonly DummyMessageInvalidAsOptionType defaultInstance = new DummyMessageInvalidAsOptionType().MakeReadOnly();
<<<<<<<
private CustomOptionMinIntegerValues() { }
private static readonly CustomOptionMinIntegerValues defaultInstance = new Builder().BuildPartial();
=======
private static readonly CustomOptionMinIntegerValues defaultInstance = new CustomOptionMinIntegerValues().MakeReadOnly();
>>>>>>>
private CustomOptionMinIntegerValues() { }
private static readonly CustomOptionMinIntegerValues defaultInstance = new CustomOptionMinIntegerValues().MakeReadOnly();
<<<<<<<
private CustomOptionMaxIntegerValues() { }
private static readonly CustomOptionMaxIntegerValues defaultInstance = new Builder().BuildPartial();
=======
private static readonly CustomOptionMaxIntegerValues defaultInstance = new CustomOptionMaxIntegerValues().MakeReadOnly();
>>>>>>>
private CustomOptionMaxIntegerValues() { }
private static readonly CustomOptionMaxIntegerValues defaultInstance = new CustomOptionMaxIntegerValues().MakeReadOnly();
<<<<<<<
private CustomOptionOtherValues() { }
private static readonly CustomOptionOtherValues defaultInstance = new Builder().BuildPartial();
=======
private static readonly CustomOptionOtherValues defaultInstance = new CustomOptionOtherValues().MakeReadOnly();
>>>>>>>
private CustomOptionOtherValues() { }
private static readonly CustomOptionOtherValues defaultInstance = new CustomOptionOtherValues().MakeReadOnly();
<<<<<<<
private SettingRealsFromPositiveInts() { }
private static readonly SettingRealsFromPositiveInts defaultInstance = new Builder().BuildPartial();
=======
private static readonly SettingRealsFromPositiveInts defaultInstance = new SettingRealsFromPositiveInts().MakeReadOnly();
>>>>>>>
private SettingRealsFromPositiveInts() { }
private static readonly SettingRealsFromPositiveInts defaultInstance = new SettingRealsFromPositiveInts().MakeReadOnly();
<<<<<<<
private SettingRealsFromNegativeInts() { }
private static readonly SettingRealsFromNegativeInts defaultInstance = new Builder().BuildPartial();
=======
private static readonly SettingRealsFromNegativeInts defaultInstance = new SettingRealsFromNegativeInts().MakeReadOnly();
>>>>>>>
private SettingRealsFromNegativeInts() { }
private static readonly SettingRealsFromNegativeInts defaultInstance = new SettingRealsFromNegativeInts().MakeReadOnly();
<<<<<<<
private ComplexOptionType1() { }
private static readonly ComplexOptionType1 defaultInstance = new Builder().BuildPartial();
=======
private static readonly ComplexOptionType1 defaultInstance = new ComplexOptionType1().MakeReadOnly();
>>>>>>>
private ComplexOptionType1() { }
private static readonly ComplexOptionType1 defaultInstance = new ComplexOptionType1().MakeReadOnly();
<<<<<<<
private ComplexOptionType2() { }
private static readonly ComplexOptionType2 defaultInstance = new Builder().BuildPartial();
=======
private static readonly ComplexOptionType2 defaultInstance = new ComplexOptionType2().MakeReadOnly();
>>>>>>>
private ComplexOptionType2() { }
private static readonly ComplexOptionType2 defaultInstance = new ComplexOptionType2().MakeReadOnly();
<<<<<<<
private ComplexOptionType4() { }
private static readonly ComplexOptionType4 defaultInstance = new Builder().BuildPartial();
=======
private static readonly ComplexOptionType4 defaultInstance = new ComplexOptionType4().MakeReadOnly();
>>>>>>>
private ComplexOptionType4() { }
private static readonly ComplexOptionType4 defaultInstance = new ComplexOptionType4().MakeReadOnly();
<<<<<<<
private ComplexOptionType3() { }
private static readonly ComplexOptionType3 defaultInstance = new Builder().BuildPartial();
=======
private static readonly ComplexOptionType3 defaultInstance = new ComplexOptionType3().MakeReadOnly();
>>>>>>>
private ComplexOptionType3() { }
private static readonly ComplexOptionType3 defaultInstance = new ComplexOptionType3().MakeReadOnly();
<<<<<<<
private ComplexOptionType5() { }
private static readonly ComplexOptionType5 defaultInstance = new Builder().BuildPartial();
=======
private static readonly ComplexOptionType5 defaultInstance = new ComplexOptionType5().MakeReadOnly();
>>>>>>>
private ComplexOptionType5() { }
private static readonly ComplexOptionType5 defaultInstance = new ComplexOptionType5().MakeReadOnly();
<<<<<<<
private ComplexOpt6() { }
private static readonly ComplexOpt6 defaultInstance = new Builder().BuildPartial();
=======
private static readonly ComplexOpt6 defaultInstance = new ComplexOpt6().MakeReadOnly();
>>>>>>>
private ComplexOpt6() { }
private static readonly ComplexOpt6 defaultInstance = new ComplexOpt6().MakeReadOnly();
<<<<<<<
private VariousComplexOptions() { }
private static readonly VariousComplexOptions defaultInstance = new Builder().BuildPartial();
=======
private static readonly VariousComplexOptions defaultInstance = new VariousComplexOptions().MakeReadOnly();
>>>>>>>
private VariousComplexOptions() { }
private static readonly VariousComplexOptions defaultInstance = new VariousComplexOptions().MakeReadOnly(); |
<<<<<<<
private TestMessageSet() { }
private static readonly TestMessageSet defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestMessageSet defaultInstance = new TestMessageSet().MakeReadOnly();
>>>>>>>
private TestMessageSet() { }
private static readonly TestMessageSet defaultInstance = new TestMessageSet().MakeReadOnly();
<<<<<<<
private TestMessageSetContainer() { }
private static readonly TestMessageSetContainer defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestMessageSetContainer defaultInstance = new TestMessageSetContainer().MakeReadOnly();
>>>>>>>
private TestMessageSetContainer() { }
private static readonly TestMessageSetContainer defaultInstance = new TestMessageSetContainer().MakeReadOnly();
<<<<<<<
private TestMessageSetExtension1() { }
private static readonly TestMessageSetExtension1 defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestMessageSetExtension1 defaultInstance = new TestMessageSetExtension1().MakeReadOnly();
>>>>>>>
private TestMessageSetExtension1() { }
private static readonly TestMessageSetExtension1 defaultInstance = new TestMessageSetExtension1().MakeReadOnly();
<<<<<<<
private TestMessageSetExtension2() { }
private static readonly TestMessageSetExtension2 defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestMessageSetExtension2 defaultInstance = new TestMessageSetExtension2().MakeReadOnly();
>>>>>>>
private TestMessageSetExtension2() { }
private static readonly TestMessageSetExtension2 defaultInstance = new TestMessageSetExtension2().MakeReadOnly();
<<<<<<<
private RawMessageSet() { }
private static readonly RawMessageSet defaultInstance = new Builder().BuildPartial();
=======
private static readonly RawMessageSet defaultInstance = new RawMessageSet().MakeReadOnly();
>>>>>>>
private RawMessageSet() { }
private static readonly RawMessageSet defaultInstance = new RawMessageSet().MakeReadOnly();
<<<<<<<
private Item() { }
private static readonly Item defaultInstance = new Builder().BuildPartial();
=======
private static readonly Item defaultInstance = new Item().MakeReadOnly();
>>>>>>>
private Item() { }
private static readonly Item defaultInstance = new Item().MakeReadOnly(); |
<<<<<<<
result.field5_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.field5_);
>>>>>>>
PrepareBuilder();
result.field5_.Add(values);
<<<<<<<
result.field14_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.field14_);
>>>>>>>
PrepareBuilder();
result.field14_.Add(values);
<<<<<<<
result.field22_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.field22_);
>>>>>>>
PrepareBuilder();
result.field22_.Add(values);
<<<<<<<
result.field73_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.field73_);
>>>>>>>
PrepareBuilder();
result.field73_.Add(values);
<<<<<<<
result.group1_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.group1_);
>>>>>>>
PrepareBuilder();
result.group1_.Add(values);
<<<<<<<
result.field128_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.field128_);
>>>>>>>
PrepareBuilder();
result.field128_.Add(values);
<<<<<<<
result.field127_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.field127_);
>>>>>>>
PrepareBuilder();
result.field127_.Add(values);
<<<<<<<
result.field130_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.field130_);
>>>>>>>
PrepareBuilder();
result.field130_.Add(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_);
>>>>>>>
PrepareBuilder();
result.phone_.Add(values);
<<<<<<<
result.addresses_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.addresses_);
>>>>>>>
PrepareBuilder();
result.addresses_.Add(values);
<<<<<<<
result.values_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.values_);
>>>>>>>
PrepareBuilder();
result.values_.Add(values);
<<<<<<<
result.values_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.values_);
>>>>>>>
PrepareBuilder();
result.values_.Add(values); |
<<<<<<<
result.repeatedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt32_);
>>>>>>>
PrepareBuilder();
result.repeatedInt32_.Add(values);
<<<<<<<
result.repeatedInt64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedInt64_);
>>>>>>>
PrepareBuilder();
result.repeatedInt64_.Add(values);
<<<<<<<
result.repeatedUint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedUint32_);
>>>>>>>
PrepareBuilder();
result.repeatedUint32_.Add(values);
<<<<<<<
result.repeatedUint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedUint64_);
>>>>>>>
PrepareBuilder();
result.repeatedUint64_.Add(values);
<<<<<<<
result.repeatedSint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSint32_);
>>>>>>>
PrepareBuilder();
result.repeatedSint32_.Add(values);
<<<<<<<
result.repeatedSint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSint64_);
>>>>>>>
PrepareBuilder();
result.repeatedSint64_.Add(values);
<<<<<<<
result.repeatedFixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFixed32_);
>>>>>>>
PrepareBuilder();
result.repeatedFixed32_.Add(values);
<<<<<<<
result.repeatedFixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFixed64_);
>>>>>>>
PrepareBuilder();
result.repeatedFixed64_.Add(values);
<<<<<<<
result.repeatedSfixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSfixed32_);
>>>>>>>
PrepareBuilder();
result.repeatedSfixed32_.Add(values);
<<<<<<<
result.repeatedSfixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedSfixed64_);
>>>>>>>
PrepareBuilder();
result.repeatedSfixed64_.Add(values);
<<<<<<<
result.repeatedFloat_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedFloat_);
>>>>>>>
PrepareBuilder();
result.repeatedFloat_.Add(values);
<<<<<<<
result.repeatedDouble_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedDouble_);
>>>>>>>
PrepareBuilder();
result.repeatedDouble_.Add(values);
<<<<<<<
result.repeatedBool_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedBool_);
>>>>>>>
PrepareBuilder();
result.repeatedBool_.Add(values);
<<<<<<<
result.repeatedString_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedString_);
>>>>>>>
PrepareBuilder();
result.repeatedString_.Add(values);
<<<<<<<
result.repeatedBytes_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedBytes_);
>>>>>>>
PrepareBuilder();
result.repeatedBytes_.Add(values);
<<<<<<<
result.repeatedGroup_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedGroup_);
>>>>>>>
PrepareBuilder();
result.repeatedGroup_.Add(values);
<<<<<<<
result.repeatedNestedMessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedNestedMessage_);
>>>>>>>
PrepareBuilder();
result.repeatedNestedMessage_.Add(values);
<<<<<<<
result.repeatedForeignMessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedForeignMessage_);
>>>>>>>
PrepareBuilder();
result.repeatedForeignMessage_.Add(values);
<<<<<<<
result.repeatedImportMessage_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedImportMessage_);
>>>>>>>
PrepareBuilder();
result.repeatedImportMessage_.Add(values);
<<<<<<<
result.repeatedNestedEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedNestedEnum_);
>>>>>>>
PrepareBuilder();
result.repeatedNestedEnum_.Add(values);
<<<<<<<
result.repeatedForeignEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedForeignEnum_);
>>>>>>>
PrepareBuilder();
result.repeatedForeignEnum_.Add(values);
<<<<<<<
result.repeatedImportEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedImportEnum_);
>>>>>>>
PrepareBuilder();
result.repeatedImportEnum_.Add(values);
<<<<<<<
result.repeatedStringPiece_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedStringPiece_);
>>>>>>>
PrepareBuilder();
result.repeatedStringPiece_.Add(values);
<<<<<<<
result.repeatedCord_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.repeatedCord_);
>>>>>>>
PrepareBuilder();
result.repeatedCord_.Add(values);
<<<<<<<
result.packedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedInt32_);
>>>>>>>
PrepareBuilder();
result.packedInt32_.Add(values);
<<<<<<<
result.packedInt64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedInt64_);
>>>>>>>
PrepareBuilder();
result.packedInt64_.Add(values);
<<<<<<<
result.packedUint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedUint32_);
>>>>>>>
PrepareBuilder();
result.packedUint32_.Add(values);
<<<<<<<
result.packedUint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedUint64_);
>>>>>>>
PrepareBuilder();
result.packedUint64_.Add(values);
<<<<<<<
result.packedSint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSint32_);
>>>>>>>
PrepareBuilder();
result.packedSint32_.Add(values);
<<<<<<<
result.packedSint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSint64_);
>>>>>>>
PrepareBuilder();
result.packedSint64_.Add(values);
<<<<<<<
result.packedFixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedFixed32_);
>>>>>>>
PrepareBuilder();
result.packedFixed32_.Add(values);
<<<<<<<
result.packedFixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedFixed64_);
>>>>>>>
PrepareBuilder();
result.packedFixed64_.Add(values);
<<<<<<<
result.packedSfixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSfixed32_);
>>>>>>>
PrepareBuilder();
result.packedSfixed32_.Add(values);
<<<<<<<
result.packedSfixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedSfixed64_);
>>>>>>>
PrepareBuilder();
result.packedSfixed64_.Add(values);
<<<<<<<
result.packedFloat_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedFloat_);
>>>>>>>
PrepareBuilder();
result.packedFloat_.Add(values);
<<<<<<<
result.packedDouble_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedDouble_);
>>>>>>>
PrepareBuilder();
result.packedDouble_.Add(values);
<<<<<<<
result.packedBool_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedBool_);
>>>>>>>
PrepareBuilder();
result.packedBool_.Add(values);
<<<<<<<
result.packedEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.packedEnum_);
>>>>>>>
PrepareBuilder();
result.packedEnum_.Add(values);
<<<<<<<
result.unpackedInt32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedInt32_);
>>>>>>>
PrepareBuilder();
result.unpackedInt32_.Add(values);
<<<<<<<
result.unpackedInt64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedInt64_);
>>>>>>>
PrepareBuilder();
result.unpackedInt64_.Add(values);
<<<<<<<
result.unpackedUint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedUint32_);
>>>>>>>
PrepareBuilder();
result.unpackedUint32_.Add(values);
<<<<<<<
result.unpackedUint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedUint64_);
>>>>>>>
PrepareBuilder();
result.unpackedUint64_.Add(values);
<<<<<<<
result.unpackedSint32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSint32_);
>>>>>>>
PrepareBuilder();
result.unpackedSint32_.Add(values);
<<<<<<<
result.unpackedSint64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSint64_);
>>>>>>>
PrepareBuilder();
result.unpackedSint64_.Add(values);
<<<<<<<
result.unpackedFixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedFixed32_);
>>>>>>>
PrepareBuilder();
result.unpackedFixed32_.Add(values);
<<<<<<<
result.unpackedFixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedFixed64_);
>>>>>>>
PrepareBuilder();
result.unpackedFixed64_.Add(values);
<<<<<<<
result.unpackedSfixed32_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSfixed32_);
>>>>>>>
PrepareBuilder();
result.unpackedSfixed32_.Add(values);
<<<<<<<
result.unpackedSfixed64_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedSfixed64_);
>>>>>>>
PrepareBuilder();
result.unpackedSfixed64_.Add(values);
<<<<<<<
result.unpackedFloat_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedFloat_);
>>>>>>>
PrepareBuilder();
result.unpackedFloat_.Add(values);
<<<<<<<
result.unpackedDouble_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedDouble_);
>>>>>>>
PrepareBuilder();
result.unpackedDouble_.Add(values);
<<<<<<<
result.unpackedBool_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedBool_);
>>>>>>>
PrepareBuilder();
result.unpackedBool_.Add(values);
<<<<<<<
result.unpackedEnum_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.unpackedEnum_);
>>>>>>>
PrepareBuilder();
result.unpackedEnum_.Add(values); |
<<<<<<<
private TestOptimizedForSize() { }
private static readonly TestOptimizedForSize defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestOptimizedForSize defaultInstance = new TestOptimizedForSize().MakeReadOnly();
>>>>>>>
private TestOptimizedForSize() { }
private static readonly TestOptimizedForSize defaultInstance = new TestOptimizedForSize().MakeReadOnly();
<<<<<<<
private TestRequiredOptimizedForSize() { }
private static readonly TestRequiredOptimizedForSize defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestRequiredOptimizedForSize defaultInstance = new TestRequiredOptimizedForSize().MakeReadOnly();
>>>>>>>
private TestRequiredOptimizedForSize() { }
private static readonly TestRequiredOptimizedForSize defaultInstance = new TestRequiredOptimizedForSize().MakeReadOnly();
<<<<<<<
private TestOptionalOptimizedForSize() { }
private static readonly TestOptionalOptimizedForSize defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestOptionalOptimizedForSize defaultInstance = new TestOptionalOptimizedForSize().MakeReadOnly();
>>>>>>>
private TestOptionalOptimizedForSize() { }
private static readonly TestOptionalOptimizedForSize defaultInstance = new TestOptionalOptimizedForSize().MakeReadOnly(); |
<<<<<<<
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_);
>>>>>>>
PrepareBuilder();
result.phone_.Add(values);
<<<<<<<
result.addresses_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.addresses_);
>>>>>>>
PrepareBuilder();
result.addresses_.Add(values); |
<<<<<<<
result.criteria_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.criteria_);
>>>>>>>
PrepareBuilder();
result.criteria_.Add(values);
<<<<<<<
result.results_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.results_);
>>>>>>>
PrepareBuilder();
result.results_.Add(values);
<<<<<<<
result.criteria_.Add(values);
=======
PrepareBuilder();
base.AddRange(values, result.criteria_);
>>>>>>>
PrepareBuilder();
result.criteria_.Add(values); |
<<<<<<<
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}_.Add(values);", Name); |
<<<<<<<
private SearchRequest() { }
private static readonly SearchRequest defaultInstance = new Builder().BuildPartial();
=======
private static readonly SearchRequest defaultInstance = new SearchRequest().MakeReadOnly();
>>>>>>>
private SearchRequest() { }
private static readonly SearchRequest defaultInstance = new SearchRequest().MakeReadOnly();
<<<<<<<
private SearchResponse() { }
private static readonly SearchResponse defaultInstance = new Builder().BuildPartial();
=======
private static readonly SearchResponse defaultInstance = new SearchResponse().MakeReadOnly();
>>>>>>>
private SearchResponse() { }
private static readonly SearchResponse defaultInstance = new SearchResponse().MakeReadOnly();
<<<<<<<
private ResultItem() { }
private static readonly ResultItem defaultInstance = new Builder().BuildPartial();
=======
private static readonly ResultItem defaultInstance = new ResultItem().MakeReadOnly();
>>>>>>>
private ResultItem() { }
private static readonly ResultItem defaultInstance = new ResultItem().MakeReadOnly();
<<<<<<<
private RefineSearchRequest() { }
private static readonly RefineSearchRequest defaultInstance = new Builder().BuildPartial();
=======
private static readonly RefineSearchRequest defaultInstance = new RefineSearchRequest().MakeReadOnly();
>>>>>>>
private RefineSearchRequest() { }
private static readonly RefineSearchRequest defaultInstance = new RefineSearchRequest().MakeReadOnly(); |
<<<<<<<
private SpeedMessage1() { }
private static readonly SpeedMessage1 defaultInstance = new Builder().BuildPartial();
=======
private static readonly SpeedMessage1 defaultInstance = new SpeedMessage1().MakeReadOnly();
>>>>>>>
private SpeedMessage1() { }
private static readonly SpeedMessage1 defaultInstance = new SpeedMessage1().MakeReadOnly();
<<<<<<<
private SpeedMessage1SubMessage() { }
private static readonly SpeedMessage1SubMessage defaultInstance = new Builder().BuildPartial();
=======
private static readonly SpeedMessage1SubMessage defaultInstance = new SpeedMessage1SubMessage().MakeReadOnly();
>>>>>>>
private SpeedMessage1SubMessage() { }
private static readonly SpeedMessage1SubMessage defaultInstance = new SpeedMessage1SubMessage().MakeReadOnly();
<<<<<<<
private SpeedMessage2() { }
private static readonly SpeedMessage2 defaultInstance = new Builder().BuildPartial();
=======
private static readonly SpeedMessage2 defaultInstance = new SpeedMessage2().MakeReadOnly();
>>>>>>>
private SpeedMessage2() { }
private static readonly SpeedMessage2 defaultInstance = new SpeedMessage2().MakeReadOnly();
<<<<<<<
private Group1() { }
private static readonly Group1 defaultInstance = new Builder().BuildPartial();
=======
private static readonly Group1 defaultInstance = new Group1().MakeReadOnly();
>>>>>>>
private Group1() { }
private static readonly Group1 defaultInstance = new Group1().MakeReadOnly();
<<<<<<<
private SpeedMessage2GroupedMessage() { }
private static readonly SpeedMessage2GroupedMessage defaultInstance = new Builder().BuildPartial();
=======
private static readonly SpeedMessage2GroupedMessage defaultInstance = new SpeedMessage2GroupedMessage().MakeReadOnly();
>>>>>>>
private SpeedMessage2GroupedMessage() { }
private static readonly SpeedMessage2GroupedMessage defaultInstance = new SpeedMessage2GroupedMessage().MakeReadOnly(); |
<<<<<<<
private TestAllTypesLite() { }
private static readonly TestAllTypesLite defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestAllTypesLite defaultInstance = new TestAllTypesLite().MakeReadOnly();
>>>>>>>
private TestAllTypesLite() { }
private static readonly TestAllTypesLite defaultInstance = new TestAllTypesLite().MakeReadOnly();
<<<<<<<
private NestedMessage() { }
private static readonly NestedMessage defaultInstance = new Builder().BuildPartial();
=======
private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly();
>>>>>>>
private NestedMessage() { }
private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly();
<<<<<<<
private OptionalGroup() { }
private static readonly OptionalGroup defaultInstance = new Builder().BuildPartial();
=======
private static readonly OptionalGroup defaultInstance = new OptionalGroup().MakeReadOnly();
>>>>>>>
private OptionalGroup() { }
private static readonly OptionalGroup defaultInstance = new OptionalGroup().MakeReadOnly();
<<<<<<<
private RepeatedGroup() { }
private static readonly RepeatedGroup defaultInstance = new Builder().BuildPartial();
=======
private static readonly RepeatedGroup defaultInstance = new RepeatedGroup().MakeReadOnly();
>>>>>>>
private RepeatedGroup() { }
private static readonly RepeatedGroup defaultInstance = new RepeatedGroup().MakeReadOnly();
<<<<<<<
private ForeignMessageLite() { }
private static readonly ForeignMessageLite defaultInstance = new Builder().BuildPartial();
=======
private static readonly ForeignMessageLite defaultInstance = new ForeignMessageLite().MakeReadOnly();
>>>>>>>
private ForeignMessageLite() { }
private static readonly ForeignMessageLite defaultInstance = new ForeignMessageLite().MakeReadOnly();
<<<<<<<
private TestPackedTypesLite() { }
private static readonly TestPackedTypesLite defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestPackedTypesLite defaultInstance = new TestPackedTypesLite().MakeReadOnly();
>>>>>>>
private TestPackedTypesLite() { }
private static readonly TestPackedTypesLite defaultInstance = new TestPackedTypesLite().MakeReadOnly();
<<<<<<<
private TestUnpackedTypesLite() { }
private static readonly TestUnpackedTypesLite defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestUnpackedTypesLite defaultInstance = new TestUnpackedTypesLite().MakeReadOnly();
>>>>>>>
private TestUnpackedTypesLite() { }
private static readonly TestUnpackedTypesLite defaultInstance = new TestUnpackedTypesLite().MakeReadOnly();
<<<<<<<
private TestAllExtensionsLite() { }
private static readonly TestAllExtensionsLite defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestAllExtensionsLite defaultInstance = new TestAllExtensionsLite().MakeReadOnly();
>>>>>>>
private TestAllExtensionsLite() { }
private static readonly TestAllExtensionsLite defaultInstance = new TestAllExtensionsLite().MakeReadOnly();
<<<<<<<
private OptionalGroup_extension_lite() { }
private static readonly OptionalGroup_extension_lite defaultInstance = new Builder().BuildPartial();
=======
private static readonly OptionalGroup_extension_lite defaultInstance = new OptionalGroup_extension_lite().MakeReadOnly();
>>>>>>>
private OptionalGroup_extension_lite() { }
private static readonly OptionalGroup_extension_lite defaultInstance = new OptionalGroup_extension_lite().MakeReadOnly();
<<<<<<<
private RepeatedGroup_extension_lite() { }
private static readonly RepeatedGroup_extension_lite defaultInstance = new Builder().BuildPartial();
=======
private static readonly RepeatedGroup_extension_lite defaultInstance = new RepeatedGroup_extension_lite().MakeReadOnly();
>>>>>>>
private RepeatedGroup_extension_lite() { }
private static readonly RepeatedGroup_extension_lite defaultInstance = new RepeatedGroup_extension_lite().MakeReadOnly();
<<<<<<<
private TestPackedExtensionsLite() { }
private static readonly TestPackedExtensionsLite defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestPackedExtensionsLite defaultInstance = new TestPackedExtensionsLite().MakeReadOnly();
>>>>>>>
private TestPackedExtensionsLite() { }
private static readonly TestPackedExtensionsLite defaultInstance = new TestPackedExtensionsLite().MakeReadOnly();
<<<<<<<
private TestUnpackedExtensionsLite() { }
private static readonly TestUnpackedExtensionsLite defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestUnpackedExtensionsLite defaultInstance = new TestUnpackedExtensionsLite().MakeReadOnly();
>>>>>>>
private TestUnpackedExtensionsLite() { }
private static readonly TestUnpackedExtensionsLite defaultInstance = new TestUnpackedExtensionsLite().MakeReadOnly();
<<<<<<<
private TestNestedExtensionLite() { }
private static readonly TestNestedExtensionLite defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestNestedExtensionLite defaultInstance = new TestNestedExtensionLite().MakeReadOnly();
>>>>>>>
private TestNestedExtensionLite() { }
private static readonly TestNestedExtensionLite defaultInstance = new TestNestedExtensionLite().MakeReadOnly();
<<<<<<<
private TestDeprecatedLite() { }
private static readonly TestDeprecatedLite defaultInstance = new Builder().BuildPartial();
=======
private static readonly TestDeprecatedLite defaultInstance = new TestDeprecatedLite().MakeReadOnly();
>>>>>>>
private TestDeprecatedLite() { }
private static readonly TestDeprecatedLite defaultInstance = new TestDeprecatedLite().MakeReadOnly(); |
<<<<<<<
=======
/// <summary>
/// Configure application logger
/// </summary>
/// <returns></returns>
private static ILogger ConfigureLogger()
{
var appConfiguration = GetAppConfiguration();
var loggerConfiguration = new LoggerConfiguration()
.Enrich.With<LoggerNameEnricher>()
.ReadFrom.Configuration(appConfiguration);
return Log.Logger = loggerConfiguration.CreateLogger();
}
>>>>>>> |
<<<<<<<
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", "iPhonePlayer" },
{ "android player", "AndroidPlayer" }
};
public static IEnumerable<UnityProcessInfo> GetAttachableProcesses (string targetName)
{
string processName;
if (!targetNameToProcessName.TryGetValue (targetName.ToLower (), out processName))
return null;
UnityProcessDiscovery.GetProcessOptions options = UnityProcessDiscovery.GetProcessOptions.All;
if (processName == "Unity Editor")
options = UnityProcessDiscovery.GetProcessOptions.Editor;
else
options = UnityProcessDiscovery.GetProcessOptions.Players;
var processes = UnityProcessDiscovery.GetAttachableProcesses (options);
processes.ForEach(p => Log.Write("Found Unity process: " + p.Name + " (" + p.Id + ")"));
return processes.Where (p => p.Name.Contains (processName));
}
}
=======
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", "WindowsPlayer" },
{ "ios player", "iPhonePlayer" },
{ "android player", "AndroidPlayer" }
};
public static IEnumerable<UnityProcessInfo> GetAttachableProcesses(string targetName)
{
string processName;
UnityProcessDiscovery.GetProcessOptions options = UnityProcessDiscovery.GetProcessOptions.All;
if (!targetNameToProcessName.TryGetValue(targetName.ToLower(), out processName))
{
processName = targetName;
}
else
{
if (processName == "Unity Editor")
options = UnityProcessDiscovery.GetProcessOptions.Editor;
else
options = UnityProcessDiscovery.GetProcessOptions.Players;
}
var processes = UnityProcessDiscovery.GetAttachableProcesses(options);
processes.ForEach(p => Log.Write("Found Unity process: " + p.Name + " (" + p.Id + ")"));
return processes.Where(p => p.Name.Contains(processName));
}
}
>>>>>>>
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", "iPhonePlayer" },
{ "android player", "AndroidPlayer" }
};
public static IEnumerable<UnityProcessInfo> GetAttachableProcesses(string targetName)
{
string processName;
UnityProcessDiscovery.GetProcessOptions options = UnityProcessDiscovery.GetProcessOptions.All;
if (!targetNameToProcessName.TryGetValue(targetName.ToLower(), out processName))
{
processName = targetName;
}
else
{
if (processName == "Unity Editor")
options = UnityProcessDiscovery.GetProcessOptions.Editor;
else
options = UnityProcessDiscovery.GetProcessOptions.Players;
}
var processes = UnityProcessDiscovery.GetAttachableProcesses(options);
processes.ForEach(p => Log.Write("Found Unity process: " + p.Name + " (" + p.Id + ")"));
return processes.Where(p => p.Name.Contains(processName));
}
} |
<<<<<<<
// 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 reach the remote API.
request.AutoAcknowledge = true;
return null;
}
=======
if (request.HttpHeaders.TryGetValue("Request-Expiration", out var value) && TimeSpan.TryParse(value, out var expiration))
{
_logger?.Information("Interceptor is setting RabbitMQ TTL to {RequestExpiration} for Request {RequestId}", expiration, request.RequestId);
request.Expiration = expiration;
return null;
}
>>>>>>>
if (request.HttpHeaders.TryGetValue("Request-Expiration", out var value) && TimeSpan.TryParse(value, out var expiration))
{
_logger?.Information("Interceptor is setting RabbitMQ TTL to {RequestExpiration} for Request {RequestId}", expiration, request.RequestId);
request.Expiration = expiration;
return null;
}
// 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 reach the remote API.
request.AutoAcknowledge = true;
return null;
} |
<<<<<<<
=======
//TODO : Uncomment to reveal memory leak in debug window : you will see multiple instance of the RefreshableListViewTest page
//CompositionTarget.Rendering += CompositionTarget_Rendering;
>>>>>>>
<<<<<<<
{
CompositionTarget.Rendering += CompositionTarget_Rendering;
manipulating = true;
}
=======
{
//TODO : comment to reveal memory leak
CompositionTarget.Rendering += CompositionTarget_Rendering;
}
>>>>>>>
{
CompositionTarget.Rendering += CompositionTarget_Rendering;
}
<<<<<<<
manipulating = false;
CompositionTarget.Rendering -= CompositionTarget_Rendering;
=======
//TODO : Comment to reveal memory leak
CompositionTarget.Rendering -= CompositionTarget_Rendering;
>>>>>>>
CompositionTarget.Rendering -= CompositionTarget_Rendering; |
<<<<<<<
// 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, ActivationFunctionType.LeakyReLU),
=======
// Create the network
INeuralNetwork network = NetworkManager.NewSequential(TensorInfo.CreateForGrayscaleImage(28, 28),
>>>>>>>
// Create the network
INeuralNetwork network = NetworkManager.NewSequential(TensorInfo.Image<Alpha8>(28, 28), |
<<<<<<<
(var training, var test) = DataParser.LoadDatasets();
INeuralNetwork network = NetworkManager.NewSequential(TensorInfo.Image<Alpha8>(28, 28),
=======
// Create the network
INeuralNetwork network = NetworkManager.NewSequential(TensorInfo.CreateForGrayscaleImage(28, 28),
>>>>>>>
// Create the network
INeuralNetwork network = NetworkManager.NewSequential(TensorInfo.Image<Alpha8>(28, 28), |
<<<<<<<
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 MemoryStream();
imgd.Write(temp);
temp.Position = 0;
var loaded = Imgd.Read(temp);
Assert.Equal(
pixelData,
loaded.GetData()
);
}
[Fact]
public void TestPixelOrder4() => CreateImgdAndComparePixelData(
new byte[] { 0x12, 0x34, },
pixelData => Imgd.Create(
new System.Drawing.Size(2, 2),
PixelFormat.Indexed4,
pixelData,
new byte[4 * 16],
false
)
);
[Fact]
public void TestPixelOrder4Swizzled() => CreateImgdAndComparePixelData(
new byte[] { 0x12, 0x34, }
.Concat(new byte[128 * 128 / 2 - 2])
.ToArray(),
pixelData => Imgd.Create(
new System.Drawing.Size(128, 128),
PixelFormat.Indexed4,
pixelData,
new byte[4 * 16],
true
)
);
[Fact]
public void TestPixelOrder8() => CreateImgdAndComparePixelData(
new byte[] { 0x12, 0x34, 0x56, 0x78, },
pixelData => Imgd.Create(
new System.Drawing.Size(2, 2),
PixelFormat.Indexed8,
pixelData,
new byte[4 * 256],
false
)
);
[Fact]
public void TestPixelOrder8Swizzled() => CreateImgdAndComparePixelData(
new byte[] { 0x12, 0x34, 0x56, 0x78, }
.Concat(new byte[128 * 64 - 4])
.ToArray(),
pixelData => Imgd.Create(
new System.Drawing.Size(128, 64),
PixelFormat.Indexed8,
pixelData,
new byte[4 * 256],
true
)
);
=======
[Fact]
public void ReadRgba8888PixelOrder()
{
var imgd = File.OpenRead($"kh2/res/2x2x32.imd").Using(Imgd.Read);
Assert.Equal(new Size(2, 2), imgd.Size);
Assert.Equal(PixelFormat.Rgba8888, imgd.PixelFormat);
Assert.Equal(
new byte[] {
// GetData(): B, G, R, A
0xFF, 0x7F, 0x27, 0xFF,
0x22, 0xB1, 0x4C, 0xFF,
0x00, 0xA2, 0xE8, 0xFF,
0xFF, 0xF2, 0x00, 0xFF,
},
imgd.GetData()
);
Assert.Equal(
new byte[] {
// Data: R, G, B, A
0x27, 0x7F, 0xFF, 0xFF,
0x4C, 0xB1, 0x22, 0xFF,
0xE8, 0xA2, 0x00, 0xFF,
0x00, 0xF2, 0xFF, 0xFF,
},
imgd.Data
);
}
[Fact]
public void WriteRgba8888PixelOrder()
{
var actual = new MemoryStream();
Imgd
.Create(
new Size(2, 2),
PixelFormat.Rgba8888,
new byte[] {
// Input: R, G, B, A
0x27, 0x7F, 0xFF, 0xFF,
0x4C, 0xB1, 0x22, 0xFF,
0xE8, 0xA2, 0x00, 0xFF,
0x00, 0xF2, 0xFF, 0xFF,
},
null,
false
)
.Write(actual);
var expectedData = File.ReadAllBytes($"kh2/res/2x2x32.imd");
Assert.Equal(expectedData, actual.ToArray());
}
>>>>>>>
void CreateImgdAndComparePixelData(
byte[] pixelData,
Func<byte[], Imgd> imgdFactory
)
{
var imgd = imgdFactory(pixelData);
var temp = new MemoryStream();
imgd.Write(temp);
temp.Position = 0;
var loaded = Imgd.Read(temp);
Assert.Equal(
pixelData,
loaded.GetData()
);
}
[Fact]
public void TestPixelOrder4() => CreateImgdAndComparePixelData(
new byte[] { 0x12, 0x34, },
pixelData => Imgd.Create(
new System.Drawing.Size(2, 2),
PixelFormat.Indexed4,
pixelData,
new byte[4 * 16],
false
)
);
[Fact]
public void TestPixelOrder4Swizzled() => CreateImgdAndComparePixelData(
new byte[] { 0x12, 0x34, }
.Concat(new byte[128 * 128 / 2 - 2])
.ToArray(),
pixelData => Imgd.Create(
new System.Drawing.Size(128, 128),
PixelFormat.Indexed4,
pixelData,
new byte[4 * 16],
true
)
);
[Fact]
public void TestPixelOrder8() => CreateImgdAndComparePixelData(
new byte[] { 0x12, 0x34, 0x56, 0x78, },
pixelData => Imgd.Create(
new System.Drawing.Size(2, 2),
PixelFormat.Indexed8,
pixelData,
new byte[4 * 256],
false
)
);
[Fact]
public void TestPixelOrder8Swizzled() => CreateImgdAndComparePixelData(
new byte[] { 0x12, 0x34, 0x56, 0x78, }
.Concat(new byte[128 * 64 - 4])
.ToArray(),
pixelData => Imgd.Create(
new System.Drawing.Size(128, 64),
PixelFormat.Indexed8,
pixelData,
new byte[4 * 256],
true
)
);
[Fact]
public void ReadRgba8888PixelOrder()
{
var imgd = File.OpenRead($"kh2/res/2x2x32.imd").Using(Imgd.Read);
Assert.Equal(new Size(2, 2), imgd.Size);
Assert.Equal(PixelFormat.Rgba8888, imgd.PixelFormat);
Assert.Equal(
new byte[] {
// GetData(): B, G, R, A
0xFF, 0x7F, 0x27, 0xFF,
0x22, 0xB1, 0x4C, 0xFF,
0x00, 0xA2, 0xE8, 0xFF,
0xFF, 0xF2, 0x00, 0xFF,
},
imgd.GetData()
);
Assert.Equal(
new byte[] {
// Data: R, G, B, A
0x27, 0x7F, 0xFF, 0xFF,
0x4C, 0xB1, 0x22, 0xFF,
0xE8, 0xA2, 0x00, 0xFF,
0x00, 0xF2, 0xFF, 0xFF,
},
imgd.Data
);
}
[Fact]
public void WriteRgba8888PixelOrder()
{
var actual = new MemoryStream();
Imgd
.Create(
new Size(2, 2),
PixelFormat.Rgba8888,
new byte[] {
// Input: R, G, B, A
0x27, 0x7F, 0xFF, 0xFF,
0x4C, 0xB1, 0x22, 0xFF,
0xE8, 0xA2, 0x00, 0xFF,
0x00, 0xF2, 0xFF, 0xFF,
},
null,
false
)
.Write(actual);
var expectedData = File.ReadAllBytes($"kh2/res/2x2x32.imd");
Assert.Equal(expectedData, actual.ToArray());
} |
<<<<<<<
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 extern int git_config_find_programdata(GitBuf programdata_config_path);
[DllImport(libgit2)]
internal static extern unsafe void git_config_free(git_config *cfg);
<<<<<<<
internal static extern unsafe int git_describe_commit(
out git_describe_result* describe,
git_object* committish,
=======
internal static extern void git_cred_free(IntPtr cred);
[DllImport(libgit2)]
internal static extern int git_describe_commit(
out DescribeResultSafeHandle describe,
GitObjectSafeHandle committish,
>>>>>>>
internal static extern void git_cred_free(IntPtr cred);
[DllImport(libgit2)]
internal static extern unsafe int git_describe_commit(
out git_describe_result* describe,
git_object* committish, |
<<<<<<<
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_repository_odb(out git_odb* odb, git_repository* repo);
>>>>>>>
internal static extern unsafe int git_repository_new(
out git_repository* repo);
[DllImport(libgit2)]
internal static extern unsafe int git_repository_odb(out git_odb* odb, git_repository* repo); |
<<<<<<<
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_config_free(IntPtr config)
{
NativeMethods.git_config_free(config);
}
public static void git_config_entry_free(IntPtr entry)
>>>>>>>
public static FilePath git_config_find_programdata()
{
return ConvertPath(NativeMethods.git_config_find_programdata);
}
public static unsafe void git_config_free(git_config *config)
{
NativeMethods.git_config_free(config);
}
public static unsafe ConfigurationEntry<T> git_config_get_entry<T>(ConfigurationHandle config, string key)
<<<<<<<
public static unsafe IndexHandle git_merge_commits(RepositoryHandle repo, ObjectHandle ourCommit, ObjectHandle theirCommit, GitMergeOpts opts)
=======
public static IndexSafeHandle git_merge_commits(RepositorySafeHandle repo, GitObjectSafeHandle ourCommit, GitObjectSafeHandle theirCommit, GitMergeOpts opts, out bool earlyStop)
>>>>>>>
public static unsafe IndexHandle git_merge_commits(RepositoryHandle repo, ObjectHandle ourCommit, ObjectHandle theirCommit, GitMergeOpts opts, out bool earlyStop)
<<<<<<<
public static unsafe void git_merge(RepositoryHandle repo, AnnotatedCommitHandle[] heads, GitMergeOpts mergeOptions, GitCheckoutOpts checkoutOptions)
=======
public static void git_merge(RepositorySafeHandle repo, GitAnnotatedCommitHandle[] heads, GitMergeOpts mergeOptions, GitCheckoutOpts checkoutOptions, out bool earlyStop)
>>>>>>>
public static unsafe void git_merge(RepositoryHandle repo, AnnotatedCommitHandle[] heads, GitMergeOpts mergeOptions, GitCheckoutOpts checkoutOptions, out bool earlyStop)
<<<<<<<
public static unsafe string git_refspec_rtransform(git_refspec* refSpecPtr, string name)
=======
public static string git_refspec_transform(GitRefSpecHandle refSpecPtr, string name)
{
using (var buf = new GitBuf())
{
int res = NativeMethods.git_refspec_transform(buf, refSpecPtr, name);
Ensure.ZeroResult(res);
return LaxUtf8Marshaler.FromNative(buf.ptr) ?? string.Empty;
}
}
public static string git_refspec_rtransform(GitRefSpecHandle refSpecPtr, string name)
>>>>>>>
public static unsafe string git_refspec_transform(IntPtr refSpecPtr, string name)
{
using (var buf = new GitBuf())
{
int res = NativeMethods.git_refspec_transform(buf, refSpecPtr, name);
Ensure.ZeroResult(res);
return LaxUtf8Marshaler.FromNative(buf.ptr) ?? string.Empty;
}
}
public static unsafe string git_refspec_rtransform(IntPtr refSpecPtr, string name) |
<<<<<<<
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 enable the cache, false otherwise</param>
public static void SetEnableCaching(bool enabled)
{
Proxy.git_libgit2_opts_set_enable_caching(enabled);
}
>>>>>>>
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 enable the cache, false otherwise</param>
public static void SetEnableCaching(bool enabled)
{
Proxy.git_libgit2_opts_set_enable_caching(enabled);
} |
<<<<<<<
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="ArgumentException"> input length is not divisible by 2 </exception>
///
/// <param name="data"> The serialised complex values, even indexes are real and odd ones imaginary</param>
///
/// <returns> A Complex[].</returns>
>>>>>>>
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="ArgumentException"> input length is not divisible by 2 </exception>
///
/// <param name="data"> The serialised complex values, even indexes are real and odd ones imaginary</param>
///
/// <returns> A Complex[].</returns> |
<<<<<<<
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[0]);
Assert.Equal("foo", vector[1]);
<<<<<<<
Assert.Single(third);
Assert.Equal("bar", third[0]);
=======
Assert.AreEqual(1, third.Length);
Assert.AreEqual("bar", third[0]);
Assert.AreEqual("foo", vector[1]);
>>>>>>>
Assert.Single(third);
Assert.Equal("bar", third[0]);
Assert.Equal("foo", vector[1]); |
<<<<<<<
QuickCommander = new QuickCommanderViewModel();
=======
OnSolutionChanged = Observable.FromEventPattern<SolutionChangedEventArgs>(this, nameof(SolutionChanged)).Select(s => s.EventArgs.NewValue);
_taskRunner = new WorkspaceTaskRunner();
>>>>>>>
OnSolutionChanged = Observable.FromEventPattern<SolutionChangedEventArgs>(this, nameof(SolutionChanged)).Select(s => s.EventArgs.NewValue);
_taskRunner = new WorkspaceTaskRunner();
QuickCommander = new QuickCommanderViewModel();
<<<<<<<
get { return modalDialog; }
set { this.RaiseAndSetIfChanged(ref modalDialog, value); }
}
public QuickCommanderViewModel QuickCommander
{
get { return _quickCommander; }
set { this.RaiseAndSetIfChanged(ref _quickCommander, value); }
=======
get { return modalDialog; }
set { this.RaiseAndSetIfChanged(ref modalDialog, value); }
>>>>>>>
get { return modalDialog; }
set { this.RaiseAndSetIfChanged(ref modalDialog, value); }
}
public QuickCommanderViewModel QuickCommander
{
get { return _quickCommander; }
set { this.RaiseAndSetIfChanged(ref _quickCommander, value); } |
<<<<<<<
#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 exception. If this is not
/// explicitly provided, the subsequent middleware pipeline will be used by default.
/// </summary>
public RequestDelegate ExceptionHandler { get; set; }
>>>>>>>
/// <summary>
/// The <see cref="RequestDelegate" /> that will handle the exception. If this is not
/// explicitly provided, the subsequent middleware pipeline will be used by default.
/// </summary>
public RequestDelegate? ExceptionHandler { get; set; } |
<<<<<<<
if (!_justOpened && intellisenseControl.IsVisible && caretIndex <= intellisenseStartedAt)
{
=======
if (intellisenseControl.IsVisible && caretIndex <= intellisenseStartedAt && e.Key != Key.LeftShift && e.Key != Key.RightShift && e.Key != Key.Up && e.Key != Key.Down)
{
>>>>>>>
if (!_justOpened && intellisenseControl.IsVisible && caretIndex <= intellisenseStartedAt && e.Key != Key.LeftShift && e.Key != Key.RightShift && e.Key != Key.Up && e.Key != Key.Down)
{ |
<<<<<<<
public class BreakPointMargin : TextViewMargin
{
private readonly BreakpointStore _manager;
private int previewLine;
private bool previewPointVisible;
static BreakPointMargin()
{
FocusableProperty.OverrideDefaultValue(typeof (BreakPointMargin), true);
}
public BreakPointMargin(BreakpointStore manager)
{
if (manager == null)
{
throw new ArgumentNullException("manager");
}
this._manager = manager;
}
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnDetachedFromVisualTree(e);
}
public override void Render(DrawingContext context, TextInfo textInfo)
{
Width = textInfo.LineHeight;
context.FillRectangle(Brush.Parse("#333333"), Bounds);
if (previewPointVisible)
{
context.FillRectangle(Brush.Parse("#E67466"),
new Rect(Bounds.Size.Width/4 - 1,
textInfo.LineHeight*(previewLine - textView.VisualLines.First().DocumentLine.LineNumber) + Bounds.Size.Width/4,
Bounds.Size.Width/1.5, textInfo.LineHeight/1.5), (float) textInfo.LineHeight);
}
foreach (var breakPoint in _manager?.OfType<Breakpoint>().Where(bp => bp.FileName.IsSamePathAs(textView.TextDocument.FileName)))
{
context.FillRectangle(Brush.Parse("#FF3737"),
new Rect(Bounds.Size.Width/4 - 1,
textInfo.LineHeight*(breakPoint.Line - textView.VisualLines.First().DocumentLine.LineNumber) + Bounds.Size.Width/4,
Bounds.Size.Width/1.5, textInfo.LineHeight/1.5), (float) textInfo.LineHeight);
}
}
protected override void OnPointerMoved(PointerEventArgs e)
{
previewPointVisible = true;
var offset = textView.GetOffsetFromPoint(e.GetPosition(this));
if (offset != -1)
{
previewLine = textView.TextDocument.GetLineByOffset(offset).LineNumber; // convert from text line to visual line.
}
InvalidateVisual();
}
protected override void OnPointerReleased(PointerEventArgs e)
{
previewPointVisible = true;
var offset = textView.GetOffsetFromPoint(e.GetPosition(this));
if (offset != -1)
{
var lineClicked = -1;
lineClicked = textView.TextDocument.GetLineByOffset(offset).LineNumber; // convert from text line to visual line.
var currentBreakPoint =
_manager.OfType<Breakpoint>().FirstOrDefault(bp => bp.FileName == textView.TextDocument.FileName && bp.Line == lineClicked) as BreakEvent;
if (currentBreakPoint != null)
{
_manager.Remove(currentBreakPoint);
}
else
{
if (!string.IsNullOrEmpty(textView.TextDocument.FileName))
{
_manager.Add(textView.TextDocument.FileName, lineClicked);
}
}
}
InvalidateVisual();
}
protected override Size MeasureOverride(Size availableSize)
{
return new Size(100, 0);
}
protected override void OnPointerLeave(PointerEventArgs e)
{
previewPointVisible = false;
InvalidateVisual();
}
protected override void OnPointerPressed(PointerPressedEventArgs e)
{
InvalidateVisual();
}
}
=======
public class BreakPointMargin : TextViewMargin
{
private readonly BreakPointManager manager;
private int previewLine;
private bool previewPointVisible;
static BreakPointMargin()
{
FocusableProperty.OverrideDefaultValue(typeof(BreakPointMargin), true);
}
public BreakPointMargin(BreakPointManager manager)
{
if (manager == null)
{
throw new ArgumentNullException("manager");
}
this.manager = manager;
}
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnDetachedFromVisualTree(e);
}
public override void Render(DrawingContext context, TextInfo textInfo)
{
Width = textInfo.LineHeight;
context.FillRectangle(Brush.Parse("#333333"), Bounds);
if (previewPointVisible)
{
context.FillRectangle(Brush.Parse("#E67466"),
new Rect((Bounds.Size.Width / 4) - 1,
(textInfo.LineHeight * (previewLine - textView.VisualLines.First().DocumentLine.LineNumber)) + (Bounds.Size.Width / 4),
Bounds.Size.Width / 1.5, textInfo.LineHeight / 1.5), (float)textInfo.LineHeight);
}
foreach (var breakPoint in manager?.Where(bp => bp.File.IsSamePathAs(textView.TextDocument.FileName)))
{
context.FillRectangle(Brush.Parse("#FF3737"),
new Rect((Bounds.Size.Width / 4) - 1,
(textInfo.LineHeight * (breakPoint.Line - textView.VisualLines.First().DocumentLine.LineNumber)) + (Bounds.Size.Width / 4),
Bounds.Size.Width / 1.5, textInfo.LineHeight / 1.5), (float)textInfo.LineHeight);
}
}
protected override void OnPointerMoved(PointerEventArgs e)
{
previewPointVisible = true;
var offset = textView.GetOffsetFromPoint(e.GetPosition(this));
if (offset != -1)
{
previewLine = textView.TextDocument.GetLineByOffset(offset).LineNumber; // convert from text line to visual line.
}
InvalidateVisual();
}
protected override async void OnPointerReleased(PointerEventArgs e)
{
previewPointVisible = true;
var offset = textView.GetOffsetFromPoint(e.GetPosition(this));
if (offset != -1)
{
var lineClicked = -1;
lineClicked = textView.TextDocument.GetLineByOffset(offset).LineNumber; // convert from text line to visual line.
var currentBreakPoint =
manager.FirstOrDefault(bp => bp.File == textView.TextDocument.FileName && bp.Line == lineClicked);
if (currentBreakPoint != null)
{
await manager.Remove(currentBreakPoint);
}
else
{
if (!string.IsNullOrEmpty(textView.TextDocument.FileName))
{
await manager.Add(new BreakPoint { File = textView.TextDocument.FileName, Line = (uint)lineClicked });
}
}
}
InvalidateVisual();
}
protected override Size MeasureOverride(Size availableSize)
{
return new Size(100, 0);
}
protected override void OnPointerLeave(PointerEventArgs e)
{
previewPointVisible = false;
InvalidateVisual();
}
protected override void OnPointerPressed(PointerPressedEventArgs e)
{
InvalidateVisual();
}
}
>>>>>>>
public class BreakPointMargin : TextViewMargin
{
private readonly BreakpointStore _manager;
private int previewLine;
private bool previewPointVisible;
static BreakPointMargin()
{
FocusableProperty.OverrideDefaultValue(typeof(BreakPointMargin), true);
}
public BreakPointMargin(BreakpointStore manager)
{
if (manager == null)
{
throw new ArgumentNullException("manager");
}
this._manager = manager;
}
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnDetachedFromVisualTree(e);
}
public override void Render(DrawingContext context, TextInfo textInfo)
{
Width = textInfo.LineHeight;
context.FillRectangle(Brush.Parse("#333333"), Bounds);
if (previewPointVisible)
{
context.FillRectangle(Brush.Parse("#E67466"),
new Rect((Bounds.Size.Width / 4) - 1,
(textInfo.LineHeight * (previewLine - textView.VisualLines.First().DocumentLine.LineNumber)) + (Bounds.Size.Width / 4),
Bounds.Size.Width / 1.5, textInfo.LineHeight / 1.5), (float)textInfo.LineHeight);
}
foreach (var breakPoint in _manager?.OfType<Breakpoint>().Where(bp => bp.FileName.IsSamePathAs(textView.TextDocument.FileName)))
{
context.FillRectangle(Brush.Parse("#FF3737"),
new Rect(Bounds.Size.Width/4 - 1,
textInfo.LineHeight*(breakPoint.Line - textView.VisualLines.First().DocumentLine.LineNumber) + Bounds.Size.Width/4,
Bounds.Size.Width/1.5, textInfo.LineHeight/1.5), (float) textInfo.LineHeight);
}
}
protected override void OnPointerMoved(PointerEventArgs e)
{
previewPointVisible = true;
var offset = textView.GetOffsetFromPoint(e.GetPosition(this));
if (offset != -1)
{
previewLine = textView.TextDocument.GetLineByOffset(offset).LineNumber; // convert from text line to visual line.
}
InvalidateVisual();
}
protected override void OnPointerReleased(PointerEventArgs e)
{
previewPointVisible = true;
var offset = textView.GetOffsetFromPoint(e.GetPosition(this));
if (offset != -1)
{
var lineClicked = -1;
lineClicked = textView.TextDocument.GetLineByOffset(offset).LineNumber; // convert from text line to visual line.
var currentBreakPoint =
_manager.OfType<Breakpoint>().FirstOrDefault(bp => bp.FileName == textView.TextDocument.FileName && bp.Line == lineClicked) as BreakEvent;
if (currentBreakPoint != null)
{
_manager.Remove(currentBreakPoint);
}
else
{
if (!string.IsNullOrEmpty(textView.TextDocument.FileName))
{
_manager.Add(textView.TextDocument.FileName, lineClicked);
}
}
}
InvalidateVisual();
}
protected override Size MeasureOverride(Size availableSize)
{
return new Size(100, 0);
}
protected override void OnPointerLeave(PointerEventArgs e)
{
previewPointVisible = false;
InvalidateVisual();
}
protected override void OnPointerPressed(PointerPressedEventArgs e)
{
InvalidateVisual();
}
} |
<<<<<<<
=======
{ "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<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference=null)
where TData : class, new()
<<<<<<<
public Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null)
where TData : class, new()
=======
public Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null, string reference=null)
where TData : class
>>>>>>>
public Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null, string reference=null)
where TData : class, new() |
<<<<<<<
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;
case "class": t.kind = 15; break;
case "static": t.kind = 16; break;
case "datatype": t.kind = 17; break;
case "codatatype": t.kind = 18; break;
case "var": t.kind = 20; break;
case "type": t.kind = 22; break;
case "method": t.kind = 25; break;
case "constructor": t.kind = 26; break;
case "returns": t.kind = 27; break;
case "modifies": t.kind = 29; break;
case "free": t.kind = 30; break;
case "requires": t.kind = 31; break;
case "ensures": t.kind = 32; break;
case "decreases": t.kind = 33; break;
case "bool": t.kind = 36; break;
case "nat": t.kind = 37; break;
case "int": t.kind = 38; break;
case "set": t.kind = 39; break;
case "multiset": t.kind = 40; break;
case "seq": t.kind = 41; break;
case "map": t.kind = 42; break;
case "object": t.kind = 43; break;
case "function": t.kind = 44; break;
case "predicate": t.kind = 45; break;
case "reads": t.kind = 46; break;
case "label": t.kind = 49; break;
case "break": t.kind = 50; break;
case "return": t.kind = 51; break;
case "assume": t.kind = 54; break;
case "new": t.kind = 55; break;
case "choose": t.kind = 58; break;
case "if": t.kind = 59; break;
case "else": t.kind = 60; break;
case "case": t.kind = 61; break;
case "while": t.kind = 63; break;
case "invariant": t.kind = 64; break;
case "match": t.kind = 65; break;
case "assert": t.kind = 66; break;
case "print": t.kind = 67; break;
case "parallel": t.kind = 68; break;
=======
case "imports": t.kind = 11; break;
case "class": t.kind = 12; break;
case "static": t.kind = 13; break;
case "datatype": t.kind = 14; break;
case "codatatype": t.kind = 15; break;
case "var": t.kind = 19; break;
case "type": t.kind = 21; break;
case "method": t.kind = 27; break;
case "constructor": t.kind = 28; break;
case "returns": t.kind = 29; break;
case "modifies": t.kind = 31; break;
case "free": t.kind = 32; break;
case "requires": t.kind = 33; break;
case "ensures": t.kind = 34; break;
case "decreases": t.kind = 35; break;
case "bool": t.kind = 36; break;
case "nat": t.kind = 37; break;
case "int": t.kind = 38; break;
case "set": t.kind = 39; break;
case "multiset": t.kind = 40; break;
case "seq": t.kind = 41; break;
case "map": t.kind = 42; break;
case "object": t.kind = 43; break;
case "function": t.kind = 45; break;
case "predicate": t.kind = 46; break;
case "reads": t.kind = 47; break;
case "label": t.kind = 50; break;
case "break": t.kind = 51; break;
case "return": t.kind = 52; break;
case "assume": t.kind = 55; break;
case "new": t.kind = 56; break;
case "choose": t.kind = 59; break;
case "if": t.kind = 60; break;
case "else": t.kind = 61; break;
case "case": t.kind = 62; break;
case "while": t.kind = 64; break;
case "invariant": t.kind = 65; break;
case "match": t.kind = 66; break;
case "assert": t.kind = 67; break;
case "print": t.kind = 68; break;
case "parallel": t.kind = 69; break;
>>>>>>>
case "as": t.kind = 13; break;
case "class": t.kind = 15; break;
case "static": t.kind = 16; break;
case "datatype": t.kind = 17; break;
case "codatatype": t.kind = 18; break;
case "var": t.kind = 20; break;
case "type": t.kind = 22; break;
case "method": t.kind = 28; break;
case "constructor": t.kind = 29; break;
case "returns": t.kind = 30; break;
case "modifies": t.kind = 32; break;
case "free": t.kind = 33; break;
case "requires": t.kind = 34; break;
case "ensures": t.kind = 35; break;
case "decreases": t.kind = 36; break;
case "bool": t.kind = 37; break;
case "nat": t.kind = 38; break;
case "int": t.kind = 39; break;
case "set": t.kind = 40; break;
case "multiset": t.kind = 41; break;
case "seq": t.kind = 42; break;
case "map": t.kind = 43; break;
case "object": t.kind = 44; break;
case "function": t.kind = 45; break;
case "predicate": t.kind = 46; break;
case "reads": t.kind = 47; break;
case "label": t.kind = 50; break;
case "break": t.kind = 51; break;
case "return": t.kind = 52; break;
case "assume": t.kind = 55; break;
case "new": t.kind = 56; break;
case "choose": t.kind = 59; break;
case "if": t.kind = 60; break;
case "else": t.kind = 61; break;
case "case": t.kind = 62; break;
case "while": t.kind = 64; break;
case "invariant": t.kind = 65; break;
case "match": t.kind = 66; break;
case "assert": t.kind = 67; break;
case "print": t.kind = 68; break;
case "parallel": t.kind = 69; break;
<<<<<<<
{t.kind = 28; break;}
=======
{t.kind = 22; break;}
>>>>>>>
{t.kind = 23; break;}
<<<<<<<
{t.kind = 34; break;}
case 23:
{t.kind = 35; break;}
=======
{t.kind = 24; break;}
case 23:
{t.kind = 30; break;}
>>>>>>>
{t.kind = 25; break;}
case 23:
{t.kind = 31; break;}
<<<<<<<
recEnd = pos; recKind = 11;
if (ch == '>') {AddCh(); goto case 30;}
else if (ch == '=') {AddCh(); goto case 63;}
else {t.kind = 11; break;}
=======
recEnd = pos; recKind = 16;
if (ch == '=') {AddCh(); goto case 63;}
else if (ch == '>') {AddCh(); goto case 30;}
else {t.kind = 16; break;}
>>>>>>>
recEnd = pos; recKind = 11;
if (ch == '=') {AddCh(); goto case 63;}
else if (ch == '>') {AddCh(); goto case 30;}
else {t.kind = 11; break;}
<<<<<<<
recEnd = pos; recKind = 19;
if (ch == '|') {AddCh(); goto case 39;}
else {t.kind = 19; break;}
=======
recEnd = pos; recKind = 25;
if (ch == '=') {AddCh(); goto case 64;}
else {t.kind = 25; break;}
>>>>>>>
recEnd = pos; recKind = 19;
if (ch == '|') {AddCh(); goto case 39;}
else {t.kind = 19; break;}
<<<<<<<
recEnd = pos; recKind = 23;
if (ch == '=') {AddCh(); goto case 65;}
else {t.kind = 23; break;}
=======
recEnd = pos; recKind = 26;
if (ch == '=') {AddCh(); goto case 41;}
else {t.kind = 26; break;}
>>>>>>>
recEnd = pos; recKind = 26;
if (ch == '=') {AddCh(); goto case 65;}
else {t.kind = 26; break;}
<<<<<<<
recEnd = pos; recKind = 24;
if (ch == '=') {AddCh(); goto case 41;}
else {t.kind = 24; break;}
=======
recEnd = pos; recKind = 44;
if (ch == '.') {AddCh(); goto case 65;}
else {t.kind = 44; break;}
>>>>>>>
recEnd = pos; recKind = 27;
if (ch == '=') {AddCh(); goto case 41;}
else {t.kind = 27; 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 (Variable v in path.varToExpr.Keys.Except(postExistVars))
<<<<<<<
=======
>>>>>>> |
<<<<<<<
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);
} else {
ModuleSignature original = ((AbstractModuleDecl)d).OriginalSignature;
ModuleSignature derived = null;
if (nw is AliasModuleDecl) {
derived = ((AliasModuleDecl)nw).Signature;
} else if (nw is AbstractModuleDecl) {
derived = ((AbstractModuleDecl)nw).Signature;
} else {
reporter.Error(nw, "a module ({0}) can only be refined by alias or abstract modules", d.Name);
}
if (derived != null) {
// check that the new module refines the previous declaration
while (derived != null) {
if (derived == original)
break;
derived = derived.Refines;
}
if (derived != original) {
reporter.Error(nw, "a module ({0}) can only be replaced by a refinement of the original module", d.Name);
}
}
}
} else if (d is ArbitraryTypeDecl) {
// this is allowed to be refined by any type declaration, so just keep the new one
// of course, the new thing has to be a type. Everything is a type except for a module
// declaration
if (nw is ModuleDecl) {
reporter.Error(nw, "a module ({0}) must refine another module", nw.Name);
}
=======
if (d is ArbitraryTypeDecl) {
bool dDemandsEqualitySupport = ((ArbitraryTypeDecl)d).MustSupportEquality;
if (nw is ArbitraryTypeDecl) {
if (dDemandsEqualitySupport != ((ArbitraryTypeDecl)nw).MustSupportEquality) {
reporter.Error(nw, "type declaration '{0}' is not allowed to change the requirement of supporting equality", nw.Name);
}
} else if (dDemandsEqualitySupport) {
if (nw is ClassDecl) {
// fine, as long as "nw" does not take any type parameters
if (nw.TypeArgs.Count != 0) {
reporter.Error(nw, "arbitrary type '{0}' is not allowed to be replaced by a class that takes type parameters", nw.Name);
}
} else if (nw is CoDatatypeDecl) {
reporter.Error(nw, "a type declaration that requires equality support cannot be replaced by a codatatype");
} else {
Contract.Assert(nw is IndDatatypeDecl);
if (nw.TypeArgs.Count != 0) {
reporter.Error(nw, "arbitrary type '{0}' is not allowed to be replaced by a datatype that takes type parameters", nw.Name);
} else {
// Here, we need to figure out if the new type supports equality. But we won't know about that until resolution has
// taken place, so we defer it until the PostResolve phase.
var udt = new UserDefinedType(nw.tok, nw.Name, nw, new List<Type>());
postTasks.Enqueue(delegate() {
if (!udt.SupportsEquality) {
reporter.Error(udt.tok, "datatype '{0}' is used to refine an arbitrary type with equality support, but '{0}' does not support equality", udt.Name);
}
});
}
}
}
>>>>>>>
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);
} else {
ModuleSignature original = ((AbstractModuleDecl)d).OriginalSignature;
ModuleSignature derived = null;
if (nw is AliasModuleDecl) {
derived = ((AliasModuleDecl)nw).Signature;
} else if (nw is AbstractModuleDecl) {
derived = ((AbstractModuleDecl)nw).Signature;
} else {
reporter.Error(nw, "a module ({0}) can only be refined by alias or abstract modules", d.Name);
}
if (derived != null) {
// check that the new module refines the previous declaration
while (derived != null) {
if (derived == original)
break;
derived = derived.Refines;
}
if (derived != original) {
reporter.Error(nw, "a module ({0}) can only be replaced by a refinement of the original module", d.Name);
}
}
}
} else if (d is ArbitraryTypeDecl) {
if (nw is ModuleDecl) {
reporter.Error(nw, "a module ({0}) must refine another module", nw.Name);
} else {
bool dDemandsEqualitySupport = ((ArbitraryTypeDecl)d).MustSupportEquality;
if (nw is ArbitraryTypeDecl) {
if (dDemandsEqualitySupport != ((ArbitraryTypeDecl)nw).MustSupportEquality) {
reporter.Error(nw, "type declaration '{0}' is not allowed to change the requirement of supporting equality", nw.Name);
}
} else if (dDemandsEqualitySupport) {
if (nw is ClassDecl) {
// fine, as long as "nw" does not take any type parameters
if (nw.TypeArgs.Count != 0) {
reporter.Error(nw, "arbitrary type '{0}' is not allowed to be replaced by a class that takes type parameters", nw.Name);
}
} else if (nw is CoDatatypeDecl) {
reporter.Error(nw, "a type declaration that requires equality support cannot be replaced by a codatatype");
} else {
Contract.Assert(nw is IndDatatypeDecl);
if (nw.TypeArgs.Count != 0) {
reporter.Error(nw, "arbitrary type '{0}' is not allowed to be replaced by a datatype that takes type parameters", nw.Name);
} else {
// Here, we need to figure out if the new type supports equality. But we won't know about that until resolution has
// taken place, so we defer it until the PostResolve phase.
var udt = new UserDefinedType(nw.tok, nw.Name, nw, new List<Type>());
postTasks.Enqueue(delegate()
{
if (!udt.SupportsEquality) {
reporter.Error(udt.tok, "datatype '{0}' is used to refine an arbitrary type with equality support, but '{0}' does not support equality", udt.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, ls, bs));
blocks.Insert(0, initBlock);
}
=======
new CallCmd(Token.NoToken,
first.proc.Name,
first.firstInParams.Select(Expr.Ident).ToList<Expr>(),
first.firstOutParams.Select(Expr.Ident).ToList()
) { Proc = first.proc },
new CallCmd(Token.NoToken,
second.proc.Name,
second.secondInParams.Select(Expr.Ident).ToList<Expr>(),
second.secondOutParams.Select(Expr.Ident).ToList()
) { Proc = second.proc }
};
var block = new Block(Token.NoToken, "init", cmds, new ReturnCmd(Token.NoToken));
>>>>>>>
new CallCmd(Token.NoToken,
first.proc.Name,
first.firstInParams.Select(Expr.Ident).ToList<Expr>(),
first.firstOutParams.Select(Expr.Ident).ToList()
) { Proc = first.proc },
new CallCmd(Token.NoToken,
second.proc.Name,
second.secondInParams.Select(Expr.Ident).ToList<Expr>(),
second.secondOutParams.Select(Expr.Ident).ToList()
) { Proc = second.proc }
};
var block = new Block(Token.NoToken, "init", cmds, new ReturnCmd(Token.NoToken));
<<<<<<<
Ensures ensureCheck = new Ensures(assertCmd.tok, false, Expr.Imp(Expr.And(linearityAssumes), assertCmd.Expr), null);
ensureCheck.ErrorData = $"Gate of {first.proc.Name} not preserved by {second.proc.Name}";
=======
Ensures ensureCheck = new Ensures(assertCmd.tok, false, Expr.Imp(Expr.And(linearityAssumes), assertCmd.Expr), null)
{
ErrorData = string.Format("Gate of {0} not preserved by {1}", first.proc.Name, second.proc.Name)
};
>>>>>>>
Ensures ensureCheck = new Ensures(assertCmd.tok, false, Expr.Imp(Expr.And(linearityAssumes), assertCmd.Expr), null)
{
ErrorData = $"Gate of {first.proc.Name} not preserved by {second.proc.Name}"
};
<<<<<<<
string checkerName = $"GatePreservationChecker_{first.proc.Name}_{second.proc.Name}";
AddChecker(checkerName, inputs, outputs, locals, requires, ensures, blocks);
=======
string checkerName = string.Format("GatePreservationChecker_{0}_{1}", first.proc.Name, second.proc.Name);
List<Variable> inputs = Enumerable.Union(first.firstInParams, second.secondInParams).ToList();
List<Variable> outputs = Enumerable.Union(first.firstOutParams, second.secondOutParams).ToList();
var block = new Block(Token.NoToken, "init",
new List<Cmd>
{
new CallCmd(Token.NoToken,
second.proc.Name,
second.secondInParams.Select(Expr.Ident).ToList<Expr>(),
second.secondOutParams.Select(Expr.Ident).ToList()
) { Proc = second.proc }
},
new ReturnCmd(Token.NoToken));
AddChecker(checkerName, inputs, outputs, new List<Variable>(), requires, ensures, new List<Block> { block });
>>>>>>>
string checkerName = $"GatePreservationChecker_{first.proc.Name}_{second.proc.Name}";
List<Variable> inputs = Enumerable.Union(first.firstInParams, second.secondInParams).ToList();
List<Variable> outputs = Enumerable.Union(first.firstOutParams, second.secondOutParams).ToList();
var block = new Block(Token.NoToken, "init",
new List<Cmd>
{
new CallCmd(Token.NoToken,
second.proc.Name,
second.secondInParams.Select(Expr.Ident).ToList<Expr>(),
second.secondOutParams.Select(Expr.Ident).ToList()
) { Proc = second.proc }
},
new ReturnCmd(Token.NoToken));
AddChecker(checkerName, inputs, outputs, new List<Variable>(), requires, ensures, new List<Block> { block });
<<<<<<<
Ensures ensureCheck = new Ensures(first.proc.tok, false, Expr.Imp(Expr.And(linearityAssumes), firstNegatedGate), null);
ensureCheck.ErrorData = $"Gate failure of {first.proc.Name} not preserved by {second.proc.Name}";
=======
Ensures ensureCheck = new Ensures(first.proc.tok, false, Expr.Imp(Expr.And(linearityAssumes), firstNegatedGate), null)
{
ErrorData = string.Format("Gate failure of {0} not preserved by {1}", first.proc.Name, second.proc.Name)
};
>>>>>>>
Ensures ensureCheck = new Ensures(first.proc.tok, false, Expr.Imp(Expr.And(linearityAssumes), firstNegatedGate), null)
{
ErrorData = $"Gate failure of {first.proc.Name} not preserved by {second.proc.Name}"
}; |
<<<<<<<
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));
>>>>>>>
Contract.Invariant(-1 <= this.bracketIdsInVC && this.bracketIdsInVC <= 1);
Contract.Invariant(cce.NonNullElements(this.proverOptions)); |
<<<<<<<
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 domain = linearTypechecker.linearDomains[domainName];
Formal f = new Formal(Token.NoToken, new TypedIdent(Token.NoToken, "linear_" + domainName + "_in", new MapType(Token.NoToken, new List<TypeVariable>(), new List<Type> { domain.elementType }, Type.Bool)), true);
>>>>>>>
var domain = linearTypeChecker.linearDomains[domainName];
Formal f = new Formal(Token.NoToken, new TypedIdent(Token.NoToken, "linear_" + domainName + "_in", new MapType(Token.NoToken, new List<TypeVariable>(), new List<Type> { domain.elementType }, Type.Bool)), true);
<<<<<<<
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 domain = linearTypechecker.linearDomains[domainName];
Formal f = new Formal(Token.NoToken, new TypedIdent(Token.NoToken, "linear_" + domainName + "_in", new MapType(Token.NoToken, new List<TypeVariable>(), new List<Type> { domain.elementType }, Type.Bool)), true);
>>>>>>>
var domain = linearTypeChecker.linearDomains[domainName];
Formal f = new Formal(Token.NoToken, new TypedIdent(Token.NoToken, "linear_" + 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";
else
expr = conjuncts.Length == 1 ? conjuncts[0] : ("(or " + conjuncts.Concat(" ") + ")");
>>>>>>>
string expr;
if (!conjuncts.Any())
{
expr = "false";
} |
<<<<<<<
/// <summary>
/// Type of futures income
/// </summary>
public enum IncomeType
{
/// <summary>
/// Transfer into account
/// </summary>
Transfer,
/// <summary>
/// Futures welcome bonus
/// </summary>
WelcomeBonus,
/// <summary>
/// Futures realized profit
/// </summary>
RealizedPnL,
/// <summary>
/// Futures funding fee
/// </summary>
FundingFee,
/// <summary>
/// Futures trading commission
/// </summary>
Commission,
/// <summary>
/// Insurance clear
/// </summary>
InsuranceClear
}
/// <summary>
/// The direction to change futures margin
/// </summary>
public enum FuturesMarginChangeDirectionType
{
/// <summary>
/// Add margin
/// </summary>
Add,
/// <summary>
/// Reduce Margin
/// </summary>
Reduce
}
/// <summary>
/// Type of Margin
/// </summary>
public enum FuturesMarginType
{
/// <summary>
/// Isolated margin
/// </summary>
Isolated,
/// <summary>
/// Crossed margin
/// </summary>
Cross
}
=======
/// <summary>
/// Side effect for a margin order
/// </summary>
public enum SideEffectType
{
/// <summary>
/// Normal trade
/// </summary>
NoSideEffect,
/// <summary>
/// Margin trade order
/// </summary>
MarginBuy,
/// <summary>
/// Make auto repayment after order is filled
/// </summary>
AutoRepay
}
>>>>>>>
/// <summary>
/// Type of futures income
/// </summary>
public enum IncomeType
{
/// <summary>
/// Transfer into account
/// </summary>
Transfer,
/// <summary>
/// Futures welcome bonus
/// </summary>
WelcomeBonus,
/// <summary>
/// Futures realized profit
/// </summary>
RealizedPnL,
/// <summary>
/// Futures funding fee
/// </summary>
FundingFee,
/// <summary>
/// Futures trading commission
/// </summary>
Commission,
/// <summary>
/// Insurance clear
/// </summary>
InsuranceClear
}
/// <summary>
/// The direction to change futures margin
/// </summary>
public enum FuturesMarginChangeDirectionType
{
/// <summary>
/// Add margin
/// </summary>
Add,
/// <summary>
/// Reduce Margin
/// </summary>
Reduce
}
/// <summary>
/// Type of Margin
/// </summary>
public enum FuturesMarginType
{
/// <summary>
/// Isolated margin
/// </summary>
Isolated,
/// <summary>
/// Crossed margin
/// </summary>
Cross
/// Side effect for a margin order
/// </summary>
public enum SideEffectType
{
/// <summary>
/// Normal trade
/// </summary>
NoSideEffect,
/// <summary>
/// Margin trade order
/// </summary>
MarginBuy,
/// <summary>
/// Make auto repayment after order is filled
/// </summary>
AutoRepay
} |
<<<<<<<
private void CapturePartitionStateUpdated(string partition, PartitionState oldState, PartitionState newState)
{
if (_partitionStateUpdateManager == null)
_partitionStateUpdateManager = new PartitionStateUpdateManager(_namingBuilder);
_partitionStateUpdateManager.StateUpdated(partition, newState, oldState.CausedBy);
}
private void RequestCheckpoint(PositionTracker lastProcessedEventPosition)
=======
/// <returns>true - if checkpoint has beem completed in-sync</returns>
private bool RequestCheckpoint(PositionTracker lastProcessedEventPosition)
>>>>>>>
private void CapturePartitionStateUpdated(string partition, PartitionState oldState, PartitionState newState)
{
if (_partitionStateUpdateManager == null)
_partitionStateUpdateManager = new PartitionStateUpdateManager(_namingBuilder);
_partitionStateUpdateManager.StateUpdated(partition, newState, oldState.CausedBy);
}
/// <returns>true - if checkpoint has beem completed in-sync</returns>
private bool RequestCheckpoint(PositionTracker lastProcessedEventPosition)
<<<<<<<
private void StartCheckpoint(PositionTracker lastProcessedEventPosition, PartitionState projectionState)
=======
/// <returns>true - if checkpoint has been completed in-sync</returns>
private bool StartCheckpoint(PositionTracker lastProcessedEventPosition, string projectionState)
>>>>>>>
/// <returns>true - if checkpoint has been completed in-sync</returns>
private bool StartCheckpoint(PositionTracker lastProcessedEventPosition, PartitionState projectionState) |
<<<<<<<
=======
// 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 (!_inCheckpoint)
throw new InvalidOperationException();
// all emitted events caused by events before the checkpoint position have been written
// unlock states, so the cache can be clean up as they can now be safely reloaded from the ES
_partitionStateCache.Unlock(_requestedCheckpointPosition);
_inCheckpointWriteAttempt = 1;
//TODO: pass correct expected eventNumber
_checkpointEventToBePublished = new Event(
Guid.NewGuid(), "ProjectionCheckpoint", false,
_requestedCheckpointStateJson == null ? null : Encoding.UTF8.GetBytes(_requestedCheckpointStateJson),
_requestedCheckpointPosition.ToJsonBytes());
PublishWriteCheckpointEvent();
}
>>>>>>>
<<<<<<<
private void OnLoadStateCompleted(ClientMessage.ReadEventsBackwardsCompleted message)
=======
private void PublishWriteCheckpointEvent()
{
if (_logger != null)
_logger.Trace(
"Writing checkpoint for {0} at {1} with expected eventNumber number {2}", _name,
_requestedCheckpointPosition, _lastWrittenCheckpointEventNumber);
_publisher.Publish(
new ClientMessage.WriteEvents(
Guid.NewGuid(), new SendToThisEnvelope(this), _projectionCheckpointStreamId,
_lastWrittenCheckpointEventNumber, _checkpointEventToBePublished));
}
private void OnLoadStateCompleted(ClientMessage.ReadStreamEventsBackwardCompleted message)
>>>>>>>
private void OnLoadStateCompleted(ClientMessage.ReadStreamEventsBackwardCompleted message) |
<<<<<<<
=======
[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),
new TestHandler<ProjectionSubscriptionMessage.CommittedEventReceived>(), null,
new TestHandler<ProjectionSubscriptionMessage.ProgressChanged>(),
new TestHandler<ProjectionSubscriptionMessage.EofReached>(),
CreateCheckpointStrategy(),
1000, 2000, 500);
}
[Test, ExpectedException(typeof (ArgumentNullException))]
public void null_progress_handler_throws_argument_null_exception()
{
var ps = new EventReorderingProjectionSubscription(
Guid.NewGuid(), Guid.NewGuid(), CheckpointTag.FromPosition(0, -1),
new TestHandler<ProjectionSubscriptionMessage.CommittedEventReceived>(),
new TestHandler<ProjectionSubscriptionMessage.CheckpointSuggested>(), null,
new TestHandler<ProjectionSubscriptionMessage.EofReached>(),
CreateCheckpointStrategy(), 1000, 2000, 500);
}
[Test, ExpectedException(typeof(ArgumentNullException))]
public void null_eof_handler_throws_argument_null_exception()
{
var ps = new EventReorderingProjectionSubscription(
Guid.NewGuid(), Guid.NewGuid(), CheckpointTag.FromPosition(0, -1),
new TestHandler<ProjectionSubscriptionMessage.CommittedEventReceived>(),
new TestHandler<ProjectionSubscriptionMessage.CheckpointSuggested>(),
new TestHandler<ProjectionSubscriptionMessage.ProgressChanged>(),
null,
CreateCheckpointStrategy(), 1000, 2000, 500);
}
>>>>>>>
<<<<<<<
null, 1000, 500);
=======
new TestHandler<ProjectionSubscriptionMessage.CommittedEventReceived>(),
new TestHandler<ProjectionSubscriptionMessage.CheckpointSuggested>(),
new TestHandler<ProjectionSubscriptionMessage.ProgressChanged>(),
new TestHandler<ProjectionSubscriptionMessage.EofReached>(),
null, 1000, 2000, 500);
>>>>>>>
null, 1000, 2000, 500); |
<<<<<<<
var projectionSubscription = message.CheckpointStrategy.CreateProjectionSubscription(_publisher,
fromCheckpointTag, message.CorrelationId, message.SubscriptionId, message.CheckpointUnhandledBytesThreshold,
message.StopOnEof);
=======
var projectionSubscription = message.CheckpointStrategy.CreateProjectionSubscription(
fromCheckpointTag, message.CorrelationId, message.SubscriptionId, message.Subscriber, message.CheckpointUnhandledBytesThreshold,
message.CheckpointProcessedEventsThreshold, message.StopOnEof);
>>>>>>>
var projectionSubscription = message.CheckpointStrategy.CreateProjectionSubscription(_publisher,
fromCheckpointTag, message.CorrelationId, message.SubscriptionId, message.CheckpointUnhandledBytesThreshold,
message.CheckpointProcessedEventsThreshold, message.StopOnEof); |
<<<<<<<
CheckpointStrategy checkpointStrategy, long? checkpointUnhandledBytesThreshold, int processingLagMs,
=======
IHandle<ProjectionSubscriptionMessage.CommittedEventReceived> eventHandler,
IHandle<ProjectionSubscriptionMessage.CheckpointSuggested> checkpointHandler,
IHandle<ProjectionSubscriptionMessage.ProgressChanged> progressHandler,
IHandle<ProjectionSubscriptionMessage.EofReached> eofHandler, CheckpointStrategy checkpointStrategy,
long? checkpointUnhandledBytesThreshold, int? checkpointProcessedEventsThreshold, int processingLagMs,
>>>>>>>
CheckpointStrategy checkpointStrategy, long? checkpointUnhandledBytesThreshold, int? checkpointProcessedEventsThreshold, int processingLagMs,
<<<<<<<
: base(publisher,
projectionCorrelationId, subscriptionId, @from,
checkpointStrategy, checkpointUnhandledBytesThreshold, stopOnEof)
=======
: base(
projectionCorrelationId, subscriptionId, @from, eventHandler, checkpointHandler, progressHandler,
eofHandler, checkpointStrategy, checkpointUnhandledBytesThreshold, checkpointProcessedEventsThreshold,
stopOnEof)
>>>>>>>
: base(publisher,
projectionCorrelationId, subscriptionId, @from,
checkpointStrategy, checkpointUnhandledBytesThreshold, checkpointProcessedEventsThreshold, stopOnEof) |
<<<<<<<
IHandle<ProjectionMessage.CoreService.Management.Create>,
IHandle<ProjectionMessage.CoreService.Management.Dispose>,
IHandle<ProjectionMessage.Projections.Management.Start>,
IHandle<ProjectionMessage.Projections.Management.Stop>,
IHandle<ProjectionMessage.Projections.Management.GetState>,
IHandle<ClientMessage.ReadEventsForwardCompleted>,
IHandle<ClientMessage.ReadEventsFromTFCompleted>
=======
IHandle<ClientMessage.ReadStreamEventsForwardCompleted>,
IHandle<ClientMessage.ReadAllEventsForwardCompleted>
>>>>>>>
IHandle<ProjectionMessage.CoreService.Management.Create>,
IHandle<ProjectionMessage.CoreService.Management.Dispose>,
IHandle<ProjectionMessage.Projections.Management.Start>,
IHandle<ProjectionMessage.Projections.Management.Stop>,
IHandle<ProjectionMessage.Projections.Management.GetState>,
IHandle<ClientMessage.ReadStreamEventsForwardCompleted>,
IHandle<ClientMessage.ReadAllEventsForwardCompleted> |
<<<<<<<
public void Build(bool buildMemTable = true)
=======
private void ReturnSeqReader(ITransactionFileSequentialReader seqReader)
{
_seqReaders.Push(seqReader);
}
public void Build()
>>>>>>>
private void ReturnSeqReader(ITransactionFileSequentialReader seqReader)
{
_seqReaders.Push(seqReader);
}
public void Build()
<<<<<<<
if (!buildMemTable)
return;
long pos = Math.Max(0, _persistedCommitCheckpoint);
=======
>>>>>>>
long pos = Math.Max(0, _persistedCommitCheckpoint); |
<<<<<<<
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,
dto.Metadata);
=======
return new ClientMessage.CreateStream(package.CorrelationId, envelope, dto.EventStreamId, dto.Metadata);
>>>>>>>
if (dto == null) return null;
return new ClientMessage.CreateStream(package.CorrelationId, envelope, dto.EventStreamId, dto.Metadata);
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.CreateStreamCompleted(new Guid(dto.CorrelationId),
dto.EventStreamId,
(OperationErrorCode) dto.ErrorCode,
dto.Error);
=======
return new ClientMessage.CreateStreamCompleted(package.CorrelationId, dto.EventStreamId, (OperationErrorCode)dto.ErrorCode, dto.Error);
>>>>>>>
if (dto == null) return null;
return new ClientMessage.CreateStreamCompleted(package.CorrelationId, dto.EventStreamId, (OperationErrorCode)dto.ErrorCode, dto.Error);
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.WriteEvents(new Guid(dto.CorrelationId),
envelope,
dto.EventStreamId,
dto.ExpectedVersion,
dto.Events.Select(
x => new Event(new Guid(x.EventId), x.EventType, false, x.Data, x.Metadata)).ToArray());
=======
return new ClientMessage.WriteEvents(
package.CorrelationId,
envelope,
dto.EventStreamId,
dto.ExpectedVersion,
dto.Events.Select(x => new Event(new Guid(x.EventId), x.EventType, false, x.Data, x.Metadata)).ToArray());
>>>>>>>
if (dto == null) return null;
return new ClientMessage.WriteEvents(
package.CorrelationId,
envelope,
dto.EventStreamId,
dto.ExpectedVersion,
dto.Events.Select(x => new Event(new Guid(x.EventId), x.EventType, false, x.Data, x.Metadata)).ToArray());
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.TransactionStart(new Guid(dto.CorrelationId), envelope, dto.EventStreamId, dto.ExpectedVersion);
=======
return new ClientMessage.TransactionStart(package.CorrelationId, envelope, dto.EventStreamId, dto.ExpectedVersion);
>>>>>>>
if (dto == null) return null;
return new ClientMessage.TransactionStart(package.CorrelationId, envelope, dto.EventStreamId, dto.ExpectedVersion);
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.TransactionStartCompleted(new Guid(dto.CorrelationId),
=======
return new ClientMessage.TransactionStartCompleted(package.CorrelationId,
>>>>>>>
if (dto == null) return null;
return new ClientMessage.TransactionStartCompleted(package.CorrelationId,
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.TransactionWriteCompleted(new Guid(dto.CorrelationId), dto.TransactionId, dto.EventStreamId, (OperationErrorCode)dto.ErrorCode, dto.Error);
=======
return new ClientMessage.TransactionWriteCompleted(package.CorrelationId, dto.TransactionId, dto.EventStreamId, (OperationErrorCode)dto.ErrorCode, dto.Error);
>>>>>>>
if (dto == null) return null;
return new ClientMessage.TransactionWriteCompleted(package.CorrelationId, dto.TransactionId, dto.EventStreamId, (OperationErrorCode)dto.ErrorCode, dto.Error);
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.TransactionCommit(new Guid(dto.CorrelationId), envelope, dto.TransactionId, dto.EventStreamId);
=======
return new ClientMessage.TransactionCommit(package.CorrelationId, envelope, dto.TransactionId, dto.EventStreamId);
>>>>>>>
if (dto == null) return null;
return new ClientMessage.TransactionCommit(package.CorrelationId, envelope, dto.TransactionId, dto.EventStreamId);
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.TransactionCommitCompleted(new Guid(dto.CorrelationId), dto.TransactionId, (OperationErrorCode)dto.ErrorCode, dto.Error);
=======
return new ClientMessage.TransactionCommitCompleted(package.CorrelationId, dto.TransactionId, (OperationErrorCode)dto.ErrorCode, dto.Error);
>>>>>>>
if (dto == null) return null;
return new ClientMessage.TransactionCommitCompleted(package.CorrelationId, dto.TransactionId, (OperationErrorCode)dto.ErrorCode, dto.Error);
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.DeleteStream(new Guid(dto.CorrelationId), envelope, dto.EventStreamId, dto.ExpectedVersion);
=======
return new ClientMessage.DeleteStream(package.CorrelationId, envelope, dto.EventStreamId, dto.ExpectedVersion);
>>>>>>>
if (dto == null) return null;
return new ClientMessage.DeleteStream(package.CorrelationId, envelope, dto.EventStreamId, dto.ExpectedVersion);
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.DeleteStreamCompleted(new Guid(dto.CorrelationId),
=======
return new ClientMessage.DeleteStreamCompleted(package.CorrelationId,
>>>>>>>
if (dto == null) return null;
return new ClientMessage.DeleteStreamCompleted(package.CorrelationId,
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.ReadEvent(new Guid(dto.CorrelationId), envelope, dto.EventStreamId, dto.EventNumber, dto.ResolveLinktos);
=======
return new ClientMessage.ReadEvent(package.CorrelationId, envelope, dto.EventStreamId, dto.EventNumber, dto.ResolveLinktos);
>>>>>>>
if (dto == null) return null;
return new ClientMessage.ReadEvent(package.CorrelationId, envelope, dto.EventStreamId, dto.EventNumber, dto.ResolveLinktos);
<<<<<<<
var dto = package.Data.Deserialize<ClientMessageDto.ReadEventsForward>();
if (dto == null)
return null;
=======
var dto = package.Data.Deserialize<ClientMessageDto.ReadStreamEventsForward>();
>>>>>>>
var dto = package.Data.Deserialize<ClientMessageDto.ReadStreamEventsForward>();
if (dto == null) return null;
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.SubscribeToStream(connection, new Guid(dto.CorrelationId), dto.EventStreamId);
=======
return new ClientMessage.SubscribeToStream(connection, package.CorrelationId, dto.EventStreamId);
>>>>>>>
if (dto == null) return null;
return new ClientMessage.SubscribeToStream(connection, package.CorrelationId, dto.EventStreamId);
<<<<<<<
if (dto == null)
return null;
return new ClientMessage.UnsubscribeFromStream(connection, new Guid(dto.CorrelationId), dto.EventStreamId);
=======
return new ClientMessage.UnsubscribeFromStream(connection, package.CorrelationId, dto.EventStreamId);
>>>>>>>
if (dto == null) return null;
return new ClientMessage.UnsubscribeFromStream(connection, package.CorrelationId, dto.EventStreamId);
<<<<<<<
var dto = package.Data.Deserialize<ClientMessageDto.SubscribeToAllStreams>();
if (dto == null)
return null;
return new ClientMessage.SubscribeToAllStreams(connection, new Guid(dto.CorrelationId));
=======
//var dto = package.Data.Deserialize<ClientMessageDto.SubscribeToAllStreams>();
return new ClientMessage.SubscribeToAllStreams(connection, package.CorrelationId);
>>>>>>>
//var dto = package.Data.Deserialize<ClientMessageDto.SubscribeToAllStreams>();
return new ClientMessage.SubscribeToAllStreams(connection, package.CorrelationId);
<<<<<<<
var dto = package.Data.Deserialize<ClientMessageDto.UnsubscribeFromAllStreams>();
if (dto == null)
return null;
return new ClientMessage.UnsubscribeFromAllStreams(connection, new Guid(dto.CorrelationId));
=======
//var dto = package.Data.Deserialize<ClientMessageDto.UnsubscribeFromAllStreams>();
return new ClientMessage.UnsubscribeFromAllStreams(connection, package.CorrelationId);
>>>>>>>
//var dto = package.Data.Deserialize<ClientMessageDto.UnsubscribeFromAllStreams>();
return new ClientMessage.UnsubscribeFromAllStreams(connection, package.CorrelationId); |
<<<<<<<
=======
private readonly ICompatibilityMode _compatibilityMode;
>>>>>>>
<<<<<<<
/// <param name="compatibilityMode"></param>
public HttpAsyncClient(TimeSpan timeout, HttpMessageHandler clientHandler = null) {
=======
/// <param name="compatibilityMode"></param>
public HttpAsyncClient(TimeSpan timeout, HttpMessageHandler clientHandler = null, ICompatibilityMode compatibilityMode = null) {
>>>>>>>
public HttpAsyncClient(TimeSpan timeout, HttpMessageHandler clientHandler = null) {
<<<<<<<
=======
_compatibilityMode = compatibilityMode ?? new NoCompatibilityMode();
>>>>>>>
<<<<<<<
=======
if (_compatibilityMode.IsVersion5CompatibilityModeEnabled())
hostHeader = "";
>>>>>>> |
<<<<<<<
var p = CoreProjection.CreateAndPrepapre(
null, new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler, _defaultProjectionConfig,
_readDispatcher, _writeDispatcher, null);
=======
var p = CoreProjection.CreateAndPrepare(null, Guid.NewGuid(), new FakePublisher(), projectionStateHandler, _defaultProjectionConfig,
_readDispatcher, _writeDispatcher, null);
>>>>>>>
var p = CoreProjection.CreateAndPrepare(null, new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler, _defaultProjectionConfig,
_readDispatcher, _writeDispatcher, null);
<<<<<<<
var p = CoreProjection.CreateAndPrepapre(
"", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler, _defaultProjectionConfig,
_readDispatcher, _writeDispatcher, null);
=======
var p = CoreProjection.CreateAndPrepare("", Guid.NewGuid(), new FakePublisher(), projectionStateHandler, _defaultProjectionConfig,
_readDispatcher, _writeDispatcher, null);
>>>>>>>
var p = CoreProjection.CreateAndPrepare("", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler, _defaultProjectionConfig,
_readDispatcher, _writeDispatcher, null);
<<<<<<<
var p = CoreProjection.CreateAndPrepapre(
"projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), null, projectionStateHandler, _defaultProjectionConfig,
_readDispatcher, _writeDispatcher, null);
=======
var p = CoreProjection.CreateAndPrepare("projection", Guid.NewGuid(), null, projectionStateHandler, _defaultProjectionConfig,
_readDispatcher, _writeDispatcher, null);
>>>>>>>
var p = CoreProjection.CreateAndPrepare("projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), null, projectionStateHandler, _defaultProjectionConfig,
_readDispatcher, _writeDispatcher, null);
<<<<<<<
var p = CoreProjection.CreateAndPrepapre(
"projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), null, _defaultProjectionConfig, _readDispatcher,
_writeDispatcher, null);
=======
var p = CoreProjection.CreateAndPrepare("projection", Guid.NewGuid(), new FakePublisher(), null, _defaultProjectionConfig, _readDispatcher,
_writeDispatcher, null);
>>>>>>>
var p = CoreProjection.CreateAndPrepare("projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), null, _defaultProjectionConfig, _readDispatcher,
_writeDispatcher, null);
<<<<<<<
var p = CoreProjection.CreateAndPrepapre(
"projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
new ProjectionConfig(-1, 10, 1000, 250, true, true, false, false), _readDispatcher, _writeDispatcher,
null);
=======
var p = CoreProjection.CreateAndPrepare("projection", Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
new ProjectionConfig(-1, 10, 1000, 250, true, true, false, false), _readDispatcher,
_writeDispatcher, null);
>>>>>>>
var p = CoreProjection.CreateAndPrepare("projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
new ProjectionConfig(-1, 10, 1000, 250, true, true, false, false), _readDispatcher,
_writeDispatcher, null);
<<<<<<<
var p = CoreProjection.CreateAndPrepapre(
"projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
new ProjectionConfig(0, 10, 1000, 250, true, true, false, false), _readDispatcher, _writeDispatcher,
null);
=======
var p = CoreProjection.CreateAndPrepare("projection", Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
new ProjectionConfig(0, 10, 1000, 250, true, true, false, false), _readDispatcher,
_writeDispatcher, null);
>>>>>>>
var p = CoreProjection.CreateAndPrepare("projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
new ProjectionConfig(0, 10, 1000, 250, true, true, false, false), _readDispatcher,
_writeDispatcher, null);
<<<<<<<
var p = CoreProjection.CreateAndPrepapre(
"projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
new ProjectionConfig(10, 5, 1000, 250, true, true, false, false), _readDispatcher, _writeDispatcher,
null);
=======
var p = CoreProjection.CreateAndPrepare("projection", Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
new ProjectionConfig(10, 5, 1000, 250, true, true, false, false), _readDispatcher,
_writeDispatcher, null);
>>>>>>>
var p = CoreProjection.CreateAndPrepare("projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
new ProjectionConfig(10, 5, 1000, 250, true, true, false, false), _readDispatcher,
_writeDispatcher, null);
<<<<<<<
var p = CoreProjection.CreateAndPrepapre(
"projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
_defaultProjectionConfig, null, _writeDispatcher, null);
=======
var p = CoreProjection.CreateAndPrepare("projection", Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
_defaultProjectionConfig, null, _writeDispatcher, null);
>>>>>>>
var p = CoreProjection.CreateAndPrepare("projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
_defaultProjectionConfig, null, _writeDispatcher, null);
<<<<<<<
var p = CoreProjection.CreateAndPrepapre(
"projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
_defaultProjectionConfig, _readDispatcher, null, null);
=======
var p = CoreProjection.CreateAndPrepare("projection", Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
_defaultProjectionConfig, _readDispatcher, null, null);
>>>>>>>
var p = CoreProjection.CreateAndPrepare("projection", new ProjectionVersion(1, 1, 1), Guid.NewGuid(), new FakePublisher(), projectionStateHandler,
_defaultProjectionConfig, _readDispatcher, null, null); |
<<<<<<<
var vnode = new ClusterVNodeSettings(Guid.NewGuid(),
GetLoopbackForPort(tcpIntPort), null,
GetLoopbackForPort(tcpExtPort), null,
GetLoopbackForPort(httpIntPort), GetLoopbackForPort(httpExtPort),
new[] {GetLoopbackForPort(httpExtPort).ToHttpUrl()},
false,
null,
1,
GetLoopbackForPort(ManagerPort),
"dns", 3, true,
TFConsts.MinFlushDelayMs,
2, 2, TimeSpan.FromSeconds(2), TimeSpan.FromSeconds(2),
false, null, false,
TimeSpan.FromHours(1),
StatsStorage.StreamAndCsv,
ClusterVNodeAuthenticationType.Internal, 0);
=======
var vnode = new ClusterVNodeSettings(Guid.NewGuid(),
GetLoopbackForPort(tcpIntPort), null,
GetLoopbackForPort(tcpExtPort), null,
GetLoopbackForPort(httpIntPort), GetLoopbackForPort(httpExtPort),
new[] { GetLoopbackForPort(httpExtPort).ToHttpUrl() },
false, null, 1, false, "dns", new[] { GetLoopbackForPort(ManagerPort) },
TFConsts.MinFlushDelayMs, 3, 2, 2, TimeSpan.FromSeconds(2),
TimeSpan.FromSeconds(2), false, null, false, TimeSpan.FromHours(1),
StatsStorage.StreamAndCsv, ClusterVNodeAuthenticationType.Internal);
>>>>>>>
var vnode = new ClusterVNodeSettings(Guid.NewGuid(),
GetLoopbackForPort(tcpIntPort), null,
GetLoopbackForPort(tcpExtPort), null,
GetLoopbackForPort(httpIntPort), GetLoopbackForPort(httpExtPort),
new[] { GetLoopbackForPort(httpExtPort).ToHttpUrl() },
false, null, 1, false, "dns", new[] { GetLoopbackForPort(ManagerPort) },
TFConsts.MinFlushDelayMs, 3, 2, 2, TimeSpan.FromSeconds(2),
TimeSpan.FromSeconds(2), false, null, false, TimeSpan.FromHours(1),
StatsStorage.StreamAndCsv, ClusterVNodeAuthenticationType.Internal, 0); |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.