conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
Check.ThatCode(() =>
{
Check.That(IntValue).IsEqualTo(LongValue);
})
.Throws<FluentCheckException>()
.WithMessage("\nThe checked value is different from the expected one.\nThe checked value:\n\t[42] of type: [int]\nThe expected value:\n... |
<<<<<<<
public void DidNotRaiseAnyOldSyntax()
{
Check.ThatCode(() =>
{
// obsolete signature, kept for coverage
Check.That(() => { new object(); }).ThrowsAny();
})
.Throws<FluentCheckException>()
.WithMessage("\n... |
<<<<<<<
#pragma warning restore 169
public DummyHeritance()
{
}
public DummyHeritance(int x, int y, int z)
: base(x, y)
{
this.z = z;
}
=======
public int GetDummyZ()
{
re... |
<<<<<<<
return (negated || notContains) ? null : FluentMessage.BuildMessage("The {0} is null.").Expected(values).Label("The {0} substring(s):").ToString();
=======
return negated ? null : FluentMessage.BuildMessage("The {0} is null.").For("string").Expected(values).Label("The {0} subst... |
<<<<<<<
Note = user.Note;
IsAfk = user.IsAfk;
=======
Status = ((UserStatus)user.Status).ToString();
>>>>>>>
Status = ((UserStatus)user.Status).ToString();
Note = user.Note;
IsAfk = user.IsAfk;
<<<<<<<
public string Note { get; set; }
... |
<<<<<<<
protected override string GetTitle(HttpWebResponse response)
{
return response.ResponseUri.AbsoluteUri.ToString();
}
=======
>>>>>>> |
<<<<<<<
user.Hash = email.ToMD5();
var userViewModel = new UserViewModel(user);
=======
ChatUser user = _users[name];
user.Hash = email.ToLowerInvariant().ToMD5();
>>>>>>>
user.Hash = email.ToLowerInvariant().ToMD5();
var userViewModel = new Us... |
<<<<<<<
attributeCounters.TryGetValue(attribute.Name, out var attributeCounter);
attributeCounters[attribute.Name] = attributeCounter + 1;
var accessorName = GetAccessorName(attribute.Name, attributeCounter);
=======
if (A... |
<<<<<<<
Program.Client.Rpc.LoadDeck(ids, keys, groups, SleeveManager.Instance.GetSleeveString(LastLoadedDeck.SleeveId));
=======
Program.Client.Rpc.LoadDeck(ids, keys, groups,sizes, SleeveManager.Instance.GetSleeveString(deck.SleeveId));
>>>>>>>
Program.Client.Rpc.LoadDeck(ids, ke... |
<<<<<<<
public void LoadDeck(int[] id, Guid[] type, Group[] group, string sleeve)
=======
public void LoadDeck(int[] id, ulong[] type, Group[] group, string[] size, string sleeve)
>>>>>>>
public void LoadDeck(int[] id, Guid[] type, Group[] group, string[] size, string sleeve)
<<<<<<<
public void CreateCard(i... |
<<<<<<<
private Color? _highlight;
private bool isAlternate = false;
private bool isAlternateImage =false;
internal bool mayBeConsideredFaceUp; /* For better responsiveness, turning a card face down is applied immediately,
=======
private double _x, _y;
private CardDe... |
<<<<<<<
var retCard = new Play.Card(player, id, Program.GameEngine.Definition.GetCardById(card.Id), true);
=======
var retCard = new Play.Card(player, id, key, Program.GameEngine.Definition.GetCardById(card.Id), true, card.Size.Name);
>>>>>>>
var retCard = new Play.Card(player, id... |
<<<<<<<
=======
private bool isLoaded;
private object playerLock;
>>>>>>>
private object playerLock;
<<<<<<<
this.totalTime = new BehaviorSubject<TimeSpan>(TimeSpan.Zero);
=======
this.playerLock = new object();
>>>>>>>
this.totalTime = new BehaviorS... |
<<<<<<<
private readonly ObservableCollection<Player> playersPeeking = new ObservableCollection<Player>();
// List of players, who had peeked at this card. The list is reset when the card changes group.
private Color? _highlight;
private bool _selected;
private Player _target;
... |
<<<<<<<
card = new Play.Card(owner, c.Id, model, owner == Play.Player.LocalPlayer);
=======
card = new Play.Card(owner, c.Id, ulong.Parse(c.EncType), model, owner == Play.Player.LocalPlayer,c.Size);
>>>>>>>
card = new Play.Card(owner, c.Id, model, owner == ... |
<<<<<<<
if (value == null) return;
cardImage.Source = new BitmapImage(value.GetCardBackUri());//Sets initial preview to default backing (!isFaceUp Image)
=======
cardImage.Source = new BitmapImage(value.GetCardBackUri());
>>>>>>>
cardImage.Sour... |
<<<<<<<
// TODO: why a SortedList? Wouldn't a Dictionary be sufficient?
private readonly SortedList<Guid, MarkerModel> markersById = new SortedList<Guid, MarkerModel>();
private readonly List<CardModel> recentCards = new List<CardModel>(MaxRecentCards);
private readonly List<MarkerModel... |
<<<<<<<
/*
* The CardModel holds all the information the Set Definition gives to us. Access to the model itself
* I would expect to be off limits.
*
* */
public static Uri GetPictureUri(Game game, Guid setId, string imageUri)
{
return new Uri(ga... |
<<<<<<<
arg1[i] = new Guid(reader.ReadBytes(16));
int arg2 = reader.ReadInt32();
handler.CreateCard(arg0, arg1, arg2);
=======
arg1[i] = reader.ReadUInt64();
length = reader.ReadInt16();
string[] arg2 = new string[length];
for (int i = 0; i < length; ++i)
arg2[i] = reader.Re... |
<<<<<<<
public DataVisualState DataStringState
{
get => (DataVisualState)GetValue(OffSetDataStringStateProperty);
=======
/// <summary>
/// Visually change de state of the byte
/// </summary>
public DataVisualState DataStringState
{
get =... |
<<<<<<<
case MeasureType.Position:
return Current_Status.playing_position;
=======
case MeasureType.PositionSeconds:
return (parent.Status?.PlayingPosition).GetValueOrDefault();
>>>>>>>
case MeasureType.Position:
... |
<<<<<<<
if ( TextHelper.TextTimestampExpired( phrase, 2000 ) )
=======
if (TextHelper.TextTimestampExpired(phrase, 3000))
>>>>>>>
if ( TextHelper.TextTimestampExpired( phrase, 2000 ) )
ReadText();
TextHelper.UpdateTextTimestamp(phrase);
... |
<<<<<<<
GuildBuff,
=======
RelationshipEXP,
Mentee,
Mentor,
>>>>>>>
RelationshipEXP,
Mentee,
Mentor,
GuildBuff,
<<<<<<<
FriendUpdate,
GuildBuffList
=======
FriendUpdate,
LoverUpdate,
MentorUpdate,
>>>>>>>
FriendUpdate,
LoverUpdate,
MentorUpdate,
... |
<<<<<<<
case (short)ServerPacketIds.ResizeInventory:
ResizeInventory((S.ResizeInventory)p);
break;
=======
case (short)ServerPacketIds.NewIntelligentCreature://IntelligentCreature
NewIntelligentCreature((S.NewIntelligentCreatu... |
<<<<<<<
RemovePet,
ConquestGuard,
ConquestGate,
ConquestWall,
ConquestSiege,
TakeConquestGold,
SetConquestRate,
StartConquest,
ScheduleConquest,
OpenGate,
CloseGate,
=======
RemovePet,
Break
>>>>>>>
Remove... |
<<<<<<<
GuildBuffList,
GameShopInfo,
GameShopStock,
=======
GuildBuffList,
NPCRequestInput
>>>>>>>
GuildBuffList,
NPCRequestInput,
GameShopInfo,
GameShopStock,
<<<<<<<
GuildBuffUpdate,
GameshopBuy
=======
GuildBuffUpdate,
NPCConfirmInput
>>>>>>>
GuildBu... |
<<<<<<<
case 71://Sabuk Archer
return new ConquestArcher(info);
case 72:
return new Gate(info);
case 73:
return new Wall(info);
=======
>>>>>>>
case 71:
return new SabukGate... |
<<<<<<<
for (int i = 0; i < GameShopList.Count; i++)
{
if (GameShopList[i].Info.Index == Info.Index) return;
}
GameShopList.Add(new GameShopItem { GoldPrice = (uint)(1000 * Settings.CredxGold), CreditPrice = 1000, ItemIndex = Info.Index, Info = Info, Date ... |
<<<<<<<
public int ResizeInventory()
{
if (Inventory.Length >= 86) return Inventory.Length;
if (Inventory.Length == 46)
Array.Resize(ref Inventory, Inventory.Length + 8);
else
Array.Resize(ref Inventory, Inventory.Length + 4);
... |
<<<<<<<
if (!Settings.Instance.AddDescription) ev.Description = "";
if (Settings.Instance.SyncDirection == Sync.Direction.GoogleToOutlook || !Settings.Instance.AddDescription_OnlyToGoogle) {
if (Sync.Engine.CompareAttribute("Description", Sync.Direction.GoogleToOutlook, ev.Descri... |
<<<<<<<
this.ddCategoryColour = new OutlookGoogleCalendarSync.Extensions.ColourPicker();
=======
this.cbOnlyRespondedInvites = new System.Windows.Forms.CheckBox();
this.lDonateTip = new System.Windows.Forms.Label();
>>>>>>>
this.ddCategoryColour = new OutlookGoogleCale... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
}
//Add the Outlook appointment ID into Google event
CustomProperty.AddOutlookIDs(ref ev, ai);
=======
} else
ev.Reminders.UseDefault = Settings.Instance.UseGoogleDefaultReminder;
//Add th... |
<<<<<<<
} catch (System.ArgumentNullException ex) {
OGCSexception.Analyse("It seems that Outlook has just been closed.", OGCSexception.LogAsFail(ex));
OutlookOgcs.Calendar.Instance.Reset();
filtered = FilterCalendarEntries(Instance.UseOutlookCalendar.Items, su... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
=======
using App.Metrics;
using App.Metrics.Configuration;
using App.Metrics.Extensions.Reporting.Graphite;
using App.Metrics.Extensions.Reporting.Graphite.Client;
using Couchbase;
using Couchbase.Configuration... |
<<<<<<<
typeof(RepeatBenchmark),
typeof(AppendPrependBenchmark),
typeof(ComparisonBenchmark),
typeof(ComparisonAsyncBenchmark)
=======
typeof(RepeatBenchmark)
#if (CURRENT)
,typeof(AppendPrependBenchmark)
#endif
>>>>>>>
... |
<<<<<<<
private readonly IFlubuCommandParser _parser;
=======
private readonly IFileWrapper _fileWrapper;
private readonly IBuildScriptLocator _buildScriptLocator;
>>>>>>>
private readonly IFlubuCommandParser _parser;
private readonly IFileWrapper _fileWrapper;
pr... |
<<<<<<<
summRow.Clear(XLClearOptions.Contents);
summRow.Cell(groupClmn).Value = _getGroupLabel != null ? _getGroupLabel(title) : title + " Total";
=======
summRow.Clear(XLClearOptions.Contents | XLClearOptions.DataType); // ClosedXML issue 844
summRow.Cell(groupClmn).Va... |
<<<<<<<
{ "GeometryRotationAnchorOffset", (parser, x) => x.GeometryRotationAnchorOffset = parser.ParsePoint2Df() },
=======
{ "CamouflageDetectionMultiplier", (parser, x) => x.CamouflageDetectionMultiplier = parser.ParseFloat()},
>>>>>>>
{ "GeometryRotationAnchorOffset", (parser,... |
<<<<<<<
// Copyright (c) Microsoft Corporation and contributors. All Rights Reserved. See License.txt in the project root for license information.
using System;
=======
using System;
using System.IO;
>>>>>>>
// Copyright (c) Microsoft Corporation and contributors. All Rights Reserved. See License.txt in the p... |
<<<<<<<
public IntPtr Data => THByteTensor_data (handle);
=======
public unsafe byte *Data => (byte*) THByteTensor_data (handle);
>>>>>>>
public IntPtr Data => THByteTensor_data (handle);
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
... |
<<<<<<<
=======
public CCLens3D()
{
}
public CCLens3D(float duration, CCGridSize gridSize, CCPoint position, float radius) : base()
{
InitWithDuration(duration, gridSize, position, radius);
}
public CCLens3D(CCLens3D lens3D)
{
InitWit... |
<<<<<<<
public int PlayEffect(int nId)
{
try
{
if (SharedList.ContainsKey(nId))
{
SharedList[nId].Play(false);
}
}
catch (Exception ex)
{
CCLog.Log("Unexpected ... |
<<<<<<<
var s = Scene.VisibleBoundsWorldspace.Size;
var p = new CCPoint(CCMacros.CCRandomBetween0And1() * s.Width, CCMacros.CCRandomBetween0And1() * s.Height);
label.Position = p;
=======
>>>>>>> |
<<<<<<<
public CCTransitionFlipX() { }
public CCTransitionFlipX(float t, CCScene s, tOrientation o) : base (t, s, o)
=======
public CCTransitionFlipX(float t, CCScene s, CCTransitionOrientation o) : base (t, s, o)
>>>>>>>
public CCTransitionFlipX() { }
public CCTransitionF... |
<<<<<<<
protected override void UpdateColor()
=======
public override void UpdateColor()
>>>>>>>
public override void UpdateColor()
<<<<<<<
// public override void UpdateDisplayedColor(CCColor3B parentColor)
// {
// base.UpdateDisplayedColor(parentColor)... |
<<<<<<<
CCSize s = Scene.VisibleBoundsWorldspace.Size;
=======
CCSize s = Director.WindowSizeInPoints;
>>>>>>>
CCSize s = Scene.VisibleBoundsWorldspace.Size;
<<<<<<<
CCSize s = Scene.VisibleBoundsWorldspace.Size;
=======
CCSize s = Director.WindowSizeIn... |
<<<<<<<
public static void SetScissorInPoints(float x, float y, float w, float h)
{
y = CCDirector.SharedDirector.WinSize.Height - y - h;
graphicsDevice.ScissorRectangle = new Rectangle(
(int)(x * m_fScaleX + m_obViewPortRect.Origin.X),
(int)(y * ... |
<<<<<<<
CCRenderTexture texture = new CCRenderTexture(bounds.Size, viewportRect.Size);
texture.Sprite.AnchorPoint = new CCPoint(0.5f, 0.5f);
texture.Position = new CCPoint(bounds.Origin.X + bounds.Size.Width / 2, bounds.Size.Height / 2);
texture.AnchorPoint = new CCPoint(... |
<<<<<<<
The most popular CCNodes are: CCScene, CCLayer, CCSprite, CCMenu.
The main features of a CCNode are:
- They can contain other CCNode nodes (addChild, getChildByTag, removeChild, etc)
- They can schedule periodic callback (schedule, unschedule, etc)
- They can execute act... |
<<<<<<<
public bool InitWithTarget(SEL_MenuHandler selector, CCMenuItem[] items)
=======
#region ICCRGBAProtocol Members
public byte Opacity
{
get { return m_cOpacity; }
set
{
m_cOpacity = value;
if (m_pSubItems != nu... |
<<<<<<<
CCSize s = Scene.VisibleBoundsWorldspace.Size;
=======
>>>>>>> |
<<<<<<<
CCRect cachedViewportRect;
CCRect cachedVisibleBoundsRect;
=======
>>>>>>> |
<<<<<<<
#if WINDOWS || WINDOWSGL || MONOMAC || IOS
=======
//#if WINDOWS || WINDOWSGL_PHONE
>>>>>>>
//#if WINDOWS || WINDOWSGL || MONOMAC || IOS
<<<<<<<
#elif !NETFX_CORE && !WINDOWS_PHONE
var inGZipStream = new GZipStream(new MemoryStream(pTMXMapInfo.CurrentString), CompressionMode.De... |
<<<<<<<
// public static b2ContactVelocityConstraint Default = b2ContactVelocityConstraint.Create();
=======
>>>>>>>
<<<<<<<
// public static b2ContactPositionConstraint Default = b2ContactPositionConstraint.Create();
=======
>>>>>>>
public static b2ContactPositionConstraint Default = b2Con... |
<<<<<<<
[Conditional("DEBUG")]
void ValidateInvariants()
{
var line = this;
int lineStartOffset = line.DocumentLine.Offset;
int lineEndOffset = line.DocumentLine.EndOffset;
for (int i = 0; i < line.Sections.Count; i++) {
HighlightedSection s1 = line.Sections[i];
if (s1.Offset < lineStartOffset... |
<<<<<<<
using ICSharpCode.NRefactory.Editor;
=======
using ICSharpCode.AvalonEdit.Utils;
>>>>>>>
using ICSharpCode.AvalonEdit.Utils;
using ICSharpCode.NRefactory.Editor; |
<<<<<<<
if (other.NodeType != NodeType.IdToken)
=======
if (!typeof(Token).IsAssignableFrom(other.GetType()))
>>>>>>>
if (!typeof(Token).IsAssignableFrom(other.GetType()))
<<<<<<<
var regex = other.Root.Language.IsCaseInsensitive()
? CaseInsensitiveReg... |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
=======
using System.Linq;
using System.Collections.Generic;
using System;
>>>>>>>
using System;
using System.Collections.Generic;
using System.Linq; |
<<<<<<<
return new StringLiteral(charLiteral.GetText(), textSpan);
=======
string text = charLiteral.GetText();
return new StringLiteral(text.Substring(1, text.Length - 2), textSpan, FileNode);
>>>>>>>
string text = charLiteral.GetText();
... |
<<<<<<<
using System.Threading.Tasks;
=======
using Microsoft.AspNetCore.Builder;
>>>>>>>
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
<<<<<<<
using Microsoft.AspNetCore.Internal;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.Routing.Internal;
using Microsoft.AspNetCore.Routing... |
<<<<<<<
Flag = true,
Enum = TestEnum.Value1,
Owned = null
=======
Composition = null
>>>>>>>
Flag = true,
Enum = TestEnum.Value1,
Owned = null
Composition = null
<<<<<<<
public... |
<<<<<<<
using Paramore.Brighter.FeatureSwitch;
=======
using Polly.Fallback;
>>>>>>>
using Paramore.Brighter.FeatureSwitch;
using Polly.Fallback;
<<<<<<<
private IAmAFeatureSwitchRegistry _featureSwitchRegistry;
=======
private IAmAChannelFactory _responseChannelFactory;
>>>>>>>
privat... |
<<<<<<<
using MediaBrowser.Model.LiveTv;
using MediaBrowser.Model.Logging;
=======
using MediaBrowser.Model.Library;
>>>>>>>
using MediaBrowser.Model.Library;
using MediaBrowser.Model.LiveTv;
using MediaBrowser.Model.Logging;
<<<<<<<
public static async Task<TReturnType> Clone<TReturnType>(this TReturnType... |
<<<<<<<
=======
using Cimbalino.Phone.Toolkit.Services;
using GalaSoft.MvvmLight.Ioc;
using MediaBrowser.ApiInteraction;
using MediaBrowser.ApiInteraction.WebSocket;
>>>>>>>
using Cimbalino.Phone.Toolkit.Services;
using GalaSoft.MvvmLight.Ioc;
<<<<<<<
using INavigationService = MediaBrowser.WindowsPhone.Model.Inter... |
<<<<<<<
using MediaBrowser.ApiInteraction.Data;
using MediaBrowser.ApiInteraction.Playback;
=======
>>>>>>>
using MediaBrowser.ApiInteraction.Data;
using MediaBrowser.ApiInteraction.Playback;
<<<<<<<
private StreamInfo _streamInfo;
=======
private StreamInfo _streamInfo;
public TimeSpan _... |
<<<<<<<
this.buttonGfxRefreshObject = new System.Windows.Forms.Button();
this.buttonGfxDumpDisplayList = new System.Windows.Forms.Button();
=======
this.buttonSaveVars = new System.Windows.Forms.Button();
this.buttonClearVars = new System.Windows.Forms.Button();
>>>>>>... |
<<<<<<<
SimplifyLogicNot,
=======
SimplifyShiftOperators,
>>>>>>>
SimplifyLogicNot,
SimplifyShiftOperators,
<<<<<<<
if (abortBeforeStep == ILAstOptimizationStep.SimplifyLogicNot) return;
modified |= block.RunOptimization(SimplifyLogicNot);
=======
if (abortBeforeStep == ILAstOptimiz... |
<<<<<<<
using ICSharpCode.ILSpy.Baml;
using ICSharpCode.ILSpy.Options;
=======
>>>>>>>
using ICSharpCode.ILSpy.Options; |
<<<<<<<
public static bool IsUnconditionalBranch(this OpCode opcode)
{
if (opcode.OpCodeType == OpCodeType.Prefix)
return false;
switch (opcode.FlowControl) {
case FlowControl.Branch:
case FlowControl.Throw:
case FlowControl.Return:
return true;
case FlowControl.Next:
case FlowCo... |
<<<<<<<
protected virtual void OnDecompilationFinished(DecompileEventArgs e)
{
if (DecompileFinished != null) {
DecompileFinished(this, e);
}
}
protected void NotifyDecompilationFinished(BaseCodeMappings b)
{
if (b is AstBuilder) {
var builder = b as AstBuilder;
var nodes = Tre... |
<<<<<<<
using ICSharpCode.ILSpy.Options;
=======
>>>>>>>
using ICSharpCode.ILSpy.Options; |
<<<<<<<
using System.Windows.Media;
=======
using System.Windows.Interop;
>>>>>>>
using System.Windows.Interop;
using System.Windows.Media;
<<<<<<<
using ICSharpCode.Decompiler;
=======
>>>>>>>
using ICSharpCode.Decompiler; |
<<<<<<<
if (method.IsExplicitInterfaceImplementation && target.Expression is ThisReferenceExpression) {
var interfaceMember = method.ExplicitlyImplementedInterfaceMembers.First();
var castExpression = new CastExpression(expressionBuilder.ConvertType(interfaceMember.DeclaringType), target.Expression)... |
<<<<<<<
WriteEnum(typeDefinition.Attributes & TypeAttributes.VisibilityMask, typeVisibility);
WriteEnum(typeDefinition.Attributes & TypeAttributes.LayoutMask, typeLayout);
WriteEnum(typeDefinition.Attributes & TypeAttributes.StringFormatMask, typeStringFormat);
const TypeAttributes masks = TypeAttributes.Cl... |
<<<<<<<
new Action(delegate { InsertResult(this.Results, result); }));
=======
new Action(delegate { InsertResult(result); }));
>>>>>>>
new Action(delegate { InsertResult(this.Results, result); }));
<<<<<<<
void InsertResult(ObservableCollection<SearchResult> results, SearchResult result)
{
... |
<<<<<<<
RunForLibrary(cscOptions: cscOptions);
=======
Run(cscOptions: cscOptions, decompilerSettings: new DecompilerSettings {
NullPropagation = false
});
>>>>>>>
RunForLibrary(cscOptions: cscOptions, decompilerSettings: new DecompilerSettings {
NullPropagation = false
});
<<<<<<<
var exe... |
<<<<<<<
volatile IndexEntry[] index; // SORTED array of index entries
=======
readonly Encoding encoding;
DateTime lastWriteDate;
IndexEntry[] index; // SORTED array of index entries
>>>>>>>
readonly Encoding encoding;
IndexEntry[] index; // SORTED array of index entries
<<<<<<<
redirectedXmlRe... |
<<<<<<<
// Create mapping - used in debugger
MethodMapping methodMapping = propDef.GetMethod.CreateCodeMapping(CSharpCodeMapping.SourceCodeMappings);
astProp.Getter = new Accessor {
Body = AstMethodBodyBuilder.CreateMethodBody(propDef.GetMethod, context)
}.WithAnnotation(propDef.GetMethod);
=... |
<<<<<<<
[ExportOptionPage(Title = nameof(Properties.Resources.Display), Order = 1)]
=======
[ExportOptionPage(Title = "Display", Order = 20)]
>>>>>>>
[ExportOptionPage(Title = nameof(Properties.Resources.Display), Order = 20)] |
<<<<<<<
using System.Reactive;
using System.Reactive.Linq;
=======
using System.Threading;
using System.Windows.Input;
>>>>>>>
using System.Reactive;
using System.Threading;
using System.Reactive.Linq; |
<<<<<<<
// Create mapping - used in debugger
MemberMapping methodMapping = propDef.GetMethod.CreateCodeMapping(CSharpCodeMapping.SourceCodeMappings);
astProp.Getter = new Accessor {
Body = AstMethodBodyBuilder.CreateMethodBody(propDef.GetMethod, context)
}.WithAnnotation(propDef.GetMethod);
... |
<<<<<<<
readonly MetadataLoader typeReferenceCecilLoader = new MetadataLoader();
=======
readonly CecilLoader typeReferenceCecilLoader;
>>>>>>>
readonly MetadataLoader typeReferenceCecilLoader;
<<<<<<<
MetadataLoader cecilLoader = new MetadataLoader { IncludeInternalMembers = true, LazyLoad = true, Shorten... |
<<<<<<<
codeDomBuilder.RunTransformations(transformAbortCondition);
codeDomBuilder.GenerateCode(output);
OnDecompilationFinished(new DecompileEventArgs { CodeMappings = codeDomBuilder.CodeMappings, LocalVariables = codeDomBuilder.LocalVariables, DecompiledMemberReferences = codeDomBuilder.DecompiledMemberRefer... |
<<<<<<<
if (!displayClass.Variables.TryGetValue(field, out var v)) {
=======
// Use the unspecialized member definition to make reference comparisons in dictionary possible.
var field = (IField)inst.Field.MemberDefinition;
// However, we want the specialized version, so that display-class type parameters ... |
<<<<<<<
public class RepackAssemblyResolver : DefaultAssemblyResolver
{
public void RegisterAssemblies(List<AssemblyDefinition> mergedAssemblies)
{
foreach (var assemblyDefinition in mergedAssemblies)
{
RegisterAssembly(assemblyDefinition);
}
... |
<<<<<<<
while (ForceUnbanning)
{
await Task.Delay(25);
}
FarmingPokemons = true;
var update = await client.UpdatePlayerLocation(pokemon.Latitude, pokemon.Longitude);
=======
await locationManager.updat... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
using Microsoft.Practices.ServiceLocation;
=======
using SubSonic.SqlGeneration;
using SubSonic.Linq.Structure;
>>>>>>>
using SubSonic.SqlGeneration;
using SubSonic.Linq.Structure; |
<<<<<<<
using SubSonic.DataProviders;
=======
>>>>>>> |
<<<<<<<
///
=======
>>>>>>> |
<<<<<<<
internal override Executable ResolveEntityNames(ParserContext parser)
{
this.BatchExecutableEntityNameResolver(parser, this.Code);
this.Condition = this.Condition.ResolveEntityNames(parser);
return this;
}
internal override void ResolveTypes(... |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
[TableName("Person")]
[ObjectFactory(typeof(TestPersonObject.Factory))]
public class TestPersonObject
{
public class Factory : IObjectFactory
{
#region IObjectFactory Members
public object CreateInstance(TypeAccessor typeAccessor, InitContext context)
{
if (context == null)
... |
<<<<<<<
public struct NullableObjectId
{
public NullableObjectId(int? value)
{
m_value = value;
}
private int? m_value;
public int? Value
{
get { return m_value; }
set { m_value = v... |
<<<<<<<
[TestCase("--skipnontestassemblies", "SkipNonTestAssemblies", true)]
=======
[TestCase("--set-principal-policy:UnauthenticatedPrincipal", "PrincipalPolicy", "UnauthenticatedPrincipal")]
>>>>>>>
[TestCase("--skipnontestassemblies", "SkipNonTestAssemblies", true)]
[TestCase("--... |
<<<<<<<
public abstract void NotifyUserConfirmation(UserConfirmation confirmation);
// Note: in PlatformCrashes we use only callbacks; not events (in Crashes, there are some corresponding events)
public abstract SendingErrorReportHandler SendingErrorReport { get; set; }
public abstract ... |
<<<<<<<
/// <summary>
/// This property controls the amount of logs emitted by the SDK.
/// </summary>
public static LogLevel LogLevel
{
get
{
return PlatformLogLevel;
}
set
{
Platfo... |
<<<<<<<
// Setup auth type dropdown choices
foreach (var authType in AuthTypeUtils.GetAuthTypeChoiceStrings())
{
this.AuthTypePicker.Items.Add(authType);
}
this.AuthTypePicker.SelectedIndex = (int)(AuthTypeUtils.GetPersistedAuthType());
... |
<<<<<<<
using System.IO;
=======
using System;
>>>>>>>
using System;
using System.IO;
<<<<<<<
Crashes.GetErrorAttachments = (ErrorReport report) =>
{
byte[] fileContent = null;
var fileName = new FileInfo(Settings.Default.FileErrorAttachments).Name;
... |
<<<<<<<
/// Set this callback to add custom behavior for determining whether user confirmation is required to send
/// error reports.
/// </summary>
/// <seealso cref="ShouldAwaitUserConfirmationCallback"/>
public static ShouldAwaitUserConfirmationCallback ShouldAwaitUserConfirma... |
<<<<<<<
Distribute.WillExitApp = OnWillExitApp;
=======
Distribute.NoReleaseAvailable = OnNoReleaseAvailable;
>>>>>>>
Distribute.WillExitApp = OnWillExitApp;
Distribute.NoReleaseAvailable = OnNoReleaseAvailable;
<<<<<<<
void OnWillExitApp()
{
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.