conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
=======
/// <summary>
/// Obsolete: Use NetworkClient directly
/// <para>For example, use <c>NetworkClient.Send(message)</c> instead of <c>NetworkManager.client.Send(message)</c></para>
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never), Obsolete("Use NetworkC... |
<<<<<<<
var networkReader = NetworkReaderPool.GetReader(payload);
DeserializeFromReader(networkReader);
NetworkReaderPool.Recycle(networkReader);
=======
using (PooledNetworkReader networkReader = NetworkReaderPool.GetReader(payload))
DeserializeFromRead... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
identity.ConnectionToClient = ownerConnection;
identity.Server = this;
identity.Client = LocalClient;
=======
identity.connectionToClient = (NetworkConnectionToClient)ownerConnection;
>>>>>>>
identity.ConnectionToClien... |
<<<<<<<
/// <summary>
/// This starts a new network client.
/// It uses the networkAddress and networkPort properties as the address to connect to.
/// </summary>
/// <returns>The client object created.</returns>
public NetworkClient StartClient()
=======
... |
<<<<<<<
var w = new NetworkWriter();
w.Write(new TestMessage(1, "2", 3.3));
=======
NetworkWriter w = new NetworkWriter();
w.WriteMessage(new TestMessage(1, "2", 3.3));
>>>>>>>
var w = new NetworkWriter();
w.WriteMessage(new TestMessage(1, "2", ... |
<<<<<<<
SerializeIntoWriter(writer, TargetComponent.transform.localPosition, TargetComponent.transform.localRotation, compressRotation, TargetComponent.transform.localScale);
=======
SerializeIntoWriter(writer, targetComponent.transform.localPosition, targetComponent.transform.localRotation, t... |
<<<<<<<
using System.Text;
=======
using Microsoft.Toolkit.Uwp.UI.Extensions;
>>>>>>>
using System.Text;
using Microsoft.Toolkit.Uwp.UI.Extensions; |
<<<<<<<
using System.Threading.Tasks;
using Mirror;
=======
>>>>>>>
using System.Threading.Tasks;
using Mirror;
<<<<<<<
=======
class NetworkManagerTest : NetworkManager
{
public override void Awake()
{
transport = gameObject.AddComponent<TelepathyTransport>();
play... |
<<<<<<<
Object.DestroyImmediate(gameObject);
Object.DestroyImmediate(networkManagerGameObject);
=======
// clean up
NetworkIdentity.spawned.Clear();
GameObject.DestroyImmediate(gameObject);
>>>>>>>
NetworkIdentity.spawned.Clear();
O... |
<<<<<<<
// T oldValue = value;
var oldValue = new VariableDefinition(syncVar.FieldType);
deserialize.Body.Variables.Add(oldValue);
=======
if (hookMethod != null)
{
// call hook
// but only if SyncVar changed. othe... |
<<<<<<<
if (GUILayout.Button("Server Only"))
{
_ = manager.StartServer();
}
=======
manager.StartHost();
>>>>>>>
_ = manager.StartHost();
<<<<<<<
//... |
<<<<<<<
void Awake()
{
NetIdentity.OnStartServer.AddListener(OnStartServer);
}
public void OnStartServer()
=======
[Header("Game Stats")]
public int damage;
public GameObject source;
public override void OnStartServer()
>>>>>>>
voi... |
<<<<<<<
// all the [Rpc] code from NetworkBehaviourProcessor in one place
using Mono.Cecil;
using Mono.Cecil.Cil;
=======
using Mono.CecilX;
using Mono.CecilX.Cil;
>>>>>>>
using Mono.Cecil;
using Mono.Cecil.Cil; |
<<<<<<<
public Animator Animator;
=======
[Header("Animator")]
[Tooltip("Animator that will have parameters synchronized")]
public Animator animator;
>>>>>>>
[Header("Animator")]
[Tooltip("Animator that will have parameters synchronized")]
public Animator Anima... |
<<<<<<<
var genericInstanceMethod = new GenericInstanceMethod(Weaver.ScriptableObjectCreateInstanceMethod);
=======
GenericInstanceMethod genericInstanceMethod = new GenericInstanceMethod(WeaverTypes.ScriptableObjectCreateInstanceMethod);
>>>>>>>
var genericInstanceMet... |
<<<<<<<
readonly Dictionary<FieldDefinition, FieldDefinition> syncVarNetIds = new Dictionary<FieldDefinition, FieldDefinition>();
readonly List<CmdResult> serverRpcs = new List<CmdResult>();
=======
Dictionary<FieldDefinition, FieldDefinition> syncVarNetIds = new Dictionary<FieldDefinition, Fi... |
<<<<<<<
var versionMethod = new MethodDefinition(ProcessedFunctionName, MethodAttributes.Private, WeaverTypes.voidType);
=======
MethodDefinition versionMethod = new MethodDefinition(ProcessedFunctionName, MethodAttributes.Private, WeaverTypes.Import(typeof(void)));
>>>>>>>
... |
<<<<<<<
if (RoomSlots.Count == maxConnections) return;
=======
if (roomSlots.Count == maxConnections)
return;
>>>>>>>
if (RoomSlots.Count == maxConnections)
return;
<<<<<<<
=======
// Deprecated 02/22/2020
/// ... |
<<<<<<<
server.SpawnObjects();
Debug.Log("Respawned Server objects after additive scene load: " + scene.name);
=======
NetworkServer.SpawnObjects();
if (LogFilter.Debug) Debug.Log("Respawned Server objects after additive scene load: " + s... |
<<<<<<<
using System.Linq;
using Mono.Cecil;
=======
using System;
using Mono.CecilX;
>>>>>>>
using System;
using Mono.Cecil;
using UnityEngine;
<<<<<<<
// Network types
public static TypeReference NetworkBehaviourType;
public static TypeReference RemoteCallHelperType;
public static ... |
<<<<<<<
GUILayout.Label(NetworkManager.transport.ToString());
=======
GUILayout.Label("Connecting to " + manager.networkAddress + "..");
>>>>>>>
GUILayout.Label("Connecting to " + manager.networkAddress + "..");
<<<<<<<
GUILayout.Label(... |
<<<<<<<
=======
// this is always true for regular connections, false for local
// connections because it's set in the constructor and never reset.
[EditorBrowsable(EditorBrowsableState.Never), Obsolete("isConnected will be removed because it's pointless. A NetworkConnection is always connecte... |
<<<<<<<
/// <returns>True if this component calculated the list of observers</returns>
public override bool OnRebuildObservers(HashSet<INetworkConnection> observers, bool initialize)
=======
public override void OnRebuildObservers(HashSet<NetworkConnection> observers, bool initialize)
>>>>>>>... |
<<<<<<<
using System.Threading.Tasks;
=======
>>>>>>>
using System.Threading.Tasks;
<<<<<<<
// Deprecated 03/03/2019
/// <summary>
=======
/// <summary>
>>>>>>>
/// <summary>
<<<<<<<
internal void RegisterSystemHandlers(bool hostMode)
=======
internal static voi... |
<<<<<<<
=======
[EditorBrowsable(EditorBrowsableState.Never), Obsolete("use SendToObservers<T> instead")]
static bool SendToObservers(NetworkIdentity identity, short msgType, MessageBase msg)
{
if (LogFilter.Debug) Debug.Log("Server.SendToObservers id:" + msgType);
if ... |
<<<<<<<
if (NetworkManager.singleton.transport.ClientConnected())
=======
error = 0;
if (Transport.activeTransport.ClientConnected())
>>>>>>>
if (Transport.activeTransport.ClientConnected()) |
<<<<<<<
protected SerializedProperty dontDestroyOnLoadProperty;
protected SerializedProperty runInBackgroundProperty;
SerializedProperty networkAddressProperty;
SerializedProperty tcpPortProperty;
SerializedProperty websocketPortProperty;
SerializedProperty serverBindToI... |
<<<<<<<
///<summary>True if the object is running on a client.</summary>
public bool isClient => m_IsClient;
///<summary>True if this object is running on the server, and has been spawned.</summary>
=======
public bool isClient { get; private set; }
>>>>>>>
///<summary>True if... |
<<<<<<<
///<summary>A flag to make this object not be spawned on clients.</summary>
public bool serverOnly { get { return m_ServerOnly; } set { m_ServerOnly = value; } }
///<summary>True if the object is controlled by the client that owns it.</summary>
public bool localPlayerAuthority { ... |
<<<<<<<
if (enableDrawTileDebug) {
m_DeferredMaterial.EnableKeyword ("ENABLE_DEBUG");
} else {
m_DeferredMaterial.DisableKeyword ("ENABLE_DEBUG");
}
if (enableReflectionProbeDebug) {
m_DeferredReflectionMaterial.EnableKeywo... |
<<<<<<<
if (LogFilter.Debug) { Debug.Log("OnSerializeSafely written for object=" + comp.name + " component=" + comp.GetType() + " sceneId=" + m_SceneId); }
=======
int endPosition = writer.Position;
// fill in length now
writer.Position = headerPosition;
wr... |
<<<<<<<
var w = new NetworkWriter();
w.Write(new TestMessage(1, "2", 3.3));
=======
NetworkWriter w = new NetworkWriter();
w.WriteMessage(new TestMessage(1, "2", 3.3));
>>>>>>>
var w = new NetworkWriter();
w.WriteMessage(new TestMessage(1, "2", ... |
<<<<<<<
=======
public void WriteLine(string text)
{
WriteLine(new FormatArray(text));
}
public void WriteLine(string format, object argument)
{
WriteLine(new FormatArray(format, argument));
}
public void WriteLine(string format, objec... |
<<<<<<<
var method = new MethodDefinition(".ctor", methodAttributes, WeaverTypes.voidType);
=======
MethodDefinition method = new MethodDefinition(".ctor", methodAttributes, WeaverTypes.Import(typeof(void)));
>>>>>>>
var method = new MethodDefinition(".ctor", methodAtt... |
<<<<<<<
=======
/// Obsolete: Use NetworkClient/NetworkServer.RegisterHandler{T} instead
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never), Obsolete("Use NetworkClient/NetworkServer.RegisterHandler<T> instead")]
public void RegisterHandler(short msgType, NetworkMessageDelegat... |
<<<<<<<
var formData = form.AllKeys.SelectMany(k => (form.GetValues(k) ?? new string[0]).Select(v => new { Name = k, Value = v }));
Log.Write(_formDataLoggingLevel, "Client provided {@FormData}", formData);
=======
var formData = form.AllKeys.SelectMany(k =>... |
<<<<<<<
using System;
using System.Diagnostics;
using System.Runtime.CLR;
using BenchmarkDotNet;
=======
>>>>>>> |
<<<<<<<
public enum Gender{Male, Female, Unknown}
public class TestFoo
{
public Gender Gender { get; set; }
public Gender? GenderNullable { get; set; }
}
[Test]
public void SerializeEnumToStringValues()
{
// Arrange
... |
<<<<<<<
public string Content { get; set; }
public string Location { get; set; }
public static MockResponse Json(int statusCode, string json)
{
return Json((HttpStatusCode)statusCode, json, null);
}
public static MockResponse Json(int statusCode, string json... |
<<<<<<<
CMSConfiguration.Configure();
=======
ResourceSpace.Has.ResourcesOfType<RedirectArgs>()
.AtUri(Constants.RedirectPath)
.HandledBy<RedirectHandler>()
.TranscodedBy<FormUrlencodedCodec>();
//.TranscodedBy<LinkHeaderCodec>();
ConfigureCMS()... |
<<<<<<<
public CompilationGenerator()
{
this.assemblyResolver = new CompositeCompilationAssemblyResolver(new ICompilationAssemblyResolver[]
{
new ReferenceAssemblyPathResolver(),
new PackageCompilationAssemblyResolver()
});
... |
<<<<<<<
Dictionary<string, float> m_FloatPropertiesToSet = new Dictionary<string, float>();
Dictionary<string, Color> m_ColorPropertiesToSet = new Dictionary<string, Color>();
List<string> m_TexturesToRemove = new List<string>();
=======
class KeywordFloatRename
{
... |
<<<<<<<
SerializeElements(writer, manager, element);
=======
// Write the child elements: serialized, children then unknown children.
this.WriteElements(writer, manager, element);
this.SerializeElements(writer, manager, element.Children);
... |
<<<<<<<
using System.Text.RegularExpressions;
=======
using Metrics;
using Metrics.Utils;
>>>>>>>
using Metrics;
using System.Text.RegularExpressions;
using Metrics.Utils;
<<<<<<<
public TimerForEachRequestMiddleware(MetricsRegistry registry, string metricPrefix, Regex[] ignorePatterns)
: base(i... |
<<<<<<<
using Metrics.Core;
=======
using System;
using Metrics;
using Metrics.Core;
>>>>>>>
using System;
using Metrics;
using Metrics.Core;
<<<<<<<
public OwinRequestMetricsConfig(Action<object> middlewareRegistration, MetricsRegistry metricsRegistry,
Regex[] ignoreRequestPathPatterns)
===... |
<<<<<<<
=======
private const string PrivateDependencyResolutionPolicy = "private";
private static readonly Lazy<Dictionary<string, ScriptRuntimeAssembly>> _runtimeAssemblies = new Lazy<Dictionary<string, ScriptRuntimeAssembly>>(DependencyHelper.GetRuntimeAssemblies);
>>>>>>>
private const s... |
<<<<<<<
private AbstractMultiLifetimeInstance _instance;
=======
#pragma warning disable CA2213 // OnceInitializedOnceDisposedAsync are not tracked correctly by the IDisposeable analyzer
private IMultiLifetimeInstance _instance;
#pragma warning restore CA2213
>>>>>>>
private IMultiLifetimeIns... |
<<<<<<<
librariesRoot.Expand();
computerRoot.Expand();
}
private void SetNodeImage(IntPtr node, IntPtr pidl, IntPtr m_TreeViewHandle, Boolean isOverlayed) {
try {
var itemInfo = new TVITEMW();
// We need to set the images for the item by sending a
// TVM_SETITEMW mess... |
<<<<<<<
private void CloseTab(Wpf.Controls.TabItem thetab, bool allowreopening = true) {
if (tcMain.SelectedIndex == 0 && tcMain.Items.Count == 1) {
if (this.IsCloseLastTabCloseApp) {
Close();
}
else {
ShellListView.Navigate(new ShellItem(tcMain.StartUpLocation));
}
return;
}
t... |
<<<<<<<
m_SpotCookieSize = properties.Find(x => x.globalFrameSettings.lightLoopSettings.spotCookieSize);
m_PointCookieSize = properties.Find(x => x.globalFrameSettings.lightLoopSettings.pointCookieSize);
m_ReflectionCubemapSize = properties.Find(x => x.globalFrameSettings.lightLoopSe... |
<<<<<<<
internal enum ConnectionRequestResult
{
Accept,
Reject
}
=======
/// <summary>
/// Additional information about disconnection
/// </summary>
>>>>>>>
internal enum ConnectionRequestResult
{
Accept,
Reject
}
/// <summary>
/// Additio... |
<<<<<<<
else if(IPv6Support)
=======
else if(_udpSocketv6 != null)
>>>>>>>
else if(IPv6Support)
<<<<<<<
=======
//Close IPv4
>>>>>>>
//Close IPv4
<<<<<<<
if (Thread.CurrentThread != _threadv6)
{
_... |
<<<<<<<
_unitySocketFix.Port = LocalPort;
_unitySocketFix.IPv6 = ipv6;
=======
_unitySocketFix.Port = port;
_unitySocketFix.IPv6 = ipv6Mode;
>>>>>>>
_unitySocketFix.Port = LocalPort;
_unitySocketFix.IPv6 = ipv6Mode;
<<<<... |
<<<<<<<
internal CFF.Cff1Font _ownerCffFont;
internal CFF.Cff1GlyphData _cff1GlyphData; //temp , TODO: review here again
internal Glyph(CFF.Cff1Font owner, CFF.Cff1GlyphData cff1Glyph)
{
#if DEBUG
this.dbugId = s_debugTotalId++;
#endif
this._ownerCffFont = owner;... |
<<<<<<<
internal readonly ushort _startCode;
internal readonly ushort[] _glyphIdArray;
=======
readonly ushort _startCode;
readonly ushort[] _glyphIdArray;
public override void CollectUnicodeChars(List<uint> unicodes)
{
ushort u = _startCode;
fo... |
<<<<<<<
TelemetryEvent telemetryEvent = new TelemetryEvent(GetEventName(eventName));
foreach ((string propertyName, object propertyValue) in properties)
=======
var telemetryEvent = new TelemetryEvent(GetEventName(eventName));
foreach (var property in properties)
>>>>>... |
<<<<<<<
var builder = new Typography.Contours.GlyphPathBuilder(typeface);
builder.BuildFromGlyphIndex(typeface.GetGlyphIndex(selectedChar), 300);
=======
var builder = new Typography.Contours.GlyphOutlineBuilder(typeface);
builder.BuildFromGlyphIndex(typ... |
<<<<<<<
// Copyright 2007-2008 The Apache Software Foundation.
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
// this file except in compliance with the License. You may obtain a copy of the
// License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless r... |
<<<<<<<
/// The poolMetaData is set by the pool which created the entity and contains information about the pool.
/// It's used to provide better error messages.
=======
public Stack<IComponent>[] componentPools { get { return _componentPools; } }
>>>>>>>
public Stack<IComponent>[] ... |
<<<<<<<
=======
[Test]
public void TestMaterializedViewSchema([IncludeDataSources(TestProvName.AllPostgreSQL)] string context)
{
using (var db = new TestDataConnection(context))
{
var schema = db.DataProvider.GetSchemaProvider().GetSchema(db);
var view = schema.Tables.FirstOrDefault(t => t.Table... |
<<<<<<<
var serverName = options.ServerName ?? descriptor.ServerName;
var databaseName = options.DatabaseName ?? descriptor.DatabaseName;
var schemaName = options.SchemaName ?? descriptor.SchemaName;
var tableName = options.TableName ?? descriptor.TableName;
=======
var databaseName = opt... |
<<<<<<<
case TestProvName.SqlAzure : RunScript(context, "\nGO\n", "SqlServer"); break;
case TestProvName.Default : RunScript(context, "\nGO\n", "SQLite", SQLiteAction); break;
=======
case TestProvName.SqlServer2019... |
<<<<<<<
if (ce.IsAssociation(MappingSchema))
{
var ctx = GetContext(context, ce);
if (ctx == null)
throw new InvalidOperationException();
return new TransformInfo(ctx.BuildExpression(ce, 0));
}
if ((_buildMultipleQueryExpressions == null || !_buildMultipleQ... |
<<<<<<<
static class AdditionalSql
{
[Sql.Expression("(({2} * ({1} - {0}) / {2}) * {0})", ServerSideOnly = true)]
public static int Operation(int item1, int item2, int item3)
{
return (item3 * (item2 - item1) / item3) * item1;
}
}
[Test]
public void TestPositionedParameters([DataSources] s... |
<<<<<<<
List<string> first = null;
foreach (IActiveDebugFrameworkServices activeDebugFramework in activeDebugFrameworks)
{
frameworks = await activeDebugFramework.GetProjectFrameworksAsync().ConfigureAwait(false);
... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Linq;
namespace LinqToDB.SqlQuery
=======
using System;
namespace LinqToDB.SqlQuery
>>>>>>>
using System;
using System.Collections.Generic;
namespace LinqToDB.SqlQuery
<<<<<<<
public static SqlInsertClause RequireInsertClause(this SqlSt... |
<<<<<<<
[Test, DataContextSource(
ProviderName.SQLite, ProviderName.Access, ProviderName.Informix, ProviderName.Firebird, ProviderName.PostgreSQL,
ProviderName.MySql, ProviderName.Sybase)]
public void UpdateIssue319Regression(string context)
{
using (var db = GetDataContext(context))
{
var id = 1... |
<<<<<<<
_table = db.CreateTable<T>(tableName, databaseName, schemaName, serverName: serverName, isTemporary: isTemporary);
Copy(items, options);
=======
_table = db.CreateTable<T>(tableName, databaseName, schemaName, serverName: serverName);
try
{
Copy(items, options);
}
catch
{
try
... |
<<<<<<<
=======
/// <summary>
/// Returns SqlField from specific expression. Usually from SqlColumn.
/// Complex expressions ignored.
/// </summary>
/// <param name="expression"></param>
/// <returns>Field instance associated with expression</returns>
public static SqlField GetUnderlyingField(ISqlExpre... |
<<<<<<<
using System;
=======
using NUnit.Framework;
>>>>>>>
using System;
<<<<<<<
=======
[TestFixture]
>>>>>>>
[TestFixture]
<<<<<<<
[Test]
[ActiveIssue(873, Details = "Also check WCF test error for Access")]
public void Test([DataSources] string context)
=======
[Test]
public void Test([Dat... |
<<<<<<<
[DebuggerDisplay("SQL = {" + nameof(SqlText) + "}")]
public class SelectQuery : ISqlTableSource
=======
[DebuggerDisplay("SQL = {" + nameof(SqlText) + "}")]
public class SelectQuery : SqlStatement, ISqlTableSource
>>>>>>>
[DebuggerDisplay("SQL = {" + nameof(SqlText) + "}")]
public class SelectQuery : I... |
<<<<<<<
if (value != null)
value = value.ToString();
dataType = dataType.WithDataType(DataType.Char);
=======
value = value?.ToString();
dataType = DataType.Char;
>>>>>>>
value = value?.ToString();
dataType = dataType.WithDataType(DataType.Char); |
<<<<<<<
SqlProviderFlags.IsUpdateFromSupported = true;
=======
SqlProviderFlags.IsCountDistinctSupported = true;
>>>>>>>
SqlProviderFlags.IsCountDistinctSupported = true;
SqlProviderFlags.IsUpdateFromSupported = true; |
<<<<<<<
using System.Reflection;
=======
using Microsoft.VisualStudio.ProjectSystem.Logging;
>>>>>>>
<<<<<<<
private bool _triedToRetrieveAddAnalyzerConfigFileMethod = false;
private bool _triedToRetrieveRemoveAnalyzerConfigFileMethod = false;
private MethodInfo? _addAnalyzerConfigFileMethod... |
<<<<<<<
foreach (var accessor in _parameters)
if (accessor.Key.EqualsTo(expr, new Dictionary<Expression, QueryableAccessor>(), compareConstantValues: true))
p = accessor.Value;
=======
if (!DataContext.SqlProviderFlags.IsParameterOrderDependent)
foreach (var accessor in _parameters)
if (access... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using LinqToDB.Data;
using NUnit.Framework;
using Tests.Model;
using Tests.OrmBattle.Helper;
=======
using System;
using System.Collections.Generic;
using System.Linq;
using LinqToDB.Data;
using NUnit.Framework;
using... |
<<<<<<<
static readonly ConcurrentDictionary<object,Query<object>> _queryCache = new ConcurrentDictionary<object,Query<object>>();
static Query<object> CreateQuery(IDataContext dataContext, string tableName, string serverName, string databaseName, string schemaName, Type type)
=======
static Query<object> C... |
<<<<<<<
[Test]
public void SubQueryCount([IncludeDataSources(
ProviderName.SqlServer2008, ProviderName.SqlServer2012,
ProviderName.SqlServer2014, ProviderName.SapHana)]
string context)
=======
[ActiveIssue("not supported?", Configuration = ProviderName.SapHana)]
[Test, IncludeDataContextSource(Prov... |
<<<<<<<
private readonly IProjectAsynchronousTasksService _tasksService;
=======
private readonly IProjectItemSchemaService _projectItemSchemaService;
>>>>>>>
private readonly IProjectAsynchronousTasksService _tasksService;
private readonly IProjectItemSchemaService _projectItemSchema... |
<<<<<<<
aggregate.enableMSAA = srcFrameSettings.enableMSAA && renderPipelineSettings.supportMSAAAntiAliasing;
if (QualitySettings.antiAliasing < 1)
aggregate.enableMSAA = false;
=======
aggregate.enableMSAA = srcFrameSettings.enableMSAA && ((int)renderPipelineSettin... |
<<<<<<<
[Test, DataContextSource(ParallelScope = ParallelScope.None)]
public void SelectNullPropagationWhereTest(string context)
{
using (var db = GetDataContext(context))
{
var query1 = from p in db.Parent
from c in db.Child.InnerJoin(c => c.ParentID == p.ParentID)
select new
{
In... |
<<<<<<<
[AppliesTo(ProjectCapability.DotNet)]
internal class BuildMacroInfo : IVsBuildMacroInfo
=======
[AppliesTo(ProjectCapability.CSharpOrVisualBasicOrFSharp)]
internal class BuildMacroInfo : IVsBuildMacroInfo, IDisposable
>>>>>>>
[AppliesTo(ProjectCapability.DotNet)]
internal class BuildM... |
<<<<<<<
var converted = attr.GetExpression(MappingSchema, context.SelectQuery, ma,
e => ConvertToExtensionSql(context, e));
=======
var converted = attr.GetExpression(DataContext, context.SelectQuery, ma,
e => ConvertToSql(context, e));
>>>>>>>
var converted = attr.GetExpression(... |
<<<<<<<
private static readonly ImmutableArray<(HandlerFactory factory, string evaluationRuleName)> HandlerFactories = CreateHandlerFactories();
private static readonly ImmutableArray<string> AllEvaluationRuleNames = GetEvaluationRuleNames();
=======
private static readonly ImmutableArray<(Han... |
<<<<<<<
public static void Query(IDataContext dataContext, string tableName, string serverName, string databaseName, string schemaName)
=======
public static void Query(IDataContext dataContext, string tableName, string databaseName, string schemaName, bool ifExists)
>>>>>>>
public static void Query(IDataCo... |
<<<<<<<
[Test]
public void SqlPropertyGroupByAssociated([DataSources] string context)
=======
[ActiveIssue(Configuration = ProviderName.SapHana)]
[Test, DataContextSource]
public void SqlPropertyGroupByAssociated(string context)
>>>>>>>
[ActiveIssue(Configuration = ProviderName.SapHana)]
[Test]
publi... |
<<<<<<<
TestExternals.Log($"CurrentDirectory : {Environment.CurrentDirectory}");
var dataProvidersJsonFile = GetFilePath(assemblyPath, @"DataProviders.json");
var userDataProvidersJsonFile = GetFilePath(assemblyPath, @"UserDataProviders.json");
=======
var dataProvidersJsonFile = GetFile... |
<<<<<<<
=======
Requires.NotNull(commonServices, nameof(commonServices));
Requires.NotNull(tasksService, nameof(tasksService));
Requires.NotNull(taskScheduler, nameof(taskScheduler));
Requires.NotNull(activeConfiguredProjectsProvider, nameof(activeConfiguredProjectsProv... |
<<<<<<<
var data = LinqServiceSerializer.Serialize(SerializationMappingSchema, _queryBatch.ToArray());
await client.ExecuteBatchAsync(Configuration, data);
=======
var data = LinqServiceSerializer.Serialize(_queryBatch.ToArray());
await client.ExecuteBatchAsync(Configuration, data).ConfigureAwait(... |
<<<<<<<
static readonly ConcurrentDictionary<object,Query<int>> _queryCache = new ConcurrentDictionary<object,Query<int>>();
static Query<int> CreateQuery(IDataContext dataContext, string tableName, string serverName, string databaseName, string schemaName, Type type)
=======
static Query<int> CreateQuery(I... |
<<<<<<<
[TestMethod]
public async Task RoomTest()
{
var client = new SocketIO("http://localhost:3000");
await client.ConnectAsync();
string room = Guid.NewGuid().ToString();
string roomMsg = string.Empty;
client.On(room, res =>
... |
<<<<<<<
using System.Web.Mvc;
using AttributeRouting.Web;
using AttributeRouting.Web.Mvc;
namespace AttributeRouting.Specs.Subjects
{
[RouteArea("Users", Subdomain = "users")]
public class SubdomainController : Controller
{
[GET("")]
public ActionResult Index()
{
return... |
<<<<<<<
req.Add(new MaybeFreeExpression(e, isFree));
} else if (la.kind == 69) {
=======
req.Add(new MaybeFreeExpression(e, isFree, reqAttrs));
} else if (la.kind == 68) {
>>>>>>>
req.Add(new MaybeFreeExpression(e, isFree, reqAttrs));
} else if (la.kind == 69) {
<<<<<<<
Expression/*!*/ e; ... |
<<<<<<<
MapEmpty,
=======
MapCard,
>>>>>>>
MapEmpty,
MapCard,
<<<<<<<
case BuiltinFunction.MapEmpty: {
Contract.Assert(args.Length == 0);
Contract.Assert(typeInstantiation != null);
Bpl.Type resultType = predef.MapType(tok, typeInstantiation, typeI... |
<<<<<<<
public List<ComprehensionExpr.BoundedPool> Constraint_Bounds; // initialized and filled in by resolver; null for Exact=true and for a ghost statement
// invariant Constraint_Bounds == null || Constraint_Bounds.Count == BoundVars.Count;
public List<IVariable> Constraint_MissingBounds; // filled in ... |
<<<<<<<
[Order(Order.Default)]
internal partial class VSProject : VSLangProj.VSProject
=======
[Order(10)]
public partial class VSProject : VSLangProj.VSProject
>>>>>>>
[Order(Order.Default)]
public partial class VSProject : VSLangProj.VSProject |
<<<<<<<
=======
public Action<AdditionalInformation> AdditionalInformationReporter;
internal void ReportAdditionalInformation(IToken token, string text) {
Contract.Requires(token != null);
Contract.Requires(text != null);
if (AdditionalInformationReporter != null) {
AdditionalInform... |
<<<<<<<
var translator = new Dafny.Translator(reporter) { InsertChecksums = true, UniqueIdPrefix = null }; //FIXME check if null is OK for UniqueIdPrefix
=======
var translator = new Dafny.Translator() { InsertChecksums = true, UniqueIdPrefix = fname };
>>>>>>>
var translator = new Dafny.Translator... |
<<<<<<<
/// This is a general constructor, but takes the layerInterCluster as an int.
/// </summary>
ExpressionTranslator(Translator translator, PredefinedDecls predef, Bpl.Expr heap, string thisVar,
Function applyLimited_CurrentFunction, int layerInterCluster, Bpl.Expr layerIntraCluster, stri... |
<<<<<<<
List<IVariable> missingBounds;
var vars = new List<IVariable>(e.BoundVars);
var bestBounds = DiscoverBestBounds_MultipleVars(vars, constraint, true, false, out missingBounds);
=======
var allBounds = DiscoverBoundsAux(e.tok, new List<IVariable>(e.BoundVars), constraint,... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.