conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
IProcessManager processManager = null, ITaskManager taskManager = null, NPath nodeJsExecutablePath = null, NPath octorunScript = null)
=======
string authorizationNote = null,
string fingerprint = null,
IProcessManager processManager = null, ITaskManager taskMan... |
<<<<<<<
private const float SpinnerAnimationDuration = 4f;
private const string FetchActionTitle = "Fetch Changes";
private const string FetchButtonText = "Fetch";
private const string FetchFailureDescription = "Could not fetch changes";
private const string PullButton = "Pull";
... |
<<<<<<<
repositoryManager.OnCurrentBranchUpdated += configBranch => {
logger?.Trace("OnCurrentBranchUpdated");
listener.OnCurrentBranchUpdated(configBranch);
managerEvents?.OnCurrentBranchUpdated.Set();
};
repositoryManager.OnCurrentRe... |
<<<<<<<
private const string NoUserOrEmailError = "Name and Email must be configured in Settings";
=======
[SerializeField] private UserSettingsView userSettingsView = new UserSettingsView();
[SerializeField] private GitPathView gitPathView = new GitPathView();
>>>>>>>
priva... |
<<<<<<<
protected override void InitializeEnvironment()
=======
protected override string GetAssetsPath()
>>>>>>>
protected override string GetAssetsPath()
<<<<<<<
private Task SetupUserTracking()
{
var usagePath = System.Environment.GetFolderPath(System.Environm... |
<<<<<<<
=======
public void UpdateConfigData()
{
UpdateConfigData(false);
}
private void LoadGitUser()
{
GitClient.GetConfigUserAndEmail()
.Then((success, user) => {
Logger.Trace("OnGitUserLoaded: {0}", user);
... |
<<<<<<<
gitExecHasChanged = true;
=======
metricsHasChanged = true;
>>>>>>>
metricsHasChanged = true;
gitExecHasChanged = true;
<<<<<<<
=======
string gitExecPath = null;
string gitExecParentPath = null;
string extension = null;
... |
<<<<<<<
private const string BadNotificationDelayError = "A delay of {0} is shorter than the default delay and thus would get pre-empted.";
private const string InitializeTitle = "Initialize";
private const string HistoryTitle = "History";
private const string ChangesTitle = "Changes";
... |
<<<<<<<
public TaskBase(CancellationToken token)
: this()
=======
protected TaskBase(CancellationToken token)
>>>>>>>
protected TaskBase(CancellationToken token)
: this()
<<<<<<<
public TaskBase(Task task)
: this()
=======
protected TaskB... |
<<<<<<<
class Window : BaseWindow, IUIProgress
=======
class Window : BaseWindow, ICanRenderEmpty
>>>>>>>
class Window : BaseWindow, IUIProgress, ICanRenderEmpty
<<<<<<<
public override void DoneRefreshing()
=======
public override void OnUI()
>>>>>>>
public override void Done... |
<<<<<<<
Logging.LogAdapter = new MultipleLogAdapter(
new FileLogAdapter($"..\\{DateTime.UtcNow:yyyyMMddHHmmss}-unit-tests.log")
, new ConsoleLogAdapter()
=======
LogHelper.LogAdapter = new MultipleLogAdapter(
new FileLogAdapter($"..\\{DateTime.Ut... |
<<<<<<<
if (ProgressRenderer != null)
ProgressRenderer.DoProgressGUI();
GUILayout.EndVertical();
GUILayout.EndHorizontal();
=======
EditorGUI.BeginDisabledGroup(isBusy);
>>>>>>>
EditorGUI.BeginDisabledGroup(isBusy);
if (Progr... |
<<<<<<<
private const string GitInstallBrowseTitle = "Select git binary";
private const string GitInstallPickInvalidTitle = "Invalid Git install";
private const string GitInstallPickInvalidMessage = "The selected file is not a valid Git install. {0}";
private const string GitInstallPickI... |
<<<<<<<
public static IFileSystem FileSystem { get { return ApplicationManager.FileSystem; } }
public static IUsageTracker UsageTracker { get { return ApplicationManager.UsageTracker; } }
=======
>>>>>>>
public static IUsageTracker UsageTracker { get { return ApplicationManager.UsageTracker... |
<<<<<<<
[SerializeField] private Vector2 treeScroll;
=======
[SerializeField] private Vector2 scroll;
[SerializeField] private CacheUpdateEvent lastCurrentBranchChangedEvent;
[SerializeField] private CacheUpdateEvent lastStatusEntriesChangedEvent;
[SerializeField] private Cach... |
<<<<<<<
#if ENABLE_BROADMODE
if (Event.current.type == EventType.Repaint && EvaluateBroadMode())
{
Refresh();
}
#endif
}
public override bool IsBusy
{
get { return isBusy; }
}
#if ENABLE_BROADMODE
public void OnBr... |
<<<<<<<
DateTimeOffset dt;
if (!DateTimeOffset.TryParseExact(firstRunAtString, Constants.Iso8601Format,
CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))
{
dt = DateTimeOffset.Now;
... |
<<<<<<<
[Location("cache/branches.yaml", LocationAttribute.Location.LibraryFolder)]
sealed class BranchCache : ManagedCacheBase<BranchCache>, IBranchCache
{
[SerializeField] private string lastUpdatedAtString = DateTimeOffset.MinValue.ToString();
[SerializeField] private string lastVerifiedA... |
<<<<<<<
Repository.User.Name = newGitName;
Repository.User.Email = newGitEmail;
=======
Repository.User.Name = gitName = newGitName;
>>>>>>>
... |
<<<<<<<
[SerializeField] private CacheUpdateEvent lastStatusChangedEvent;
[SerializeField] private ChangesTree treeChanges;
[SerializeField] private List<GitStatusEntry> gitStatusEntries;
=======
[SerializeField] private CacheUpdateEvent lastStatusEntriesChangedEvent;
[Serializ... |
<<<<<<<
=======
Logger.Warning("Unable to get current user");
isBusy = false;
>>>>>>>
Logger.Warning("Unable to get current user");
isBusy = false;
<<<<<<<
Client.GetOrganizations(... |
<<<<<<<
// Set window title
if (smallLogo == null)
{
smallLogo = Styles.SmallLogo;
titleContent = new GUIContent(Title, smallLogo);
}
=======
>>>>>>> |
<<<<<<<
public RepositoryManager CreateRepositoryManager(IPlatform platform, ITaskRunner taskRunner, IUsageTracker usageTracker, NPath repositoryRoot,
CancellationToken cancellationToken)
=======
public RepositoryManager CreateRepositoryManager(IPlatform platform, ITaskManager taskManager,... |
<<<<<<<
event Action<string> OnActiveBranchChanged;
event Action<ConfigRemote?> OnActiveRemoteChanged;
event Action<string> OnHeadChanged;
=======
event Action OnActiveBranchChanged;
event Action OnActiveRemoteChanged;
event Action OnRemoteBranchListChanged;
eve... |
<<<<<<<
public class BranchesTree: Tree
{
[NonSerialized] public Texture2D ActiveNodeIcon;
[NonSerialized] public Texture2D BranchIcon;
[NonSerialized] public Texture2D FolderIcon;
[NonSerialized] public Texture2D RemoteIcon;
[SerializeField] public bool IsRemote;
... |
<<<<<<<
public abstract class Tree
=======
public class TreeNodeDictionary : SerializableDictionary<string, TreeNode> { }
[Serializable]
public class Tree
>>>>>>>
public class TreeNodeDictionary : SerializableDictionary<string, TreeNode> { }
[Serializable]
public abstract class Tree
<<... |
<<<<<<<
IEnumerable<string> GetDirectories(string path);
=======
IEnumerable<string> GetDirectories(string path);
IEnumerable<string> GetDirectories(string path, string pattern, SearchOption searchOption);
>>>>>>>
IEnumerable<string> GetDirectories(string path);
IEnumerable<st... |
<<<<<<<
=======
repositoryManagerListener.Received().OnStatusUpdate(Args.GitStatus);
repositoryManagerListener.DidNotReceive().OnActiveBranchChanged(Arg.Any<ConfigBranch?>());
repositoryManagerListener.DidNotReceive().OnActiveRemoteChanged(Arg.Any<ConfigRemote?>());
rep... |
<<<<<<<
repositoryManager = initRepositoryManager;
repositoryManager.OnCurrentBranchUpdated += RepositoryManager_OnCurrentBranchUpdated;
repositoryManager.OnCurrentRemoteUpdated += RepositoryManager_OnCurrentRemoteUpdated;
repositoryManager.OnRepositoryUpdated += Reposito... |
<<<<<<<
//TODO: This is removed in another branch anyway
//OnInstallPathGUI();
}
Styles.EndInitialStateArea();
return false;
}
=======
OnInstallPathGUI();
}
Styles.E... |
<<<<<<<
var gitLfsVersionTask = new GitLfsVersionTask(cancellationToken)
.Configure(processManager, path, dontSetupGit: isCustomGit);
gitLfsVersionTask
.Then((result, version) => {return gitLfsVersion = version;})
.Then(... |
<<<<<<<
#if ENABLE_BROADMODE
if (broadMode)
{
((Window)Parent).Branches.RefreshEmbedded();
}
#endif
=======
>>>>>>>
<<<<<<<
#if ENABLE_BROADMODE
if (broadMode)
OnBroadGUI();
else
#endif
=======
if (!HasReposito... |
<<<<<<<
var convertSceneHelper = new UnityToMayaConvertSceneHelper (uniPropertyName);
=======
var convertSceneHelper = new UnityToMayaConvertSceneHelper (uniPropertyName, fbxNode);
// TODO: we'll resample the curve so we don't have to
... |
<<<<<<<
protected static bool ExportSingleEditorClip(Object editorClipSelected)
=======
/// <summary>
/// Validate the menu item defined by the function OnClipContextClick.
/// </summary>
[MenuItem(TimelineClipMenuItemName, true, 31)]
static bool... |
<<<<<<<
=======
using (var fbxLayerElement = FbxLayerElementUV.Create (fbxMesh, "UVSet")) {
fbxLayerElement.SetMappingMode (FbxLayerElement.EMappingMode.eByPolygonVertex);
fbxLayerElement.SetReferenceMode (FbxLayerElement.EReferenceMode.eIndexToDirect);
... |
<<<<<<<
=======
exportSettings.exportMeshNoRenderer = EditorGUILayout.Toggle(
new GUIContent("Export Unrendered:",
"If checked, meshes will be exported even if they don't have a Renderer component."),
exportSettings.exportMeshNoRenderer
);
... |
<<<<<<<
private const string MODULE_TEMPLATE_PATH = "Integrations/Autodesk/maya/" + MODULE_FILENAME + ".txt";
=======
private const string MAYA_INSTRUCTION_FILENAME = "_safe_to_delete/_temp.txt";
public class MayaException : System.Exception {
public MayaException() { }
... |
<<<<<<<
private static string m_integrationFolderPath = null;
public static string INTEGRATION_FOLDER_PATH
{
get{
if (string.IsNullOrEmpty (m_integrationFolderPath)) {
m_integrationFolderPath = Application.dataPath;
}
... |
<<<<<<<
using System.Runtime.Serialization;
using UnityEngine.Formats.FbxSdk;
=======
using Autodesk.Fbx;
>>>>>>>
using Autodesk.Fbx;
using System.Runtime.Serialization; |
<<<<<<<
// check if file already exists, give a warning if it does
if (!OverwriteExistingFile (fbxPath) || !OverwriteExistingFile (prefabPath)) {
return false;
}
=======
>>>>>>>
// check if file already exists, give a warning if it ... |
<<<<<<<
fbxPrefab = toConvert.AddComponent<FbxPrefab>();
fbxPrefab.SetSourceModel(unityMainAsset);
=======
fbxPrefab = unityGO.AddComponent<FbxPrefab>();
var fbxPrefabUtility = new FbxPrefabAutoUpdater.FbxPrefabUtility (fbxPrefab);
fbxPre... |
<<<<<<<
// create camera and light if none
if (Camera.main == null) {
GameObject camera = new GameObject ("MainCamera");
camera.AddComponent<Camera> ();
camera.tag = "MainCamera";
}
... |
<<<<<<<
fbxLayer.SetNormals (fbxLayerElement);
}
=======
fbxLayer.SetNormals (fbxLayerElement);
exportedAttribute = true;
>>>>>>>
fbxLayer.SetNormals (fbxLayerElement);
}
... |
<<<<<<<
var filename = gosToExport [n].name + ".fbx";
var filePath = Path.Combine (dirPath, filename);
if (File.Exists (filePath)) {
filePath = IncrementFileName (dirPath, filename);
}
filePaths[n... |
<<<<<<<
#if INDICATE_SHARP
IndicateManager IndicateManager { get; set; }
=======
#if INDICATE_SHARP || MESSAGING_MENU_SHARP
private IndicateManager _IndicateManager;
>>>>>>>
#if INDICATE_SHARP || MESSAGING_MENU_SHARP
IndicateManager IndicateManager { get; set; }
<<<<<<<
#if INDICATE_SHARP
... |
<<<<<<<
msg = "irc://freenode/smuxi";
builder = new MessageBuilder();
builder.TimeStamp = DateTime.MinValue;
builder.Append(new UrlMessagePartModel(msg));
TestMessage(msg, builder.ToMessage());
=======
msg = "http://www.test.de/bilder.html?data... |
<<<<<<<
public override bool allowedInSubGraph
{
get { return false; }
}
=======
public override string documentationURL
{
get { return "https://github.com/Unity-Technologies/ShaderGraph/wiki/Sub-graph-Node"; }
}
>>>>>>>
public overrid... |
<<<<<<<
using System.IO;
using SignalR.Hosting.Self.Infrastructure;
=======
using System;
>>>>>>>
using System.IO;
using SignalR.Hosting.Self.Infrastructure;
<<<<<<<
=======
using System.Threading.Tasks;
using SignalR.Hosting.Self.Infrastructure;
>>>>>>> |
<<<<<<<
IDisposable registration = CancellationToken.SafeRegister(cancelState =>
=======
var closeDisposer = new Disposer();
var abortDisposer = new Disposer();
IDisposable closeRegistration = CancellationToken.SafeRegister(asyncResult =>
>>>>>>>
... |
<<<<<<<
break;
}
catch (QuotaExceededException ex)
{
_trace.TraceError(errorMessage, ex.Message);
if(ex.IsTransient)
{
Thread.Sleep(RetryDelay);
}
... |
<<<<<<<
? value.ToBoolean() : conversionType.GetTypeInfo().IsEnum
? value.ToEnum(conversionType) : safeChangeType();
=======
? value.ToBoolean() : conversionType.IsEnum
? value.ToEnum(conversionType, ignoreValueCase) : safeChangeT... |
<<<<<<<
(vals, type, isScalar) => TypeConverter.ChangeType(vals, type, isScalar, CultureInfo.InvariantCulture),
StringComparer.Ordinal
);
=======
(vals, type, isScalar) => TypeConverter.ChangeType(vals, type, isScalar, CultureInfo.InvariantCulture, false... |
<<<<<<<
ExpectedType = "double",
FirstType = "double",
SecondType = "double",
IncludeRem = false
=======
ExpectedType = @"double",
FirstType = @"double",
SecondType = @"double",
IncludeRem = false,
IncludeRet = false
>>>>>>>
ExpectedType = "double",
FirstType = "double",
... |
<<<<<<<
private readonly Dictionary<ILayerRenderer, ElapsedMillisecondsTimedStat> _renderCacheDrawTimes;
private readonly Dictionary<ILayerRenderer, IBitmap> _bitmapBuffer = new Dictionary<ILayerRenderer, IBitmap>();
=======
private readonly Dictionary<ILayerRenderer, IBitmap> _bitmapBuffer = ... |
<<<<<<<
}
private void GameLoopStep(object sender, EventArgs e)
{
_gameLoopTimer?.Stop();
GameLoopStep(0.005f * this.SpeedAdjustmentFactor);
_gameLoopTimer?.Start();
=======
return distance <= 0.0f;
}
private static (TrainPosit... |
<<<<<<<
public CachableLayoutRenderer(ILayout<T> layout, IRenderer<T> renderer, IImageFactory imageFactory)
: this(layout, new[] { renderer }, imageFactory)
{
}
public CachableLayoutRenderer(ILayout<T> layout, IEnumerable<IRenderer<T>> renderers, IImageFactory imageFactory)
... |
<<<<<<<
=======
DoAnEdgeSnap(position);
}
private static void DoAnEdgeSnap(TrainPosition position)
{
// Do some fun snapping
if (position.RelativeLeft < 0)
{
position.RelativeLeft = -0.1f;
position.RelativeTop = 0.... |
<<<<<<<
public class MappingEngine : IMappingEngine, IMappingEngineRunner
{
private static readonly IDictionaryFactory DictionaryFactory = PlatformAdapter.Resolve<IDictionaryFactory>();
private static readonly IProxyGeneratorFactory ProxyGeneratorFactory = PlatformAdapter.Resolve<IProxyGeneratorFactory>();
... |
<<<<<<<
{
private static readonly IDictionaryFactory DictionaryFactory = PlatformAdapter.Resolve<IDictionaryFactory>();
internal readonly ITypeMapFactory _typeMapFactory;
private readonly IEnumerable<IObjectMapper> _mappers;
internal const string DefaultProfileName = "";
private readonly ThreadSa... |
<<<<<<<
SquirrelAwareApp.HandleEvents(
version => AppHost.OnInitialInstall(version),
version => AppHost.OnAppUpdate(version),
onAppUninstall: version => AppHost.OnAppUninstall(version),
onFirstRun: () => AppHost.OnFirstRun());
=======
... |
<<<<<<<
[SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "ViewPort")]
public static IList<WeakReference> GetItemsInViewPort(ItemsControl list)
=======
public static IList<WeakReference> GetItemsInViewPort(this ItemsControl list)
>>>>>>>
[S... |
<<<<<<<
ownerFrameworkElement.RemoveHandler(MouseLeftButtonDownEvent, new MouseButtonEventHandler(OnOwnerMouseLeftButtonDown));
ownerFrameworkElement.ManipulationDelta -= OnOwnerManipulationDelta;
ownerFrameworkElement.RemoveHandler(MouseLeftButton... |
<<<<<<<
serializer.Serialize(ms, new SimlpeStringKeyData
=======
MessagePackSerializer.Serialize(ms, new SimpleStringKeyData
>>>>>>>
serializer.Serialize(ms, new SimpleStringKeyData
<<<<<<<
var d = serializer.Deserialize<SimlpeStringKeyData>(ms, readStrict: true);
==... |
<<<<<<<
config.BootstrapServers = "localhost:9093";
config.FollowMetadata = true;
config.NumStreamThreads = 2;
=======
config.BootstrapServers = "localhost:9093";
>>>>>>>
config.BootstrapServers = "localhost:9093";
<<<<<<<
... |
<<<<<<<
SimpleWeb.Configuration.DefaultMediaTypeHandler = new JsonMediaTypeHandler();
=======
SimpleWeb.Configuration.ExceptionHandler = new ExceptionHandler();
>>>>>>>
SimpleWeb.Configuration.ExceptionHandler = new ExceptionHandler();
SimpleWeb.Configuration.DefaultMe... |
<<<<<<<
/// <summary>
/// Distance between the top and bottom faces in milliradii
/// </summary>
[ParserTarget("thickness")]
public NumericParser<float> thickness {
get { return ring.thickness; }
set { ring.thickness = value; }... |
<<<<<<<
else if (s.StartsWith("RGB("))
{
s = s.Replace("RGB(", string.Empty);
s = s.Replace(")", string.Empty);
s = s.Replace(" ", string.Empty);
string[] colorArray = s.Split(',');
value = new Color(float.Parse(colorArray[0]) / 255, float.Parse(colorArray[1]) / 255, float.Parse(colorA... |
<<<<<<<
=======
private string _asymmAlg;
private bool _unofficial;
>>>>>>>
<<<<<<<
this.HasOption("a|asymmetric:", Localized.Asymmetric, v => { _asymm = true;});
=======
this.HasOption("a|asymmetric:", Localized.Asymmetric, v =>
... |
<<<<<<<
/// <summary>
/// Gets the <see cref="Board"/> on which the label is defined.
/// </summary>
IBoard Board { get; }
/// <summary>
/// Gets and sets the color. Use null for no color.
/// </summary>
LabelColor? Color { get; set; }
/// <summary>
/// Gets the creation date of the label.
/// ... |
<<<<<<<
public ICard Card => _card.Value;
=======
/// <associated-notification-types>
/// - AddedAttachmentToCard
/// - AddedToCard
/// - AddedMemberToCard
/// - ChangeCard
/// - CommentCard
/// - CreatedCard
/// - RemovedFromCard
/// - RemovedMemberFromCard
/// - MentionedOnCard
/// - UpdateC... |
<<<<<<<
/// <summary>
/// Gets the collection of actions performed on the organization.
/// </summary>
IReadOnlyCollection<IAction> Actions { get; }
/// <summary>
/// Gets the collection of boards owned by the organization.
/// </summary>
IBoardCollection Boards { get; }
/// <summary>
/// Gets the... |
<<<<<<<
return new StateInfo(stateRepresentation.UnderlyingState, ignoredTriggers,
stateRepresentation.EntryActions.Select(e => ActionInfo.Create(e)).ToList(),
stateRepresentation.ActivateActions.Select(e => e.Description).ToList(),
stateRepresentation.Deactiv... |
<<<<<<<
[Test]
public void TestEmptyCollectionParsing()
{
string code = @"
class FooBar
{
Dictionary<byte, string> foo = new Dictionary<byte, string>{
{},
{}
};
}
";
var unit = SyntaxTree.Parse(code);
var type = unit.Members.First() as TypeDeclaration;
var member = type.Members.First() as Fiel... |
<<<<<<<
[Test]
=======
[Test, Ignore("Explicit conversions with nullables are currently broken")]
public void UserDefinedExplicitConversion_Lifted() {
string program = @"using System;
struct Convertible {
public static explicit operator Convertible(int i) {return new Convertible(); }
}
class Test {
public ... |
<<<<<<<
if (varDecl == null)
return false;
var type = context.Resolve (varDecl.Variables.First ().Initializer).Type;
return !type.Equals (SpecialType.NullType) && !type.Equals (SpecialType.UnknownType);
=======
IType type;
if (varDecl != null) {
type = context.Resolve (varDecl.Variables.First (... |
<<<<<<<
WriteKeyword ("__arglist");
=======
WriteKeyword("__arglist");
>>>>>>>
WriteKeyword ("__arglist");
<<<<<<<
StartNode (namedArgumentExpression);
WriteIdentifier (namedArgumentExpression.Identifier);
WriteToken (":", NamedArgumentExpression.Roles.Colon);
Space ();
namedArgumentExpres... |
<<<<<<<
variable.AddChild ((Expression)em.Initializer.Accept (this), VariableInitializer.Roles.Expression);
=======
var initializer = (Expression)em.Initializer.Accept (this);
if (initializer != null)
newField.AddChild (initializer, EnumMemberDeclaration.InitializerRole);
>>>>>>>
newField.A... |
<<<<<<<
using System.Numerics;
using System.Text;
using System;
=======
using System;
>>>>>>>
using System.Numerics;
using System;
<<<<<<<
if ((canMap != null && !canMap(type, propertyInfo)))
{
continue;
}
=======
if (property... |
<<<<<<<
bool OnFocusSelectAll { get; }
=======
bool ReadOnly { get; }
>>>>>>>
bool ReadOnly { get; }
bool OnFocusSelectAll { get; } |
<<<<<<<
/// Looks up a localized string similar to Managing desktop integration.
/// </summary>
internal static string ActionAppCommand {
get {
return ResourceManager.GetString("ActionAppCommand", resourceCulture);
}
}
/// <summa... |
<<<<<<<
/// <exception cref="ImplementationNotFoundException">Thrown if one of the <see cref="Model.Implementation"/>s is not cached yet.</exception>
/// <exception cref="CommandException">Thrown if there was a problem locating the implementation executable.</exception>
/// <exception cref="Win3... |
<<<<<<<
private readonly C5.LinkedList<CapabilityList> _capabilityLists = new C5.LinkedList<CapabilityList>();
/// <summary>
/// A set of <see cref="Capability"/> lists for different architectures.
/// </summary>
[Description("A set of Capability lists for different architectures... |
<<<<<<<
using CRMCore.Mvc.Core.LocationExpander;
=======
using CRMCore.Mvc.Core.LocationExpander;
using Microsoft.AspNetCore.Mvc.ApplicationParts;
>>>>>>>
using CRMCore.Mvc.Core.LocationExpander;
<<<<<<<
services.AddMvc()
.AddViewLocalization();
=======
// services.Tr... |
<<<<<<<
using global::Catalog.API.IntegrationEvents;
=======
using System.Threading.Tasks;
>>>>>>>
using global::Catalog.API.IntegrationEvents;
using System.Threading.Tasks;
<<<<<<<
checks.AddSqlCheck("CatalogDb", Configuration["ConnectionString"]);
=======
checks.A... |
<<<<<<<
WaitForSqlAvailabilityAsync(loggerFactory, app, env).Wait();
ConfigureEventBus(app);
=======
WaitForSqlAvailabilityAsync(loggerFactory, app).Wait();
>>>>>>>
WaitForSqlAvailabilityAsync(loggerFactory, app, env).Wait(); |
<<<<<<<
services.AddSingleton<IEventBus, EventBusRabbitMQ>();
services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
services.AddTransient<UserCheckoutAcceptedIntegrationEventHandler>();
services.AddTransient<IIntegrationEventHandler... |
<<<<<<<
Task<IEnumerable<dynamic>> GetOrdersAsync(string userId);
Task<IEnumerable<dynamic>> GetCardTypesAsync();
Task<IEnumerable<dynamic>> GetOrderItems();
=======
Task<IEnumerable<CardType>> GetCardTypesAsync();
>>>>>>>
Task<IEnumerable<dynamic>> GetOrdersAsync(string use... |
<<<<<<<
=======
var catalogPriceHandler = serviceProvider.GetService<IIntegrationEventHandler<ProductPriceChangedIntegrationEvent>>();
eventBus.Subscribe<ProductPriceChangedIntegrationEvent>(catalogPriceHandler);
>>>>>>> |
<<<<<<<
private readonly Mock<IBuyerRepository> _buyerRepositoryMock;
private readonly Mock<IOrderRepository> _orderRepositoryMock;
=======
private readonly Mock<IOrderRepository<Order>> _orderRepositoryMock;
>>>>>>>
private readonly Mock<IOrderRepository> _orderRepositoryMock;
<<<<<... |
<<<<<<<
using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
=======
using MediatR;
using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands;
using Microsoft.Extensions.Logging;
using Ordering.API.Applicat... |
<<<<<<<
services.AddSingleton<IEventBus, EventBusRabbitMQ>();
services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
services.AddTransient<UserCheckoutAcceptedIntegrationEventHandler>();
services.AddTransient<IIntegrationEventHandler... |
<<<<<<<
public string LocationsUrl { get; set; }
public string ArtificialIntelligenceUrl { get; set; }
public string ProductRecommenderUrl { get; set; }
public string ProductSearchImageUrl
{
get
{
if (ProductSearchImageBased == null || str... |
<<<<<<<
using Ordering.API.Application.IntegrationEvents;
=======
>>>>>>>
using Ordering.API.Application.IntegrationEvents;
<<<<<<<
=======
using System;
>>>>>>>
using System;
<<<<<<<
=======
using Ordering.API.Application.IntegrationEvents;
>>>>>>>
using Ordering.API.Application.IntegrationEvents; |
<<<<<<<
public bool UseCustomizationData { get; set; }
=======
public string ActivateCampaignDetailFunction { get; set; }
>>>>>>>
public string ActivateCampaignDetailFunction { get; set; }
public bool UseCustomizationData { get; set; } |
<<<<<<<
public int GetOrderStatusId()
{
return _orderStatusId;
}
=======
#endregion
>>>>>>>
#endregion
public int GetOrderStatusId()
{
return _orderStatusId;
} |
<<<<<<<
new ApiResource("basket", "Basket Service"),
new ApiResource("marketing", "Marketing Service")
=======
new ApiResource("basket", "Basket Service"),
new ApiResource("locations", "Locations Service")
>>>>>>>
new ApiResource("basket... |
<<<<<<<
return new DefaultRabbitMQPersistentConnection(factory, logger);
});
}
RegisterEventBus(services);
=======
RegisterServiceBus(services);
>>>>>>>
return new DefaultRabbitMQPersistentConnection(factory, lo... |
<<<<<<<
Task<CustomerBasket> GetBasketAsync(string customerId);
Task<CustomerBasket> UpdateBasketAsync(CustomerBasket basket);
Task<bool> DeleteBasketAsync(string id);
=======
Task<CustomerBasket> GetBasket(string customerId);
Task<IEnumerable<string>> GetUsers();
Task<... |
<<<<<<<
public void Destroy() {
_controller.gameObject.GetEntityLink().entity.isOutOfScreen = true;
_controller.gameObject.GetEntityLink().entity.flagDestroy = true;
=======
public void HandlePathComplete() {
var entity = _controller.gameObject.GetEntityLink().entity;
entity.is... |
<<<<<<<
[Fact]
public void Union_IssueOrPullRequest()
{
var expression = new Query()
.Repository("foo", "bar")
.IssueOrPullRequest(1)
.Select(x => x.Switch<object>(when =>
when.Issue(issue => new IssueModel
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.