conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
};
=======
[!ItemsPresenter.MemberSelectorProperty] = parent[!ItemsControl.MemberSelectorProperty],
}.RegisterInNameScope(scope);
>>>>>>>
}.RegisterInNameScope(scope); |
<<<<<<<
#endif
public async Task Path_Tick_Scaled()
=======
public void Path_Tick_Scaled()
>>>>>>>
public async Task Path_Tick_Scaled()
<<<<<<<
#endif
public async Task Path_Tick_Scaled_Stroke_8px()
=======
public void Path_Tick_Scaled_Stroke_8px()
>>>>>>>
public a... |
<<<<<<<
[Fact]
public void HotKeyManager_Should_Release_Reference_When_Control_In_Item_Template_Detached()
{
using (UnitTestApplication.Start(TestServices.StyledWindow))
{
var styler = new Mock<Styler>();
AvaloniaLocator.CurrentMutable
... |
<<<<<<<
private NativeControlHostImpl _nativeControlHost;
=======
private IGlContext _glContext;
>>>>>>>
private NativeControlHostImpl _nativeControlHost;
private IGlContext _glContext;
<<<<<<<
void IAvnWindowBaseEvents.LostFocus()
{
... |
<<<<<<<
public PlatformRenderInterface(ISkiaGpu skiaGpu)
=======
private GRContext GrContext { get; }
public PlatformRenderInterface(ICustomSkiaGpu customSkiaGpu, long maxResourceBytes = 100663296)
>>>>>>>
public PlatformRenderInterface(ISkiaGpu skiaGpu, long maxResourceBytes)
<<<<<... |
<<<<<<<
public static readonly StyledProperty<IBrush> SelectionBrushProperty =
AvaloniaProperty.Register<TextBox, IBrush>(nameof(SelectionBrushProperty));
public static readonly StyledProperty<IBrush> SelectionForegroundBrushProperty =
AvaloniaProperty.Register<TextBox, IBrush>(... |
<<<<<<<
=======
/// <summary>
/// A specialized translator that can handle specific scenarios.
/// </summary>
class SpecializedTranslatorMiddleware : TranslationMiddleware
{
public SpecializedTranslatorMiddleware(string[] nativeLanguages, string translatorKey) : base(nativeLanguages, trans... |
<<<<<<<
[Fact]
public void Shift_Right_Click_Should_Not_Select_Mutiple()
{
var target = new ListBox
{
Template = Template(),
Items = new[] { "Foo", "Bar", "Baz" },
ItemTemplate = new FuncDataTemplate<string>(x => new TextBlo... |
<<<<<<<
using Avalonia.Dialogs;
using Avalonia.OpenGL;
=======
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Headless;
using Avalonia.LogicalTree;
using Avalonia.Skia;
>>>>>>>
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Headless;
using... |
<<<<<<<
public static bool UseImmediateRenderer { get; set; }
public static void Initialize()
{
AvaloniaLocator.CurrentMutable
.Bind<IPlatformRenderInterface>().ToConstant(s_instance)
.Bind<IRendererFactory>().ToConstant(s_instance)
.B... |
<<<<<<<
BorderThickness = 2,
BorderBrush = Brushes.Black,
Padding = new Thickness(8),
Content = new Path
{
Id = "checkMark",
... |
<<<<<<<
var impl = new Mock<ITopLevelImpl>();
=======
RegisterServices();
PerspexLocator.CurrentMutable.Bind<ILayoutManager>().ToConstant(new LayoutManager());
var impl = Mock.Of<ITopLevelImpl>(x => x.Scaling == 1);
>>>>>>>
var impl = M... |
<<<<<<<
public static readonly StyledProperty<IBrush> SelectionBrushProperty =
AvaloniaProperty.Register<TextPresenter, IBrush>(nameof(SelectionBrushProperty));
public static readonly StyledProperty<IBrush> SelectionForegroundBrushProperty =
AvaloniaProperty.Register<TextPresent... |
<<<<<<<
/// <summary>
/// Sets the shutdown mode of the application.
/// </summary>
/// <param name="exitMode">The shutdown mode.</param>
/// <returns></returns>
public TAppBuilder SetExitMode(ExitMode exitMode)
{
Instance.ExitMode = exitMode;
... |
<<<<<<<
private IResourceDictionary _resources;
private Styles _styles;
=======
>>>>>>>
private IResourceDictionary _resources;
private Styles _styles;
<<<<<<<
public Styles Styles
{
get { return _styles ?? (Styles = new Styles()); }
set
... |
<<<<<<<
public BotFrameworkAdapter(string appId, string appPassword, HttpClient httpClient = null, IMiddleware middleware = null)
: this(new SimpleCredentialProvider(appId, appPassword), httpClient, middleware)
=======
public BotFrameworkAdapter(string appId, string appPassword) : this(ap... |
<<<<<<<
modifierMinorityPolicy, modifierSomeEverydayNeedsFulfilled;
static readonly Modifier modCountryIsToBig = new Modifier(x => (x as PopUnit).Country.getSize() > (x as PopUnit).Country.government.getTypedValue().getLoyaltySizeLimit(), "That country is too big for good management", -0.5f, false);... |
<<<<<<<
=======
public class LocaleState
{
public string Locale { get; set; }
}
>>>>>>> |
<<<<<<<
_statisticsViewModel = new StatisticsViewModel();
=======
_buildingSettingsViewModel = new BuildingSettingsViewModel();
>>>>>>>
_statisticsViewModel = new StatisticsViewModel();
_buildingSettingsViewModel = new BuildingSettingsViewModel();
<<<<<<<
... |
<<<<<<<
using System.Threading;
=======
using System.Collections.ObjectModel;
>>>>>>>
using System.Threading;
using System.Collections.ObjectModel;
<<<<<<<
=======
//refresh localized influence types in combo box
comboxBoxInfluenceType.Items.Clear();
string[] rangeTypes = Enu... |
<<<<<<<
private void LanguageMenuSubmenuClosed(object sender, RoutedEventArgs e)
{
SelectedLanguageChanged();
}
private void TreeViewPresetsMouseDoubleClick(object sender, MouseButtonEventArgs e)
{
ApplyPreset();
}
=======
private void La... |
<<<<<<<
//DockPanel
=======
#endregion
#region DockPanel
private string _buildingSettings;
public string BuildingSettings
{
get { return _buildingSettings; }
set
{
UpdateProperty(ref _buildingSettings, value);
... |
<<<<<<<
=======
App.DpiScale = VisualTreeHelper.GetDpi(this);
>>>>>>>
App.DpiScale = VisualTreeHelper.GetDpi(this);
<<<<<<<
annoCanvas.StatisticsUpdated += AnnoCanvas_StatisticsUpdated;
=======
DpiChanged += MainWindow_DpiChanged;
>>>>>>>
annoCanva... |
<<<<<<<
{ "UpdateErrorPresetMessage" , "There was an error installing the update." },
{ "ColorsInLayout" , "Colors in Layout" },
{ "ColorsInLayoutToolTip" , "Double click color to select it" },
=======
{ "UpdateErrorPreset... |
<<<<<<<
_mainWindowLocalization.StatisticsViewModel.UpdateStatistics(annoCanvas.PlacedObjects,
annoCanvas.SelectedObjects,
annoCanvas.BuildingPresets);
=======
_mainWindowLocalization.TreeViewSearchText = string.Empty;
>>>>>>>
_mainWindowLocaliza... |
<<<<<<<
=======
/// <summary>
/// A specialized translator that can handle specific scenarios.
/// </summary>
class SpecializedTranslatorMiddleware : TranslationMiddleware
{
public SpecializedTranslatorMiddleware(string[] nativeLanguages, string translatorKey) : base(nativeLanguages, trans... |
<<<<<<<
using System.Collections.Generic;
using System.Drawing;
=======
>>>>>>>
using System.Collections.Generic;
<<<<<<<
IEnumerable<ShaderParamInfo> GetShaderParamList(IShaderProgramImp shaderProgram);
=======
>>>>>>>
IEnumerable<ShaderParamInfo> GetShaderParamList(IShaderProgramImp shaderP... |
<<<<<<<
=======
public static IMessageActivity ReplyWithSuggestions(BotContext context, string title, string message, string[] choices)
{
var reply = ReplyWithTitle(context, title, message);
reply.SuggestedActions = new SuggestedActions(
actions: choices.Select... |
<<<<<<<
=======
#endregion
#region Constructors
>>>>>>>
#endregion
#region Constructors
<<<<<<<
=======
#endregion
#region Members
>>>>>>>
#endregion
#region Members |
<<<<<<<
{
if (services == null)
{
throw new ArgumentNullException(nameof(services));
}
if (configureAction != null)
{
services.Configure(configureAction);
}
services.PostConfigure<BotFrameworkOp... |
<<<<<<<
private TransformComponent _camTransform;
private const float twoPi = M.Pi * 2.0f;
=======
//rnd is public so unit tests can inject a seeded random.
public Random rnd;
>>>>>>>
private TransformComponent _camTransform;
private const float twoPi = M.Pi * 2.0f... |
<<<<<<<
private const string VsDiffuse = @"
#ifndef GL_ES
#version 120
#endif
=======
>>>>>>>
<<<<<<<
private const string PsDiffuse = @"
#ifndef GL_ES
#version 120
#endif
=======
>>>>>>>
<<<<<<<
private const string VsSpecular = @"
#ifndef GL_ES
#version 120
=======
private const string VsDiff... |
<<<<<<<
=======
//if (_gamePad != null)
// Diagnostics.Log(_gamePad.LSX);
>>>>>>>
//if (_gamePad != null)
// Diagnostics.Log(_gamePad.LSX);
<<<<<<<
=======
// TODO: fixme I'm broken.
//else if (_spaceMouse != null)
//{
... |
<<<<<<<
internal struct MatrixParamNames
{
// ReSharper disable InconsistentNaming
public IShaderParam FUSEE_M;
public IShaderParam FUSEE_V;
public IShaderParam FUSEE_MV;
public IShaderParam FUSEE_P;
public IShaderParam FUSEE_MVP;
... |
<<<<<<<
private static Type _physicsImplementor;
[JSIgnore]
=======
private static Type _networkImplementor;
[JSIgnore]
>>>>>>>
private static Type _physicsImplementor;
[JSIgnore]
private static Type _networkImplementor;
[JSIgnore]
<<<<<<<
... |
<<<<<<<
//directional or Point- Light
public void SetLight(float3 v3, float4 color, int type, int id)
{
switch (type)
{
case 0:
SetLightActive(id, 1);
SetLightAmbient(id, color);
SetLightDiffuse(... |
<<<<<<<
=======
#endregion
#region Constructors
>>>>>>>
#endregion
<<<<<<<
renderContext.SetLight(_position, _diffuseColor, _ambientColor, _specularColor, (int)_type, _channel);
//Console.WriteLine("Pointlight worked");
=======
rend... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
// Set Context here, so that even the first pass is rendered defered or with shadows
// otherwise DeferredShaderHelper.GBufferPassShaderEffect is not initialized and null leading to an exception
SetContext(rc);
if (... |
<<<<<<<
/// <summary>
/// Contains all pixel and vertex shaders and a method to create a ShaderProgram in Rendercontext.
/// </summary>
=======
/// <summary>
/// Handles the <see cref="ShaderProgram"/> creation.
/// </summary>
>>>>>>>
/// <summary>
/// Contains all pixel and vertex sh... |
<<<<<<<
private static float _angleHorz = 0.0f, _angleVert = 0.0f, _angleVelHorz = 0, _angleVelVert = 0, _rotationSpeed = 10.0f, _damping = 0.95f;
protected Mesh Mesh;//, MeshFace;
//protected IShaderParam VColorParam;
protected IShaderParam Shininess;
protected IShaderParam Ambi... |
<<<<<<<
if (_inputDriverImp == null)
_inputDriverImp = ImpFactory.CreateIInputDriverImp();
=======
if (_networkImp == null)
_networkImp = ImpFactory.CreateINetworkImp();
>>>>>>>
if (_inputDriverImp == null)
_inputDriverImp = ImpFa... |
<<<<<<<
this.tabSource = new System.Windows.Forms.TabPage();
this.videoSourceResetButton = new System.Windows.Forms.Button();
this.lbl_VideoSourceURL = new System.Windows.Forms.Label();
this.changeVideoSourceText = new System.Windows.Forms.TextBox();
this.tvCh... |
<<<<<<<
=======
using System.Text;
using System.Threading.Tasks;
using Dalamud.Data;
>>>>>>>
using Dalamud.Data;
<<<<<<<
case SeStringChunkType.UIForeground:
payload = new UIForegroundPayload();
break;
case SeStringChunkType.UIGlow:
... |
<<<<<<<
=======
this.clmName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.clmSize = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
>>>>>>>
this.clmName = ((System.Windows.Forms.ColumnHeader)(new System.Wind... |
<<<<<<<
var merge = new MergePullRequest { Message = "thing the thing" };
var result = await _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge);
=======
var merge = new MergePullRequest { CommitMessage = "thing the thing" };
var result = await _fixture.... |
<<<<<<<
/// <summary>
/// Returns the <see cref="System.Uri"/> for the Deployments API for the given repository.
/// </summary>
/// <param name="owner">Owner of the repository</param>
/// <param name="name">Name of the repository</param>
/// <returns></returns>
p... |
<<<<<<<
IObservableWatchedClient Watched { get; }
=======
IObservableStarredClient Starred { get; }
>>>>>>>
IObservableWatchedClient Watched { get; }
IObservableStarredClient Starred { get; } |
<<<<<<<
Watched = new ObservableWatchedClient(client);
=======
Starred = new ObservableStarredClient(client);
>>>>>>>
Watched = new ObservableWatchedClient(client);
Starred = new ObservableStarredClient(client);
<<<<<<<
public IObservableWatchedClient Watched... |
<<<<<<<
/// <summary>
/// Add a member to the team
/// </summary>
/// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
/// <returns></returns>
Task AddMember(int id, string login);
/// <summary>
/// Remove a member from ... |
<<<<<<<
/// Gets a <see cref="Team"/>.
/// </summary>
/// <remarks>
/// http://developer.github.com/v3/orgs/teams/#get-team
/// </remarks>
/// <param name="id">The id of the <see cref="Team"/>.</param>
/// <exception cref="ApiException">Thrown when a general API e... |
<<<<<<<
Deployment = new DeploymentsClient(apiConnection);
Statistics = new StatisticsClient(apiConnection);
=======
PullRequest = new PullRequestsClient(apiConnection);
>>>>>>>
Statistics = new StatisticsClient(apiConnection);
<<<<<<<
/// <summary>
//... |
<<<<<<<
Hooks = new RepositoryHooksClient(apiConnection);
Forks = new RepositoryForksClient(apiConnection);
=======
RepoCollaborators = new RepoCollaboratorsClient(apiConnection);
>>>>>>>
Hooks = new RepositoryHooksClient(apiConnection);
Forks = new Reposit... |
<<<<<<<
Email = new UserEmailsClient(apiConnection);
=======
Followers = new FollowersClient(apiConnection);
>>>>>>>
Email = new UserEmailsClient(apiConnection);
Followers = new FollowersClient(apiConnection);
<<<<<<<
=======
/// <summary>
/// Retur... |
<<<<<<<
Hooks = new ObservableRepositoryHooksClient(client);
=======
RepoCollaborators = new ObservableRepoCollaboratorsClient(client);
>>>>>>>
Hooks = new ObservableRepositoryHooksClient(client);
RepoCollaborators = new ObservableRepoCollaboratorsClient(client);
<<<<... |
<<<<<<<
/// <summary>
/// A client for GitHub's Repository Hooks API.
/// </summary>
/// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/">API documentation</a> for more information.</remarks>
IRepositoryHooksClient Hooks { get; }
/// <summary>
... |
<<<<<<<
var position = sourceText.Lines.GetPosition(new LinePosition(request.Line, request.Column));
var symbol = SymbolFinder.FindSymbolAtPosition(semanticModel, position, _workspace);
=======
var position = sourceText.Lines.GetPosition(new LinePosition(request.Line - ... |
<<<<<<<
private readonly CachingCodeFixProviderForProjects _codeFixesForProjects;
=======
private readonly RulesetsForProjects _rulesetsForProjects;
>>>>>>>
<<<<<<<
_codeFixesForProjects = codeFixesForProjects;
=======
_rulesetsForProjects = rulesetsForProjects;
>>>>>>>
<... |
<<<<<<<
public const string DiscoverTests = "/v2/discovertests";
=======
public const string RunTestsInContext = "/v2/runtestsincontext";
>>>>>>>
public const string DiscoverTests = "/v2/discovertests";
public const string RunTestsInContext = "/v2/runtestsincontext"; |
<<<<<<<
//Gets the parameter documentation from this object
public string GetParameterText(string name)
{
var requiredParam = Array.Find(ParamElements, parameter => parameter.Name == name);
if (requiredParam != null)
return requiredParam.Documentation;
... |
<<<<<<<
public Dialog(string dialogId = null)
{
Id = dialogId;
_telemetryClient = NullBotTelemetryClient.Instance;
}
private string id;
/// <summary>
/// Unique id for the dialog.
/// </summary>
public string Id
=======
... |
<<<<<<<
[Option('e', HelpText = "Use an enhanced transcription model.")]
public bool UseEnhancedModel { get; set; }
=======
[Option('c', HelpText = "Set number of channels")]
public int NumberOfChannels { get; set; }
>>>>>>>
[Option('e', HelpText = "Use an enhanced transcri... |
<<<<<<<
ListBuckets
ListObjects
UploadStream
DownloadStream
DeleteObject
DownloadToFile
Required environment variables:
GOOGLE_PROJECT_ID The ID of Google Developers Console project
GOOGLE_BUCKET The name of Google Cloud Storage buc... |
<<<<<<<
public static object AttachDevice(MqttClient client, string deviceId, string auth)
=======
//[START iot_listen_for_config_messages]
//[START iot_send_data_from_bound_device]
public static object AttachDevice(MqttClient client, string deviceId)
>>>>>>>
//[START iot_lis... |
<<<<<<<
Name = "MainMenu";
BackgroundTexture = AssetLoader.LoadTexture("MainMenu/mainmenubg.png");
=======
Name = nameof(MainMenu);
BackgroundTexture = AssetLoader.LoadTexture("MainMenu\\mainmenubg.png");
>>>>>>>
Name = nameof(MainMenu);
Backgro... |
<<<<<<<
XNALabel lblPrivateMessaging;
XNAClientTabControl tabControl;
XNALabel lblPlayers;
XNAListBox lbUserList;
XNALabel lblMessages;
ChatListBox lbMessages;
XNATextBox tbMessageInput;
XNAContextMenu playerContextMenu;
CnCNetManager connect... |
<<<<<<<
var options = new IACompilerParameters { GenerateExecutable = false, GenerateInMemory = true };
options.ReferencedAssemblies.Add(typeof(Core).Namespace + ".dll");
=======
var options = new CompilerParameters { GenerateExecutable = false, GenerateInMemory = true, };
>>>>>>>... |
<<<<<<<
SetVariable = typeof(Script.Variables).GetMethod("set_Item");
GetVariable = typeof(Script.Variables).GetMethod("get_Item");
MethodInfo GetVars = typeof(Script).GetMethod("get_Vars");
if(Mirror != null)
{
ForceS... |
<<<<<<<
_logger.LogDebug($"Publishing message '{typeof(T).Name}' on exchange '{config.Exchange.Name}' with routing key {config.RoutingKey}.");
=======
_logger.LogDebug($"Initiating publish for message '{typeof(T).Name}' on exchange '{config.Exchange.ExchangeName}' with routing key {config.RoutingKey}.");
>>>>>... |
<<<<<<<
public class Pet : IEquatable<Pet>
{
[JsonConverter(typeof(StringEnumConverter))]
public enum StatusEnum {
[EnumMember(Value = "available")]
Available,
[EnumMember(Value = "pending")]
Pending,
... |
<<<<<<<
public class Tag : IEquatable<Tag>
{
=======
public partial class Tag : IEquatable<Tag>
{
>>>>>>>
public partial class Tag : IEquatable<Tag>
{
<<<<<<<
=======
this.Id = Id;
this.Name = Name;
>>>>>>>
this.Id... |
<<<<<<<
public class Order : IEquatable<Order>
{
[JsonConverter(typeof(StringEnumConverter))]
public enum StatusEnum {
[EnumMember(Value = "placed")]
Placed,
[EnumMember(Value = "approved")]
Approved,
... |
<<<<<<<
// authentication (test_api_key_query) required
if (!String.IsNullOrEmpty(Configuration.GetApiKeyWithPrefix("test_api_key_query")))
{
localVarQueryParams["test_api_key_query"] = Configuration.GetApiKeyWithPrefix("test_api_key_query");
}
... |
<<<<<<<
struct Primitive {
public UnityEngine.Mesh mesh;
public int materialIndex;
public Primitive( UnityEngine.Mesh mesh, int materialIndex ) {
this.mesh = mesh;
this.materialIndex = materialIndex;
}
}
... |
<<<<<<<
UnityEngine.Material GetPbrMetallicRoughnessMaterial();
UnityEngine.Material GenerateMaterial(
Material gltfMaterial,
ref Schema.Texture[] textures,
ref Schema.Image[] schemaImages,
ref UnityEngine.Texture2D[] images
);
=======
UnityEngin... |
<<<<<<<
var minDist = area.Center.Y - 40;
string widthText = $"{ViewModel.Width}{ViewModel.Unit}";
=======
string widthText = $"{MathF.Round(ViewModel.Width, 3)}{ViewModel.Unit}";
>>>>>>>
var minDist = area.Center.Y - 40;
string widthText = $"{MathF.Round(V... |
<<<<<<<
var settingsFile = new FileInfo(appInfo.SettingsFile);
await Application.Instance.InvokeAsync(async () => Settings = await Driver.Instance.GetSettings());
if (!settingsFile.Exists)
await ShowFirstStartupGreeter();
outputModeEditor.SetDisplaySize(... |
<<<<<<<
Info.Driver.ReportRecieved -= HandleReport;
lock (stateLock)
{
if (Enabled)
Enabled = false;
this.scheduler.Elapsed -= InterpolateHook;
this.scheduler.Dispose();
... |
<<<<<<<
private SocketClient _eventendpoint = null;
=======
private Thread _shutdownWhenDisconnected = null;
>>>>>>>
private SocketClient _eventendpoint = null;
private Thread _shutdownWhenDisconnected = null;
<<<<<<<
try
{
if (_client != null && _client.IsConnected)
return true;
... |
<<<<<<<
/// <inheritdoc />
=======
/// <summary>
/// Converts a bool value into a <see cref="Visibility"/> value and back.
/// </summary>
>>>>>>>
/// <inheritdoc />
/// <summary>
/// Converts a bool value into a <see cref="Visibility"/> value and back.
/// </summary>
<<<<<<<
/// <inheritdoc />
=======
... |
<<<<<<<
[ContentProperty(nameof(Children))]
=======
/// <summary>Implements the model for a layout anchorable pane control (a pane in a tool window environment).
/// A layout anchorable pane control can have multiple LayoutAnchorable controls as its children.
/// </summary>
[ContentProperty(nameof(Children))]
... |
<<<<<<<
/// <inheritdoc />
=======
/// <summary>
/// Converts an inverted bool value into a <see cref="Visibility"/> value.
/// </summary>
>>>>>>>
/// <inheritdoc />
/// <summary>
/// Converts an inverted bool value into a <see cref="Visibility"/> value.
/// </summary>
<<<<<<<
/// <inheritdoc />
==... |
<<<<<<<
public bool IsHidden => Parent is LayoutRoot;
=======
public bool IsHidden { get => (Parent is LayoutRoot); }
>>>>>>>
public bool IsHidden => Parent is LayoutRoot;
<<<<<<<
get => Parent != null && !(Parent is LayoutRoot);
set { if (value) Show(); else Hide(); }
=======
get => Parent != null... |
<<<<<<<
foreach (var entity in _globalEntityViewsDB)
if (entity.Value.isQueryiableEntityView)
=======
foreach (var entity in _entityViewsDB)
if (entity.Value.isQueryiableEntityView == true)
>>>>>>>
foreach (var groups in _groupEntityViewsDB)
... |
<<<<<<<
I18n.__("bookmark.overwrite.confirm", saveId),
=======
string.Format(saveBookmarkComfirmText, SaveIdToDisplayId(saveId)),
>>>>>>>
I18n.__("bookmark.overwrite.confirm", SaveIdToDisplayId(saveId)),
<<<<<<<
I18n.__("bookmark.load.confirm", saveId)... |
<<<<<<<
private Dictionary<int, BookmarkMetadata> usedSaveSlots;
=======
private HashSet<int> usedSaveSlots;
private readonly Dictionary<int, Sprite> _cachedThumbnailSprite = new Dictionary<int, Sprite>();
>>>>>>>
private Dictionary<int, BookmarkMetadata> usedSaveSlots;
privat... |
<<<<<<<
using NUnit.Framework;
=======
>>>>>>>
<<<<<<<
[TestFixture]
=======
>>>>>>>
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<... |
<<<<<<<
=======
using Microsoft.Build.Framework;
using Microsoft.Build.Tasks;
using Microsoft.Build.Utilities;
using Microsoft.Build.Shared;
>>>>>>>
using Microsoft.Build.Framework;
using Microsoft.Build.Tasks;
using Microsoft.Build.Utilities;
using Microsoft.Build.Shared;
<<<<<<<
[TestFixture]
=======
>>>>>... |
<<<<<<<
using NUnit.Framework;
=======
>>>>>>>
<<<<<<<
[TestFixture]
=======
>>>>>>>
<<<<<<<
[SetUp]
public void SetUp()
=======
///
public TaskHost_Tests()
>>>>>>>
public TaskHost_Tests()
<<<<<<<
/// Clean up after each tests is run
/// </summary>... |
<<<<<<<
=======
using System.Configuration;
using Microsoft.Win32;
using Microsoft.Build.Evaluation;
>>>>>>>
<<<<<<<
using Microsoft.Win32;
using NUnit.Framework;
using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException;
=======
using Xunit;
>>>>>>>
using Microso... |
<<<<<<<
=======
using System.Text.RegularExpressions;
using System.Threading;
using Microsoft.Build.Framework;
>>>>>>>
using System.Text.RegularExpressions;
using System.Threading;
using Microsoft.Build.Framework;
<<<<<<<
using NUnit.Framework;
=======
using Microsoft.Build.Evaluation;
using Xunit;
>>>>>>>
usi... |
<<<<<<<
using NUnit.Framework;
=======
using Xunit;
>>>>>>>
using Xunit;
<<<<<<<
[TestFixture]
=======
>>>>>>>
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
[Test]
=======
[Fact]
>... |
<<<<<<<
=======
using System;
>>>>>>>
using System;
<<<<<<<
[TestFixture]
=======
>>>>>>>
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
... |
<<<<<<<
using System.Collections.Generic;
using System.IO;
=======
using System.Collections.Specialized;
using System.Text.RegularExpressions;
using Microsoft.Build.Framework;
>>>>>>>
using System.Collections.Specialized;
using System.Text.RegularExpressions;
using Microsoft.Build.Framework;
<<<<<<<
=======
us... |
<<<<<<<
=======
using Microsoft.Build.UnitTests;
>>>>>>>
using Microsoft.Build.UnitTests;
<<<<<<<
[TestFixture]
public class SimpleScenarios
=======
public class SimpleScenarios : IDisposable
>>>>>>>
public class SimpleScenarios : IDisposable
<<<<<<<
[TearDown]
public void Unlo... |
<<<<<<<
internal class CopyOnWriteDictionary<K, V> : IDictionary<K, V>, IDictionary, ISerializable where V : class
=======
internal class CopyOnWriteDictionary<K, V> : IDictionary<K, V>, IDictionary
>>>>>>>
internal class CopyOnWriteDictionary<K, V> : IDictionary<K, V>, IDictionary, ISerializable
<<<<<<... |
<<<<<<<
using Microsoft.Build.Shared;
using NUnit.Framework;
=======
using Xunit;
>>>>>>>
using Microsoft.Build.Shared;
using Xunit;
<<<<<<<
[TestFixture]
=======
>>>>>>>
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
... |
<<<<<<<
=======
/// <summary>
/// If a config value is an empty string we return null, this is to keep
/// backward compatibility with old code
/// </summary>
public static string GetConfigValue(string value)
{
return string.IsNullOrEmpty(value) ? null : value.Trim();
}
>>>>>>> |
<<<<<<<
using NUnit.Framework;
=======
>>>>>>>
<<<<<<<
[TestFixture]
=======
>>>>>>>
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<... |
<<<<<<<
using NUnit.Framework;
=======
>>>>>>>
<<<<<<<
[TestFixture]
=======
>>>>>>>
<<<<<<<
[Test]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
[Test]
[ExpectedException(typeof(KeyNotFoundException))]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
[Te... |
<<<<<<<
#if FEATURE_SECURITY_PERMISSIONS
=======
using System.Resources;
>>>>>>>
using System.Resources;
#if FEATURE_SECURITY_PERMISSIONS |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.