conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
public static ControlPoint Default = new ControlPoint
{
BeatLength = 500,
TimingChange = true,
};
public string SampleBank;
public int SampleVolume;
=======
>>>>>>>
public string SampleBank;
public int SampleVolume; |
<<<<<<<
this.RotateTo(currentRotation / 2, 500, Easing.OutExpo);
}
public void Rotate(float angle)
{
if (!rotationTransferred)
{
currentRotation = Rotation * 2;
rotationTransferred = true;
}
if (angle >... |
<<<<<<<
protected sealed override Playfield CreatePlayfield() => new ManiaPlayfield(availableColumns)
=======
protected sealed override Playfield<ManiaHitObject, ManiaJudgement> CreatePlayfield() => new ManiaPlayfield(AvailableColumns)
>>>>>>>
protected sealed override Playfield CreatePlayfie... |
<<<<<<<
using osu.Framework.Allocation;
using osu.Framework.Audio.Track;
=======
using osu.Framework.Allocation;
>>>>>>>
using osu.Framework.Allocation;
using osu.Framework.Audio.Track;
<<<<<<<
using osu.Framework.Input;
using osu.Framework.Timing;
=======
using osu.Framework.Graphics.Audio;
>>>>>>>
using osu.Fr... |
<<<<<<<
AddUntilStep(() => ((ScoreAccessiblePlayer)Player).ScoreProcessor.TotalScore.Value > 0, "score above zero");
AddUntilStep(() => ((ScoreAccessiblePlayer)Player).HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 0), "key counter counted keys");
=======
base.AddCheckS... |
<<<<<<<
=======
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
>>>>>>>
using System;
using System.Collections.Generic; |
<<<<<<<
private Container<ChangelogContent> content;
private Sample sampleBack;
=======
private SampleChannel sampleBack;
>>>>>>>
private Sample sampleBack; |
<<<<<<<
=======
public const int RNG_SEED = 1337;
private void applyPositionOffsets()
{
var rng = new FastRandom(RNG_SEED);
// todo: HardRock displacement should be applied here
foreach (var obj in Beatmap.HitObjects)
{
switch (... |
<<<<<<<
var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
var currentModeRank = User.User?.GetStatisticsFor(ruleset)?.GlobalRank;
// fallback to current mode rank for testing purposes.
currentModeRank ??= User.User?.CurrentModeRank;
userRankText.T... |
<<<<<<<
=======
var spanDuration = length / Velocity;
>>>>>>>
<<<<<<<
var repeatStartTime = StartTime + repeat * RepeatDuration;
var reversed = repeat % 2 == 1;
=======
var spanStartTime = StartTime + span * spanDuration;
var reversed = s... |
<<<<<<<
showKeyCounter.ValueChanged += keyCounterVisibilityChanged;
=======
showKeyCounter.ValueChanged += visibility =>
{
if (visibility)
KeyCounter.Show();
else
KeyCounter.Hide();
};
>>>>>>>
... |
<<<<<<<
=======
private void initializeSkipButton()
{
const double skip_required_cutoff = 3000;
const double fade_time = 300;
double firstHitObject = Beatmap.Beatmap.HitObjects.First().StartTime;
if (firstHitObject < skip_required_cutoff)
{... |
<<<<<<<
hudOverlay.ReplaySettingsOverlay.PlaybackSettings.AdjustableClock = adjustableSourceClock;
=======
breakOverlay.BindProcessor(scoreProcessor);
>>>>>>>
breakOverlay.BindProcessor(scoreProcessor);
hudOverlay.ReplaySettingsOverlay.PlaybackSettings.AdjustableClo... |
<<<<<<<
using osu.Framework.Extensions.IEnumerableExtensions;
=======
using osu.Framework.Configuration;
>>>>>>>
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Configuration;
<<<<<<<
protected void AddNested(Playfield otherPlayfield) => nestedPlayfields.Value.Add(otherPlayfield);
... |
<<<<<<<
/// <summary>
/// The BPM at this control point.
/// </summary>
public double BPM => 60000 / BeatLength;
private double beatLength = DEFAULT_BEAT_LENGTH;
=======
/// <summary>
/// The beat length at this control point.
/// </summary>
pub... |
<<<<<<<
AddUntilStep(() => ((ScoreAccessibleReplayPlayer)Player).ScoreProcessor.TotalScore.Value > 0, "score above zero");
AddUntilStep(() => ((ScoreAccessibleReplayPlayer)Player).HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 0), "key counter counted keys");
=======
ba... |
<<<<<<<
protected override void OnNewDrawableHitObject(DrawableHitObject drawable)
{
((DrawableOsuHitObject)drawable).CheckHittable = CheckHittable;
Debug.Assert(!drawable.IsLoaded, $"Already loaded {nameof(DrawableHitObject)} is added to {nameof(OsuPlayfield)}");
dr... |
<<<<<<<
private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.SmallTickHit && judgementResults.First().Type == HitResult.Miss;
=======
private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.IgnoreHit && !judgementResults.First().IsHit;
>>>>>>>
... |
<<<<<<<
Padding = new MarginPadding { Top = hitPosition };
Explosions.Padding = new MarginPadding { Top = DefaultNotePiece.NOTE_HEIGHT / 2 };
=======
Explosions.Padding = new MarginPadding { Top = DefaultNotePiece.NOTE_HEIGHT };
>>>>>>>
Explosions.Padd... |
<<<<<<<
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Graphics;
using System.Collections.Generic;
using System.Linq;
namespace osu.Game.... |
<<<<<<<
public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new TaikoHitRenderer(beatmap);
=======
public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new TaikoHitRenderer
{... |
<<<<<<<
Add(LeftContent = new Container
{
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Both,
Size = new Vector2(wedged_container_size.X, 1),
Padding = new MarginPadding
... |
<<<<<<<
using System.Collections.Generic;
=======
using osu.Framework.Graphics.Cursor;
>>>>>>>
using System.Collections.Generic;
using osu.Framework.Graphics.Cursor; |
<<<<<<<
[BackgroundDependencyLoader]
private void load(IGameBeatmap beatmap, OsuColour colours)
{
this.beatmap.BindTo(beatmap);
// linear colour looks better in this case, so let's use it for now.
Color4 gradientDark = colours.Blue.Opacity(0).ToLinear();
... |
<<<<<<<
case ModType.Fun:
return new Mod[] {
new OsuModTransform(),
};
=======
case ModType.Fun:
return new Mod[]
{
new OsuModWiggle(),
};... |
<<<<<<<
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Play;
=======
using osu.Game.Storyboards;
>>>>>>>
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Play;
using osu.Game.Storyboards;
<<<<<<<
protected override Player CreatePlayer(Ruleset ruleset) => new ScoreExposedPlayer();
pr... |
<<<<<<<
var visibleSets = beatmapSets.Where(s => !s.Filtered).ToList();
if (!visibleSets.Any())
return;
=======
var visible = beatmapSets.Where(s => !s.Filtered).ToList();
if (!visible.Any())
return false;
>>>>>>>
var visible... |
<<<<<<<
=======
using osu.Framework.Logging;
using osu.Framework.Platform;
>>>>>>>
using osu.Framework.Logging;
<<<<<<<
private void load(OsuGame game, NotificationOverlay notifications)
=======
private void load(OsuGame game, NotificationOverlay notifications, GameHost host, ChannelManager channe... |
<<<<<<<
Schedule(() =>
{
manager.Delete(manager.GetAllUsableBeatmapSets());
var temp = TestResources.GetTestBeatmapForImport();
manager.Import(temp);
Child = screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
... |
<<<<<<<
using System.Collections.Specialized;
using System.Diagnostics;
=======
using System.Linq;
>>>>>>>
using System.Collections.Specialized;
<<<<<<<
using osu.Framework.Input.States;
=======
using osu.Framework.Input.Events;
using osu.Framework.Threading;
>>>>>>>
using osu.Framework.Input.Events;
<<<<<<<
... |
<<<<<<<
=======
logoTracking = false;
hideOverlaysOnEnter.Value = true;
allowOpeningOverlays.Value = false;
>>>>>>>
logoTracking = false;
<<<<<<<
}, 150);
=======
}, buttonAre... |
<<<<<<<
[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.Dynamic")]
[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.Android")]
=======
[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.Dynamic")]
[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.iOS")]
>>>>>>>
[assembly: Intern... |
<<<<<<<
using System.Collections.Generic;
=======
using System;
>>>>>>>
using System;
using System.Collections.Generic;
<<<<<<<
private static readonly SkinInfo random_skin_info = new RandomSkinInfo();
private SkinManager skins;
private List<SkinInfo> usableSkins;
=======
[Resolve... |
<<<<<<<
float halfCatchWidth;
using (var catcher = new Catcher(beatmap.BeatmapInfo.BaseDifficulty))
{
halfCatchWidth = catcher.CatchWidth * 0.5f;
halfCatchWidth *= 0.8f; // We're only using 80% of the catcher's width to simulate imperfect gameplay.
... |
<<<<<<<
addControlPoint(time, new DifficultyControlPoint
=======
handleDifficultyControlPoint(new LegacyDifficultyControlPoint
>>>>>>>
addControlPoint(time, new LegacyDifficultyControlPoint |
<<<<<<<
protected virtual void Shake(double maximumLength) => shakeContainer.Shake(maximumLength);
}
=======
>>>>>>>
protected virtual void Shake(double maximumLength) => shakeContainer.Shake(maximumLength); |
<<<<<<<
public Bindable<bool> Joined = new Bindable<bool>();
=======
public readonly SortedList<Message> Messages = new SortedList<Message>(Comparer<Message>.Default);
>>>>>>>
public Bindable<bool> Joined = new Bindable<bool>();
public readonly SortedList<Message> Messages = new Sort... |
<<<<<<<
double currentTrackTime = beatmap.Value.Track.CurrentTime + EarlyActivationMilliseconds;
ControlPoint overridePoint;
ControlPoint controlPoint = beatmap.Value.Beatmap.TimingInfo.TimingPointAt(currentTrackTime, out overridePoint);
=======
double currentTrackTime... |
<<<<<<<
ColumnLineColour,
JudgementLineColour,
ColumnBackgroundColour,
ColumnLightColour
=======
ColumnLineColour,
MinimumColumnWidth
>>>>>>>
ColumnLineColour,
JudgementLineColour,
ColumnBackgroundColour,
ColumnLightColour
Minimu... |
<<<<<<<
ColumnBackground
HitTarget
=======
KeyArea
>>>>>>>
ColumnBackground
HitTarget
KeyArea |
<<<<<<<
AddButton("DrumRoll", () => addDrumRoll(false));
AddButton("Strong DrumRoll", () => addDrumRoll(true));
=======
AddButton("Centre", () => addCentreHit(false));
AddButton("Strong Centre", () => addCentreHit(true));
AddButton("Rim", () => addRimHit(fal... |
<<<<<<<
protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> nodeSamples)
=======
protected override HitObject CreateSlider(Vector2 position, bool newCombo, i... |
<<<<<<<
protected override IEnumerable<Type> ValidConversionTypes { get; } = new[] { typeof(HitObject) };
public TaikoBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
: base(beatmap, ruleset)
=======
public TaikoBeatmapConverter(IBeatmap beatmap)
: base(beatmap)
>>... |
<<<<<<<
=======
using osu.Game.Modes.Mods;
using osu.Game.Modes.Objects;
>>>>>>>
using osu.Game.Modes.Mods; |
<<<<<<<
using osu.Game.Input;
=======
using osu.Framework.Testing;
>>>>>>>
using osu.Framework.Testing;
using osu.Game.Input; |
<<<<<<<
public class ManiaBeatmapConversionTest : BeatmapConversionTest<ManiaConvertMapping, ConvertValue>
=======
[TestFixture]
public class ManiaBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
>>>>>>>
[TestFixture]
public class ManiaBeatmapConversionTest : BeatmapConversionTest<Mani... |
<<<<<<<
using osu.Game.Modes.Taiko.Beatmaps;
using osu.Game.Modes.Taiko.Mods;
=======
>>>>>>>
using osu.Game.Modes.Taiko.Mods; |
<<<<<<<
[Resolved(CanBeNull = true)]
private DrawableRuleset drawableRuleset { get; set; }
=======
private Container<PausableSkinnableSound> samplesContainer;
>>>>>>>
[Resolved(CanBeNull = true)]
private DrawableRuleset drawableRuleset { get; set; }
private Containe... |
<<<<<<<
private void initializeSkipButton()
{
const double skip_required_cutoff = 3000;
const double fade_time = 300;
double firstHitObject = Beatmap.Beatmap.HitObjects.First().StartTime;
if (firstHitObject < skip_required_cutoff)
{
... |
<<<<<<<
public interface IBeatmap : IJsonSerializable
{
/// <summary>
/// This beatmap's info.
/// </summary>
BeatmapInfo BeatmapInfo { get; set; }
/// <summary>
/// This beatmap's metadata.
/// </summary>
BeatmapMetadata Metadata { get; }
... |
<<<<<<<
LabelText = "Show difficulty graph on progress bar",
Bindable = config.GetBindable<bool>(OsuSetting.ShowProgressGraph)
},
new SettingsCheckbox
{
=======
LabelText = "Show health display even when you ca... |
<<<<<<<
/// <summary>
/// Whether playback of this sound has been requested, regardless of whether it could be played or not (due to being paused, for instance).
/// </summary>
protected bool PlaybackRequested;
=======
>>>>>>>
<<<<<<<
protected virtual bool PlayWhenPaused =>... |
<<<<<<<
Breaks = working.Beatmap.Breaks
},
RulesetContainer.Cursor?.CreateProxy() ?? new Container(),
HUDOverlay = new HUDOverlay(ScoreProcessor, RulesetContainer, working)
=======
Breaks = ... |
<<<<<<<
new OsuModTraceable(),
=======
new OsuModGrow(),
new MultiMod(new ModWindUp<OsuHitObject>(), new ModWindDown<OsuHitObject>()),
>>>>>>>
new OsuModGrow(),
new MultiMod(new ModWindUp<OsuHitObj... |
<<<<<<<
using System.Linq;
=======
using JetBrains.Annotations;
>>>>>>>
using System.Linq;
using JetBrains.Annotations; |
<<<<<<<
protected override IEnumerable<string> GetStableImportPaths() => GetStableStorage().GetDirectories(ImportFromStablePath);
=======
protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize) =>
new DownloadBeatmapSe... |
<<<<<<<
using osu.Framework.Graphics.Animations;
=======
using osu.Framework.Graphics.Containers;
>>>>>>>
using osu.Framework.Graphics.Animations;
using osu.Framework.Graphics.Containers; |
<<<<<<<
protected override void ApplyDrawNode(DrawNode node)
{
base.ApplyDrawNode(node);
var flashNode = (FlashlightDrawNode)node;
flashNode.Shader = shader;
flashNode.ScreenSpaceDrawQuad = ScreenSpaceDrawQuad;
fla... |
<<<<<<<
=======
/// Create a token for the given text.
/// </summary>
/// <param name="text">The text string to create the token for.</param>
/// <returns>The token that was created.</returns>
public static Token Create(string text)
{
return Create(TokenKind... |
<<<<<<<
case HUDSkinComponents.ScoreCounter:
return new LegacyScoreCounter(this);
case HUDSkinComponents.ScoreText:
const string font = "score";
if (!this.HasFont(font))
... |
<<<<<<<
using System;
=======
using osu.Framework.Allocation;
>>>>>>>
using System;
using osu.Framework.Allocation;
<<<<<<<
public class OverlayHeaderTabControl : OverlayTabControl<T>
=======
protected TabControlOverlayHeader(OverlayColourScheme colourScheme)
: base(colourScheme)
... |
<<<<<<<
protected bool PauseCooldownActive =>
lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
private bool canPause =>
=======
/// <summary>
/// A set of conditionals which defines whether the current... |
<<<<<<<
[Cached]
[Cached(typeof(ISamplePlaybackDisabler))]
public readonly GameplayClock GameplayClock;
=======
public GameplayClock GameplayClock => localGameplayClock;
[Cached(typeof(GameplayClock))]
private readonly LocalGameplayClock localGameplayClock;
>>>>>>>
... |
<<<<<<<
using osu.Game.Modes.Mania.Beatmaps;
using osu.Game.Modes.Mania.Mods;
=======
>>>>>>>
using osu.Game.Modes.Mania.Mods; |
<<<<<<<
public interface IContentFieldDriver : IEvents {
DriverResult BuildDisplayShape(BuildDisplayModelContext context);
DriverResult BuildEditorShape(BuildEditorModelContext context);
DriverResult UpdateEditorShape(UpdateEditorModelContext context);
=======
public interface IContent... |
<<<<<<<
=======
using System.Collections.Generic;
using System.Diagnostics;
>>>>>>>
using System.Collections.Generic;
<<<<<<<
try
=======
// this is kind of SILLY
// https://github.com/dotnet/aspnetcore/issues/15198
connection.On<MultiplayerRoomState>(nameof(IMultip... |
<<<<<<<
Playlist.BindCollectionChanged(onPlaylistChanged, true);
=======
>>>>>>> |
<<<<<<<
case HitResult.Ok:
return useStrongExplosion(judgedObject)
? TaikoSkinComponents.TaikoExplosionOkStrong
: TaikoSkinComponents.TaikoExplosionOk;
=======
case HitResult.Good:
return TaikoSkinC... |
<<<<<<<
protected override void OnDisplaying(TextArea element, ElementDisplayingContext context) {
context.ElementShape.TokenizedValue = _tokenizer.Replace(element.RuntimeValue, null);
=======
protected override void OnDisplaying(TextArea element, ElementDisplayContext context) {
... |
<<<<<<<
private CancellationTokenSource initialAddSetsTask;
private GameBeatmap beatmap;
=======
>>>>>>>
private GameBeatmap beatmap; |
<<<<<<<
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
{
dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
dependencies.CacheAs(this);
dependencies.CacheAs(Ruleset);
... |
<<<<<<<
case TaikoSkinComponents.TaikoExplosionOk:
case TaikoSkinComponents.TaikoExplosionOkStrong:
=======
case TaikoSkinComponents.TaikoExplosionMiss:
var missSprite = this.GetAnimation(getHitName(taikoComponent.Component), true, false);
... |
<<<<<<<
using osu.Game.Online.Rooms;
=======
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu.Mods;
>>>>>>>
using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu.Mods; |
<<<<<<<
base.OnResuming(last);
// required due to https://github.com/ppy/osu-framework/issues/3218
ModSelect.SelectedMods.Disabled = false;
ModSelect.SelectedMods.BindTo(selectedMods);
=======
Carousel.AllowSelection = true;
>>>>>>>
base.OnRe... |
<<<<<<<
var osuFile = await OSharp.Beatmap.OsuFile.ReadFromFileAsync(@"\\?\" + osuFilePath).ConfigureAwait(false);
=======
if (!File.Exists(osuFilePath))
{
return null;
}
var osuFile = await OSharp.Beatmap.OsuFile.ReadFromFileAsync(osuFilePa... |
<<<<<<<
public static readonly string ApiUserSecretKeyPrefix = "COVID-19-RADAR";
public static readonly string AppName = "COVID-19-RADAR";
=======
public static readonly string ApiUserSecretKeyPrefix = "Bearer";
>>>>>>>
public static readonly string ApiUserSecretKeyPrefix = "Bearer";
... |
<<<<<<<
=======
/// <summary>
/// HOME に類似しているローカライズされた文字列を検索します。
/// </summary>
internal static string ButtonHome {
get {
return ResourceManager.GetString("ButtonHome", resourceCulture);
}
}
/// <summary>
/// ... |
<<<<<<<
=======
/// <summary>
/// HOME に類似しているローカライズされた文字列を検索します。
/// </summary>
internal static string ButtonHome {
get {
return ResourceManager.GetString("ButtonHome", resourceCulture);
}
}
/// <summary>
/// ... |
<<<<<<<
public string TextUserAgreement { get; set; }
public string TextContainsDescriptionOfConsent1 { get; set; }
public string TextContainsDescriptionOfConsent2 { get; set; }
public string ButtonAgreeAndProceed { get; set; }
=======
private UserDataService _userDataService;... |
<<<<<<<
/// Looks up a localized string similar to Start.
/// </summary>
internal static string ButtonStart {
get {
return ResourceManager.GetString("ButtonStart", resourceCulture);
}
}
/// <summary>
=======
/// Looks... |
<<<<<<<
using Covid19Radar.Resources;
using Prism.Navigation;
=======
using Covid19Radar.Renderers;
using Covid19Radar.Views;
using Prism.Navigation;
>>>>>>>
using Covid19Radar.Resources;
using Covid19Radar.Renderers;
using Covid19Radar.Views;
using Prism.Navigation; |
<<<<<<<
{
private INavigationService _navigationService;
private IBeaconService _beaconService;
private ObservableCollection<BeaconDataModel> _beaconDataList;
public ObservableCollection<BeaconDataModel> BeaconDataList
{
get => _beaconDataList;
set ... |
<<<<<<<
public string TextUserAgreement { get; set; }
public string TextContainsDescriptionOfConsent1 { get; set; }
public string TextContainsDescriptionOfConsent2 { get; set; }
public string ButtonAgreeAndProceed { get; set; }
=======
private UserDataService _userDataService;... |
<<<<<<<
public static readonly string ApiUserSecretKeyPrefix = "COVID-19-RADAR";
public static readonly string AppName = "COVID-19-RADAR";
=======
public static readonly string ApiUserSecretKeyPrefix = "Bearer";
>>>>>>>
public static readonly string ApiUserSecretKeyPrefix = "Bearer";
... |
<<<<<<<
=======
/// <summary>
/// HOME に類似しているローカライズされた文字列を検索します。
/// </summary>
internal static string ButtonHome {
get {
return ResourceManager.GetString("ButtonHome", resourceCulture);
}
}
/// <summary>
/// ... |
<<<<<<<
.SelectMany(x => x.Count() == 1 ?
Observable.Return(x.First().Value) :
Observable.Throw<byte[]>(new KeyNotFoundException()))
=======
.SelectMany(x => x.Count == 1 ?
Observable.Return(x[0].Value) :
... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
#if ENABLE_DYNAMO_SCHEDULER
=======
revitDynamoModel.PackageManagerClient.RequestAuthentication +=
SingleSignOnManager.RegisterSingleSignOn;
>>>>>>> |
<<<<<<<
using Orchard.Core.Common.Models;
using Orchard.Environment.Features;
=======
using Orchard.Themes;
>>>>>>>
using Orchard.Environment.Features; |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
=======
>>>>>>>
using System.Collections.Generic;
using System.Linq;
<<<<<<<
private static readonly List<Action> idleActions = new List<Action>();
enum Versions { ShapeManager = 221 }
=======
enum Versions { ShapeManager = 2... |
<<<<<<<
var assemblyLocation = Assembly.GetExecutingAssembly().Location;
var assemblyDirectory = Path.GetDirectoryName(assemblyLocation);
var parentDirectory = Directory.GetParent(assemblyDirectory);
var corePath = parentDirectory.FullName;
=======
... |
<<<<<<<
CustomConsole.WriteLineOK("Aura successfully started!");
=======
//Networking init
NetworkInit.Init();
>>>>>>>
NetworkInit.Init();
CustomConsole.WriteLineOK("Aura successfully started!"); |
<<<<<<<
using Cosmos.HAL.PCInformation;
using System;
using System.Collections.Generic;
=======
using Cosmos.HAL;
using Cosmos.System.Network;
using System;
using IPv4 = Cosmos.System.Network.IPv4;
>>>>>>>
using Cosmos.HAL.PCInformation;
using System;
using System.Collections.Generic;
using Cosmos.HAL;
using Cosmo... |
<<<<<<<
Console.WriteLine("RxOverflow!");
CurAddressPointerReadRegister = (UInt16)(CurBufferAddressRegister - 0x10);
cur_status = (UInt16)(cur_status | 0x01);
=======
CurAddressPointerReadRegister = (ushort)(CurBufferAddressRegister - 0x10);
... |
<<<<<<<
private readonly ActionTypePassed _actionTypePassed;
=======
private ActionTypePassed _actionTypePassed;
private string _title;
>>>>>>>
private string _title;
private readonly ActionTypePassed _actionTypePassed;
<<<<<<<
public BootstrapActionLink IconAppend(st... |
<<<<<<<
public const string OptionDebugMode = "Debug mode";
public const bool OptionDebugModeDefaultValue = false;
private const string RegOptionDebugMode = "DebugMode";
public const string OptionDebugModeDescription =
=======
public const string OptionUserDebugMode = "Debug mo... |
<<<<<<<
using System.Text.RegularExpressions;
=======
using System.Threading;
using System.Threading.Tasks;
>>>>>>>
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
<<<<<<<
public static void ValidateRegex(string pattern)
{
try
{
... |
<<<<<<<
int exitCode = _processExecutor.ExecuteCommandBlocking(
=======
_processExecutor.ExecuteCommandBlocking(
>>>>>>>
int exitCode = _processExecutor.ExecuteCommandBlocking(
<<<<<<<
if (printTestOutput)
_logger.LogInfo($"{_threadName}<<<<<<<<<<<<<<... |
<<<<<<<
var testCaseLocations = GetTestCaseLocations(testCaseDescriptors, _settings.GetPathExtension(_executable), _settings.GetAdditionalPdbs(_executable));
=======
var resolver = new TestCaseResolver(_executable, _settings.GetPathExtension(_executable), _diaResolverFactory, _settings.ParseSy... |
<<<<<<<
Directory.CreateDirectory(Path.GetDirectoryName(expectationFile));
Assert.Inconclusive("Test results changed and have been overwritten. Differences: " + msg);
=======
Assert.Inconclusive("Test results changed and have been overwritten.");
>>>>>>>
... |
<<<<<<<
// This file has been modified by Microsoft on 6/2017.
using System;
=======
using System;
using System.Collections.Generic;
>>>>>>>
// This file has been modified by Microsoft on 6/2017.
using System;
using System.Collections.Generic;
<<<<<<<
using System.Text.RegularExpressions;
=======
using Syste... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.