conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
msbuildProject.ToolsVersion = "14.0";
=======
msbuildProject = new MSBuildProject ();
msbuildProject.ToolsVersion = GetToolsVersion ();
>>>>>>>
msbuildProject.ToolsVersion = GetToolsVersion (); |
<<<<<<<
[assembly:AddinDependency ("Core", "6.0")]
[assembly:AddinDependency ("Ide", "6.0")]
[assembly:AddinDependency ("DesignerSupport", "6.0")]
[assembly:AddinDependency ("Debugger", "6.0")]
[assembly:AddinDependency ("Debugger.Soft", "6.0")]
=======
[assembly:AddinDependency ("Core", "5.9")]
[assembly:AddinDependency ("Ide", "5.9")]
[assembly:AddinDependency ("DesignerSupport", "5.9")]
[assembly:AddinDependency ("Debugger", "5.9")]
[assembly:AddinDependency ("Debugger.Soft", "5.9")]
[assembly:AddinDependency ("SourceEditor2", "5.9")]
>>>>>>>
[assembly:AddinDependency ("Core", "6.0")]
[assembly:AddinDependency ("Ide", "6.0")]
[assembly:AddinDependency ("DesignerSupport", "6.0")]
[assembly:AddinDependency ("Debugger", "6.0")]
[assembly:AddinDependency ("Debugger.Soft", "6.0")]
[assembly:AddinDependency ("SourceEditor2", "6.0")] |
<<<<<<<
using System.Linq;
using System.Xml;
using MonoDevelop.Core;
using MonoDevelop.Projects.MSBuild;
=======
using System.Reflection;
using System.Xml;
using MonoDevelop.Core;
using MonoDevelop.Projects.Formats.MSBuild;
>>>>>>>
using System.Linq;
using System.Reflection;
using System.Xml;
using MonoDevelop.Core;
using MonoDevelop.Projects.MSBuild; |
<<<<<<<
MSBuildPropertyGroup globals = AddGlobalsProperties (projectGuid, rootNamespace);
=======
AddDotNetCoreProps ();
AddGlobalsProperties (projectGuid, rootNamespace);
>>>>>>>
MSBuildPropertyGroup globals = AddGlobalsProperties (projectGuid, rootNamespace);
<<<<<<<
AddDnxTargets ();
AddDnxProps (globals);
=======
AddDotNetTargets ();
return msbuildProject;
>>>>>>>
AddDotNetTargets ();
AddDotNetCoreProps (globals);
<<<<<<<
AddPropertyWithNotEmptyCondition (propertyGroup, "BaseIntermediateOutputPath", @"..\..\artifacts\obj\$(MSBuildProjectName)");
AddPropertyWithNotEmptyCondition (propertyGroup, "OutputPath", @"..\..\artifacts\bin\$(MSBuildProjectName)\");
return propertyGroup;
=======
AddPropertyWithNotEmptyCondition (propertyGroup, "BaseIntermediateOutputPath", @".\obj");
AddPropertyWithNotEmptyCondition (propertyGroup, "OutputPath", @".\bin\");
AddProperty (propertyGroup, "TargetFrameworkVersion", "v4.5");
>>>>>>>
AddPropertyWithNotEmptyCondition (propertyGroup, "BaseIntermediateOutputPath", @".\obj");
AddPropertyWithNotEmptyCondition (propertyGroup, "OutputPath", @".\bin\");
AddProperty (propertyGroup, "TargetFrameworkVersion", "v4.5");
return propertyGroup; |
<<<<<<<
new Dictionary<string, string> {
{ "DNX_BUILD_PORTABLE_PDB", GetDnxBuildPortablePDBValue () }
}
) {
UserAssemblyPaths = new List<string> ()
};
}
static string GetDnxBuildPortablePDBValue ()
{
if (DnxServices.IsPortablePdbSupported)
return "1";
return "0";
}
ProcessAsyncOperation IExecutionHandler.Execute (ExecutionCommand command, OperationConsole console)
{
var dotNetCommand = ConvertCommand ((DnxProjectExecutionCommand)command);
return Runtime.SystemAssemblyService.DefaultRuntime.GetExecutionHandler ().Execute (dotNetCommand, console);
=======
new Dictionary<string, string> {
{ "DNX_BUILD_PORTABLE_PDB", GetDnxBuildPortablePDBValue () }
}
) {
UserAssemblyPaths = new List<string> ()
};
}
static string GetDnxBuildPortablePDBValue ()
{
if (DnxServices.IsPortablePdbSupported)
return "1";
return "0";
}
public IProcessAsyncOperation Execute (ExecutionCommand command, IConsole console)
{
var dotNetCommand = ConvertCommand ((DnxProjectExecutionCommand)command);
return Runtime.SystemAssemblyService.DefaultRuntime.GetExecutionHandler ().Execute (dotNetCommand, console);
>>>>>>>
new Dictionary<string, string> {
{ "DNX_BUILD_PORTABLE_PDB", GetDnxBuildPortablePDBValue () }
}
) {
UserAssemblyPaths = new List<string> ()
};
}
static string GetDnxBuildPortablePDBValue ()
{
if (DnxServices.IsPortablePdbSupported)
return "1";
return "0";
}
public ProcessAsyncOperation Execute (ExecutionCommand command, OperationConsole console)
{
var dotNetCommand = ConvertCommand ((DnxProjectExecutionCommand)command);
return Runtime.SystemAssemblyService.DefaultRuntime.GetExecutionHandler ().Execute (dotNetCommand, console); |
<<<<<<<
using System.Threading.Tasks;
using Microsoft.Framework.DesignTimeHost.Models.OutgoingMessages;
=======
using Microsoft.DotNet.ProjectModel.Server.Models;
>>>>>>>
using System.Threading.Tasks;
using Microsoft.DotNet.ProjectModel.Server.Models;
<<<<<<<
ProgressMonitor monitor;
ManualResetEventSlim waitEvent = new ManualResetEventSlim ();
CancellationTokenRegistration cancelRegistration;
bool cancelled;
DiagnosticsMessage[] messages;
=======
IProgressMonitor monitor;
>>>>>>>
ProgressMonitor monitor;
<<<<<<<
cancelRegistration = this.monitor.CancellationToken.Register (CancelRequested);
}
public string ProjectPath {
get { return project.JsonPath; }
}
void CancelRequested ()
{
cancelled = true;
waitEvent.Set ();
=======
>>>>>>> |
<<<<<<<
[assembly:AddinDependency ("Core", "6.0")]
[assembly:AddinDependency ("Ide", "6.0")]
[assembly:AddinDependency ("DesignerSupport", "6.0")]
=======
[assembly:AddinDependency ("Core", "5.9")]
[assembly:AddinDependency ("Ide", "5.9")]
[assembly:AddinDependency ("DesignerSupport", "5.9")]
[assembly:AddinDependency ("Debugger", "5.9")]
[assembly:AddinDependency ("Debugger.Soft", "5.9")]
>>>>>>>
[assembly:AddinDependency ("Core", "6.0")]
[assembly:AddinDependency ("Ide", "6.0")]
[assembly:AddinDependency ("DesignerSupport", "6.0")]
[assembly:AddinDependency ("Debugger", "6.0")]
[assembly:AddinDependency ("Debugger.Soft", "6.0")] |
<<<<<<<
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.Framework.DesignTimeHost.Models.OutgoingMessages;
=======
using Microsoft.DotNet.ProjectModel.Server.Models;
>>>>>>>
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.DotNet.ProjectModel.Server.Models;
<<<<<<<
using Solution = MonoDevelop.Projects.Solution;
using System.Collections.Concurrent;
=======
>>>>>>>
using Solution = MonoDevelop.Projects.Solution;
using System.Collections.Concurrent;
<<<<<<<
ConcurrentDictionary<string, DnxProjectBuilder> builders = new ConcurrentDictionary<string, DnxProjectBuilder> ();
=======
>>>>>>>
ConcurrentDictionary<string, DnxProjectBuilder> builders = new ConcurrentDictionary<string, DnxProjectBuilder> (); |
<<<<<<<
Logger.Log(Logger.LogChannel.Warn, () => $"{instance.Id}: You should only patch implemented methods/constructors to avoid issues. Path the declared method {original.GetDeclaredMember().FullDescription()} instead of {original.FullDescription()}.");
=======
{
var declaredMember = original.GetDeclaredMember();
throw new ArgumentException($"You can only patch implemented methods/constructors. Patch the declared method {declaredMember.FullDescription()} instead.");
}
>>>>>>>
Logger.Log(Logger.LogChannel.Warn, () => $"{instance.Id}: You should only patch implemented methods/constructors to avoid issues. Patch the declared method {original.GetDeclaredMember().FullDescription()} instead of {original.FullDescription()}."); |
<<<<<<<
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || false
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
>>>>>>>
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
<<<<<<<
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || false
[global::Uno.NotImplemented]
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
>>>>>>>
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__")]
<<<<<<<
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || false
[global::Uno.NotImplemented]
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
>>>>>>>
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__")] |
<<<<<<<
var instruction = instructions[i];
if (instruction["opcode"] != null && instruction["operand"] != null)
target.Instructions[i] =
Instruction.Create((OpCode)GetInstructionField(instruction.First.ToString()).GetValue(this),
=======
if (instruction.First != null && instruction.First.Value<string>() != "")
target.Instruction =
Instruction.Create((OpCode)GetInstructionField(instruction.First.First.ToString()).GetValue(this),
>>>>>>>
var instruction = instructions[i];
if (instruction["opcode"] != null && instruction["operand"] != null)
target.Instruction =
Instruction.Create((OpCode)GetInstructionField(instruction.First.First.ToString()).GetValue(this), |
<<<<<<<
_recentsFragment = new ArticlesPageTabFragment(false);
_statsFragment = new ProfilePageStatsTabFragment();
=======
_recentsFragment = new ProfilePageRecentUpdatesFragment();
_statsFragment = new ArticlesPageTabFragment(false);
>>>>>>>
_statsFragment = new ProfilePageStatsTabFragment();
_recentsFragment = new ProfilePageRecentUpdatesFragment(); |
<<<<<<<
#region Blockchain
string GetBestBlockHash();
GetBlockResponse GetBlock(string hash, bool verbose = true);
=======
String AddMultiSigAddress(Int32 nRquired, List<String> publicKeys, String account = null);
void AddNode(String node, NodeAction action);
void BackupWallet(String destination);
CreateMultiSigResponse CreateMultiSig(Int32 nRquired, List<String> publicKeys);
String CreateRawTransaction(CreateRawTransactionRequest rawTransaction);
DecodeRawTransactionResponse DecodeRawTransaction(String rawTransactionHexString);
DecodeScriptResponse DecodeScript(String hexString);
String DumpPrivKey(String bitcoinAddress);
void DumpWallet(String filename);
String EncryptWallet(String passphrame);
Decimal EstimateFee(UInt16 nBlocks);
Decimal EstimatePriority(UInt16 nBlocks);
String GetAccount(String bitcoinAddress);
String GetAccountAddress(String account);
GetAddedNodeInfoResponse GetAddedNodeInfo(String dns, String node = null);
List<String> GetAddressesByAccount(String account);
Decimal GetBalance(String account = null, Int32 minConf = 1, Boolean? includeWatchonly = null);
String GetBestBlockHash();
GetBlockResponse GetBlock(String hash, Boolean verbose = true);
>>>>>>>
#region Blockchain
string GetBestBlockHash();
GetBlockResponse GetBlock(string hash, bool verbose = true);
<<<<<<<
=======
Int32 GetConnectionCount();
Double GetDifficulty();
Boolean GetGenerate();
Int32 GetHashesPerSec();
GetInfoResponse GetInfo();
>>>>>>>
<<<<<<<
// listbanned
=======
String GetRawChangeAddress();
GetRawMemPoolResponse GetRawMemPool(Boolean verbose = false);
GetRawTransactionResponse GetRawTransaction(String txId, Int32 verbose = 0);
Decimal GetReceivedByAccount(String account, Int32 minConf = 1);
Decimal GetReceivedByAddress(String bitcoinAddress, Int32 minConf = 1);
GetTransactionResponse GetTransaction(String txId, Boolean? includeWatchonly = null);
GetTransactionResponse GetTxOut(String txId, Int32 n, Boolean includeMemPool = true);
GetTxOutSetInfoResponse GetTxOutSetInfo();
Decimal GetUnconfirmedBalance();
GetWalletInfoResponse GetWalletInfo();
String Help(String command = null);
void ImportAddress(String address, String label = null, Boolean rescan = true);
String ImportPrivKey(String privateKey, String label = null, Boolean rescan = true);
void ImportWallet(String filename);
String KeyPoolRefill(UInt32 newSize = 100);
Dictionary<String, Decimal> ListAccounts(Int32 minConf = 1, Boolean? includeWatchonly = null);
List<List<ListAddressGroupingsResponse>> ListAddressGroupings();
String ListLockUnspent();
List<ListReceivedByAccountResponse> ListReceivedByAccount(Int32 minConf = 1, Boolean includeEmpty = false, Boolean? includeWatchonly = null);
List<ListReceivedByAddressResponse> ListReceivedByAddress(Int32 minConf = 1, Boolean includeEmpty = false, Boolean? includeWatchonly = null);
ListSinceBlockResponse ListSinceBlock(String blockHash = null, Int32 targetConfirmations = 1, Boolean? includeWatchonly = null);
List<ListTransactionsResponse> ListTransactions(String account = null, Int32 count = 10, Int32 from = 0, Boolean? includeWatchonly = null);
List<ListUnspentResponse> ListUnspent(Int32 minConf = 1, Int32 maxConf = 9999999, List<String> addresses = null);
Boolean LockUnspent(Boolean unlock, IList<ListUnspentResponse> listUnspentResponses);
Boolean Move(String fromAccount, String toAccount, Decimal amount, Int32 minConf = 1, String comment = "");
>>>>>>>
// listbanned
<<<<<<<
#endregion
#region Util
CreateMultiSigResponse CreateMultiSig(int nRquired, List<string> publicKeys);
decimal EstimateFee(ushort nBlocks);
decimal EstimatePriority(ushort nBlocks);
// estimatesmartfee
// estimatesmartpriority
ValidateAddressResponse ValidateAddress(string bitcoinAddress);
string VerifyMessage(string bitcoinAddress, string signature, string message);
#endregion
#region Wallet
// abandontransaction
string AddMultiSigAddress(int nRquired, List<string> publicKeys, string account = null);
string BackupWallet(string destination);
string DumpPrivKey(string bitcoinAddress);
void DumpWallet(string filename);
string GetAccount(string bitcoinAddress);
string GetAccountAddress(string account);
List<string> GetAddressesByAccount(string account);
decimal GetBalance(string account = null, int minConf = 1, bool? includeWatchonly = null);
string GetNewAddress(string account = "");
string GetRawChangeAddress();
string GetReceivedByAccount(string account, int minConf = 1);
string GetReceivedByAddress(string bitcoinAddress, int minConf = 1);
GetTransactionResponse GetTransaction(string txId, bool? includeWatchonly = null);
decimal GetUnconfirmedBalance();
GetWalletInfoResponse GetWalletInfo();
void ImportAddress(string address, string label = null, bool rescan = true);
string ImportPrivKey(string privateKey, string label = null, bool rescan = true);
// importpubkey
void ImportWallet(string filename);
string KeyPoolRefill(uint newSize = 100);
Dictionary<string, decimal> ListAccounts(int minConf = 1, bool? includeWatchonly = null);
List<List<ListAddressGroupingsResponse>> ListAddressGroupings();
string ListLockUnspent();
List<ListReceivedByAccountResponse> ListReceivedByAccount(int minConf = 1, bool includeEmpty = false, bool? includeWatchonly = null);
List<ListReceivedByAddressResponse> ListReceivedByAddress(int minConf = 1, bool includeEmpty = false, bool? includeWatchonly = null);
ListSinceBlockResponse ListSinceBlock(string blockHash = null, int targetConfirmations = 1, bool? includeWatchonly = null);
List<ListTransactionsResponse> ListTransactions(string account = null, int count = 10, int from = 0, bool? includeWatchonly = null);
List<ListUnspentResponse> ListUnspent(int minConf = 1, int maxConf = 9999999, List<string> addresses = null);
bool LockUnspent(bool unlock, IList<ListUnspentResponse> listUnspentResponses);
bool Move(string fromAccount, string toAccount, decimal amount, int minConf = 1, string comment = "");
string SendFrom(string fromAccount, string toBitcoinAddress, decimal amount, int minConf = 1, string comment = null, string commentTo = null);
string SendMany(string fromAccount, Dictionary<string, decimal> toBitcoinAddress, int minConf = 1, string comment = null);
string SendToAddress(string bitcoinAddress, decimal amount, string comment = null, string commentTo = null);
string SetAccount(string bitcoinAddress, string account);
string SetTxFee(decimal amount);
string SignMessage(string bitcoinAddress, string message);
string WalletLock();
string WalletPassphrase(string passphrase, int timeoutInSeconds);
string WalletPassphraseChange(string oldPassphrase, string newPassphrase);
#endregion
=======
String Stop();
String SubmitBlock(String hexData, params Object[] parameters);
ValidateAddressResponse ValidateAddress(String bitcoinAddress);
Boolean VerifyChain(UInt16 checkLevel = 3, UInt32 numBlocks = 288); // Note: numBlocks: 0 => ALL
Boolean VerifyMessage(String bitcoinAddress, String signature, String message);
String WalletLock();
String WalletPassphrase(String passphrase, Int32 timeoutInSeconds);
String WalletPassphraseChange(String oldPassphrase, String newPassphrase);
>>>>>>>
#endregion
#region Util
CreateMultiSigResponse CreateMultiSig(int nRquired, List<string> publicKeys);
decimal EstimateFee(ushort nBlocks);
decimal EstimatePriority(ushort nBlocks);
// estimatesmartfee
// estimatesmartpriority
ValidateAddressResponse ValidateAddress(string bitcoinAddress);
bool VerifyMessage(string bitcoinAddress, string signature, string message);
#endregion
#region Wallet
// abandontransaction
string AddMultiSigAddress(int nRquired, List<string> publicKeys, string account = null);
void BackupWallet(string destination);
string DumpPrivKey(string bitcoinAddress);
void DumpWallet(string filename);
string GetAccount(string bitcoinAddress);
string GetAccountAddress(string account);
List<string> GetAddressesByAccount(string account);
decimal GetBalance(string account = null, int minConf = 1, bool? includeWatchonly = null);
string GetNewAddress(string account = "");
string GetRawChangeAddress();
decimal GetReceivedByAccount(string account, int minConf = 1);
decimal GetReceivedByAddress(string bitcoinAddress, int minConf = 1);
GetTransactionResponse GetTransaction(string txId, bool? includeWatchonly = null);
decimal GetUnconfirmedBalance();
GetWalletInfoResponse GetWalletInfo();
void ImportAddress(string address, string label = null, bool rescan = true);
string ImportPrivKey(string privateKey, string label = null, bool rescan = true);
// importpubkey
void ImportWallet(string filename);
string KeyPoolRefill(uint newSize = 100);
Dictionary<string, decimal> ListAccounts(int minConf = 1, bool? includeWatchonly = null);
List<List<ListAddressGroupingsResponse>> ListAddressGroupings();
string ListLockUnspent();
List<ListReceivedByAccountResponse> ListReceivedByAccount(int minConf = 1, bool includeEmpty = false, bool? includeWatchonly = null);
List<ListReceivedByAddressResponse> ListReceivedByAddress(int minConf = 1, bool includeEmpty = false, bool? includeWatchonly = null);
ListSinceBlockResponse ListSinceBlock(string blockHash = null, int targetConfirmations = 1, bool? includeWatchonly = null);
List<ListTransactionsResponse> ListTransactions(string account = null, int count = 10, int from = 0, bool? includeWatchonly = null);
List<ListUnspentResponse> ListUnspent(int minConf = 1, int maxConf = 9999999, List<string> addresses = null);
bool LockUnspent(bool unlock, IList<ListUnspentResponse> listUnspentResponses);
bool Move(string fromAccount, string toAccount, decimal amount, int minConf = 1, string comment = "");
string SendFrom(string fromAccount, string toBitcoinAddress, decimal amount, int minConf = 1, string comment = null, string commentTo = null);
string SendMany(string fromAccount, Dictionary<string, decimal> toBitcoinAddress, int minConf = 1, string comment = null);
string SendToAddress(string bitcoinAddress, decimal amount, string comment = null, string commentTo = null);
string SetAccount(string bitcoinAddress, string account);
string SetTxFee(decimal amount);
string SignMessage(string bitcoinAddress, string message);
string WalletLock();
string WalletPassphrase(string passphrase, int timeoutInSeconds);
string WalletPassphraseChange(string oldPassphrase, string newPassphrase);
#endregion |
<<<<<<<
errorsListener.EnableEvents(SemanticLoggingEventSource.Log, EventLevel.Verbose);
listener.LogToElasticsearch("testInstance", elasticsearchUri, this.indexPrefix, this.type, bufferingInterval: bufferingInterval);
=======
listener.LogToElasticSearch("testInstance", elasticSearchUri, this.indexPrefix, this.type, bufferingInterval: bufferingInterval);
>>>>>>>
listener.LogToElasticsearch("testInstance", elasticsearchUri, this.indexPrefix, this.type, bufferingInterval: bufferingInterval);
<<<<<<<
var result = ElasticsearchHelper.PollUntilEvents(this.elasticsearchUri, index, this.type, 210);
Assert.AreEqual(210, result.Hits.Total);
}
finally
{
try
{ listener1.DisableEvents(logger); }
catch
{ }
try
{ listener2.DisableEvents(logger); }
catch
{ }
}
=======
var result = ElasticSearchHelper.PollUntilEvents(this.elasticSearchUri, index, this.type, 210);
Assert.AreEqual(210, result.Hits.Total);
});
>>>>>>>
var result = ElasticsearchHelper.PollUntilEvents(this.elasticsearchUri, index, this.type, 210);
Assert.AreEqual(210, result.Hits.Total);
});
<<<<<<<
listener.LogToElasticsearch("testInstance", elasticsearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
listener2.LogToElasticsearch("testInstance", elasticsearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
listener.EnableEvents(logger, EventLevel.Error);
=======
listener1.LogToElasticSearch("testInstance", elasticSearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
listener2.LogToElasticSearch("testInstance", elasticSearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
listener1.EnableEvents(logger, EventLevel.Error);
>>>>>>>
listener1.LogToElasticsearch("testInstance", elasticsearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
listener2.LogToElasticsearch("testInstance", elasticsearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
listener1.EnableEvents(logger, EventLevel.Error);
<<<<<<<
eventListener.LogToElasticsearch("testInstance", elasticsearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
eventListener.EnableEvents(logger, EventLevel.LogAlways);
=======
listener.LogToElasticSearch("testInstance", elasticSearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
listener.EnableEvents(logger, EventLevel.LogAlways);
>>>>>>>
listener.LogToElasticsearch("testInstance", elasticsearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
listener.EnableEvents(logger, EventLevel.LogAlways);
EventSource.SetCurrentThreadActivityId(activityId, out previousActivityId);
<<<<<<<
eventListener.LogToElasticsearch("testInstance", elasticsearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
eventListener.EnableEvents(logger, EventLevel.LogAlways);
=======
listener.LogToElasticSearch("testInstance", elasticSearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
listener.EnableEvents(logger, EventLevel.LogAlways);
>>>>>>>
listener.LogToElasticsearch("testInstance", elasticsearchUri, this.indexPrefix, this.type, bufferingInterval: TimeSpan.FromSeconds(1));
listener.EnableEvents(logger, EventLevel.LogAlways);
EventSource.SetCurrentThreadActivityId(activityId, out previousActivityId); |
<<<<<<<
public void PlaySoundFromGroup(List<AudioClip> group, float volume) {
if(group.Count == 0) {
return;
}
int which_shot = Random.Range(0, group.Count);
GetComponent<AudioSource>().PlayOneShot(group[which_shot], volume * PlayerPrefs.GetFloat("sound_volume", 1f));
}
public void Discharge() {
Instantiate(muzzle_flash, transform.Find("point_muzzleflash").position, transform.Find("point_muzzleflash").rotation);
for(var i = 0; i < projectilePerDischarge; i++) {
var bullet = Instantiate(bullet_obj, transform.Find("point_muzzle").position, transform.Find("point_muzzle").rotation);
if(projectileInaccuracy != 0f) {
var angle = Random.Range(0, 6.283f);
var radius = Random.Range(0, projectileInaccuracy);
bullet.transform.Rotate(Mathf.Cos(angle) * radius, Mathf.Sin(angle) * radius, 0);
}
bullet.GetComponent<BulletScript>().SetVelocity(bullet.transform.forward * projectileVelocity);
}
rotation_transfer_y += Random.Range(1f, 2f);
rotation_transfer_x += Random.Range(-1f, 1f);
recoil_transfer_x -= Random.Range(150f, 300f);
recoil_transfer_y += Random.Range(-200f, 200f);
add_head_recoil = true;
=======
public void PlaySoundFromGroup(List<AudioClip> group,float volume){
if(group.Count == 0){
return;
}
int which_shot = UnityEngine.Random.Range(0,group.Count);
GetComponent<AudioSource>().PlayOneShot(group[which_shot], volume * Preferences.sound_volume);
>>>>>>>
public void PlaySoundFromGroup(List<AudioClip> group, float volume) {
if(group.Count == 0) {
return;
}
int which_shot = Random.Range(0, group.Count);
GetComponent<AudioSource>().PlayOneShot(group[which_shot], volume * Preferences.sound_volume);
}
public void Discharge() {
Instantiate(muzzle_flash, transform.Find("point_muzzleflash").position, transform.Find("point_muzzleflash").rotation);
for(var i = 0; i < projectilePerDischarge; i++) {
var bullet = Instantiate(bullet_obj, transform.Find("point_muzzle").position, transform.Find("point_muzzle").rotation);
if(projectileInaccuracy != 0f) {
var angle = Random.Range(0, 6.283f);
var radius = Random.Range(0, projectileInaccuracy);
bullet.transform.Rotate(Mathf.Cos(angle) * radius, Mathf.Sin(angle) * radius, 0);
}
bullet.GetComponent<BulletScript>().SetVelocity(bullet.transform.forward * projectileVelocity);
}
rotation_transfer_y += Random.Range(1f, 2f);
rotation_transfer_x += Random.Range(-1f, 1f);
recoil_transfer_x -= Random.Range(150f, 300f);
recoil_transfer_y += Random.Range(-200f, 200f);
add_head_recoil = true;
<<<<<<<
if(pressure_on_trigger == PressureState.NONE) {
pressure_on_trigger = PressureState.INITIAL;
fired_once_this_pull = false;
} else {
pressure_on_trigger = PressureState.CONTINUING;
}
if(yolk_stage != YolkStage.CLOSED) {
return false;
}
if(action_type == ActionType.BOLT && IsBoltOpen()) {
return false;
}
if((pressure_on_trigger == PressureState.INITIAL || action_type == ActionType.DOUBLE) && !slide_lock && thumb_on_hammer == Thumb.OFF_HAMMER && hammer_cocked == 1f && safety_off == 1f && (auto_mod_stage == AutoModStage.ENABLED || !fired_once_this_pull)) {
trigger_pressed = 1f;
if(gun_type == GunType.AUTOMATIC && slide_amount == 0f) {
hammer_cocked = 0f;
if(round_in_chamber && round_in_chamber_state == RoundState.READY) {
fired_once_this_pull = true;
PlaySoundFromGroup(sound_gunshot_smallroom, 1f);
round_in_chamber_state = RoundState.FIRED;
GameObject.Destroy(round_in_chamber);
round_in_chamber = Instantiate(shell_casing, transform.Find("point_chambered_round").position, transform.rotation);
round_in_chamber.transform.parent = transform;
RemoveChildrenShadows(round_in_chamber);
Discharge();
if(action_type == ActionType.SINGLE || action_type == ActionType.DOUBLE) {
PullSlideBack();
}
return true;
} else {
PlaySoundFromGroup(sound_mag_eject_button, 0.5f);
}
} else if(gun_type == GunType.REVOLVER) {
hammer_cocked = 0f;
int which_chamber = active_cylinder % cylinder_capacity;
if(which_chamber < 0) {
which_chamber += cylinder_capacity;
}
GameObject round = cylinders[which_chamber].game_object;
if(round && cylinders[which_chamber].can_fire) {
PlaySoundFromGroup(sound_gunshot_smallroom, 1f);
round_in_chamber_state = RoundState.FIRED;
cylinders[which_chamber].can_fire = false;
cylinders[which_chamber].seated += Random.Range(0f, 0.5f);
cylinders[which_chamber].game_object = Instantiate(shell_casing, round.transform.position, round.transform.rotation);
=======
if(pressure_on_trigger == PressureState.NONE){
pressure_on_trigger = PressureState.INITIAL;
fired_once_this_pull = false;
} else {
pressure_on_trigger = PressureState.CONTINUING;
}
if(yolk_stage != YolkStage.CLOSED){
return false;
}
if((pressure_on_trigger == PressureState.INITIAL || action_type == ActionType.DOUBLE) && !slide_lock && thumb_on_hammer == Thumb.OFF_HAMMER && hammer_cocked == 1.0f && safety_off == 1.0f && (auto_mod_stage == AutoModStage.ENABLED || !fired_once_this_pull)){
trigger_pressed = 1.0f;
fired_once_this_pull = true;
Renderer[] renderers = null;
GameObject bullet = null;
if(gun_type == GunType.AUTOMATIC && slide_amount == 0.0f){
hammer_cocked = 0.0f;
if((round_in_chamber != null) && round_in_chamber_state == RoundState.READY){
PlaySoundFromGroup(sound_gunshot_smallroom, 1.0f);
round_in_chamber_state = RoundState.FIRED;
GameObject.Destroy(round_in_chamber);
round_in_chamber = (GameObject)Instantiate(shell_casing, transform.Find("point_chambered_round").position, transform.rotation);
round_in_chamber.transform.parent = transform;
renderers = round_in_chamber.GetComponentsInChildren<Renderer>();
foreach(Renderer renderer in renderers){
renderer.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off;
}
Instantiate(muzzle_flash, transform.Find("point_muzzleflash").position, transform.Find("point_muzzleflash").rotation);
bullet = (GameObject)Instantiate(bullet_obj, transform.Find("point_muzzle").position, transform.Find("point_muzzle").rotation);
bullet.GetComponent<BulletScript>().SetVelocity(transform.forward * 251.0f);
PullSlideBack();
rotation_transfer_y += UnityEngine.Random.Range(1.0f,2.0f);
rotation_transfer_x += UnityEngine.Random.Range(-1.0f,1.0f);
recoil_transfer_x -= UnityEngine.Random.Range(150.0f,300.0f);
recoil_transfer_y += UnityEngine.Random.Range(-200.0f,200.0f);
add_head_recoil = true;
return true;
} else {
PlaySoundFromGroup(sound_mag_eject_button, 0.5f);
}
} else if(gun_type == GunType.REVOLVER){
hammer_cocked = 0.0f;
int which_chamber = active_cylinder % cylinder_capacity;
if(which_chamber < 0){
which_chamber += cylinder_capacity;
}
GameObject round = cylinders[which_chamber].game_object;
if((round != null) && cylinders[which_chamber].can_fire){
PlaySoundFromGroup(sound_gunshot_smallroom, 1.0f);
round_in_chamber_state = RoundState.FIRED;
cylinders[which_chamber].can_fire = false;
cylinders[which_chamber].seated += UnityEngine.Random.Range(0.0f,0.5f);
cylinders[which_chamber].game_object = (GameObject)Instantiate(shell_casing, round.transform.position, round.transform.rotation);
>>>>>>>
if(pressure_on_trigger == PressureState.NONE) {
pressure_on_trigger = PressureState.INITIAL;
fired_once_this_pull = false;
} else {
pressure_on_trigger = PressureState.CONTINUING;
}
if(yolk_stage != YolkStage.CLOSED) {
return false;
}
if(action_type == ActionType.BOLT && IsBoltOpen()) {
return false;
}
if((pressure_on_trigger == PressureState.INITIAL || action_type == ActionType.DOUBLE) && !slide_lock && thumb_on_hammer == Thumb.OFF_HAMMER && hammer_cocked == 1f && safety_off == 1f && (auto_mod_stage == AutoModStage.ENABLED || !fired_once_this_pull)) {
trigger_pressed = 1f;
fired_once_this_pull = true;
if(gun_type == GunType.AUTOMATIC && slide_amount == 0f) {
hammer_cocked = 0f;
if(round_in_chamber && round_in_chamber_state == RoundState.READY) {
PlaySoundFromGroup(sound_gunshot_smallroom, 1f);
round_in_chamber_state = RoundState.FIRED;
GameObject.Destroy(round_in_chamber);
round_in_chamber = Instantiate(shell_casing, transform.Find("point_chambered_round").position, transform.rotation);
round_in_chamber.transform.parent = transform;
RemoveChildrenShadows(round_in_chamber);
Discharge();
if(action_type == ActionType.SINGLE || action_type == ActionType.DOUBLE) {
PullSlideBack();
}
return true;
} else {
PlaySoundFromGroup(sound_mag_eject_button, 0.5f);
}
} else if(gun_type == GunType.REVOLVER) {
hammer_cocked = 0f;
int which_chamber = active_cylinder % cylinder_capacity;
if(which_chamber < 0) {
which_chamber += cylinder_capacity;
}
GameObject round = cylinders[which_chamber].game_object;
if(round && cylinders[which_chamber].can_fire) {
PlaySoundFromGroup(sound_gunshot_smallroom, 1f);
round_in_chamber_state = RoundState.FIRED;
cylinders[which_chamber].can_fire = false;
cylinders[which_chamber].seated += Random.Range(0f, 0.5f);
cylinders[which_chamber].game_object = Instantiate(shell_casing, round.transform.position, round.transform.rotation);
<<<<<<<
pressure_on_trigger = PressureState.NONE;
trigger_pressed = 0f;
=======
if(fired_once_this_pull && pressure_on_trigger == PressureState.CONTINUING)
PlaySoundFromGroup(sound_trigger_reset, 0.07f);
pressure_on_trigger = PressureState.NONE;
trigger_pressed = 0.0f;
>>>>>>>
if(fired_once_this_pull && pressure_on_trigger == PressureState.CONTINUING)
PlaySoundFromGroup(sound_trigger_reset, 0.07f);
pressure_on_trigger = PressureState.NONE;
trigger_pressed = 0f; |
<<<<<<<
return OnFromTableOrView<TObject>(DatabaseMetadata.GetTableOrViewFromClass<TObject>().Name, filterValue, filterOptions);
=======
return OnFromTableOrView<TObject>(DatabaseObjectAsTableOrView<TObject>(OperationType.Select).Name, filterValue, FilterOptions.None);
>>>>>>>
return OnFromTableOrView<TObject>(DatabaseObjectAsTableOrView<TObject>(OperationType.Select).Name, filterValue, filterOptions); |
<<<<<<<
[AutoRetry]
[ActivePlatforms(Platform.Android, Platform.iOS)]
public void FlyoutTest_DataBoundButton_CommandExecutes()
{
Run("UITests.Shared.Windows_UI_Xaml_Controls.Flyout.Flyout_ButtonInContent");
var flyoutButton = _app.Marked("FlyoutButton");
var dataBoundButton = _app.Marked("DataBoundButton");
var dataBoundText = _app.Marked("DataBoundText");
_app.WaitForElement(flyoutButton);
_app.Tap(flyoutButton);
_app.WaitForElement(dataBoundButton);
Assert.AreEqual("Button not clicked", dataBoundText.GetText());
_app.Tap(dataBoundButton);
Assert.AreEqual("Button was clicked", dataBoundText.GetText());
}
[Test]
=======
[AutoRetry]
>>>>>>>
[AutoRetry]
public void FlyoutTest_DataBoundButton_CommandExecutes()
{
Run("UITests.Shared.Windows_UI_Xaml_Controls.Flyout.Flyout_ButtonInContent");
var flyoutButton = _app.Marked("FlyoutButton");
var dataBoundButton = _app.Marked("DataBoundButton");
var dataBoundText = _app.Marked("DataBoundText");
_app.WaitForElement(flyoutButton);
_app.Tap(flyoutButton);
_app.WaitForElement(dataBoundButton);
Assert.AreEqual("Button not clicked", dataBoundText.GetText());
_app.Tap(dataBoundButton);
Assert.AreEqual("Button was clicked", dataBoundText.GetText());
}
[Test]
[AutoRetry] |
<<<<<<<
readonly SqlServerTableOrViewMetadata<SqlDbType> m_Table;
readonly string m_WhereClause;
=======
readonly TableOrViewMetadata<SqlServerObjectName, SqlDbType> m_Table;
readonly object m_NewValues;
readonly string m_UpdateExpression;
readonly object m_UpdateArgumentValue;
readonly UpdateOptions m_Options;
string m_WhereClause;
object m_WhereArgumentValue;
object m_FilterValue;
FilterOptions m_FilterOptions;
>>>>>>>
readonly SqlServerTableOrViewMetadata<SqlDbType> m_Table;
readonly string m_WhereClause;
readonly object m_NewValues;
readonly string m_UpdateExpression;
readonly object m_UpdateArgumentValue;
readonly UpdateOptions m_Options;
string m_WhereClause;
object m_WhereArgumentValue;
object m_FilterValue;
FilterOptions m_FilterOptions;
<<<<<<<
var sql = new StringBuilder();
string header;
string intoClause;
string footer;
sqlBuilder.UseTableVariable(m_Table, out header, out intoClause, out footer);
sql.Append(header);
sql.Append($"UPDATE {m_Table.Name.ToQuotedString()}");
sqlBuilder.BuildSetClause(sql, " SET ", null, null);
sqlBuilder.BuildSelectClause(sql, " OUTPUT ", prefix, intoClause);
sql.Append(" WHERE " + m_WhereClause);
=======
var parameters = new List<SqlParameter>();
var sql = new StringBuilder("UPDATE " + m_Table.Name.ToQuotedString());
if (m_UpdateExpression == null)
{
sqlBuilder.BuildSetClause(sql, " SET ", null, null);
}
else
{
sql.Append(" SET " + m_UpdateExpression);
parameters.AddRange(SqlBuilder.GetParameters<SqlParameter>(m_UpdateArgumentValue));
}
sqlBuilder.BuildSelectClause(sql, " OUTPUT ", prefix, null);
if (m_FilterValue != null)
{
sql.Append(" WHERE " + sqlBuilder.ApplyFilterValue(m_FilterValue, m_FilterOptions));
parameters.AddRange(sqlBuilder.GetParameters());
}
else if (!string.IsNullOrWhiteSpace(m_WhereClause))
{
sql.Append(" WHERE " + m_WhereClause);
parameters.AddRange(sqlBuilder.GetParameters());
parameters.AddRange(SqlBuilder.GetParameters<SqlParameter>(m_WhereArgumentValue));
}
else
{
parameters.AddRange(sqlBuilder.GetParameters());
}
>>>>>>>
var sql = new StringBuilder();
string header;
string intoClause;
string footer;
sqlBuilder.UseTableVariable(m_Table, out header, out intoClause, out footer);
sql.Append(header);
sql.Append($"UPDATE {m_Table.Name.ToQuotedString()}");
sqlBuilder.BuildSetClause(sql, " SET ", null, null);
sqlBuilder.BuildSelectClause(sql, " OUTPUT ", prefix, intoClause);
sql.Append(" WHERE " + m_WhereClause);
var parameters = new List<SqlParameter>();
var sql = new StringBuilder("UPDATE " + m_Table.Name.ToQuotedString());
if (m_UpdateExpression == null)
{
sqlBuilder.BuildSetClause(sql, " SET ", null, null);
}
else
{
sql.Append(" SET " + m_UpdateExpression);
parameters.AddRange(SqlBuilder.GetParameters<SqlParameter>(m_UpdateArgumentValue));
}
sqlBuilder.BuildSelectClause(sql, " OUTPUT ", prefix, null);
if (m_FilterValue != null)
{
sql.Append(" WHERE " + sqlBuilder.ApplyFilterValue(m_FilterValue, m_FilterOptions));
parameters.AddRange(sqlBuilder.GetParameters());
}
else if (!string.IsNullOrWhiteSpace(m_WhereClause))
{
sql.Append(" WHERE " + m_WhereClause);
parameters.AddRange(sqlBuilder.GetParameters());
parameters.AddRange(SqlBuilder.GetParameters<SqlParameter>(m_WhereArgumentValue));
}
else
{
parameters.AddRange(sqlBuilder.GetParameters());
} |
<<<<<<<
/// <remarks>If you don't override this method, it will call execute on the previous link.</remarks>
public virtual Task<TResult> ExecuteAsync(CancellationToken cancellationToken, object state = null)
{
return PreviousLink.ExecuteAsync(cancellationToken, state);
}
/// <summary>
/// Occurs when an execution token has been prepared.
/// </summary>
/// <remarks>This is mostly used by appenders to override command behavior.</remarks>
public event EventHandler<ExecutionTokenPreparedEventArgs> ExecutionTokenPrepared;
=======
public abstract Task<TResultType> ExecuteAsync(CancellationToken cancellationToken, object state = null);
/// <summary>
/// Returns the generated SQL statement of the previous link.
/// </summary>
/// <returns></returns>
public string Sql()
{
return m_PreviousLink.Sql();
}
>>>>>>>
/// <remarks>If you don't override this method, it will call execute on the previous link.</remarks>
public virtual Task<TResult> ExecuteAsync(CancellationToken cancellationToken, object state = null)
{
return PreviousLink.ExecuteAsync(cancellationToken, state);
}
/// <summary>
/// Occurs when an execution token has been prepared.
/// </summary>
/// <remarks>This is mostly used by appenders to override command behavior.</remarks>
public event EventHandler<ExecutionTokenPreparedEventArgs> ExecutionTokenPrepared;
/// <summary>
/// Returns the generated SQL statement of the previous link.
/// </summary>
/// <returns></returns>
public string Sql()
{
return m_PreviousLink.Sql();
} |
<<<<<<<
{
var cacheKey = m_CacheKeyFunction(item);
await DataSource.Cache.WriteAsync(cacheKey, item, m_Policy);
cacheKeys.Add(cacheKey);
}
m_ActualCacheKeys = cacheKeys.ToImmutableArray();
=======
await DataSource.Cache.WriteAsync(m_CacheKeyFunction(item), item, m_Policy).ConfigureAwait(false);
>>>>>>>
{
var cacheKey = m_CacheKeyFunction(item);
await DataSource.Cache.WriteAsync(cacheKey, item, m_Policy).ConfigureAwait(false);
cacheKeys.Add(cacheKey);
}
m_ActualCacheKeys = cacheKeys.ToImmutableArray(); |
<<<<<<<
actualSchema = reader.GetString(reader.GetOrdinal("SchemaName"));
actualName = reader.GetString(reader.GetOrdinal("Name"));
objectId = reader.GetInt32(reader.GetOrdinal("ObjectId"));
sqlTypeName = reader.IsDBNull(reader.GetOrdinal("TypeName")) ? null : reader.GetString(reader.GetOrdinal("TypeName"));
isNullable = reader.GetBoolean(reader.GetOrdinal("is_nullable"));
maxLength = reader.IsDBNull(reader.GetOrdinal("max_length")) ? (int?)null : reader.GetInt32(reader.GetOrdinal("max_length"));
precision = reader.IsDBNull(reader.GetOrdinal("precision")) ? (int?)null : reader.GetInt32(reader.GetOrdinal("precision"));
scale = reader.IsDBNull(reader.GetOrdinal("scale")) ? (int?)null : reader.GetInt32(reader.GetOrdinal("scale"));
AdjustTypeDetails(sqlTypeName, ref maxLength, ref precision, ref scale, out fullTypeName);
=======
actualSchema = reader.GetString("SchemaName");
actualName = reader.GetString("Name");
objectId = reader.GetInt32("ObjectId");
typeName = reader.GetStringOrNull("TypeName");
isNullable = reader.GetBoolean("is_nullable");
maxLength = reader.GetInt32OrNull("max_length");
precision = reader.GetInt32OrNull("precision");
scale = reader.GetInt32OrNull("scale");
AdjustTypeDetails(typeName, ref maxLength, ref precision, ref scale, out fullTypeName);
>>>>>>>
actualSchema = reader.GetString("SchemaName");
actualName = reader.GetString("Name");
objectId = reader.GetInt32("ObjectId");
sqlTypeName = reader.GetStringOrNull("TypeName");
isNullable = reader.GetBoolean("is_nullable");
maxLength = reader.GetInt32OrNull("max_length");
precision = reader.GetInt32OrNull("precision");
scale = reader.GetInt32OrNull("scale");
AdjustTypeDetails(sqlTypeName, ref maxLength, ref precision, ref scale, out fullTypeName);
<<<<<<<
var name = reader.GetString(reader.GetOrdinal("ColumnName"));
var computed = reader.GetBoolean(reader.GetOrdinal("is_computed"));
var primary = reader.GetBoolean(reader.GetOrdinal("is_primary_key"));
var isIdentity = reader.GetBoolean(reader.GetOrdinal("is_identity"));
var sqlTypeName = reader.IsDBNull(reader.GetOrdinal("TypeName")) ? null : reader.GetString(reader.GetOrdinal("TypeName"));
var isNullable = reader.GetBoolean(reader.GetOrdinal("is_nullable"));
int? maxLength = reader.IsDBNull(reader.GetOrdinal("max_length")) ? (int?)null : reader.GetInt32(reader.GetOrdinal("max_length"));
int? precision = reader.IsDBNull(reader.GetOrdinal("precision")) ? (int?)null : reader.GetInt32(reader.GetOrdinal("precision"));
int? scale = reader.IsDBNull(reader.GetOrdinal("scale")) ? (int?)null : reader.GetInt32(reader.GetOrdinal("scale"));
=======
var name = reader.GetString("ColumnName");
var computed = reader.GetBoolean("is_computed");
var primary = reader.GetBoolean("is_primary_key");
var isIdentity = reader.GetBoolean("is_identity");
var typeName = reader.GetStringOrNull("TypeName");
var isNullable = reader.GetBoolean("is_nullable");
int? maxLength = reader.GetInt32OrNull("max_length");
int? precision = reader.GetInt32OrNull("precision");
int? scale = reader.GetInt32OrNull("scale");
>>>>>>>
var name = reader.GetString("ColumnName");
var computed = reader.GetBoolean("is_computed");
var primary = reader.GetBoolean("is_primary_key");
var isIdentity = reader.GetBoolean("is_identity");
var sqlTypeName = reader.GetStringOrNull("TypeName");
var isNullable = reader.GetBoolean("is_nullable");
int? maxLength = reader.GetInt32OrNull("max_length");
int? precision = reader.GetInt32OrNull("precision");
int? scale = reader.GetInt32OrNull("scale");
<<<<<<<
var name = reader.GetString(reader.GetOrdinal("ParameterName"));
var sqlTypeName = reader.GetString(reader.GetOrdinal("TypeName"));
=======
var name = reader.GetString("ParameterName");
var typeName = reader.GetString("TypeName");
>>>>>>>
var name = reader.GetString("ParameterName");
var sqlTypeName = reader.GetString("TypeName"); |
<<<<<<<
=======
private class ColumnData
{
public ColumnData(int index, Type columnType, string getter)
{
ColumnType = columnType;
Getter = getter;
Index = index;
}
public int Index { get; }
public string Getter { get; }
public Type ColumnType { get; }
}
>>>>>>>
<<<<<<<
class ColumnData
{
public ColumnData(int index, Type columnType, string getter)
{
ColumnType = columnType;
Getter = getter;
Index = index;
}
public Type ColumnType { get; }
public string Getter { get; }
public int Index { get; }
}
=======
/// <summary>
/// Occurs when a materializer is compiled.
/// </summary>
public static event EventHandler<MaterializerCompilerEventArgs> MaterializerCompiled;
/// <summary>
/// Occurs when materializer fails to compile.
/// </summary>
public static event EventHandler<MaterializerCompilerEventArgs> MaterializerCompilerFailed;
>>>>>>>
class ColumnData
{
public ColumnData(int index, Type columnType, string getter)
{
ColumnType = columnType;
Getter = getter;
Index = index;
}
public Type ColumnType { get; }
public string Getter { get; }
public int Index { get; }
} |
<<<<<<<
sqlBuilder.BuildSelectClause(sql, " OUTPUT ", "Deleted.", intoClause);
sql.Append(" WHERE " + m_WhereClause);
=======
sqlBuilder.BuildSelectClause(sql, " OUTPUT ", "Deleted.", null);
if (m_FilterValue != null)
{
sql.Append(" WHERE " + sqlBuilder.ApplyFilterValue(m_FilterValue, m_FilterOptions));
parameters = sqlBuilder.GetParameters();
}
else if (!string.IsNullOrWhiteSpace(m_WhereClause))
{
sql.Append(" WHERE " + m_WhereClause);
parameters = SqlBuilder.GetParameters<SqlParameter>(m_ArgumentValue);
parameters.AddRange(sqlBuilder.GetParameters());
}
else
{
parameters = sqlBuilder.GetParameters();
}
>>>>>>>
sqlBuilder.BuildSelectClause(sql, " OUTPUT ", "Deleted.", intoClause);
sql.Append(" WHERE " + m_WhereClause);
sqlBuilder.BuildSelectClause(sql, " OUTPUT ", "Deleted.", null);
if (m_FilterValue != null)
{
sql.Append(" WHERE " + sqlBuilder.ApplyFilterValue(m_FilterValue, m_FilterOptions));
parameters = sqlBuilder.GetParameters();
}
else if (!string.IsNullOrWhiteSpace(m_WhereClause))
{
sql.Append(" WHERE " + m_WhereClause);
parameters = SqlBuilder.GetParameters<SqlParameter>(m_ArgumentValue);
parameters.AddRange(sqlBuilder.GetParameters());
}
else
{
parameters = sqlBuilder.GetParameters();
} |
<<<<<<<
var sqlTypeName = reader.GetString(reader.GetOrdinal("udt_name"));
parameters.Add(new ParameterMetadata<NpgsqlDbType>(parameterName, "@" + parameterName, sqlTypeName, SqlTypeNameToDbType(sqlTypeName)));
=======
var typeName = reader.GetString("udt_name");
parameters.Add(new ParameterMetadata<NpgsqlDbType>(parameterName, "@" + parameterName, typeName, TypeNameToNpgSqlDbType(typeName)));
>>>>>>>
var sqlTypeName = reader.GetString("udt_name");
parameters.Add(new ParameterMetadata<NpgsqlDbType>(parameterName, "@" + parameterName, sqlTypeName, SqlTypeNameToDbType(sqlTypeName)));
<<<<<<<
var name = reader.GetString(reader.GetOrdinal("parameter_name"));
var sqlTypeName = reader.GetString(reader.GetOrdinal("udt_name"));
=======
var name = reader.GetString("parameter_name");
var typeName = reader.GetString("udt_name");
>>>>>>>
var name = reader.GetString("parameter_name");
var sqlTypeName = reader.GetString("udt_name");
<<<<<<<
actualSchema = reader.GetString(reader.GetOrdinal("routine_schema"));
actualName = reader.GetString(reader.GetOrdinal("routine_name"));
specificName = reader.GetString(reader.GetOrdinal("specific_name"));
sqlTypeName = reader.GetString(reader.GetOrdinal("data_type"));
=======
actualSchema = reader.GetString("routine_schema");
actualName = reader.GetString("routine_name");
specificName = reader.GetString("specific_name");
typeName = reader.GetString("data_type");
>>>>>>>
actualSchema = reader.GetString("routine_schema");
actualName = reader.GetString("routine_name");
specificName = reader.GetString("specific_name");
sqlTypeName = reader.GetString("data_type"); |
<<<<<<<
/// Gets a value indicating whether this table or view has primary key.
/// </summary>
/// <value>
/// <c>true</c> if this instance has a primary key; otherwise, <c>false</c>.
/// </value>
public bool HasPrimaryKey => Columns.Any(c => c.IsPrimaryKey);
/// <summary>
=======
>>>>>>>
/// Gets a value indicating whether this table or view has primary key.
/// </summary>
/// <value>
/// <c>true</c> if this instance has a primary key; otherwise, <c>false</c>.
/// </value>
public bool HasPrimaryKey => Columns.Any(c => c.IsPrimaryKey);
/// <summary>
<<<<<<<
/// <summary>
/// Gets the columns known to be not nullable.
/// </summary>
/// <value>
/// The nullable columns.
/// </value>
/// <remarks>This is used to improve the performance of materializers by avoiding is null checks.</remarks>
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public ColumnMetadataCollection NonNullableColumns { get; protected set; }
=======
/// <summary>
/// Gets the columns known to be not nullable.
/// </summary>
/// <value>
/// The nullable columns.
/// </value>
/// <remarks>This is used to improve the performance of materializers by avoiding is null checks.</remarks>
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public ColumnMetadataCollection NonNullableColumns { get; protected set; }
/// <summary>
/// Gets the columns that make up the primary key.
/// </summary>
/// <value>
/// The columns.
/// </value>
public ColumnMetadataCollection PrimaryKeyColumns { get; protected set; }
>>>>>>>
/// <summary>
/// Gets the columns known to be not nullable.
/// </summary>
/// <value>
/// The nullable columns.
/// </value>
/// <remarks>This is used to improve the performance of materializers by avoiding is null checks.</remarks>
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public ColumnMetadataCollection NonNullableColumns { get; protected set; }
/// <summary>
/// Gets the columns that make up the primary key.
/// </summary>
/// <value>
/// The columns.
/// </value>
public ColumnMetadataCollection PrimaryKeyColumns { get; protected set; } |
<<<<<<<
var sqlTypeName = reader.GetString("DATA_TYPE");
var maxLength = reader.IsDBNull(reader.GetOrdinal("CHARACTER_MAXIMUM_LENGTH")) ? (UInt64?)null : reader.GetUInt64("CHARACTER_MAXIMUM_LENGTH");
var precisionA = reader.IsDBNull(reader.GetOrdinal("NUMERIC_PRECISION")) ? (int?)null : reader.GetInt32("NUMERIC_PRECISION");
var scale = reader.IsDBNull(reader.GetOrdinal("NUMERIC_SCALE")) ? (int?)null : reader.GetInt32("NUMERIC_SCALE");
var precisionB = reader.IsDBNull(reader.GetOrdinal("DATETIME_PRECISION")) ? (int?)null : reader.GetInt32("DATETIME_PRECISION");
=======
var typeName = reader.GetString("DATA_TYPE");
var maxLength = reader.GetUInt64OrNull("CHARACTER_MAXIMUM_LENGTH");
var precisionA = reader.GetInt32OrNull("NUMERIC_PRECISION");
var scale = reader.GetInt32OrNull("NUMERIC_SCALE");
var precisionB = reader.GetInt32OrNull("DATETIME_PRECISION");
>>>>>>>
var sqlTypeName = reader.GetString("DATA_TYPE");
var maxLength = reader.GetUInt64OrNull("CHARACTER_MAXIMUM_LENGTH");
var precisionA = reader.GetInt32OrNull("NUMERIC_PRECISION");
var scale = reader.GetInt32OrNull("NUMERIC_SCALE");
var precisionB = reader.GetInt32OrNull("DATETIME_PRECISION");
<<<<<<<
var name = reader.GetString(reader.GetOrdinal("PARAMETER_NAME"));
var sqlTypeName = reader.GetString(reader.GetOrdinal("DATA_TYPE"));
=======
var name = reader.GetString("PARAMETER_NAME");
var typeName = reader.GetString("DATA_TYPE");
>>>>>>>
var name = reader.GetString("PARAMETER_NAME");
var sqlTypeName = reader.GetString("DATA_TYPE");
<<<<<<<
sqlTypeName = reader.GetString("DATA_TYPE");
maxLength = reader.IsDBNull(reader.GetOrdinal("CHARACTER_MAXIMUM_LENGTH")) ? (UInt64?)null : reader.GetUInt64("CHARACTER_MAXIMUM_LENGTH");
var precisionA = reader.IsDBNull(reader.GetOrdinal("NUMERIC_PRECISION")) ? (int?)null : reader.GetInt32("NUMERIC_PRECISION");
scale = reader.IsDBNull(reader.GetOrdinal("NUMERIC_SCALE")) ? (int?)null : reader.GetInt32("NUMERIC_SCALE");
var precisionB = reader.IsDBNull(reader.GetOrdinal("DATETIME_PRECISION")) ? (int?)null : reader.GetInt32("DATETIME_PRECISION");
=======
typeName = reader.GetString("DATA_TYPE");
maxLength = reader.GetUInt64OrNull("CHARACTER_MAXIMUM_LENGTH");
var precisionA = reader.GetInt32OrNull("NUMERIC_PRECISION");
scale = reader.GetInt32OrNull("NUMERIC_SCALE");
var precisionB = reader.GetInt32OrNull("DATETIME_PRECISION");
>>>>>>>
sqlTypeName = reader.GetString("DATA_TYPE");
maxLength = reader.GetUInt64OrNull("CHARACTER_MAXIMUM_LENGTH");
var precisionA = reader.GetInt32OrNull("NUMERIC_PRECISION");
scale = reader.GetInt32OrNull("NUMERIC_SCALE");
var precisionB = reader.GetInt32OrNull("DATETIME_PRECISION"); |
<<<<<<<
#if SQL_SERVER || POSTGRESQL || OLE_SQL_SERVER
=======
#if SQL_SERVER || POSTGRESQL || MYSQL
>>>>>>>
#if SQL_SERVER || POSTGRESQL || OLE_SQL_SERVER || MYSQL
<<<<<<<
#elif OLE_SQL_SERVER
const string CheckA = @"SELECT Count(*) FROM Sales.Customer c WHERE c.State = ?;";
const string CheckB = @"SELECT Count(*) FROM Sales.[Order] o INNER JOIN Sales.Customer c ON o.CustomerKey = c.CustomerKey WHERE c.State = ?;";
static object Parameter1 = new { @State = "CA" };
static object DictParameter1a = new Dictionary<string, object>() { { "State", "CA" } };
static object DictParameter1b = new Dictionary<string, object>() { { "@State", "CA" } };
=======
#elif MYSQL
const string CheckA = @"SELECT Count(*) FROM Sales.Customer c WHERE c.State = @State;";
const string CheckB = @"SELECT Count(*) FROM Sales.`Order` o INNER JOIN Sales.Customer c ON o.CustomerKey = c.CustomerKey WHERE c.State = @State;";
static object CheckParameter1 = new { @State = "CA" };
static object ProcParameter1 = new { p_State = "CA" };
static object DictParameter1a = new Dictionary<string, object>() { { "p_State", "CA" } };
//static object DictParameter1b = new Dictionary<string, object>() { { "@p_State", "CA" } };
>>>>>>>
#elif OLE_SQL_SERVER
const string CheckA = @"SELECT Count(*) FROM Sales.Customer c WHERE c.State = ?;";
const string CheckB = @"SELECT Count(*) FROM Sales.[Order] o INNER JOIN Sales.Customer c ON o.CustomerKey = c.CustomerKey WHERE c.State = ?;";
static object CheckParameter1 = new { @State = "CA" };
static object ProcParameter1 = new { @State = "CA" };
static object DictParameter1a = new Dictionary<string, object>() { { "State", "CA" } };
static object DictParameter1b = new Dictionary<string, object>() { { "@State", "CA" } };
#elif MYSQL
const string CheckA = @"SELECT Count(*) FROM Sales.Customer c WHERE c.State = @State;";
const string CheckB = @"SELECT Count(*) FROM Sales.`Order` o INNER JOIN Sales.Customer c ON o.CustomerKey = c.CustomerKey WHERE c.State = @State;";
static object CheckParameter1 = new { @State = "CA" };
static object ProcParameter1 = new { p_State = "CA" };
static object DictParameter1a = new Dictionary<string, object>() { { "p_State", "CA" } };
//static object DictParameter1b = new Dictionary<string, object>() { { "@p_State", "CA" } }; |
<<<<<<<
var hsrel5 = (HSREL5)_ccToolsBoardService.RegisterDevice(CCToolsDevice.HSRel5, InstalledDevice.BedroomHSREL5.ToString(), 38);
var hsrel8 = (HSREL8)_ccToolsBoardService.RegisterDevice(CCToolsDevice.HSRel8, InstalledDevice.BedroomHSREL8.ToString(), 21);
=======
>>>>>>>
var hsrel5 = (HSREL5)_ccToolsBoardService.RegisterDevice(CCToolsDevice.HSRel5, InstalledDevice.BedroomHSREL5.ToString(), 38);
var hsrel8 = (HSREL8)_ccToolsBoardService.RegisterDevice(CCToolsDevice.HSRel8, InstalledDevice.BedroomHSREL8.ToString(), 21);
<<<<<<<
_sensorFactory.RegisterButton(area, Bedroom.ButtonDoor, input5.GetInput(11));
_sensorFactory.RegisterButton(area, Bedroom.RollerShutterButtonsUpperUp, input5.GetInput(6));
_sensorFactory.RegisterButton(area, Bedroom.RollerShutterButtonsUpperDown, input5.GetInput(7));
_sensorFactory.RegisterButton(area, Bedroom.RollerShutterButtonsLowerUp, input5.GetInput(4));
_sensorFactory.RegisterButton(area, Bedroom.RollerShutterButtonsLowerDown, input5.GetInput(5));
=======
_sensorFactory.RegisterRollerShutterButtons(area, Bedroom.RollerShutterButtonsUpperUp, input5.GetInput(6),
Bedroom.RollerShutterButtonsUpperDown, input5.GetInput(7));
_sensorFactory.RegisterRollerShutterButtons(area, Bedroom.RollerShutterButtonsLowerUp, input5.GetInput(4),
Bedroom.RollerShutterButtonsLowerDown, input5.GetInput(5));
>>>>>>>
_sensorFactory.RegisterButton(area, Bedroom.ButtonDoor, input5.GetInput(11));
_sensorFactory.RegisterButton(area, Bedroom.RollerShutterButtonsUpperUp, input5.GetInput(6));
_sensorFactory.RegisterButton(area, Bedroom.RollerShutterButtonsUpperDown, input5.GetInput(7));
_sensorFactory.RegisterButton(area, Bedroom.RollerShutterButtonsLowerUp, input5.GetInput(4));
_sensorFactory.RegisterButton(area, Bedroom.RollerShutterButtonsLowerDown, input5.GetInput(5)); |
<<<<<<<
using System.Text;
=======
using System.Data.Common;
>>>>>>>
using System.Text;
using System.Data.Common;
<<<<<<<
public long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferOffset, int length)
=======
public override long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferoffset, int length)
>>>>>>>
public override long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferOffset, int length)
<<<<<<<
public long GetChars(int i, long fieldOffset, char[] buffer, int bufferoffset, int length)
=======
public override long GetChars(int i, long fieldoffset, char[] buffer, int bufferoffset, int length)
>>>>>>>
public override long GetChars(int i, long fieldOffset, char[] buffer, int bufferoffset, int length)
<<<<<<<
public object GetValue(int i)
=======
public override string GetString(int i)
{
throw new NotImplementedException();
}
public override object GetValue(int i)
>>>>>>>
public override object GetValue(int i)
<<<<<<<
object IDataRecord.this[string name] => GetValue(GetOrdinal(name));
public void Dispose()
{
Close();
}
=======
public override object this[int ordinal] => GetValue(ordinal);
>>>>>>>
public override object this[int ordinal] => GetValue(ordinal);
<<<<<<<
/// <summary>
/// Advances the reader to the next result set.
/// </summary>
/// <returns>true if the reader is pointing at a record set; false otherwise.</returns>
public bool NextResult()
=======
public override bool NextResult()
>>>>>>>
/// <summary>
/// Advances the reader to the next result set.
/// </summary>
/// <returns>true if the reader is pointing at a record set; false otherwise.</returns>
public override bool NextResult()
<<<<<<<
/// <summary>
/// Advance the reader to the next record in the current result set.
/// </summary>
/// <returns>true if the reader is pointing at a row of data; false otherwise.</returns>
public bool Read()
=======
public override bool Read()
>>>>>>>
/// <summary>
/// Advance the reader to the next record in the current result set.
/// </summary>
/// <returns>true if the reader is pointing at a row of data; false otherwise.</returns>
public override bool Read() |
<<<<<<<
=======
// excel and google plugin have its own template files,
// so we need to set the different path when the asset file is created.
private readonly string gDataTemplatePath = "QuickSheet/GDataPlugin/Templates";
>>>>>>>
<<<<<<<
private void Awake() {
// excel and google plugin have its own template files,
// so we need to set the different path when the asset file is created.
TemplatePath = GoogleDataSettings.Instance.TemplatePath;
=======
private void Awake() {
TemplatePath = gDataTemplatePath;
>>>>>>>
private void Awake()
{
// excel and google plugin have its own template files,
// so we need to set the different path when the asset file is created.
TemplatePath = GoogleDataSettings.Instance.TemplatePath; |
<<<<<<<
public void Exit()
{
NSApplication.SharedApplication.Terminate(null);
}
=======
[Export("themeChanged:")]
public void ThemeChanged(NSObject change) => OnSystemThemeChanged();
>>>>>>>
[Export("themeChanged:")]
public void ThemeChanged(NSObject change) => OnSystemThemeChanged();
public void Exit()
{
NSApplication.SharedApplication.Terminate(null);
} |
<<<<<<<
public static int AddTask(string boardID, string dateCreated, string title, string desc, string categ, string colorKey, string tags)
=======
public static void UpdateColumnData(CustomKanbanModel selectedCardModel, string targetCategory)
{
using (SqliteConnection db =
new SqliteConnection("Filename=ktdatabase.db"))
{
db.Open();
// Update task column/category when dragged to new column/category
SqliteCommand updateCommand = new SqliteCommand
("UPDATE tblTasks SET Category=@category WHERE Id=@id", db);
updateCommand.Parameters.AddWithValue("@category", targetCategory);
updateCommand.Parameters.AddWithValue("@id", selectedCardModel.ID);
updateCommand.ExecuteNonQuery();
db.Close();
}
}
public static int AddTask(string boardID, string title, string desc, string categ, string colorKey, string tags)
>>>>>>>
public static void UpdateColumnData(CustomKanbanModel selectedCardModel, string targetCategory)
{
using (SqliteConnection db =
new SqliteConnection("Filename=ktdatabase.db"))
{
db.Open();
// Update task column/category when dragged to new column/category
SqliteCommand updateCommand = new SqliteCommand
("UPDATE tblTasks SET Category=@category WHERE Id=@id", db);
updateCommand.Parameters.AddWithValue("@category", targetCategory);
updateCommand.Parameters.AddWithValue("@id", selectedCardModel.ID);
updateCommand.ExecuteNonQuery();
db.Close();
}
}
public static int AddTask(string boardID, string dateCreated, string title, string desc, string categ, string colorKey, string tags) |
<<<<<<<
private string GetArgumentsString(ArgumentContainer container)
{
var resContainer = new ArgumentContainer { new InputArgument("input.mp4") };
foreach (var a in container)
{
resContainer.Add(a.Value);
}
resContainer.Add(new OutputArgument("output.mp4"));
return builder.BuildArguments(resContainer);
}
=======
>>>>>>>
private string GetArgumentsString(ArgumentContainer container)
{
var resContainer = new ArgumentContainer { new InputArgument("input.mp4") };
foreach (var a in container)
{
resContainer.Add(a.Value);
}
resContainer.Add(new OutputArgument("output.mp4"));
return builder.BuildArguments(resContainer);
}
<<<<<<<
[TestMethod]
public void Builder_BuildString_Copy_Audio_Fluent()
{
var str = GetArgumentsString(new ArgumentContainer().Copy(Channel.Audio));
Assert.AreEqual(str, "-i \"input.mp4\" -c:a copy \"output.mp4\"");
}
=======
>>>>>>>
[TestMethod]
public void Builder_BuildString_Copy_Audio_Fluent()
{
var str = GetArgumentsString(new ArgumentContainer().Copy(Channel.Audio));
Assert.AreEqual(str, "-i \"input.mp4\" -c:a copy \"output.mp4\"");
}
<<<<<<<
[TestMethod]
public void Builder_BuildString_Threads_2_Fluent()
{
var str = GetArgumentsString(new ArgumentContainer().MultiThreaded());
Assert.AreEqual(str, $"-i \"input.mp4\" -threads {Environment.ProcessorCount} \"output.mp4\"");
}
=======
>>>>>>>
<<<<<<<
public void Builder_BuildString_Codec_Override_Fluent()
{
var str = GetArgumentsString(new ArgumentContainer().VideoCodec(VideoCodec.LibX264).Override());
Assert.AreEqual(str, "-i \"input.mp4\" -c:v libx264 -pix_fmt yuv420p -y \"output.mp4\"");
}
[TestMethod]
public void Builder_BuildString_Duration() {
=======
public void Builder_BuildString_Duration()
{
>>>>>>>
public void Builder_BuildString_Codec_Override_Fluent()
{
var str = GetArgumentsString(new ArgumentContainer().VideoCodec(VideoCodec.LibX264).Override());
Assert.AreEqual(str, "-i \"input.mp4\" -c:v libx264 -pix_fmt yuv420p -y \"output.mp4\"");
}
[TestMethod]
public void Builder_BuildString_Duration()
{
<<<<<<<
[TestMethod]
public void Builder_BuildString_Duration_Fluent()
{
var str = GetArgumentsString(new ArgumentContainer().Duration(TimeSpan.FromSeconds(20)));
Assert.AreEqual(str, "-i \"input.mp4\" -t 00:00:20 \"output.mp4\"");
}
=======
[TestMethod]
public void Builder_BuildString_Raw()
{
var str = GetArgumentsString(new CustomArgument(null));
Assert.AreEqual(str, "-i \"input.mp4\" \"output.mp4\"");
str = GetArgumentsString(new CustomArgument("-acodec copy"));
Assert.AreEqual(str, "-i \"input.mp4\" -acodec copy \"output.mp4\"");
}
>>>>>>>
[TestMethod]
public void Builder_BuildString_Duration_Fluent()
{
var str = GetArgumentsString(new ArgumentContainer().Duration(TimeSpan.FromSeconds(20)));
Assert.AreEqual(str, "-i \"input.mp4\" -t 00:00:20 \"output.mp4\"");
}
[TestMethod]
public void Builder_BuildString_Raw()
{
var str = GetArgumentsString(new CustomArgument(null));
Assert.AreEqual(str, "-i \"input.mp4\" \"output.mp4\"");
str = GetArgumentsString(new CustomArgument("-acodec copy"));
Assert.AreEqual(str, "-i \"input.mp4\" -acodec copy \"output.mp4\"");
} |
<<<<<<<
#if __ANDROID__ || false || NET461 || __WASM__ || false
#if __ANDROID__ || false || NET461 || __WASM__ || false
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
>>>>>>>
#if __ANDROID__ || false || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
#if __ANDROID__ || false || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
<<<<<<<
#if __ANDROID__ || false || NET461 || __WASM__ || false
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
>>>>>>>
#if __ANDROID__ || false || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
<<<<<<<
#if __ANDROID__ || false || NET461 || __WASM__ || false
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
>>>>>>>
#if __ANDROID__ || false || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false |
<<<<<<<
[Test]
public void Ensure_Can_Parse_Multiple_Nullable_Enums_To_A_List()
{
var parser = CreateFluentParser();
var actual = new List<TestEnum?>();
parser.Setup<List<TestEnum?>>("enums")
.Callback(actual.AddRange);
var result = parser.Parse(new[] { "--enums", "--", TestEnum.Value0.ToString(), TestEnum.Value1.ToString() });
Assert.IsFalse(result.HasErrors);
Assert.IsFalse(result.EmptyArgs);
Assert.IsFalse(result.HelpCalled);
Assert.AreEqual(2, actual.Count());
Assert.Contains(TestEnum.Value0, actual);
Assert.Contains(TestEnum.Value1, actual);
}
=======
[Test]
public void Ensure_Can_Parse_Arguments_Containing_Long_To_A_List()
{
var parser = CreateFluentParser();
long value1 = 21474836471;
long value2 = 21474836472;
long value3 = 214748364723;
long value4 = 21474836471233;
var actual = new List<long>();
parser.Setup<List<long>>("longs")
.Callback(actual.AddRange);
var result = parser.Parse(new[] { "--longs", "--", value1.ToString(), value2.ToString(), value3.ToString(), value4.ToString() });
Assert.IsFalse(result.HasErrors);
Assert.IsFalse(result.EmptyArgs);
Assert.IsFalse(result.HelpCalled);
Assert.AreEqual(4, actual.Count());
Assert.IsTrue(actual.Contains(value1));
Assert.IsTrue(actual.Contains(value2));
Assert.IsTrue(actual.Contains(value3));
Assert.IsTrue(actual.Contains(value4));
}
>>>>>>>
[Test]
{
var parser = CreateFluentParser();
var actual = new List<TestEnum?>();
parser.Setup<List<TestEnum?>>("enums")
.Callback(actual.AddRange);
Assert.IsFalse(result.HasErrors);
Assert.IsFalse(result.EmptyArgs);
Assert.IsFalse(result.HelpCalled);
Assert.IsFalse(result.HasErrors);
Assert.IsFalse(result.EmptyArgs);
Assert.IsFalse(result.HelpCalled);
Assert.IsTrue(actual.Contains(value3));
Assert.IsTrue(actual.Contains(value4));
}
[Test]
public void Ensure_Can_Parse_Arguments_Containing_Long_To_A_List()
{
var parser = CreateFluentParser();
long value1 = 21474836471;
long value2 = 21474836472;
long value3 = 214748364723;
long value4 = 21474836471233;
var actual = new List<long>();
parser.Setup<List<long>>("longs")
.Callback(actual.AddRange);
var result = parser.Parse(new[] { "--longs", "--", value1.ToString(), value2.ToString(), value3.ToString(), value4.ToString() });
Assert.IsFalse(result.HasErrors);
Assert.IsFalse(result.EmptyArgs);
Assert.IsFalse(result.HelpCalled);
Assert.AreEqual(4, actual.Count());
Assert.IsTrue(actual.Contains(value1));
Assert.IsTrue(actual.Contains(value2));
Assert.IsTrue(actual.Contains(value3));
Assert.IsTrue(actual.Contains(value4));
} |
<<<<<<<
#if NET461 || __WASM__ || false
=======
#if false || false || NET461 || __WASM__ || __MACOS__
>>>>>>>
#if false || false || NET461 || __WASM__ || false
<<<<<<<
#if NET461 || __WASM__ || false
=======
#if false || false || NET461 || __WASM__ || __MACOS__
>>>>>>>
#if false || false || NET461 || __WASM__ || false
<<<<<<<
#if NET461 || __WASM__ || false
=======
#if false || false || NET461 || __WASM__ || __MACOS__
>>>>>>>
#if false || false || NET461 || __WASM__ || false |
<<<<<<<
Console.WriteLine("{0}.exe [/log] - compiles sources in current directory. optionally logs diagnostics info.", appName);
Console.WriteLine("{0}.exe /lib - compiles sources in current directory ito dll.", appName);
Console.WriteLine("{0}.exe /clean - deletes tools, packages, and bin project subdirectories.", appName);
Console.WriteLine("{0}.exe /new - creates template sources for a new console app", appName);
Console.WriteLine("{0}.exe /edit - starts code editor", appName);
Console.WriteLine("{0}.exe /? - help", appName);
=======
Console.WriteLine("{0} [/log] - compiles sources in current direcotry. optionally logs diagnostics info.", appName);
Console.WriteLine("{0} /clean - deletes tools, packages, and bin project subdirectories.", appName);
Console.WriteLine("{0} /new - creates template sources for a new console app", appName);
Console.WriteLine("{0} /edit - starts code editor", appName);
Console.WriteLine("{0} /? - help", appName);
>>>>>>>
Console.WriteLine("{0} [/log] - compiles sources in current direcotry. optionally logs diagnostics info.", appName);
Console.WriteLine("{0} /lib - compiles sources in current directory ito dll.", appName);
Console.WriteLine("{0} /clean - deletes tools, packages, and bin project subdirectories.", appName);
Console.WriteLine("{0} /new - creates template sources for a new console app", appName);
Console.WriteLine("{0} /edit - starts code editor", appName);
Console.WriteLine("{0} /? - help", appName); |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
return destinationImage;
}
else
{
throw new InvalidOperationException(SR.Format(SR.ResizeInvalidParameters, width, height));
}
}
//Transparency
//opacityMultiplier is between 0-1
public static void SetAlphaPercentage(this Image sourceImage, double opacityMultiplier)
{
if(opacityMultiplier > 1 || opacityMultiplier < 0)
{
throw new InvalidOperationException(SR.Format(SR.InvalidTransparencyPercent, opacityMultiplier));
}
double alphaAdjustment = 1 - opacityMultiplier;
for(int y = 0; y < sourceImage.HeightInPixels; y++)
{
for(int x = 0; x < sourceImage.WidthInPixels; x++)
{
//get the current color of the pixel
int currentColor = LibGDOSXImports.gdImageGetTrueColorPixel(sourceImage.gdImageStructPtr, x, y);
//mask to just get the alpha value (7 bits)
double currentAlpha = (currentColor >> 24) & 0xff;
if(y == 10)
//System.Console.WriteLine("curAReset: " + currentAlpha);
//if the current alpha is transparent
//dont bother/ skip over
if (currentAlpha == 127)
continue;
//calculate the new alpha value given the adjustment
currentAlpha += (127 - currentAlpha) * alphaAdjustment;
//make a new color with the new alpha to set the pixel
currentColor = (currentColor & 0x00ffffff | ((int)currentAlpha << 24));
//turn alpha blending off so you don't draw over the same picture and get an opaque cat
LibGDOSXImports.gdImageAlphaBlending(sourceImage.gdImageStructPtr, 0);
LibGDOSXImports.gdImageSetPixel(sourceImage.gdImageStructPtr, x, y, currentColor);
}
}
}
//Stamping an Image onto another
public static void Draw(this Image destinationImage, Image sourceImage, int xOffset, int yOffset)
{
//turn alpha blending on for drawing
LibGDOSXImports.gdImageAlphaBlending(destinationImage.gdImageStructPtr, 1);
//loop through the source image
for (int y = 0; y < sourceImage.HeightInPixels; y++)
{
for(int x = 0; x < sourceImage.WidthInPixels; x++)
{
int color = LibGDOSXImports.gdImageGetPixel(sourceImage.gdImageStructPtr, x, y);
int alpha = (color >> 24) & 0xff;
if (alpha == 127)
{
continue;
}
LibGDOSXImports.gdImageSetPixel(destinationImage.gdImageStructPtr, x + xOffset, y + yOffset, color);
}
}
}
}
}
#endif
=======
#endif
}
>>>>>>>
return destinationImage;
}
else
{
throw new InvalidOperationException(SR.Format(SR.ResizeInvalidParameters, width, height));
}
}
//Transparency
//opacityMultiplier is between 0-1
public static void SetAlphaPercentage(this Image sourceImage, double opacityMultiplier)
{
if(opacityMultiplier > 1 || opacityMultiplier < 0)
{
throw new InvalidOperationException(SR.Format(SR.InvalidTransparencyPercent, opacityMultiplier));
}
double alphaAdjustment = 1 - opacityMultiplier;
for(int y = 0; y < sourceImage.HeightInPixels; y++)
{
for(int x = 0; x < sourceImage.WidthInPixels; x++)
{
//get the current color of the pixel
int currentColor = LibGDOSXImports.gdImageGetTrueColorPixel(sourceImage.gdImageStructPtr, x, y);
//mask to just get the alpha value (7 bits)
double currentAlpha = (currentColor >> 24) & 0xff;
if(y == 10)
//System.Console.WriteLine("curAReset: " + currentAlpha);
//if the current alpha is transparent
//dont bother/ skip over
if (currentAlpha == 127)
continue;
//calculate the new alpha value given the adjustment
currentAlpha += (127 - currentAlpha) * alphaAdjustment;
//make a new color with the new alpha to set the pixel
currentColor = (currentColor & 0x00ffffff | ((int)currentAlpha << 24));
//turn alpha blending off so you don't draw over the same picture and get an opaque cat
LibGDOSXImports.gdImageAlphaBlending(sourceImage.gdImageStructPtr, 0);
LibGDOSXImports.gdImageSetPixel(sourceImage.gdImageStructPtr, x, y, currentColor);
}
}
}
//Stamping an Image onto another
public static void Draw(this Image destinationImage, Image sourceImage, int xOffset, int yOffset)
{
//turn alpha blending on for drawing
LibGDOSXImports.gdImageAlphaBlending(destinationImage.gdImageStructPtr, 1);
//loop through the source image
for (int y = 0; y < sourceImage.HeightInPixels; y++)
{
for(int x = 0; x < sourceImage.WidthInPixels; x++)
{
int color = LibGDOSXImports.gdImageGetPixel(sourceImage.gdImageStructPtr, x, y);
int alpha = (color >> 24) & 0xff;
if (alpha == 127)
{
continue;
}
LibGDOSXImports.gdImageSetPixel(destinationImage.gdImageStructPtr, x + xOffset, y + yOffset, color);
}
}
}
}
}
#endif
} |
<<<<<<<
internal DLLImports.gdImageStruct gdImageStruct;
=======
IntPtr gdImageStructPtr;
>>>>>>>
internal IntPtr gdImageStructPtr; |
<<<<<<<
/* Factory Methods */
public static Image Create(int width, int height)
{
return new Image(width, height);
}
public static Image Load(string filePath)
{
return new Image(filePath);
}
public static Image Load(Stream stream)
=======
private bool TrueColor
{
get
{
DLLImports.gdImageStruct gdImageStruct = Marshal.PtrToStructure<DLLImports.gdImageStruct>(gdImageStructPtr);
return (gdImageStruct.trueColor == 1);
}
}
/* Factory Methods */
public static Bitmap Create(int width, int height)
>>>>>>>
/* Factory Methods */
public static Image Create(int width, int height)
{
return new Image(width, height);
}
public static Image Load(string filePath)
{
return new Image(filePath);
}
public static Image Load(Stream stream)
{
return new Image(stream);
}
private bool TrueColor
{
get
{
DLLImports.gdImageStruct gdImageStruct = Marshal.PtrToStructure<DLLImports.gdImageStruct>(gdImageStructPtr);
return (gdImageStruct.trueColor == 1);
}
}
/* Factory Methods */
public static Bitmap Create(int width, int height)
<<<<<<<
private Image(string filePath)
{
//File.Exists(filePath);
if (DLLImports.gdSupportsFileType(filePath, false))
{
gdImageStructPtr = DLLImports.gdImageCreateFromFile(filePath);
DLLImports.gdImageStruct gdImageStruct = Marshal.PtrToStructure<DLLImports.gdImageStruct>(gdImageStructPtr);
System.Console.WriteLine("True Color : " + gdImageStruct.trueColor);
if(gdImageStruct.trueColor == 0)
{
int a = DLLImports.gdImagePaletteToTrueColor(gdImageStructPtr);
System.Console.WriteLine("palette to true color fail?: " + a);
gdImageStruct = Marshal.PtrToStructure<DLLImports.gdImageStruct>(gdImageStructPtr);
System.Console.WriteLine("True Color : " + gdImageStruct.trueColor);
}
System.Console.WriteLine("True Color : " + gdImageStruct.trueColor);
DLLImports.gdImageAlphaBlending(gdImageStructPtr, 0);
DLLImports.gdImageSaveAlpha(gdImageStructPtr, 1);
}
else
{
throw new FileLoadException("File type not supported.");
}
}
private Image(Stream stream)
{
throw new NotImplementedException();
}
=======
//private Image(string filePath)
//{
// if (!File.Exists(filePath))
// {
// throw new FileNotFoundException("Malformed file path given.");
// }
// else if (DLLImports.gdSupportsFileType(filePath, false))
// {
// gdImageStructPtr = DLLImports.gdImageCreateFromFile(filePath);
// DLLImports.gdImageStruct gdImageStruct = Marshal.PtrToStructure<DLLImports.gdImageStruct>(gdImageStructPtr);
// if(gdImageStruct.trueColor == 0)
// {
// int a = DLLImports.gdImagePaletteToTrueColor(gdImageStructPtr);
// gdImageStruct = Marshal.PtrToStructure<DLLImports.gdImageStruct>(gdImageStructPtr);
// }
// }
// else
// {
// throw new FileLoadException("File type not supported.");
// }
//}
//private Image(Stream stream)
//{
// throw new NotImplementedException();
//}
>>>>>>>
private Image(string filePath)
{
//File.Exists(filePath);
if (DLLImports.gdSupportsFileType(filePath, false))
{
gdImageStructPtr = DLLImports.gdImageCreateFromFile(filePath);
DLLImports.gdImageStruct gdImageStruct = Marshal.PtrToStructure<DLLImports.gdImageStruct>(gdImageStructPtr);
System.Console.WriteLine("True Color : " + gdImageStruct.trueColor);
if(gdImageStruct.trueColor == 0)
{
int a = DLLImports.gdImagePaletteToTrueColor(gdImageStructPtr);
System.Console.WriteLine("palette to true color fail?: " + a);
gdImageStruct = Marshal.PtrToStructure<DLLImports.gdImageStruct>(gdImageStructPtr);
System.Console.WriteLine("True Color : " + gdImageStruct.trueColor);
}
System.Console.WriteLine("True Color : " + gdImageStruct.trueColor);
DLLImports.gdImageAlphaBlending(gdImageStructPtr, 0);
DLLImports.gdImageSaveAlpha(gdImageStructPtr, 1);
}
else
{
throw new FileLoadException("File type not supported.");
}
}
private Image(Stream stream)
{
throw new NotImplementedException();
}
//private Image(string filePath)
//{
// if (!File.Exists(filePath))
// {
// throw new FileNotFoundException("Malformed file path given.");
// }
// else if (DLLImports.gdSupportsFileType(filePath, false))
// {
// gdImageStructPtr = DLLImports.gdImageCreateFromFile(filePath);
// DLLImports.gdImageStruct gdImageStruct = Marshal.PtrToStructure<DLLImports.gdImageStruct>(gdImageStructPtr);
// if(gdImageStruct.trueColor == 0)
// {
// int a = DLLImports.gdImagePaletteToTrueColor(gdImageStructPtr);
// gdImageStruct = Marshal.PtrToStructure<DLLImports.gdImageStruct>(gdImageStructPtr);
// }
// }
// else
// {
// throw new FileLoadException("File type not supported.");
// }
//}
//private Image(Stream stream)
//{
// throw new NotImplementedException();
//} |
<<<<<<<
public bool CopyNumberSwapped;
public bool IsHeterogeneous;
=======
public bool CopyNumberSwapped;
>>>>>>>
public bool CopyNumberSwapped;
public bool IsHeterogeneous;
<<<<<<<
writer.WriteLine("##INFO=<ID=SUBCLONAL,Number=0,Type=Flag,Description=\"Subclonal variant\">");
writer.WriteLine("##INFO=<ID=SVTYPE,Number=1,Type=String,Description=\"Type of structural variant\">");
writer.WriteLine("##INFO=<ID=END,Number=1,Type=Integer,Description=\"End position of the variant described in this record\">");
=======
writer.WriteLine("##INFO=<ID=CIEND,Number=2,Type=Integer,Description=\"Confidence interval around END for imprecise variants\">");
writer.WriteLine("##INFO=<ID=CIPOS,Number=2,Type=Integer,Description=\"Confidence interval around POS for imprecise variants\">");
>>>>>>>
writer.WriteLine("##INFO=<ID=CIEND,Number=2,Type=Integer,Description=\"Confidence interval around END for imprecise variants\">");
writer.WriteLine("##INFO=<ID=CIPOS,Number=2,Type=Integer,Description=\"Confidence interval around POS for imprecise variants\">");
<<<<<<<
// Assimilate an adjacent segment with the same copy number call and heterogeneity flag:
if (lastSegment.copyNumber == segments[segmentIndex].copyNumber && lastSegment.Chr == segments[segmentIndex].Chr &&
!IsForbiddenInterval(lastSegment.Chr, lastSegment.End, segments[segmentIndex].Begin, excludedIntervals) &&
lastSegment.IsHeterogeneous == segments[segmentIndex].IsHeterogeneous)
=======
// Assimilate an adjacent segment with the same copy number call:
if (lastSegment.CopyNumber == segments[segmentIndex].CopyNumber && lastSegment.Chr == segments[segmentIndex].Chr &&
!IsForbiddenInterval(lastSegment.Chr, lastSegment.End, segments[segmentIndex].Begin, excludedIntervals))
>>>>>>>
// Assimilate an adjacent segment with the same copy number call and heterogeneity flag:
if (lastSegment.CopyNumber == segments[segmentIndex].CopyNumber && lastSegment.Chr == segments[segmentIndex].Chr &&
!IsForbiddenInterval(lastSegment.Chr, lastSegment.End, segments[segmentIndex].Begin, excludedIntervals) &&
lastSegment.IsHeterogeneous == segments[segmentIndex].IsHeterogeneous)
<<<<<<<
// Assimilate an adjacent segment with the same copy number call and heterogeneity flag:
if (lastSegment.copyNumber == segments[segmentIndex].copyNumber && lastSegment.Chr == segments[segmentIndex].Chr &&
segments[segmentIndex].Begin - lastSegment.End < maximumMergeSpan && lastSegment.IsHeterogeneous == segments[segmentIndex].IsHeterogeneous)
=======
// Assimilate an adjacent segment with the same copy number call:
if (lastSegment.CopyNumber == segments[segmentIndex].CopyNumber && lastSegment.Chr == segments[segmentIndex].Chr &&
segments[segmentIndex].Begin - lastSegment.End < maximumMergeSpan)
>>>>>>>
// Assimilate an adjacent segment with the same copy number call and heterogeneity flag:
if (lastSegment.CopyNumber == segments[segmentIndex].CopyNumber && lastSegment.Chr == segments[segmentIndex].Chr &&
segments[segmentIndex].Begin - lastSegment.End < maximumMergeSpan && lastSegment.IsHeterogeneous == segments[segmentIndex].IsHeterogeneous) |
<<<<<<<
using CanvasPedigreeCaller.Visualization;
=======
using CanvasCommon;
>>>>>>>
using CanvasCommon;
using CanvasPedigreeCaller.Visualization;
<<<<<<<
using Isas.Framework.Settings;
using Isas.Framework.Utilities;
using Isas.Framework.WorkManagement;
using Isas.Framework.WorkManagement.CommandBuilding;
using Isas.SequencingFiles;
=======
using Utilities = Isas.Framework.Utilities.Utilities;
>>>>>>>
using Isas.Framework.Settings;
using Isas.Framework.WorkManagement;
using Isas.Framework.WorkManagement.CommandBuilding;
using Isas.SequencingFiles;
<<<<<<<
var settings = new SettingsProcessor();
var outputDirectory = new DirectoryLocation(outDir);
var workerDirectory = new DirectoryLocation(Utilities.GetAssemblyFolder(typeof(CanvasPedigreeCaller)));
var commandManager = new CommandManager(new ExecutableProcessor(settings, logger, workerDirectory));
var workManager = WorkManagerFactory.GetWorkManager(logger, outputDirectory, settings);
var bigWigConverter = new FormatConverterFactory(logger, workManager, commandManager).GetBedGraphToBigWigConverter();
var referenceGenome = new ReferenceGenomeFactory().GetReferenceGenome(new DirectoryLocation(referenceFolder));
var genomeMetadata = referenceGenome.GenomeMetadata;
var coverageBigWigWriter = new CoverageBigWigWriterFactory(logger, bigWigConverter, genomeMetadata).Create();
var caller = new CanvasPedigreeCaller(logger, qScoreThreshold, dqScoreThreshold, callerParameters, coverageBigWigWriter);
var outVcf = outputDirectory.GetFileLocation("CNV.vcf.gz");
return caller.CallVariants(variantFrequencyFiles, segmentFiles, outVcf, ploidyBedPath, referenceFolder, sampleNames, commonCNVsbedPath, pedigreeFile);
=======
var copyNumberLikelihoodCalculator = new CopyNumberLikelihoodCalculator(callerParameters.MaximumCopyNumber);
IVariantCaller variantCaller = new VariantCaller(copyNumberLikelihoodCalculator, callerParameters, qScoreThreshold);
var caller = new CanvasPedigreeCaller(logger, qScoreThreshold, dqScoreThreshold, callerParameters, copyNumberLikelihoodCalculator, variantCaller);
return caller.CallVariants(variantFrequencyFiles, segmentFiles, outDir, ploidyBedPath, referenceFolder, sampleNames, commonCnvsBedPath, sampleTypesEnum);
}
private static SampleType GetSampleType(string sampleType)
{
if (Enum.TryParse(sampleType, out SampleType sampleTypeEnum))
return sampleTypeEnum;
throw new ArgumentException($"CanvasPedigreeCaller.exe: SampleType {sampleType} does not exist!");
>>>>>>>
var settings = new SettingsProcessor();
var outputDirectory = new DirectoryLocation(outDir);
var workerDirectory = new DirectoryLocation(Isas.Framework.Utilities.Utilities.GetAssemblyFolder(typeof(CanvasPedigreeCaller)));
var commandManager = new CommandManager(new ExecutableProcessor(settings, logger, workerDirectory));
var workManager = WorkManagerFactory.GetWorkManager(logger, outputDirectory, settings);
var bigWigConverter = new FormatConverterFactory(logger, workManager, commandManager).GetBedGraphToBigWigConverter();
var referenceGenome = new ReferenceGenomeFactory().GetReferenceGenome(new DirectoryLocation(referenceFolder));
var genomeMetadata = referenceGenome.GenomeMetadata;
var coverageBigWigWriter = new CoverageBigWigWriterFactory(logger, bigWigConverter, genomeMetadata).Create();
var copyNumberLikelihoodCalculator = new CopyNumberLikelihoodCalculator(callerParameters.MaximumCopyNumber);
IVariantCaller variantCaller = new VariantCaller(copyNumberLikelihoodCalculator, callerParameters, qScoreThreshold);
var caller = new CanvasPedigreeCaller(logger, qScoreThreshold, dqScoreThreshold, callerParameters, copyNumberLikelihoodCalculator, variantCaller, coverageBigWigWriter);
var outVcf = outputDirectory.GetFileLocation("CNV.vcf.gz");
return caller.CallVariants(variantFrequencyFiles, segmentFiles, outVcf, ploidyBedPath, referenceFolder, sampleNames, commonCnvsBedPath, sampleTypesEnum);
}
private static SampleType GetSampleType(string sampleType)
{
if (Enum.TryParse(sampleType, out SampleType sampleTypeEnum))
return sampleTypeEnum;
throw new ArgumentException($"CanvasPedigreeCaller.exe: SampleType {sampleType} does not exist!"); |
<<<<<<<
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || false
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
>>>>>>>
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
<<<<<<<
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || false
[global::Uno.NotImplemented]
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
>>>>>>>
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
<<<<<<<
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || false
[global::Uno.NotImplemented]
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
>>>>>>>
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__")] |
<<<<<<<
_coverageBigWigWriter = coverageBigWigWriter;
QualityFilterThreshold = qualityFilterThreshold;
DeNovoQualityFilterThreshold = deNovoQualityFilterThreshold;
CallerParameters = callerParameters;
=======
_qualityFilterThreshold = qualityFilterThreshold;
_deNovoQualityFilterThreshold = deNovoQualityFilterThreshold;
_callerParameters = callerParameters;
_copyNumberLikelihoodCalculator = copyNumberLikelihoodCalculator;
_variantCaller = variantCaller;
>>>>>>>
_qualityFilterThreshold = qualityFilterThreshold;
_deNovoQualityFilterThreshold = deNovoQualityFilterThreshold;
_callerParameters = callerParameters;
_copyNumberLikelihoodCalculator = copyNumberLikelihoodCalculator;
_variantCaller = variantCaller;
_coverageBigWigWriter = coverageBigWigWriter;
<<<<<<<
IFileLocation outVcfFile, string ploidyBedPath, string referenceFolder, List<string> sampleNames, string commonCNVsbedPath, string pedigreeFile)
=======
string outVcfFile, string ploidyBedPath, string referenceFolder, List<string> sampleNames, string commonCnvsBedPath, List<SampleType> sampleTypes)
>>>>>>>
IFileLocation outVcfFile, string ploidyBedPath, string referenceFolder, List<string> sampleNames, string commonCnvsBedPath, List<SampleType> sampleTypes)
<<<<<<<
var mergedVariantCalledSegments = MergeSegments(variantCalledSegments, CallerParameters.MinimumCallSize);
var outputFolder = outVcfFile.Directory;
=======
var mergedVariantCalledSegments = MergeSegments(variantCalledSegments, _callerParameters.MinimumCallSize);
var outputFolder = new FileLocation(outVcfFile).Directory;
>>>>>>>
var mergedVariantCalledSegments = MergeSegments(variantCalledSegments, _callerParameters.MinimumCallSize);
var outputFolder = outVcfFile.Directory;
<<<<<<<
CanvasSegmentWriter.WriteMultiSampleSegments(outVcfFile.FullName, mergedVariantCalledSegments, diploidCoverage, referenceFolder, names,
null, ploidies, QualityFilterThreshold, isPedigreeInfoSupplied, denovoQualityThreshold);
=======
CanvasSegmentWriter.WriteMultiSampleSegments(outVcfFile, mergedVariantCalledSegments, diploidCoverage, referenceFolder, names,
null, ploidies, _qualityFilterThreshold, isPedigreeInfoSupplied, denovoQualityThreshold);
>>>>>>>
CanvasSegmentWriter.WriteMultiSampleSegments(outVcfFile.FullName, mergedVariantCalledSegments, diploidCoverage, referenceFolder, names,
null, ploidies, _qualityFilterThreshold, isPedigreeInfoSupplied, denovoQualityThreshold);
<<<<<<<
samplesInfo[sampleId].Ploidy, QualityFilterThreshold, isPedigreeInfoSupplied, denovoQualityThreshold);
var visualizationTemp = outputFolder.CreateSubdirectory($"VisualizationTemp{sampleId}");
var bigWig = _coverageBigWigWriter.Write(mergedVariantCalledSegments[sampleId], visualizationTemp);
bigWig.MoveTo(SingleSampleCallset.GetSingleSamplePedigreeCoverageBigWig(outputFolder, sampleId.ToString()));
=======
samplesInfo[sampleId].Ploidy, _qualityFilterThreshold, isPedigreeInfoSupplied, denovoQualityThreshold);
>>>>>>>
samplesInfo[sampleId].Ploidy, _qualityFilterThreshold, isPedigreeInfoSupplied, denovoQualityThreshold);
var visualizationTemp = outputFolder.CreateSubdirectory($"VisualizationTemp{sampleId}");
var bigWig = _coverageBigWigWriter.Write(mergedVariantCalledSegments[sampleId], visualizationTemp);
bigWig.MoveTo(SingleSampleCallset.GetSingleSamplePedigreeCoverageBigWig(outputFolder, sampleId.ToString())); |
<<<<<<<
using Utilities = Isas.Framework.Utilities.Utilities;
=======
using Isas.Framework.Utilities;
using Isas.SequencingFiles;
>>>>>>>
using Isas.Framework.Utilities;
using Isas.SequencingFiles;
<<<<<<<
var sampleTypesEnum = sampleTypesString.Select(GetSampleType).ToList();
=======
>>>>>>>
var sampleTypesEnum = sampleTypesString.Select(GetSampleType).ToList(); |
<<<<<<<
private static readonly FileOption PloidyFile = FileOption.Create("bed or vcf file specifying the regions where reference ploidy is not 2", "p", "ploidy");
=======
private static readonly FileOption PloidyBed = FileOption.Create("Bed file specifying the regions where reference ploidy is not 2", "p", "ploidy");
private static readonly FlagOption SplitBySize = new FlagOption("Split by variant size", "s", "splitBySize");
private static readonly FlagOption SkipDiploid = new FlagOption("Skip diploid calls", "d", "skipDiploid");
>>>>>>>
private static readonly FileOption PloidyFile = FileOption.Create("bed or vcf file specifying the regions where reference ploidy is not 2", "p", "ploidy");
private static readonly FlagOption SplitBySize = new FlagOption("Split by variant size", "s", "splitBySize");
private static readonly FlagOption SkipDiploid = new FlagOption("Skip diploid calls", "d", "skipDiploid");
<<<<<<<
PloidyFile,
=======
PloidyBed,
SplitBySize,
SkipDiploid,
>>>>>>>
SplitBySize,
SkipDiploid,
PloidyFile,
<<<<<<<
IFileLocation ploidyFile = parseInput.Get(PloidyFile);
=======
IFileLocation ploidyBed = parseInput.Get(PloidyBed);
bool splitBySize = parseInput.Get(SplitBySize);
bool skipDiploid = parseInput.Get(SkipDiploid);
>>>>>>>
bool splitBySize = parseInput.Get(SplitBySize);
bool skipDiploid = parseInput.Get(SkipDiploid);
IFileLocation ploidyFile = parseInput.Get(PloidyFile);
<<<<<<<
return ParsingResult<EvaluateCnvOptions>.SuccessfulResult(new EvaluateCnvOptions(roiBed, heterogeneityFraction, dqscoreThreshold, ploidyFile, help));
=======
return ParsingResult<EvaluateCnvOptions>.SuccessfulResult(new EvaluateCnvOptions(baseFileName, roiBed, heterogeneityFraction,
dqscoreThreshold, ploidyBed, splitBySize, skipDiploid, help));
>>>>>>>
return ParsingResult<EvaluateCnvOptions>.SuccessfulResult(new EvaluateCnvOptions(baseFileName, roiBed, heterogeneityFraction,
dqscoreThreshold, ploidyFile, splitBySize, skipDiploid, help));
<<<<<<<
public IFileLocation PloidyFile { get; }
=======
public IFileLocation PloidyBed { get; }
public bool SplitBySize { get; }
public bool SkipDiploid { get; }
>>>>>>>
public bool SplitBySize { get; }
public bool SkipDiploid { get; }
public IFileLocation PloidyFile { get; }
<<<<<<<
public EvaluateCnvOptions(IFileLocation roiBed, double heterogeneityFraction, double? dqscoreThreshold, IFileLocation ploidyFile, bool help)
=======
public EvaluateCnvOptions(string baseFileName, IFileLocation roiBed, double heterogeneityFraction, double? dqscoreThreshold, IFileLocation ploidyBed, bool splitBySize, bool skipDiploid, bool help)
>>>>>>>
public EvaluateCnvOptions(string baseFileName, IFileLocation roiBed, double heterogeneityFraction, double? dqscoreThreshold, IFileLocation ploidyFile, bool splitBySize, bool skipDiploid, bool help)
<<<<<<<
PloidyFile = ploidyFile;
=======
PloidyBed = ploidyBed;
SplitBySize = splitBySize;
SkipDiploid = skipDiploid;
>>>>>>>
SplitBySize = splitBySize;
SkipDiploid = skipDiploid;
PloidyFile = ploidyFile; |
<<<<<<<
[Test]
[AutoRetry]
public void ListView_ExpandableItem_ExpandSingleItem()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item");
var checkBox = _app.Marked("CheckBox");
_app.WaitForElement(checkBox);
// Save initial state(not expanded)
var screenshot1 = TakeScreenshot("Initial State");
// Expand and compare
ClickCheckBoxAt(0);
var screenshot2 = TakeScreenshot("Expanded State");
ImageAssert.AreNotEqual(screenshot1, screenshot2);
// Collapse and compare
ClickCheckBoxAt(0);
var screenshot3 = TakeScreenshot("Collapsed State");
ImageAssert.AreEqual(screenshot1, screenshot3);
}
[Test]
[AutoRetry]
public void ListView_ExpandableItem_ExpandMultipleItems()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item");
var checkBox = _app.Marked("CheckBox");
_app.WaitForElement(checkBox);
// Save initial state(not expanded)
var screenshot1 = TakeScreenshot("Initial State");
// Expand multiple items and compare
ClickCheckBoxAt(0);
ClickCheckBoxAt(1);
ClickCheckBoxAt(2);
var screenshot2 = TakeScreenshot("Expanded State");
ImageAssert.AreNotEqual(screenshot1, screenshot2);
// Collapse all and compare
ClickCheckBoxAt(0);
ClickCheckBoxAt(1);
ClickCheckBoxAt(2);
var screenshot3 = TakeScreenshot("Collapsed State");
ImageAssert.AreEqual(screenshot1, screenshot3);
}
[Test]
[AutoRetry]
public void ListView_ExpandableItemLarge_ExpandHeader_Validation()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item_Large");
var checkBoxHeader = _app.Marked("CheckBoxHeader");
_app.WaitForElement(checkBoxHeader);
// Save initial state(not expanded)
var screenshot1 = TakeScreenshot("Initial State");
// Expand and compare
checkBoxHeader.Tap();
var screenshot2 = TakeScreenshot("Expanded State");
ImageAssert.AreNotEqual(screenshot1, screenshot2);
// Collapse and compare
checkBoxHeader.Tap();
var screenshot3 = TakeScreenshot("Collapsed State");
ImageAssert.AreAlmostEqual(screenshot1, screenshot3);
}
[Test]
[AutoRetry]
public void ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item_Large");
var checkBoxHeader = _app.Marked("CheckBoxHeader");
_app.WaitForElement(checkBoxHeader);
// Save initial state(not expanded)
var screenshot1 = TakeScreenshot("Initial State");
// Expand and compare
checkBoxHeader.Tap();
ClickCheckBoxAt(0);
ClickCheckBoxAt(1);
ClickCheckBoxAt(2);
var screenshot2 = TakeScreenshot("Expanded State");
ImageAssert.AreNotEqual(screenshot1, screenshot2);
// Collapse and compare
checkBoxHeader.Tap();
ClickCheckBoxAt(0);
ClickCheckBoxAt(1);
ClickCheckBoxAt(2);
var screenshot3 = TakeScreenshot("Collapsed State");
ImageAssert.AreEqual(screenshot1, screenshot3);
}
[Test]
[AutoRetry]
public void ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item_Large");
var checkBoxHeader = _app.Marked("CheckBoxHeader");
_app.WaitForElement(checkBoxHeader);
// Save initial state(not expanded)
var screenshot1 = TakeScreenshot("Initial State");
// Expand multiple items, header and compare
checkBoxHeader.Tap();
ClickCheckBoxAt(0);
var screenshot2 = TakeScreenshot("Expanded State");
ImageAssert.AreNotEqual(screenshot1, screenshot2);
// Collapse all and compare
checkBoxHeader.Tap();
ClickCheckBoxAt(0);
var screenshot3 = TakeScreenshot("Collapsed State");
ImageAssert.AreEqual(screenshot1, screenshot3);
}
private void ClickCheckBoxAt(int i)
{
_app.Marked("CheckBox").AtIndex(i).Tap();
}
=======
[Test]
[AutoRetry]
public void ListView_SelectedItem()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_SelectedItem");
_app.WaitForText("_SelectedItem", "3");
_app.WaitForText("itemsStackPanelListSelectedItem", "3");
_app.WaitForText("stackPanelListSelectedItem", "3");
{
var firstItem = _app.Marked("itemsStackPanelList").Descendant().Marked("1");
_app.FastTap(firstItem);
_app.WaitForText("itemsStackPanelListSelectedItem", "1");
}
{
var firstItem = _app.Marked("stackPanelList").Descendant().Marked("1");
_app.FastTap(firstItem);
_app.WaitForText("itemsStackPanelListSelectedItem", "1");
}
TakeScreenshot("Both Selection Changed");
}
[Test]
[AutoRetry]
public void ListView_SelectedItems()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewSelectedItems");
_app.FastTap("Right 0");
_app.WaitForText("_selectedItem", "Selected item: 0");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(0, ), RemovedItems=()");
_app.FastTap("Left 0");
_app.WaitForText("_selectedItem", "Selected item: ");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(), RemovedItems=(0, )");
_app.FastTap("Left 0");
_app.WaitForText("_selectedItem", "Selected item: 0");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(0, ), RemovedItems=()");
_app.FastTap("Left 1");
_app.WaitForText("_selectedItem", "Selected item: 0");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(1, ), RemovedItems=()");
_app.FastTap("Left 2");
_app.WaitForText("_selectedItem", "Selected item: 0");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(2, ), RemovedItems=()");
_app.FastTap("Center 3");
_app.WaitForText("_selectedItem", "Selected item: 3");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(3, ), RemovedItems=(0, 1, 2, )");
_app.FastTap("Right 0");
_app.FastTap("Right 1");
_app.FastTap("Right 2");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(2, ), RemovedItems=()");
_app.FastTap("ClearSelectedItemButton");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(), RemovedItems=(3, 0, 1, 2, )");
}
>>>>>>>
[Test]
[AutoRetry]
public void ListView_ExpandableItem_ExpandSingleItem()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item");
var checkBox = _app.Marked("CheckBox");
_app.WaitForElement(checkBox);
// Save initial state(not expanded)
var screenshot1 = TakeScreenshot("Initial State");
// Expand and compare
ClickCheckBoxAt(0);
var screenshot2 = TakeScreenshot("Expanded State");
ImageAssert.AreNotEqual(screenshot1, screenshot2);
// Collapse and compare
ClickCheckBoxAt(0);
var screenshot3 = TakeScreenshot("Collapsed State");
ImageAssert.AreEqual(screenshot1, screenshot3);
}
[Test]
[AutoRetry]
public void ListView_ExpandableItem_ExpandMultipleItems()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item");
var checkBox = _app.Marked("CheckBox");
_app.WaitForElement(checkBox);
// Save initial state(not expanded)
var screenshot1 = TakeScreenshot("Initial State");
// Expand multiple items and compare
ClickCheckBoxAt(0);
ClickCheckBoxAt(1);
ClickCheckBoxAt(2);
var screenshot2 = TakeScreenshot("Expanded State");
ImageAssert.AreNotEqual(screenshot1, screenshot2);
// Collapse all and compare
ClickCheckBoxAt(0);
ClickCheckBoxAt(1);
ClickCheckBoxAt(2);
var screenshot3 = TakeScreenshot("Collapsed State");
ImageAssert.AreEqual(screenshot1, screenshot3);
}
[Test]
[AutoRetry]
public void ListView_SelectedItem()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_SelectedItem");
_app.WaitForText("_SelectedItem", "3");
_app.WaitForText("itemsStackPanelListSelectedItem", "3");
_app.WaitForText("stackPanelListSelectedItem", "3");
{
var firstItem = _app.Marked("itemsStackPanelList").Descendant().Marked("1");
_app.FastTap(firstItem);
_app.WaitForText("itemsStackPanelListSelectedItem", "1");
}
{
var firstItem = _app.Marked("stackPanelList").Descendant().Marked("1");
_app.FastTap(firstItem);
_app.WaitForText("itemsStackPanelListSelectedItem", "1");
}
TakeScreenshot("Both Selection Changed");
}
[Test]
[AutoRetry]
public void ListView_ExpandableItemLarge_ExpandHeader_Validation()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item_Large");
var checkBoxHeader = _app.Marked("CheckBoxHeader");
_app.WaitForElement(checkBoxHeader);
// Save initial state(not expanded)
var screenshot1 = TakeScreenshot("Initial State");
// Expand and compare
checkBoxHeader.Tap();
var screenshot2 = TakeScreenshot("Expanded State");
ImageAssert.AreNotEqual(screenshot1, screenshot2);
// Collapse and compare
checkBoxHeader.Tap();
var screenshot3 = TakeScreenshot("Collapsed State");
ImageAssert.AreAlmostEqual(screenshot1, screenshot3);
}
[Test]
[AutoRetry]
public void ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item_Large");
var checkBoxHeader = _app.Marked("CheckBoxHeader");
_app.WaitForElement(checkBoxHeader);
// Save initial state(not expanded)
var screenshot1 = TakeScreenshot("Initial State");
// Expand and compare
checkBoxHeader.Tap();
ClickCheckBoxAt(0);
ClickCheckBoxAt(1);
ClickCheckBoxAt(2);
var screenshot2 = TakeScreenshot("Expanded State");
ImageAssert.AreNotEqual(screenshot1, screenshot2);
// Collapse and compare
checkBoxHeader.Tap();
ClickCheckBoxAt(0);
ClickCheckBoxAt(1);
ClickCheckBoxAt(2);
var screenshot3 = TakeScreenshot("Collapsed State");
ImageAssert.AreEqual(screenshot1, screenshot3);
}
[Test]
[AutoRetry]
public void ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item_Large");
var checkBoxHeader = _app.Marked("CheckBoxHeader");
_app.WaitForElement(checkBoxHeader);
// Save initial state(not expanded)
var screenshot1 = TakeScreenshot("Initial State");
// Expand multiple items, header and compare
checkBoxHeader.Tap();
ClickCheckBoxAt(0);
var screenshot2 = TakeScreenshot("Expanded State");
ImageAssert.AreNotEqual(screenshot1, screenshot2);
// Collapse all and compare
checkBoxHeader.Tap();
ClickCheckBoxAt(0);
var screenshot3 = TakeScreenshot("Collapsed State");
ImageAssert.AreEqual(screenshot1, screenshot3);
}
public void ListView_SelectedItems()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewSelectedItems");
_app.FastTap("Right 0");
_app.WaitForText("_selectedItem", "Selected item: 0");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(0, ), RemovedItems=()");
_app.FastTap("Left 0");
_app.WaitForText("_selectedItem", "Selected item: ");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(), RemovedItems=(0, )");
_app.FastTap("Left 0");
_app.WaitForText("_selectedItem", "Selected item: 0");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(0, ), RemovedItems=()");
_app.FastTap("Left 1");
_app.WaitForText("_selectedItem", "Selected item: 0");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(1, ), RemovedItems=()");
_app.FastTap("Left 2");
_app.WaitForText("_selectedItem", "Selected item: 0");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(2, ), RemovedItems=()");
_app.FastTap("Center 3");
_app.WaitForText("_selectedItem", "Selected item: 3");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(3, ), RemovedItems=(0, 1, 2, )");
_app.FastTap("Right 0");
_app.FastTap("Right 1");
_app.FastTap("Right 2");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(2, ), RemovedItems=()");
_app.FastTap("ClearSelectedItemButton");
_app.WaitForText("SelectionChangedTextBlock", "SelectionChanged event: AddedItems=(), RemovedItems=(3, 0, 1, 2, )");
}
private void ClickCheckBoxAt(int i)
{
_app.Marked("CheckBox").AtIndex(i).Tap();
} |
<<<<<<<
public const string TokenCacheJsonSerializerFailedParse = "MSAL V3 Deserialization failed to parse the cache contents. Is this possibly an earlier format needed for DeserializeMsalV2?";
public const string TokenCacheDictionarySerializerFailedParse = "MSAL V2 Deserialization failed to parse the cache contents. Is this possibly an earlier format needed for DeserializeMsalV3?";
=======
public const string BrokerNotSupportedOnThisPlatform = "Broker is only supported on mobile platforms (Android and iOS). See https://aka.ms/msal-brokers for details";
>>>>>>>
public const string TokenCacheJsonSerializerFailedParse = "MSAL V3 Deserialization failed to parse the cache contents. Is this possibly an earlier format needed for DeserializeMsalV2?";
public const string TokenCacheDictionarySerializerFailedParse = "MSAL V2 Deserialization failed to parse the cache contents. Is this possibly an earlier format needed for DeserializeMsalV3?";
public const string BrokerNotSupportedOnThisPlatform = "Broker is only supported on mobile platforms (Android and iOS). See https://aka.ms/msal-brokers for details"; |
<<<<<<<
private async Task<T> GetResponseAsync<T>(string endpointType, bool respondToDeviceAuthChallenge)
{
=======
private async Task<T> GetResponseAsync<T>(bool respondToDeviceAuthChallenge)
{
>>>>>>>
private async Task<T> GetResponseAsync<T>(bool respondToDeviceAuthChallenge)
{
<<<<<<<
if (ex.InnerException is TaskCanceledException)
{
Resiliency = true;
PlatformPlugin.Logger.Information(this.CallState, ex.InnerException + "Network timeout..Client Resiliency feature enabled..");
}
if (!this.isDeviceAuthChallenge(endpointType, ex.WebResponse, respondToDeviceAuthChallenge))
=======
if (!this.isDeviceAuthChallenge(ex.WebResponse, respondToDeviceAuthChallenge))
>>>>>>>
if (ex.InnerException is TaskCanceledException)
{
Resiliency = true;
PlatformPlugin.Logger.Information(this.CallState, ex.InnerException + "Network timeout..Client Resiliency feature enabled..");
}
if (!this.isDeviceAuthChallenge(ex.WebResponse, respondToDeviceAuthChallenge))
<<<<<<<
finally
{
clientMetrics.EndClientMetricsRecord(endpointType, this.CallState);
}
=======
>>>>>>>
<<<<<<<
private bool isDeviceAuthChallenge(string endpointType, IHttpWebResponse response, bool respondToDeviceAuthChallenge)
=======
private bool isDeviceAuthChallenge(IHttpWebResponse response, bool respondToDeviceAuthChallenge)
>>>>>>>
private bool isDeviceAuthChallenge(IHttpWebResponse response, bool respondToDeviceAuthChallenge)
<<<<<<<
respondToDeviceAuthChallenge && response != null &&
=======
respondToDeviceAuthChallenge && response != null && response.Headers != null &&
>>>>>>>
respondToDeviceAuthChallenge && response != null && response.Headers != null && |
<<<<<<<
public override string GetDeviceNetworkState()
{
// TODO(mats):
return string.Empty;
}
public override string GetDpti()
{
// TODO(mats):
return string.Empty;
}
public override string GetMatsOsPlatform()
{
return MatsConverter.AsString(OsPlatform.Win32);
}
public override int GetMatsOsPlatformCode()
{
return MatsConverter.AsInt(OsPlatform.Win32);
}
=======
protected override IFeatureFlags CreateFeatureFlags() => new UapFeatureFlags();
>>>>>>>
public override string GetDeviceNetworkState()
{
// TODO(mats):
return string.Empty;
}
public override string GetDpti()
{
// TODO(mats):
return string.Empty;
}
public override string GetMatsOsPlatform()
{
return MatsConverter.AsString(OsPlatform.Win32);
}
public override int GetMatsOsPlatformCode()
{
return MatsConverter.AsInt(OsPlatform.Win32);
}
protected override IFeatureFlags CreateFeatureFlags() => new UapFeatureFlags(); |
<<<<<<<
///
=======
/// Sets the Application token cache. This cache is used in client credential flows
/// (<see cref="IConfidentialClientApplication.AcquireTokenForClientAsync(System.Collections.Generic.IEnumerable{string})"/>
/// and its override
/// </summary>
/// <param name="tokenCache">Application token cache</param>
/// <returns></returns>
[Obsolete("You can access the AppTokenCache using the AppTokenCache property on the created IConfidentialClientApplication")]
public ConfidentialClientApplicationBuilder WithAppTokenCache(TokenCache tokenCache)
{
throw new NotImplementedException();
}
/// <summary>
/// Sets the user token cache. In a confidential client application, you should ensure that there is
/// one cache per user.
/// </summary>
/// <param name="tokenCache">User token cache</param>
/// <returns></returns>
[Obsolete("You can access the UserTokenCache using the UserTokenCache property on the created IConfidentialClientApplication")]
public ConfidentialClientApplicationBuilder WithUserTokenCache(TokenCache tokenCache)
{
throw new NotImplementedException();
}
/// <summary>
/// Sets the certificate associated with the application
>>>>>>>
/// Sets the certificate associated with the application |
<<<<<<<
public override string GetDeviceNetworkState()
{
// TODO(mats):
return string.Empty;
}
public override string GetDpti()
{
// TODO(mats):
return string.Empty;
}
public override string GetMatsOsPlatform()
{
return MatsConverter.AsString(OsPlatform.Android);
}
public override int GetMatsOsPlatformCode()
{
return MatsConverter.AsInt(OsPlatform.Android);
}
=======
protected override IFeatureFlags CreateFeatureFlags() => new AndroidFeatureFlags();
>>>>>>>
public override string GetDeviceNetworkState()
{
// TODO(mats):
return string.Empty;
}
public override string GetDpti()
{
// TODO(mats):
return string.Empty;
}
public override string GetMatsOsPlatform()
{
return MatsConverter.AsString(OsPlatform.Android);
}
public override int GetMatsOsPlatformCode()
{
return MatsConverter.AsInt(OsPlatform.Android);
}
protected override IFeatureFlags CreateFeatureFlags() => new AndroidFeatureFlags(); |
<<<<<<<
CacheQueryData = new CacheQueryData();
CacheQueryData.Authority = Authenticator.Authority;
CacheQueryData.Resource = this.Resource;
CacheQueryData.ClientId = this.ClientKey.ClientId;
CacheQueryData.SubjectType = this.TokenSubjectType;
CacheQueryData.UniqueId = this.UniqueId;
CacheQueryData.DisplayableId = this.DisplayableId;
CacheQueryData.ExtendedLifeTimeEnabled = requestData.ExtendedLifeTimeEnabled;
=======
}
>>>>>>>
CacheQueryData.ExtendedLifeTimeEnabled = requestData.ExtendedLifeTimeEnabled;
<<<<<<<
AuthenticationResultEx extendedLifetimeResultEx = null;
=======
CacheQueryData.Authority = Authenticator.Authority;
CacheQueryData.Resource = this.Resource;
CacheQueryData.ClientId = this.ClientKey.ClientId;
CacheQueryData.SubjectType = this.TokenSubjectType;
CacheQueryData.UniqueId = this.UniqueId;
CacheQueryData.DisplayableId = this.DisplayableId;
>>>>>>>
AuthenticationResultEx extendedLifetimeResultEx = null;
CacheQueryData.Authority = Authenticator.Authority;
CacheQueryData.Resource = this.Resource;
CacheQueryData.ClientId = this.ClientKey.ClientId;
CacheQueryData.SubjectType = this.TokenSubjectType;
CacheQueryData.UniqueId = this.UniqueId;
CacheQueryData.DisplayableId = this.DisplayableId;
<<<<<<<
client = new AdalHttpClient(this.Authenticator.TokenUri, this.CallState)
{ Client = { BodyParameters = requestParameters } };
TokenResponse tokenResponse = await client.GetResponseAsync<TokenResponse>(ClientMetricsEndpointType.Token);
=======
var client = new AdalHttpClient(this.Authenticator.TokenUri, this.CallState) { Client = { BodyParameters = requestParameters } };
TokenResponse tokenResponse = await client.GetResponseAsync<TokenResponse>();
>>>>>>>
client = new AdalHttpClient(this.Authenticator.TokenUri, this.CallState)
{ Client = { BodyParameters = requestParameters } };
TokenResponse tokenResponse = await client.GetResponseAsync<TokenResponse>(); |
<<<<<<<
/// <remarks>You can add several authorities, but only one can be the default authority.</remarks>
=======
>>>>>>>
<<<<<<<
/// <remarks>You can add several authorities, but only one can be the default authority.</remarks>
=======
>>>>>>>
<<<<<<<
/// <remarks>You can add several authorities, but only one can be the default authority.
/// MSAL.NET will only support ADFS 2019 or later.</remarks>
=======
/// <remarks>You can add several authorities, but only one can be the default authority.</remarks>
/// MSAL.NET will only support ADFS 2019
>>>>>>>
/// <remarks>You can add several authorities, but only one can be the default authority.
/// MSAL.NET will only support ADFS 2019 or later.</remarks>
<<<<<<<
/// <param name="isDefaultAuthority">Boolean telling if this is the default authority
/// for the application</param>
/// <remarks>You can add several authorities, but only one can be the default authority.</remarks>
=======
/// <param name="isDefaultAuthority"></param>
/// <remarks>You can add several authorities, but only one can be the default authority.</remarks>
>>>>>>>
/// <param name="isDefaultAuthority">Boolean telling if this is the default authority
/// for the application</param>
/// <remarks>You can add several authorities, but only one can be the default authority.</remarks> |
<<<<<<<
public const string ClientApplicationBaseExecutorNotImplemented =
"ClientApplicationBase implementation does not implement IClientApplicationBaseExecutor.";
public const string ActivityRequiredForParentObjectAndroid = "Activity is required for parent object on Android.";
public const string LoggingCallbackAlreadySet = "LoggingCallback has already been set";
public const string TelemetryCallbackAlreadySet = "TelemetryCallback has already been set";
public const string NoClientIdWasSpecified = "No ClientId was specified.";
public const string MoreThanOneDefaultAuthorityConfigured = "More than one default authority was configured.";
public const string AdfsNotCurrentlySupportedAuthorityType = "ADFS is not currently a supported authority type.";
public const string TenantIdAndAadAuthorityInstanceAreMutuallyExclusive = "TenantId and AadAuthorityAudience are both set, but they're mutually exclusive.";
public const string InstanceAndAzureCloudInstanceAreMutuallyExclusive = "Instance and AzureCloudInstance are both set but they're mutually exclusive.";
=======
public const string NoRefreshTokenProvided = "A refresh token must be provided.";
public const string NullTokenCacheError = "Token cache is set to null. Acquire by refresh token requests cannot be executed.";
public const string NoRefreshTokenInResponse = "Acquire by refresh token request completed, but no refresh token was found";
>>>>>>>
public const string ClientApplicationBaseExecutorNotImplemented =
"ClientApplicationBase implementation does not implement IClientApplicationBaseExecutor.";
public const string ActivityRequiredForParentObjectAndroid = "Activity is required for parent object on Android.";
public const string LoggingCallbackAlreadySet = "LoggingCallback has already been set";
public const string TelemetryCallbackAlreadySet = "TelemetryCallback has already been set";
public const string NoClientIdWasSpecified = "No ClientId was specified.";
public const string MoreThanOneDefaultAuthorityConfigured = "More than one default authority was configured.";
public const string AdfsNotCurrentlySupportedAuthorityType = "ADFS is not currently a supported authority type.";
public const string TenantIdAndAadAuthorityInstanceAreMutuallyExclusive = "TenantId and AadAuthorityAudience are both set, but they're mutually exclusive.";
public const string InstanceAndAzureCloudInstanceAreMutuallyExclusive = "Instance and AzureCloudInstance are both set but they're mutually exclusive.";
public const string NoRefreshTokenProvided = "A refresh token must be provided.";
public const string NullTokenCacheError = "Token cache is set to null. Acquire by refresh token requests cannot be executed.";
public const string NoRefreshTokenInResponse = "Acquire by refresh token request completed, but no refresh token was found"; |
<<<<<<<
public static string InvalidRedirectUriReceived(string invalidRedirectUri)
{
return $"Invalid RedirectURI was received ({invalidRedirectUri}) Not parseable into System.Uri class.";
}
=======
public static string DefaultAuthorityTypeInstanceAudienceMismatch(AuthorityType authorityType, string defaultAuthorityInstance, string defaultAuthorityAudience)
{
return string.Format(CultureInfo.InvariantCulture,
"DefaultAuthorityType is {0} but defaultAuthorityInstance({1}) or defaultAuthorityAudience({2}) is invalid.",
authorityType, defaultAuthorityInstance, defaultAuthorityAudience);
}
>>>>>>>
public static string InvalidRedirectUriReceived(string invalidRedirectUri)
{
return $"Invalid RedirectURI was received ({invalidRedirectUri}) Not parseable into System.Uri class.";
}
public static string DefaultAuthorityTypeInstanceAudienceMismatch(AuthorityType authorityType, string defaultAuthorityInstance, string defaultAuthorityAudience)
{
return string.Format(CultureInfo.InvariantCulture,
"DefaultAuthorityType is {0} but defaultAuthorityInstance({1}) or defaultAuthorityAudience({2}) is invalid.",
authorityType, defaultAuthorityInstance, defaultAuthorityAudience);
} |
<<<<<<<
public static class Midi
{
#if __WASM__
/// <summary>
/// Allows MIDI System eclusive access for WebAssembly.
/// </summary>
public static bool RequestSystemExclusiveAccess { get; set; }
#endif
}
=======
public static class NetworkInformation
{
public static string ReachabilityHostname { get; set; } = "www.example.com";
}
>>>>>>>
public static class Midi
{
#if __WASM__
/// <summary>
/// Allows MIDI System eclusive access for WebAssembly.
/// </summary>
public static bool RequestSystemExclusiveAccess { get; set; }
#endif
}
public static class NetworkInformation
{
public static string ReachabilityHostname { get; set; } = "www.example.com";
} |
<<<<<<<
get;
set;
=======
get
{
return GetXmlNodeDoubleNull(_crossesAtPath);
}
set
{
if (value == null)
{
DeleteNode(_crossesAtPath, true);
}
else
{
SetXmlNodeString(_crossesAtPath, ((double)value).ToString(CultureInfo.InvariantCulture));
}
}
>>>>>>>
get;
set;
DeleteNode(_crossesAtPath, true);
<<<<<<<
get;
set;
}
=======
get
{
string v = GetXmlNodeString(_displayUnitPath);
if (string.IsNullOrEmpty(v))
{
var c = GetXmlNodeDoubleNull(_custUnitPath);
if (c == null)
{
return 0;
}
else
{
return c.Value;
}
}
else
{
try
{
return (double)(long)Enum.Parse(typeof(eBuildInUnits), v, true);
}
catch
{
return 0;
}
}
}
set
{
if (AxisType == eAxisType.Val && value>=0)
{
foreach(var v in Enum.GetValues(typeof(eBuildInUnits)))
{
if((double)(long)v==value)
{
DeleteNode(_custUnitPath, true);
SetXmlNodeString(_displayUnitPath, ((eBuildInUnits)value).ToString());
return;
}
}
DeleteNode(_displayUnitPath, true);
if(value!=0)
{
SetXmlNodeString(_custUnitPath, value.ToString(CultureInfo.InvariantCulture));
}
}
}
}
ExcelChartTitle _title = null;
>>>>>>>
get;
set;
DeleteNode(_custUnitPath, true);
DeleteNode(_displayUnitPath, true);
}
<<<<<<<
get;
set;
=======
get
{
return GetXmlNodeDoubleNull(_minValuePath);
}
set
{
if (value == null)
{
DeleteNode(_minValuePath,true);
}
else
{
SetXmlNodeString(_minValuePath, ((double)value).ToString(CultureInfo.InvariantCulture));
}
}
>>>>>>>
get;
set;
DeleteNode(_minValuePath,true);
<<<<<<<
get;
set;
=======
get
{
return GetXmlNodeDoubleNull(_maxValuePath);
}
set
{
if (value == null)
{
DeleteNode(_maxValuePath, true);
}
else
{
SetXmlNodeString(_maxValuePath, ((double)value).ToString(CultureInfo.InvariantCulture));
}
}
>>>>>>>
get;
set;
DeleteNode(_maxValuePath, true);
<<<<<<<
get;
set;
=======
get
{
if (AxisType == eAxisType.Cat)
{
return GetXmlNodeDoubleNull(_majorUnitCatPath);
}
else
{
return GetXmlNodeDoubleNull(_majorUnitPath);
}
}
set
{
if (value == null)
{
DeleteNode(_majorUnitPath, true);
DeleteNode(_majorUnitCatPath, true);
}
else
{
if (AxisType == eAxisType.Cat)
{
SetXmlNodeString(_majorUnitCatPath, ((double)value).ToString(CultureInfo.InvariantCulture));
}
else
{
SetXmlNodeString(_majorUnitPath, ((double)value).ToString(CultureInfo.InvariantCulture));
}
}
}
>>>>>>>
get;
set;
DeleteNode(_majorUnitPath, true);
DeleteNode(_majorUnitCatPath, true);
<<<<<<<
get;
set;
=======
get
{
var v=GetXmlNodeString(_majorTimeUnitPath);
if(string.IsNullOrEmpty(v))
{
return null;
}
else
{
return v.ToEnum(eTimeUnit.Years);
}
}
set
{
if (value.HasValue)
{
SetXmlNodeString(_majorTimeUnitPath, value.ToEnumString());
}
else
{
DeleteNode(_majorTimeUnitPath, true);
}
}
>>>>>>>
get;
set;
DeleteNode(_majorTimeUnitPath, true);
<<<<<<<
get;
set;
=======
get
{
if (AxisType == eAxisType.Cat)
{
return GetXmlNodeDoubleNull(_minorUnitCatPath);
}
else
{
return GetXmlNodeDoubleNull(_minorUnitPath);
}
}
set
{
if (value == null)
{
DeleteNode(_minorUnitPath, true);
DeleteNode(_minorUnitCatPath, true);
}
else
{
if (AxisType == eAxisType.Cat)
{
SetXmlNodeString(_minorUnitCatPath, ((double)value).ToString(CultureInfo.InvariantCulture));
}
else
{
SetXmlNodeString(_minorUnitPath, ((double)value).ToString(CultureInfo.InvariantCulture));
}
}
}
>>>>>>>
get;
set;
DeleteNode(_minorUnitPath, true);
DeleteNode(_minorUnitCatPath, true);
<<<<<<<
get;
set;
=======
get
{
return GetXmlNodeDoubleNull(_logbasePath);
}
set
{
if (value == null)
{
DeleteNode(_logbasePath, true);
}
else
{
double v = ((double)value);
if (v < 2 || v > 1000)
{
throw(new ArgumentOutOfRangeException("Value must be between 2 and 1000"));
}
SetXmlNodeString(_logbasePath, v.ToString("0.0", CultureInfo.InvariantCulture));
}
}
>>>>>>>
get;
set;
DeleteNode(_logbasePath, true); |
<<<<<<<
var selectedMethod = candidateMethods
.Where(m => m.Name == name &&
m.GetParameters().Skip(1)
.All(p => p.HasDefaultValue
|| suppliedArgumentValues.Any(s => s.Key.Equals(p.Name, StringComparison.OrdinalIgnoreCase))
// parameters of type IConfiguration are implicitly populated with provided Configuration
|| p.ParameterType == typeof(IConfiguration)
))
=======
return candidateMethods
.Where(m => m.Name == name)
.Where(m => m.GetParameters()
.Skip(1)
.All(p => HasImplicitValueWhenNotSpecified(p) ||
ParameterNameMatches(p.Name, suppliedArgumentNames)))
>>>>>>>
var selectedMethod = candidateMethods
.Where(m => m.Name == name)
.Where(m => m.GetParameters()
.Skip(1)
.All(p => HasImplicitValueWhenNotSpecified(p) ||
ParameterNameMatches(p.Name, suppliedArgumentNames))) |
<<<<<<<
using System.Collections.Generic;
using Serilog.Debugging;
=======
>>>>>>>
using System.Collections.Generic;
using Serilog.Debugging;
<<<<<<<
SelfLog.Enable(Console.Error);
=======
Thread.CurrentThread.Name = "Main thread";
>>>>>>>
Thread.CurrentThread.Name = "Main thread"; |
<<<<<<<
private UnityEngine.Rendering.Universal.RenderPassEvent m_renderPassEvent = UnityEngine.Rendering.Universal.RenderPassEvent.AfterRenderingOpaques;
=======
private RenderPassEvent m_renderPassEvent = RenderPassEvent.AfterRenderingOpaques;
>>>>>>>
private RenderPassEvent m_renderPassEvent = RenderPassEvent.AfterRenderingOpaques;
<<<<<<<
[SerializeField]
[HideInInspector]
private int m_stencilRef = 1;
[SerializeField]
[HideInInspector]
private int m_stencilMask = 1;
[SerializeField]
[HideInInspector]
private int m_version = 0;
const int s_currentVersion = 1;
=======
>>>>>>>
private int m_version = 0;
const int s_currentVersion = 1;
<<<<<<<
public UnityEngine.Rendering.Universal.RenderPassEvent renderPassEvent
=======
public RenderPassEvent renderPassEvent
>>>>>>>
public RenderPassEvent renderPassEvent
<<<<<<<
s_shaderPropIdFsrWorldToProjector = Shader.PropertyToID("_FSRWorldToProjector");
s_shaderPropIdFsrWorldProjectDir = Shader.PropertyToID("_FSRWorldProjectDir");
}
m_projector = GetComponent<Projector>();
if (m_projector == null)
{
m_projector = gameObject.AddComponent<Projector>();
}
if (useStencilTest && m_meshFrustum == null)
{
m_meshFrustum = new Mesh();
m_meshFrustum.hideFlags = HideFlags.HideAndDontSave;
}
UpdateFrustum();
if (m_version < s_currentVersion) {
if (m_shaderTagList != null && 0 < m_shaderTagList.Length)
{
if (m_shaderTagList[0] == "LightweightForward")
{
m_shaderTagList[0] = "UniversalForward";
}
m_version = s_currentVersion;
}
}
if (m_shaderTagIdList == null)
{
UpdateShaderTagIdList();
=======
s_isInitialized = true;
>>>>>>>
s_isInitialized = true; |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Windows;
using System.Windows.Controls;
=======
>>>>>>>
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Windows;
using System.Windows.Controls;
<<<<<<<
// ReSharper disable InconsistentNaming
=======
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Windows;
using System.Windows.Controls;
>>>>>>>
// ReSharper disable InconsistentNaming |
<<<<<<<
using LiveCharts.Geared;
=======
using System.Collections.Generic;
using LiveCharts;
using LiveCharts.Wpf.Charts.Base;
>>>>>>>
using System.Collections.Generic;
using LiveCharts;
using LiveCharts.Geared;
using LiveCharts.Wpf.Charts.Base;
<<<<<<<
=======
>>>>>>> |
<<<<<<<
Activated += MainForm_Activated;
Deactivate += MainForm_Deactivate;
foreach (var control in new[] { SystemLabel, MinimizeLabel, MaximizeLabel, CloseLabel })
{
control.MouseEnter += (s, e) => SetLabelColors((Control)s, MouseState.Hover);
control.MouseLeave += (s, e) => SetLabelColors((Control)s, MouseState.Normal);
control.MouseDown += (s, e) => SetLabelColors((Control)s, MouseState.Down);
}
TopLeftCornerPanel.MouseDown += (s, e) => DecorationMouseDown(HitTestValues.HTTOPLEFT);
TopRightCornerPanel.MouseDown += (s, e) => DecorationMouseDown(HitTestValues.HTTOPRIGHT);
BottomLeftCornerPanel.MouseDown += (s, e) => DecorationMouseDown(HitTestValues.HTBOTTOMLEFT);
BottomRightCornerPanel.MouseDown += (s, e) => DecorationMouseDown(HitTestValues.HTBOTTOMRIGHT);
=======
TopLeftCornerPanel.MouseDown += (s, e) => DecorationMouseDown(e, HitTestValues.HTTOPLEFT);
TopRightCornerPanel.MouseDown += (s, e) => DecorationMouseDown(e, HitTestValues.HTTOPRIGHT);
BottomLeftCornerPanel.MouseDown += (s, e) => DecorationMouseDown(e, HitTestValues.HTBOTTOMLEFT);
BottomRightCornerPanel.MouseDown += (s, e) => DecorationMouseDown(e, HitTestValues.HTBOTTOMRIGHT);
>>>>>>>
Activated += MainForm_Activated;
Deactivate += MainForm_Deactivate;
foreach (var control in new[] { SystemLabel, MinimizeLabel, MaximizeLabel, CloseLabel })
{
control.MouseEnter += (s, e) => SetLabelColors((Control)s, MouseState.Hover);
control.MouseLeave += (s, e) => SetLabelColors((Control)s, MouseState.Normal);
control.MouseDown += (s, e) => SetLabelColors((Control)s, MouseState.Down);
}
TopLeftCornerPanel.MouseDown += (s, e) => DecorationMouseDown(e, HitTestValues.HTTOPLEFT);
TopRightCornerPanel.MouseDown += (s, e) => DecorationMouseDown(e, HitTestValues.HTTOPRIGHT);
BottomLeftCornerPanel.MouseDown += (s, e) => DecorationMouseDown(e, HitTestValues.HTBOTTOMLEFT);
BottomRightCornerPanel.MouseDown += (s, e) => DecorationMouseDown(e, HitTestValues.HTBOTTOMRIGHT); |
<<<<<<<
&& context.resources.computeShaders.lut3DBaker != null
&& SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLCore;
=======
&& SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLCore
&& SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLES3;
>>>>>>>
&& context.resources.computeShaders.lut3DBaker != null
&& SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLCore;
&& SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLES3; |
<<<<<<<
cmd.GetTemporaryRT(mipDown, tw, th, 0, FilterMode.Bilinear, context.sourceFormat);
cmd.GetTemporaryRT(mipUp, tw, th, 0, FilterMode.Bilinear, context.sourceFormat);
cmd.BlitFullscreenTriangle(lastDown, mipDown, sheet, pass);
=======
context.GetScreenSpaceTemporaryRT(cmd, mipDown, 0, context.sourceFormat, RenderTextureReadWrite.Default, FilterMode.Bilinear, tw, th);
context.GetScreenSpaceTemporaryRT(cmd, mipUp, 0, context.sourceFormat, RenderTextureReadWrite.Default, FilterMode.Bilinear, tw, th);
cmd.BlitFullscreenTriangle(last, mipDown, sheet, pass);
>>>>>>>
context.GetScreenSpaceTemporaryRT(cmd, mipDown, 0, context.sourceFormat, RenderTextureReadWrite.Default, FilterMode.Bilinear, tw, th);
context.GetScreenSpaceTemporaryRT(cmd, mipUp, 0, context.sourceFormat, RenderTextureReadWrite.Default, FilterMode.Bilinear, tw, th);
cmd.BlitFullscreenTriangle(lastDown, mipDown, sheet, pass); |
<<<<<<<
=======
public AmbientOcclusion ambientOcclusion;
public ScreenSpaceReflections screenSpaceReflections;
>>>>>>>
public ScreenSpaceReflections screenSpaceReflections;
<<<<<<<
RuntimeUtilities.CreateIfNull(ref debugLayer);
=======
RuntimeUtilities.CreateIfNull(ref monitors);
RuntimeUtilities.CreateIfNull(ref ambientOcclusion);
RuntimeUtilities.CreateIfNull(ref screenSpaceReflections);
>>>>>>>
RuntimeUtilities.CreateIfNull(ref screenSpaceReflections);
<<<<<<<
=======
ambientOcclusion.Release();
screenSpaceReflections.Release();
>>>>>>>
screenSpaceReflections.Release(); |
<<<<<<<
/// <summary>
/// The ambient occlusion method to use.
/// </summary>
[Tooltip("The ambient occlusion method to use. \"MSVO\" is higher quality and faster on desktop & console platforms but requires compute shader support.")]
=======
[Tooltip("The ambient occlusion method to use. \"Multi Scale Volumetric Obscurance\" is higher quality and faster on desktop & console platforms but requires compute shader support.")]
>>>>>>>
[Tooltip("The ambient occlusion method to use. \"MSVO\" is higher quality and faster on desktop & console platforms but requires compute shader support.")]
/// <summary>
/// The ambient occlusion method to use.
/// </summary>
[Tooltip("The ambient occlusion method to use. \"Multi Scale Volumetric Obscurance\" is higher quality and faster on desktop & console platforms but requires compute shader support.")]
<<<<<<<
/// <summary>
/// The degree of darkness added by ambient occlusion.
/// </summary>
[Range(0f, 4f), Tooltip("Degree of darkness added by ambient occlusion.")]
=======
[Range(0f, 4f), Tooltip("The degree of darkness added by ambient occlusion. Higher values produce darker areas.")]
>>>>>>>
/// <summary>
/// The degree of darkness added by ambient occlusion.
/// </summary>
[Range(0f, 4f), Tooltip("The degree of darkness added by ambient occlusion. Higher values produce darker areas.")]
<<<<<<<
/// <summary>
/// A custom color to use for the ambient occlusion.
/// </summary>
[ColorUsage(false), Tooltip("Custom color to use for the ambient occlusion.")]
=======
[ColorUsage(false), Tooltip("The custom color to use for the ambient occlusion. The default is black.")]
>>>>>>>
/// <summary>
/// A custom color to use for the ambient occlusion.
/// </summary>
[ColorUsage(false), Tooltip("The custom color to use for the ambient occlusion. The default is black.")]
<<<<<<<
/// <summary>
/// Only affects ambient lighting. This mode is only available with the Deferred rendering
/// path and HDR rendering. Objects rendered with the Forward rendering path won't get any
/// ambient occlusion.
/// </summary>
[Tooltip("Only affects ambient lighting. This mode is only available with the Deferred rendering path and HDR rendering. Objects rendered with the Forward rendering path won't get any ambient occlusion.")]
=======
[Tooltip("Check this box to mark this Volume as to only affect ambient lighting. This mode is only available with the Deferred rendering path and HDR rendering. Objects rendered with the Forward rendering path won't get any ambient occlusion.")]
>>>>>>>
/// <summary>
/// Only affects ambient lighting. This mode is only available with the Deferred rendering
/// path and HDR rendering. Objects rendered with the Forward rendering path won't get any
/// ambient occlusion.
/// </summary>
[Tooltip("Check this box to mark this Volume as to only affect ambient lighting. This mode is only available with the Deferred rendering path and HDR rendering. Objects rendered with the Forward rendering path won't get any ambient occlusion.")]
<<<<<<<
/// <summary>
/// Modifies the thickness of occluders. This increases dark areas but also introduces dark
/// halo around objects.
/// </summary>
[Range(1f, 10f), Tooltip("Modifies the thickness of occluders. This increases dark areas but also introduces dark halo around objects.")]
=======
[Range(1f, 10f), Tooltip("This modifies the thickness of occluders. It increases the size of dark areas and also introduces a dark halo around objects.")]
>>>>>>>
/// <summary>
/// Modifies the thickness of occluders. This increases dark areas but also introduces dark
/// halo around objects.
/// </summary>
[Range(1f, 10f), Tooltip("This modifies the thickness of occluders. It increases the size of dark areas and also introduces a dark halo around objects.")]
<<<<<<<
/// <summary>
/// Radius of sample points, which affects extent of darkened areas.
/// </summary>
[Tooltip("Radius of sample points, which affects extent of darkened areas.")]
=======
[Tooltip("The radius of sample points. This affects the size of darkened areas.")]
>>>>>>>
/// <summary>
/// Radius of sample points, which affects extent of darkened areas.
/// </summary>
[Tooltip("The radius of sample points. This affects the size of darkened areas.")]
<<<<<<<
/// <summary>
/// The number of sample points, which affects quality and performance. Lowest, Low & Medium
/// passes are downsampled. High and Ultra are not and should only be used on high-end
/// hardware.
/// </summary>
[Tooltip("Number of sample points, which affects quality and performance. Lowest, Low & Medium passes are downsampled. High and Ultra are not and should only be used on high-end hardware.")]
=======
[Tooltip("The number of sample points. This affects both quality and performance. For \"Lowest\", \"Low\", and \"Medium\", passes are downsampled. For \"High\" and \"Ultra\", they are not and therefore you should only \"High\" and \"Ultra\" on high-end hardware.")]
>>>>>>>
/// <summary>
/// The number of sample points, which affects quality and performance. Lowest, Low & Medium
/// passes are downsampled. High and Ultra are not and should only be used on high-end
/// hardware.
/// </summary>
[Tooltip("The number of sample points. This affects both quality and performance. For \"Lowest\", \"Low\", and \"Medium\", passes are downsampled. For \"High\" and \"Ultra\", they are not and therefore you should only \"High\" and \"Ultra\" on high-end hardware.")]
<<<<<<<
// SRPs can call this method without a context set (see HDRP).
=======
// SRPs can call this method without a context set (see HDRP)
>>>>>>>
// SRPs can call this method without a context set (see HDRP). |
<<<<<<<
case ServerPackets.QuestOffer:
HandleQuestOffer(bf.ReadBytes(bf.Length()));
break;
case ServerPackets.QuestProgress:
HandleQuestProgress(bf.ReadBytes(bf.Length()));
break;
=======
case ServerPackets.TradeStart:
HandleTradeStart(bf.ReadBytes(bf.Length()));
break;
case ServerPackets.TradeUpdate:
HandleTradeUpdate(bf.ReadBytes(bf.Length()));
break;
case ServerPackets.TradeClose:
HandleTradeClose(bf.ReadBytes(bf.Length()));
break;
case ServerPackets.TradeRequest:
HandleTradeRequest(bf.ReadBytes(bf.Length()));
break;
>>>>>>>
case ServerPackets.QuestOffer:
HandleQuestOffer(bf.ReadBytes(bf.Length()));
break;
case ServerPackets.QuestProgress:
HandleQuestProgress(bf.ReadBytes(bf.Length()));
break;
case ServerPackets.TradeStart:
HandleTradeStart(bf.ReadBytes(bf.Length()));
break;
case ServerPackets.TradeUpdate:
HandleTradeUpdate(bf.ReadBytes(bf.Length()));
break;
case ServerPackets.TradeClose:
HandleTradeClose(bf.ReadBytes(bf.Length()));
break;
case ServerPackets.TradeRequest:
HandleTradeRequest(bf.ReadBytes(bf.Length()));
break;
<<<<<<<
private static void HandleQuestOffer(byte[] packet)
{
var bf = new ByteBuffer();
bf.WriteBytes(packet);
var index = (int)bf.ReadInteger();
if (!Globals.QuestOffers.Contains(index))
{
Globals.QuestOffers.Add(index);
}
bf.Dispose();
}
private static void HandleQuestProgress(byte[] packet)
{
if (Globals.Me != null)
{
var bf = new ByteBuffer();
bf.WriteBytes(packet);
var count = bf.ReadInteger();
for (int i = 0; i < count; i++)
{
var index = bf.ReadInteger();
if (bf.ReadByte() == 0)
{
if (Globals.Me.QuestProgress.ContainsKey(index))
{
Globals.Me.QuestProgress.Remove(index);
}
}
else
{
QuestProgressStruct questProgress = new QuestProgressStruct();
questProgress.completed = bf.ReadInteger();
questProgress.task = bf.ReadInteger();
questProgress.taskProgress = bf.ReadInteger();
if (Globals.Me.QuestProgress.ContainsKey(index))
{
Globals.Me.QuestProgress[index] = questProgress;
}
else
{
Globals.Me.QuestProgress.Add(index, questProgress);
}
}
}
if (Gui.GameUI != null)
{
Gui.GameUI.NotifyQuestsUpdated();
}
bf.Dispose();
}
}
=======
private static void HandleTradeStart(byte[] packet)
{
var bf = new ByteBuffer();
bf.WriteBytes(packet);
int index = bf.ReadInteger();
//Gotta initialize the trade values
for (int x = 0; x < 2; x++)
{
for (int y = 0; y < Options.MaxInvItems; y++)
{
Globals.Trade[x, y] = new ItemInstance();
}
}
Gui.GameUI.NotifyOpenTrading(index);
bf.Dispose();
}
private static void HandleTradeUpdate(byte[] packet)
{
var bf = new ByteBuffer();
bf.WriteBytes(packet);
int index = bf.ReadInteger();
int i = 0;
if (index != Globals.Me.MyIndex)
{
i = 1;
}
int slot = bf.ReadInteger();
int active = bf.ReadInteger();
if (active == 0)
{
Globals.Trade[i, slot] = null;
}
else
{
Globals.Trade[i, slot] = new ItemInstance();
Globals.Trade[i, slot].Load(bf);
}
bf.Dispose();
}
private static void HandleTradeClose(byte[] packet)
{
Gui.GameUI.NotifyCloseTrading();
}
private static void HandleTradeRequest(byte[] packet)
{
var bf = new ByteBuffer();
bf.WriteBytes(packet);
int partner = bf.ReadInteger();
InputBox iBox = new InputBox("Trade Request", Globals.Entities[partner].MyName + " has invited you to trade items with them. Do you accept?", true, PacketSender.SendTradeRequestAccept, PacketSender.SendRequestDecline, partner, false);
bf.Dispose();
}
>>>>>>>
private static void HandleQuestOffer(byte[] packet)
{
var bf = new ByteBuffer();
bf.WriteBytes(packet);
var index = (int)bf.ReadInteger();
if (!Globals.QuestOffers.Contains(index))
{
Globals.QuestOffers.Add(index);
}
bf.Dispose();
}
private static void HandleQuestProgress(byte[] packet)
{
if (Globals.Me != null)
{
var bf = new ByteBuffer();
bf.WriteBytes(packet);
var count = bf.ReadInteger();
for (int i = 0; i < count; i++)
{
var index = bf.ReadInteger();
if (bf.ReadByte() == 0)
{
if (Globals.Me.QuestProgress.ContainsKey(index))
{
Globals.Me.QuestProgress.Remove(index);
}
}
else
{
QuestProgressStruct questProgress = new QuestProgressStruct();
questProgress.completed = bf.ReadInteger();
questProgress.task = bf.ReadInteger();
questProgress.taskProgress = bf.ReadInteger();
if (Globals.Me.QuestProgress.ContainsKey(index))
{
Globals.Me.QuestProgress[index] = questProgress;
}
else
{
Globals.Me.QuestProgress.Add(index, questProgress);
}
}
}
if (Gui.GameUI != null)
{
Gui.GameUI.NotifyQuestsUpdated();
}
bf.Dispose();
}
private static void HandleTradeStart(byte[] packet)
{
var bf = new ByteBuffer();
bf.WriteBytes(packet);
int index = bf.ReadInteger();
//Gotta initialize the trade values
for (int x = 0; x < 2; x++)
{
for (int y = 0; y < Options.MaxInvItems; y++)
{
Globals.Trade[x, y] = new ItemInstance();
}
}
Gui.GameUI.NotifyOpenTrading(index);
bf.Dispose();
}
private static void HandleTradeUpdate(byte[] packet)
{
var bf = new ByteBuffer();
bf.WriteBytes(packet);
int index = bf.ReadInteger();
int i = 0;
if (index != Globals.Me.MyIndex)
{
i = 1;
}
int slot = bf.ReadInteger();
int active = bf.ReadInteger();
if (active == 0)
{
Globals.Trade[i, slot] = null;
}
else
{
Globals.Trade[i, slot] = new ItemInstance();
Globals.Trade[i, slot].Load(bf);
}
bf.Dispose();
}
private static void HandleTradeClose(byte[] packet)
{
Gui.GameUI.NotifyCloseTrading();
}
private static void HandleTradeRequest(byte[] packet)
{
var bf = new ByteBuffer();
bf.WriteBytes(packet);
int partner = bf.ReadInteger();
InputBox iBox = new InputBox("Trade Request", Globals.Entities[partner].MyName + " has invited you to trade items with them. Do you accept?", true, PacketSender.SendTradeRequestAccept, PacketSender.SendRequestDecline, partner, false);
bf.Dispose();
} |
<<<<<<<
protected byte _renderPriority = 1;
=======
public int AnimationFrame;
>>>>>>>
protected byte _renderPriority = 1;
public int AnimationFrame; |
<<<<<<<
public static void SendParty(Client client)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.PartyData);
bf.WriteInteger(client.Entity.Party.Count);
for (int i = 0; i < client.Entity.Party.Count; i++)
{
bf.WriteInteger(client.Entity.Party[i].MyIndex);
}
client.SendPacket(bf.ToArray());
bf.Dispose();
}
public static void SendPartyInvite(Client client, int leader)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.PartyInvite);
bf.WriteInteger(leader);
client.SendPacket(bf.ToArray());
bf.Dispose();
}
=======
public static void SendChatBubble(int entityIndex, int type, string text, int map)
{
var bf = new ByteBuffer();
bf.WriteLong((int)ServerPackets.ChatBubble);
bf.WriteLong(entityIndex);
bf.WriteInteger(type);
bf.WriteInteger(map);
bf.WriteString(text);
SendDataToProximity(map, bf.ToArray());
bf.Dispose();
}
>>>>>>>
public static void SendParty(Client client)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.PartyData);
bf.WriteInteger(client.Entity.Party.Count);
for (int i = 0; i < client.Entity.Party.Count; i++)
{
bf.WriteInteger(client.Entity.Party[i].MyIndex);
}
client.SendPacket(bf.ToArray());
bf.Dispose();
}
public static void SendPartyInvite(Client client, int leader)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.PartyInvite);
bf.WriteInteger(leader);
client.SendPacket(bf.ToArray());
bf.Dispose();
}
public static void SendChatBubble(int entityIndex, int type, string text, int map)
{
var bf = new ByteBuffer();
bf.WriteLong((int)ServerPackets.ChatBubble);
bf.WriteLong(entityIndex);
bf.WriteInteger(type);
bf.WriteInteger(map);
bf.WriteString(text);
SendDataToProximity(map, bf.ToArray());
bf.Dispose();
} |
<<<<<<<
if (MapInstance.Lookup.Get<MapInstance>(mapNum) != null)
{
if (Globals.CurrentMap == MapInstance.Lookup.Get<MapInstance>(mapNum))
Globals.CurrentMap = map;
MapInstance.Lookup.Get<MapInstance>(mapNum).Delete();
}
map.Load(mapJson);
=======
map.Load(mapData);
>>>>>>>
map.Load(mapJson); |
<<<<<<<
sizeLabel.Text = TranslationServer.Translate("SIZE") + " " +
size.ToString(CultureInfo.CurrentCulture);
=======
sizeLabel.Text = size.ToString(CultureInfo.CurrentCulture);
UpdateCellStatsIndicators();
>>>>>>>
sizeLabel.Text = size.ToString(CultureInfo.CurrentCulture);
UpdateCellStatsIndicators();
<<<<<<<
generationLabel.Text = TranslationServer.Translate("GENERATION") + " " +
generation.ToString(CultureInfo.CurrentCulture);
=======
generationLabel.Text = generation.ToString(CultureInfo.CurrentCulture);
>>>>>>>
generationLabel.Text = generation.ToString(CultureInfo.CurrentCulture);
<<<<<<<
speedLabel.Text = TranslationServer.Translate("SPEED") + " " +
string.Format(CultureInfo.CurrentCulture, "{0:F1}", speed);
=======
speedLabel.Text = string.Format(CultureInfo.CurrentCulture, "{0:F1}", speed);
UpdateCellStatsIndicators();
}
public void UpdateHitpoints(float hp)
{
hpLabel.Text = hp.ToString(CultureInfo.CurrentCulture);
UpdateCellStatsIndicators();
>>>>>>>
speedLabel.Text = string.Format(CultureInfo.CurrentCulture, "{0:F1}", speed);
UpdateCellStatsIndicators();
}
public void UpdateHitpoints(float hp)
{
hpLabel.Text = hp.ToString(CultureInfo.CurrentCulture);
UpdateCellStatsIndicators();
<<<<<<<
processBody.AddChild(percentageLabel);
processBody.AddChild(
GUICommon.Instance.CreateCompoundIcon(environmentCompound.Compound.GetName()));
}
}
=======
hpIndicator.Show();
>>>>>>>
hpIndicator.Show();
<<<<<<<
patchNitrogen.Text = string.Format(CultureInfo.CurrentCulture,
TranslationServer.Translate("VALUE_PPM"),
patch.Biome.Compounds[nitrogen].Dissolved * 100);
patchCO2.Text = string.Format(CultureInfo.CurrentCulture,
TranslationServer.Translate("VALUE_PPM"),
patch.Biome.Compounds[carbondioxide].Dissolved * 100);
=======
patchNitrogen.Text = (patch.Biome.Compounds[nitrogen].Dissolved * 100) + "%";
patchCO2.Text = (patch.Biome.Compounds[carbondioxide].Dissolved * 100) + "%";
>>>>>>>
patchNitrogen.Text = (patch.Biome.Compounds[nitrogen].Dissolved * 100) + "%";
patchCO2.Text = (patch.Biome.Compounds[carbondioxide].Dissolved * 100) + "%";
<<<<<<<
var speciesLabel = new Label
{
// {0} with population: {1}
Text = string.Format(CultureInfo.CurrentCulture,
TranslationServer.Translate("WITH_POPULATION"), species.FormattedName,
patch.GetSpeciesPopulation(species)),
};
speciesList.AddChild(speciesLabel);
// Yes, apparently this has to be done so that the rect size is updated immediately
speciesList.RectSize = speciesList.RectSize;
if (speciesListIsHidden)
{
// Adjust the species list's clipping area's "height" value
var clip = speciesList.GetParent<MarginContainer>();
clip.AddConstantOverride("margin_top", -(int)speciesList.RectSize.y);
}
=======
var speciesLabel = new Label();
speciesLabel.SizeFlagsHorizontal = (int)Control.SizeFlags.ExpandFill;
speciesLabel.Autowrap = true;
speciesLabel.Text = species.FormattedName + " with population: " + patch.GetSpeciesPopulation(species);
speciesListBox.AddItem(speciesLabel);
>>>>>>>
var speciesLabel = new Label();
speciesLabel.SizeFlagsHorizontal = (int)Control.SizeFlags.ExpandFill;
speciesLabel.Autowrap = true;
speciesLabel.Text = string.Format(CultureInfo.CurrentCulture,
TranslationServer.Translate("WITH_POPULATION"), species.FormattedName,
patch.GetSpeciesPopulation(species)),
speciesListBox.AddItem(speciesLabel); |
<<<<<<<
DespawnNpc,
=======
//Questing
StartQuest,
CompleteQuestTask,
EndQuest,
>>>>>>>
DespawnNpc,
//Questing
StartQuest,
CompleteQuestTask,
EndQuest, |
<<<<<<<
public void ApplyPropertiesFromSave(Microbe microbe)
{
SaveApplyHelper.CopyJSONSavedPropertiesAndFields(this, microbe, new List<string>()
{
"organelles",
});
NodeGroupSaveHelper.CopyGroups(this, microbe);
organelles.Clear();
while (microbe.organelles.Count > 0)
{
// Steal the organelles from the other microbe which will be destroyed anyway once the save is fully loaded
var organelle = microbe.organelles[0];
microbe.organelles.Remove(organelle);
// Though we don't want them to be actually disposed
if (TemporaryLoadedNodeDeleter.Instance.Release(organelle) != organelle)
throw new Exception("failed to remove a loaded organelle from being released");
organelles.Add(organelle);
}
// TODO: fix existing references in the microbe AI
// For now we just cause amnesia on the cell's AI
ai?.ClearAfterLoadedFromSave(this);
}
=======
internal void SuccessfulScavenge()
{
GameWorld.AlterSpeciesPopulation(Species,
Constants.CREATURE_SCAVENGE_POPULATION_GAIN, "successful scavenge");
}
internal void SuccessfulKill()
{
GameWorld.AlterSpeciesPopulation(Species,
Constants.CREATURE_KILL_POPULATION_GAIN, "successful kill");
}
>>>>>>>
public void ApplyPropertiesFromSave(Microbe microbe)
{
SaveApplyHelper.CopyJSONSavedPropertiesAndFields(this, microbe, new List<string>()
{
"organelles",
});
NodeGroupSaveHelper.CopyGroups(this, microbe);
organelles.Clear();
while (microbe.organelles.Count > 0)
{
// Steal the organelles from the other microbe which will be destroyed anyway once the save is fully loaded
var organelle = microbe.organelles[0];
microbe.organelles.Remove(organelle);
// Though we don't want them to be actually disposed
if (TemporaryLoadedNodeDeleter.Instance.Release(organelle) != organelle)
throw new Exception("failed to remove a loaded organelle from being released");
organelles.Add(organelle);
}
// TODO: fix existing references in the microbe AI
// For now we just cause amnesia on the cell's AI
ai?.ClearAfterLoadedFromSave(this);
}
internal void SuccessfulScavenge()
{
GameWorld.AlterSpeciesPopulation(Species,
Constants.CREATURE_SCAVENGE_POPULATION_GAIN, "successful scavenge");
}
internal void SuccessfulKill()
{
GameWorld.AlterSpeciesPopulation(Species,
Constants.CREATURE_KILL_POPULATION_GAIN, "successful kill");
} |
<<<<<<<
foreach (var map in MapInstance.Lookup.Copy)
=======
var timeMs = Globals.System.GetTimeMs();
var maps = MapInstance.GetObjects();
foreach (var map in maps)
>>>>>>>
var timeMs = Globals.System.GetTimeMs();
foreach (var map in MapInstance.Lookup.Copy) |
<<<<<<<
private void questEditorToolStripMenuItem_Click(object sender, EventArgs e)
{
PacketSender.SendQuestEditor();
}
=======
//Help
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
frmAbout aboutfrm = new frmAbout();
aboutfrm.ShowDialog();
}
>>>>>>>
private void questEditorToolStripMenuItem_Click(object sender, EventArgs e)
{
PacketSender.SendQuestEditor();
}
//Help
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
frmAbout aboutfrm = new frmAbout();
aboutfrm.ShowDialog();
} |
<<<<<<<
/*foreach (var evt in EventBase.GetObjects())
=======
foreach (var evt in EventBase.Lookup)
>>>>>>>
/*foreach (var evt in EventBase.Lookup) |
<<<<<<<
this.mapListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.hideTilePreviewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.hideTilePreviewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
>>>>>>>
this.hideTilePreviewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
<<<<<<<
// FrmMain
=======
// frmMain
>>>>>>>
// frmMain
<<<<<<<
private ToolStripMenuItem questEditorToolStripMenuItem;
=======
private ToolStripButton toolStripBtnScreenshot;
private ToolStripSeparator toolStripSeparator6;
private ToolStripMenuItem importMapToolStripMenuItem;
private ToolStripMenuItem exportMapToolStripMenuItem;
>>>>>>>
private ToolStripMenuItem questEditorToolStripMenuItem;
private ToolStripButton toolStripBtnScreenshot;
private ToolStripSeparator toolStripSeparator6;
private ToolStripMenuItem importMapToolStripMenuItem;
private ToolStripMenuItem exportMapToolStripMenuItem; |
<<<<<<<
BenchBase b = BenchBase.Lookup.Get(InCraft);
if (CraftTimer + b.Crafts[CraftIndex].Time < timeMs)
=======
BenchBase b = BenchBase.GetCraft(InCraft);
if (CraftTimer + b.Crafts[CraftIndex].Time < timeMs)
>>>>>>>
BenchBase b = BenchBase.Lookup.Get(InCraft);
if (CraftTimer + b.Crafts[CraftIndex].Time < timeMs)
<<<<<<<
var projectileBase = ProjectileBase.Lookup.Get(spell.Projectile);
if (projectileBase.Ammo > -1)
=======
var projectileBase = ProjectileBase.GetProjectile(spell.Projectile);
if (projectileBase != null && projectileBase.Ammo > -1)
>>>>>>>
var projectileBase = ProjectileBase.Lookup.Get(spell.Projectile);
if (projectileBase != null && projectileBase.Ammo > -1) |
<<<<<<<
ChatBubble,
MapEntities
=======
PartyData,
PartyInvite,
ChatBubble,
>>>>>>>
PartyData,
PartyInvite,
ChatBubble,
MapEntities |
<<<<<<<
dbObj = new AnimationBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new ClassBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new ItemBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new NpcBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new ProjectileBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new QuestBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new ResourceBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new ShopBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new SpellBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new CraftingTableBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new CraftBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new MapInstance(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new EventBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new PlayerSwitchBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new PlayerVariableBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new ServerSwitchBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new ServerVariableBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new TilesetBase(predefinedid);
=======
>>>>>>> |
<<<<<<<
Name = resource.Name;
Sprite = resource.InitialGraphic;
Vital[(int) Vitals.Health] = Globals.Rand.Next(Math.Min(1, resource.MinHp),
Math.Max(resource.MaxHp, Math.Min(1, resource.MinHp)) + 1);
MaxVital[(int) Vitals.Health] = Vital[(int) Vitals.Health];
=======
MyName = resource.Name;
MySprite = resource.InitialGraphic;
SetMaxVital(Vitals.Health, Globals.Rand.Next(Math.Min(1, resource.MinHp),
Math.Max(resource.MaxHp, Math.Min(1, resource.MinHp)) + 1));
RestoreVital(Vitals.Health);
>>>>>>>
Name = resource.Name;
Sprite = resource.InitialGraphic;
SetMaxVital(Vitals.Health, Globals.Rand.Next(Math.Min(1, resource.MinHp),
Math.Max(resource.MaxHp, Math.Min(1, resource.MinHp)) + 1));
RestoreVital(Vitals.Health);
<<<<<<<
Sprite = MyBase.InitialGraphic;
Vital[(int) Vitals.Health] = Globals.Rand.Next(Math.Min(1, MyBase.MinHp),
Math.Max(MyBase.MaxHp, Math.Min(1, MyBase.MinHp)) + 1);
MaxVital[(int) Vitals.Health] = Vital[(int) Vitals.Health];
=======
MySprite = MyBase.InitialGraphic;
SetMaxVital(Vitals.Health,Globals.Rand.Next(MyBase.MinHp, MyBase.MaxHp + 1));
RestoreVital(Vitals.Health);
>>>>>>>
Sprite = MyBase.InitialGraphic;
SetMaxVital(Vitals.Health,Globals.Rand.Next(MyBase.MinHp, MyBase.MaxHp + 1));
RestoreVital(Vitals.Health); |
<<<<<<<
BenchBase b = BenchBase.Lookup.Get(InCraft);
if (CraftTimer + b.Crafts[CraftIndex].Time < Environment.TickCount)
=======
BenchBase b = BenchBase.GetCraft(InCraft);
if (CraftTimer + b.Crafts[CraftIndex].Time < timeMs)
>>>>>>>
BenchBase b = BenchBase.Lookup.Get(InCraft);
if (CraftTimer + b.Crafts[CraftIndex].Time < timeMs) |
<<<<<<<
LoadingScreen.Instance.Show(TranslationServer.Translate("LOADING_GAME"),
TranslationServer.Translate("CREATING_OBJECTS_FROM_SAVE"))));
=======
LoadingScreen.Instance.Show("Loading Game", "Creating objects from save")));
state = State.CreatingScene;
>>>>>>>
LoadingScreen.Instance.Show(TranslationServer.Translate("LOADING_GAME"),
TranslationServer.Translate("CREATING_OBJECTS_FROM_SAVE"))));
state = State.CreatingScene;
<<<<<<<
ReportStatus(false, TranslationServer.Translate("SAVE_IS_INVALID"),
TranslationServer.Translate("SAVE_HAS_UNKNOWN_GAME_STATE"));
state = State.Finished;
break;
}
try
{
loadedState = (ILoadableGameState)loadedScene.Instance();
}
catch (Exception e)
{
ReportStatus(false,
TranslationServer.Translate("AN_EXCEPTION_HAPPENED_WHILE_INSTANTIATING"),
e.ToString());
=======
ReportStatus(false, "Save is invalid", "Save has invalid game state scene");
>>>>>>>
ReportStatus(false, TranslationServer.Translate("SAVE_IS_INVALID"),
TranslationServer.Translate("SAVE_HAS_INVALID_GAME_STATE")); |
<<<<<<<
cmbItem.SelectedIndex = Database.GameObjectListIndex(GameObjectType.Item, _myTask.Data1);
scrlItemQuantity.Value = _myTask.Data2;
lblItemQuantity.Text = "Amount: " + scrlItemQuantity.Value;
=======
cmbItem.SelectedIndex = Database.GameObjectListIndex(GameObject.Item, _myTask.Data1);
nudItemAmount.Value = _myTask.Data2;
>>>>>>>
cmbItem.SelectedIndex = Database.GameObjectListIndex(GameObjectType.Item, _myTask.Data1);
nudItemAmount.Value = _myTask.Data2;
<<<<<<<
cmbNpc.SelectedIndex = Database.GameObjectListIndex(GameObjectType.Item, _myTask.Data1);
scrlNpcQuantity.Value = _myTask.Data2;
lblNpcQuantity.Text = "Amount: " + scrlNpcQuantity.Value;
=======
cmbNpc.SelectedIndex = Database.GameObjectListIndex(GameObject.Item, _myTask.Data1);
nudNpcQuantity.Value = _myTask.Data2;
>>>>>>>
cmbNpc.SelectedIndex = Database.GameObjectListIndex(GameObjectType.Item, _myTask.Data1);
nudNpcQuantity.Value = _myTask.Data2; |
<<<<<<<
public static void SendQuestOffer(Player player, int questId)
{
var bf = new ByteBuffer();
bf.WriteLong((int)ServerPackets.QuestOffer);
bf.WriteInteger(questId);
SendDataTo(player.MyClient, bf.ToArray());
bf.Dispose();
}
public static void SendQuestsProgress(Client client)
{
var bf = new ByteBuffer();
bf.WriteLong((int)ServerPackets.QuestProgress);
bf.WriteInteger(client.Entity.Quests.Count);
foreach (var quest in client.Entity.Quests)
{
bf.WriteInteger(quest.Key);
bf.WriteByte(1);
bf.WriteInteger(quest.Value.completed);
bf.WriteInteger(quest.Value.task);
bf.WriteInteger(quest.Value.taskProgress);
}
SendDataTo(client, bf.ToArray());
bf.Dispose();
}
public static void SendQuestProgress(Player player, int questId)
{
var bf = new ByteBuffer();
bf.WriteLong((int)ServerPackets.QuestProgress);
bf.WriteInteger(1);
bf.WriteInteger(questId);
if (player.Quests.ContainsKey(questId))
{
bf.WriteByte(1);
bf.WriteInteger(player.Quests[questId].completed);
bf.WriteInteger(player.Quests[questId].task);
bf.WriteInteger(player.Quests[questId].taskProgress);
}
else
{
bf.WriteByte(0);
}
SendDataTo(player.MyClient, bf.ToArray());
bf.Dispose();
}
=======
public static void StartTrade(Client client, int target)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.TradeStart);
bf.WriteInteger(target);
client.SendPacket(bf.ToArray());
bf.Dispose();
}
public static void SendTradeUpdate(Client client, int index, int slot)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.TradeUpdate);
bf.WriteInteger(index);
bf.WriteInteger(slot);
if (((Player)Globals.Entities[index]).Trade[slot] == null || ((Player)Globals.Entities[index]).Trade[slot].ItemNum < 0 ||
((Player)Globals.Entities[index]).Trade[slot].ItemVal <= 0)
{
bf.WriteInteger(0);
}
else
{
bf.WriteInteger(1);
bf.WriteBytes(((Player)Globals.Entities[index]).Trade[slot].Data());
}
client.SendPacket(bf.ToArray());
bf.Dispose();
}
public static void SendTradeClose(Client client)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.TradeClose);
client.SendPacket(bf.ToArray());
bf.Dispose();
}
public static void SendTradeRequest(Client client, int partnerIndex)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.TradeRequest);
bf.WriteInteger(partnerIndex);
client.SendPacket(bf.ToArray());
bf.Dispose();
}
>>>>>>>
public static void SendQuestOffer(Player player, int questId)
{
var bf = new ByteBuffer();
bf.WriteLong((int)ServerPackets.QuestOffer);
bf.WriteInteger(questId);
SendDataTo(player.MyClient, bf.ToArray());
bf.Dispose();
}
public static void SendQuestsProgress(Client client)
{
var bf = new ByteBuffer();
bf.WriteLong((int)ServerPackets.QuestProgress);
bf.WriteInteger(client.Entity.Quests.Count);
foreach (var quest in client.Entity.Quests)
{
bf.WriteInteger(quest.Key);
bf.WriteByte(1);
bf.WriteInteger(quest.Value.completed);
bf.WriteInteger(quest.Value.task);
bf.WriteInteger(quest.Value.taskProgress);
}
SendDataTo(client, bf.ToArray());
bf.Dispose();
}
public static void SendQuestProgress(Player player, int questId)
{
var bf = new ByteBuffer();
bf.WriteLong((int)ServerPackets.QuestProgress);
bf.WriteInteger(1);
bf.WriteInteger(questId);
if (player.Quests.ContainsKey(questId))
{
bf.WriteByte(1);
bf.WriteInteger(player.Quests[questId].completed);
bf.WriteInteger(player.Quests[questId].task);
bf.WriteInteger(player.Quests[questId].taskProgress);
}
else
{
bf.WriteByte(0);
}
SendDataTo(player.MyClient, bf.ToArray());
bf.Dispose();
}
public static void StartTrade(Client client, int target)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.TradeStart);
bf.WriteInteger(target);
client.SendPacket(bf.ToArray());
bf.Dispose();
}
public static void SendTradeUpdate(Client client, int index, int slot)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.TradeUpdate);
bf.WriteInteger(index);
bf.WriteInteger(slot);
if (((Player)Globals.Entities[index]).Trade[slot] == null || ((Player)Globals.Entities[index]).Trade[slot].ItemNum < 0 ||
((Player)Globals.Entities[index]).Trade[slot].ItemVal <= 0)
{
bf.WriteInteger(0);
}
else
{
bf.WriteInteger(1);
bf.WriteBytes(((Player)Globals.Entities[index]).Trade[slot].Data());
}
client.SendPacket(bf.ToArray());
bf.Dispose();
}
public static void SendTradeClose(Client client)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.TradeClose);
client.SendPacket(bf.ToArray());
bf.Dispose();
}
public static void SendTradeRequest(Client client, int partnerIndex)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.TradeRequest);
bf.WriteInteger(partnerIndex);
client.SendPacket(bf.ToArray());
bf.Dispose();
} |
<<<<<<<
TryGiveItem(new ItemInstance(BenchBase.GetCraft(InCraft).Crafts[index].Item, 1));
PacketSender.SendPlayerMsg(MyClient, Strings.Get("crafting","crafted", ItemBase.GetName(BenchBase.GetCraft(InCraft).Crafts[index].Item)), Color.Green);
=======
if (TryGiveItem(new ItemInstance(BenchBase.GetCraft(InCraft).Crafts[index].Item, 1)))
{
PacketSender.SendPlayerMsg(MyClient,
"You successfully crafted " + ItemBase.GetName(BenchBase.GetCraft(InCraft).Crafts[index].Item) +
"!", Color.Green);
}
else
{
Inventory = invbackup;
PacketSender.SendInventory(MyClient);
PacketSender.SendPlayerMsg(MyClient,
"You do not have enough inventory space to craft " + ItemBase.GetName(BenchBase.GetCraft(InCraft).Crafts[index].Item) +
"!", Color.Red);
}
>>>>>>>
if (TryGiveItem(new ItemInstance(BenchBase.GetCraft(InCraft).Crafts[index].Item, 1)))
{
PacketSender.SendPlayerMsg(MyClient, Strings.Get("crafting","crafted", ItemBase.GetName(BenchBase.GetCraft(InCraft).Crafts[index].Item)), Color.Green);
}
else
{
Inventory = invbackup;
PacketSender.SendInventory(MyClient);
PacketSender.SendPlayerMsg(MyClient,
"You do not have enough inventory space to craft " + ItemBase.GetName(BenchBase.GetCraft(InCraft).Crafts[index].Item) +
"!", Color.Red);
} |
<<<<<<<
=======
this.txtMaxHp = new System.Windows.Forms.TextBox();
this.lblMaxHp = new System.Windows.Forms.Label();
this.scrlAnimation = new System.Windows.Forms.HScrollBar();
this.lblAnimation = new System.Windows.Forms.Label();
>>>>>>>
<<<<<<<
// picEndResource
//
this.picEndResource.Location = new System.Drawing.Point(0, 0);
this.picEndResource.Name = "picEndResource";
this.picEndResource.Size = new System.Drawing.Size(195, 277);
this.picEndResource.TabIndex = 2;
this.picEndResource.TabStop = false;
this.picEndResource.MouseDown += new System.Windows.Forms.MouseEventHandler(this.picEndResource_MouseDown);
this.picEndResource.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picEndResource_MouseMove);
this.picEndResource.MouseUp += new System.Windows.Forms.MouseEventHandler(this.picEndResource_MouseUp);
//
=======
// picEndResource
//
this.picEndResource.Location = new System.Drawing.Point(0, 0);
this.picEndResource.Name = "picEndResource";
this.picEndResource.Size = new System.Drawing.Size(1024, 1024);
this.picEndResource.TabIndex = 2;
this.picEndResource.TabStop = false;
//
>>>>>>>
// picEndResource
//
this.picEndResource.Location = new System.Drawing.Point(0, 0);
this.picEndResource.Name = "picEndResource";
this.picEndResource.Size = new System.Drawing.Size(195, 341);
this.picEndResource.TabIndex = 2;
this.picEndResource.TabStop = false;
this.picEndResource.MouseDown += new System.Windows.Forms.MouseEventHandler(this.picEndResource_MouseDown);
this.picEndResource.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picEndResource_MouseMove);
this.picEndResource.MouseUp += new System.Windows.Forms.MouseEventHandler(this.picEndResource_MouseUp);
//
<<<<<<<
// picInitialResource
//
this.picInitialResource.Location = new System.Drawing.Point(0, 0);
this.picInitialResource.Name = "picInitialResource";
this.picInitialResource.Size = new System.Drawing.Size(195, 277);
this.picInitialResource.TabIndex = 2;
this.picInitialResource.TabStop = false;
this.picInitialResource.MouseDown += new System.Windows.Forms.MouseEventHandler(this.picInitialResource_MouseDown);
this.picInitialResource.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picInitialResource_MouseMove);
this.picInitialResource.MouseUp += new System.Windows.Forms.MouseEventHandler(this.picInitialResource_MouseUp);
//
=======
// picInitialResource
//
this.picInitialResource.Location = new System.Drawing.Point(0, 0);
this.picInitialResource.Name = "picInitialResource";
this.picInitialResource.Size = new System.Drawing.Size(1024, 1024);
this.picInitialResource.TabIndex = 2;
this.picInitialResource.TabStop = false;
//
>>>>>>>
// picInitialResource
//
this.picInitialResource.Location = new System.Drawing.Point(0, 0);
this.picInitialResource.Name = "picInitialResource";
this.picInitialResource.Size = new System.Drawing.Size(195, 341);
this.picInitialResource.TabIndex = 2;
this.picInitialResource.TabStop = false;
this.picInitialResource.MouseDown += new System.Windows.Forms.MouseEventHandler(this.picInitialResource_MouseDown);
this.picInitialResource.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picInitialResource_MouseMove);
this.picInitialResource.MouseUp += new System.Windows.Forms.MouseEventHandler(this.picInitialResource_MouseUp);
//
<<<<<<<
=======
// txtMaxHp
//
this.txtMaxHp.Location = new System.Drawing.Point(75, 103);
this.txtMaxHp.Name = "txtMaxHp";
this.txtMaxHp.Size = new System.Drawing.Size(135, 20);
this.txtMaxHp.TabIndex = 34;
this.txtMaxHp.TextChanged += new System.EventHandler(this.txtMaxHp_TextChanged);
//
// lblMaxHp
//
this.lblMaxHp.AutoSize = true;
this.lblMaxHp.Location = new System.Drawing.Point(6, 106);
this.lblMaxHp.Name = "lblMaxHp";
this.lblMaxHp.Size = new System.Drawing.Size(48, 13);
this.lblMaxHp.TabIndex = 35;
this.lblMaxHp.Text = "Max HP:";
//
// scrlAnimation
//
this.scrlAnimation.LargeChange = 1;
this.scrlAnimation.Location = new System.Drawing.Point(9, 186);
this.scrlAnimation.Maximum = 3600;
this.scrlAnimation.Minimum = -1;
this.scrlAnimation.Name = "scrlAnimation";
this.scrlAnimation.Size = new System.Drawing.Size(201, 18);
this.scrlAnimation.TabIndex = 37;
this.scrlAnimation.Value = -1;
this.scrlAnimation.Scroll += new System.Windows.Forms.ScrollEventHandler(this.scrlAnimation_Scroll);
//
// lblAnimation
//
this.lblAnimation.AutoSize = true;
this.lblAnimation.Location = new System.Drawing.Point(6, 173);
this.lblAnimation.Name = "lblAnimation";
this.lblAnimation.Size = new System.Drawing.Size(94, 13);
this.lblAnimation.TabIndex = 36;
this.lblAnimation.Text = "Animation: 0 None";
//
>>>>>>> |
<<<<<<<
private const string DIRECTORY_BACKUPS = "resources/backups";
private const int DbVersion = 10;
=======
private const int DbVersion = 11;
>>>>>>>
private const string DIRECTORY_BACKUPS = "resources/backups";
private const int DbVersion = 11; |
<<<<<<<
namespace Intersect.Server.Classes.Entities
=======
/////////////////////////////////////////////////////
/// Welcome to Kibbelz Boss ass projectile system ///
/// Glad you took the time to view the code :) ///
/////////////////////////////////////////////////////
namespace Intersect_Server.Classes.Entities
>>>>>>>
/////////////////////////////////////////////////////
/// Welcome to Kibbelz Boss ass projectile system ///
/// Glad you took the time to view the code :) ///
/////////////////////////////////////////////////////
namespace Intersect.Server.Classes.Entities |
<<<<<<<
//Event trigger
for (var i = 0; i < MyEvents.Count; i++)
{
MyEvents[i].PlayerHasDied = true;
}
base.Die(dropitems);
=======
base.Die(dropitems, killer);
>>>>>>>
//Event trigger
for (var i = 0; i < MyEvents.Count; i++)
{
MyEvents[i].PlayerHasDied = true;
}
base.Die(dropitems, killer); |
<<<<<<<
this.kernel.Bind<IRemovableDriveWatcher>().To<RemovableDriveWatcher>();
this.kernel.Bind<ILibraryReader>().To<LibraryFileReader>().WithConstructorArgument("sourcePath", FilePath);
this.kernel.Bind<ILibraryWriter>().To<LibraryFileWriter>().WithConstructorArgument("targetPath", FilePath);
this.kernel.Bind<ViewSettings>().To<ViewSettings>().InSingletonScope();
this.kernel.Bind<CoreSettings>().To<CoreSettings>().InSingletonScope()
=======
this.kernel.Bind<ILibraryReader>().To<LibraryFileReader>().WithConstructorArgument("sourcePath", LibraryFilePath);
this.kernel.Bind<ILibraryWriter>().To<LibraryFileWriter>().WithConstructorArgument("targetPath", LibraryFilePath);
this.kernel.Bind<ViewSettings>().To<ViewSettings>().InSingletonScope().WithConstructorArgument("blobCache", BlobCache.LocalMachine);
this.kernel.Bind<CoreSettings>().To<CoreSettings>().InSingletonScope().WithConstructorArgument("blobCache", BlobCache.LocalMachine)
>>>>>>>
this.kernel.Bind<ILibraryReader>().To<LibraryFileReader>().WithConstructorArgument("sourcePath", LibraryFilePath);
this.kernel.Bind<ILibraryWriter>().To<LibraryFileWriter>().WithConstructorArgument("targetPath", LibraryFilePath);
this.kernel.Bind<ViewSettings>().To<ViewSettings>().InSingletonScope();
this.kernel.Bind<CoreSettings>().To<CoreSettings>().InSingletonScope() |
<<<<<<<
// Add managment endpoint services
services.AddCloudFoundryActuators(Configuration);
=======
>>>>>>>
// Add managment endpoint services
services.AddCloudFoundryActuators(Configuration);
<<<<<<<
=======
#if NETCOREAPP3_1
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
#if NETCOREAPP3_1
>>>>>>>
<<<<<<<
app.UseEndpoints(endpoints =>
{
endpoints.MapControllerRoute(
name: "default",
pattern: "{controller=Home}/{action=Index}/{id?}");
});
=======
app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute());
#else
app.UseMvc(routes =>
{
routes.MapRoute(
name: "default",
template: "{controller=Home}/{action=Index}/{id?}");
});
#endif
>>>>>>>
app.UseEndpoints(endpoints =>
{
endpoints.MapControllerRoute(
name: "default",
pattern: "{controller=Home}/{action=Index}/{id?}");
}); |
<<<<<<<
=======
internal static readonly PropertyInfo String_Length =
typeof(string).GetProperty(nameof(string.Length));
>>>>>>> |
<<<<<<<
using System.Threading.Tasks;
using Microsoft.Actions.Actors.Communication;
using Microsoft.Actions.Actors.Communication.Client;
=======
using System.Threading.Tasks;
using Newtonsoft.Json;
>>>>>>>
using System.Threading.Tasks;
using Microsoft.Actions.Actors.Communication;
using Microsoft.Actions.Actors.Communication.Client;
using Newtonsoft.Json;
<<<<<<<
internal static readonly ActorProxyFactory DefaultProxyFactory = new ActorProxyFactory();
private ActorCommunicationClient actorCommunicationClient;
=======
internal static readonly ActorProxyFactory DefaultProxyFactory = new ActorProxyFactory();
private static ActionsHttpInteractor actionsHttpInteractor = new ActionsHttpInteractor();
private string actorType;
private ActorId actorId;
>>>>>>>
internal static readonly ActorProxyFactory DefaultProxyFactory = new ActorProxyFactory();
private static ActionsHttpInteractor actionsHttpInteractor = new ActionsHttpInteractor();
private ActorCommunicationClient actorCommunicationClient;
private string actorType;
private ActorId actorId;
<<<<<<<
}
/// <inheritdoc/>
public ActorId ActorId
{
get
{
return this.actorCommunicationClient.ActorId;
}
}
/// <inheritdoc/>
/// <summary>
/// Gets the <see cref="IActorCommunicationClient"/> interface that this proxy is using to communicate with the actor.
/// </summary>
/// <value><see cref="ActorCommunicationClient"/> that this proxy is using to communicate with the actor.</value>
public IActorCommunicationClient ActorCommunicationClient
{
get { return this.actorCommunicationClient; }
}
internal IActorMessageBodyFactory ActorMessageBodyFactory { get; set; }
=======
this.actorType = actorType;
this.actorId = actorId;
}
>>>>>>>
this.actorType = actorType;
this.actorId = actorId;
}
/// <inheritdoc/>
public ActorId ActorId
{
get
{
return this.actorCommunicationClient.ActorId;
}
}
/// <inheritdoc/>
/// <summary>
/// Gets the <see cref="IActorCommunicationClient"/> interface that this proxy is using to communicate with the actor.
/// </summary>
/// <value><see cref="ActorCommunicationClient"/> that this proxy is using to communicate with the actor.</value>
public IActorCommunicationClient ActorCommunicationClient
{
get { return this.actorCommunicationClient; }
}
internal IActorMessageBodyFactory ActorMessageBodyFactory { get; set; }
<<<<<<<
public static TActorInterface Create<TActorInterface>(ActorId actorId, Type actorType)
=======
public static TActorInterface Create<TActorInterface>(ActorId actorId, Type actorType)
>>>>>>>
public static TActorInterface Create<TActorInterface>(ActorId actorId, Type actorType)
<<<<<<<
await Task.CompletedTask;
return string.Empty;
}
internal void Initialize(
ActorCommunicationClient client,
IActorMessageBodyFactory actorMessageBodyFactory)
{
this.actorCommunicationClient = client;
this.ActorMessageBodyFactory = actorMessageBodyFactory;
}
/// <summary>
/// Invokes the specified method for the actor with provided request.
/// </summary>
/// <param name="interfaceId">Interface ID.</param>
/// <param name="methodId">Method ID.</param>
/// <param name="methodName">Method Name.</param>
/// <param name="requestMsgBodyValue">Request Message Body Value.</param>
/// <param name="cancellationToken">Cancellation Token.</param>
/// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
protected async Task<IActorMessageBody> InvokeAsync(
int interfaceId,
int methodId,
string methodName,
IActorMessageBody requestMsgBodyValue,
CancellationToken cancellationToken)
{
var headers = new ActorRequestMessageHeader
{
ActorId = this.ActorId,
ActorType = this.actorCommunicationClient.ActorType.Name,
InterfaceId = interfaceId,
MethodId = methodId,
CallContext = Actors.Helper.GetCallContext(),
MethodName = methodName,
};
var responseMsg = await this.actorCommunicationClient.InvokeAsync(
new ActorRequestMessage(
headers,
requestMsgBodyValue),
methodName,
cancellationToken);
return responseMsg != null ? responseMsg.GetBody()
: null;
}
/// <summary>
/// Creates the Remoting request message Body.
/// </summary>
/// <param name="interfaceName">Full Name of the service interface for which this call is invoked.</param>
/// <param name="methodName">Method Name of the service interface for which this call is invoked.</param>
/// <param name="parameterCount">Number of Parameters in the service interface Method.</param>
/// <param name="wrappedRequest">Wrapped Request Object.</param>
/// <returns>A request message body for V2 remoting stack.</returns>
protected IActorMessageBody CreateRequestMessageBody(
string interfaceName,
string methodName,
int parameterCount,
object wrappedRequest)
{
return this.ActorMessageBodyFactory.CreateMessageBody(interfaceName, methodName, wrappedRequest, parameterCount);
}
/// <summary>
/// This method is used by the generated proxy type and should be used directly. This method converts the Task with object
/// return value to a Task without the return value for the void method invocation.
/// </summary>
/// <param name="task">A task returned from the method that contains null return value.</param>
/// <returns>A task that represents the asynchronous operation for remote method call without the return value.</returns>
protected Task ContinueWith(Task<object> task)
{
return task;
}
/// <summary>
/// This method is used by the generated proxy type and should be used directly. This method converts the Task with object
/// return value to a Task without the return value for the void method invocation.
/// </summary>
/// <param name="interfaceId">Interface Id for the actor interface.</param>
/// <param name="methodId">Method Id for the actor method.</param>
/// <param name="responseBody">Response body.</param>
/// <returns>Return value of method call as <see cref="object"/>.</returns>
protected abstract object GetReturnValue(int interfaceId, int methodId, object responseBody);
/// <summary>
/// Called by the generated proxy class to get the result from the response body.
/// </summary>
/// <typeparam name="TRetval"><see cref="System.Type"/> of the remote method return value.</typeparam>
/// <param name="interfaceId">InterfaceId of the remoting interface.</param>
/// <param name="methodId">MethodId of the remoting Method.</param>
/// <param name="task">A task that represents the asynchronous operation for remote method call.</param>
/// <returns>A task that represents the asynchronous operation for remote method call.
/// The value of the TRetval contains the remote method return value. </returns>
protected async Task<TRetval> ContinueWithResult<TRetval>(
int interfaceId,
int methodId,
Task<IActorMessageBody> task)
{
var responseBody = await task;
var wrappedMessage = responseBody as WrappedMessage;
if (wrappedMessage != null)
{
return (TRetval)this.GetReturnValue(
interfaceId,
methodId,
wrappedMessage.Value);
}
return (TRetval)responseBody.Get(typeof(TRetval));
}
/// <summary>
/// This check if we are wrapping remoting message or not.
/// </summary>
/// <param name="requestMessage">Remoting Request Message.</param>
/// <returns>true or false. </returns>
protected bool CheckIfItsWrappedRequest(IActorMessageBody requestMessage)
{
if (requestMessage is WrappedMessage)
{
return true;
}
return false;
=======
var jsonPayload = JsonConvert.SerializeObject(data);
return actionsHttpInteractor.InvokeActorMethodAsync(this.actorType, this.actorId, method, jsonPayload, cancellationToken);
>>>>>>>
var jsonPayload = JsonConvert.SerializeObject(data);
return actionsHttpInteractor.InvokeActorMethodAsync(this.actorType, this.actorId, method, jsonPayload, cancellationToken);
}
internal void Initialize(
ActorCommunicationClient client,
IActorMessageBodyFactory actorMessageBodyFactory)
{
this.actorCommunicationClient = client;
this.ActorMessageBodyFactory = actorMessageBodyFactory;
}
/// <summary>
/// Invokes the specified method for the actor with provided request.
/// </summary>
/// <param name="interfaceId">Interface ID.</param>
/// <param name="methodId">Method ID.</param>
/// <param name="methodName">Method Name.</param>
/// <param name="requestMsgBodyValue">Request Message Body Value.</param>
/// <param name="cancellationToken">Cancellation Token.</param>
/// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
protected async Task<IActorMessageBody> InvokeAsync(
int interfaceId,
int methodId,
string methodName,
IActorMessageBody requestMsgBodyValue,
CancellationToken cancellationToken)
{
var headers = new ActorRequestMessageHeader
{
ActorId = this.ActorId,
ActorType = this.actorCommunicationClient.ActorType.Name,
InterfaceId = interfaceId,
MethodId = methodId,
CallContext = Actors.Helper.GetCallContext(),
MethodName = methodName,
};
var responseMsg = await this.actorCommunicationClient.InvokeAsync(
new ActorRequestMessage(
headers,
requestMsgBodyValue),
methodName,
cancellationToken);
return responseMsg != null ? responseMsg.GetBody()
: null;
}
/// <summary>
/// Creates the Remoting request message Body.
/// </summary>
/// <param name="interfaceName">Full Name of the service interface for which this call is invoked.</param>
/// <param name="methodName">Method Name of the service interface for which this call is invoked.</param>
/// <param name="parameterCount">Number of Parameters in the service interface Method.</param>
/// <param name="wrappedRequest">Wrapped Request Object.</param>
/// <returns>A request message body for V2 remoting stack.</returns>
protected IActorMessageBody CreateRequestMessageBody(
string interfaceName,
string methodName,
int parameterCount,
object wrappedRequest)
{
return this.ActorMessageBodyFactory.CreateMessageBody(interfaceName, methodName, wrappedRequest, parameterCount);
}
/// <summary>
/// This method is used by the generated proxy type and should be used directly. This method converts the Task with object
/// return value to a Task without the return value for the void method invocation.
/// </summary>
/// <param name="task">A task returned from the method that contains null return value.</param>
/// <returns>A task that represents the asynchronous operation for remote method call without the return value.</returns>
protected Task ContinueWith(Task<object> task)
{
return task;
}
/// <summary>
/// This method is used by the generated proxy type and should be used directly. This method converts the Task with object
/// return value to a Task without the return value for the void method invocation.
/// </summary>
/// <param name="interfaceId">Interface Id for the actor interface.</param>
/// <param name="methodId">Method Id for the actor method.</param>
/// <param name="responseBody">Response body.</param>
/// <returns>Return value of method call as <see cref="object"/>.</returns>
protected virtual object GetReturnValue(int interfaceId, int methodId, object responseBody)
{
return null;
}
/// <summary>
/// Called by the generated proxy class to get the result from the response body.
/// </summary>
/// <typeparam name="TRetval"><see cref="System.Type"/> of the remote method return value.</typeparam>
/// <param name="interfaceId">InterfaceId of the remoting interface.</param>
/// <param name="methodId">MethodId of the remoting Method.</param>
/// <param name="task">A task that represents the asynchronous operation for remote method call.</param>
/// <returns>A task that represents the asynchronous operation for remote method call.
/// The value of the TRetval contains the remote method return value. </returns>
protected async Task<TRetval> ContinueWithResult<TRetval>(
int interfaceId,
int methodId,
Task<IActorMessageBody> task)
{
var responseBody = await task;
var wrappedMessage = responseBody as WrappedMessage;
if (wrappedMessage != null)
{
return (TRetval)this.GetReturnValue(
interfaceId,
methodId,
wrappedMessage.Value);
}
return (TRetval)responseBody.Get(typeof(TRetval));
}
/// <summary>
/// This check if we are wrapping remoting message or not.
/// </summary>
/// <param name="requestMessage">Remoting Request Message.</param>
/// <returns>true or false. </returns>
protected bool CheckIfItsWrappedRequest(IActorMessageBody requestMessage)
{
if (requestMessage is WrappedMessage)
{
return true;
}
return false; |
<<<<<<<
using Microsoft.Actions.Actors.Communication;
using Microsoft.Actions.Actors.Resources;
=======
using Microsoft.Actions.Actors.Runtime;
>>>>>>>
using Microsoft.Actions.Actors.Communication;
using Microsoft.Actions.Actors.Resources;
using Microsoft.Actions.Actors.Runtime;
<<<<<<<
public Task<object> InvokeActorMethod(string actorId, string actorType, string methodName, byte[] messageHeader, byte[] messageBody, CancellationToken cancellationToken = default(CancellationToken))
{
var relativeUrl = $"{Constants.ActorRequestRelativeUrl}/{actorType}/{actorId}/{methodName}";
var requestId = Guid.NewGuid().ToString();
HttpRequestMessage RequestFunc()
{
var request = new HttpRequestMessage()
{
Method = HttpMethod.Post,
Content = new ByteArrayContent(messageBody),
};
request.Headers.Add(Constants.RequestHeaderName, Encoding.UTF8.GetString(messageHeader, 0, messageHeader.Length));
request.Content.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
return request;
}
return Task.FromResult((object)this.SendAsync(RequestFunc, relativeUrl, requestId, cancellationToken));
}
=======
public Task<string> InvokeActorMethodAsync(string actorType, ActorId actorId, string methodName, string jsonPayload, CancellationToken cancellationToken = default(CancellationToken))
{
var relativeUri = $"v1.0/actors/{actorType}/{actorId}/{methodName}";
var requestId = Guid.NewGuid().ToString();
HttpRequestMessage RequestFunc()
{
var request = new HttpRequestMessage()
{
Method = HttpMethod.Put,
Content = new StringContent(jsonPayload, Encoding.UTF8),
};
request.Content.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
return request;
}
return this.SendAsyncGetResponseAsRawJson(RequestFunc, relativeUri, requestId, cancellationToken);
}
>>>>>>>
public Task<object> InvokeActorMethod(string actorId, string actorType, string methodName, byte[] messageHeader, byte[] messageBody, CancellationToken cancellationToken = default(CancellationToken))
{
var relativeUrl = $"{Constants.ActorRequestRelativeUrl}/{actorType}/{actorId}/{methodName}";
var requestId = Guid.NewGuid().ToString();
HttpRequestMessage RequestFunc()
{
var request = new HttpRequestMessage()
{
Method = HttpMethod.Post,
Content = new ByteArrayContent(messageBody),
};
request.Headers.Add(Constants.RequestHeaderName, Encoding.UTF8.GetString(messageHeader, 0, messageHeader.Length));
request.Content.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
return request;
}
return Task.FromResult((object)this.SendAsync(RequestFunc, relativeUrl, requestId, cancellationToken));
}
public Task<string> InvokeActorMethodAsync(string actorType, ActorId actorId, string methodName, string jsonPayload, CancellationToken cancellationToken = default(CancellationToken))
{
var relativeUri = $"v1.0/actors/{actorType}/{actorId}/{methodName}";
var requestId = Guid.NewGuid().ToString();
HttpRequestMessage RequestFunc()
{
var request = new HttpRequestMessage()
{
Method = HttpMethod.Put,
Content = new StringContent(jsonPayload, Encoding.UTF8),
};
request.Content.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
return request;
}
return this.SendAsyncGetResponseAsRawJson(RequestFunc, relativeUri, requestId, cancellationToken);
}
<<<<<<<
/// <returns>The payload of the GET response.</returns>
internal async Task<HttpResponseMessage> SendAsync(
=======
internal async Task SendAsync(
>>>>>>>
/// <returns>The payload of the GET response.</returns>
internal async Task<HttpResponseMessage> SendAsync( |
<<<<<<<
this.btnCenterText = new System.Windows.Forms.Button();
=======
this.btnRectangle = new System.Windows.Forms.Button();
>>>>>>>
this.btnCenterText = new System.Windows.Forms.Button();
this.btnRectangle = new System.Windows.Forms.Button();
<<<<<<<
// btnCenterText
//
this.btnCenterText.Location = new System.Drawing.Point(168, 63);
this.btnCenterText.Name = "btnCenterText";
this.btnCenterText.Size = new System.Drawing.Size(73, 23);
this.btnCenterText.TabIndex = 3;
this.btnCenterText.Text = "Center";
this.btnCenterText.UseVisualStyleBackColor = true;
this.btnCenterText.Click += new System.EventHandler(this.btnCenterText_Click);
//
=======
// btnRectangle
//
this.btnRectangle.Location = new System.Drawing.Point(4, 262);
this.btnRectangle.Name = "btnRectangle";
this.btnRectangle.Size = new System.Drawing.Size(75, 23);
this.btnRectangle.TabIndex = 9;
this.btnRectangle.Text = "Rectangle";
this.btnRectangle.UseVisualStyleBackColor = true;
this.btnRectangle.Click += new System.EventHandler(this.btnRectangle_Click);
//
>>>>>>>
// btnCenterText
//
this.btnCenterText.Location = new System.Drawing.Point(168, 63);
this.btnCenterText.Name = "btnCenterText";
this.btnCenterText.Size = new System.Drawing.Size(73, 23);
this.btnCenterText.TabIndex = 3;
this.btnCenterText.Text = "Center";
this.btnCenterText.UseVisualStyleBackColor = true;
this.btnCenterText.Click += new System.EventHandler(this.btnCenterText_Click);
//
// btnRectangle
//
this.btnRectangle.Location = new System.Drawing.Point(4, 262);
this.btnRectangle.Name = "btnRectangle";
this.btnRectangle.Size = new System.Drawing.Size(75, 23);
this.btnRectangle.TabIndex = 9;
this.btnRectangle.Text = "Rectangle";
this.btnRectangle.UseVisualStyleBackColor = true;
this.btnRectangle.Click += new System.EventHandler(this.btnRectangle_Click);
//
<<<<<<<
this.Controls.Add(this.btnCenterText);
=======
this.Controls.Add(this.btnRectangle);
>>>>>>>
this.Controls.Add(this.btnCenterText);
this.Controls.Add(this.btnRectangle);
<<<<<<<
private System.Windows.Forms.Button btnCenterText;
=======
private System.Windows.Forms.Button btnRectangle;
>>>>>>>
private System.Windows.Forms.Button btnCenterText;
private System.Windows.Forms.Button btnRectangle; |
<<<<<<<
this.btnCenterText = new System.Windows.Forms.Button();
this.txtBoundaries = new ThoNohT.NohBoard.Controls.VectorTextBox();
this.txtTextPosition = new ThoNohT.NohBoard.Controls.VectorTextBox();
=======
this.btnRectangle = new System.Windows.Forms.Button();
>>>>>>>
this.btnCenterText = new System.Windows.Forms.Button();
this.txtBoundaries = new ThoNohT.NohBoard.Controls.VectorTextBox();
this.txtTextPosition = new ThoNohT.NohBoard.Controls.VectorTextBox();
this.btnRectangle = new System.Windows.Forms.Button();
<<<<<<<
=======
// txtBoundaries
//
this.txtBoundaries.Location = new System.Drawing.Point(85, 90);
this.txtBoundaries.MaxVal = 2147483647;
this.txtBoundaries.Name = "txtBoundaries";
this.txtBoundaries.Separator = ';';
this.txtBoundaries.Size = new System.Drawing.Size(156, 20);
this.txtBoundaries.SpacesAroundSeparator = true;
this.txtBoundaries.TabIndex = 3;
this.txtBoundaries.Text = "0 ; 0";
this.txtBoundaries.X = 0;
this.txtBoundaries.Y = 0;
//
>>>>>>>
// txtBoundaries
//
this.txtBoundaries.Location = new System.Drawing.Point(85, 90);
this.txtBoundaries.MaxVal = 2147483647;
this.txtBoundaries.Name = "txtBoundaries";
this.txtBoundaries.Separator = ';';
this.txtBoundaries.Size = new System.Drawing.Size(156, 20);
this.txtBoundaries.SpacesAroundSeparator = true;
this.txtBoundaries.TabIndex = 3;
this.txtBoundaries.Text = "0 ; 0";
this.txtBoundaries.X = 0;
this.txtBoundaries.Y = 0;
//
<<<<<<<
this.txtText.TabIndex = 0;
=======
this.txtText.TabIndex = 0;
//
// txtTextPosition
//
this.txtTextPosition.Location = new System.Drawing.Point(85, 64);
this.txtTextPosition.MaxVal = 2147483647;
this.txtTextPosition.Name = "txtTextPosition";
this.txtTextPosition.Separator = ';';
this.txtTextPosition.Size = new System.Drawing.Size(156, 20);
this.txtTextPosition.SpacesAroundSeparator = true;
this.txtTextPosition.TabIndex = 2;
this.txtTextPosition.Text = "0 ; 0";
this.txtTextPosition.X = 0;
this.txtTextPosition.Y = 0;
>>>>>>>
this.txtText.TabIndex = 0;
//
// txtTextPosition
//
this.txtTextPosition.Location = new System.Drawing.Point(85, 64);
this.txtTextPosition.MaxVal = 2147483647;
this.txtTextPosition.Name = "txtTextPosition";
this.txtTextPosition.Separator = ';';
this.txtTextPosition.Size = new System.Drawing.Size(156, 20);
this.txtTextPosition.SpacesAroundSeparator = true;
this.txtTextPosition.TabIndex = 2;
this.txtTextPosition.Text = "0 ; 0";
this.txtTextPosition.X = 0;
this.txtTextPosition.Y = 0;
<<<<<<<
// btnCenterText
//
this.btnCenterText.Location = new System.Drawing.Point(168, 62);
this.btnCenterText.Name = "btnCenterText";
this.btnCenterText.Size = new System.Drawing.Size(73, 23);
this.btnCenterText.TabIndex = 3;
this.btnCenterText.Text = "Center";
this.btnCenterText.UseVisualStyleBackColor = true;
this.btnCenterText.Click += new System.EventHandler(this.btnCenterText_Click);
//
// txtBoundaries
//
this.txtBoundaries.Location = new System.Drawing.Point(85, 90);
this.txtBoundaries.MaxVal = 2147483647;
this.txtBoundaries.Name = "txtBoundaries";
this.txtBoundaries.Separator = ';';
this.txtBoundaries.Size = new System.Drawing.Size(156, 20);
this.txtBoundaries.SpacesAroundSeparator = true;
this.txtBoundaries.TabIndex = 4;
this.txtBoundaries.Text = "0 ; 0";
this.txtBoundaries.X = 0;
this.txtBoundaries.Y = 0;
//
// txtTextPosition
//
this.txtTextPosition.Location = new System.Drawing.Point(85, 64);
this.txtTextPosition.MaxVal = 2147483647;
this.txtTextPosition.Name = "txtTextPosition";
this.txtTextPosition.Separator = ';';
this.txtTextPosition.Size = new System.Drawing.Size(77, 20);
this.txtTextPosition.SpacesAroundSeparator = true;
this.txtTextPosition.TabIndex = 2;
this.txtTextPosition.Text = "0 ; 0";
this.txtTextPosition.X = 0;
this.txtTextPosition.Y = 0;
//
=======
// btnRectangle
//
this.btnRectangle.Location = new System.Drawing.Point(4, 261);
this.btnRectangle.Name = "btnRectangle";
this.btnRectangle.Size = new System.Drawing.Size(75, 23);
this.btnRectangle.TabIndex = 9;
this.btnRectangle.Text = "Rectangle";
this.btnRectangle.UseVisualStyleBackColor = true;
this.btnRectangle.Click += new System.EventHandler(this.btnRectangle_Click);
//
>>>>>>>
// btnCenterText
//
this.btnCenterText.Location = new System.Drawing.Point(168, 62);
this.btnCenterText.Name = "btnCenterText";
this.btnCenterText.Size = new System.Drawing.Size(73, 23);
this.btnCenterText.TabIndex = 3;
this.btnCenterText.Text = "Center";
this.btnCenterText.UseVisualStyleBackColor = true;
this.btnCenterText.Click += new System.EventHandler(this.btnCenterText_Click);
//
// txtBoundaries
//
this.txtBoundaries.Location = new System.Drawing.Point(85, 90);
this.txtBoundaries.MaxVal = 2147483647;
this.txtBoundaries.Name = "txtBoundaries";
this.txtBoundaries.Separator = ';';
this.txtBoundaries.Size = new System.Drawing.Size(156, 20);
this.txtBoundaries.SpacesAroundSeparator = true;
this.txtBoundaries.TabIndex = 4;
this.txtBoundaries.Text = "0 ; 0";
this.txtBoundaries.X = 0;
this.txtBoundaries.Y = 0;
//
// txtTextPosition
//
this.txtTextPosition.Location = new System.Drawing.Point(85, 64);
this.txtTextPosition.MaxVal = 2147483647;
this.txtTextPosition.Name = "txtTextPosition";
this.txtTextPosition.Separator = ';';
this.txtTextPosition.Size = new System.Drawing.Size(77, 20);
this.txtTextPosition.SpacesAroundSeparator = true;
this.txtTextPosition.TabIndex = 2;
this.txtTextPosition.Text = "0 ; 0";
this.txtTextPosition.X = 0;
this.txtTextPosition.Y = 0;
// btnRectangle
//
this.btnRectangle.Location = new System.Drawing.Point(4, 261);
this.btnRectangle.Name = "btnRectangle";
this.btnRectangle.Size = new System.Drawing.Size(75, 23);
this.btnRectangle.TabIndex = 9;
this.btnRectangle.Text = "Rectangle";
this.btnRectangle.UseVisualStyleBackColor = true;
this.btnRectangle.Click += new System.EventHandler(this.btnRectangle_Click);
//
<<<<<<<
this.Controls.Add(this.btnCenterText);
=======
this.Controls.Add(this.btnRectangle);
>>>>>>>
this.Controls.Add(this.btnCenterText);
this.Controls.Add(this.btnRectangle);
<<<<<<<
private System.Windows.Forms.Button btnCenterText;
=======
private System.Windows.Forms.Button btnRectangle;
>>>>>>>
private System.Windows.Forms.Button btnCenterText;
private System.Windows.Forms.Button btnRectangle; |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.