conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
if (length > 0 && _cache.MetaArea.ContainsBlockPointer(pointer, length))
=======
field.DataAddress = pointer;
// Check if the pointer is valid
if (length > 0 && _cache.MetaArea.ContainsPointer(pointer))
>>>>>>>
if (length > 0 && _cache.MetaArea.ContainsBlockPointer(pointer, length))
<<<<<<<
if (_type == LoadType.Memory)
_reader.SeekTo(pointer);
else
_reader.SeekTo(_cache.MetaArea.PointerToOffset(pointer));
switch(field.Format)
{
default:
var data = _reader.ReadBlock(field.Length);
field.Value = FunctionHelpers.BytesToHexLines(data, 24);
break;
case "unicode":
field.Value = _reader.ReadUTF16(field.Length);
break;
case "asciiz":
field.Value = _reader.ReadAscii(field.Length);
break;
}
=======
var offset = pointer;
if (_type == LoadType.File)
offset = (uint)_cache.MetaArea.PointerToOffset(offset);
_reader.SeekTo(offset);
switch (field.Format)
{
default:
var data = _reader.ReadBlock(field.Length);
field.Value = FunctionHelpers.BytesToHexLines(data, 24);
break;
case "unicode":
field.Value = _reader.ReadUTF16(field.Length);
break;
case "asciiz":
field.Value = _reader.ReadAscii(field.Length);
break;
}
>>>>>>>
if (_type == LoadType.Memory)
_reader.SeekTo(pointer);
else
_reader.SeekTo(_cache.MetaArea.PointerToOffset(pointer));
switch (field.Format)
{
default:
var data = _reader.ReadBlock(field.Length);
field.Value = FunctionHelpers.BytesToHexLines(data, 24);
break;
case "unicode":
field.Value = _reader.ReadUTF16(field.Length);
break;
case "asciiz":
field.Value = _reader.ReadAscii(field.Length);
break;
}
<<<<<<<
if (length <= 0 || !_cache.MetaArea.ContainsBlockPointer(pointer, (int)(length * field.EntrySize)))
=======
var metaEnd = _cache.MetaArea.BasePointer + _cache.MetaArea.Size;
if (!_cache.MetaArea.ContainsPointer(pointer) || pointer + length * field.EntrySize > metaEnd)
{
>>>>>>>
if (length <= 0 || !_cache.MetaArea.ContainsBlockPointer(pointer, (int)(length * field.EntrySize)))
{ |
<<<<<<<
//// Start Caching Blam Cache MetaData
//var metadataCacheThread = new Thread(BlamCacheMetaData.BeginCachingData);
//metadataCacheThread.Start();
#if !DEBUG
Current.DispatcherUnhandledException += (o, args) =>
{
MetroException.Show(args.Exception);
args.Handled = true;
};
#endif
=======
// Start Caching Blam Cache MetaData
var metadataCacheThread = new Thread(BlamCacheMetaData.BeginCachingData);
metadataCacheThread.Start();
>>>>>>>
//// Start Caching Blam Cache MetaData
//var metadataCacheThread = new Thread(BlamCacheMetaData.BeginCachingData);
//metadataCacheThread.Start(); |
<<<<<<<
using UnityEngine.Assertions;
=======
using Newtonsoft.Json.Linq;
>>>>>>>
using Newtonsoft.Json.Linq;
using UnityEngine.Assertions;
<<<<<<<
// ReSharper disable once MemberCanBePrivate.Global
// ReSharper disable once InconsistentNaming
=======
public static string InferIDFromJObject(JObject jObj, string type = null)
{
// go through the different kinds of id storage in JSONS
// TODO: make this specific to the type
string[] jPaths = { "Description.Id", "id", "Id", "ID", "identifier", "Identifier" };
string id;
foreach (var jPath in jPaths)
{
id = (string)jObj.SelectToken(jPath);
if (id != null)
return id;
}
return null;
}
>>>>>>>
public static string InferIDFromJObject(JObject jObj, string type = null)
{
// go through the different kinds of id storage in JSONS
// TODO: make this specific to the type
string[] jPaths = { "Description.Id", "id", "Id", "ID", "identifier", "Identifier" };
string id;
foreach (var jPath in jPaths)
{
id = (string)jObj.SelectToken(jPath);
if (id != null)
return id;
}
return null;
} |
<<<<<<<
using System.Diagnostics.CodeAnalysis;
=======
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
>>>>>>>
using System.Diagnostics.CodeAnalysis;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
<<<<<<<
[UsedImplicitly]
[SuppressMessage("ReSharper", "InconsistentNaming")]
=======
public static class DoJSONMerge
{
public static HashSet<Int32> JSONHashes = new HashSet<Int32>();
public static Dictionary<string, List<string>> JSONMerges = new Dictionary<string, List<string>>();
public static void Execute(ref string json)
{
var copy_json = json;
try
{
var oldJObj = JObject.Parse(copy_json);
var id = ModTek.InferIDFromJObject(oldJObj);
if (JSONMerges.ContainsKey(id))
{
JSONMerges[id].ForEach((string json_patch) =>
{
var patchJObj = JObject.Parse(json_patch);
oldJObj.Merge(patchJObj);
});
JSONMerges.Remove(id);
}
// Once we are here, we can commit to changing the json file
json = oldJObj.ToString();
}
catch (JsonReaderException e)
{
ModTek.Log(e.Message);
ModTek.Log(e.StackTrace);
ModTek.Log("Error encountered loading json, skipping any patches which would have been applied.");
}
}
}
[HarmonyPatch(typeof(HBS.Util.JSONSerializationUtility), "StripHBSCommentsFromJSON")]
public static class HBS_Util_JSONSerializationUtility_StripHBSCommentsFromJSON_Patch
{
public static void Postfix(string json, ref string __result)
{
// function has invalid json coming from file
// and hopefully valid json (i.e. comments out) coming out from function
if (DoJSONMerge.JSONHashes.Contains(json.GetHashCode()))
{
ModTek.LogWithDate("Hash hit so running JSON Merge");
DoJSONMerge.Execute(ref __result);
}
}
}
>>>>>>>
public static class DoJSONMerge
{
public static HashSet<Int32> JSONHashes = new HashSet<Int32>();
public static Dictionary<string, List<string>> JSONMerges = new Dictionary<string, List<string>>();
public static void Execute(ref string json)
{
var copy_json = json;
try
{
var oldJObj = JObject.Parse(copy_json);
var id = ModTek.InferIDFromJObject(oldJObj);
if (JSONMerges.ContainsKey(id))
{
JSONMerges[id].ForEach((string json_patch) =>
{
var patchJObj = JObject.Parse(json_patch);
oldJObj.Merge(patchJObj);
});
JSONMerges.Remove(id);
}
// Once we are here, we can commit to changing the json file
json = oldJObj.ToString();
}
catch (JsonReaderException e)
{
Log(e.Message);
Log(e.StackTrace);
Log("Error encountered loading json, skipping any patches which would have been applied.");
}
}
}
[UsedImplicitly]
[SuppressMessage("ReSharper", "InconsistentNaming")]
[HarmonyPatch(typeof(HBS.Util.JSONSerializationUtility), "StripHBSCommentsFromJSON")]
public static class HBS_Util_JSONSerializationUtility_StripHBSCommentsFromJSON_Patch
{
public static void Postfix(string json, ref string __result)
{
// function has invalid json coming from file
// and hopefully valid json (i.e. comments out) coming out from function
if (DoJSONMerge.JSONHashes.Contains(json.GetHashCode()))
{
LogWithDate("Hash hit so running JSON Merge");
DoJSONMerge.Execute(ref __result);
}
}
}
[UsedImplicitly]
[SuppressMessage("ReSharper", "InconsistentNaming")]
<<<<<<<
Log($"\tAddOrUpdate({id},{path},{type},{DateTime.Now})");
__result.AddOrUpdate(id, path, type, DateTime.Now);
=======
ModTek.Log("\tAdding id {0} to JSONMerges", id);
DoJSONMerge.JSONMerges[id].Add(partialJSON);
}
else
{
// This is a new definition or a replacement that doesn't get merged, so add or update the manifest
ModTek.Log("\tAddOrUpdate({0}, {1}, {2}, {3}, {4}, {5})", id, newEntry.Path, newEntry.Type, DateTime.Now, newEntry.AssetBundleName, newEntry.AssetBundlePersistent);
__result.AddOrUpdate(id, newEntry.Path, newEntry.Type, DateTime.Now, newEntry.AssetBundleName, newEntry.AssetBundlePersistent);
}
>>>>>>>
Log("\tAdding id {0} to JSONMerges", id);
DoJSONMerge.JSONMerges[id].Add(partialJSON);
}
else
{
// This is a new definition or a replacement that doesn't get merged, so add or update the manifest
Log($"\tAddOrUpdate({id}, {newEntry.Path}, {newEntry.Type}, {DateTime.Now}, {newEntry.AssetBundleName}, {newEntry.AssetBundlePersistent})");
__result.AddOrUpdate(id, newEntry.Path, newEntry.Type, DateTime.Now, newEntry.AssetBundleName, newEntry.AssetBundlePersistent);
} |
<<<<<<<
public string CalculateMD5(string input)
{
var md5 = MD5.Create();
var inputBytes = Encoding.ASCII.GetBytes(input);
var hash = md5.ComputeHash(inputBytes);
var sb = new StringBuilder();
for (int i = 0; i < hash.Length; i++)
sb.Append(hash[i].ToString("X2"));
return sb.ToString();
}
public string procMD5(Process proc)
{
#if DEBUG
System.Diagnostics.Debug.WriteLine("Start: " + proc.StartTime + " ID: " + proc.Id + " MD5: " + CalculateMD5(proc.StartTime.ToString() + proc.Id.ToString()));
#endif
return CalculateMD5(proc.StartTime.ToString() + proc.Id.ToString());
}
=======
private static BitmapSource LoadImage(string path)
{
var bitmap = new BitmapImage();
using (var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
{
bitmap.BeginInit();
bitmap.CacheOption = BitmapCacheOption.OnLoad;
bitmap.StreamSource = stream;
bitmap.EndInit();
}
return bitmap;
}
//####################################################################################
//Old Handle method functions
//####################################################################################
void checksetup()
{
try
{
if (!System.IO.File.Exists(AppdataPath + "handle64.exe") || !System.IO.File.Exists(AppdataPath + "handle.exe"))
{
winsetupinfo.WindowStyle = WindowStyle.None;
winsetupinfo.Width = 300;
winsetupinfo.Height = 200;
winsetupinfo.Show();
myWindow.Visibility = Visibility.Hidden;
Thread th_gethandleexe = new Thread(gethandleexe);
th_gethandleexe.IsBackground = true;
th_gethandleexe.Start();
}
}
catch (Exception e)
{
MessageBox.Show(e.Message);
}
}
void gethandleexe()
{
try
{
System.IO.File.Delete(AppdataPath + "handle64.exe");
System.IO.File.Delete(AppdataPath + "handle.exe");
System.IO.File.Delete(AppdataPath + "Eula.txt");
WebClient downloadclient = new WebClient();
downloadclient.DownloadFile("https://download.sysinternals.com/files/Handle.zip", AppdataPath + "Handle.zip");
ZipFile.ExtractToDirectory(AppdataPath + "Handle.zip", AppdataPath);
}
catch
{
MessageBox.Show("Official microsoft link is not reachable. Using embbeded handle version!");
try
{
//System.IO.File.WriteAllBytes(AppdataPath+ "handle64.exe", Properties.Resources.handle64);
//System.IO.File.WriteAllBytes(AppdataPath + "handle.exe", Properties.Resources.handle);
}
catch (Exception err)
{
MessageBox.Show("Could not extract handle components. No admin privilges?\n" + err.Message);
}
}
try
{
ProcessStartInfo prohandleinfo = new ProcessStartInfo();
prohandleinfo.UseShellExecute = false;
prohandleinfo.CreateNoWindow = true;
prohandleinfo.Arguments = "-accepteula";
if (Environment.Is64BitOperatingSystem)
{
prohandleinfo.FileName = AppdataPath + "handle64.exe";
}
else
{
prohandleinfo.FileName = AppdataPath + "handle.exe";
}
Process prohandle = new Process { StartInfo = prohandleinfo };
prohandle.Start();
System.IO.File.Delete(AppdataPath + "Handle.zip");
System.IO.File.Delete(AppdataPath + "Eula.txt");
Application.Current.Dispatcher.BeginInvoke(
System.Windows.Threading.DispatcherPriority.Background,
new Action(() => setupend()));
}
catch (Exception e)
{
MessageBox.Show(e.Message);
}
}
//####################################################################################
//Old Handle method functions END
//####################################################################################
>>>>>>>
private static BitmapSource LoadImage(string path)
{
var bitmap = new BitmapImage();
using (var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
{
bitmap.BeginInit();
bitmap.CacheOption = BitmapCacheOption.OnLoad;
bitmap.StreamSource = stream;
bitmap.EndInit();
}
return bitmap;
}
//####################################################################################
//Old Handle method functions
//####################################################################################
void checksetup()
{
try
{
if (!System.IO.File.Exists(AppdataPath + "handle64.exe") || !System.IO.File.Exists(AppdataPath + "handle.exe"))
{
winsetupinfo.WindowStyle = WindowStyle.None;
winsetupinfo.Width = 300;
winsetupinfo.Height = 200;
winsetupinfo.Show();
myWindow.Visibility = Visibility.Hidden;
Thread th_gethandleexe = new Thread(gethandleexe);
th_gethandleexe.IsBackground = true;
th_gethandleexe.Start();
}
}
catch (Exception e)
{
MessageBox.Show(e.Message);
}
}
void gethandleexe()
{
try
{
System.IO.File.Delete(AppdataPath + "handle64.exe");
System.IO.File.Delete(AppdataPath + "handle.exe");
System.IO.File.Delete(AppdataPath + "Eula.txt");
WebClient downloadclient = new WebClient();
downloadclient.DownloadFile("https://download.sysinternals.com/files/Handle.zip", AppdataPath + "Handle.zip");
ZipFile.ExtractToDirectory(AppdataPath + "Handle.zip", AppdataPath);
}
catch
{
MessageBox.Show("Official microsoft link is not reachable. Using embbeded handle version!");
try
{
//System.IO.File.WriteAllBytes(AppdataPath+ "handle64.exe", Properties.Resources.handle64);
//System.IO.File.WriteAllBytes(AppdataPath + "handle.exe", Properties.Resources.handle);
}
catch (Exception err)
{
MessageBox.Show("Could not extract handle components. No admin privilges?\n" + err.Message);
}
}
public string CalculateMD5(string input)
{
var md5 = MD5.Create();
var inputBytes = Encoding.ASCII.GetBytes(input);
var hash = md5.ComputeHash(inputBytes);
var sb = new StringBuilder();
for (int i = 0; i < hash.Length; i++)
sb.Append(hash[i].ToString("X2"));
return sb.ToString();
}
public string procMD5(Process proc)
{
#if DEBUG
System.Diagnostics.Debug.WriteLine("Start: " + proc.StartTime + " ID: " + proc.Id + " MD5: " + CalculateMD5(proc.StartTime.ToString() + proc.Id.ToString()));
#endif
return CalculateMD5(proc.StartTime.ToString() + proc.Id.ToString());
}
}
try
{
ProcessStartInfo prohandleinfo = new ProcessStartInfo();
prohandleinfo.UseShellExecute = false;
prohandleinfo.CreateNoWindow = true;
prohandleinfo.Arguments = "-accepteula";
if (Environment.Is64BitOperatingSystem)
{
prohandleinfo.FileName = AppdataPath + "handle64.exe";
}
else
{
prohandleinfo.FileName = AppdataPath + "handle.exe";
}
Process prohandle = new Process { StartInfo = prohandleinfo };
prohandle.Start();
System.IO.File.Delete(AppdataPath + "Handle.zip");
System.IO.File.Delete(AppdataPath + "Eula.txt");
Application.Current.Dispatcher.BeginInvoke(
System.Windows.Threading.DispatcherPriority.Background,
new Action(() => setupend()));
}
catch (Exception e)
{
MessageBox.Show(e.Message);
}
}
//####################################################################################
//Old Handle method functions END
//#################################################################################### |
<<<<<<<
public Task<TokenResponse> LoginAsync(LoginInput input)
=======
public Task<string> LoginAsync(LoginDto input)
>>>>>>>
public Task<string> LoginAsync(LoginInput input)
<<<<<<<
public Task<TokenResponse> RefreshAsync(RefreshInput input)
=======
public Task<string> RefreshAsync(RefreshDto input)
>>>>>>>
public Task<string> RefreshAsync(RefreshInput input) |
<<<<<<<
[SerializeField] private DialogueActorChannelSO _startTalking = default;
//UI event
=======
[SerializeField] private DialogueEventChannelSO _startTalking = default;
>>>>>>>
[SerializeField] private DialogueActorChannelSO _startTalking = default;
//UI event
<<<<<<<
case InteractionType.None:
return;
case InteractionType.PickUp:
if (_currentInteractableObject != null)
{
if (_onObjectPickUp != null)
{
Item currentItem = default;
//raise an event with an item as parameter (to add object to inventory)
if (_currentInteractableObject.GetComponent<CollectibleItem>())
{
currentItem = _currentInteractableObject.GetComponent<CollectibleItem>().GetItem();
_onObjectPickUp.RaiseEvent(currentItem);
}
//set current interaction for state machine
currentInteraction = InteractionType.PickUp;
}
}
//destroy the GO
Destroy(_currentInteractableObject);
break;
=======
>>>>>>>
<<<<<<<
if (_startTalking != null)
{
//raise an event with an actor as parameter
_currentInteractableObject.GetComponent<StepController>().InteractWithCharacter();
//_startTalking.RaiseEvent(currentActor);
//Change the action map
_inputReader.EnableDialogueInput();
//set current interaction for state machine
currentInteraction = InteractionType.Talk;
}
=======
//TODO:
//Actor currentActor = currentInteractableObject.GetComponent<Dialogue>().GetActor();
//_startTalking.RaiseEvent(currentActor);
_inputReader.EnableDialogueInput();
>>>>>>>
//TODO:
//Actor currentActor = currentInteractableObject.GetComponent<Dialogue>().GetActor();
//_startTalking.RaiseEvent(currentActor);
_currentInteractableObject.GetComponent<StepController>().InteractWithCharacter();
_inputReader.EnableDialogueInput();
<<<<<<<
_potentialInteraction = InteractionType.PickUp;
DisplayInteractionUI();
_currentInteractableObject = other.gameObject;
=======
newPotentialInteraction.type = InteractionType.Cook;
>>>>>>>
newPotentialInteraction.type = InteractionType.Cook;
<<<<<<<
_potentialInteraction = InteractionType.Cook;
DisplayInteractionUI();
_currentInteractableObject = other.gameObject;
=======
newPotentialInteraction.type = InteractionType.Talk;
>>>>>>>
newPotentialInteraction.type = InteractionType.Talk;
<<<<<<<
_potentialInteraction = InteractionType.Talk;
DisplayInteractionUI();
_currentInteractableObject = other.gameObject;
=======
_potentialInteractions.AddFirst(newPotentialInteraction);
RequestUpdateUI(true);
>>>>>>>
_potentialInteractions.AddFirst(newPotentialInteraction);
RequestUpdateUI(true); |
<<<<<<<
public GameInput gameInput;
public MenuInputReader Menu { get; private set; }
=======
// Dialogue
public event UnityAction advanceDialogueEvent = delegate { };
public event UnityAction onMoveSelectionEvent = delegate { };
private GameInput gameInput;
>>>>>>>
// Dialogue
public event UnityAction advanceDialogueEvent = delegate { };
public event UnityAction onMoveSelectionEvent = delegate { };
public MenuInputReader Menu { get; private set; }
private GameInput gameInput;
<<<<<<<
DisableControls();
=======
DisableAllInput();
>>>>>>>
DisableAllInput();
<<<<<<<
public void EnableMenuInput()
{
gameInput.Gameplay.Disable();
gameInput.Menus.Enable();
}
public void EnableGameplayInput()
{
gameInput.Gameplay.Enable();
gameInput.Menus.Disable();
}
public void DisableControls()
{
gameInput.Gameplay.Disable();
gameInput.Menus.Disable();
}
=======
public void OnMoveSelection(InputAction.CallbackContext context)
{
if (context.phase == InputActionPhase.Performed)
onMoveSelectionEvent();
}
public void OnAdvanceDialogue(InputAction.CallbackContext context)
{
if (context.phase == InputActionPhase.Performed)
advanceDialogueEvent();
}
public void EnableDialogueInput()
{
gameInput.Dialogues.Enable();
gameInput.Gameplay.Disable();
}
public void EnableGameplayInput()
{
gameInput.Gameplay.Enable();
gameInput.Dialogues.Disable();
}
public void DisableAllInput()
{
gameInput.Gameplay.Disable();
gameInput.Dialogues.Disable();
}
>>>>>>>
public void OnMoveSelection(InputAction.CallbackContext context)
{
if (context.phase == InputActionPhase.Performed)
onMoveSelectionEvent();
}
public void OnAdvanceDialogue(InputAction.CallbackContext context)
{
if (context.phase == InputActionPhase.Performed)
advanceDialogueEvent();
}
public void EnableDialogueInput()
{
gameInput.Dialogues.Enable();
gameInput.Gameplay.Disable();
}
public void EnableGameplayInput()
{
gameInput.Gameplay.Enable();
gameInput.Dialogues.Disable();
}
public void DisableAllInput()
{
gameInput.Gameplay.Disable();
gameInput.Dialogues.Disable();
}
public void EnableMenuInput()
{
gameInput.Gameplay.Disable();
gameInput.Menus.Enable();
} |
<<<<<<<
=======
}
[Fact]
public void ConvexHullAndBoundingRect()
{
Name = "Convex Hull";
var rand = new Random();
// fuzz test
for (int test = 0; test < 50; test++)
{
var basePt = new Vector3((test % 5) * 12, (test - (test % 5)) / 5 * 12);
var pts = new List<Vector3>();
for (int i = 0; i < 20; i++)
{
pts.Add(basePt + new Vector3(rand.NextDouble() * 10, rand.NextDouble() * 10));
}
var modelPts = pts.Select(p => new ModelCurve(new Circle(p, 0.2)));
var hull = ConvexHull.FromPoints(pts);
var boundingRect = Polygon.FromAlignedBoundingBox2d(pts);
Model.AddElements(modelPts);
Model.AddElements(boundingRect);
Model.AddElement(hull);
}
// handle collinear pts test
var coPts = new List<Vector3> {
new Vector3(0,0),
new Vector3(1,0),
new Vector3(2,0),
new Vector3(4,0),
new Vector3(10,0),
new Vector3(10,5),
new Vector3(10,10)
};
var coHull = ConvexHull.FromPoints(coPts);
Assert.Equal(50, coHull.Area());
>>>>>>>
}
[Fact]
public void ConvexHullAndBoundingRect()
{
Name = "Convex Hull";
var rand = new Random();
// fuzz test
for (int test = 0; test < 50; test++)
{
var basePt = new Vector3((test % 5) * 12, (test - (test % 5)) / 5 * 12);
var pts = new List<Vector3>();
for (int i = 0; i < 20; i++)
{
pts.Add(basePt + new Vector3(rand.NextDouble() * 10, rand.NextDouble() * 10));
}
var modelPts = pts.Select(p => new ModelCurve(new Circle(p, 0.2)));
var hull = ConvexHull.FromPoints(pts);
var boundingRect = Polygon.FromAlignedBoundingBox2d(pts);
Model.AddElements(modelPts);
Model.AddElements(boundingRect);
Model.AddElement(hull);
}
// handle collinear pts test
var coPts = new List<Vector3> {
new Vector3(0,0),
new Vector3(1,0),
new Vector3(2,0),
new Vector3(4,0),
new Vector3(10,0),
new Vector3(10,5),
new Vector3(10,10)
};
var coHull = ConvexHull.FromPoints(coPts);
Assert.Equal(50, coHull.Area()); |
<<<<<<<
using System.Net;
using System.Diagnostics;
=======
using Elements.Interfaces;
>>>>>>>
using System.Net;
using Elements.Interfaces;
<<<<<<<
if (!geometricElement.IsElementDefinition)
{
NodeUtilities.CreateNodeForMesh(meshId, nodes, geometricElement.Transform);
}
}
=======
if (!meshElementMap.ContainsKey(e.Id))
{
meshElementMap.Add(e.Id, new List<int>());
}
meshElementMap[e.Id].Add(meshId);
if (!geometricElement.IsElementDefinition)
{
CreateNodeForMesh(gltf, meshId, nodes, geometricElement.Transform);
>>>>>>>
if (!geometricElement.IsElementDefinition)
{
NodeUtilities.CreateNodeForMesh(meshId, nodes, geometricElement.Transform); |
<<<<<<<
namespace HubSpot.NET.Core
=======
using HubSpot.NET.Api.Company;
using HubSpot.NET.Api.Contact;
using HubSpot.NET.Api.Deal;
using HubSpot.NET.Api.EmailEvents;
using HubSpot.NET.Api.EmailSubscriptions;
using HubSpot.NET.Api.Engagement;
using HubSpot.NET.Api.Files;
using HubSpot.NET.Api.Owner;
using HubSpot.NET.Api.Properties;
using HubSpot.NET.Core.Interfaces;
namespace HubSpot.NET.Core
>>>>>>>
namespace HubSpot.NET.Core
<<<<<<<
public IHubSpotOAuthApi OAuth { get; set; }
public IHubSpotCompanyApi Company { get; private set; }
public IHubSpotContactApi Contact { get; private set; }
public IHubSpotContactPropertyApi ContactProperty { get; private set; }
public IHubSpotDealApi Deal { get; private set; }
public IHubSpotEngagementApi Engagement { get; private set; }
public IHubSpotCosFileApi File { get; private set; }
public IHubSpotOwnerApi Owner { get; private set; }
public IHubSpotCompanyPropertiesApi CompanyProperties { get; private set; }
public IHubSpotEmailSubscriptionsApi EmailSubscriptions { get; private set; }
public IHubSpotTimelineApi Timelines { get; private set; }
=======
public IHubSpotCompanyApi Company { get; }
public IHubSpotCompanyPropertiesApi CompanyProperties { get; }
public IHubSpotContactApi Contact { get; }
public IHubSpotDealApi Deal { get; }
public IHubSpotEmailEventsApi EmailEvents { get; }
public IHubSpotEmailSubscriptionsApi EmailSubscriptions { get; }
public IHubSpotEngagementApi Engagement { get; }
public IHubSpotCosFileApi File { get; }
public IHubSpotOwnerApi Owner { get; }
>>>>>>>
public IHubSpotOAuthApi OAuth { get; set; }
public IHubSpotCompanyApi Company { get; private set; }
public IHubSpotContactApi Contact { get; private set; }
public IHubSpotContactPropertyApi ContactProperty { get; private set; }
public IHubSpotDealApi Deal { get; private set; }
public IHubSpotEngagementApi Engagement { get; private set; }
public IHubSpotCosFileApi File { get; private set; }
public IHubSpotOwnerApi Owner { get; private set; }
public IHubSpotCompanyPropertiesApi CompanyProperties { get; private set; }
public IHubSpotEmailSubscriptionsApi EmailSubscriptions { get; private set; }
public IHubSpotTimelineApi Timelines { get; private set; }
<<<<<<<
CompanyProperties = new HubSpotCompaniesPropertiesApi(client);
EmailSubscriptions = new HubSpotEmailSubscriptionsApi(client);
Timelines = new HubSpotTimelineApi(client);
=======
>>>>>>>
CompanyProperties = new HubSpotCompaniesPropertiesApi(client);
EmailSubscriptions = new HubSpotEmailSubscriptionsApi(client);
Timelines = new HubSpotTimelineApi(client); |
<<<<<<<
public SecretClientOptions(Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion version = Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion.V7_1_Preview) { }
public Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion Version { get { throw null; } }
=======
public SecretClientOptions(Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion version = Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion.V7_1) { }
public Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion Version { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
>>>>>>>
public SecretClientOptions(Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion version = Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion.V7_1) { }
public Azure.Security.KeyVault.Secrets.SecretClientOptions.ServiceVersion Version { get { throw null; } }
<<<<<<<
V7_1_Preview = 1,
=======
V7_1 = 1,
>>>>>>>
V7_1 = 1, |
<<<<<<<
.SetQueryParam("appId", appId);
var data = _client.Execute<T>(path, Method.GET);
=======
.SetQueryParam(QueryParams.APP_ID, appId);
var data = _client.Execute<T>(path, Method.GET, convertToPropertiesSchema: false);
>>>>>>>
.SetQueryParam(QueryParams.APP_ID, appId);
var data = _client.Execute<T>(path, Method.GET); |
<<<<<<<
using System.CodeDom.Compiler;
using System.Collections;
=======
>>>>>>>
using System.CodeDom.Compiler;
using System.Collections;
<<<<<<<
private void DeleteAdeptNuget() {
const string folderPath = @"C:\\temp";
const string filesToDelete = "*NuGet*";
string[] fileList = Directory.GetFiles(folderPath, filesToDelete);
foreach (string file in fileList)
{
File.Delete(file);
}
}
=======
>>>>>>>
private void DeleteAdeptNuget() {
const string folderPath = @"C:\\temp";
const string filesToDelete = "*NuGet*";
string[] fileList = Directory.GetFiles(folderPath, filesToDelete);
foreach (string file in fileList)
{
File.Delete(file);
}
} |
<<<<<<<
oxidationModifier = Math.Pow(combinedPresure / GameConstants.EarthAtmospherePressureAtSeaLevel, 0.25);
=======
oxidationModifier = Math.Pow(combinedPressure / 101.325, 0.25);
>>>>>>>
oxidationModifier = Math.Pow(combinedPressure / GameConstants.EarthAtmospherePressureAtSeaLevel, 0.25); |
<<<<<<<
using osuTK;
using osuTK.Input;
=======
using osu.Framework.Input.StateChanges;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;
>>>>>>>
using osuTK;
using osuTK.Input;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; |
<<<<<<<
private NSApplicationPresentationOptions presentationOptionsForWindowMode(WindowMode windowMode)
{
switch (windowMode)
{
case Configuration.WindowMode.Fullscreen:
return NSApplicationPresentationOptions.HideDock | NSApplicationPresentationOptions.HideMenuBar | NSApplicationPresentationOptions.FullScreen;
case Configuration.WindowMode.Borderless:
case Configuration.WindowMode.Windowed:
return NSApplicationPresentationOptions.AutoHideDock | NSApplicationPresentationOptions.AutoHideMenuBar | NSApplicationPresentationOptions.FullScreen;
default:
return NSApplicationPresentationOptions.Default;
}
}
private uint windowWillUseFullScreen(IntPtr self, IntPtr cmd, IntPtr window, uint options) => (uint)presentationOptionsForWindowMode(WindowMode.Value);
private void windowDidEnterFullScreen(IntPtr self, IntPtr cmd, IntPtr notification)
{
if (WindowMode.Value == Configuration.WindowMode.Windowed)
WindowMode.Value = Configuration.WindowMode.Borderless;
NSApplication.PresentationOptions = presentationOptionsForWindowMode(WindowMode.Value);
}
private void windowDidExitFullScreen(IntPtr self, IntPtr cmd, IntPtr notification) => WindowMode.Value = Configuration.WindowMode.Windowed;
=======
private void refreshCursorState(object sender, OpenTK.FrameEventArgs e)
{
// If the cursor should be hidden, but something in the system has made it appear (such as a notification),
// invalidate the cursor rects to hide it. OpenTK has a private function that does this.
if (CursorState.HasFlag(CursorState.Hidden) && Cocoa.CGCursorIsVisible())
methodInvalidateCursorRects.Invoke(nativeWindow, new object[0]);
}
>>>>>>>
private NSApplicationPresentationOptions presentationOptionsForWindowMode(WindowMode windowMode)
{
switch (windowMode)
{
case Configuration.WindowMode.Fullscreen:
return NSApplicationPresentationOptions.HideDock | NSApplicationPresentationOptions.HideMenuBar | NSApplicationPresentationOptions.FullScreen;
case Configuration.WindowMode.Borderless:
case Configuration.WindowMode.Windowed:
return NSApplicationPresentationOptions.AutoHideDock | NSApplicationPresentationOptions.AutoHideMenuBar | NSApplicationPresentationOptions.FullScreen;
default:
return NSApplicationPresentationOptions.Default;
}
}
private uint windowWillUseFullScreen(IntPtr self, IntPtr cmd, IntPtr window, uint options) => (uint)presentationOptionsForWindowMode(WindowMode.Value);
private void windowDidEnterFullScreen(IntPtr self, IntPtr cmd, IntPtr notification)
{
if (WindowMode.Value == Configuration.WindowMode.Windowed)
WindowMode.Value = Configuration.WindowMode.Borderless;
NSApplication.PresentationOptions = presentationOptionsForWindowMode(WindowMode.Value);
}
private void windowDidExitFullScreen(IntPtr self, IntPtr cmd, IntPtr notification) => WindowMode.Value = Configuration.WindowMode.Windowed;
private void refreshCursorState(object sender, OpenTK.FrameEventArgs e)
{
// If the cursor should be hidden, but something in the system has made it appear (such as a notification),
// invalidate the cursor rects to hide it. OpenTK has a private function that does this.
if (CursorState.HasFlag(CursorState.Hidden) && Cocoa.CGCursorIsVisible())
methodInvalidateCursorRects.Invoke(nativeWindow, new object[0]);
} |
<<<<<<<
/// The direction of the fill. Default is <see cref="FillDirection.Full"/>.
/// If <see cref="FillDirection.Full"/> or <see cref="FillDirection.Horizontal"/>,
/// <see cref="Container{T}.Children"/> are arranged from left-to-right if their
/// <see cref="Drawable.Anchor"/> is to the left or centered horizontally.
/// They are arranged from right-to-left otherwise.
/// If <see cref="FillDirection.Full"/> or <see cref="FillDirection.Vertical"/>,
/// <see cref="Container{T}.Children"/> are arranged from top-to-bottom if their
/// <see cref="Drawable.Anchor"/> is to the top or centered vertically.
/// They are arranged from bottom-to-top otherwise.
=======
/// The direction of the fill. Default is <see cref="FillDirection.Full"/>.
>>>>>>>
/// If <see cref="FillDirection.Full"/> or <see cref="FillDirection.Horizontal"/>,
/// <see cref="Container{T}.Children"/> are arranged from left-to-right if their
/// <see cref="Drawable.Anchor"/> is to the left or centered horizontally.
/// They are arranged from right-to-left otherwise.
/// If <see cref="FillDirection.Full"/> or <see cref="FillDirection.Vertical"/>,
/// <see cref="Container{T}.Children"/> are arranged from top-to-bottom if their
/// <see cref="Drawable.Anchor"/> is to the top or centered vertically.
/// They are arranged from bottom-to-top otherwise. |
<<<<<<<
private All filteringMode;
=======
private TextureWrapMode internalWrapMode;
>>>>>>>
private All filteringMode;
private TextureWrapMode internalWrapMode; |
<<<<<<<
=======
using System.Linq;
using System.Diagnostics;
using osu.Framework.Input.EventArgs;
using osu.Framework.Input.StateChanges;
using osu.Framework.Input.States;
using osu.Framework.Logging;
>>>>>>> |
<<<<<<<
/// <summary>
/// Retrieves the value after a pivot from an <see cref="IEnumerable{T}"/>.
/// </summary>
/// <typeparam name="T">The type of the items stored in the collection.</typeparam>
/// <param name="collection">The collection to iterate on.</param>
/// <param name="current">The pivot value.</param>
/// <returns></returns>
public static T GetNext<T>(this IEnumerable<T> collection, T current)
{
return collection.SkipWhile(i => !i.Equals(current)).Skip(1).FirstOrDefault();
}
/// <summary>
/// Retrieves the value before a pivot from an <see cref="IEnumerable{T}"/>.
/// </summary>
/// <typeparam name="T">The type of the items stored in the collection.</typeparam>
/// <param name="collection">The collection to iterate on.</param>
/// <param name="current">The pivot value.</param>
/// <returns></returns>
public static T GetPrevious<T>(this IEnumerable<T> collection, T current)
{
return collection.TakeWhile(i => !i.Equals(current)).LastOrDefault();
}
=======
/// <summary>
/// Wraps this object instance into an <see cref="IEnumerable{T}"/>
/// consisting of a single item.
/// </summary>
/// <typeparam name="T">The type of the object.</typeparam>
/// <param name="item">The instance that will be wrapped.</param>
/// <returns> An <see cref="IEnumerable{T}"/> consisting of a single item.</returns>
public static IEnumerable<T> Yield<T>(this T item)
{
yield return item;
}
>>>>>>>
/// <summary>
/// Wraps this object instance into an <see cref="IEnumerable{T}"/>
/// consisting of a single item.
/// </summary>
/// <typeparam name="T">The type of the object.</typeparam>
/// <param name="item">The instance that will be wrapped.</param>
/// <returns> An <see cref="IEnumerable{T}"/> consisting of a single item.</returns>
public static IEnumerable<T> Yield<T>(this T item)
{
yield return item;
}
/// <summary>
/// Retrieves the value after a pivot from an <see cref="IEnumerable{T}"/>.
/// </summary>
/// <typeparam name="T">The type of the items stored in the collection.</typeparam>
/// <param name="collection">The collection to iterate on.</param>
/// <param name="current">The pivot value.</param>
/// <returns></returns>
public static T GetNext<T>(this IEnumerable<T> collection, T current)
{
return collection.SkipWhile(i => !i.Equals(current)).Skip(1).FirstOrDefault();
}
/// <summary>
/// Retrieves the value before a pivot from an <see cref="IEnumerable{T}"/>.
/// </summary>
/// <typeparam name="T">The type of the items stored in the collection.</typeparam>
/// <param name="collection">The collection to iterate on.</param>
/// <param name="current">The pivot value.</param>
/// <returns></returns>
public static T GetPrevious<T>(this IEnumerable<T> collection, T current)
{
return collection.TakeWhile(i => !i.Equals(current)).LastOrDefault();
} |
<<<<<<<
using osu.Framework.Event;
=======
using osu.Framework.Input.EventArgs;
using osu.Framework.Input.States;
>>>>>>>
using osu.Framework.Event;
using osu.Framework.Input.EventArgs;
using osu.Framework.Input.States; |
<<<<<<<
#if NET_FRAMEWORK
using System;
using System.Collections.Generic;
using System.Linq;
=======
using System.Threading.Tasks;
>>>>>>>
#if NET_FRAMEWORK
using System;
using System.Collections.Generic;
using System.Linq;
<<<<<<<
#if NET_FRAMEWORK
if (targetThread.IsAlive && clock.ElapsedMilliseconds - LastConsumptionTime > spikeRecordThreshold / 2 && backgroundMonitorStackTrace == null)
=======
if (Enabled && targetThread.IsAlive && clock.ElapsedMilliseconds - LastConsumptionTime > spikeRecordThreshold / 2 && backgroundMonitorStackTrace == null)
>>>>>>>
#if NET_FRAMEWORK
if (Enabled && targetThread.IsAlive && clock.ElapsedMilliseconds - LastConsumptionTime > spikeRecordThreshold / 2 && backgroundMonitorStackTrace == null)
<<<<<<<
#endif
=======
#region IDisposable Support
~BackgroundStackTraceCollector()
{
Dispose(false);
}
private bool isDisposed;
protected virtual void Dispose(bool disposing)
{
if (!isDisposed)
{
isDisposed = true;
cancellationToken?.Cancel();
}
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
#endregion
>>>>>>>
#endif
#region IDisposable Support
~BackgroundStackTraceCollector()
{
Dispose(false);
private bool isDisposed;
protected virtual void Dispose(bool disposing)
{
if (!isDisposed)
{
isDisposed = true;
cancellationToken?.Cancel();
}
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
#endregion
} |
<<<<<<<
using (var convert = GetPageImageForCharacter(character))
using (var buffer = SixLabors.ImageSharp.Configuration.Default.MemoryAllocator.Allocate<byte>(convert.Width * convert.Height))
=======
using (var convert = GetPageImage(page))
>>>>>>>
using (var convert = GetPageImage(page))
using (var buffer = SixLabors.ImageSharp.Configuration.Default.MemoryAllocator.Allocate<byte>(convert.Width * convert.Height)) |
<<<<<<<
case GameWindow _:
{
=======
case OsuTKWindow _:
>>>>>>>
case OsuTKWindow _:
{ |
<<<<<<<
textContent.Text = item.Text.Value;
Item.Text.ValueChanged += newText => textContent.Text = newText;
=======
textContent.Text = item.Text;
Item.Text.ValueChanged += args => textContent.Text = args.NewValue;
>>>>>>>
textContent.Text = item.Text.Value;
textContent.Text = item.Text;
Item.Text.ValueChanged += args => textContent.Text = args.NewValue; |
<<<<<<<
public bool IsScrolledToEnd(float lenience = Precision.FLOAT_EPSILON) => Precision.AlmostBigger(target, ScrollableExtent, lenience);
=======
public bool IsScrolledToEnd(float lenience = Precision.FLOAT_EPSILON) => Precision.AlmostBigger(Target, scrollableExtent, lenience);
>>>>>>>
public bool IsScrolledToEnd(float lenience = Precision.FLOAT_EPSILON) => Precision.AlmostBigger(Target, ScrollableExtent, lenience);
<<<<<<<
ScrollTo(target - DisplayableContent);
=======
OnUserScroll(Target - displayableContent);
>>>>>>>
OnUserScroll(Target - DisplayableContent);
<<<<<<<
ScrollTo(target + DisplayableContent);
=======
OnUserScroll(Target + displayableContent);
>>>>>>>
OnUserScroll(Target + DisplayableContent);
<<<<<<<
if (Current < target && target < 0 || Current > target && target > ScrollableExtent)
=======
if (Current < Target && Target < 0 || Current > Target && Target > scrollableExtent)
>>>>>>>
if (Current < Target && Target < 0 || Current > Target && Target > ScrollableExtent) |
<<<<<<<
new KeyBinding(new KeyCombination(new[] { InputKey.Shift, InputKey.Left }), new PlatformAction(PlatformActionType.CharPrevious, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(new[] { InputKey.Shift, InputKey.Right }), new PlatformAction(PlatformActionType.CharNext, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(new[] { InputKey.Shift, InputKey.BackSpace }), new PlatformAction(PlatformActionType.CharPrevious, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(new[] { InputKey.Shift, InputKey.Delete }), new PlatformAction(PlatformActionType.CharNext, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(new[] { InputKey.Alt, InputKey.Left }), new PlatformAction(PlatformActionType.WordPrevious, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(new[] { InputKey.Alt, InputKey.Right }), new PlatformAction(PlatformActionType.WordNext, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(new[] { InputKey.Alt, InputKey.BackSpace }), new PlatformAction(PlatformActionType.WordPrevious, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(new[] { InputKey.Alt, InputKey.Delete }), new PlatformAction(PlatformActionType.WordNext, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(new[] { InputKey.Alt, InputKey.Shift, InputKey.Left }), new PlatformAction(PlatformActionType.WordPrevious, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(new[] { InputKey.Alt, InputKey.Shift, InputKey.Right }), new PlatformAction(PlatformActionType.WordNext, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(new[] { InputKey.Super, InputKey.Left }), new PlatformAction(PlatformActionType.LineStart, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(new[] { InputKey.Super, InputKey.Right }), new PlatformAction(PlatformActionType.LineEnd, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(new[] { InputKey.Super, InputKey.BackSpace }), new PlatformAction(PlatformActionType.LineStart, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(new[] { InputKey.Super, InputKey.Delete }), new PlatformAction(PlatformActionType.LineEnd, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(new[] { InputKey.Super, InputKey.Shift, InputKey.Left }), new PlatformAction(PlatformActionType.LineStart, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(new[] { InputKey.Super, InputKey.Shift, InputKey.Right }), new PlatformAction(PlatformActionType.LineEnd, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(new[] { InputKey.Alt, InputKey.Super, InputKey.Left }), new PlatformAction(PlatformActionType.DocumentPrevious)),
new KeyBinding(new KeyCombination(new[] { InputKey.Alt, InputKey.Super, InputKey.Right }), new PlatformAction(PlatformActionType.DocumentNext)),
new KeyBinding(new KeyCombination(new[] { InputKey.Control, InputKey.Tab }), new PlatformAction(PlatformActionType.DocumentNext)),
new KeyBinding(new KeyCombination(new[] { InputKey.Control, InputKey.Shift, InputKey.Tab }), new PlatformAction(PlatformActionType.DocumentPrevious)),
new KeyBinding(new KeyCombination(new[] { InputKey.Super, InputKey.Up }), new PlatformAction(PlatformActionType.ListStart, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(new[] { InputKey.Super, InputKey.Down }), new PlatformAction(PlatformActionType.ListEnd, PlatformActionMethod.Move))
=======
new KeyBinding(new KeyCombination(InputKey.Shift, InputKey.Left), new PlatformAction(PlatformActionType.CharPrevious, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Shift, InputKey.Right), new PlatformAction(PlatformActionType.CharNext, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Shift, InputKey.BackSpace), new PlatformAction(PlatformActionType.CharPrevious, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Shift, InputKey.Delete), new PlatformAction(PlatformActionType.CharNext, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Left), new PlatformAction(PlatformActionType.WordPrevious, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Right), new PlatformAction(PlatformActionType.WordNext, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.BackSpace), new PlatformAction(PlatformActionType.WordPrevious, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Delete), new PlatformAction(PlatformActionType.WordNext, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Shift, InputKey.Left), new PlatformAction(PlatformActionType.WordPrevious, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Shift, InputKey.Right), new PlatformAction(PlatformActionType.WordNext, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.Left), new PlatformAction(PlatformActionType.LineStart, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.Right), new PlatformAction(PlatformActionType.LineEnd, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.BackSpace), new PlatformAction(PlatformActionType.LineStart, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.Delete), new PlatformAction(PlatformActionType.LineEnd, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.Shift, InputKey.Left), new PlatformAction(PlatformActionType.LineStart, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.Shift, InputKey.Right), new PlatformAction(PlatformActionType.LineEnd, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Super, InputKey.Left), new PlatformAction(PlatformActionType.DocumentPrevious)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Super, InputKey.Right), new PlatformAction(PlatformActionType.DocumentNext)),
new KeyBinding(new KeyCombination(InputKey.Control, InputKey.Tab), new PlatformAction(PlatformActionType.DocumentNext)),
new KeyBinding(new KeyCombination(InputKey.Control, InputKey.Shift, InputKey.Tab), new PlatformAction(PlatformActionType.DocumentPrevious)),
>>>>>>>
new KeyBinding(new KeyCombination(InputKey.Shift, InputKey.Left), new PlatformAction(PlatformActionType.CharPrevious, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Shift, InputKey.Right), new PlatformAction(PlatformActionType.CharNext, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Shift, InputKey.BackSpace), new PlatformAction(PlatformActionType.CharPrevious, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Shift, InputKey.Delete), new PlatformAction(PlatformActionType.CharNext, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Left), new PlatformAction(PlatformActionType.WordPrevious, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Right), new PlatformAction(PlatformActionType.WordNext, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.BackSpace), new PlatformAction(PlatformActionType.WordPrevious, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Delete), new PlatformAction(PlatformActionType.WordNext, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Shift, InputKey.Left), new PlatformAction(PlatformActionType.WordPrevious, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Shift, InputKey.Right), new PlatformAction(PlatformActionType.WordNext, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.Left), new PlatformAction(PlatformActionType.LineStart, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.Right), new PlatformAction(PlatformActionType.LineEnd, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.BackSpace), new PlatformAction(PlatformActionType.LineStart, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.Delete), new PlatformAction(PlatformActionType.LineEnd, PlatformActionMethod.Delete)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.Shift, InputKey.Left), new PlatformAction(PlatformActionType.LineStart, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Super, InputKey.Shift, InputKey.Right), new PlatformAction(PlatformActionType.LineEnd, PlatformActionMethod.Select)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Super, InputKey.Left), new PlatformAction(PlatformActionType.DocumentPrevious)),
new KeyBinding(new KeyCombination(InputKey.Alt, InputKey.Super, InputKey.Right), new PlatformAction(PlatformActionType.DocumentNext)),
new KeyBinding(new KeyCombination(InputKey.Control, InputKey.Tab), new PlatformAction(PlatformActionType.DocumentNext)),
new KeyBinding(new KeyCombination(InputKey.Control, InputKey.Shift, InputKey.Tab), new PlatformAction(PlatformActionType.DocumentPrevious)),
new KeyBinding(new KeyCombination(new[] { InputKey.Super, InputKey.Up }), new PlatformAction(PlatformActionType.ListStart, PlatformActionMethod.Move)),
new KeyBinding(new KeyCombination(new[] { InputKey.Super, InputKey.Down }), new PlatformAction(PlatformActionType.ListEnd, PlatformActionMethod.Move)) |
<<<<<<<
Parts[i].Texture.DrawQuad(shadowQuad, Depth, shadowColour, vertexAction: vertexAction);
=======
parts[i].Texture.DrawQuad(shadowQuad, finalShadowColour, vertexAction: vertexAction);
>>>>>>>
parts[i].Texture.DrawQuad(shadowQuad, Depth, finalShadowColour, vertexAction: vertexAction);
<<<<<<<
Parts[i].Texture.DrawQuad(Parts[i].DrawQuad, Depth, DrawColourInfo.Colour, vertexAction: vertexAction);
=======
parts[i].Texture.DrawQuad(parts[i].DrawQuad, DrawColourInfo.Colour, vertexAction: vertexAction);
>>>>>>>
parts[i].Texture.DrawQuad(parts[i].DrawQuad, Depth, DrawColourInfo.Colour, vertexAction: vertexAction); |
<<<<<<<
private OpenTKKeyboardHandler keyboardHandler = new OpenTKKeyboardHandler();
internal LinuxGameHost(GraphicsContextFlags flags, string gameName)
=======
internal LinuxGameHost(GraphicsContextFlags flags, string gameName, bool bindIPC = false) : base(bindIPC)
>>>>>>>
private OpenTKKeyboardHandler keyboardHandler = new OpenTKKeyboardHandler();
internal LinuxGameHost(GraphicsContextFlags flags, string gameName, bool bindIPC = false) : base(bindIPC) |
<<<<<<<
Size = new Vector2(FixedWidth ? constantWidth.GetValueOrDefault() : s.DrawSize.X, 1f),
Scale = new Vector2(TextSize),
Children = new[] { s }
=======
Size = new Vector2(FixedWidth ? constantWidth.GetValueOrDefault() : d.DrawSize.X, 1f),
Scale = new Vector2(textSize),
Children = new[] { d }
>>>>>>>
Size = new Vector2(FixedWidth ? constantWidth.GetValueOrDefault() : d.DrawSize.X, 1f),
Scale = new Vector2(TextSize),
Children = new[] { d } |
<<<<<<<
public TrackStore Tracks => GetTrackStore();
=======
public IAdjustableResourceStore<Track.Track> Tracks => GetTrackStore();
>>>>>>>
public IAdjustableResourceStore<Track.Track> Tracks => GetTrackStore();
<<<<<<<
public SampleStore Samples => GetSampleStore();
=======
public IAdjustableResourceStore<SampleChannel> Samples => GetSampleStore();
>>>>>>>
public IAdjustableResourceStore<SampleChannel> Samples => GetSampleStore();
<<<<<<<
private readonly Lazy<TrackStore> globalTrackStore;
private readonly Lazy<SampleStore> globalSampleStore;
=======
private readonly Lazy<IAdjustableResourceStore<Track.Track>> globalTrackManager;
private readonly Lazy<IAdjustableResourceStore<SampleChannel>> globalSampleManager;
>>>>>>>
private readonly Lazy<IAdjustableResourceStore<Track.Track>> globalTrackStore;
private readonly Lazy<IAdjustableResourceStore<SampleChannel>> globalSampleStore;
<<<<<<<
globalTrackStore = new Lazy<TrackStore>(() => GetTrackStore(trackStore));
globalSampleStore = new Lazy<SampleStore>(() => GetSampleStore(sampleStore));
=======
globalTrackManager = new Lazy<IAdjustableResourceStore<Track.Track>>(() => GetTrackStore(trackStore));
globalSampleManager = new Lazy<IAdjustableResourceStore<SampleChannel>>(() => GetSampleStore(sampleStore));
>>>>>>>
globalTrackStore = new Lazy<IAdjustableResourceStore<Track.Track>>(() => GetTrackStore(trackStore));
globalSampleStore = new Lazy<IAdjustableResourceStore<SampleChannel>>(() => GetSampleStore(sampleStore));
<<<<<<<
/// <param name="store">The <see cref="IResourceStore{T}"/> of which to retrieve the <see cref="TrackStore"/>.</param>
public TrackStore GetTrackStore(IResourceStore<byte[]> store = null)
=======
/// <param name="store">The <see cref="IResourceStore{T}"/> of which to retrieve the <see cref="TrackStore"/>.</param>
public IAdjustableResourceStore<Track.Track> GetTrackStore(IResourceStore<byte[]> store = null)
>>>>>>>
/// <param name="store">The <see cref="IResourceStore{T}"/> of which to retrieve the <see cref="TrackStore"/>.</param>
public IAdjustableResourceStore<Track.Track> GetTrackStore(IResourceStore<byte[]> store = null)
<<<<<<<
/// <param name="store">The <see cref="IResourceStore{T}"/> of which to retrieve the <see cref="SampleStore"/>.</param>
public SampleStore GetSampleStore(IResourceStore<byte[]> store = null)
=======
/// <param name="store">The <see cref="IResourceStore{T}"/> of which to retrieve the <see cref="SampleStore"/>.</param>
public IAdjustableResourceStore<SampleChannel> GetSampleStore(IResourceStore<byte[]> store = null)
>>>>>>>
/// <param name="store">The <see cref="IResourceStore{T}"/> of which to retrieve the <see cref="SampleStore"/>.</param>
public IAdjustableResourceStore<SampleChannel> GetSampleStore(IResourceStore<byte[]> store = null)
<<<<<<<
public override void UpdateDevice(int deviceIndex)
{
Samples.UpdateDevice(deviceIndex);
Tracks.UpdateDevice(deviceIndex);
}
=======
>>>>>>> |
<<<<<<<
Blit(ScreenSpaceDrawQuad, vertexAction);
=======
Shader.Bind();
Blit(vertexAction);
>>>>>>>
Shader.Bind();
Blit(ScreenSpaceDrawQuad, vertexAction); |
<<<<<<<
ClickedDrawable = PropagateMouseButtonEvent(drawables, new ClickEvent(state, Button, MouseDownPosition));
=======
var clicked = intersectingQueue.FirstOrDefault(t => t.CanReceiveMouseInput && t.ReceiveMouseInputAt(state.Mouse.Position) && t.TriggerOnClick(state));
ClickedDrawable.SetTarget(clicked);
>>>>>>>
var clicked = PropagateMouseButtonEvent(drawables, new ClickEvent(state, Button, MouseDownPosition));
ClickedDrawable.SetTarget(clicked); |
<<<<<<<
rateAdjustSlider.Current.BindTo(browser.PlaybackRate);
rateAdjustSlider.Current.BindValueChanged(args => rateText.Text = args.To.ToString("0%"), true);
=======
rateAdjustSlider.Current.BindValueChanged(v => rateText.Text = v.ToString("0%"), true);
>>>>>>>
rateAdjustSlider.Current.BindValueChanged(args => rateText.Text = args.To.ToString("0%"), true); |
<<<<<<<
var value = field.GetValue(target);
dc.CacheAs(attribute.Type ?? value.GetType(), value, allowValueTypes);
});
=======
additionActivators.Add((target, dc) =>
{
var value = field.GetValue(target);
dc.CacheAs(attribute.Type ?? value.GetType(), value);
});
}
>>>>>>>
additionActivators.Add((target, dc) =>
{
var value = field.GetValue(target);
dc.CacheAs(attribute.Type ?? value.GetType(), value, allowValueTypes);
});
} |
<<<<<<<
using osu.Framework.Platform.Linux.Sdl;
=======
using OpenTK;
>>>>>>>
using osu.Framework.Platform.Linux.Sdl;
using OpenTK; |
<<<<<<<
Commit();
=======
if (ReleaseFocusOnCommit)
killFocus();
Background.Colour = ReleaseFocusOnCommit ? BackgroundUnfocused : BackgroundFocused;
Background.ClearTransforms();
Background.FlashColour(BackgroundCommit, 400);
audio.Sample.Get(@"Keyboard/key-confirm")?.Play();
OnCommit?.Invoke(this, true);
>>>>>>>
Commit();
<<<<<<<
private bool keyProducesCharacter(Key key) => key == Key.Space || key >= Key.Keypad0;
protected void Commit()
=======
/// <summary>
/// Removes focus from this <see cref="TextBox"/> if it currently has focus.
/// </summary>
protected virtual void KillFocus() => killFocus();
private void killFocus()
{
var manager = GetContainingInputManager();
if (manager.FocusedDrawable == this)
manager.ChangeFocus(null);
}
protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
>>>>>>>
private bool keyProducesCharacter(Key key) => key == Key.Space || key >= Key.Keypad0;
/// <summary>
/// Removes focus from this <see cref="TextBox"/> if it currently has focus.
/// </summary>
protected virtual void KillFocus() => killFocus();
private void killFocus()
{
var manager = GetContainingInputManager();
if (manager.FocusedDrawable == this)
manager.ChangeFocus(null);
}
protected void Commit() |
<<<<<<<
public static extern void av_packet_unref(AVPacket* pkt);
[DllImport(dll_name)]
public static extern void av_packet_free(AVPacket** pkt);
=======
private static extern void av_packet_free(AVPacket** pkt);
>>>>>>>
private static extern void av_packet_unref(AVPacket* pkt);
[DllImport(dll_name)]
private static extern void av_packet_free(AVPacket** pkt); |
<<<<<<<
if (shallPropagate && source != Parent)
{
var parentInvalidation = invalidation;
// Colour doesn't affect parent's properties
parentInvalidation &= ~Invalidation.Colour;
if (parentInvalidation > 0)
Parent.InvalidateFromChild(invalidation, this);
}
=======
if (shallPropagate && Parent != null && source != Parent)
Parent.InvalidateFromChild(invalidation, this);
>>>>>>>
if (shallPropagate && Parent != null && source != Parent)
{
var parentInvalidation = invalidation;
// Colour doesn't affect parent's properties
parentInvalidation &= ~Invalidation.Colour;
if (parentInvalidation > 0)
Parent.InvalidateFromChild(invalidation, this);
} |
<<<<<<<
using OpenTK.Graphics.ES30;
=======
using OpenTK.Graphics.ES20;
using osu.Framework.Graphics.Batches;
using osu.Framework.Graphics.OpenGL;
>>>>>>>
using OpenTK.Graphics.ES30;
using osu.Framework.Graphics.Batches;
using osu.Framework.Graphics.OpenGL; |
<<<<<<<
PossiblyHandleKeyboardInput = HandleInputCache.HandleKeyboardInput(this) || HandleKeyboardInput;
PossiblyHandleMouseInput = HandleInputCache.HandleMouseInput(this) || HandleMouseInput;
PossiblyHandleInputSubtree = PossiblyHandleKeyboardInput;
=======
handleNonPositionalInput = HandleInputCache.HandleNonPositionalInput(this);
handlePositionalInput = HandleInputCache.HandlePositionalInput(this);
>>>>>>>
PossiblyHandleNonPositionalInput = HandleInputCache.HandleNonPositionalInput(this) || HandleNonPositionalInput;
PossiblyHandlePositionalInput = HandleInputCache.HandlePositionalInput(this) || HandlePositionalInput;
PossiblyHandleNonPositionalInputSubtree = PossiblyHandleNonPositionalInput;
<<<<<<<
internal bool PossiblyHandleKeyboardInput;
internal bool PossiblyHandleMouseInput;
=======
private bool handleNonPositionalInput, handlePositionalInput;
>>>>>>>
internal bool PossiblyHandleNonPositionalInput;
internal bool PossiblyHandlePositionalInput;
<<<<<<<
public virtual bool HandleKeyboardInput => PossiblyHandleKeyboardInput;
=======
public virtual bool HandleNonPositionalInput => handleNonPositionalInput;
>>>>>>>
public virtual bool HandleNonPositionalInput => PossiblyHandleNonPositionalInput;
<<<<<<<
public virtual bool HandleMouseInput => PossiblyHandleMouseInput;
=======
public virtual bool HandlePositionalInput => handlePositionalInput;
>>>>>>>
public virtual bool HandlePositionalInput => PossiblyHandlePositionalInput;
<<<<<<<
/// This method is responsible for building a queue of Drawables to receive keyboard input in reverse order.
=======
/// This method is responsible for building a queue of Drawables to receive non-positional input
/// in reverse order. This method is overridden by <see cref="CompositeDrawable"/> to be called on all
/// children such that the entire scene graph is covered.
>>>>>>>
/// This method is responsible for building a queue of Drawables to receive non-positional input in reverse order.
<<<<<<<
/// This method is responsible for building a queue of Drawables to receive mouse input in reverse order.
=======
/// This method is responsible for building a queue of Drawables to receive positional input
/// in reverse order. This method is overridden by <see cref="CompositeDrawable"/> to be called on all
/// children such that the entire scene graph is covered.
>>>>>>>
/// This method is responsible for building a queue of Drawables to receive positional input in reverse order. |
<<<<<<<
using osu.Framework.Input;
using osu.Framework.Input.EventArgs;
=======
using osu.Framework.Input.Events;
>>>>>>>
using osu.Framework.Input;
using osu.Framework.Input.Events;
using osu.Framework.Input.States;
<<<<<<<
StyledDropdown styledDropdown, styledDropdownMenu2, keyboardInputDropdown1, keyboardInputDropdown2, keyboardInputDropdown3;
=======
>>>>>>> |
<<<<<<<
=======
frame = ffmpeg.av_frame_alloc();
ffmpegFrame = ffmpeg.av_frame_alloc();
uncompressedFrameSize = ffmpeg.av_image_get_buffer_size(AVPixelFormat.AV_PIX_FMT_RGBA, codecParams.width, codecParams.height, 1);
frameRgbBufferPtr = Marshal.AllocHGlobal(uncompressedFrameSize);
var dataArr4 = *(byte_ptrArray4*)&ffmpegFrame->data;
var linesizeArr4 = *(int_array4*)&ffmpegFrame->linesize;
var result = ffmpeg.av_image_fill_arrays(ref dataArr4, ref linesizeArr4, (byte*)frameRgbBufferPtr, AVPixelFormat.AV_PIX_FMT_RGBA, codecParams.width, codecParams.height, 1);
if (result < 0)
throw new InvalidOperationException("Couldn't fill image arrays.");
for (uint j = 0; j < byte_ptrArray4.Size; ++j)
{
ffmpegFrame->data[j] = dataArr4[j];
ffmpegFrame->linesize[j] = linesizeArr4[j];
}
>>>>>>>
<<<<<<<
=======
if (sendPacketResult < 0)
throw new InvalidOperationException($"Error {sendPacketResult} sending packet.");
var result = ffmpeg.avcodec_receive_frame(stream->codec, frame);
>>>>>>> |
<<<<<<<
using osuTK;
using osuTK.Input;
=======
using osu.Framework.Input.StateChanges;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;
>>>>>>>
using osuTK;
using osuTK.Input;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; |
<<<<<<<
public Transform resetPos;
public Transform resetScene;
public Transform home;
public Transform menus;
public Transform matryx;
private Vector3 idleScale, selectedScale;
=======
>>>>>>>
<<<<<<<
base.Start();
selectedScale = new Vector3(0.05f, 0.001f, 0.05f);
idleScale = new Vector3(0.02f, 0.001f, 0.02f);
buttonScale = new Vector3(0.003f, 0.05f, 0.07f);
matryxScale = new Vector3(0.003f, 0.025f, 0.1475f);
transform.localScale = idleScale;
=======
home = this.transform.parent.Find("HomeButton");
menus = this.transform.parent.Find("MenuButton");
resetPos = this.transform.parent.Find("ResetPositionButton");
resetScene = this.transform.parent.Find("ResetSceneButton");
matryx = this.transform.parent.Find("MatryxButton");
}
>>>>>>>
home = this.transform.parent.Find("HomeButton");
menus = this.transform.parent.Find("MenuButton");
resetPos = this.transform.parent.Find("ResetPositionButton");
resetScene = this.transform.parent.Find("ResetSceneButton");
matryx = this.transform.parent.Find("MatryxButton");
} |
<<<<<<<
IsNullOrEmpty(filter.DimensionFilters) ? string.Empty : "(" + GenerateMetricDimensionFilterString(filter.DimensionFilters) + ") and ",
filter.TimeGrain.To8601String(),
=======
filter.Names == null || !filter.Names.Any() ? string.Empty : "(" + GenerateMetricDefinitionFilterString(filter.Names) + ") and ",
XmlConvert.ToString(filter.TimeGrain),
>>>>>>>
IsNullOrEmpty(filter.DimensionFilters) ? string.Empty : "(" + GenerateMetricDimensionFilterString(filter.DimensionFilters) + ") and ",
XmlConvert.ToString(filter.TimeGrain), |
<<<<<<<
public override void SetData(ITextureUpload upload, WrapMode? wrapModeS = null, WrapMode? wrapModeT = null, Opacity? uploadOpacity = null)
=======
internal override void SetData(ITextureUpload upload, WrapMode wrapModeS, WrapMode wrapModeT)
>>>>>>>
internal override void SetData(ITextureUpload upload, WrapMode wrapModeS, WrapMode wrapModeT, Opacity? uploadOpacity)
<<<<<<<
// For a texture atlas, we don't care about opacity, so we avoid
// any computations related to it by assuming it to be mixed.
base.SetData(upload, default, default, Opacity.Mixed);
=======
base.SetData(upload, wrapModeS, wrapModeT);
>>>>>>>
// For a texture atlas, we don't care about opacity, so we avoid
// any computations related to it by assuming it to be mixed.
base.SetData(upload, wrapModeS, wrapModeT, Opacity.Mixed);
<<<<<<<
// For a texture atlas, we don't care about opacity, so we avoid
// any computations related to it by assuming it to be mixed.
base.SetData(upload, default, default, Opacity.Mixed);
=======
base.SetData(upload, wrapModeS, wrapModeT);
>>>>>>>
// For a texture atlas, we don't care about opacity, so we avoid
// any computations related to it by assuming it to be mixed.
base.SetData(upload, wrapModeS, wrapModeT, Opacity.Mixed);
<<<<<<<
// For a texture atlas, we don't care about opacity, so we avoid
// any computations related to it by assuming it to be mixed.
base.SetData(sideUpload, default, default, Opacity.Mixed);
=======
base.SetData(sideUpload, WrapMode.None, WrapMode.None);
>>>>>>>
{
// For a texture atlas, we don't care about opacity, so we avoid
// any computations related to it by assuming it to be mixed.
base.SetData(sideUpload, WrapMode.None, WrapMode.None, Opacity.Mixed);
}
<<<<<<<
// For a texture atlas, we don't care about opacity, so we avoid
// any computations related to it by assuming it to be mixed.
base.SetData(sideUpload, default, default, Opacity.Mixed);
=======
base.SetData(sideUpload, WrapMode.None, WrapMode.None);
>>>>>>>
{
// For a texture atlas, we don't care about opacity, so we avoid
// any computations related to it by assuming it to be mixed.
base.SetData(sideUpload, WrapMode.None, WrapMode.None, Opacity.Mixed);
}
<<<<<<<
// For a texture atlas, we don't care about opacity, so we avoid
// any computations related to it by assuming it to be mixed.
base.SetData(cornerUpload, default, default, Opacity.Mixed);
=======
base.SetData(cornerUpload, WrapMode.None, WrapMode.None);
>>>>>>>
// For a texture atlas, we don't care about opacity, so we avoid
// any computations related to it by assuming it to be mixed.
base.SetData(cornerUpload, WrapMode.None, WrapMode.None, Opacity.Mixed); |
<<<<<<<
using Size = OpenTK.Size;
using Point = OpenTK.Point;
=======
using OpenTK.Graphics;
>>>>>>>
using OpenTK.Graphics;
using Size = OpenTK.Size;
using Point = OpenTK.Point; |
<<<<<<<
queueLock.EnterWriteLock();
try
{
queue.Enqueue(item);
}
finally
{
queueLock.ExitWriteLock();
}
=======
if (!queue.Any(x => x.Urls == item.Urls) && (ItemBeingProcessed== null || ItemBeingProcessed.Urls != item.Urls))
queue.Enqueue(item);
>>>>>>>
queueLock.EnterWriteLock();
try
{
if (!queue.Any(x => x.Urls == item.Urls) && (ItemBeingProcessed== null || ItemBeingProcessed.Urls != item.Urls))
queue.Enqueue(item);
}
finally
{
queueLock.ExitWriteLock();
} |
<<<<<<<
x = Context.FromPixels(y);
#elif __TIZEN__
=======
y = Context.FromPixels(y);
#elif TIZEN4_0
>>>>>>>
y = Context.FromPixels(y);
#elif __TIZEN__ |
<<<<<<<
public void DrawBitmapNinePatch (SKBitmap bitmap, SKRectI center, SKRect dst, SKPaint paint = null)
{
if (bitmap == null)
throw new ArgumentNullException (nameof (bitmap));
// the "center" rect must fit inside the bitmap "rect"
if (!SKRect.Create (bitmap.Info.Size).Contains (center))
throw new ArgumentOutOfRangeException (nameof (center));
var xDivs = new [] { center.Left, center.Right };
var yDivs = new [] { center.Top, center.Bottom };
DrawBitmapLattice (bitmap, xDivs, yDivs, dst, paint);
}
public void DrawImageNinePatch (SKImage image, SKRectI center, SKRect dst, SKPaint paint = null)
{
if (image == null)
throw new ArgumentNullException (nameof (image));
// the "center" rect must fit inside the image "rect"
if (!SKRect.Create (image.Width, image.Height).Contains (center))
throw new ArgumentOutOfRangeException (nameof (center));
var xDivs = new [] { center.Left, center.Right };
var yDivs = new [] { center.Top, center.Bottom };
DrawImageLattice (image, xDivs, yDivs, dst, paint);
}
public void DrawBitmapLattice (SKBitmap bitmap, int[] xDivs, int[] yDivs, SKRect dst, SKPaint paint = null)
{
if (bitmap == null)
throw new ArgumentNullException (nameof (bitmap));
if (xDivs == null)
throw new ArgumentNullException (nameof (xDivs));
if (yDivs == null)
throw new ArgumentNullException (nameof (yDivs));
SkiaApi.sk_canvas_draw_bitmap_lattice (Handle, bitmap.Handle, xDivs, xDivs.Length, yDivs, yDivs.Length, ref dst, paint == null ? IntPtr.Zero : paint.Handle);
}
public void DrawImageLattice (SKImage image, int[] xDivs, int[] yDivs, SKRect dst, SKPaint paint = null)
{
if (image == null)
throw new ArgumentNullException (nameof (image));
if (xDivs == null)
throw new ArgumentNullException (nameof (xDivs));
if (yDivs == null)
throw new ArgumentNullException (nameof (yDivs));
SkiaApi.sk_canvas_draw_image_lattice (Handle, image.Handle, xDivs, xDivs.Length, yDivs, yDivs.Length, ref dst, paint == null ? IntPtr.Zero : paint.Handle);
}
=======
public void Flush ()
{
SkiaApi.sk_canvas_flush (Handle);
}
>>>>>>>
public void Flush ()
{
SkiaApi.sk_canvas_flush (Handle);
}
public void DrawBitmapNinePatch (SKBitmap bitmap, SKRectI center, SKRect dst, SKPaint paint = null)
{
if (bitmap == null)
throw new ArgumentNullException (nameof (bitmap));
// the "center" rect must fit inside the bitmap "rect"
if (!SKRect.Create (bitmap.Info.Size).Contains (center))
throw new ArgumentOutOfRangeException (nameof (center));
var xDivs = new [] { center.Left, center.Right };
var yDivs = new [] { center.Top, center.Bottom };
DrawBitmapLattice (bitmap, xDivs, yDivs, dst, paint);
}
public void DrawImageNinePatch (SKImage image, SKRectI center, SKRect dst, SKPaint paint = null)
{
if (image == null)
throw new ArgumentNullException (nameof (image));
// the "center" rect must fit inside the image "rect"
if (!SKRect.Create (image.Width, image.Height).Contains (center))
throw new ArgumentOutOfRangeException (nameof (center));
var xDivs = new [] { center.Left, center.Right };
var yDivs = new [] { center.Top, center.Bottom };
DrawImageLattice (image, xDivs, yDivs, dst, paint);
}
public void DrawBitmapLattice (SKBitmap bitmap, int[] xDivs, int[] yDivs, SKRect dst, SKPaint paint = null)
{
if (bitmap == null)
throw new ArgumentNullException (nameof (bitmap));
if (xDivs == null)
throw new ArgumentNullException (nameof (xDivs));
if (yDivs == null)
throw new ArgumentNullException (nameof (yDivs));
SkiaApi.sk_canvas_draw_bitmap_lattice (Handle, bitmap.Handle, xDivs, xDivs.Length, yDivs, yDivs.Length, ref dst, paint == null ? IntPtr.Zero : paint.Handle);
}
public void DrawImageLattice (SKImage image, int[] xDivs, int[] yDivs, SKRect dst, SKPaint paint = null)
{
if (image == null)
throw new ArgumentNullException (nameof (image));
if (xDivs == null)
throw new ArgumentNullException (nameof (xDivs));
if (yDivs == null)
throw new ArgumentNullException (nameof (yDivs));
SkiaApi.sk_canvas_draw_image_lattice (Handle, image.Handle, xDivs, xDivs.Length, yDivs, yDivs.Length, ref dst, paint == null ? IntPtr.Zero : paint.Handle);
} |
<<<<<<<
BindableProperty.Create("HasRenderLoop", typeof(bool), typeof(SKGLView), false);
public static readonly BindableProperty EnableTouchEventsProperty =
BindableProperty.Create(nameof(EnableTouchEvents), typeof(bool), typeof(SKCanvasView), false);
=======
BindableProperty.Create(nameof(HasRenderLoop), typeof(bool), typeof(SKGLView), false);
>>>>>>>
BindableProperty.Create(nameof(HasRenderLoop), typeof(bool), typeof(SKGLView), false);
public static readonly BindableProperty EnableTouchEventsProperty =
BindableProperty.Create(nameof(EnableTouchEvents), typeof(bool), typeof(SKCanvasView), false); |
<<<<<<<
using System.Linq;
using Xunit;
=======
using NUnit.Framework;
>>>>>>>
using System.Linq;
using NUnit.Framework; |
<<<<<<<
=======
using Showcase.Server.Api.Controllers.Base;
using Showcase.Server.Infrastructure.Extensions;
>>>>>>>
using Showcase.Server.Api.Controllers.Base; |
<<<<<<<
=======
using Showcase.Server.Api.Controllers.Base;
using Showcase.Server.Infrastructure.Extensions;
>>>>>>>
using Showcase.Server.Api.Controllers.Base; |
<<<<<<<
using System.ComponentModel;
=======
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
>>>>>>>
using System.ComponentModel.DataAnnotations; |
<<<<<<<
return renderer.Writer.ToString();
=======
string html = renderer.Writer.ToString()!;
pipeline.ReleaseCacheableHtmlRenderer(renderer);
return html;
}
/// <summary>
/// Converts a Markdown document to HTML.
/// </summary>
/// <param name="document">A Markdown document.</param>
/// <param name="pipeline">The pipeline used for the conversion.</param>
/// <returns>The result of the conversion</returns>
/// <exception cref="ArgumentNullException">if markdown document variable is null</exception>
public static string ToHtml(this MarkdownDocument document, MarkdownPipeline pipeline = null)
{
if (document == null) ThrowHelper.ArgumentNullException(nameof(document));
pipeline ??= new MarkdownPipelineBuilder().Build();
var renderer = pipeline.GetCacheableHtmlRenderer();
renderer.Render(document);
renderer.Writer.Flush();
string html = renderer.Writer.ToString();
pipeline.ReleaseCacheableHtmlRenderer(renderer);
return html;
>>>>>>>
return renderer.Writer.ToString() ?? string.Empty;
<<<<<<<
if (markdown == null) ThrowHelper.ArgumentNullException_markdown();
if (writer == null) ThrowHelper.ArgumentNullException_writer();
=======
if (markdown is null) ThrowHelper.ArgumentNullException_markdown();
if (writer is null) ThrowHelper.ArgumentNullException_writer();
pipeline ??= new MarkdownPipelineBuilder().Build();
pipeline = CheckForSelfPipeline(pipeline, markdown);
>>>>>>>
if (markdown is null) ThrowHelper.ArgumentNullException_markdown();
if (writer is null) ThrowHelper.ArgumentNullException_writer();
<<<<<<<
if (markdown == null) ThrowHelper.ArgumentNullException_markdown();
if (renderer == null) ThrowHelper.ArgumentNullException(nameof(renderer));
=======
if (markdown is null) ThrowHelper.ArgumentNullException_markdown();
if (renderer is null) ThrowHelper.ArgumentNullException(nameof(renderer));
pipeline ??= new MarkdownPipelineBuilder().Build();
>>>>>>>
if (markdown is null) ThrowHelper.ArgumentNullException_markdown();
if (renderer is null) ThrowHelper.ArgumentNullException(nameof(renderer));
<<<<<<<
MarkdownPipeline pipeline = trackTrivia ? _defaultTrackTriviaPipeline : null;
=======
MarkdownPipeline? pipeline = trackTrivia ? new MarkdownPipelineBuilder()
.EnableTrackTrivia()
.Build() : null;
>>>>>>>
MarkdownPipeline? pipeline = trackTrivia ? _defaultTrackTriviaPipeline : null;
<<<<<<<
if (markdown == null) ThrowHelper.ArgumentNullException_markdown();
=======
if (markdown is null) ThrowHelper.ArgumentNullException_markdown();
pipeline ??= new MarkdownPipelineBuilder().Build();
>>>>>>>
if (markdown is null) ThrowHelper.ArgumentNullException_markdown(); |
<<<<<<<
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.CompositeType.#Properties")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.EnumType.#Values")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.Method.#InputParameterTransformation")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Methods")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Properties")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ParameterTransformation.#ParameterMappings")]
=======
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "FileSystem", Scope = "member", Target = "Microsoft.Rest.Generator.Extensibility.ExtensionsLoader.#GetConfigurationFileContent(Microsoft.Rest.Generator.Settings)")]
>>>>>>>
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "FileSystem", Scope = "member", Target = "Microsoft.Rest.Generator.Extensibility.ExtensionsLoader.#GetConfigurationFileContent(Microsoft.Rest.Generator.Settings)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.CompositeType.#Properties")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.EnumType.#Values")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.Method.#InputParameterTransformation")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Methods")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Properties")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ParameterTransformation.#ParameterMappings")] |
<<<<<<<
// parameter locations
this.RetrofitParameters.ForEach(p =>
{
string locationImport = p.Location.ImportFrom();
if (!string.IsNullOrEmpty(locationImport))
{
imports.Add(p.Location.ImportFrom());
}
});
=======
>>>>>>> |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<AzureOperationResponse> PutPositiveDurationWithHttpMessagesAsync(TimeSpan? durationBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<AzureOperationResponse> PutPositiveDurationWithHttpMessagesAsync(TimeSpan durationBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<AzureOperationResponse> PutPositiveDurationWithHttpMessagesAsync(TimeSpan durationBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamIntegerWithHttpMessagesAsync(string scenario, int? value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> ParamIntegerWithHttpMessagesAsync(string scenario, int value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamIntegerWithHttpMessagesAsync(string scenario, int value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamLongWithHttpMessagesAsync(string scenario, long? value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> ParamLongWithHttpMessagesAsync(string scenario, long value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamLongWithHttpMessagesAsync(string scenario, long value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamFloatWithHttpMessagesAsync(string scenario, double? value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> ParamFloatWithHttpMessagesAsync(string scenario, double value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamFloatWithHttpMessagesAsync(string scenario, double value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamDoubleWithHttpMessagesAsync(string scenario, double? value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> ParamDoubleWithHttpMessagesAsync(string scenario, double value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamDoubleWithHttpMessagesAsync(string scenario, double value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamBoolWithHttpMessagesAsync(string scenario, bool? value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> ParamBoolWithHttpMessagesAsync(string scenario, bool value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamBoolWithHttpMessagesAsync(string scenario, bool value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamDateWithHttpMessagesAsync(string scenario, DateTime? value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> ParamDateWithHttpMessagesAsync(string scenario, DateTime value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamDateWithHttpMessagesAsync(string scenario, DateTime value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamDatetimeWithHttpMessagesAsync(string scenario, DateTime? value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> ParamDatetimeWithHttpMessagesAsync(string scenario, DateTime value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamDatetimeWithHttpMessagesAsync(string scenario, DateTime value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamDurationWithHttpMessagesAsync(string scenario, TimeSpan? value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> ParamDurationWithHttpMessagesAsync(string scenario, TimeSpan value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> ParamDurationWithHttpMessagesAsync(string scenario, TimeSpan value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Pet>> GetPetByIdWithHttpMessagesAsync(long? petId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse<Pet>> GetPetByIdWithHttpMessagesAsync(long petId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Pet>> GetPetByIdWithHttpMessagesAsync(long petId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> UpdatePetWithFormWithHttpMessagesAsync(long? petId, System.IO.Stream fileContent, string fileName = default(string), string status = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> UpdatePetWithFormWithHttpMessagesAsync(long petId, System.IO.Stream fileContent, string fileName = default(string), string status = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> UpdatePetWithFormWithHttpMessagesAsync(long petId, System.IO.Stream fileContent, string fileName = default(string), string status = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> DeletePetWithHttpMessagesAsync(long? petId, string apiKey = "", Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> DeletePetWithHttpMessagesAsync(long petId, string apiKey = "", Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> DeletePetWithHttpMessagesAsync(long petId, string apiKey = "", Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Product>> ValidationOfMethodParametersWithHttpMessagesAsync(string resourceGroupName, int? id, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse<Product>> ValidationOfMethodParametersWithHttpMessagesAsync(string resourceGroupName, int id, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Product>> ValidationOfMethodParametersWithHttpMessagesAsync(string resourceGroupName, int id, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Product>> ValidationOfBodyWithHttpMessagesAsync(string resourceGroupName, int? id, Product body = default(Product), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse<Product>> ValidationOfBodyWithHttpMessagesAsync(string resourceGroupName, int id, Product body = default(Product), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Product>> ValidationOfBodyWithHttpMessagesAsync(string resourceGroupName, int id, Product body = default(Product), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> EnumValidWithHttpMessagesAsync(UriColor? enumPath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> EnumValidWithHttpMessagesAsync(UriColor enumPath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> EnumValidWithHttpMessagesAsync(UriColor enumPath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> EnumNullWithHttpMessagesAsync(UriColor? enumPath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> EnumNullWithHttpMessagesAsync(UriColor enumPath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> EnumNullWithHttpMessagesAsync(UriColor enumPath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> DateNullWithHttpMessagesAsync(DateTime? datePath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> DateNullWithHttpMessagesAsync(DateTime datePath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> DateNullWithHttpMessagesAsync(DateTime datePath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> DateTimeNullWithHttpMessagesAsync(DateTime? dateTimePath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> DateTimeNullWithHttpMessagesAsync(DateTime dateTimePath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> DateTimeNullWithHttpMessagesAsync(DateTime dateTimePath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Error>> PostRequiredIntegerParameterWithHttpMessagesAsync(int? bodyParameter, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse<Error>> PostRequiredIntegerParameterWithHttpMessagesAsync(int bodyParameter, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Error>> PostRequiredIntegerParameterWithHttpMessagesAsync(int bodyParameter, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Error>> PostRequiredIntegerPropertyWithHttpMessagesAsync(int? value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse<Error>> PostRequiredIntegerPropertyWithHttpMessagesAsync(int value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Error>> PostRequiredIntegerPropertyWithHttpMessagesAsync(int value, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Error>> PostRequiredIntegerHeaderWithHttpMessagesAsync(int? headerParameter, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse<Error>> PostRequiredIntegerHeaderWithHttpMessagesAsync(int headerParameter, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse<Error>> PostRequiredIntegerHeaderWithHttpMessagesAsync(int headerParameter, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMax32WithHttpMessagesAsync(int? intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutMax32WithHttpMessagesAsync(int intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMax32WithHttpMessagesAsync(int intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMax64WithHttpMessagesAsync(long? intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutMax64WithHttpMessagesAsync(long intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMax64WithHttpMessagesAsync(long intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMin32WithHttpMessagesAsync(int? intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutMin32WithHttpMessagesAsync(int intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMin32WithHttpMessagesAsync(int intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long? intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMax32WithHttpMessagesAsync(int? intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutMax32WithHttpMessagesAsync(int intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMax32WithHttpMessagesAsync(int intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMax64WithHttpMessagesAsync(long? intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutMax64WithHttpMessagesAsync(long intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMax64WithHttpMessagesAsync(long intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMin32WithHttpMessagesAsync(int? intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutMin32WithHttpMessagesAsync(int intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMin32WithHttpMessagesAsync(int intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long? intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) |
<<<<<<<
settings.Validate(codeGenerator);
=======
>>>>>>> |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigFloatWithHttpMessagesAsync(double? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutBigFloatWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigFloatWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDoubleWithHttpMessagesAsync(double? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutBigDoubleWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDoubleWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDoublePositiveDecimalWithHttpMessagesAsync(double? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutBigDoublePositiveDecimalWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDoublePositiveDecimalWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDoubleNegativeDecimalWithHttpMessagesAsync(double? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutBigDoubleNegativeDecimalWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDoubleNegativeDecimalWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDecimalWithHttpMessagesAsync(decimal? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutBigDecimalWithHttpMessagesAsync(decimal numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDecimalWithHttpMessagesAsync(decimal numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDecimalPositiveDecimalWithHttpMessagesAsync(decimal? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutBigDecimalPositiveDecimalWithHttpMessagesAsync(decimal numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDecimalPositiveDecimalWithHttpMessagesAsync(decimal numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDecimalNegativeDecimalWithHttpMessagesAsync(decimal? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutBigDecimalNegativeDecimalWithHttpMessagesAsync(decimal numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutBigDecimalNegativeDecimalWithHttpMessagesAsync(decimal numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutSmallFloatWithHttpMessagesAsync(double? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutSmallFloatWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutSmallFloatWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutSmallDoubleWithHttpMessagesAsync(double? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutSmallDoubleWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutSmallDoubleWithHttpMessagesAsync(double numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutSmallDecimalWithHttpMessagesAsync(decimal? numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutSmallDecimalWithHttpMessagesAsync(decimal numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutSmallDecimalWithHttpMessagesAsync(decimal numberBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) |
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMaxDateWithHttpMessagesAsync(DateTime? dateBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutMaxDateWithHttpMessagesAsync(DateTime dateBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMaxDateWithHttpMessagesAsync(DateTime dateBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
<<<<<<<
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMinDateWithHttpMessagesAsync(DateTime? dateBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
=======
public async Task<HttpOperationResponse> PutMinDateWithHttpMessagesAsync(DateTime dateBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
>>>>>>>
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<HttpOperationResponse> PutMinDateWithHttpMessagesAsync(DateTime dateBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) |
<<<<<<<
public CellParts(string value, int width, Alignment alignment)
=======
internal CellParts(string value, int width)
>>>>>>>
internal CellParts(string value, int width, Alignment alignment)
<<<<<<<
public int ColMaxWidth { get; set; }
public Alignment Alignment { get; set; }
public int LineCount => _lines.Length;
public string GetLine(int i)
=======
internal int ColMaxWidth { get; private set; }
internal int LineCount => _lines.Length;
internal string GetLine(int i)
>>>>>>>
internal int ColMaxWidth { get; set; }
internal Alignment Alignment { get; set; }
internal int LineCount => _lines.Length;
public string GetLine(int i) |
<<<<<<<
bool GridLinesVisible { get; set; }
=======
void ScrollToRow (int row);
>>>>>>>
void ScrollToRow (int row);
bool GridLinesVisible { get; set; } |
<<<<<<<
=======
using MonoMac.CoreText;
using MonoMac.CoreGraphics;
using Xwt.Engine;
>>>>>>>
using MonoMac.CoreText;
using MonoMac.CoreGraphics;
using Xwt.Engine;
<<<<<<<
li.Font = (NSFont)Toolkit.GetBackend (font);
UpdateInfo (li);
=======
li.Font = (NSFont)WidgetRegistry.GetBackend (font);
InvalidateFramesetter (li);
>>>>>>>
li.Font = (NSFont)Toolkit.GetBackend (font);
InvalidateFramesetter (li);
<<<<<<<
public override Size GetSize (object backend)
=======
static NSAttributedString CreateAttributedString (LayoutInfo li, string overrideText = null)
>>>>>>>
static NSAttributedString CreateAttributedString (LayoutInfo li, string overrideText = null) |
<<<<<<<
public override void SetTextAttributes(object backend, IEnumerable<TextAttribute> textAttributes)
{
Pango.Layout tl = (Pango.Layout) backend;
var attrList = new FastPangoAttrList ();
// TODO: UTF-8 coordinate transformation.
foreach (var textAttr in textAttributes) {
var fg = textAttr as TextAttributeForeground;
if (fg != null) {
attrList.AddForegroundAttribute (fg.Color.ToGdkColor (), fg.StartIndex, fg.EndIndex);
continue;
}
var bg = textAttr as TextAttributeBackground;
if (bg != null) {
attrList.AddBackgroundAttribute (bg.Color.ToGdkColor (), bg.StartIndex, bg.EndIndex);
continue;
}
var style = textAttr as TextAttributeStyle;
if (style != null) {
attrList.AddStyleAttribute (ConvertStyle (style.TextStyle), style.StartIndex, style.EndIndex);
continue;
}
var weight = textAttr as TextAttributeWeight;
if (weight != null) {
attrList.AddWeightAttribute (ConvertWeight (weight.TextWeight), weight.StartIndex, weight.EndIndex);
continue;
}
var decoration = textAttr as TextAttributeDecoration;
if (decoration != null) {
if (decoration.TextDecoration.HasFlag (TextDecoration.Underline))
attrList.AddUnderlineAttribute (Pango.Underline.Single, decoration.StartIndex, decoration.EndIndex);
if (decoration.TextDecoration.HasFlag (TextDecoration.Strikethrough))
attrList.AddStrikethroughAttribute (true, decoration.StartIndex, decoration.EndIndex);
continue;
}
}
attrList.AssignTo (tl);
}
static Pango.Style ConvertStyle (TextStyle textStyle)
{
switch (textStyle) {
case TextStyle.Normal:
return Pango.Style.Normal;
case TextStyle.Italic:
return Pango.Style.Italic;
case TextStyle.Oblique:
return Pango.Style.Oblique;
default:
throw new ArgumentOutOfRangeException ();
}
}
static Pango.Weight ConvertWeight (TextWeight textWeight)
{
switch (textWeight) {
case TextWeight.Normal:
return Pango.Weight.Normal;
case TextWeight.Bold:
return Pango.Weight.Bold;
case TextWeight.Heavy:
return Pango.Weight.Heavy;
case TextWeight.Light:
return Pango.Weight.Light;
default:
throw new ArgumentOutOfRangeException ();
}
}
/// <summary>
/// This creates a Pango list and applies attributes to it with *much* less overhead than the GTK# version.
/// </summary>
class FastPangoAttrList : IDisposable
{
IntPtr list;
public FastPangoAttrList ()
{
list = pango_attr_list_new ();
}
public void AddStyleAttribute (Pango.Style style, uint start, uint end)
{
Add (pango_attr_style_new (style), start, end);
}
public void AddWeightAttribute (Pango.Weight weight, uint start, uint end)
{
Add (pango_attr_weight_new (weight), start, end);
}
public void AddForegroundAttribute (Gdk.Color color, uint start, uint end)
{
Add (pango_attr_foreground_new (color.Red, color.Green, color.Blue), start, end);
}
public void AddBackgroundAttribute (Gdk.Color color, uint start, uint end)
{
Add (pango_attr_background_new (color.Red, color.Green, color.Blue), start, end);
}
public void AddUnderlineAttribute (Pango.Underline underline, uint start, uint end)
{
Add (pango_attr_underline_new (underline), start, end);
}
public void AddStrikethroughAttribute (bool strikethrough, uint start, uint end)
{
Add (pango_attr_strikethrough_new (strikethrough), start, end);
}
void Add (IntPtr attribute, uint start, uint end)
{
unsafe {
PangoAttribute *attPtr = (PangoAttribute *) attribute;
attPtr->start_index = start;
attPtr->end_index = end;
}
pango_attr_list_insert (list, attribute);
}
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_style_new (Pango.Style style);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_stretch_new (Pango.Stretch stretch);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_weight_new (Pango.Weight weight);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_foreground_new (ushort red, ushort green, ushort blue);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_background_new (ushort red, ushort green, ushort blue);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_underline_new (Pango.Underline underline);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_strikethrough_new (bool strikethrough);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_list_new ();
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_attr_list_unref (IntPtr list);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_attr_list_insert (IntPtr list, IntPtr attr);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_layout_set_attributes (IntPtr layout, IntPtr attrList);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_attr_list_splice (IntPtr attr_list, IntPtr other, Int32 pos, Int32 len);
public void Splice (Pango.AttrList attrs, int pos, int len)
{
pango_attr_list_splice (list, attrs.Handle, pos, len);
}
public void AssignTo (Pango.Layout layout)
{
pango_layout_set_attributes (layout.Handle, list);
}
[StructLayout (LayoutKind.Sequential)]
struct PangoAttribute
{
public IntPtr klass;
public uint start_index;
public uint end_index;
}
public void Dispose ()
{
if (list != IntPtr.Zero) {
GC.SuppressFinalize (this);
Destroy ();
}
}
//NOTE: the list destroys all its attributes when the ref count reaches zero
void Destroy ()
{
pango_attr_list_unref (list);
list = IntPtr.Zero;
}
~FastPangoAttrList ()
{
GLib.Idle.Add (delegate {
Destroy ();
return false;
});
}
}
=======
public override int GetIndexFromCoordinates (object backend, double x, double y)
{
Pango.Layout tl = (Pango.Layout) backend;
int index, trailing;
tl.XyToIndex ((int)x, (int)y, out index, out trailing);
// TODO: UTF-8 coordinate transformation
return index;
}
public override Rectangle GetExtendsFromIndex (object backend, int index)
{
Pango.Layout tl = (Pango.Layout) backend;
// TODO: UTF-8 coordinate transformation
var pos = tl.IndexToPos (index);
return new Rectangle (pos.X, pos.Y, pos.Width, pos.Height);
}
>>>>>>>
public override void SetTextAttributes(object backend, IEnumerable<TextAttribute> textAttributes)
{
Pango.Layout tl = (Pango.Layout) backend;
var attrList = new FastPangoAttrList ();
// TODO: UTF-8 coordinate transformation.
foreach (var textAttr in textAttributes) {
var fg = textAttr as TextAttributeForeground;
if (fg != null) {
attrList.AddForegroundAttribute (fg.Color.ToGdkColor (), fg.StartIndex, fg.EndIndex);
continue;
}
var bg = textAttr as TextAttributeBackground;
if (bg != null) {
attrList.AddBackgroundAttribute (bg.Color.ToGdkColor (), bg.StartIndex, bg.EndIndex);
continue;
}
var style = textAttr as TextAttributeStyle;
if (style != null) {
attrList.AddStyleAttribute (ConvertStyle (style.TextStyle), style.StartIndex, style.EndIndex);
continue;
}
var weight = textAttr as TextAttributeWeight;
if (weight != null) {
attrList.AddWeightAttribute (ConvertWeight (weight.TextWeight), weight.StartIndex, weight.EndIndex);
continue;
}
var decoration = textAttr as TextAttributeDecoration;
if (decoration != null) {
if (decoration.TextDecoration.HasFlag (TextDecoration.Underline))
attrList.AddUnderlineAttribute (Pango.Underline.Single, decoration.StartIndex, decoration.EndIndex);
if (decoration.TextDecoration.HasFlag (TextDecoration.Strikethrough))
attrList.AddStrikethroughAttribute (true, decoration.StartIndex, decoration.EndIndex);
continue;
}
}
attrList.AssignTo (tl);
}
static Pango.Style ConvertStyle (TextStyle textStyle)
{
switch (textStyle) {
case TextStyle.Normal:
return Pango.Style.Normal;
case TextStyle.Italic:
return Pango.Style.Italic;
case TextStyle.Oblique:
return Pango.Style.Oblique;
default:
throw new ArgumentOutOfRangeException ();
}
}
static Pango.Weight ConvertWeight (TextWeight textWeight)
{
switch (textWeight) {
case TextWeight.Normal:
return Pango.Weight.Normal;
case TextWeight.Bold:
return Pango.Weight.Bold;
case TextWeight.Heavy:
return Pango.Weight.Heavy;
case TextWeight.Light:
return Pango.Weight.Light;
default:
throw new ArgumentOutOfRangeException ();
}
}
/// <summary>
/// This creates a Pango list and applies attributes to it with *much* less overhead than the GTK# version.
/// </summary>
class FastPangoAttrList : IDisposable
{
IntPtr list;
public FastPangoAttrList ()
{
list = pango_attr_list_new ();
}
public void AddStyleAttribute (Pango.Style style, uint start, uint end)
{
Add (pango_attr_style_new (style), start, end);
}
public void AddWeightAttribute (Pango.Weight weight, uint start, uint end)
{
Add (pango_attr_weight_new (weight), start, end);
}
public void AddForegroundAttribute (Gdk.Color color, uint start, uint end)
{
Add (pango_attr_foreground_new (color.Red, color.Green, color.Blue), start, end);
}
public void AddBackgroundAttribute (Gdk.Color color, uint start, uint end)
{
Add (pango_attr_background_new (color.Red, color.Green, color.Blue), start, end);
}
public void AddUnderlineAttribute (Pango.Underline underline, uint start, uint end)
{
Add (pango_attr_underline_new (underline), start, end);
}
public void AddStrikethroughAttribute (bool strikethrough, uint start, uint end)
{
Add (pango_attr_strikethrough_new (strikethrough), start, end);
}
void Add (IntPtr attribute, uint start, uint end)
{
unsafe {
PangoAttribute *attPtr = (PangoAttribute *) attribute;
attPtr->start_index = start;
attPtr->end_index = end;
}
pango_attr_list_insert (list, attribute);
}
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_style_new (Pango.Style style);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_stretch_new (Pango.Stretch stretch);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_weight_new (Pango.Weight weight);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_foreground_new (ushort red, ushort green, ushort blue);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_background_new (ushort red, ushort green, ushort blue);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_underline_new (Pango.Underline underline);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_strikethrough_new (bool strikethrough);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_attr_list_new ();
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_attr_list_unref (IntPtr list);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_attr_list_insert (IntPtr list, IntPtr attr);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_layout_set_attributes (IntPtr layout, IntPtr attrList);
[DllImport (PangoUtil.LIBPANGO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_attr_list_splice (IntPtr attr_list, IntPtr other, Int32 pos, Int32 len);
public void Splice (Pango.AttrList attrs, int pos, int len)
{
pango_attr_list_splice (list, attrs.Handle, pos, len);
}
public void AssignTo (Pango.Layout layout)
{
pango_layout_set_attributes (layout.Handle, list);
}
[StructLayout (LayoutKind.Sequential)]
struct PangoAttribute
{
public IntPtr klass;
public uint start_index;
public uint end_index;
}
public void Dispose ()
{
if (list != IntPtr.Zero) {
GC.SuppressFinalize (this);
Destroy ();
}
}
//NOTE: the list destroys all its attributes when the ref count reaches zero
void Destroy ()
{
pango_attr_list_unref (list);
list = IntPtr.Zero;
}
~FastPangoAttrList ()
{
GLib.Idle.Add (delegate {
Destroy ();
return false;
});
}
}
public override int GetIndexFromCoordinates (object backend, double x, double y)
{
Pango.Layout tl = (Pango.Layout) backend;
int index, trailing;
tl.XyToIndex ((int)x, (int)y, out index, out trailing);
// TODO: UTF-8 coordinate transformation
return index;
}
public override Rectangle GetExtendsFromIndex (object backend, int index)
{
Pango.Layout tl = (Pango.Layout) backend;
// TODO: UTF-8 coordinate transformation
var pos = tl.IndexToPos (index);
return new Rectangle (pos.X, pos.Y, pos.Width, pos.Height);
} |
<<<<<<<
public override void SetTextAttributes(object backend, IEnumerable<TextAttribute> textAttributes)
{
throw new NotImplementedException ();
}
=======
public override Rectangle GetExtendsFromIndex (object backend, int index)
{
throw new NotImplementedException ();
}
>>>>>>>
public override void SetTextAttributes(object backend, IEnumerable<TextAttribute> textAttributes)
{
throw new NotImplementedException ();
}
public override Rectangle GetExtendsFromIndex (object backend, int index)
{
throw new NotImplementedException ();
} |
<<<<<<<
public void SetTextAttributes(params TextAttribute[] textAttributes)
{
handler.SetTextAttributes (Backend, textAttributes);
}
public void SetTextAttributes(IEnumerable<TextAttribute> textAttributes)
{
handler.SetTextAttributes (Backend, textAttributes);
}
=======
/// <summary>
/// Converts from a X and Y position within the layout to the character at this position.
/// </summary>
/// <returns>The index of the character.</returns>
/// <param name="x">The x coordinate.</param>
/// <param name="y">The y coordinate.</param>
public int GetIndexFromCoordinates (double x, double y)
{
return handler.GetIndexFromCoordinates (Backend, x, y);
}
/// <summary>
/// Converts from a Position within the layout to the character at this position.
/// </summary>
/// <returns>The index of the character.</returns>
/// <param name="p">The position.</param>
public int GetIndexFromCoordinates (Point p)
{
return handler.GetIndexFromCoordinates (Backend, p.X, p.Y);
}
/// <summary>
/// Obtains the graphical rectangle of an character in the layout.
/// </summary>
/// <returns>The extends from the character at index.</returns>
/// <param name="index">The index of the character.</param>
public Rectangle GetExtendsFromIndex (int index)
{
return handler.GetExtendsFromIndex (Backend, index);
}
>>>>>>>
public void SetTextAttributes(params TextAttribute[] textAttributes)
{
handler.SetTextAttributes (Backend, textAttributes);
}
public void SetTextAttributes(IEnumerable<TextAttribute> textAttributes)
{
handler.SetTextAttributes (Backend, textAttributes);
}
/// <summary>
/// Converts from a X and Y position within the layout to the character at this position.
/// </summary>
/// <returns>The index of the character.</returns>
/// <param name="x">The x coordinate.</param>
/// <param name="y">The y coordinate.</param>
public int GetIndexFromCoordinates (double x, double y)
{
return handler.GetIndexFromCoordinates (Backend, x, y);
}
/// <summary>
/// Converts from a Position within the layout to the character at this position.
/// </summary>
/// <returns>The index of the character.</returns>
/// <param name="p">The position.</param>
public int GetIndexFromCoordinates (Point p)
{
return handler.GetIndexFromCoordinates (Backend, p.X, p.Y);
}
/// <summary>
/// Obtains the graphical rectangle of an character in the layout.
/// </summary>
/// <returns>The extends from the character at index.</returns>
/// <param name="index">The index of the character.</param>
public Rectangle GetExtendsFromIndex (int index)
{
return handler.GetExtendsFromIndex (Backend, index);
} |
<<<<<<<
=======
#region Constructors
/// <summary>
/// Initializes a new instance of the <see cref="TwitterRateLimitStatus"/> class.
/// </summary>
public TwitterRateLimitStatus()
{
}
/// <summary>
/// Initializes a new instance of the <see cref="TwitterRateLimitStatus"/> class.
/// </summary>
/// <param name="tokens">OAuth access tokens.</param>
protected TwitterRateLimitStatus(OAuthTokens tokens)
: base()
{
this.Tokens = tokens;
}
#endregion
>>>>>>> |
<<<<<<<
=======
rules.GrantToRoles.Each(role =>
{
writer.WriteLine($"GRANT SELECT ({Columns.Select(x => x.Name).Join(", ")}) ON TABLE {Table.QualifiedName} TO \"{role}\";");
});
writer.WriteLine(this.OriginStatement());
>>>>>>>
writer.WriteLine(this.OriginStatement()); |
<<<<<<<
int id;
if (int.TryParse(word, NumberStyles.Integer, CultureInfo.InvariantCulture, out id))
{
var vehicle = BaseVehicle.Find(id);
if (vehicle != null)
{
output = vehicle;
commandText = commandText.Substring(word.Length).TrimStart(' ');
return true;
}
}
return ignoreUsage;
=======
if (!int.TryParse(word, NumberStyles.Integer, CultureInfo.InvariantCulture, out var id))
return false;
var vehicle = BaseVehicle.Find(id);
if (vehicle == null)
return false;
output = vehicle;
commandText = commandText.Substring(word.Length).TrimStart(' ');
return true;
>>>>>>>
if (!int.TryParse(word, NumberStyles.Integer, CultureInfo.InvariantCulture, out var id))
return false;
var vehicle = BaseVehicle.Find(id);
if (vehicle == null)
return ignoreUsage;
output = vehicle;
commandText = commandText.Substring(word.Length).TrimStart(' ');
return true; |
<<<<<<<
if (ioDoneEvent.CurrentCount == 0)
ioDoneEvent.Reset(1);
else
ioDoneEvent.AddCount();
//How to read from Queue while writing to disk?
=======
>>>>>>>
if (ioDoneEvent.CurrentCount == 0)
ioDoneEvent.Reset(1);
else
ioDoneEvent.AddCount(); |
<<<<<<<
using Sitecore.Feature.Accounts.Texts;
using Sitecore.Foundation.Alerts.Extensions;
using Sitecore.Foundation.Alerts.Models;
=======
using Sitecore.Foundation.Dictionary.Repositories;
>>>>>>>
using Sitecore.Foundation.Dictionary.Repositories;
using Sitecore.Foundation.Alerts.Extensions;
using Sitecore.Foundation.Alerts.Models;
<<<<<<<
this.Session["EditProfileMessage"] = new InfoMessage(Captions.EditProfileSuccess);
return this.Redirect(this.Request.RawUrl);
=======
this.Session["EditProfileMessage"] = new InfoMessage(DictionaryPhraseRepository.Current.Get("/Accounts/Edit Profile/Edit Profile Success", "Profile was successfully updated"));
return this.Redirect(Request.RawUrl);
>>>>>>>
this.Session["EditProfileMessage"] = new InfoMessage(DictionaryPhraseRepository.Current.Get("/Accounts/Edit Profile/Edit Profile Success", "Profile was successfully updated"));
return this.Redirect(this.Request.RawUrl); |
<<<<<<<
[AutoDbData]
public void RestorePassword_ValidUser_ShouldCallResetPassword(FakeMembershipUser user, MembershipProvider membershipProvider, AccountRepository repo)
=======
[AutoFakeUserData]
public void RestorePasswordShouldCallResetPassword(FakeMembershipUser user, MembershipProvider membershipProvider, AccountRepository repo)
>>>>>>>
[AutoFakeUserData]
public void RestorePassword_ValidUser_ShouldCallResetPassword(FakeMembershipUser user, MembershipProvider membershipProvider, AccountRepository repo)
<<<<<<<
[AutoDbData]
public void RestorePassword_ValidUser_ShouldReturnsNewPassword(FakeMembershipUser user, MembershipProvider membershipProvider, AccountRepository repo)
=======
[AutoFakeUserData]
public void RestorePasswordShouldReturnsNewPassword(FakeMembershipUser user, MembershipProvider membershipProvider, AccountRepository repo)
>>>>>>>
[AutoFakeUserData]
public void RestorePassword_ValidUser_ShouldReturnsNewPassword(FakeMembershipUser user, MembershipProvider membershipProvider, AccountRepository repo)
<<<<<<<
[AutoDbData]
public void RegisterUser_ValidData_ShouldCreateUserWithEmailAndPassword(FakeMembershipUser user, MembershipProvider membershipProvider, RegistrationInfo registrationInfo, string userProfile, AccountRepository repository)
=======
[AutoFakeUserData]
public void RegisterShouldCreateUserWithEmailAndPassword(FakeMembershipUser user, MembershipProvider membershipProvider, RegistrationInfo registrationInfo, string userProfile, AccountRepository repository)
>>>>>>>
[AutoFakeUserData]
public void RegisterUser_ValidData_ShouldCreateUserWithEmailAndPassword(FakeMembershipUser user, MembershipProvider membershipProvider, RegistrationInfo registrationInfo, string userProfile, AccountRepository repository)
<<<<<<<
[AutoDbData]
public void RegisterUser_ValidData_ShouldCreateLoginUser(FakeMembershipUser user, [Substitute] MembershipProvider membershipProvider, [Substitute] AuthenticationProvider authenticationProvider, RegistrationInfo registrationInfo, AccountRepository repository, string profileId)
=======
[AutoFakeUserData]
public void RegisterShouldCreateLoginUser(FakeMembershipUser user, [Substitute] MembershipProvider membershipProvider, [Substitute] AuthenticationProvider authenticationProvider, RegistrationInfo registrationInfo, AccountRepository repository, string profileId)
>>>>>>>
[AutoFakeUserData]
public void RegisterUser_ValidData_ShouldCreateLoginUser(FakeMembershipUser user, [Substitute] MembershipProvider membershipProvider, [Substitute] AuthenticationProvider authenticationProvider, RegistrationInfo registrationInfo, AccountRepository repository, string profileId)
<<<<<<<
[AutoDbData]
public void Register_ValidUser_ShouldTrackRegistraionEvents(FakeMembershipUser user, [Substitute] MembershipProvider membershipProvider, [Substitute] AuthenticationProvider authenticationProvider, RegistrationInfo registrationInfo, [Frozen] IAccountTrackerService accountTrackerService, AccountRepository repository, string profileId)
=======
[AutoFakeUserData]
public void Register_ValidUser_ShouldTrackRegistraionEvents(FakeMembershipUser user, [Substitute]MembershipProvider membershipProvider, [Substitute]AuthenticationProvider authenticationProvider, RegistrationInfo registrationInfo, [Frozen]IAccountTrackerService accountTrackerService, AccountRepository repository, string profileId)
>>>>>>>
[AutoFakeUserData]
public void Register_ValidUser_ShouldTrackRegistraionEvents(FakeMembershipUser user, [Substitute] MembershipProvider membershipProvider, [Substitute] AuthenticationProvider authenticationProvider, RegistrationInfo registrationInfo, [Frozen] IAccountTrackerService accountTrackerService, AccountRepository repository, string profileId) |
<<<<<<<
//bool waitingReload = true;
public void OnGUI()
=======
int patchCount = 0;
public void Update()
>>>>>>>
int patchCount = 0;
public void Update()
<<<<<<<
if (currentAssembly.Location != a.path)
candidates += "Version " + a.assembly.GetName().Version + " " + a.path + " " + "\n";
if (candidates.Length > 0)
print("[ModuleManager] version " + currentAssembly.GetName().Version + " at " + currentAssembly.Location + " won the election against\n" + candidates);
}
=======
candidates += "Version " + a.assembly.GetName().Version + " " + a.path + " " + "\n";
print("[ModuleManager] version " + currentAssembly.GetName().Version + " at " + currentAssembly.Location + " won the election against\n" + candidates);
}
>>>>>>>
if (currentAssembly.Location != a.path)
candidates += "Version " + a.assembly.GetName().Version + " " + a.path + " " + "\n";
if (candidates.Length > 0)
print("[ModuleManager] version " + currentAssembly.GetName().Version + " at " + currentAssembly.Location + " won the election against\n" + candidates);
}
<<<<<<<
ApplyPatch(excludePaths, false);
=======
patchCount = 0;
applyPatch(excludePaths, false);
>>>>>>>
patchCount = 0;
ApplyPatch(excludePaths, false);
<<<<<<<
ApplyPatch(excludePaths, true);
=======
applyPatch(excludePaths, true);
print("[ModuleManager] Applied " + patchCount + " patch");
>>>>>>>
ApplyPatch(excludePaths, true);
print("[ModuleManager] Applied " + patchCount + " patch"); |
<<<<<<<
this.contextMenuStrip.Size = new System.Drawing.Size(150, 120);
this.contextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip_Opening);
=======
this.contextMenuStrip.Size = new System.Drawing.Size(153, 142);
>>>>>>>
this.contextMenuStrip.Size = new System.Drawing.Size(153, 142);
<<<<<<<
private System.Windows.Forms.ToolStripMenuItem elevateClientPermissionsToolStripMenuItem;
=======
private System.Windows.Forms.ToolStripMenuItem connectionsToolStripMenuItem;
>>>>>>>
private System.Windows.Forms.ToolStripMenuItem elevateClientPermissionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem connectionsToolStripMenuItem; |
<<<<<<<
}
return image;
}
/// <summary>
/// Returns the correct <see cref="Size"/> for the given string.
/// </summary>
/// <param name="input">
/// The input string containing the value to parse.
/// </param>
/// <returns>
/// The <see cref="Size"/>.
/// </returns>
private Size ParseSize(string input)
{
const string Width = "width=";
const string Height = "height=";
const string WidthRatio = "widthratio=";
const string HeightRatio = "heightratio=";
Size size = new Size();
// First merge the matches so we can parse .
StringBuilder stringBuilder = new StringBuilder();
foreach (Match match in SizeRegex.Matches(input))
{
stringBuilder.Append(match.Value);
}
// First cater for single dimensions.
string value = stringBuilder.ToString();
if (input.Contains(Width) && !input.Contains(Height))
{
size = new Size(value.ToPositiveIntegerArray()[0], 0);
}
if (input.Contains(Height) && !input.Contains(Width))
{
size = new Size(0, value.ToPositiveIntegerArray()[0]);
}
// Both dimensions supplied.
if (input.Contains(Height) && input.Contains(Width))
{
int[] dimensions = value.ToPositiveIntegerArray();
// Check the order in which they have been supplied.
size = input.IndexOf(Width, StringComparison.Ordinal) < input.IndexOf(Height, StringComparison.Ordinal)
? new Size(dimensions[0], dimensions[1])
: new Size(dimensions[1], dimensions[0]);
}
// Calculate any ratio driven sizes.
if (size.Width == 0 || size.Height == 0)
{
stringBuilder.Clear();
foreach (Match match in RatioRegex.Matches(input))
{
stringBuilder.Append(match.Value);
}
value = stringBuilder.ToString();
// Replace 0 width
if (size.Width == 0 && size.Height > 0 && input.Contains(WidthRatio) && !input.Contains(HeightRatio))
{
size.Width = (int)Math.Ceiling(value.ToPositiveFloatArray()[0] * size.Height);
}
// Replace 0 height
if (size.Height == 0 && size.Width > 0 && input.Contains(HeightRatio) && !input.Contains(WidthRatio))
{
size.Height = (int)Math.Ceiling(value.ToPositiveFloatArray()[0] * size.Width);
}
}
return size;
}
/// <summary>
/// Returns the correct <see cref="ResizeMode"/> for the given string.
/// </summary>
/// <param name="input">
/// The input string containing the value to parse.
/// </param>
/// <returns>
/// The correct <see cref="ResizeMode"/>.
/// </returns>
private ResizeMode ParseMode(string input)
{
foreach (Match match in ModeRegex.Matches(input))
{
// Split on =
string mode = match.Value.Split('=')[1];
switch (mode)
{
case "stretch":
return ResizeMode.Stretch;
case "crop":
return ResizeMode.Crop;
case "max":
return ResizeMode.Max;
default:
return ResizeMode.Pad;
}
}
return ResizeMode.Pad;
}
/// <summary>
/// Returns the correct <see cref="AnchorPosition"/> for the given string.
/// </summary>
/// <param name="input">
/// The input string containing the value to parse.
/// </param>
/// <returns>
/// The correct <see cref="AnchorPosition"/>.
/// </returns>
private AnchorPosition ParsePosition(string input)
{
foreach (Match match in AnchorRegex.Matches(input))
{
// Split on =
string anchor = match.Value.Split('=')[1];
=======
>>>>>>> |
<<<<<<<
}
return image;
}
/// <summary>
/// Returns the correct <see cref="Size"/> for the given string.
/// </summary>
/// <param name="input">
/// The input string containing the value to parse.
/// </param>
/// <returns>
/// The <see cref="Size"/>.
/// </returns>
private Size ParseSize(string input)
{
const string Width = "width=";
const string Height = "height=";
const string WidthRatio = "widthratio=";
const string HeightRatio = "heightratio=";
Size size = new Size();
// First merge the matches so we can parse .
StringBuilder stringBuilder = new StringBuilder();
foreach (Match match in SizeRegex.Matches(input))
{
stringBuilder.Append(match.Value);
}
// First cater for single dimensions.
string value = stringBuilder.ToString();
if (input.Contains(Width) && !input.Contains(Height))
{
size = new Size(value.ToPositiveIntegerArray()[0], 0);
}
if (input.Contains(Height) && !input.Contains(Width))
{
size = new Size(0, value.ToPositiveIntegerArray()[0]);
}
// Both dimensions supplied.
if (input.Contains(Height) && input.Contains(Width))
{
int[] dimensions = value.ToPositiveIntegerArray();
// Check the order in which they have been supplied.
size = input.IndexOf(Width, StringComparison.Ordinal) < input.IndexOf(Height, StringComparison.Ordinal)
? new Size(dimensions[0], dimensions[1])
: new Size(dimensions[1], dimensions[0]);
}
// Calculate any ratio driven sizes.
if (size.Width == 0 || size.Height == 0)
{
stringBuilder.Clear();
foreach (Match match in RatioRegex.Matches(input))
{
stringBuilder.Append(match.Value);
}
value = stringBuilder.ToString();
// Replace 0 width
if (size.Width == 0 && size.Height > 0 && input.Contains(WidthRatio) && !input.Contains(HeightRatio))
{
size.Width = (int)Math.Ceiling(value.ToPositiveFloatArray()[0] * size.Height);
}
// Replace 0 height
if (size.Height == 0 && size.Width > 0 && input.Contains(HeightRatio) && !input.Contains(WidthRatio))
{
size.Height = (int)Math.Ceiling(value.ToPositiveFloatArray()[0] * size.Width);
}
}
return size;
}
/// <summary>
/// Returns the correct <see cref="ResizeMode"/> for the given string.
/// </summary>
/// <param name="input">
/// The input string containing the value to parse.
/// </param>
/// <returns>
/// The correct <see cref="ResizeMode"/>.
/// </returns>
private ResizeMode ParseMode(string input)
{
foreach (Match match in ModeRegex.Matches(input))
{
// Split on =
string mode = match.Value.Split('=')[1];
switch (mode)
{
case "stretch":
return ResizeMode.Stretch;
case "crop":
return ResizeMode.Crop;
case "max":
return ResizeMode.Max;
default:
return ResizeMode.Pad;
}
}
return ResizeMode.Pad;
}
/// <summary>
/// Returns the correct <see cref="AnchorPosition"/> for the given string.
/// </summary>
/// <param name="input">
/// The input string containing the value to parse.
/// </param>
/// <returns>
/// The correct <see cref="AnchorPosition"/>.
/// </returns>
private AnchorPosition ParsePosition(string input)
{
foreach (Match match in AnchorRegex.Matches(input))
{
// Split on =
string anchor = match.Value.Split('=')[1];
=======
>>>>>>> |
<<<<<<<
/// <summary />
protected MvpPage()
{
AutoDataBind = true;
}
/// <summary>
/// Gets a value indicating whether the page should automatically data bind itself at the Page.PreRenderComplete event.
/// </summary>
/// <value><c>true</c> if auto data binding is enabled (default); otherwise, <c>false</c>.</value>
protected bool AutoDataBind { get; set; }
=======
bool throwExceptionIfNoPresenterBound;
bool registeredWithPageViewHost;
/// <summary />
protected MvpPage()
{
ThrowExceptionIfNoPresenterBound = true;
}
/// <summary>
/// Gets or sets whether the runtime should throw an exception if a presenter is not bound to this control.
/// </summary>
/// <value><c>true</c> if an exception should be thrown (default); otherwise, <c>false</c>.</value>
public bool ThrowExceptionIfNoPresenterBound
{
get
{
return throwExceptionIfNoPresenterBound;
}
set
{
if (registeredWithPageViewHost)
{
throw new InvalidOperationException("ThrowExceptionIfNoPresenterBound can only be set prior to the control's Init event. The best place to set it is in the control's constructor.");
}
throwExceptionIfNoPresenterBound = value;
}
}
>>>>>>>
bool throwExceptionIfNoPresenterBound;
bool registeredWithPageViewHost;
/// <summary />
protected MvpPage()
{
AutoDataBind = true;
ThrowExceptionIfNoPresenterBound = true;
}
/// <summary>
/// Gets or sets whether the runtime should throw an exception if a presenter is not bound to this control.
/// </summary>
/// <value><c>true</c> if an exception should be thrown (default); otherwise, <c>false</c>.</value>
public bool ThrowExceptionIfNoPresenterBound
{
get
{
return throwExceptionIfNoPresenterBound;
}
set
{
if (registeredWithPageViewHost)
{
throw new InvalidOperationException("ThrowExceptionIfNoPresenterBound can only be set prior to the control's Init event. The best place to set it is in the control's constructor.");
}
throwExceptionIfNoPresenterBound = value;
}
}
<<<<<<<
PageViewHost.Register(this, Context, AutoDataBind);
=======
registeredWithPageViewHost = true;
PageViewHost.Register(this, Context);
>>>>>>>
PageViewHost.Register(this, Context, AutoDataBind);
registeredWithPageViewHost = true; |
<<<<<<<
=======
using Metrics;
using Metrics.Json;
using Metrics.Reporters;
using Metrics.Utils;
using Metrics.Visualization;
>>>>>>>
using Metrics;
using Metrics.Json;
using Metrics.Reporters;
using Metrics.Utils;
using Metrics.Visualization; |
<<<<<<<
using System.Text.RegularExpressions;
=======
using Metrics;
using Metrics.Utils;
>>>>>>>
using Metrics;
using System.Text.RegularExpressions;
using Metrics.Utils;
<<<<<<<
public TimerForEachRequestMiddleware(MetricsRegistry registry, string metricPrefix, Regex[] ignorePatterns)
: base(ignorePatterns)
=======
public TimerForEachRequestMiddleware(MetricsContext context, string metricPrefix)
>>>>>>>
public TimerForEachRequestMiddleware(MetricsContext context, string metricPrefix, Regex[] ignorePatterns)
: base(ignorePatterns)
<<<<<<<
await next(environment);
=======
var httpRequestPath = environment["owin.RequestPath"].ToString().ToUpper();
var name = string.Format("{0}.{1} [{2}]", metricPrefix, httpMethod, httpRequestPath);
var startTime = (long)environment[RequestStartTimeKey];
var elapsed = Clock.Default.Nanoseconds - startTime;
this.context.Timer(name, Unit.Requests, SamplingType.FavourRecent, TimeUnit.Seconds, TimeUnit.Milliseconds).Record(elapsed, TimeUnit.Nanoseconds);
>>>>>>>
await next(environment); |
<<<<<<<
using System.Text.RegularExpressions;
=======
using Metrics;
>>>>>>>
using Metrics.Core;
<<<<<<<
public ActiveRequestCounterMiddleware(MetricsRegistry registry, string metricName, Regex[] ignorePatterns)
: base(ignorePatterns)
=======
public ActiveRequestCounterMiddleware(MetricsContext context, string metricName)
>>>>>>>
public ActiveRequestCounterMiddleware(MetricsContext context, string metricName)
: base(ignorePatterns) |
<<<<<<<
using System.Text.RegularExpressions;
=======
using Metrics;
>>>>>>>
using Metrics;
using System.Text.RegularExpressions;
<<<<<<<
public PostAndPutRequestSizeHistogramMiddleware(MetricsRegistry registry, string metricName, Regex[] ignorePatterns)
: base(ignorePatterns)
=======
public PostAndPutRequestSizeHistogramMiddleware(MetricsContext context, string metricName)
>>>>>>>
public PostAndPutRequestSizeHistogramMiddleware(MetricsContext context, string metricName)
: base(ignorePatterns) |
<<<<<<<
kernel.Bind<IPaths>().To<UacCompliantPaths>().InSingletonScope();
kernel.Bind<IParser>().To<Common.CommandLine.Parser>();
=======
>>>>>>>
kernel.Bind<IParser>().To<Common.CommandLine.Parser>(); |
<<<<<<<
_npcMonsters[npcMonster.NpcMonsterVNum] = npcMonster as NpcMonster;
});
_npcs.AddRange(_npcMonsters.GetAllItems());
=======
NpcMonster npc = npcmonsterDTO as NpcMonster;
npc.BCards = new List<BCard>();
DAOFactory.BCardDAO.LoadByNpcMonsterVNum(npc.NpcMonsterVNum).ToList().ForEach(s => npc.BCards.Add((BCard)s));
_npcs.Add(npc);
}
>>>>>>>
_npcMonsters[npcMonster.NpcMonsterVNum] = npcMonster as NpcMonster;
_npcMonsters[npcMonster.NpcMonsterVNum].BCards = new List<BCard>();
DAOFactory.BCardDAO.LoadByNpcMonsterVNum(npc.NpcMonsterVNum).ToList().ForEach(s => _npcMonsters[npcMonster.NpcMonsterVNum].BCards.Add((BCard)s));
});
_npcs.AddRange(_npcMonsters.GetAllItems());
<<<<<<<
Skill skillObj = skill as Skill;
skillObj.Combos.AddRange(DAOFactory.ComboDAO.LoadBySkillVnum(skillObj.SkillVNum).ToList());
_skill[skillObj.SkillVNum] = skillObj as Skill;
});
_skills.AddRange(_skill.GetAllItems());
=======
Skill skill = (Skill)skillDTO;
skill.Combos.AddRange(DAOFactory.ComboDAO.LoadBySkillVnum(skill.SkillVNum).ToList());
skill.BCards = new List<BCard>();
DAOFactory.BCardDAO.LoadBySkillVNum(skill.SkillVNum).ToList().ForEach(o => skill.BCards.Add((BCard)o));
_skills.Add(skill);
}
>>>>>>>
Skill skillObj = skill as Skill;
skillObj.Combos.AddRange(DAOFactory.ComboDAO.LoadBySkillVnum(skillObj.SkillVNum).ToList());
skillObj.BCards = new List<BCard>
DAOFactory.BCardDAO.LoadBySkillVNum(skillObj.SkillVNum).ToList().ForEach(o => skillObj.BCards.Add((BCard)o));
_skill[skillObj.SkillVNum] = skillObj as Skill;
});
_skills.AddRange(_skill.GetAllItems());
<<<<<<<
newMap.LoadMonsters();
=======
newMap.LoadPortals();
foreach (MapMonster mapMonster in newMap.Monsters)
{
mapMonster.MapInstance = newMap;
mapMonster.Monster.BCards.ForEach(c => c.ApplyBCards(mapMonster));
newMap.AddMonster(mapMonster);
}
>>>>>>>
newMap.LoadMonsters();
<<<<<<<
public void RaidDisolve(ClientSession session, Raid raid = null)
{
if (raid == null)
{
raid = Instance.Raids.FirstOrDefault(s => s.IsMemberOfRaid(session.Character.CharacterId));
}
if (raid == null)
{
return;
}
Parallel.ForEach(raid.Characters, targetSession =>
{
targetSession.SendPacket(UserInterfaceHelper.Instance.GenerateMsg(Language.Instance.GetMessageFromKey("RAID_CLOSED"), 0));
raid.Leave(targetSession);
});
raid.DestroyRaid();
}
public void RaidLeave(ClientSession session)
{
if (session == null || Raids == null)
{
return;
}
Raid raid = Instance.Raids.FirstOrDefault(s => s.IsMemberOfRaid(session.Character.CharacterId));
if (raid != null)
{
if (raid.Characters.Count > 1)
{
if (raid.Leader != session)
{
raid.Leave(session);
}
else
{
raid.Leave(raid.Leader);
raid.Leader.SendPacket($"say 1 {raid.Leader.Character.CharacterId} 10 {Language.Instance.GetMessageFromKey("RAID_NEW_LEADER")}"); raid.Leader.SendPacket(UserInterfaceHelper.Instance.GenerateMsg(Language.Instance.GetMessageFromKey("RAID_NEW_LEADER"), 0));
raid.Leader.SendPacket(UserInterfaceHelper.Instance.GenerateMsg(string.Format(Language.Instance.GetMessageFromKey("LEAVE_RAID"), session.Character.Name), 0));
}
session.SendPacket(UserInterfaceHelper.Instance.GenerateMsg(Language.Instance.GetMessageFromKey("RAID_LEFT"), 0));
raid.UpdateVisual();
}
else
{
RaidDisolve(session, raid);
}
}
}
=======
>>>>>>>
<<<<<<<
Parallel.ForEach(_mapinstances, map =>
=======
Raids = new List<ScriptedInstance>();
foreach (var map in _mapinstances)
>>>>>>>
Raids = new List<ScriptedInstance>();
Parallel.ForEach(_mapinstances, map => |
<<<<<<<
using AsmResolver.DotNet.Signatures.Types.Parsing;
=======
using System.Reflection;
>>>>>>>
using System.Reflection;
using AsmResolver.DotNet.Signatures.Types.Parsing; |
<<<<<<<
return new SerializedPEFile(reader, mode);
=======
// DOS header.
var dosHeader = DosHeader.FromReader(reader);
reader.FileOffset = dosHeader.NextHeaderOffset;
uint signature = reader.ReadUInt32();
if (signature != ValidPESignature)
throw new BadImageFormatException();
// Read NT headers.
var peFile = new PEFile(
dosHeader,
FileHeader.FromReader(reader),
OptionalHeader.FromReader(reader));
// Section headers.
reader.FileOffset = peFile.OptionalHeader.FileOffset + peFile.FileHeader.SizeOfOptionalHeader;
for (int i = 0; i < peFile.FileHeader.NumberOfSections; i++)
{
var header = SectionHeader.FromReader(reader);
DataSegment contents = null;
if (header.SizeOfRawData > 0)
{
var contentsReader = reader.Fork(header.PointerToRawData, header.SizeOfRawData);
contents = DataSegment.FromReader(contentsReader);
}
var virtualSegment = new VirtualSegment(contents, header.VirtualSize);
virtualSegment.UpdateOffsets(header.PointerToRawData, header.VirtualAddress);
peFile.Sections.Add(new PESection(header, virtualSegment));
}
// Data between section headers and sections.
int extraSectionDataLength = (int) (peFile.OptionalHeader.SizeOfHeaders - reader.FileOffset);
if (extraSectionDataLength != 0)
peFile.ExtraSectionData = DataSegment.FromReader(reader, extraSectionDataLength);
return peFile;
>>>>>>>
return new SerializedPEFile(reader, mode);
<<<<<<<
ulong fileOffset = i > 0
? Sections[i - 1].Offset + Sections[i - 1].GetPhysicalSize()
: OptionalHeader.SizeOfHeaders;
=======
>>>>>>>
<<<<<<<
writer.Offset = section.Offset;
section.Contents.Write(writer);
=======
writer.FileOffset = section.FileOffset;
section.Contents?.Write(writer);
>>>>>>>
writer.Offset = section.Offset;
section.Contents?.Write(writer); |
<<<<<<<
/// データセットをローカルコピーするか否か。
/// true：ローカルコピーする false：ローカルコピーしない(シンボリックリンクを作成する)
/// </summary>
public bool LocalDataSet { get; set; }
/// <summary>
=======
/// エントリポイント。
/// ノートブック起動時に実行されるスクリプト。
/// </summary>
public string EntryPoint { get; set; }
/// <summary>
>>>>>>>
/// データセットをローカルコピーするか否か。
/// true：ローカルコピーする false：ローカルコピーしない(シンボリックリンクを作成する)
/// </summary>
public bool LocalDataSet { get; set; }
/// <summary>
/// エントリポイント。
/// ノートブック起動時に実行されるスクリプト。
/// </summary>
public string EntryPoint { get; set; }
/// <summary> |
<<<<<<<
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
namespace Nssol.Platypus.ApiModels.TrainingApiModels
=======
namespace Nssol.Platypus.ApiModels.TrainingApiModels
>>>>>>>
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
namespace Nssol.Platypus.ApiModels.TrainingApiModels
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
/// <summary>
/// 親学習ID
/// </summary>
public string ParentId { get; set; }
/// <summary>
/// 親学習名
/// </summary>
public string ParentName { get; set; }
>>>>>>>
/// <summary>
/// 親学習ID
/// </summary>
public string ParentId { get; set; }
/// <summary>
/// 親学習名
/// </summary>
public string ParentName { get; set; }
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
Tags = history.Tags;
=======
if (history.ParentMaps != null && history.ParentMaps.Count > 0)
{
List<string> parentFullNameList = new List<string>();
foreach (TrainingHistoryParentMap parentMap in history.ParentMaps)
{
parentFullNameList.Add($"{parentMap.Parent.Id}:{parentMap.Parent.Name}");
}
ParentFullNameList = parentFullNameList;
}
>>>>>>>
if (history.ParentMaps != null && history.ParentMaps.Count > 0)
{
List<string> parentFullNameList = new List<string>();
foreach (TrainingHistoryParentMap parentMap in history.ParentMaps)
{
parentFullNameList.Add($"{parentMap.Parent.Id}:{parentMap.Parent.Name}");
}
ParentFullNameList = parentFullNameList;
}
Tags = history.Tags;
<<<<<<<
/// <summary>
/// タグ
/// </summary>
public IEnumerable<string> Tags { get; set; }
=======
/// <summary>
/// 親学習名（表示用）
/// </summary>
public List<string> ParentFullNameList { get; set; }
>>>>>>>
/// <summary>
/// 親学習名（表示用）
/// </summary>
public List<string> ParentFullNameList { get; set; }
/// <summary>
/// タグ
/// </summary>
public IEnumerable<string> Tags { get; set; } |
<<<<<<<
public async Task<IActionResult> DeleteTenantAsync(long id)
=======
public async Task<IActionResult> DeleteTenantAsync(long id, [FromBody] DeleteInputModel model, [FromServices] INodeRepository nodeRepository)
>>>>>>>
public async Task<IActionResult> DeleteTenantAsync(long id, [FromServices] INodeRepository nodeRepository) |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.