conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
SceneSystem,
=======
MouseInput,
>>>>>>>
MouseInput,
SceneSystem, |
<<<<<<<
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.Test.Unit, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
=======
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.Android.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.iOS.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
>>>>>>>
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.Test.Unit, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.Android.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.iOS.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
<<<<<<<
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.Test.Unit")]
=======
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.Android.Test")]
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.iOS.Test")]
>>>>>>>
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.Test.Unit")]
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.Android.Test")]
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Mobile.iOS.Test")] |
<<<<<<<
inputSource = inputSystem.RequestNewGenericInputSource(Name);
=======
inputSource = MixedRealityToolkit.InputSystem.RequestNewGenericInputSource(Name, sourceType: InputSourceType.Voice);
>>>>>>>
inputSource = inputSystem.RequestNewGenericInputSource(Name, sourceType: InputSourceType.Voice);
<<<<<<<
dictationRecognizer = new DictationRecognizer();
dictationRecognizer.DictationHypothesis += DictationRecognizer_DictationHypothesis;
dictationRecognizer.DictationResult += DictationRecognizer_DictationResult;
dictationRecognizer.DictationComplete += DictationRecognizer_DictationComplete;
dictationRecognizer.DictationError += DictationRecognizer_DictationError;
=======
if (dictationRecognizer == null)
{
dictationRecognizer = new DictationRecognizer();
}
dictationRecognizer.DictationHypothesis += DictationRecognizer_DictationHypothesis;
dictationRecognizer.DictationResult += DictationRecognizer_DictationResult;
dictationRecognizer.DictationComplete += DictationRecognizer_DictationComplete;
dictationRecognizer.DictationError += DictationRecognizer_DictationError;
}
catch (System.Exception ex)
{
Debug.LogError($"Failed to start dictation recognizer. Are microphone permissions granted? Exception: {ex}");
Disable();
>>>>>>>
if (dictationRecognizer == null)
{
dictationRecognizer = new DictationRecognizer();
dictationRecognizer.DictationHypothesis += DictationRecognizer_DictationHypothesis;
dictationRecognizer.DictationResult += DictationRecognizer_DictationResult;
dictationRecognizer.DictationComplete += DictationRecognizer_DictationComplete;
dictationRecognizer.DictationError += DictationRecognizer_DictationError;
}
}
catch (System.Exception ex)
{
Debug.LogError($"Failed to start dictation recognizer. Are microphone permissions granted? Exception: {ex}");
Disable(); |
<<<<<<<
[Obsolete("Use GetDataProvider<T> instead")]
=======
[Obsolete]
>>>>>>>
[Obsolete("Use GetDataProvider<T> instead")]
<<<<<<<
MixedRealityServiceRegistry.RemoveService<T>(serviceInstance, this);
CoreServices.ResetCacheReference(interfaceType);
return true;
}
Tuple<Type, IMixedRealityService> registryInstance = new Tuple<Type, IMixedRealityService>(interfaceType, serviceInstance);
if (registeredMixedRealityServices.Contains(registryInstance))
{
registeredMixedRealityServices.Remove(registryInstance);
if (!(serviceInstance is IMixedRealityDataProvider))
{
// Only remove IMixedRealityService or IMixedRealityExtensionService (not IMixedRealityDataProvider)
MixedRealityServiceRegistry.RemoveService<T>(serviceInstance, this);
}
return true;
=======
// Reset the convenience properties.
if (typeof(IMixedRealityBoundarySystem).IsAssignableFrom(interfaceType)) { boundarySystem = null; }
else if (typeof(IMixedRealityCameraSystem).IsAssignableFrom(interfaceType)) { cameraSystem = null; }
else if (typeof(IMixedRealityDiagnosticsSystem).IsAssignableFrom(interfaceType)) { diagnosticsSystem = null; }
// Focus provider reference is not managed by the MixedRealityToolkit class.
else if (typeof(IMixedRealityInputSystem).IsAssignableFrom(interfaceType)) { inputSystem = null; }
// Raycast provider reference is not managed by the MixedRealityToolkit class.
else if (typeof(IMixedRealitySpatialAwarenessSystem).IsAssignableFrom(interfaceType)) { spatialAwarenessSystem = null; }
else if (typeof(IMixedRealityTeleportSystem).IsAssignableFrom(interfaceType)) { teleportSystem = null; }
>>>>>>>
CoreServices.ResetCacheReference(interfaceType);
return true;
<<<<<<<
T service;
MixedRealityServiceRegistry.TryGetService<T>(out service);
// If registry failed to have it, check active systems
if (service == null)
{
IMixedRealityService activeSerivce;
activeSystems.TryGetValue(typeof(T), out activeSerivce);
// if active services dictionary failed to have it, check registered data providers
if (activeSerivce == null)
{
Type interfaceType = typeof(T);
for (int i = 0; i < registeredMixedRealityServices.Count; i++)
{
if (CheckServiceMatch(interfaceType, string.Empty,
registeredMixedRealityServices[i].Item1,
registeredMixedRealityServices[i].Item2))
{
return true;
}
}
return false;
}
}
return true;
=======
Type interfaceType = typeof(T);
if (typeof(IMixedRealityDataProvider).IsAssignableFrom(interfaceType))
{
Debug.LogWarning($"Unable to check a service of type {typeof(IMixedRealityDataProvider).Name}. Inquire with the MixedRealityService that registered the DataProvider type in question");
return false;
}
T service;
MixedRealityServiceRegistry.TryGetService<T>(out service, name);
return service != null;
>>>>>>>
Type interfaceType = typeof(T);
if (typeof(IMixedRealityDataProvider).IsAssignableFrom(interfaceType))
{
Debug.LogWarning($"Unable to check a service of type {typeof(IMixedRealityDataProvider).Name}. Inquire with the MixedRealityService that registered the DataProvider type in question");
return false;
}
T service;
MixedRealityServiceRegistry.TryGetService<T>(out service, name);
return service != null;
<<<<<<<
/// <inheritdoc />
public bool RegisterDataProvider<T>(T dataProviderInstance) where T : IMixedRealityDataProvider
{
return RegisterService<T>(dataProviderInstance);
}
/// <inheritdoc />
public bool RegisterDataProvider<T>(
Type concreteType,
SupportedPlatforms supportedPlatforms = (SupportedPlatforms)(-1),
params object[] args) where T : IMixedRealityDataProvider
{
return RegisterService<T>(concreteType, supportedPlatforms, args);
}
/// <inheritdoc />
public bool UnregisterDataProvider<T>(string name = null) where T : IMixedRealityDataProvider
{
return UnregisterService<T>(name);
}
/// <inheritdoc />
public bool UnregisterDataProvider<T>(T dataProviderInstance) where T : IMixedRealityDataProvider
{
return UnregisterService<T>(dataProviderInstance);
}
/// <inheritdoc />
public bool IsDataProviderRegistered<T>(string name = null) where T : IMixedRealityDataProvider
{
return IsServiceRegistered<T>(name);
}
/// <inheritdoc />
public T GetDataProvider<T>(string name = null) where T : IMixedRealityDataProvider
{
return GetService<T>(name);
}
/// <inheritdoc />
public IReadOnlyList<T> GetDataProviders<T>(string name = null) where T : IMixedRealityDataProvider
{
return GetServices<T>(name);
}
/// <inheritdoc />
public IReadOnlyList<T> GetDataProviders<T>() where T : IMixedRealityDataProvider
{
return GetServices<T>(null);
}
=======
>>>>>>>
<<<<<<<
=======
#region Services Initialization
>>>>>>>
<<<<<<<
if (!CanGetService(interfaceType)) { return null; }
IMixedRealityService service;
MixedRealityServiceRegistry.TryGetService(interfaceType, out service, out _, serviceName);
if (service != null)
{
return service;
}
// The interal dictionary of MRTK will eventually be fully deprecated
// and storage access should be done against the MixedRealityServiceRegistry
// However, MixedRealityServiceRegistry cannot atm handle IMixedRealityDataProviders and
// there is a convoluted API interface for IMixedRealityServiceRegistrar and IMixedRealityDataProviderAccess
if (IsCoreSystem(interfaceType))
=======
if (typeof(IMixedRealityDataProvider).IsAssignableFrom(interfaceType))
>>>>>>>
if (typeof(IMixedRealityDataProvider).IsAssignableFrom(interfaceType)) |
<<<<<<<
PlayModeTestUtilities.Setup();
=======
TestUtilities.InitializeMixedRealityToolkitAndCreateScenes(true);
TestUtilities.InitializePlayspace();
PlayModeTestUtilities.EnsureInputModule();
>>>>>>>
PlayModeTestUtilities.Setup();
PlayModeTestUtilities.EnsureInputModule();
<<<<<<<
PlayModeTestUtilities.TearDown();
=======
PlayModeTestUtilities.TeardownInputModule();
TestUtilities.ShutdownMixedRealityToolkit();
>>>>>>>
PlayModeTestUtilities.TearDown(); |
<<<<<<<
AddManager(typeof(IMixedRealityDeviceManager), new UnityJoystickManager("Unity Joystick Manager", 10));
AddManager(typeof(IMixedRealityDeviceManager), new UnityTouchDeviceManager("Unity Touch Device Manager", 10));
=======
AddManager(typeof(IMixedRealityDeviceManager), new UnityJoystickManager("Unity Joystick Manager", 10));
AddManager(typeof(IMixedRealityDeviceManager), new OpenVRDeviceManager("Unity OpenVR Device Manager", 10));
>>>>>>>
AddManager(typeof(IMixedRealityDeviceManager), new UnityJoystickManager("Unity Joystick Manager", 10));
AddManager(typeof(IMixedRealityDeviceManager), new UnityTouchDeviceManager("Unity Touch Device Manager", 10));
AddManager(typeof(IMixedRealityDeviceManager), new OpenVRDeviceManager("Unity OpenVR Device Manager", 10));
<<<<<<<
case RuntimePlatform.OSXPlayer:
case RuntimePlatform.OSXEditor:
case RuntimePlatform.Android:
case RuntimePlatform.WebGLPlayer:
AddManager(typeof(IMixedRealityDeviceManager), new OpenVRDeviceManager("Unity OpenVR Device Manager", 10));
=======
// If the Speech system has been selected for initialization in the Active speech profile, enable it in the project
if (ActiveProfile.IsSpeechCommandsEnabled)
{
AddManager(typeof(IMixedRealitySpeechSystem), new WindowsSpeechInputDeviceManager("Windows Speech Manager", 10));
}
// If the Dictation system has been selected for initialization in the Active speech profile, enable it in the project
if (ActiveProfile.IsDictationEnabled)
{
AddManager(typeof(IMixedRealityDictationManager), new WindowsDictationInputDeviceManager("Windows Dictation Manager", 10));
}
>>>>>>>
case RuntimePlatform.OSXPlayer:
case RuntimePlatform.OSXEditor:
case RuntimePlatform.Android:
case RuntimePlatform.WebGLPlayer:
// If the Speech system has been selected for initialization in the Active speech profile, enable it in the project
if (ActiveProfile.IsSpeechCommandsEnabled)
{
AddManager(typeof(IMixedRealitySpeechSystem), new WindowsSpeechInputDeviceManager("Windows Speech Manager", 10));
}
// If the Dictation system has been selected for initialization in the Active speech profile, enable it in the project
if (ActiveProfile.IsDictationEnabled)
{
AddManager(typeof(IMixedRealityDictationManager), new WindowsDictationInputDeviceManager("Windows Dictation Manager", 10));
}
<<<<<<<
AddManager(typeof(IMixedRealityDeviceManager), new UnityJoystickManager("Unity Joystick Manager", 10));
AddManager(typeof(IMixedRealityDeviceManager), new UnityTouchDeviceManager("Unity Touch Device Manager", 10));
=======
AddManager(typeof(IMixedRealityDeviceManager), new UnityJoystickManager("Unity Joystick Manager", 10));
AddManager(typeof(IMixedRealityDeviceManager), new OpenVRDeviceManager("Unity OpenVR Device Manager", 10));
>>>>>>>
AddManager(typeof(IMixedRealityDeviceManager), new UnityJoystickManager("Unity Joystick Manager", 10));
AddManager(typeof(IMixedRealityDeviceManager), new UnityTouchDeviceManager("Unity Touch Device Manager", 10));
AddManager(typeof(IMixedRealityDeviceManager), new OpenVRDeviceManager("Unity OpenVR Device Manager", 10));
<<<<<<<
case UnityEditor.BuildTarget.StandaloneOSX:
case UnityEditor.BuildTarget.Android:
case UnityEditor.BuildTarget.WebGL:
AddManager(typeof(IMixedRealityDeviceManager), new OpenVRDeviceManager("Unity OpenVR Device Manager", 10));
=======
// If the Speech system has been selected for initialization in the Active speech profile, enable it in the project
if (ActiveProfile.IsSpeechCommandsEnabled)
{
AddManager(typeof(IMixedRealitySpeechSystem), new WindowsSpeechInputDeviceManager("Windows Speech Manager", 10));
}
// If the Dictation system has been selected for initialization in the Active speech profile, enable it in the project
if (ActiveProfile.IsDictationEnabled)
{
AddManager(typeof(IMixedRealityDictationManager), new WindowsDictationInputDeviceManager("Windows Dictation Manager", 10));
}
>>>>>>>
case UnityEditor.BuildTarget.StandaloneOSX:
case UnityEditor.BuildTarget.Android:
case UnityEditor.BuildTarget.WebGL:
// If the Speech system has been selected for initialization in the Active speech profile, enable it in the project
if (ActiveProfile.IsSpeechCommandsEnabled)
{
AddManager(typeof(IMixedRealitySpeechSystem), new WindowsSpeechInputDeviceManager("Windows Speech Manager", 10));
}
// If the Dictation system has been selected for initialization in the Active speech profile, enable it in the project
if (ActiveProfile.IsDictationEnabled)
{
AddManager(typeof(IMixedRealityDictationManager), new WindowsDictationInputDeviceManager("Windows Dictation Manager", 10));
} |
<<<<<<<
base.OnEnable();
if (!CheckMixedRealityManager(false))
=======
if (!CheckMixedRealityConfigured(false))
>>>>>>>
base.OnEnable();
if (!CheckMixedRealityConfigured(false)) |
<<<<<<<
/// <summary>
/// Adds the 'Gaze Input' capability to the manifest.
/// </summary>
/// <remarks>
/// This is a workaround for versions of Unity which don't have native support
/// for the 'Gaze Input' capability in its Player Settings preference location.
/// Note that this function is only public to poke a hole for testing - do not
/// take a dependency on this function.
/// </remarks>
public static void AddGazeInputCapability(XElement rootNode)
{
// If the capabilities container tag is missing, make sure it gets added.
var capabilitiesTag = rootNode.GetDefaultNamespace() + "Capabilities";
XElement capabilitiesNode = rootNode.Element(capabilitiesTag);
if (capabilitiesNode == null)
{
capabilitiesNode = new XElement(capabilitiesTag);
rootNode.Add(capabilitiesNode);
}
var gazeInputCapability = rootNode.GetDefaultNamespace() + "DeviceCapability";
XElement existingGazeInputCapability = capabilitiesNode.Elements(gazeInputCapability)
.FirstOrDefault(element => element.Attribute("Name")?.Value == "gazeInput");
// Only add the capability if isn't there already.
if (existingGazeInputCapability == null)
{
capabilitiesNode.Add(
new XElement(gazeInputCapability, new XAttribute("Name", "gazeInput")));
}
}
/// <summary>
/// An overload of AddGazeInputCapability that will read the AppX manifest from
/// the build output and update the manifest file with the gazeInput capability.
/// </summary>
/// <param name="buildInfo">An IBuildInfo containing a valid OutputDirectory</param>
public static void AddGazeInputCapability(IBuildInfo buildInfo)
{
string manifestFilePath = GetManifestFilePath(buildInfo);
if (manifestFilePath == null)
{
throw new FileNotFoundException("Unable to find manifest file");
}
var rootElement = XElement.Load(manifestFilePath);
AddGazeInputCapability(rootElement);
rootElement.Save(manifestFilePath);
}
=======
/// <summary>
/// Gets the subpart of the msbuild.exe command to save log information
/// in the given logFileName.
/// </summary>
/// <remarks>
/// Will return an empty string if logDirectory is not set.
/// </remarks>
private static string GetMSBuildLoggingCommand(string logDirectory, string logFileName)
{
if (String.IsNullOrEmpty(logDirectory))
{
Debug.Log($"Not logging {logFileName} because no logDirectory was provided");
return "";
}
return $"-fl -flp:logfile={Path.Combine(logDirectory, logFileName)};verbosity=detailed";
}
>>>>>>>
/// Gets the subpart of the msbuild.exe command to save log information
/// in the given logFileName.
/// </summary>
/// <remarks>
/// Will return an empty string if logDirectory is not set.
/// </remarks>
private static string GetMSBuildLoggingCommand(string logDirectory, string logFileName)
{
if (String.IsNullOrEmpty(logDirectory))
{
Debug.Log($"Not logging {logFileName} because no logDirectory was provided");
return "";
}
return $"-fl -flp:logfile={Path.Combine(logDirectory, logFileName)};verbosity=detailed";
}
/// <summary>
/// Adds the 'Gaze Input' capability to the manifest.
/// </summary>
/// <remarks>
/// This is a workaround for versions of Unity which don't have native support
/// for the 'Gaze Input' capability in its Player Settings preference location.
/// Note that this function is only public to poke a hole for testing - do not
/// take a dependency on this function.
/// </remarks>
public static void AddGazeInputCapability(XElement rootNode)
{
// If the capabilities container tag is missing, make sure it gets added.
var capabilitiesTag = rootNode.GetDefaultNamespace() + "Capabilities";
XElement capabilitiesNode = rootNode.Element(capabilitiesTag);
if (capabilitiesNode == null)
{
capabilitiesNode = new XElement(capabilitiesTag);
rootNode.Add(capabilitiesNode);
}
var gazeInputCapability = rootNode.GetDefaultNamespace() + "DeviceCapability";
XElement existingGazeInputCapability = capabilitiesNode.Elements(gazeInputCapability)
.FirstOrDefault(element => element.Attribute("Name")?.Value == "gazeInput");
// Only add the capability if isn't there already.
if (existingGazeInputCapability == null)
{
capabilitiesNode.Add(
new XElement(gazeInputCapability, new XAttribute("Name", "gazeInput")));
}
}
/// <summary>
/// An overload of AddGazeInputCapability that will read the AppX manifest from
/// the build output and update the manifest file with the gazeInput capability.
/// </summary>
/// <param name="buildInfo">An IBuildInfo containing a valid OutputDirectory</param>
public static void AddGazeInputCapability(IBuildInfo buildInfo)
{
string manifestFilePath = GetManifestFilePath(buildInfo);
if (manifestFilePath == null)
{
throw new FileNotFoundException("Unable to find manifest file");
}
var rootElement = XElement.Load(manifestFilePath);
AddGazeInputCapability(rootElement);
rootElement.Save(manifestFilePath);
} |
<<<<<<<
#endregion
#region Private Serialized Fields
[Header("Target Bounding Box")]
[SerializeField]
[Tooltip("Object the app bar is controlling - This object must implement the IBoundsTargetProvider.")]
private MonoBehaviour boundingBox = null;
/// <summary>
/// Object the app bar is controlling - This object must implement the IBoundsTargetProvider.
/// </summary>
public MonoBehaviour BoundingBox { get => boundingBox; set => boundingBox = value; }
[SerializeField]
private GameObject baseRenderer = null;
[SerializeField]
private Transform buttonParent = null;
[SerializeField]
private GameObject backgroundBar = null;
[Header("States")]
[SerializeField]
private AppBarDisplayTypeEnum displayType = AppBarDisplayTypeEnum.Manipulation;
[SerializeField]
private AppBarStateEnum state = AppBarStateEnum.Default;
[Header("Default Button Options")]
[SerializeField]
private bool useRemove = true;
[SerializeField]
private bool useAdjust = true;
[SerializeField]
private bool useHide = true;
=======
>>>>>>>
<<<<<<<
state = AppBarStateEnum.Default;
FollowTargetObject(false);
=======
State = AppBarStateEnum.Default;
FollowBoundingBox(false);
>>>>>>>
State = AppBarStateEnum.Default;
FollowTargetObject(false);
<<<<<<<
var boundsProvider = BoundingBox as IBoundsTargetProvider;
if (boundsProvider != null)
{
boundsProvider.Target.SetActive(false);
}
BoundingBox.gameObject.SetActive(false);
=======
TargetBoundingBox.Target.SetActive(false);
TargetBoundingBox.gameObject.SetActive(false);
>>>>>>>
var boundsProvider = TargetBoundingBox as IBoundsTargetProvider;
if (boundsProvider != null)
{
boundsProvider.Target.SetActive(false);
}
BoundingBox.gameObject.SetActive(false);
<<<<<<<
var boundsProvider = BoundingBox as IBoundsTargetProvider;
if (boundsProvider == null || boundsProvider.Target == null)
=======
if (TargetBoundingBox == null || TargetBoundingBox.Target == null)
>>>>>>>
var boundsProvider = BoundingBox as IBoundsTargetProvider;
if (boundsProvider == null || boundsProvider.Target == null)
<<<<<<<
if (boundsProvider == null)
=======
if (TargetBoundingBox == null)
>>>>>>>
if (boundsProvider == null)
<<<<<<<
var boundsProvider = BoundingBox as IBoundsTargetProvider;
if (boundsProvider == null)
=======
if (TargetBoundingBox == null)
>>>>>>>
var boundsProvider = BoundingBox as IBoundsTargetProvider;
if (boundsProvider == null)
<<<<<<<
helper.UpdateNonAABoundsCornerPositions(boundsProvider.TargetBounds, boundsPoints);
=======
helper.UpdateNonAABoundingBoxCornerPositions(TargetBoundingBox, boundsPoints);
>>>>>>>
helper.UpdateNonAABoundsCornerPositions(boundsProvider.TargetBounds, boundsPoints);
<<<<<<<
Vector3 direction = (boundsProvider.TargetBounds.bounds.center - finalPosition).normalized;
=======
Vector3 direction = (TargetBoundingBox.TargetBounds.bounds.center - finalPosition).normalized;
>>>>>>>
Vector3 direction = (boundsProvider.TargetBounds.bounds.center - finalPosition).normalized; |
<<<<<<<
// Spatial Awareness system configuration
enableSpatialAwarenessSystem = serializedObject.FindProperty("enableSpatialAwarenessSystem");
spatialAwarenessSystemType = serializedObject.FindProperty("spatialAwarenessSystemType");
spatialAwarenessProfile = serializedObject.FindProperty("spatialAwarenessProfile");
=======
boundaryVisualizationProfile = serializedObject.FindProperty("boundaryVisualizationProfile");
registeredComponentsProfile = serializedObject.FindProperty("registeredComponentsProfile");
>>>>>>>
// Spatial Awareness system configuration
enableSpatialAwarenessSystem = serializedObject.FindProperty("enableSpatialAwarenessSystem");
spatialAwarenessSystemType = serializedObject.FindProperty("spatialAwarenessSystemType");
spatialAwarenessProfile = serializedObject.FindProperty("spatialAwarenessProfile");
registeredComponentsProfile = serializedObject.FindProperty("registeredComponentsProfile"); |
<<<<<<<
IMixedRealityInputSystem inputSystem = Service as IMixedRealityInputSystem;
var pointers = interactionSource.supportsPointing ? RequestPointers(typeof(WindowsMixedRealityController), controllingHand) : null;
=======
IMixedRealityPointer[] pointers = null;
InputSourceType inputSourceType = InputSourceType.Other;
switch(interactionSource.kind)
{
case InteractionSourceKind.Controller:
pointers = RequestPointers(SupportedControllerType.WindowsMixedReality, controllingHand);
inputSourceType = InputSourceType.Controller;
break;
case InteractionSourceKind.Hand:
if(interactionSource.supportsPointing)
{
pointers = RequestPointers(SupportedControllerType.ArticulatedHand, controllingHand);
}
else
{
pointers = RequestPointers(SupportedControllerType.GGVHand, controllingHand);
}
inputSourceType = InputSourceType.Hand;
break;
case InteractionSourceKind.Voice:
// set to null: when pointers are null we use head gaze, which is what we want for voice
break;
default:
Debug.LogError($"Unknown new type in WindowsMixedRealityDeviceManager {interactionSource.kind}, make sure to add a SupportedControllerType");
break;
}
>>>>>>>
IMixedRealityInputSystem inputSystem = Service as IMixedRealityInputSystem;
IMixedRealityPointer[] pointers = null;
InputSourceType inputSourceType = InputSourceType.Other;
switch(interactionSource.kind)
{
case InteractionSourceKind.Controller:
pointers = RequestPointers(SupportedControllerType.WindowsMixedReality, controllingHand);
inputSourceType = InputSourceType.Controller;
break;
case InteractionSourceKind.Hand:
if(interactionSource.supportsPointing)
{
pointers = RequestPointers(SupportedControllerType.ArticulatedHand, controllingHand);
}
else
{
pointers = RequestPointers(SupportedControllerType.GGVHand, controllingHand);
}
inputSourceType = InputSourceType.Hand;
break;
case InteractionSourceKind.Voice:
// set to null: when pointers are null we use head gaze, which is what we want for voice
break;
default:
Debug.LogError($"Unknown new type in WindowsMixedRealityDeviceManager {interactionSource.kind}, make sure to add a SupportedControllerType");
break;
}
<<<<<<<
var inputSource = inputSystem?.RequestNewGenericInputSource($"Mixed Reality Controller {nameModifier}", pointers);
var detectedController = new WindowsMixedRealityController(TrackingState.NotTracked, controllingHand, inputSource);
=======
var inputSource = MixedRealityToolkit.InputSystem?.RequestNewGenericInputSource($"Mixed Reality Controller {nameModifier}", pointers, inputSourceType);
>>>>>>>
var inputSource = inputSystem?.RequestNewGenericInputSource($"Mixed Reality Controller {nameModifier}", pointers, inputSourceType);
<<<<<<<
IMixedRealityInputSystem inputSystem = Service as IMixedRealityInputSystem;
inputSystem?.RaiseSourceLost(controller.InputSource, controller);
=======
MixedRealityToolkit.InputSystem?.RaiseSourceLost(controller.InputSource, controller);
foreach (IMixedRealityPointer pointer in controller.InputSource.Pointers)
{
if (pointer != null)
{
pointer.Controller = null;
}
}
>>>>>>>
IMixedRealityInputSystem inputSystem = Service as IMixedRealityInputSystem;
inputSystem?.RaiseSourceLost(controller.InputSource, controller);
foreach (IMixedRealityPointer pointer in controller.InputSource.Pointers)
{
if (pointer != null)
{
pointer.Controller = null;
}
} |
<<<<<<<
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Controller Mapping Profile", fileName = "MixedRealityControllerMappingProfile", order = (int)CreateProfileMenuItemIndices.ControllerMapping)]
public class MixedRealityControllerMappingProfile : ScriptableObject
=======
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Controller Configuration Profile", fileName = "MixedRealityControllerConfigurationProfile", order = (int)CreateProfileMenuItemIndices.Controller)]
public class MixedRealityControllerMappingProfile : BaseMixedRealityProfile
>>>>>>>
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Controller Mapping Profile", fileName = "MixedRealityControllerMappingProfile", order = (int)CreateProfileMenuItemIndices.ControllerMapping)]
public class MixedRealityControllerMappingProfile : BaseMixedRealityProfile |
<<<<<<<
// Runtime Version:4.0.30319.34003
=======
// Runtime Version:4.0.30319.33440
>>>>>>>
// Runtime Version:4.0.30319.34003
<<<<<<<
/// Looks up a localized string similar to Loading of more items already in process..
/// </summary>
internal static string MobileServiceCollection_LoadInProcess {
get {
return ResourceManager.GetString("MobileServiceCollection_LoadInProcess", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The type '{0}' has an integer id member and therefore can not have any members with the system property attribute '{1}'..
/// </summary>
internal static string MobileServiceContractResolver_IntegerIdTypeWithSystemPropertyAttributes {
get {
return ResourceManager.GetString("MobileServiceContractResolver_IntegerIdTypeWithSystemPropertyAttributes", resourceCulture);
}
}
/// <summary>
=======
/// Looks up a localized string similar to Failed to incrementally load more items of type '{0}'. See the inner exception for details..
/// </summary>
internal static string MobileServiceCollection_IncrementalLoadingFailed {
get {
return ResourceManager.GetString("MobileServiceCollection_IncrementalLoadingFailed", resourceCulture);
}
}
/// <summary>
>>>>>>>
/// Looks up a localized string similar to Loading of more items already in process..
/// </summary>
internal static string MobileServiceCollection_LoadInProcess {
get {
return ResourceManager.GetString("MobileServiceCollection_LoadInProcess", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The type '{0}' has an integer id member and therefore can not have any members with the system property attribute '{1}'..
/// </summary>
internal static string MobileServiceContractResolver_IntegerIdTypeWithSystemPropertyAttributes {
get {
return ResourceManager.GetString("MobileServiceContractResolver_IntegerIdTypeWithSystemPropertyAttributes", resourceCulture);
}
}
/// Looks up a localized string similar to Failed to incrementally load more items of type '{0}'. See the inner exception for details..
/// </summary>
internal static string MobileServiceCollection_IncrementalLoadingFailed {
get {
return ResourceManager.GetString("MobileServiceCollection_IncrementalLoadingFailed", resourceCulture);
}
}
/// <summary> |
<<<<<<<
[Tooltip("The duration of the teleport in seconds.")]
private float teleportDuration = 0.25f;
/// <summary>
/// The duration of the teleport in seconds.
/// </summary>
public float TeleportDuration
{
get { return teleportDuration; }
set { teleportDuration = value; }
}
[SerializeField]
[Tooltip("Enable the Spatial Awareness system on Startup")]
private bool enableSpatialAwarenessSystem = false;
/// <summary>
/// Enable and configure the spatial awareness system.
/// </summary>
public bool IsSpatialAwarenessSystemEnabled
{
get { return spatialAwarenessSystemType != null && spatialAwarenessSystemType.Type != null && enableSpatialAwarenessSystem; }
private set { enableSpatialAwarenessSystem = value; }
}
[SerializeField]
[Tooltip("Spatial Awareness System Class to instantiate at runtime.")]
[Implements(typeof(IMixedRealitySpatialAwarenessSystem), TypeGrouping.ByNamespaceFlat)]
private SystemType spatialAwarenessSystemType;
/// <summary>
/// Boundary System Script File to instantiate at runtime.
/// </summary>
public SystemType SpatialAwarenessSystemSystemType
{
get { return spatialAwarenessSystemType; }
private set { spatialAwarenessSystemType = value; }
}
[SerializeField]
[Tooltip("Profile for configuring the Spatial Awareness system.")]
private MixedRealitySpatialAwarenessProfile spatialAwarenessProfile;
/// <summary>
/// Active profile for spatial awareness configuration
/// </summary>
public MixedRealitySpatialAwarenessProfile SpatialAwarenessProfile
{
get { return spatialAwarenessProfile; }
private set { spatialAwarenessProfile = value; }
}
[SerializeField]
=======
>>>>>>>
[Tooltip("Enable the Spatial Awareness system on Startup")]
private bool enableSpatialAwarenessSystem = false;
/// <summary>
/// Enable and configure the spatial awareness system.
/// </summary>
public bool IsSpatialAwarenessSystemEnabled
{
get { return spatialAwarenessSystemType != null && spatialAwarenessSystemType.Type != null && enableSpatialAwarenessSystem; }
private set { enableSpatialAwarenessSystem = value; }
}
[SerializeField]
[Tooltip("Spatial Awareness System Class to instantiate at runtime.")]
[Implements(typeof(IMixedRealitySpatialAwarenessSystem), TypeGrouping.ByNamespaceFlat)]
private SystemType spatialAwarenessSystemType;
/// <summary>
/// Boundary System Script File to instantiate at runtime.
/// </summary>
public SystemType SpatialAwarenessSystemSystemType
{
get { return spatialAwarenessSystemType; }
private set { spatialAwarenessSystemType = value; }
}
[SerializeField]
[Tooltip("Profile for configuring the Spatial Awareness system.")]
private MixedRealitySpatialAwarenessProfile spatialAwarenessProfile;
/// <summary>
/// Active profile for spatial awareness configuration
/// </summary>
public MixedRealitySpatialAwarenessProfile SpatialAwarenessProfile
{
get { return spatialAwarenessProfile; }
private set { spatialAwarenessProfile = value; }
}
[SerializeField] |
<<<<<<<
=======
/// The version system property as a string with the prefix.
/// </summary>
internal static readonly string VersionSystemPropertyString = String.Format("{0}{1}", MobileServiceSerializer.SystemPropertyPrefix, MobileServiceSystemProperties.Version.ToString()).ToLowerInvariant();
/// <summary>
/// The version system property as a string with the prefix.
/// </summary>
internal static readonly string UpdatedAtSystemPropertyString = String.Format("{0}{1}", MobileServiceSerializer.SystemPropertyPrefix, MobileServiceSystemProperties.UpdatedAt.ToString().ToLowerInvariant());
/// <summary>
/// The version system property as a string with the prefix.
/// </summary>
internal static readonly string CreatedAtSystemPropertyString = String.Format("{0}{1}", MobileServiceSerializer.SystemPropertyPrefix, MobileServiceSystemProperties.CreatedAt.ToString().ToLowerInvariant());
/// <summary>
/// The name of the reserved Mobile Services id member.
/// </summary>
/// <remarks>
/// Note: This value is used by other areas like serialiation to find
/// the name of the reserved id member.
/// </remarks>
internal const string IdPropertyName = "id";
/// <summary>
>>>>>>>
/// The version system property as a string with the prefix.
/// </summary>
internal static readonly string VersionSystemPropertyString = String.Format("{0}{1}", MobileServiceSerializer.SystemPropertyPrefix, MobileServiceSystemProperties.Version.ToString()).ToLowerInvariant();
/// <summary>
/// The version system property as a string with the prefix.
/// </summary>
internal static readonly string UpdatedAtSystemPropertyString = String.Format("{0}{1}", MobileServiceSerializer.SystemPropertyPrefix, MobileServiceSystemProperties.UpdatedAt.ToString().ToLowerInvariant());
/// <summary>
/// The version system property as a string with the prefix.
/// </summary>
internal static readonly string CreatedAtSystemPropertyString = String.Format("{0}{1}", MobileServiceSerializer.SystemPropertyPrefix, MobileServiceSystemProperties.CreatedAt.ToString().ToLowerInvariant());
/// <summary> |
<<<<<<<
using Microsoft.MixedReality.Toolkit.Core.Attributes;
using Microsoft.MixedReality.Toolkit.Core.Definitions.Devices;
using Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem;
using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
using Microsoft.MixedReality.Toolkit.Core.Providers;
using Microsoft.MixedReality.Toolkit.Core.Services;
using Microsoft.MixedReality.Toolkit.Utilities.Gltf.Serialization;
using System;
=======
using Microsoft.MixedReality.Toolkit.Input;
using Microsoft.MixedReality.Toolkit.Utilities;
>>>>>>>
using Microsoft.MixedReality.Toolkit.Input;
using Microsoft.MixedReality.Toolkit.Utilities;
using Microsoft.MixedReality.Toolkit.Utilities.Gltf.Serialization;
using System;
<<<<<<<
#if WINDOWS_UWP
using Windows.Foundation;
using Windows.Perception;
using Windows.UI.Input.Spatial;
using Windows.Storage.Streams;
#endif
namespace Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality
=======
namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input
>>>>>>>
#if WINDOWS_UWP
using Windows.Foundation;
using Windows.Perception;
using Windows.UI.Input.Spatial;
using Windows.Storage.Streams;
#endif
namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input |
<<<<<<<
private static bool AreApproximatelyEqual(float f0, float f1, float tolerance)
{
return Mathf.Abs(f0 - f1) < tolerance;
}
private static Vector3 GetBackPlateToFrontPlateVector(PressableButton button)
{
var movingButtonVisualsTransform = GetPrivateMovingButtonVisuals(button).transform;
var backPlateTransform = button.transform.Find("BackPlate");
return movingButtonVisualsTransform.position - backPlateTransform.position;
}
private static GameObject GetPrivateMovingButtonVisuals(PressableButton button)
{
// Use reflection to get the private field that contains the front plate.
var movingButtonVisualsField = typeof(PressableButton).GetField("movingButtonVisuals", BindingFlags.NonPublic | BindingFlags.Instance);
return (GameObject)movingButtonVisualsField.GetValue(button);
}
private static void ForceInvoke_UpdateMovingVisualsPosition(PressableButton button)
{
// Use reflection to invoke a non-public method.
var method = typeof(PressableButton).GetMethod("UpdateMovingVisualsPosition", BindingFlags.NonPublic | BindingFlags.Instance);
method.Invoke(button, new object[0]);
}
=======
>>>>>>>
private static Vector3 GetBackPlateToFrontPlateVector(PressableButton button)
{
var movingButtonVisualsTransform = GetPrivateMovingButtonVisuals(button).transform;
var backPlateTransform = button.transform.Find("BackPlate");
return movingButtonVisualsTransform.position - backPlateTransform.position;
}
private static GameObject GetPrivateMovingButtonVisuals(PressableButton button)
{
// Use reflection to get the private field that contains the front plate.
var movingButtonVisualsField = typeof(PressableButton).GetField("movingButtonVisuals", BindingFlags.NonPublic | BindingFlags.Instance);
return (GameObject)movingButtonVisualsField.GetValue(button);
}
private static void ForceInvoke_UpdateMovingVisualsPosition(PressableButton button)
{
// Use reflection to invoke a non-public method.
var method = typeof(PressableButton).GetMethod("UpdateMovingVisualsPosition", BindingFlags.NonPublic | BindingFlags.Instance);
method.Invoke(button, new object[0]);
} |
<<<<<<<
// If the Spatial Awareness system has been selected for initialization in the Active profile, enable it in the project
if (ActiveProfile.IsSpatialAwarenessSystemEnabled)
{
AddManager(typeof(IMixedRealitySpatialAwarenessSystem), Activator.CreateInstance(ActiveProfile.SpatialAwarenessSystemSystemType) as IMixedRealitySpatialAwarenessSystem);
}
=======
>>>>>>> |
<<<<<<<
#if NETFULL
using System.Transactions;
#else
using System.Data;
#endif
=======
>>>>>>>
<<<<<<<
$@"select * from [{_storage.SchemaName}].Server",
transaction: transaction)
=======
string.Format(@"select * from [{0}].Server with (nolock)", _storage.GetSchemaName()))
>>>>>>>
$@"select * from [{_storage.SchemaName}].Server with (nolock)")
<<<<<<<
string sql = String.Format(@"
select count(Id) from [{0}].Job where StateName = N'Enqueued';
select count(Id) from [{0}].Job where StateName = N'Failed';
select count(Id) from [{0}].Job where StateName = N'Processing';
select count(Id) from [{0}].Job where StateName = N'Scheduled';
select count(Id) from [{0}].Server;
=======
string sql = string.Format(@"
select count(Id) from [{0}].Job with (nolock) where StateName = N'Enqueued';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Failed';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Processing';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Scheduled';
select count(Id) from [{0}].Server with (nolock);
>>>>>>>
string sql = String.Format(@"
select count(Id) from [{0}].Job with (nolock) where StateName = N'Enqueued';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Failed';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Processing';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Scheduled';
select count(Id) from [{0}].Server with (nolock);
<<<<<<<
select count(*) from [{0}].[Set] where [Key] = N'recurring-jobs';
", _storage.SchemaName);
=======
select count(*) from [{0}].[Set] with (nolock) where [Key] = N'recurring-jobs';
", _storage.GetSchemaName());
>>>>>>>
select count(*) from [{0}].[Set] with (nolock) where [Key] = N'recurring-jobs';
", _storage.SchemaName);
<<<<<<<
string sqlQuery =
$@"select [Key], [Value] as [Count] from [{_storage.SchemaName}].AggregatedCounter
where [Key] in @keys";
=======
string sqlQuery = string.Format(@"
select [Key], [Value] as [Count] from [{0}].AggregatedCounter with (nolock)
where [Key] in @keys", _storage.GetSchemaName());
>>>>>>>
string sqlQuery =
$@"select [Key], [Value] as [Count] from [{_storage.SchemaName}].AggregatedCounter with (nolock)
where [Key] in @keys";
<<<<<<<
string enqueuedJobsSql =
$@"select j.*, s.Reason as StateReason, s.Data as StateData
from [{_storage.SchemaName}].Job j
left join [{_storage.SchemaName}].State s on s.Id = j.StateId
where j.Id in @jobIds";
=======
string enqueuedJobsSql = string.Format(@"
select j.*, s.Reason as StateReason, s.Data as StateData
from [{0}].Job j with (nolock)
left join [{0}].State s with (nolock) on s.Id = j.StateId
where j.Id in @jobIds", _storage.GetSchemaName());
>>>>>>>
string enqueuedJobsSql =
$@"select j.*, s.Reason as StateReason, s.Data as StateData
from [{_storage.SchemaName}].Job j with (nolock)
left join [{_storage.SchemaName}].State s with (nolock) on s.Id = j.StateId
where j.Id in @jobIds";
<<<<<<<
? $@"select count(j.Id) from (select top (@limit) Id from [{_storage.SchemaName}].Job where StateName = @state) as j"
: $@"select count(Id) from [{_storage.SchemaName}].Job where StateName = @state";
=======
? string.Format(@"select count(j.Id) from (select top (@limit) Id from [{0}].Job with (nolock) where StateName = @state) as j", _storage.GetSchemaName())
: string.Format(@"select count(Id) from [{0}].Job with (nolock) where StateName = @state", _storage.GetSchemaName());
>>>>>>>
? $@"select count(j.Id) from (select top (@limit) Id from [{_storage.SchemaName}].Job with (nolock) where StateName = @state) as j"
: $@"select count(Id) from [{_storage.SchemaName}].Job with (nolock) where StateName = @state";
<<<<<<<
from [{_storage.SchemaName}].Job j with (forceseek)
left join [{_storage.SchemaName}].State s on j.StateId = s.Id
=======
from [{0}].Job j with (nolock, forceseek)
left join [{0}].State s with (nolock) on j.StateId = s.Id
>>>>>>>
from [{_storage.SchemaName}].Job j with (nolock, forceseek)
left join [{_storage.SchemaName}].State s with (nolock) on j.StateId = s.Id
<<<<<<<
string fetchedJobsSql =
$@"select j.*, s.Reason as StateReason, s.Data as StateData
from [{_storage.SchemaName}].Job j
left join [{_storage.SchemaName}].State s on s.Id = j.StateId
where j.Id in @jobIds";
=======
string fetchedJobsSql = string.Format(@"
select j.*, s.Reason as StateReason, s.Data as StateData
from [{0}].Job j with (nolock)
left join [{0}].State s with (nolock) on s.Id = j.StateId
where j.Id in @jobIds", _storage.GetSchemaName());
>>>>>>>
string enqueuedJobsSql =
$@"select j.*, s.Reason as StateReason, s.Data as StateData
from [{_storage.SchemaName}].Job j with (nolock)
left join [{_storage.SchemaName}].State s with (nolock) on s.Id = j.StateId
where j.Id in @jobIds";
var jobs = connection.Query<SqlJob>(
enqueuedJobsSql,
new { jobIds = jobIds })
.ToDictionary(x => x.Id, x => x);
var sortedSqlJobs = jobIds
.Select(jobId => jobs.ContainsKey(jobId) ? jobs[jobId] : new SqlJob { Id = jobId })
.ToList();
return DeserializeJobs(
sortedSqlJobs,
(sqlJob, job, stateData) => new EnqueuedJobDto
{
Job = job,
State = sqlJob.StateName,
EnqueuedAt = sqlJob.StateName == EnqueuedState.StateName
? JobHelper.DeserializeNullableDateTime(stateData["EnqueuedAt"])
: null
});
}
private long GetNumberOfJobsByStateName(DbConnection connection, string stateName)
{
var sqlQuery = _jobListLimit.HasValue
? $@"select count(j.Id) from (select top (@limit) Id from [{_storage.SchemaName}].Job with (nolock) where StateName = @state) as j"
: $@"select count(Id) from [{_storage.SchemaName}].Job with (nolock) where StateName = @state";
var count = connection.Query<int>(
sqlQuery,
new { state = stateName, limit = _jobListLimit })
.Single();
return count;
}
private static Job DeserializeJob(string invocationData, string arguments)
{
var data = JobHelper.FromJson<InvocationData>(invocationData);
data.Arguments = arguments;
try
{
return data.Deserialize();
}
catch (JobLoadException)
{
return null;
}
}
private JobList<TDto> GetJobs<TDto>(
DbConnection connection,
int from,
int count,
string stateName,
Func<SqlJob, Job, Dictionary<string, string>, TDto> selector)
{
string jobsSql =
$@"select * from (
select j.*, s.Reason as StateReason, s.Data as StateData, row_number() over (order by j.Id desc) as row_num
from [{_storage.SchemaName}].Job j with (nolock, forceseek)
left join [{_storage.SchemaName}].State s with (nolock) on j.StateId = s.Id
where j.StateName = @stateName
) as j where j.row_num between @start and @end";
var jobs = connection.Query<SqlJob>(
jobsSql,
new { stateName = stateName, start = @from + 1, end = @from + count })
.ToList();
return DeserializeJobs(jobs, selector);
}
private static JobList<TDto> DeserializeJobs<TDto>(
ICollection<SqlJob> jobs,
Func<SqlJob, Job, Dictionary<string, string>, TDto> selector)
{
var result = new List<KeyValuePair<string, TDto>>(jobs.Count);
// ReSharper disable once LoopCanBeConvertedToQuery
foreach (var job in jobs)
{
var dto = default(TDto);
if (job.InvocationData != null)
{
var deserializedData = JobHelper.FromJson<Dictionary<string, string>>(job.StateData);
var stateData = deserializedData != null
? new Dictionary<string, string>(deserializedData, StringComparer.OrdinalIgnoreCase)
: null;
dto = selector(job, DeserializeJob(job.InvocationData, job.Arguments), stateData);
}
result.Add(new KeyValuePair<string, TDto>(
job.Id.ToString(), dto));
}
return new JobList<TDto>(result);
}
private JobList<FetchedJobDto> FetchedJobs(DbConnection connection, IEnumerable<int> jobIds)
{
string fetchedJobsSql =
$@"select j.*, s.Reason as StateReason, s.Data as StateData
from [{_storage.SchemaName}].Job j with (nolock)
left join [{_storage.SchemaName}].State s with (nolock) on s.Id = j.StateId
where j.Id in @jobIds"; |
<<<<<<<
$@"select InvocationData, StateName, Arguments, CreatedAt from [{_storage.SchemaName}].Job where Id = @id";
=======
string.Format(@"select InvocationData, StateName, Arguments, CreatedAt from [{0}].Job with (readcommittedlock) where Id = @id", _storage.GetSchemaName());
>>>>>>>
$@"select InvocationData, StateName, Arguments, CreatedAt from [{_storage.SchemaName}].Job with (readcommittedlock) where Id = @id";
<<<<<<<
string sql =
$@"select s.Name, s.Reason, s.Data
from [{_storage.SchemaName}].State s
inner join [{_storage.SchemaName}].Job j on j.StateId = s.Id
where j.Id = @jobId";
=======
string sql = string.Format(@"
select s.Name, s.Reason, s.Data
from [{0}].State s with (readcommittedlock)
inner join [{0}].Job j on j.StateId = s.Id
where j.Id = @jobId", _storage.GetSchemaName());
>>>>>>>
string sql =
$@"select s.Name, s.Reason, s.Data
from [{_storage.SchemaName}].State s with (readcommittedlock)
inner join [{_storage.SchemaName}].Job j with (readcommittedlock) on j.StateId = s.Id
where j.Id = @jobId";
<<<<<<<
$@"select Value from [{_storage.SchemaName}].JobParameter where JobId = @id and Name = @name",
=======
string.Format(@"select Value from [{0}].JobParameter with (readcommittedlock) where JobId = @id and Name = @name", _storage.GetSchemaName()),
>>>>>>>
$@"select Value from [{_storage.SchemaName}].JobParameter with (readcommittedlock) where JobId = @id and Name = @name",
<<<<<<<
$@"select Value from [{_storage.SchemaName}].[Set] where [Key] = @key",
=======
string.Format(@"select Value from [{0}].[Set] with (readcommittedlock) where [Key] = @key", _storage.GetSchemaName()),
>>>>>>>
$@"select Value from [{_storage.SchemaName}].[Set] with (readcommittedlock) where [Key] = @key",
<<<<<<<
$@"select top 1 Value from [{_storage.SchemaName}].[Set] where [Key] = @key and Score between @from and @to order by Score",
=======
string.Format(@"select top 1 Value from [{0}].[Set] with (readcommittedlock) where [Key] = @key and Score between @from and @to order by Score", _storage.GetSchemaName()),
>>>>>>>
$@"select top 1 Value from [{_storage.SchemaName}].[Set] with (readcommittedlock) where [Key] = @key and Score between @from and @to order by Score",
<<<<<<<
$"select Field, Value from [{_storage.SchemaName}].Hash with (forceseek) where [Key] = @key",
=======
string.Format("select Field, Value from [{0}].Hash with (forceseek, readcommittedlock) where [Key] = @key", _storage.GetSchemaName()),
>>>>>>>
$"select Field, Value from [{_storage.SchemaName}].Hash with (forceseek. readcommittedlock) where [Key] = @key",
<<<<<<<
$"select count([Key]) from [{_storage.SchemaName}].[Set] where [Key] = @key",
=======
string.Format("select count([Key]) from [{0}].[Set] with (readcommittedlock) where [Key] = @key", _storage.GetSchemaName()),
>>>>>>>
$"select count([Key]) from [{_storage.SchemaName}].[Set] with (readcommittedlock) where [Key] = @key",
<<<<<<<
string query = $@"select min([ExpireAt]) from [{_storage.SchemaName}].[Set] where [Key] = @key";
=======
string query = string.Format(@"
select min([ExpireAt]) from [{0}].[Set] with (readcommittedlock)
where [Key] = @key", _storage.GetSchemaName());
>>>>>>>
string query = $@"select min([ExpireAt]) from [{_storage.SchemaName}].[Set] with (readcommittedlock) where [Key] = @key";
<<<<<<<
string query =
$@"select sum(s.[Value]) from (select sum([Value]) as [Value] from [{_storage.SchemaName}].Counter
=======
string query = string.Format(@"
select sum(s.[Value]) from (select sum([Value]) as [Value] from [{0}].Counter with (readcommittedlock)
>>>>>>>
string query =
$@"select sum(s.[Value]) from (select sum([Value]) as [Value] from [{_storage.SchemaName}].Counter with (readcommittedlock)
<<<<<<<
select [Value] from [{_storage.SchemaName}].AggregatedCounter
where [Key] = @key) as s";
=======
select [Value] from [{0}].AggregatedCounter with (readcommittedlock)
where [Key] = @key) as s", _storage.GetSchemaName());
>>>>>>>
select [Value] from [{_storage.SchemaName}].AggregatedCounter with (readcommittedlock)
where [Key] = @key) as s";
<<<<<<<
string query = $@"select count([Id]) from [{_storage.SchemaName}].Hash where [Key] = @key";
=======
string query = string.Format(@"
select count([Id]) from [{0}].Hash with (readcommittedlock)
where [Key] = @key", _storage.GetSchemaName());
>>>>>>>
string query = $@"select count([Id]) from [{_storage.SchemaName}].Hash with (readcommittedlock) where [Key] = @key";
<<<<<<<
string query = $@"select min([ExpireAt]) from [{_storage.SchemaName}].Hash where [Key] = @key";
=======
string query = string.Format(@"
select min([ExpireAt]) from [{0}].Hash with (readcommittedlock)
where [Key] = @key", _storage.GetSchemaName());
>>>>>>>
string query = $@"select min([ExpireAt]) from [{_storage.SchemaName}].Hash with (readcommittedlock) where [Key] = @key";
<<<<<<<
string query =
$@"select [Value] from [{_storage.SchemaName}].Hash
where [Key] = @key and [Field] = @field";
=======
string query = string.Format(@"
select [Value] from [{0}].Hash with (readcommittedlock)
where [Key] = @key and [Field] = @field", _storage.GetSchemaName());
>>>>>>>
string query =
$@"select [Value] from [{_storage.SchemaName}].Hash with (readcommittedlock)
where [Key] = @key and [Field] = @field";
<<<<<<<
string query =
$@"select count([Id]) from [{_storage.SchemaName}].List
where [Key] = @key";
=======
string query = string.Format(@"
select count([Id]) from [{0}].List with (readcommittedlock)
where [Key] = @key", _storage.GetSchemaName());
>>>>>>>
string query =
$@"select count([Id]) from [{_storage.SchemaName}].List with (readcommittedlock)
where [Key] = @key";
<<<<<<<
string query =
$@"select min([ExpireAt]) from [{_storage.SchemaName}].List
where [Key] = @key";
=======
string query = string.Format(@"
select min([ExpireAt]) from [{0}].List with (readcommittedlock)
where [Key] = @key", _storage.GetSchemaName());
>>>>>>>
string query =
$@"select min([ExpireAt]) from [{_storage.SchemaName}].List with (readcommittedlock)
where [Key] = @key";
<<<<<<<
from [{_storage.SchemaName}].List
=======
from [{0}].List with (readcommittedlock)
>>>>>>>
from [{_storage.SchemaName}].List with (readcommittedlock)
<<<<<<<
string query =
$@"select [Value] from [{_storage.SchemaName}].List
=======
string query = string.Format(@"
select [Value] from [{0}].List with (readcommittedlock)
>>>>>>>
string query =
$@"select [Value] from [{_storage.SchemaName}].List with (readcommittedlock) |
<<<<<<<
void Remove(Cluster cluster);
void Save(Cluster cluster);
=======
Cluster Update(Cluster cluster);
>>>>>>>
void Remove(Cluster cluster);
Cluster Update(Cluster cluster);
void Save(Cluster cluster); |
<<<<<<<
cmd.SetComputeIntParam(shadeOpaqueShader, "_DebugViewMaterial", debugViewMaterial);
cmd.SetComputeIntParam(shadeOpaqueShader, "_DebugLightingMode", debugLightingMode);
cmd.SetComputeVectorParam(shadeOpaqueShader, "_DebugLightingAlbedo", debugLightingAlbedo);
cmd.SetComputeVectorParam(shadeOpaqueShader, "_DebugLightingSmoothness", debugLightingSmoothness);
cmd.SetComputeBufferParam(shadeOpaqueShader, kernel, "g_vLightListGlobal", bUseClusteredForDeferred ? s_PerVoxelLightLists : s_LightList);
cmd.SetComputeTextureParam(shadeOpaqueShader, kernel, "_MainDepthTexture", depthTexture);
cmd.SetComputeTextureParam(shadeOpaqueShader, kernel, "_GBufferTexture0", gbufferTexture0);
cmd.SetComputeTextureParam(shadeOpaqueShader, kernel, "_GBufferTexture1", gbufferTexture1);
cmd.SetComputeTextureParam(shadeOpaqueShader, kernel, "_GBufferTexture2", gbufferTexture2);
cmd.SetComputeTextureParam(shadeOpaqueShader, kernel, "_GBufferTexture3", gbufferTexture3);
cmd.SetComputeTextureParam(shadeOpaqueShader, kernel, "_AmbientOcclusionTexture", ambientOcclusionTexture);
cmd.SetComputeTextureParam(shadeOpaqueShader, kernel, "_LtcData", ltcData);
cmd.SetComputeTextureParam(shadeOpaqueShader, kernel, "_PreIntegratedFGD", preIntegratedFGD);
cmd.SetComputeTextureParam(shadeOpaqueShader, kernel, "_LtcGGXMatrix", ltcGGXMatrix);
cmd.SetComputeTextureParam(shadeOpaqueShader, kernel, "_LtcDisneyDiffuseMatrix", ltcDisneyDiffuseMatrix);
cmd.SetComputeTextureParam(shadeOpaqueShader, kernel, "_LtcMultiGGXFresnelDisneyDiffuse", ltcMultiGGXFresnelDisneyDiffuse);
cmd.SetComputeMatrixParam(shadeOpaqueShader, "g_mInvScrProjection", invScrProjection);
cmd.SetComputeIntParam(shadeOpaqueShader, "_UseTileLightList", useTileLightList);
cmd.SetComputeVectorParam(shadeOpaqueShader, "_Time", time);
cmd.SetComputeVectorParam(shadeOpaqueShader, "_SinTime", sinTime);
cmd.SetComputeVectorParam(shadeOpaqueShader, "_CosTime", cosTime);
cmd.SetComputeVectorParam(shadeOpaqueShader, "unity_DeltaTime", unity_DeltaTime);
cmd.SetComputeIntParam(shadeOpaqueShader, "_EnvLightSkyEnabled", envLightSkyEnabled);
=======
cmd.SetComputeIntParam(deferredComputeShader, "_DebugViewMaterial", debugViewMaterial);
cmd.SetComputeIntParam(deferredComputeShader, "_DebugLightingMode", debugLightingMode);
cmd.SetComputeVectorParam(deferredComputeShader, "_DebugLightingAlbedo", debugLightingAlbedo);
cmd.SetComputeVectorParam(deferredComputeShader, "_DebugLightingSmoothness", debugLightingSmoothness);
cmd.SetComputeBufferParam(deferredComputeShader, kernel, "g_vLightListGlobal", bUseClusteredForDeferred ? s_PerVoxelLightLists : s_LightList);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_MainDepthTexture", depthTexture);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_GBufferTexture0", gbufferTexture0);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_GBufferTexture1", gbufferTexture1);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_GBufferTexture2", gbufferTexture2);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_GBufferTexture3", gbufferTexture3);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_AmbientOcclusionTexture", ambientOcclusionTexture);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_LtcData", ltcData);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_PreIntegratedFGD", preIntegratedFGD);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_LtcGGXMatrix", ltcGGXMatrix);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_LtcDisneyDiffuseMatrix", ltcDisneyDiffuseMatrix);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_LtcMultiGGXFresnelDisneyDiffuse", ltcMultiGGXFresnelDisneyDiffuse);
cmd.SetComputeMatrixParam(deferredComputeShader, "g_mInvScrProjection", invScrProjection);
cmd.SetComputeIntParam(deferredComputeShader, "_UseTileLightList", useTileLightList);
cmd.SetComputeVectorParam(deferredComputeShader, "_Time", time);
cmd.SetComputeVectorParam(deferredComputeShader, "_SinTime", sinTime);
cmd.SetComputeVectorParam(deferredComputeShader, "_CosTime", cosTime);
cmd.SetComputeVectorParam(deferredComputeShader, "unity_DeltaTime", unity_DeltaTime);
cmd.SetComputeVectorParam(deferredComputeShader, "_WorldSpaceCameraPos", worldSpaceCameraPos);
cmd.SetComputeVectorParam(deferredComputeShader, "_ProjectionParams", projectionParams);
cmd.SetComputeVectorParam(deferredComputeShader, "_ScreenParams", screenParams);
cmd.SetComputeVectorParam(deferredComputeShader, "_ZBufferParams", zbufferParams);
cmd.SetComputeVectorParam(deferredComputeShader, "unity_OrthoParams", unity_OrthoParams);
cmd.SetComputeIntParam(deferredComputeShader, "_EnvLightSkyEnabled", envLightSkyEnabled);
cmd.SetComputeFloatParam(deferredComputeShader, "_AmbientOcclusionDirectLightStrenght", ambientOcclusionDirectLightStrenght);
>>>>>>>
cmd.SetComputeIntParam(deferredComputeShader, "_DebugViewMaterial", debugViewMaterial);
cmd.SetComputeIntParam(deferredComputeShader, "_DebugLightingMode", debugLightingMode);
cmd.SetComputeVectorParam(deferredComputeShader, "_DebugLightingAlbedo", debugLightingAlbedo);
cmd.SetComputeVectorParam(deferredComputeShader, "_DebugLightingSmoothness", debugLightingSmoothness);
cmd.SetComputeBufferParam(deferredComputeShader, kernel, "g_vLightListGlobal", bUseClusteredForDeferred ? s_PerVoxelLightLists : s_LightList);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_MainDepthTexture", depthTexture);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_GBufferTexture0", gbufferTexture0);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_GBufferTexture1", gbufferTexture1);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_GBufferTexture2", gbufferTexture2);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_GBufferTexture3", gbufferTexture3);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_AmbientOcclusionTexture", ambientOcclusionTexture);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_LtcData", ltcData);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_PreIntegratedFGD", preIntegratedFGD);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_LtcGGXMatrix", ltcGGXMatrix);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_LtcDisneyDiffuseMatrix", ltcDisneyDiffuseMatrix);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_LtcMultiGGXFresnelDisneyDiffuse", ltcMultiGGXFresnelDisneyDiffuse);
cmd.SetComputeMatrixParam(deferredComputeShader, "g_mInvScrProjection", invScrProjection);
cmd.SetComputeIntParam(deferredComputeShader, "_UseTileLightList", useTileLightList);
cmd.SetComputeVectorParam(deferredComputeShader, "_Time", time);
cmd.SetComputeVectorParam(deferredComputeShader, "_SinTime", sinTime);
cmd.SetComputeVectorParam(deferredComputeShader, "_CosTime", cosTime);
cmd.SetComputeVectorParam(deferredComputeShader, "unity_DeltaTime", unity_DeltaTime);
cmd.SetComputeIntParam(deferredComputeShader, "_EnvLightSkyEnabled", envLightSkyEnabled);
cmd.SetComputeFloatParam(deferredComputeShader, "_AmbientOcclusionDirectLightStrenght", ambientOcclusionDirectLightStrenght); |
<<<<<<<
{}
=======
{
}
protected override void ValidateCommandLine()
{
if (ConfigurationSettings.VcfPath != "-")
{
CheckInputFilenameExists(ConfigurationSettings.VcfPath, "vcf", "--in");
}
CheckInputFilenameExists(ConfigurationSettings.CompressedReferencePath, "compressed reference sequence", "--ref");
CheckInputFilenameExists(CacheConstants.TranscriptPath(ConfigurationSettings.InputCachePrefix), "transcript cache", "--cache");
CheckInputFilenameExists(CacheConstants.SiftPath(ConfigurationSettings.InputCachePrefix), "SIFT cache", "--cache");
CheckInputFilenameExists(CacheConstants.PolyPhenPath(ConfigurationSettings.InputCachePrefix), "PolyPhen cache", "--cache");
CheckDirectoryExists(ConfigurationSettings.SupplementaryAnnotationDirectory, "supplementary annotation", "--sd", false);
foreach (var customAnnotationDirectory in ConfigurationSettings.CustomAnnotationDirectories)
{
CheckDirectoryExists(customAnnotationDirectory, "custom annotation", "--ca", false);
}
foreach (var customAnnotationDirectory in ConfigurationSettings.CustomIntervalDirectories)
{
CheckDirectoryExists(customAnnotationDirectory, "custom interval", "--ci", false);
}
// if we're using stdout, it doesn't make sense to output the VCF and gVCF
if (ConfigurationSettings.OutputFileName == "-")
{
ConfigurationSettings.Vcf = false;
ConfigurationSettings.Gvcf = false;
PerformanceMetrics.DisableOutput = true;
}
HasRequiredParameter(ConfigurationSettings.OutputFileName, "output file stub", "--out");
if (ConfigurationSettings.LimitReferenceNoCallsToTranscripts)
ConfigurationSettings.EnableReferenceNoCalls = true;
}
>>>>>>>
{}
<<<<<<<
Console.WriteLine("Running Nirvana on {0}:", Path.GetFileName(ConfigurationSettings.VcfPath));
=======
var processedReferences = new HashSet<string>();
string previousReference = null;
if (!Console.IsOutputRedirected) Console.WriteLine("Running Nirvana on {0}:", GetFileName());
>>>>>>>
if (!Console.IsOutputRedirected) Console.WriteLine("Running Nirvana on {0}:", GetFileName());
<<<<<<<
using (var reader = new LiteVcfReader(ConfigurationSettings.VcfPath))
=======
var jsonCreationTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// parse the vcf header
var reader = GetVcfReader();
var booleanArguments = new List<string>();
if (ConfigurationSettings.EnableReferenceNoCalls) booleanArguments.Add(AnnotatorInfoCommon.ReferenceNoCall);
if (ConfigurationSettings.LimitReferenceNoCallsToTranscripts) booleanArguments.Add(AnnotatorInfoCommon.TranscriptOnlyRefNoCall);
if (ConfigurationSettings.ForceMitochondrialAnnotation || reader.IsRcrsMitochondrion) booleanArguments.Add(AnnotatorInfoCommon.EnableMitochondrialAnnotation);
if (ConfigurationSettings.ReportAllSvOverlappingTranscripts) booleanArguments.Add(AnnotatorInfoCommon.ReportAllSvOverlappingTranscripts);
if (ConfigurationSettings.EnableLoftee) booleanArguments.Add(AnnotatorInfoCommon.EnableLoftee);
var annotatorInfo = new AnnotatorInfo(reader.SampleNames, booleanArguments);
var annotatorPaths = new AnnotatorPath(ConfigurationSettings.InputCachePrefix, ConfigurationSettings.CompressedReferencePath, ConfigurationSettings.SupplementaryAnnotationDirectory, ConfigurationSettings.CustomAnnotationDirectories, ConfigurationSettings.CustomIntervalDirectories);
var annotator = new AnnotationSourceFactory().CreateAnnotationSource(annotatorInfo, annotatorPaths);
// sanity check: make sure we have annotations
if (annotator == null)
>>>>>>>
using (var reader = GetVcfReader())
<<<<<<<
if (annotator == null)
{
throw new InvalidOperationException("Unable to perform annotation because no annotation sources could be created");
}
using (var jsonWriter = new UnifiedJsonWriter(outputVariantsPath, Date.GetTimeStamp, annotator.GetDataVersion(), annotator.GetDataSourceVersions(), annotator.GetGenomeAssembly(), reader.SampleNames))
using (var vcfWriter = ConfigurationSettings.Vcf ? new LiteVcfWriter(outputVcfPath, reader.HeaderLines, annotator.GetDataVersion(), annotator.GetDataSourceVersions()) : null)
using (var gvcfWriter = ConfigurationSettings.Gvcf ? new LiteVcfWriter(outputGvcfPath, reader.HeaderLines, annotator.GetDataVersion(), annotator.GetDataSourceVersions()) : null)
=======
using (var jsonStreamWriter = GetJsonStreamWriter(outputVariantsPath))
using (var jsonWriter = GetJsonWriter(jsonStreamWriter, jsonCreationTime, annotator, reader))
using (var vcfWriter = ConfigurationSettings.Vcf ? new LiteVcfWriter(outputVcfPath, reader.HeaderLines, annotator.GetDataVersion(), annotator.GetDataSourceVersions()) : null)
using (var gvcfWriter = ConfigurationSettings.Gvcf ? new LiteVcfWriter(outputGvcfPath, reader.HeaderLines, annotator.GetDataVersion(), annotator.GetDataSourceVersions()) : null)
{
>>>>>>>
if (annotator == null)
{
throw new InvalidOperationException("Unable to perform annotation because no annotation sources could be created");
}
using (var jsonStreamWriter = GetJsonStreamWriter(outputVariantsPath))
using (var jsonWriter = GetJsonWriter(jsonStreamWriter, Date.GetTimeStamp, annotator, reader))
using (var vcfWriter = ConfigurationSettings.Vcf ? new LiteVcfWriter(outputVcfPath, reader.HeaderLines, annotator.GetDataVersion(), annotator.GetDataSourceVersions()) : null)
using (var gvcfWriter = ConfigurationSettings.Gvcf ? new LiteVcfWriter(outputGvcfPath, reader.HeaderLines, annotator.GetDataVersion(), annotator.GetDataSourceVersions()) : null)
<<<<<<<
while (true)
=======
while ((vcfLine = reader.ReadLine()) != null)
>>>>>>>
while (true)
<<<<<<<
var fields = vcfLine.Split('\t');
if (fields.Length < VcfCommon.MinNumColumns) continue;
=======
if (annotatedVariant.AnnotatedAlternateAlleles.First().IsReference)
{
if (annotatedVariant.AnnotatedAlternateAlleles.First().IsReferenceNoCall || annotatedVariant.AnnotatedAlternateAlleles.First().IsReferenceMinor)
{
jsonWriter.Write(annotatedVariant.ToString());
}
>>>>>>>
var fields = vcfLine.Split('\t');
if (fields.Length < VcfCommon.MinNumColumns) continue;
<<<<<<<
var vcfOutput = GetVcfString(variant, annotatedVariant);
WriteOutput(vcfOutput, annotatedVariant, vcfWriter, gvcfWriter, jsonWriter);
=======
jsonWriter.Write(annotatedVariant.ToString());
vcfWriter?.Write(vcfVariant, annotatedVariant);
>>>>>>>
var vcfOutput = GetVcfString(variant, annotatedVariant);
WriteOutput(vcfOutput, annotatedVariant, vcfWriter, gvcfWriter, jsonWriter);
<<<<<<<
WriteOmim(annotator, jsonWriter);
=======
var omimAnnotations = new List<string>();
annotator.AddGeneLevelAnnotation(omimAnnotations);
var annotionOutput = UnifiedJson.GetGeneAnnotation(omimAnnotations, "omim");
jsonWriter.Write(annotionOutput);
>>>>>>>
WriteOmim(annotator, jsonWriter);
<<<<<<<
private static IAnnotationSource GetAnnotator(string[] sampleNames, List<string> booleanArguments)
=======
private static StreamWriter GetJsonStreamWriter(string outputPath)
{
return ConfigurationSettings.OutputFileName == "-"
? new StreamWriter(Console.OpenStandardOutput())
: GZipUtilities.GetStreamWriter(outputPath);
}
private static UnifiedJsonWriter GetJsonWriter(StreamWriter streamWriter, string jsonCreationTime, IAnnotationSource annotator, LiteVcfReader reader)
{
return new UnifiedJsonWriter(streamWriter, jsonCreationTime, annotator.GetDataVersion(), annotator.GetDataSourceVersions(), annotator.GetGenomeAssembly(), reader.SampleNames);
}
private static string GetFileName()
{
return Console.IsInputRedirected ? "stdin" : Path.GetFileName(ConfigurationSettings.VcfPath);
}
private LiteVcfReader GetVcfReader()
{
var useStdInput = ConfigurationSettings.VcfPath == "-";
var peekStream =
new PeekStream(useStdInput
? Console.OpenStandardInput()
: FileUtilities.GetReadStream(ConfigurationSettings.VcfPath));
return new LiteVcfReader(GZipUtilities.GetAppropriateStream(peekStream));
}
private static IVariant CreateVcfVariant(string vcfLine, bool isGatkGenomeVcf)
>>>>>>>
private static IAnnotationSource GetAnnotator(string[] sampleNames, List<string> booleanArguments) |
<<<<<<<
var version = GetDataSourceVersion(fileName);
var reader = new CustomIntervalParser(new FileInfo(fileName),_refNamesDictionary);
using (var writer = new IntervalTsvWriter(_outputDirectory, version ,
_genomeAssembly.ToString(), SaTsvCommon.CustIntervalSchemaVersion, reader.KeyName,
ReportFor.AllVariants))
{
foreach (var custInterval in reader)
{
writer.AddEntry(custInterval.Chromosome.EnsemblName, custInterval.Start, custInterval.End, custInterval.GetJsonString());
}
}
=======
var version = GetDataSourceVersion(fileName);
var reader = new CustomIntervalParser(new FileInfo(fileName), _refNamesDictionary);
using (var writer = new IntervalTsvWriter(_outputDirectory, version,
_genomeAssembly.ToString(), SaTSVCommon.CustIntervalSchemaVersion, reader.KeyName,
ReportFor.AllVariants))
{
foreach (var custInterval in reader)
{
writer.AddEntry(custInterval.Chromosome.EnsemblName, custInterval.Start, custInterval.End, custInterval.GetJsonString());
}
}
>>>>>>>
var version = GetDataSourceVersion(fileName);
var reader = new CustomIntervalParser(new FileInfo(fileName), _refNamesDictionary);
using (var writer = new IntervalTsvWriter(_outputDirectory, version,
_genomeAssembly.ToString(), SaTsvCommon.CustIntervalSchemaVersion, reader.KeyName,
ReportFor.AllVariants))
{
foreach (var custInterval in reader)
{
writer.AddEntry(custInterval.Chromosome.EnsemblName, custInterval.Start, custInterval.End, custInterval.GetJsonString());
}
} |
<<<<<<<
bool EvolveAllPokemonWithEnoughCandy { get; }
bool KeepPokemonsThatCanEvolve { get; }
bool TransferDuplicatePokemon { get; }
bool UseEggIncubators { get; }
int DelayBetweenPokemonCatch { get; }
bool AutomaticallyLevelUpPokemon { get; }
string LevelUpByCPorIv { get; }
float UpgradePokemonCpMinimum { get; }
float UpgradePokemonIvMinimum { get; }
int DelayBetweenPlayerActions { get; }
bool UsePokemonToNotCatchFilter { get; }
int KeepMinDuplicatePokemon { get; }
bool PrioritizeIvOverCp { get; }
=======
>>>>>>>
<<<<<<<
bool StartupWelcomeDelay { get; }
bool Teleport { get; }
int DelayPositionCheckState { get; }
int DelayCatchIncensePokemon { get; }
int DelayCatchNearbyPokemon { get; }
int DelayCatchLurePokemon { get; }
int DelayCatchPokemon { get; }
int DelayDisplayPokemon { get; }
int DelayUseLuckyEgg { get; }
int DelaySoftbanRetry { get; }
int DelayPokestop { get; }
int DelayRecyleItem { get; }
int DelaySnipePokemon { get; }
int DelayTransferPokemon { get; }
double RecycleInventoryAtUsagePercentage { get; }
bool HumanizeThrows { get; }
double ThrowAccuracyMin { get; }
double ThrowAccuracyMax { get; }
double ThrowSpinFrequency { get; }
int UseBerryMinCp { get; }
float UseBerryMinIv { get; }
double UseBerryBelowCatchProbability { get; }
int UseGreatBallAboveIv { get; }
int UseUltraBallAboveIv { get; }
double UseMasterBallBelowCatchProbability { get; }
double UseUltraBallBelowCatchProbability { get; }
double UseGreatBallBelowCatchProbability { get; }
=======
>>>>>>> |
<<<<<<<
=======
//pokeballs
public int UseGreatBallAboveCp = 750;
public int UseUltraBallAboveCp = 1500;
public int UseMasterBallAboveCp = 2500;
>>>>>>> |
<<<<<<<
[Emitter(typeof(OpOpenBracket), typeof(RegXX), typeof(OpPlus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(RegXX))]
[Emitter(typeof(OpOpenBracket), typeof(RegXX), typeof(OpPlus), typeof(RegXX), typeof(OpCloseBracket), typeof(OpEquals), typeof(RegXX))]
[Emitter(typeof(OpOpenBracket), typeof(RegXX), typeof(OpMinus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(RegXX))]
[Emitter(typeof(OpOpenBracket), typeof(RegXX), typeof(OpMinus), typeof(RegXX), typeof(OpCloseBracket), typeof(OpEquals), typeof(RegXX))]
[Emitter(typeof(OpOpenBracket), typeof(RegXX), typeof(OpPlus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(Variable))]
[Emitter(typeof(OpOpenBracket), typeof(RegXX), typeof(OpPlus), typeof(RegXX), typeof(OpCloseBracket), typeof(OpEquals), typeof(Variable))]
[Emitter(typeof(OpOpenBracket), typeof(RegXX), typeof(OpMinus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(Variable))]
[Emitter(typeof(OpOpenBracket), typeof(RegXX), typeof(OpMinus), typeof(RegXX), typeof(OpCloseBracket), typeof(OpEquals), typeof(Variable))]
=======
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpPlus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(Reg))]
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpMinus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(Reg))]
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpPlus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(Variable))]
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpMinus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(Variable))]
>>>>>>>
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpPlus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(Reg))]
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpPlus), typeof(Reg), typeof(OpCloseBracket), typeof(OpEquals), typeof(Reg))]
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpMinus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(Reg))]
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpMinus), typeof(Reg), typeof(OpCloseBracket), typeof(OpEquals), typeof(Reg))]
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpPlus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(Variable))]
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpPlus), typeof(Reg), typeof(OpCloseBracket), typeof(OpEquals), typeof(Variable))]
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpMinus), typeof(Int32u), typeof(OpCloseBracket), typeof(OpEquals), typeof(Variable))]
[Emitter(typeof(OpOpenBracket), typeof(Reg), typeof(OpMinus), typeof(Reg), typeof(OpCloseBracket), typeof(OpEquals), typeof(Variable))] |
<<<<<<<
return Resolver.TryResolveFolder(Path, allowedExtensions, disallowedExtensions);
=======
return Resolver.TryResolveFolder(Path, IsRecursive, allowedExtensions);
>>>>>>>
return Resolver.TryResolveFolder(Path, IsRecursive, allowedExtensions, disallowedExtensions); |
<<<<<<<
=======
internal override void BeforeRenderDebug()
{
foreach(var asset in bundleState.Assets.Where(a => a.IsLocal))
{
var localPath = asset.LocalPath;
if(localPath.ToLower().EndsWith(".less") || localPath.ToLower().EndsWith(".less.css"))
{
string outputFile = FileSystem.ResolveAppRelativePathToFileSystem(localPath);
string css = ProcessLess(outputFile);
outputFile += ".debug.css";
using(var fileWriter = fileWriterFactory.GetFileWriter(outputFile))
{
fileWriter.Write(css);
}
asset.LocalPath = localPath + ".debug.css";
}
}
}
>>>>>>> |
<<<<<<<
private static string[] extensions = new string[] { ".sass", ".scss" };
//private static Regex sassFiles = new Regex(@"(\.sass)|(\.scss)$", RegexOptions.Compiled);
=======
private static string[] extensions = new[] { ".sass", ".scss" };
private static Regex sassFiles = new Regex(@"(\.sass)|(\.scss)$", RegexOptions.Compiled);
>>>>>>>
private static string[] extensions = new[] { ".sass", ".scss" };
//private static Regex sassFiles = new Regex(@"(\.sass)|(\.scss)$", RegexOptions.Compiled); |
<<<<<<<
var result = new FileSystemResolver().TryResolveFolder(path, null, null).ToList();
=======
var result = new FileSystemResolver().TryResolveFolder(path, true, null).ToList();
>>>>>>>
var result = new FileSystemResolver().TryResolveFolder(path, true, null, null).ToList();
<<<<<<<
var result = new FileSystemResolver().TryResolveFolder(path, new[] { ".js" }, new [] { ".css" }).ToList();
=======
var result = new FileSystemResolver().TryResolveFolder(path, true, new[] { ".js" }).ToList();
>>>>>>>
var result = new FileSystemResolver().TryResolveFolder(path, true, new[] { ".js" }, new [] { ".css" }).ToList(); |
<<<<<<<
=======
private string ProcessLess(string file)
{
lock (typeof(CSSBundle))
{
try
{
var dir = Path.GetDirectoryName(file);
currentDirectoryWrapper.SetCurrentDirectory(dir);
var content = ReadFile(file);
var engineFactory = new EngineFactory();
var engine = engineFactory.GetEngine();
var css = engine.TransformToCss(content, file);
var appPath = FileSystem.ResolveFileSystemPathToAppRelative(dir);
var importPaths = engine.GetImports();
foreach (var importPath in importPaths)
{
var import = FileSystem.ResolveAppRelativePathToFileSystem(Path.Combine(appPath, importPath));
DependentFiles.Add(import);
}
return css;
}
finally
{
currentDirectoryWrapper.Revert();
}
}
}
>>>>>>>
<<<<<<<
string outputFile = FileSystem.ResolveAppRelativePathToFileSystem(localPath);
string css = PreprocessCssFile(outputFile, preprocessor);
outputFile += ".debug.css";
using (var fileWriter = fileWriterFactory.GetFileWriter(outputFile))
{
fileWriter.Write(css);
}
asset.LocalPath = localPath + ".debug.css";
=======
fileWriter.Write(css);
>>>>>>>
fileWriter.Write(css); |
<<<<<<<
public class JavaScriptBundle: BundleBase<JavaScriptBundle>
{
private const string JS_TEMPLATE = "<script type=\"text/javascript\" {0}src=\"{1}\"></script>";
=======
internal class JavaScriptBundle: BundleBase, IJavaScriptBundle, IJavaScriptBundleBuilder
{
private static Regex httpMatcher = new Regex(@"^https?://");
private static BundleCache<RenderedScriptBundle> bundleCache = new BundleCache<RenderedScriptBundle>();
private static Dictionary<string, string> debugJavaScriptFiles = new Dictionary<string, string>();
private static Dictionary<string, NamedState> namedState = new Dictionary<string, NamedState>();
private List<string> javaScriptFiles = new List<string>();
private List<string> remoteJavaScriptFiles = new List<string>();
private List<string> embeddedResourceJavaScriptFiles = new List<string>();
private IJavaScriptMinifier javaScriptMinifier = new MsMinifier();
private const string scriptTemplate = "<script type=\"text/javascript\" {0}src=\"{1}\"></script>";
>>>>>>>
public class JavaScriptBundle: BundleBase<JavaScriptBundle>
{ |
<<<<<<<
BottomNavigationViewTracker _bottomNavigationTracker;
=======
BottomSheetDialog _bottomSheetDialog;
bool _disposed;
>>>>>>>
BottomNavigationViewTracker _bottomNavigationTracker;
BottomSheetDialog _bottomSheetDialog;
bool _disposed;
<<<<<<<
var items = CreateTabList(ShellItem);
var bottomSheetDialog = BottomNavigationViewUtils.CreateMoreBottomSheet(OnMoreItemSelected, Context, items, _bottomView.MaxItemCount);
bottomSheetDialog.Show();
bottomSheetDialog.DismissEvent += OnMoreSheetDismissed;
=======
_bottomSheetDialog = CreateMoreBottomSheet(OnMoreItemSelected);
_bottomSheetDialog.Show();
_bottomSheetDialog.DismissEvent += OnMoreSheetDismissed;
>>>>>>>
var items = CreateTabList(ShellItem);
_bottomSheetDialog = BottomNavigationViewUtils.CreateMoreBottomSheet(OnMoreItemSelected, Context, items, _bottomView.MaxItemCount);
_bottomSheetDialog.Show();
_bottomSheetDialog.DismissEvent += OnMoreSheetDismissed;
<<<<<<<
List<(string title, ImageSource icon, bool tabEnabled)> CreateTabList(ShellItem shellItem)
{
var items = new List<(string title, ImageSource icon, bool tabEnabled)>();
for (int i = 0; i < shellItem.Items.Count; i++)
{
var item = shellItem.Items[i];
items.Add((item.Title, item.Icon, item.IsEnabled));
}
return items;
}
protected virtual void OnMoreSheetDismissed(object sender, EventArgs e) => OnShellSectionChanged();
=======
protected virtual void OnMoreSheetDismissed(object sender, EventArgs e)
{
OnShellSectionChanged();
if (_bottomSheetDialog != null)
{
_bottomSheetDialog.DismissEvent -= OnMoreSheetDismissed;
_bottomSheetDialog.Dispose();
_bottomSheetDialog = null;
}
}
>>>>>>>
List<(string title, ImageSource icon, bool tabEnabled)> CreateTabList(ShellItem shellItem)
{
var items = new List<(string title, ImageSource icon, bool tabEnabled)>();
for (int i = 0; i < shellItem.Items.Count; i++)
{
var item = shellItem.Items[i];
items.Add((item.Title, item.Icon, item.IsEnabled));
}
return items;
}
protected virtual void OnMoreSheetDismissed(object sender, EventArgs e)
{
OnShellSectionChanged();
if (_bottomSheetDialog != null)
{
_bottomSheetDialog.DismissEvent -= OnMoreSheetDismissed;
_bottomSheetDialog.Dispose();
_bottomSheetDialog = null;
}
} |
<<<<<<<
[assembly: XmlnsPrefix("http://xamarin.com/schemas/2014/forms", "xf")]
[assembly: XmlnsPrefix("http://xamarin.com/schemas/2014/forms/design", "d")]
=======
[assembly: XmlnsDefinition("http://xamarin.com/schemas/2014/forms/design", "Xamarin.Forms")]
>>>>>>>
[assembly: XmlnsDefinition("http://xamarin.com/schemas/2014/forms/design", "Xamarin.Forms")]
[assembly: XmlnsPrefix("http://xamarin.com/schemas/2014/forms", "xf")]
[assembly: XmlnsPrefix("http://xamarin.com/schemas/2014/forms/design", "d")] |
<<<<<<<
using Xamarin.Forms.Controls.GalleryPages.SwipeViewGalleries;
=======
using Xamarin.Forms.Controls.GalleryPages.PlatformTestsGallery;
>>>>>>>
using Xamarin.Forms.Controls.GalleryPages.SwipeViewGalleries;
using Xamarin.Forms.Controls.GalleryPages.PlatformTestsGallery; |
<<<<<<<
Layer.BackgroundColor = ColorExtensions.BackgroundColor.CGColor;
=======
_actualView.Layer.BackgroundColor = UIColor.White.CGColor;
>>>>>>>
_actualView.Layer.BackgroundColor = ColorExtensions.BackgroundColor.CGColor;
<<<<<<<
if (_shadowView != null)
{
if (_shadowView.Superview == null && Superview != null)
Superview.InsertSubviewBelow(_shadowView, this);
=======
if (_previousSize != Bounds.Size)
SetNeedsDisplay();
>>>>>>>
if (_shadowView != null)
{
if (_shadowView.Superview == null && Superview != null)
Superview.InsertSubviewBelow(_shadowView, this);
_shadowView?.SetNeedsLayout();
}
if (_previousSize != Bounds.Size)
SetNeedsDisplay(); |
<<<<<<<
using Xamarin.Forms.Controls.GalleryPages.TwoPaneViewGalleries;
using Xamarin.Forms.Controls.GalleryPages.AppThemeGalleries;
using Xamarin.Forms.Controls.GalleryPages.ExpanderGalleries;
using Xamarin.Forms.Controls.GalleryPages.RadioButtonGalleries;
=======
>>>>>>>
using Xamarin.Forms.Controls.GalleryPages.AppThemeGalleries;
using Xamarin.Forms.Controls.GalleryPages.ExpanderGalleries;
using Xamarin.Forms.Controls.GalleryPages.RadioButtonGalleries; |
<<<<<<<
using Xamarin.Forms.Platform.UAP;
using WScrollMode = Windows.UI.Xaml.Controls.ScrollMode;
=======
using UWPApp = Windows.UI.Xaml.Application;
>>>>>>>
using UWPApp = Windows.UI.Xaml.Application;
using Xamarin.Forms.Platform.UAP;
using WScrollMode = Windows.UI.Xaml.Controls.ScrollMode;
<<<<<<<
var gridView = new FormsGridView();
if (gridItemsLayout.Orientation == ItemsLayoutOrientation.Horizontal)
{
gridView.UseHorizontalItemsPanel();
// TODO hartez 2018/06/06 12:13:38 Should this logic just be built into FormsGridView?
ScrollViewer.SetHorizontalScrollMode(gridView, WScrollMode.Auto);
ScrollViewer.SetHorizontalScrollBarVisibility(gridView,
Windows.UI.Xaml.Controls.ScrollBarVisibility.Auto);
}
else
=======
return new FormsGridView
>>>>>>>
return new FormsGridView |
<<<<<<<
=======
[assembly: ExportRenderer(typeof(Xamarin.Forms.Controls.GalleryPages.TwoPaneViewGalleries.HingeAngleLabel), typeof(HingeAngleLabelRenderer))]
[assembly: ExportRenderer(typeof(Issue8801.PopupStackLayout), typeof(Issue8801StackLayoutRenderer))]
>>>>>>>
[assembly: ExportRenderer(typeof(Issue8801.PopupStackLayout), typeof(Issue8801StackLayoutRenderer))]
<<<<<<<
public class CustomStackLayoutRenderer : VisualElementRenderer<StackLayout>
=======
public class HingeAngleLabelRenderer : Xamarin.Forms.Platform.Android.FastRenderers.LabelRenderer
{
System.Timers.Timer _hingeTimer;
public HingeAngleLabelRenderer(Context context) : base(context)
{
}
async void OnTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
{
if (_hingeTimer == null)
return;
_hingeTimer.Stop();
var hingeAngle = await DualScreen.DualScreenInfo.Current.GetHingeAngleAsync();
Device.BeginInvokeOnMainThread(() =>
{
if (_hingeTimer != null)
Element.Text = hingeAngle.ToString();
});
if(_hingeTimer != null)
_hingeTimer.Start();
}
protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
{
base.OnElementChanged(e);
if(_hingeTimer == null)
{
_hingeTimer = new System.Timers.Timer(100);
_hingeTimer.Elapsed += OnTimerElapsed;
_hingeTimer.Start();
}
}
protected override void Dispose(bool disposing)
{
if (_hingeTimer != null)
{
_hingeTimer.Elapsed -= OnTimerElapsed;
_hingeTimer.Stop();
_hingeTimer = null;
}
base.Dispose(disposing);
}
}
public class Issue8801StackLayoutRenderer : VisualElementRenderer<StackLayout>
>>>>>>>
public class Issue8801StackLayoutRenderer : VisualElementRenderer<StackLayout> |
<<<<<<<
case LinearItemsLayout listItemsLayout when listItemsLayout.Orientation == ItemsLayoutOrientation.Horizontal:
ScrollViewer.SetHorizontalScrollMode(ListViewBase, CarouselView.IsSwipeEnabled ? WScrollMode.Auto : WScrollMode.Disabled);
=======
case ItemsLayoutOrientation.Horizontal:
ScrollViewer.SetHorizontalScrollMode(ListViewBase, CarouselView.IsSwipeEnabled ? ScrollMode.Auto : ScrollMode.Disabled);
>>>>>>>
case ItemsLayoutOrientation.Horizontal:
ScrollViewer.SetHorizontalScrollMode(ListViewBase, CarouselView.IsSwipeEnabled ? WScrollMode.Auto : WScrollMode.Disabled);
<<<<<<<
case LinearItemsLayout listItemsLayout when listItemsLayout.Orientation == ItemsLayoutOrientation.Vertical:
ScrollViewer.SetVerticalScrollMode(ListViewBase, CarouselView.IsSwipeEnabled ? WScrollMode.Auto : WScrollMode.Disabled);
=======
case ItemsLayoutOrientation.Vertical:
ScrollViewer.SetVerticalScrollMode(ListViewBase, CarouselView.IsSwipeEnabled ? ScrollMode.Auto : ScrollMode.Disabled);
>>>>>>>
case ItemsLayoutOrientation.Vertical:
ScrollViewer.SetVerticalScrollMode(ListViewBase, CarouselView.IsSwipeEnabled ? WScrollMode.Auto : WScrollMode.Disabled); |
<<<<<<<
static bool? s_isiOS13OrNewer;
=======
static bool? s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden;
>>>>>>>
static bool? s_isiOS13OrNewer;
static bool? s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden;
<<<<<<<
internal static bool IsiOS13OrNewer
{
get
{
if (!s_isiOS13OrNewer.HasValue)
s_isiOS13OrNewer = UIDevice.CurrentDevice.CheckSystemVersion(13, 0);
return s_isiOS13OrNewer.Value;
}
}
=======
internal static bool RespondsToSetNeedsUpdateOfHomeIndicatorAutoHidden
{
get
{
if (!s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden.HasValue)
s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden = new UIViewController().RespondsToSelector(new ObjCRuntime.Selector("setNeedsUpdateOfHomeIndicatorAutoHidden"));
return s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden.Value;
}
}
>>>>>>>
internal static bool IsiOS13OrNewer
{
get
{
if (!s_isiOS13OrNewer.HasValue)
s_isiOS13OrNewer = UIDevice.CurrentDevice.CheckSystemVersion(13, 0);
return s_isiOS13OrNewer.Value;
}
}
internal static bool RespondsToSetNeedsUpdateOfHomeIndicatorAutoHidden
{
get
{
if (!s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden.HasValue)
s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden = new UIViewController().RespondsToSelector(new ObjCRuntime.Selector("setNeedsUpdateOfHomeIndicatorAutoHidden"));
return s_respondsTosetNeedsUpdateOfHomeIndicatorAutoHidden.Value;
}
} |
<<<<<<<
//TestBugzilla44596();
//TestBugzilla45702();
}
protected override void OnStart()
{
//TestIssue2393();
}
void TestBugzilla44596()
{
// verify that there is no gray screen displayed between the blue splash and red MasterDetailPage.
SetMainPage(new Bugzilla44596SplashPage(() =>
{
var newTabbedPage = new TabbedPage();
newTabbedPage.Children.Add(new ContentPage { BackgroundColor = Color.Red, Content = new Label { Text = "yay" } });
MainPage = new MasterDetailPage
{
Master = new ContentPage { Title = "Master", BackgroundColor = Color.Red },
Detail = newTabbedPage
};
}));
}
void TestBugzilla45702()
{
// verify that there is no crash when switching MainPage from MDP inside NavPage
SetMainPage(new Bugzilla45702());
}
void TestIssue2393()
{
MainPage = new NavigationPage();
// Hand off to website for sign in process
var view = new WebView { Source = new Uri("http://google.com") };
view.Navigated += (s, e) => MainPage.DisplayAlert("Navigated", $"If this popup appears multiple times, this test has failed", "ok"); ;
MainPage.Navigation.PushAsync(new ContentPage { Content = view, Title = "Issue 2393" });
=======
//// Uncomment to verify that there is no gray screen displayed between the blue splash and red MasterDetailPage.
//SetMainPage(new Bugzilla44596SplashPage(() =>
//{
// var newTabbedPage = new TabbedPage();
// newTabbedPage.Children.Add(new ContentPage { BackgroundColor = Color.Red, Content = new Label { Text = "yay" } });
// MainPage = new MasterDetailPage
// {
// Master = new ContentPage { Title = "Master", BackgroundColor = Color.Red },
// Detail = newTabbedPage
// };
//}));
//// Uncomment to verify that there is no crash when switching MainPage from MDP inside NavPage
//SetMainPage(new Bugzilla45702());
//// Uncomment to verify that there is no crash when rapidly switching pages that contain lots of buttons
//SetMainPage(new Issues.Issue2004());
>>>>>>>
//TestBugzilla44596();
//TestBugzilla45702();
}
protected override void OnStart()
{
//TestIssue2393();
}
void TestBugzilla44596()
{
// verify that there is no gray screen displayed between the blue splash and red MasterDetailPage.
SetMainPage(new Bugzilla44596SplashPage(() =>
{
var newTabbedPage = new TabbedPage();
newTabbedPage.Children.Add(new ContentPage { BackgroundColor = Color.Red, Content = new Label { Text = "yay" } });
MainPage = new MasterDetailPage
{
Master = new ContentPage { Title = "Master", BackgroundColor = Color.Red },
Detail = newTabbedPage
};
}));
}
void TestBugzilla45702()
{
// verify that there is no crash when switching MainPage from MDP inside NavPage
SetMainPage(new Bugzilla45702());
}
void TestIssue2393()
{
MainPage = new NavigationPage();
// Hand off to website for sign in process
var view = new WebView { Source = new Uri("http://google.com") };
view.Navigated += (s, e) => MainPage.DisplayAlert("Navigated", $"If this popup appears multiple times, this test has failed", "ok"); ;
MainPage.Navigation.PushAsync(new ContentPage { Content = view, Title = "Issue 2393" });
//// Uncomment to verify that there is no gray screen displayed between the blue splash and red MasterDetailPage.
//SetMainPage(new Bugzilla44596SplashPage(() =>
//{
// var newTabbedPage = new TabbedPage();
// newTabbedPage.Children.Add(new ContentPage { BackgroundColor = Color.Red, Content = new Label { Text = "yay" } });
// MainPage = new MasterDetailPage
// {
// Master = new ContentPage { Title = "Master", BackgroundColor = Color.Red },
// Detail = newTabbedPage
// };
//}));
//// Uncomment to verify that there is no crash when switching MainPage from MDP inside NavPage
//SetMainPage(new Bugzilla45702());
//// Uncomment to verify that there is no crash when rapidly switching pages that contain lots of buttons
//SetMainPage(new Issues.Issue2004()); |
<<<<<<<
[Test]
public void MapFailureOnSuccessShouldReturnSuccess()
{
Result<int, string>.Succeed(42, "warn1")
.MapFailure(list => new[] { 42 })
.Match(
ifSuccess: (v, msgs) =>
{
Assert.AreEqual(42, v);
Assert.That(msgs, Is.Empty);
},
ifFailure: errs => Assert.Fail());
}
[Test]
public void MapFailureOnFailureShouldMapOverError()
{
Result<int, string>.FailWith(new[] { "err1", "err2" })
.MapFailure(_ => new[] { 42 })
.Match(
ifSuccess: (v, msgs) => Assert.Fail(),
ifFailure: errs => Assert.That(errs, Is.EquivalentTo(new[] { 42 })));
}
[Test]
public void MapFailureOnFailureShouldMapOverListOfErrors()
{
Result<int, string>.FailWith(new[] { "err1", "err2" })
.MapFailure(errs => errs.Select(err =>
{
switch (err)
{
case "err1": return 42;
case "err2": return 43;
default: return 0;
}
}))
.Match(
ifSuccess: (v, msgs) => Assert.Fail(),
ifFailure: errs => Assert.That(errs, Is.EquivalentTo(new[] { 42, 43 })));
}
=======
[Test]
public void ToResultOnSomeShouldSucceed()
{
var opt = FSharpOption<int>.Some(42);
var result = opt.ToResult("error");
result.Match(
ifSuccess: (x, msgs) =>
{
Assert.AreEqual(42, x);
Assert.That(msgs, Is.Empty);
},
ifFailure: errs => Assert.Fail());
}
[Test]
public void ToResultOnNoneShoulFail()
{
var opt = FSharpOption<int>.None;
var result = opt.ToResult("error");
result.Match(
ifSuccess: (x, _) => Assert.Fail(),
ifFailure: errs => Assert.That(errs, Is.EquivalentTo(new[] {"error"})));
}
>>>>>>>
[Test]
public void ToResultOnSomeShouldSucceed()
{
var opt = FSharpOption<int>.Some(42);
var result = opt.ToResult("error");
result.Match(
ifSuccess: (x, msgs) =>
{
Assert.AreEqual(42, x);
Assert.That(msgs, Is.Empty);
},
ifFailure: errs => Assert.Fail());
}
[Test]
public void ToResultOnNoneShoulFail()
{
var opt = FSharpOption<int>.None;
var result = opt.ToResult("error");
result.Match(
ifSuccess: (x, _) => Assert.Fail(),
ifFailure: errs => Assert.That(errs, Is.EquivalentTo(new[] {"error"})));
}
[Test]
public void MapFailureOnSuccessShouldReturnSuccess()
{
Result<int, string>.Succeed(42, "warn1")
.MapFailure(list => new[] { 42 })
.Match(
ifSuccess: (v, msgs) =>
{
Assert.AreEqual(42, v);
Assert.That(msgs, Is.Empty);
},
ifFailure: errs => Assert.Fail());
}
[Test]
public void MapFailureOnFailureShouldMapOverError()
{
Result<int, string>.FailWith(new[] { "err1", "err2" })
.MapFailure(_ => new[] { 42 })
.Match(
ifSuccess: (v, msgs) => Assert.Fail(),
ifFailure: errs => Assert.That(errs, Is.EquivalentTo(new[] { 42 })));
}
[Test]
public void MapFailureOnFailureShouldMapOverListOfErrors()
{
Result<int, string>.FailWith(new[] { "err1", "err2" })
.MapFailure(errs => errs.Select(err =>
{
switch (err)
{
case "err1": return 42;
case "err2": return 43;
default: return 0;
}
}))
.Match(
ifSuccess: (v, msgs) => Assert.Fail(),
ifFailure: errs => Assert.That(errs, Is.EquivalentTo(new[] { 42, 43 })));
} |
<<<<<<<
_displayTextBuilder.BuildMarkdownSignature(sh);
return sh;
=======
return Task.FromResult(sh);
>>>>>>>
_displayTextBuilder.BuildMarkdownSignature(sh);
return sh;
<<<<<<<
=======
private string MakeHoverText(IEnumerable<AnalysisValue> values, string originalExpression, bool limitLines = true) {
string firstLongDescription = null;
var multiline = false;
var result = new StringBuilder();
var descriptions = new HashSet<string>();
foreach (var v in values) {
if (string.IsNullOrEmpty(firstLongDescription)) {
firstLongDescription = limitLines ? LimitLines(v.Description) : v.Description;
}
var description = LimitLines(v.ShortDescription ?? "");
if (string.IsNullOrEmpty(description)) {
continue;
}
if (descriptions.Add(description)) {
if (descriptions.Count > 1) {
if (result.Length == 0) {
// Nop
} else if (result[result.Length - 1] != '\n') {
result.Append(", ");
} else {
multiline = true;
}
}
result.Append(description);
}
}
if (descriptions.Count == 1 && !string.IsNullOrEmpty(firstLongDescription)) {
result.Clear();
result.Append(firstLongDescription);
}
if (!string.IsNullOrEmpty(originalExpression)) {
if (originalExpression.Length > 4096) {
originalExpression = originalExpression.Substring(0, 4093) + "...";
}
if (multiline) {
result.Insert(0, originalExpression + ": " + Environment.NewLine);
} else if (result.Length > 0) {
result.Insert(0, originalExpression + ": ");
} else {
result.Append(originalExpression);
result.Append(": ");
result.Append("<unknown type>");
}
}
return result.ToString().Trim();
}
internal static string LimitLines(
string str,
int maxLines = 30,
int charsPerLine = 200,
bool ellipsisAtEnd = true,
bool stopAtFirstBlankLine = false
) {
if (string.IsNullOrEmpty(str)) {
return str;
}
var lineCount = 0;
var prettyPrinted = new StringBuilder();
var wasEmpty = true;
using (var reader = new StringReader(str)) {
for (var line = reader.ReadLine(); line != null && lineCount < maxLines; line = reader.ReadLine()) {
if (string.IsNullOrWhiteSpace(line)) {
if (wasEmpty) {
continue;
}
wasEmpty = true;
if (stopAtFirstBlankLine) {
lineCount = maxLines;
break;
}
lineCount += 1;
prettyPrinted.AppendLine();
} else {
wasEmpty = false;
lineCount += (line.Length / charsPerLine) + 1;
prettyPrinted.AppendLine(line);
}
}
}
if (ellipsisAtEnd && lineCount >= maxLines) {
prettyPrinted.AppendLine("...");
}
return prettyPrinted.ToString().Trim();
}
>>>>>>>
private string MakeHoverText(IEnumerable<AnalysisValue> values, string originalExpression, bool limitLines = true) {
string firstLongDescription = null;
var multiline = false;
var result = new StringBuilder();
var descriptions = new HashSet<string>();
foreach (var v in values) {
if (string.IsNullOrEmpty(firstLongDescription)) {
firstLongDescription = limitLines ? LimitLines(v.Description) : v.Description;
}
var description = LimitLines(v.ShortDescription ?? "");
if (string.IsNullOrEmpty(description)) {
continue;
}
if (descriptions.Add(description)) {
if (descriptions.Count > 1) {
if (result.Length == 0) {
// Nop
} else if (result[result.Length - 1] != '\n') {
result.Append(", ");
} else {
multiline = true;
}
}
result.Append(description);
}
}
if (descriptions.Count == 1 && !string.IsNullOrEmpty(firstLongDescription)) {
result.Clear();
result.Append(firstLongDescription);
}
if (!string.IsNullOrEmpty(originalExpression)) {
if (originalExpression.Length > 4096) {
originalExpression = originalExpression.Substring(0, 4093) + "...";
}
if (multiline) {
result.Insert(0, originalExpression + ": " + Environment.NewLine);
} else if (result.Length > 0) {
result.Insert(0, originalExpression + ": ");
} else {
result.Append(originalExpression);
result.Append(": ");
result.Append("<unknown type>");
}
}
return result.ToString().Trim();
}
internal static string LimitLines(
string str,
int maxLines = 30,
int charsPerLine = 200,
bool ellipsisAtEnd = true,
bool stopAtFirstBlankLine = false
) {
if (string.IsNullOrEmpty(str)) {
return str;
}
var lineCount = 0;
var prettyPrinted = new StringBuilder();
var wasEmpty = true;
using (var reader = new StringReader(str)) {
for (var line = reader.ReadLine(); line != null && lineCount < maxLines; line = reader.ReadLine()) {
if (string.IsNullOrWhiteSpace(line)) {
if (wasEmpty) {
continue;
}
wasEmpty = true;
if (stopAtFirstBlankLine) {
lineCount = maxLines;
break;
}
lineCount += 1;
prettyPrinted.AppendLine();
} else {
wasEmpty = false;
lineCount += (line.Length / charsPerLine) + 1;
prettyPrinted.AppendLine(line);
}
}
}
if (ellipsisAtEnd && lineCount >= maxLines) {
prettyPrinted.AppendLine("...");
}
return prettyPrinted.ToString().Trim();
} |
<<<<<<<
public VariableDef GetParameter(string name) {
if (string.IsNullOrEmpty(name)) {
return null;
}
if (name == _seqParameters?.Name) {
return _seqParameters;
} else if (name == _dictParameters?.Name) {
return _dictParameters;
} else if (_parameters.TryGetValue(name, out var vd)) {
return vd;
}
return null;
}
internal void EnsureParameters(FunctionAnalysisUnit unit, bool usePlaceholders) {
var astParams = Function.FunctionDefinition.Parameters;
for (int i = 0; i < astParams.Count; ++i) {
var p = astParams[i];
var name = p?.Name;
if (string.IsNullOrEmpty(name)) {
continue;
}
var node = (Node)astParams[i].NameExpression ?? astParams[i];
if (astParams[i].Kind == ParameterKind.List) {
if (_seqParameters == null) {
_seqParameters = new ListParameterVariableDef(unit, p, name);
AddParameter(unit, name, p, usePlaceholders ? null : _seqParameters);
=======
internal void EnsureParameters(FunctionAnalysisUnit unit) {
var astParams = Function.FunctionDefinition.ParametersInternal;
for (int i = 0; i < astParams.Length; ++i) {
if (!TryGetVariable(astParams[i].Name, out var param)) {
var n = (Node)astParams[i].NameExpression ?? astParams[i];
if (astParams[i].Kind == ParameterKind.List) {
param = _seqParameters = _seqParameters ?? new ListParameterVariableDef(unit, n);
} else if (astParams[i].Kind == ParameterKind.Dictionary) {
param = _dictParameters = _dictParameters ?? new DictParameterVariableDef(unit, n);
} else {
param = new LocatedVariableDef(unit.ProjectEntry, n);
>>>>>>>
public VariableDef GetParameter(string name) {
if (string.IsNullOrEmpty(name)) {
return null;
}
if (name == _seqParameters?.Name) {
return _seqParameters;
} else if (name == _dictParameters?.Name) {
return _dictParameters;
} else if (_parameters.TryGetValue(name, out var vd)) {
return vd;
}
return null;
}
internal void EnsureParameters(FunctionAnalysisUnit unit, bool usePlaceholders) {
var astParams = Function.FunctionDefinition.ParametersInternal;
for (int i = 0; i < astParams.Length; ++i) {
var p = astParams[i];
var name = p?.Name;
if (string.IsNullOrEmpty(name)) {
continue;
}
var node = (Node)astParams[i].NameExpression ?? astParams[i];
if (astParams[i].Kind == ParameterKind.List) {
if (_seqParameters == null) {
_seqParameters = new ListParameterVariableDef(unit, p, name);
AddParameter(unit, name, p, usePlaceholders ? null : _seqParameters);
<<<<<<<
for (int i = 0; i < others.Args.Length && i < astParams.Count; ++i) {
var name = astParams[i].Name;
VariableDef param;
if (name == _seqParameters?.Name) {
param = _seqParameters;
} else if (name == _dictParameters?.Name) {
param = _dictParameters;
} else if (!_parameters.TryGetValue(name, out param)) {
Debug.Fail($"Parameter {name} has no variable in this function");
_parameters[name] = param = new LocatedVariableDef(Function.AnalysisUnit.ProjectEntry, (Node)astParams[i].NameExpression ?? astParams[i]);
=======
for (var i = 0; i < others.Args.Length && i < astParams.Length; ++i) {
if (!TryGetVariable(astParams[i].Name, out var param)) {
Debug.Assert(false, "Parameter " + astParams[i].Name + " has no variable in this scope");
param = AddVariable(astParams[i].Name);
>>>>>>>
for (int i = 0; i < others.Args.Length && i < astParams.Length; ++i) {
var name = astParams[i].Name;
VariableDef param;
if (name == _seqParameters?.Name) {
param = _seqParameters;
} else if (name == _dictParameters?.Name) {
param = _dictParameters;
} else if (!_parameters.TryGetValue(name, out param)) {
Debug.Fail($"Parameter {name} has no variable in this function");
_parameters[name] = param = new LocatedVariableDef(Function.AnalysisUnit.ProjectEntry, (Node)astParams[i].NameExpression ?? astParams[i]); |
<<<<<<<
/// Looks up a localized string similar to Arbitrary Python expressions can only be evaluated on a thread which is stopped in Python code at a breakpoint or after a step-in or a step-over operation. Only expressions involving global and local variables, object field access, and indexing of built-in collection types with literals can be evaluated in the current context..
/// </summary>
public static string DebugArbitraryExpressionOnStoppedThreadOnly {
get {
return ResourceManager.GetString("DebugArbitraryExpressionOnStoppedThreadOnly", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Getting attach information from web site..
=======
/// Looks up a localized string similar to Steps over the next function call..
>>>>>>>
/// Looks up a localized string similar to Steps over the next function call..
<<<<<<<
/// Looks up a localized string similar to [Native to Python Transition].
/// </summary>
public static string DebugCallStackNativeToPythonTransition {
get {
return ResourceManager.GetString("DebugCallStackNativeToPythonTransition", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [Python to Native Transition].
/// </summary>
public static string DebugCallStackPythonToNativeTransition {
get {
return ResourceManager.GetString("DebugCallStackPythonToNativeTransition", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Failed to connect to process {0} ({1}): {2}.
/// </summary>
public static string DebugConnectionFailedToConnectToProcessWithModule {
get {
return ResourceManager.GetString("DebugConnectionFailedToConnectToProcessWithModule", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Failed to connect to process {0}: {1}.
/// </summary>
public static string DebugConnectionFailedToConnectToProcessWithoutModule {
get {
return ResourceManager.GetString("DebugConnectionFailedToConnectToProcessWithoutModule", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Couldn't abort a failed expression evaluation..
/// </summary>
public static string DebugCouldNotAbortFailedExpressionEvaluation {
get {
return ResourceManager.GetString("DebugCouldNotAbortFailedExpressionEvaluation", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {0} raised while evaluating expression: {1}.
/// </summary>
public static string DebugErrorWhileEvaluatingExpression {
get {
return ResourceManager.GetString("DebugErrorWhileEvaluatingExpression", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Evaluation timed out..
/// </summary>
public static string DebugEvaluationTimedOut {
get {
return ResourceManager.GetString("DebugEvaluationTimedOut", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to <exec or eval>.
/// </summary>
public static string DebugExecEvalFunctionName {
get {
return ResourceManager.GetString("DebugExecEvalFunctionName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to <exec/eval>.
/// </summary>
public static string DebugExecEvalModuleName {
get {
return ResourceManager.GetString("DebugExecEvalModuleName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {0} module.
/// </summary>
public static string DebugFileModule {
get {
return ResourceManager.GetString("DebugFileModule", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {0} unknown code.
/// </summary>
public static string DebugFileUnknownCode {
get {
return ResourceManager.GetString("DebugFileUnknownCode", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The project cannot be launched because no Python interpreter is specified. Please check the Python Environments window and ensure the version of Python is installed and has all settings specified..
=======
/// Looks up a localized string similar to Current process changed to {0}.
>>>>>>>
/// Looks up a localized string similar to Current process changed to {0}.
<<<<<<<
/// Looks up a localized string similar to No symbols required.
/// </summary>
public static string DebugModuleNoSymbolsRequired {
get {
return ResourceManager.GetString("DebugModuleNoSymbolsRequired", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Could not obtain a Python frame object for the current frame..
/// </summary>
public static string DebugNoPythonFrameForCurrentFrame {
get {
return ResourceManager.GetString("DebugNoPythonFrameForCurrentFrame", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Only boolean, numeric or string literals and None are supported..
/// </summary>
public static string DebugOnlyBoolNumericStringAndNoneSupported {
get {
return ResourceManager.GetString("DebugOnlyBoolNumericStringAndNoneSupported", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {0}:{1} in {2}.
/// </summary>
public static string DebugPythonExceptionStackTraceFileAndLineNumber {
get {
return ResourceManager.GetString("DebugPythonExceptionStackTraceFileAndLineNumber", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {0} in {1}.
/// </summary>
public static string DebugPythonExceptionStackTraceFileOnly {
get {
return ResourceManager.GetString("DebugPythonExceptionStackTraceFileOnly", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [Python view].
/// </summary>
public static string DebugPythonView {
get {
return ResourceManager.GetString("DebugPythonView", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Python view is unavailable for this object.
/// </summary>
public static string DebugPythonViewNotAvailableForObject {
get {
return ResourceManager.GetString("DebugPythonViewNotAvailableForObject", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Debug.
=======
/// Looks up a localized string similar to {2}Thread id={0}, name={1}.
>>>>>>>
/// Looks up a localized string similar to {2}Thread id={0}, name={1}.
<<<<<<<
/// Looks up a localized string similar to bad char for integer value: {0}.
/// </summary>
public static string InvalidHexValue {
get {
return ResourceManager.GetString("InvalidHexValue", resourceCulture);
}
}
/// <summary>
=======
/// Looks up a localized string similar to Already detached from text view.
/// </summary>
public static string IntellisenseControllerAlreadyDetachedException {
get {
return ResourceManager.GetString("IntellisenseControllerAlreadyDetachedException", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Not attached to specified text view.
/// </summary>
public static string IntellisenseControllerNotAttachedToSpecifiedTextViewException {
get {
return ResourceManager.GetString("IntellisenseControllerNotAttachedToSpecifiedTextViewException", resourceCulture);
}
}
/// <summary>
>>>>>>>
/// Looks up a localized string similar to Already detached from text view.
/// </summary>
public static string IntellisenseControllerAlreadyDetachedException {
get {
return ResourceManager.GetString("IntellisenseControllerAlreadyDetachedException", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Not attached to specified text view.
/// </summary>
public static string IntellisenseControllerNotAttachedToSpecifiedTextViewException {
get {
return ResourceManager.GetString("IntellisenseControllerNotAttachedToSpecifiedTextViewException", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to bad char for integer value: {0}.
/// </summary>
public static string InvalidHexValue {
get {
return ResourceManager.GetString("InvalidHexValue", resourceCulture);
}
}
/// <summary>
<<<<<<<
/// Looks up a localized string similar to Unrecognized value for enum type '{0}'..
/// </summary>
public static string UnrecognizedEnumValue {
get {
return ResourceManager.GetString("UnrecognizedEnumValue", resourceCulture);
}
}
/// <summary>
=======
/// Looks up a localized string similar to Unknown role type: {0}.
/// </summary>
public static string UnknownRoleTypeException {
get {
return ResourceManager.GetString("UnknownRoleTypeException", resourceCulture);
}
}
/// <summary>
>>>>>>>
/// Looks up a localized string similar to Unknown role type: {0}.
/// </summary>
public static string UnknownRoleTypeException {
get {
return ResourceManager.GetString("UnknownRoleTypeException", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Unrecognized value for enum type '{0}'..
/// </summary>
public static string UnrecognizedEnumValue {
get {
return ResourceManager.GetString("UnrecognizedEnumValue", resourceCulture);
}
}
/// <summary> |
<<<<<<<
using System.Text;
using System.Threading;
using System.Threading.Tasks;
=======
>>>>>>>
using System.Text;
using System.Threading;
using System.Threading.Tasks;
<<<<<<<
using NativeMethods = Microsoft.VisualStudioTools.Project.NativeMethods;
using Task = System.Threading.Tasks.Task;
=======
>>>>>>>
using NativeMethods = Microsoft.VisualStudioTools.Project.NativeMethods;
using Task = System.Threading.Tasks.Task;
<<<<<<<
await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
=======
services.AddService(typeof(IPythonToolsOptionsService), PythonToolsOptionsService.CreateService, promote: true);
services.AddService(typeof(IClipboardService), new ClipboardService(), promote: true);
services.AddService(typeof(IPythonToolsToolWindowService), this, promote: true);
services.AddService(typeof(PythonLanguageInfo), (container, serviceType) => new PythonLanguageInfo(container), true);
services.AddService(typeof(IPythonToolsLogger), PythonToolsLogger.CreateService, promote: true);
services.AddService(typeof(PythonToolsService), PythonToolsService.CreateService, promote: true);
services.AddService(typeof(ErrorTaskProvider), ErrorTaskProvider.CreateService, promote: true);
services.AddService(typeof(CommentTaskProvider), CommentTaskProvider.CreateService, promote: true);
>>>>>>>
await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken); |
<<<<<<<
var item = await _ppc.ConsumeAsync();
if (item.CompleteBeforeNext) {
=======
var item = await _ppc.ConsumeAsync();
if (item.IsAwaitable) {
>>>>>>>
var item = await _ppc.ConsumeAsync();
if (item.IsAwaitable) {
<<<<<<<
disposable.Task.Wait(_ppc.CancellationToken);
=======
await disposable.Task;
>>>>>>>
await disposable;
<<<<<<<
public Task DefaultPriorityAsync(CancellationToken cancellationToken = default(CancellationToken)) {
return Enqueue(DefaultPriority, false, cancellationToken);
}
=======
public Task DefaultPriorityAsync(CancellationToken cancellationToken = default(CancellationToken))
=> Enqueue(DefaultPriority, false, cancellationToken);
>>>>>>>
public Task DefaultPriorityAsync(CancellationToken cancellationToken = default(CancellationToken))
=> Enqueue(DefaultPriority, false, cancellationToken);
<<<<<<<
public Task<IDisposable> Task { get; }
public bool CompleteBeforeNext { get; }
=======
public Task<IDisposable> Task => _tcs.Task;
public bool IsAwaitable { get; }
>>>>>>>
public Task<IDisposable> Task => _tcs.Task;
public bool IsAwaitable { get; }
<<<<<<<
Task = _tcs.Task;
CompleteBeforeNext = completeBeforeNext;
=======
IsAwaitable = isAwaitable;
>>>>>>>
IsAwaitable = isAwaitable;
<<<<<<<
=======
public Task Task => _tcs.Task;
>>>>>>> |
<<<<<<<
/// Looks up a localized string similar to File:.
/// </summary>
public static string PythonNavigateToItemDisplay_FileHeader {
get {
return ResourceManager.GetString("PythonNavigateToItemDisplay_FileHeader", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to File: {0}.
/// </summary>
public static string PythonNavigateToItemDisplay_FileInfo {
get {
return ResourceManager.GetString("PythonNavigateToItemDisplay_FileInfo", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Line:.
/// </summary>
public static string PythonNavigateToItemDisplay_LineHeader {
get {
return ResourceManager.GetString("PythonNavigateToItemDisplay_LineHeader", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Project:.
/// </summary>
public static string PythonNavigateToItemDisplay_ProjectHeader {
get {
return ResourceManager.GetString("PythonNavigateToItemDisplay_ProjectHeader", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Project: {0}.
/// </summary>
public static string PythonNavigateToItemDisplay_ProjectInfo {
get {
return ResourceManager.GetString("PythonNavigateToItemDisplay_ProjectInfo", resourceCulture);
}
}
/// <summary>
=======
/// Looks up a localized string similar to Publish.
/// </summary>
public static string PythonPublishPropertyPageLabel {
get {
return ResourceManager.GetString("PythonPublishPropertyPageLabel", resourceCulture);
}
}
/// <summary>
>>>>>>>
/// Looks up a localized string similar to File:.
/// </summary>
public static string PythonNavigateToItemDisplay_FileHeader {
get {
return ResourceManager.GetString("PythonNavigateToItemDisplay_FileHeader", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to File: {0}.
/// </summary>
public static string PythonNavigateToItemDisplay_FileInfo {
get {
return ResourceManager.GetString("PythonNavigateToItemDisplay_FileInfo", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Line:.
/// </summary>
public static string PythonNavigateToItemDisplay_LineHeader {
get {
return ResourceManager.GetString("PythonNavigateToItemDisplay_LineHeader", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Project:.
/// </summary>
public static string PythonNavigateToItemDisplay_ProjectHeader {
get {
return ResourceManager.GetString("PythonNavigateToItemDisplay_ProjectHeader", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Project: {0}.
/// </summary>
public static string PythonNavigateToItemDisplay_ProjectInfo {
get {
return ResourceManager.GetString("PythonNavigateToItemDisplay_ProjectInfo", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Publish.
/// </summary>
public static string PythonPublishPropertyPageLabel {
get {
return ResourceManager.GetString("PythonPublishPropertyPageLabel", resourceCulture);
}
}
/// <summary> |
<<<<<<<
/// Looks up a localized string similar to Execute File in P&ython Interactive.
/// </summary>
public static string ExecuteInReplCommand_ExecuteFile {
get {
return ResourceManager.GetString("ExecuteInReplCommand_ExecuteFile", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Execute Project in P&ython Interactive.
/// </summary>
public static string ExecuteInReplCommand_ExecuteProject {
get {
return ResourceManager.GetString("ExecuteInReplCommand_ExecuteProject", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Running {0}.
/// </summary>
public static string ExecuteInReplCommand_RunningMessage {
get {
return ResourceManager.GetString("ExecuteInReplCommand_RunningMessage", resourceCulture);
}
}
/// <summary>
=======
/// Looks up a localized string similar to Cannot open file.
/// </summary>
public static string ErrorTaskItemZipArchiveNotSupportedCaption {
get {
return ResourceManager.GetString("ErrorTaskItemZipArchiveNotSupportedCaption", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Opening source files contained in .zip archives is not supported.
/// </summary>
public static string ErrorTaskItemZipArchiveNotSupportedMessage {
get {
return ResourceManager.GetString("ErrorTaskItemZipArchiveNotSupportedMessage", resourceCulture);
}
}
/// <summary>
>>>>>>>
/// Looks up a localized string similar to Cannot open file.
/// </summary>
public static string ErrorTaskItemZipArchiveNotSupportedCaption {
get {
return ResourceManager.GetString("ErrorTaskItemZipArchiveNotSupportedCaption", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Opening source files contained in .zip archives is not supported.
/// </summary>
public static string ErrorTaskItemZipArchiveNotSupportedMessage {
get {
return ResourceManager.GetString("ErrorTaskItemZipArchiveNotSupportedMessage", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Execute File in P&ython Interactive.
/// </summary>
public static string ExecuteInReplCommand_ExecuteFile {
get {
return ResourceManager.GetString("ExecuteInReplCommand_ExecuteFile", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Execute Project in P&ython Interactive.
/// </summary>
public static string ExecuteInReplCommand_ExecuteProject {
get {
return ResourceManager.GetString("ExecuteInReplCommand_ExecuteProject", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Running {0}.
/// </summary>
public static string ExecuteInReplCommand_RunningMessage {
get {
return ResourceManager.GetString("ExecuteInReplCommand_RunningMessage", resourceCulture);
}
}
/// <summary> |
<<<<<<<
=======
private readonly int _cmdId;
private readonly InterpreterConfiguration _config;
>>>>>>>
<<<<<<<
=======
_config = config;
>>>>>>>
<<<<<<<
// Use the factory or command line passed as an argument.
IPythonInterpreterFactory factory = null;
=======
// _factory is never null, but if a specific factory or command line
// is passed as an argument, use that instead.
var config = _config;
>>>>>>>
// Use the factory or command line passed as an argument.
IPythonInterpreterFactory factory = null;
<<<<<<<
if ((factory = oe.InValue as IPythonInterpreterFactory) == null &&
!string.IsNullOrEmpty(args = oe.InValue as string)
) {
=======
if ((asFactory = oe.InValue as IPythonInterpreterFactory) != null) {
config = asFactory.Configuration;
} else if (!string.IsNullOrEmpty(args = oe.InValue as string)) {
>>>>>>>
if ((asFactory = oe.InValue as IPythonInterpreterFactory) != null) {
config = asFactory.Configuration;
} else if (!string.IsNullOrEmpty(args = oe.InValue as string)) {
<<<<<<<
var service = _serviceProvider.GetComponentModel().GetService<IInterpreterOptionsService>();
factory = service.Interpreters.FirstOrDefault(
=======
var service = _serviceProvider.GetComponentModel().GetService<IInterpreterRegistryService>();
var matchingConfig = service.Configurations.FirstOrDefault(
>>>>>>>
var service = _serviceProvider.GetComponentModel().GetService<IInterpreterRegistryService>();
var matchingConfig = service.Configurations.FirstOrDefault(
<<<<<<<
=======
if (matchingConfig != null) {
config = matchingConfig;
}
>>>>>>>
if (matchingConfig != null) {
config = matchingConfig;
}
<<<<<<<
if (factory == null) {
var service = _serviceProvider.GetComponentModel().GetService<IInterpreterOptionsService>();
factory = service.DefaultInterpreter;
}
=======
// These commands are project-insensitive, so pass null for project.
ExecuteInReplCommand.EnsureReplWindow(_serviceProvider, config, null).Show(true);
}
>>>>>>>
if (factory == null) {
var service = _serviceProvider.GetComponentModel().GetService<IInterpreterOptionsService>();
factory = service.DefaultInterpreter;
} |
<<<<<<<
private readonly PythonInteractiveOptions _interactiveOptions;
internal readonly Dictionary<IPythonInterpreterFactory, InterpreterOptions> _interpreterOptions = new Dictionary<IPythonInterpreterFactory, InterpreterOptions>();
private readonly SuppressDialogOptions _suppressDialogOptions;
=======
internal readonly Dictionary<string, PythonInteractiveOptions> _interactiveOptions = new Dictionary<string, PythonInteractiveOptions>();
internal readonly Dictionary<string, InterpreterOptions> _interpreterOptions = new Dictionary<string, InterpreterOptions>();
>>>>>>>
private readonly PythonInteractiveOptions _interactiveOptions;
internal readonly Dictionary<IPythonInterpreterFactory, InterpreterOptions> _interpreterOptions = new Dictionary<IPythonInterpreterFactory, InterpreterOptions>();
private readonly SuppressDialogOptions _suppressDialogOptions;
<<<<<<<
_suppressDialogOptions = new SuppressDialogOptions(this);
_globalInterpreterOptions = new GlobalInterpreterOptions(this, _interpreterOptionsService);
=======
_globalInterpreterOptions = new GlobalInterpreterOptions(this, _interpreterOptionsService, _interpreterRegistry);
>>>>>>>
_suppressDialogOptions = new SuppressDialogOptions(this);
_globalInterpreterOptions = new GlobalInterpreterOptions(this, _interpreterOptionsService, _interpreterRegistry);
<<<<<<<
_interactiveOptions = new PythonInteractiveOptions(this, "Interactive");
_interactiveOptions.Load();
_debugInteractiveOptions = new PythonInteractiveOptions(this, "Debug Interactive Window");
_debuggerOptions.Load();
=======
_debugInteractiveOptions = new PythonInteractiveCommonOptions(this, "Debug Interactive Window", "");
_factoryProviders = ComponentModel.DefaultExportProvider.GetExports<IPythonInterpreterFactoryProvider, Dictionary<string, object>>();
>>>>>>>
_interactiveOptions = new PythonInteractiveOptions(this, "Interactive");
_interactiveOptions.Load();
_debugInteractiveOptions = new PythonInteractiveOptions(this, "Debug Interactive Window");
_debuggerOptions.Load();
_factoryProviders = ComponentModel.DefaultExportProvider.GetExports<IPythonInterpreterFactoryProvider, Dictionary<string, object>>();
<<<<<<<
var configurable = _interpreterOptionsService.KnownProviders.OfType<ConfigurablePythonInterpreterFactoryProvider>().FirstOrDefault();
Debug.Assert(configurable != null);
if (configurable != null) {
// Remove any items
foreach (var option in InterpreterOptions.Select(kv => kv.Value).Where(o => o.Removed).ToList()) {
configurable.RemoveInterpreter(option.Id);
RemoveInterpreterOptions(option.Factory);
}
=======
_interpreterOptionsService.DefaultInterpreterId = GlobalInterpreterOptions.DefaultInterpreter;
// Remove any items
foreach (var option in InterpreterOptions.Select(kv => kv.Value).Where(o => o.Removed).ToList()) {
_interpreterOptionsService.RemoveConfigurableInterpreter(option._config.Id);
RemoveInteractiveOptions(option._config.Id);
RemoveInterpreterOptions(option._config.Id);
}
>>>>>>>
_interpreterOptionsService.DefaultInterpreterId = GlobalInterpreterOptions.DefaultInterpreter;
// Remove any items
foreach (var option in InterpreterOptions.Select(kv => kv.Value).Where(o => o.Removed).ToList()) {
_interpreterOptionsService.RemoveConfigurableInterpreter(option._config.Id);
RemoveInteractiveOptions(option._config.Id);
RemoveInterpreterOptions(option._config.Id);
}
<<<<<<<
if (option.IsConfigurable) {
// save configurable interpreter options
var actualFactory = configurable.SetOptions(
new InterpreterFactoryCreationOptions {
Id = option.Id,
InterpreterPath = option.InterpreterPath ?? "",
WindowInterpreterPath = option.WindowsInterpreterPath ?? "",
LibraryPath = option.LibraryPath ?? "",
PathEnvironmentVariableName = option.PathEnvironmentVariable ?? "",
ArchitectureString = option.Architecture ?? "x86",
LanguageVersionString = option.Version ?? "2.7",
Description = option.Display,
}
);
=======
if (option.IsConfigurable) {
ProcessorArchitecture arch = ProcessorArchitecture.X86;
switch (option.Architecture) {
case "x86": arch = ProcessorArchitecture.X86; break;
case "x64": arch = ProcessorArchitecture.Amd64; break;
}
// save configurable interpreter options
var actualFactory = _interpreterOptionsService.AddConfigurableInterpreter(
option.Description,
new InterpreterConfiguration(
option.Id,
option.Description,
!String.IsNullOrWhiteSpace(option.LibraryPath) ? Path.GetDirectoryName(option.LibraryPath) : "",
option.InterpreterPath ?? "",
option.WindowsInterpreterPath ?? "",
option.LibraryPath ?? "",
option.PathEnvironmentVariable ?? "",
arch,
Version.Parse(option.Version) ?? new Version(2, 7)
)
);
if (option.InteractiveOptions != null) {
option.InteractiveOptions._id = actualFactory;
option.InteractiveOptions.Save(actualFactory);
>>>>>>>
if (option.IsConfigurable) {
ProcessorArchitecture arch = ProcessorArchitecture.X86;
switch (option.Architecture) {
case "x86": arch = ProcessorArchitecture.X86; break;
case "x64": arch = ProcessorArchitecture.Amd64; break;
}
// save configurable interpreter options
var actualFactory = _interpreterOptionsService.AddConfigurableInterpreter(
option.Description,
new InterpreterConfiguration(
option.Id,
option.Description,
!String.IsNullOrWhiteSpace(option.LibraryPath) ? Path.GetDirectoryName(option.LibraryPath) : "",
option.InterpreterPath ?? "",
option.WindowsInterpreterPath ?? "",
option.LibraryPath ?? "",
option.PathEnvironmentVariable ?? "",
arch,
Version.Parse(option.Version) ?? new Version(2, 7)
)
<<<<<<<
internal InterpreterOptions GetInterpreterOptions(IPythonInterpreterFactory interpreterFactory) {
InterpreterOptions options;
if (!_interpreterOptions.TryGetValue(interpreterFactory, out options)) {
var path = GetOptionsPath(interpreterFactory);
_interpreterOptions[interpreterFactory] = options = new InterpreterOptions(this, interpreterFactory);
=======
internal InterpreterOptions GetInterpreterOptions(string id) {
InterpreterOptions options;
if (!_interpreterOptions.TryGetValue(id, out options)) {
_interpreterOptions[id] = options = new InterpreterOptions(this, _interpreterRegistry.FindConfiguration(id));
>>>>>>>
internal InterpreterOptions GetInterpreterOptions(string id) {
InterpreterOptions options;
if (!_interpreterOptions.TryGetValue(id, out options)) {
_interpreterOptions[id] = options = new InterpreterOptions(this, _interpreterRegistry.FindConfiguration(id));
<<<<<<<
internal void AddInterpreterOptions(IPythonInterpreterFactory interpreterFactory, InterpreterOptions options) {
_interpreterOptions[interpreterFactory] = options;
=======
internal void AddInterpreterOptions(string id, InterpreterOptions options, bool addInteractive = false) {
_interpreterOptions[id] = options;
if (addInteractive) {
_interactiveOptions[id] = options.InteractiveOptions;
}
>>>>>>>
internal void AddInterpreterOptions(IPythonInterpreterFactory interpreterFactory, InterpreterOptions options) {
_interpreterOptions[interpreterFactory] = options;
<<<<<<<
internal PythonInteractiveOptions InteractiveOptions => _interactiveOptions;
=======
internal PythonInteractiveOptions GetInteractiveOptions(InterpreterConfiguration config) {
PythonInteractiveOptions options;
if (!_interactiveOptions.TryGetValue(config.Id, out options)) {
var path = config.Id;
_interactiveOptions[config.Id] = options = new PythonInteractiveOptions(_container, this, "Interactive Windows", path);
options.Load();
}
return options;
}
internal IEnumerable<KeyValuePair<string, PythonInteractiveOptions>> InteractiveOptions {
get {
return _interactiveOptions;
}
}
internal void AddInteractiveOptions(string id , PythonInteractiveOptions options) {
_interactiveOptions[id] = options;
}
internal void RemoveInteractiveOptions(string id) {
_interactiveOptions.Remove(id);
}
internal void ClearInteractiveOptions() {
_interactiveOptions.Clear();
}
>>>>>>>
internal PythonInteractiveOptions InteractiveOptions => _interactiveOptions;
<<<<<<<
internal static string GetOptionsPath(IPythonInterpreterFactory interpreterFactory) {
return interpreterFactory.Id.ToString("B") + "\\" + interpreterFactory.Configuration.Version + "\\";
=======
internal static string GetInteractivePath(InterpreterConfiguration config) {
return config.Id;
>>>>>>>
internal static string GetInteractivePath(InterpreterConfiguration config) {
return config.Id; |
<<<<<<<
State = post.GetState(isDraft),
=======
EnableComments = post.EnableComments,
CloseCommentsAfterDays = post.CloseCommentsAfterDays,
State = GetState(post, isDraft),
>>>>>>>
EnableComments = post.EnableComments,
CloseCommentsAfterDays = post.CloseCommentsAfterDays,
State = post.GetState(isDraft), |
<<<<<<<
public RepositoryHooks<Alias> Alias { get; } = new RepositoryHooks<Alias>();
=======
public ServiceHooks<Alias> Alias { get; private set; } = new ServiceHooks<Alias>();
/// <summary>
/// Gets the hooks available for comments.
/// </summary>
public ValidationServiceHooks<Comment> Comments { get; private set; } = new ValidationServiceHooks<Comment>();
>>>>>>>
public ServiceHooks<Alias> Alias { get; } = new ServiceHooks<Alias>();
/// <summary>
/// Gets the hooks available for comments.
/// </summary>
public ValidationServiceHooks<Comment> Comments { get; } = new ValidationServiceHooks<Comment>();
<<<<<<<
public RepositoryHooks<Media> Media { get; } = new RepositoryHooks<Media>();
=======
public ServiceHooks<Media> Media { get; private set; } = new ServiceHooks<Media>();
>>>>>>>
public ServiceHooks<Media> Media { get; } = new ServiceHooks<Media>();
<<<<<<<
public RepositoryHooks<MediaFolder> MediaFolder { get; } = new RepositoryHooks<MediaFolder>();
=======
public ServiceHooks<MediaFolder> MediaFolder { get; private set; } = new ServiceHooks<MediaFolder>();
>>>>>>>
public ServiceHooks<MediaFolder> MediaFolder { get; } = new ServiceHooks<MediaFolder>();
<<<<<<<
public RepositoryHooks<PageBase> Pages { get; } = new RepositoryHooks<PageBase>();
=======
public ServiceHooks<PageBase> Pages { get; private set; } = new ServiceHooks<PageBase>();
>>>>>>>
public ServiceHooks<PageBase> Pages { get; } = new ServiceHooks<PageBase>();
<<<<<<<
public RepositoryHooks<Param> Param { get; } = new RepositoryHooks<Param>();
=======
public ServiceHooks<Param> Param { get; private set; } = new ServiceHooks<Param>();
>>>>>>>
public ServiceHooks<Param> Param { get; } = new ServiceHooks<Param>(); |
<<<<<<<
[Serializable]
public abstract class PostBase : RoutedContent, IBlockModel, IMeta
=======
public abstract class PostBase : RoutedContent, IBlockModel, IMeta, ICommentModel
>>>>>>>
[Serializable]
public abstract class PostBase : RoutedContent, IBlockModel, IMeta, ICommentModel |
<<<<<<<
[Route("folder/delete/{id:Guid}")]
public async Task<IActionResult> DeleteFolder(Guid id)
{
try
{
var folderId = await _service.DeleteFolder(id);
var result = await _service.GetList(folderId);
result.Status = new StatusMessage
{
Type = StatusMessage.Success,
Body = $"The folder was successfully deleted"
};
return Ok(result);
}
catch (ValidationException e)
{
var result = new MediaListModel();
result.Status = new StatusMessage
{
Type = StatusMessage.Error,
Body = e.Message
};
return BadRequest(result);
}
}
=======
/// <summary>
/// Adds a new media upload.
/// </summary>
/// <param name="model">The upload model</param>
[HttpPost]
[Route("upload")]
[Consumes("multipart/form-data")]
public async Task<IActionResult> Upload([FromForm] MediaUploadModel model)
{
// Allow for dropzone uploads
if (!model.Uploads.Any())
{
model.Uploads = HttpContext.Request.Form.Files;
}
try
{
var uploaded = await _service.SaveMedia(model);
if (uploaded == model.Uploads.Count())
{
return Ok(new StatusMessage
{
Type = StatusMessage.Success,
Body = $"Uploaded all media assets"
});
}
else if (uploaded == 0)
{
return Ok(new StatusMessage
{
Type = StatusMessage.Error,
Body = $"Could not upload the media assets."
});
}
else
{
return Ok(new StatusMessage
{
Type = StatusMessage.Information,
Body = $"Uploaded {uploaded} of {model.Uploads.Count()} media assets."
});
}
}
catch (Exception e)
{
return BadRequest(new StatusMessage
{
Type = StatusMessage.Error,
Body = e.Message
});
}
}
>>>>>>>
[Route("folder/delete/{id:Guid}")]
public async Task<IActionResult> DeleteFolder(Guid id)
{
try
{
var folderId = await _service.DeleteFolder(id);
var result = await _service.GetList(folderId);
result.Status = new StatusMessage
{
Type = StatusMessage.Success,
Body = $"The folder was successfully deleted"
};
return Ok(result);
}
catch (ValidationException e)
{
var result = new MediaListModel();
result.Status = new StatusMessage
{
Type = StatusMessage.Error,
Body = e.Message
};
return BadRequest(result);
}
}
/// <summary>
/// Adds a new media upload.
/// </summary>
/// <param name="model">The upload model</param>
[HttpPost]
[Route("upload")]
[Consumes("multipart/form-data")]
public async Task<IActionResult> Upload([FromForm] MediaUploadModel model)
{
// Allow for dropzone uploads
if (!model.Uploads.Any())
{
model.Uploads = HttpContext.Request.Form.Files;
}
try
{
var uploaded = await _service.SaveMedia(model);
if (uploaded == model.Uploads.Count())
{
return Ok(new StatusMessage
{
Type = StatusMessage.Success,
Body = $"Uploaded all media assets"
});
}
else if (uploaded == 0)
{
return Ok(new StatusMessage
{
Type = StatusMessage.Error,
Body = $"Could not upload the media assets."
});
}
else
{
return Ok(new StatusMessage
{
Type = StatusMessage.Information,
Body = $"Uploaded {uploaded} of {model.Uploads.Count()} media assets."
});
}
}
catch (Exception e)
{
return BadRequest(new StatusMessage
{
Type = StatusMessage.Error,
Body = e.Message
});
}
} |
<<<<<<<
using Microsoft.Extensions.Hosting;
=======
>>>>>>>
using Microsoft.Extensions.Hosting;
<<<<<<<
app.UseRouting();
app.UseEndpoints(endpoints =>
=======
app.UsePiranhaSummernote();
//app.UsePiranhaTinyMCE();
app.UseMvc(routes =>
>>>>>>>
app.UsePiranhaSummernote();
app.UseRouting();
app.UseEndpoints(endpoints => |
<<<<<<<
InitPokemons();
InitPokemonMoves();
InitPokemonEvolutions();
InitPlayerCharacter();
=======
InitPokemonItems();
>>>>>>>
InitPokemons();
InitPokemonMoves();
InitPokemonEvolutions();
InitPokemonItems();
InitPlayerCharacter(); |
<<<<<<<
//picture.texture = null; //player sprites not yet implemented.
string playerMoney = string.Empty;
char[] playerMoneyChars = SaveData.currentSave.playerMoney.ToString().ToCharArray();
=======
if(SaveData.currentSave.playerOutfit != "custom") {
picture.texture = Resources.Load<Texture>("PlayerSprites/" + SaveData.currentSave.getPlayerSpritePrefix() + "front");
} else {
picture.texture = null; //custom sprites not implemented
}
string playerMoney = "" + SaveData.currentSave.playerMoney;
char[] playerMoneyChars = playerMoney.ToCharArray();
playerMoney = "";
>>>>>>>
if(SaveData.currentSave.playerOutfit != "custom") {
picture.texture = Resources.Load<Texture>("PlayerSprites/" + SaveData.currentSave.getPlayerSpritePrefix() + "front");
} else {
picture.texture = null; //custom sprites not implemented
}
//picture.texture = null; //player sprites not yet implemented.
string playerMoney = string.Empty;
char[] playerMoneyChars = SaveData.currentSave.playerMoney.ToString().ToCharArray();
<<<<<<<
pokedexData.text = SaveData.currentSave.pokedexCaught + "/" + SaveData.currentSave.pokedexSeen;//"0"; //pokedex not yet implemented.
=======
pokedexData.text = SaveData.currentSave.pokeDex.ToString(); //pokedex not yet implemented.
>>>>>>>
pokedexData.text = SaveData.currentSave.pokedexCaught + "/" + SaveData.currentSave.pokedexSeen;//"0"; //pokedex not yet implemented. |
<<<<<<<
=======
public enum EncounterTypes
{
Pal_Park, Egg, Hatched, Special_Event, //= 0x0
Tall_Grass, //= 0x2
Plot_Event, //Dialga/Palkia In-Game Event, //= 0x4
Cave, Hall_of_Origin, //= 0x5
Surfing, Fishing, //= 0x7
Building, //= 0x9
Great_Marsh, //(Safari Zone) //= 0xA
Starter, Fossil, Gift //(Eevee) //= 0xC
}
public enum Weather
{
NONE,
RAINDANCE,
HEAVYRAIN,
SUNNYDAY,
HARSHSUN,
SANDSTORM,
STRONGWINDS,
HAIL
}
/// <summary>
/// Terrain Tags or Tiles a player can be stepping on;
/// used to contruct map floor plane
/// </summary>
public enum Terrain
{
Grass,
Sand,
Rock,
DeepWater,
StillWater,
Water,
TallGrass,
SootGrass,
Puddle
}
public enum Environment
{
None,
/// <summary>
/// Normal Grass, and Sooty Tall Grass, are both grass but different colors
/// </summary>
Grass,
Cave,
Sand,
Rock,
MovingWater,
StillWater,
Underwater,
/// <summary>
/// Tall Grass
/// </summary>
TallGrass,
Forest,
Snow,
Volcano,
Graveyard,
Sky,
Space
}
>>>>>>> |
<<<<<<<
//public static UnityEngine.SceneManagement.Scene SceneLoaded = SceneManager.GetActiveScene();
public enum Language
{
/// <summary>
/// US English
/// </summary>
English = 9
}
=======
>>>>>>>
//public static UnityEngine.SceneManagement.Scene SceneLoaded = SceneManager.GetActiveScene();
public enum Language
{
/// <summary>
/// US English
/// </summary>
English = 9
}
<<<<<<<
void CheckSceneLoaded(UnityEngine.SceneManagement.Scene scene, UnityEngine.SceneManagement.LoadSceneMode mode) {
Debug.Log(scene.name + " : " + mode.ToString());
}
private void OnDestroy()
{
SceneManager.sceneLoaded -= CheckSceneLoaded;
}
=======
void OnDestroy()
{
SceneManager.sceneLoaded -= CheckLevelLoaded;
}
>>>>>>>
void CheckSceneLoaded(UnityEngine.SceneManagement.Scene scene, UnityEngine.SceneManagement.LoadSceneMode mode) {
Debug.Log(scene.name + " : " + mode.ToString());
}
private void OnDestroy()
{
SceneManager.sceneLoaded -= CheckSceneLoaded;
}
<<<<<<<
SceneManager.sceneLoaded += CheckSceneLoaded;
=======
SceneManager.sceneLoaded += CheckLevelLoaded;
>>>>>>>
SceneManager.sceneLoaded += CheckSceneLoaded;
<<<<<<<
SaveData.currentSave.playerName = "Gold";
SaveData.currentSave.playerID = 29482;
SaveData.currentSave.isMale = true;
SaveData.currentSave.playerLanguage = Language.English;
=======
//EnableDebugMode();
SaveData.currentSave.playerName = name;
SaveData.currentSave.playerID = 29482; //not implemented
SaveData.currentSave.isMale = isMale;
SaveData.currentSave.playerMoney = 2481;
>>>>>>>
//EnableDebugMode();
SaveData.currentSave.playerName = name;
SaveData.currentSave.playerID = 29482; //not implemented
SaveData.currentSave.isMale = isMale;
SaveData.currentSave.playerMoney = 2481;
SaveData.currentSave.playerName = "Gold";
SaveData.currentSave.playerLanguage = Language.English;
<<<<<<<
SaveData.currentSave.playerName,
=======
name,
>>>>>>>
name,
<<<<<<<
SaveData.currentSave.fileCreationDate = new System.DateTime(System.DateTime.Now.Year, 2, 14); //"Feb. 14th, 2015";
SaveData.currentSave.playerMoney = 2481;
SaveData.currentSave.playerScore = SaveData.currentSave.pokedexCaught + "/" + SaveData.currentSave.pokedexSeen;// PokemonDatabase.LoadPokedex().Length;//481;
=======
SaveData.currentSave.playerScore = 481;
SaveData.currentSave.pokeDex = 0;
>>>>>>>
SaveData.currentSave.fileCreationDate = new System.DateTime(System.DateTime.Now.Year, 2, 14); //"Feb. 14th, 2015";
SaveData.currentSave.playerMoney = 2481;
SaveData.currentSave.playerScore = SaveData.currentSave.pokedexCaught + "/" + SaveData.currentSave.pokedexSeen;// PokemonDatabase.LoadPokedex().Length;//481;
SaveData.currentSave.playerScore = 481;
SaveData.currentSave.pokeDex = 0;
<<<<<<<
new System.DateTime(System.DateTime.Now.Year, 4, 27) /*"Apr. 27th, 2015"*/, new System.DateTime(System.DateTime.Now.Year, 4, 30) /*"Apr. 30th, 2015"*/, null, null, null, new System.DateTime(System.DateTime.Now.Year, 5,1) /*"May. 1st, 2015"*/,
=======
"Apr. 27th, 2017", "Apr. 30th, 2017", null, null, null, date,
>>>>>>>
new System.DateTime(System.DateTime.Now.Year, 4, 27) /*"Apr. 27th, 2015"*/, new System.DateTime(System.DateTime.Now.Year, 4, 30) /*"Apr. 30th, 2015"*/, null, null, null, new System.DateTime(System.DateTime.Now.Year, 5,1) /*"May. 1st, 2015"*/, |
<<<<<<<
using System.Text.RegularExpressions;
=======
using UnityEditor.AddressableAssets.Settings.GroupSchemas;
>>>>>>>
using System.Text.RegularExpressions;
using UnityEditor.AddressableAssets.Settings.GroupSchemas;
<<<<<<<
// The regex to apply to the path. If Simplified is ticked, it a pattern that matches any path, capturing the path, filename and extension.
// If the mode is Wildcard, the pattern will match and capture the entire path string.
string pathRegex =
rule.simplified
? @"(?<path>.*[/\\])+(?<filename>.+?)(?<extension>\.[^.]*$|$)"
: (rule.matchType == AddressableImportRuleMatchType.Wildcard
? @"(.*)"
: rule.path);
// The replacement string passed into Regex.Replace. If Simplified is ticked, it's the filename, without the extension.
// If the mode is Wildcard, it's the entire path, i.e. the first capture group.
string addressReplacement =
rule.simplified
? @"${filename}"
: (rule.matchType == AddressableImportRuleMatchType.Wildcard
? @"$1"
: rule.addressReplacement);
var entry = CreateOrUpdateAddressableAssetEntry(settings, path, rule.groupName, rule.labels, pathRegex, addressReplacement);
=======
var entry = CreateOrUpdateAddressableAssetEntry(settings, path, rule, importSettings);
>>>>>>>
var entry = CreateOrUpdateAddressableAssetEntry(settings, importSettings, rule, path);
<<<<<<<
if (!string.IsNullOrEmpty(pathRegex) && !string.IsNullOrEmpty(addressReplacement))
entry.address = Regex.Replace(path, pathRegex, addressReplacement);
else
entry.address = path;
=======
if (rule.simplified)
path = Path.GetFileNameWithoutExtension(path);
entry.address = path;
>>>>>>>
if (!string.IsNullOrEmpty(pathRegex) && !string.IsNullOrEmpty(addressReplacement))
entry.address = Regex.Replace(path, pathRegex, addressReplacement);
else
entry.address = path;
<<<<<<<
}
=======
/// <summary>
/// Attempts to get the group using the provided <paramref name="groupName"/>.
/// </summary>
/// <param name="settings">Reference to the <see cref="AddressableAssetSettings"/></param>
/// <param name="groupName">The name of the group for the search.</param>
/// <param name="group">The <see cref="AddressableAssetGroup"/> if found. Set to <see cref="null"/> if not found.</param>
/// <returns>True if a group is found.</returns>
static bool TryGetGroup(AddressableAssetSettings settings, string groupName, out AddressableAssetGroup group)
{
if (string.IsNullOrWhiteSpace(groupName))
{
group = settings.DefaultGroup;
return true;
}
return ((group = settings.groups.Find(g => string.Equals(g.Name, groupName.Trim()))) == null) ? false : true;
}
}
>>>>>>>
/// <summary>
/// Attempts to get the group using the provided <paramref name="groupName"/>.
/// </summary>
/// <param name="settings">Reference to the <see cref="AddressableAssetSettings"/></param>
/// <param name="groupName">The name of the group for the search.</param>
/// <param name="group">The <see cref="AddressableAssetGroup"/> if found. Set to <see cref="null"/> if not found.</param>
/// <returns>True if a group is found.</returns>
static bool TryGetGroup(AddressableAssetSettings settings, string groupName, out AddressableAssetGroup group)
{
if (string.IsNullOrWhiteSpace(groupName))
{
group = settings.DefaultGroup;
return true;
}
return ((group = settings.groups.Find(g => string.Equals(g.Name, groupName.Trim()))) == null) ? false : true;
}
} |
<<<<<<<
this.userConfigManager = userConfigManager;
Thumbnail = ThumbnailHelper.GetThumbnail(img, userConfigManager.Config.ThumbnailSize);
ImageFormat imageFormat;
ScannedImageHelper.GetSmallestBitmap(img, bitDepth, highQuality, out baseImage, out baseImageEncoded, out imageFormat);
=======
Thumbnail = ThumbnailHelper.GetThumbnail(img);
ScannedImageHelper.GetSmallestBitmap(img, bitDepth, highQuality, out baseImage, out baseImageEncoded, out baseImageFileFormat);
>>>>>>>
this.userConfigManager = userConfigManager;
Thumbnail = ThumbnailHelper.GetThumbnail(img, userConfigManager.Config.ThumbnailSize);
ScannedImageHelper.GetSmallestBitmap(img, bitDepth, highQuality, out baseImage, out baseImageEncoded, out baseImageFileFormat); |
<<<<<<<
private bool isControlKeyDown;
public FDesktop(IEmailer emailer, ImageSaver imageSaver, StringWrapper stringWrapper, AppConfigManager appConfigManager, IErrorOutput errorOutput, IScannedImageFactory scannedImageFactory, RecoveryManager recoveryManager, IScannedImageImporter scannedImageImporter, AutoUpdaterUI autoUpdaterUI, OcrDependencyManager ocrDependencyManager, IProfileManager profileManager, IScanPerformer scanPerformer, IImagePrinter imagePrinter, ChangeTracker changeTracker)
=======
public FDesktop(IEmailer emailer, ImageSaver imageSaver, StringWrapper stringWrapper, AppConfigManager appConfigManager, IErrorOutput errorOutput, IScannedImageFactory scannedImageFactory, RecoveryManager recoveryManager, IScannedImageImporter scannedImageImporter, AutoUpdaterUI autoUpdaterUI, OcrDependencyManager ocrDependencyManager, IProfileManager profileManager, IScanPerformer scanPerformer, IImagePrinter imagePrinter, ChangeTracker changeTracker, EmailSettingsContainer emailSettingsContainer)
>>>>>>>
private bool isControlKeyDown;
public FDesktop(IEmailer emailer, ImageSaver imageSaver, StringWrapper stringWrapper, AppConfigManager appConfigManager, IErrorOutput errorOutput, IScannedImageFactory scannedImageFactory, RecoveryManager recoveryManager, IScannedImageImporter scannedImageImporter, AutoUpdaterUI autoUpdaterUI, OcrDependencyManager ocrDependencyManager, IProfileManager profileManager, IScanPerformer scanPerformer, IImagePrinter imagePrinter, ChangeTracker changeTracker)
<<<<<<<
private void thumbnailList1_MouseWheel(object sender, MouseEventArgs e)
{
if (isControlKeyDown)
{
double step = e.Delta / (double)SystemInformation.MouseWheelScrollDelta;
int thumbnailSize = UserConfigManager.Config.ThumbnailSize;
thumbnailSize += (int)(32 * step);
thumbnailSize = Math.Max(Math.Min(thumbnailSize, 256), 64);
UserConfigManager.Config.ThumbnailSize = thumbnailSize;
UserConfigManager.Save();
thumbnailList1.ThumbnailSize = new Size(thumbnailSize, thumbnailSize);
//foreach (var image in imageList.Images)
//{
// image.UpdateThumbnail();
//}
UpdateThumbnails(SelectedIndices.ToList());
}
}
=======
private void tsPDFSettings_Click(object sender, EventArgs e)
{
FormFactory.Create<FPdfSettings>().ShowDialog();
}
private void tsPdfSettings2_Click(object sender, EventArgs e)
{
FormFactory.Create<FPdfSettings>().ShowDialog();
}
private void tsEmailSettings_Click(object sender, EventArgs e)
{
FormFactory.Create<FEmailSettings>().ShowDialog();
}
>>>>>>>
private void tsPDFSettings_Click(object sender, EventArgs e)
{
FormFactory.Create<FPdfSettings>().ShowDialog();
}
private void tsPdfSettings2_Click(object sender, EventArgs e)
{
FormFactory.Create<FPdfSettings>().ShowDialog();
}
private void tsEmailSettings_Click(object sender, EventArgs e)
{
FormFactory.Create<FEmailSettings>().ShowDialog();
}
private void thumbnailList1_MouseWheel(object sender, MouseEventArgs e)
{
if (isControlKeyDown)
{
double step = e.Delta / (double)SystemInformation.MouseWheelScrollDelta;
int thumbnailSize = UserConfigManager.Config.ThumbnailSize;
thumbnailSize += (int)(32 * step);
thumbnailSize = Math.Max(Math.Min(thumbnailSize, 256), 64);
UserConfigManager.Config.ThumbnailSize = thumbnailSize;
UserConfigManager.Save();
thumbnailList1.ThumbnailSize = new Size(thumbnailSize, thumbnailSize);
//foreach (var image in imageList.Images)
//{
// image.UpdateThumbnail();
//}
UpdateThumbnails(SelectedIndices.ToList());
}
} |
<<<<<<<
=======
#if TESTS
>>>>>>>
<<<<<<<
=======
#else
/// <summary>
/// The dependency container that this controller will use
/// </summary>
public IGameContainer Container { get; set; }
#endif
>>>>>>> |
<<<<<<<
Actor.FromProducer(() => new EndpointManager());
=======
Actor.FromProducer(() => new EndpointManager())
.WithMailbox(() => new DefaultMailbox(new UnboundedMailboxQueue(), new UnboundedMailboxQueue()));
>>>>>>>
Actor.FromProducer(() => new EndpointManager());
.WithMailbox(() => new DefaultMailbox(new UnboundedMailboxQueue(), new UnboundedMailboxQueue())); |
<<<<<<<
var actor = Actor.FromFunc(c =>
{
if (c.Headers.ContainsKey("TraceID"))
{
Console.WriteLine($"TraceID = {c.Headers.GetOrDefault("TraceID")}");
Console.WriteLine($"SpanID = {c.Headers.GetOrDefault("SpanID")}");
Console.WriteLine($"ParentSpanID = {c.Headers.GetOrDefault("ParentSpanID")}");
}
Console.WriteLine($"actor got {c.Message.GetType()}:{c.Message}");
return Actor.Done;
})
.WithReceiveMiddleware(
next => async c =>
{
Console.WriteLine($"middleware 1 enter {c.Message.GetType()}:{c.Message}");
c.Message = c.Message + ".";
await next(c);
Console.WriteLine($"middleware 1 exit {c.Message.GetType()}:{c.Message}");
},
next => async c =>
{
Console.WriteLine($"middleware 2 enter {c.Message.GetType()}:{c.Message}");
c.Message = c.Message + "$";
await next(c);
Console.WriteLine($"middleware 2 exit {c.Message.GetType()}:{c.Message}");
});
=======
var actor = Actor.FromFunc(
c =>
{
if (c.Headers.ContainsKey("TraceID"))
{
Console.WriteLine($"TraceID = {c.Headers.GetOrDefault("TraceID")}");
Console.WriteLine($"SpanID = {c.Headers.GetOrDefault("SpanID")}");
Console.WriteLine($"ParentSpanID = {c.Headers.GetOrDefault("ParentSpanID")}");
}
Console.WriteLine($"actor got {c.Message.GetType()}:{c.Message}");
if (c.Sender != null) c.Respond("World !");
return Actor.Done;
})
.WithReceiveMiddleware(
next => async c =>
{
Console.WriteLine($"middleware 1 enter {c.Message.GetType()}:{c.Message}");
await next(c);
Console.WriteLine($"middleware 1 exit {c.Message.GetType()}:{c.Message}");
},
next => async c =>
{
Console.WriteLine($"middleware 2 enter {c.Message.GetType()}:{c.Message}");
await next(c);
Console.WriteLine($"middleware 2 exit {c.Message.GetType()}:{c.Message}");
});
>>>>>>>
var actor = Actor.FromFunc(
c =>
{
if (c.Headers.ContainsKey("TraceID"))
{
Console.WriteLine($"TraceID = {c.Headers.GetOrDefault("TraceID")}");
Console.WriteLine($"SpanID = {c.Headers.GetOrDefault("SpanID")}");
Console.WriteLine($"ParentSpanID = {c.Headers.GetOrDefault("ParentSpanID")}");
}
Console.WriteLine($"actor got {c.Message.GetType()}:{c.Message}");
if (c.Sender != null) c.Respond("World !");
return Actor.Done;
})
.WithReceiveMiddleware(
next => async c =>
{
Console.WriteLine($"middleware 1 enter {c.Message.GetType()}:{c.Message}");
c.Message = c.Message + ".";
await next(c);
Console.WriteLine($"middleware 1 exit {c.Message.GetType()}:{c.Message}");
},
next => async c =>
{
Console.WriteLine($"middleware 2 enter {c.Message.GetType()}:{c.Message}");
c.Message = c.Message + "$";
await next(c);
Console.WriteLine($"middleware 2 exit {c.Message.GetType()}:{c.Message}");
});
<<<<<<<
Console.WriteLine($"sender middleware 1 enter {envelope.Message.GetType()}:{envelope.Message}");
envelope.Message = envelope.Message + "!";
await next(c, target, envelope);
Console.WriteLine($"sender middleware 1 exit {envelope.Message.GetType()}:{envelope.Message}");
},
next => async (c, target, envelope) =>
{
Console.WriteLine($"sender middleware 2 enter {envelope.Message.GetType()}:{envelope.Message}");
envelope.Message = envelope.Message + "?";
await next(c, target, envelope);
Console.WriteLine($"sender middleware 2 exit {envelope.Message.GetType()}:{envelope.Message}");
});
=======
>>>>>>> |
<<<<<<<
using React.Models;
=======
using Microsoft.AspNetCore.Mvc;
>>>>>>>
using React.Models; |
<<<<<<<
using BurningKnight.entity.component;
using BurningKnight.entity.events;
using Lens.entity;
=======
using BurningKnight.assets.particle;
using BurningKnight.assets.particle.controller;
using BurningKnight.assets.particle.renderer;
using BurningKnight.ui.editor;
>>>>>>>
using BurningKnight.entity.component;
using BurningKnight.entity.events;
using Lens.entity;
using BurningKnight.assets.particle;
using BurningKnight.assets.particle.controller;
using BurningKnight.assets.particle.renderer;
<<<<<<<
using VelcroPhysics.Dynamics;
=======
using Random = Lens.util.math.Random;
>>>>>>>
using VelcroPhysics.Dynamics;
using Random = Lens.util.math.Random; |
<<<<<<<
} else if (t.Matches(TileFlags.WallLayer) && (IsInside(index + width) && !((Tile) Tiles[index + width]).Matches(Tile.WallA, Tile.WallB))) {
var pos = new Vector2(x * 16, y * 16 + 8);
Graphics.Render(t == Tile.WallA ? Tileset.WallA[CalcWallIndex(x, y)] : Tileset.WallB[CalcWallIndex(x, y)], pos);
var ind = -1;
if (index >= Size - 1 || !((Tile) Tiles[index + 1]).Matches(Tile.WallA, Tile.WallB)) {
ind += 1;
}
if (index <= 0 || !((Tile) Tiles[index - 1]).Matches(Tile.WallA, Tile.WallB)) {
ind += 2;
}
if (ind != -1) {
Graphics.Render(t == Tile.WallA ? Tileset.WallSidesA[ind] : Tileset.WallSidesB[ind], pos);
}
=======
>>>>>>>
} else if (t.Matches(TileFlags.WallLayer) && (IsInside(index + width) && !((Tile) Tiles[index + width]).Matches(Tile.WallA, Tile.WallB))) {
var pos = new Vector2(x * 16, y * 16 + 8);
Graphics.Render(t == Tile.WallA ? Tileset.WallA[CalcWallIndex(x, y)] : Tileset.WallB[CalcWallIndex(x, y)], pos);
var ind = -1;
if (index >= Size - 1 || !((Tile) Tiles[index + 1]).Matches(Tile.WallA, Tile.WallB)) {
ind += 1;
}
if (index <= 0 || !((Tile) Tiles[index - 1]).Matches(Tile.WallA, Tile.WallB)) {
ind += 2;
}
if (ind != -1) {
Graphics.Render(t == Tile.WallA ? Tileset.WallSidesA[ind] : Tileset.WallSidesB[ind], pos);
} |
<<<<<<<
var m = currentPlaying;
Tween.To(v, m.Volume, x => m.Volume = x, CrossFadeTime);
=======
Tween.To(musicVolume, currentPlaying.Volume, x => currentPlaying.Volume = x, CrossFadeTime);
>>>>>>>
var m = currentPlaying;
Tween.To(musicVolume, m.Volume, x => m.Volume = x, CrossFadeTime);
<<<<<<<
public static void Update() {
if (currentPlaying != null && currentPlaying.State == SoundState.Stopped) {
currentPlaying.Play();
}
}
=======
private static float musicVolume;
public static void UpdateMusicVolume(float value) {
if (currentPlaying != null) {
currentPlaying.Volume = value;
}
musicVolume = value;
}
>>>>>>>
private static float musicVolume;
public static void UpdateMusicVolume(float value) {
if (currentPlaying != null) {
currentPlaying.Volume = value;
}
musicVolume = value;
}
public static void Update() {
if (currentPlaying != null && currentPlaying.State == SoundState.Stopped) {
currentPlaying.Play();
}
} |
<<<<<<<
comboBox.Text = " ~ s gui.cs master ↑10";
#endif
=======
comboBox.Text = gitString;
>>>>>>>
comboBox.Text = gitString;
#endif |
<<<<<<<
=======
_capslock,
_numlock,
_scrolllock,
font
>>>>>>> |
<<<<<<<
try
=======
var activeWindow = Pres.Application.ActiveWindow;
var tempName = Pres.Name.GetHashCode().ToString();
string tempFolderPath = Path.GetTempPath() + TempFolderNamePrefix + tempName + @"\";
if (Directory.Exists(tempFolderPath))
>>>>>>>
try
var activeWindow = Pres.Application.ActiveWindow;
var tempName = Pres.Name.GetHashCode().ToString();
string tempFolderPath = Path.GetTempPath() + TempFolderNamePrefix + tempName + @"\";
if (Directory.Exists(tempFolderPath))
<<<<<<<
try
{
// extract embedded audio files to temp folder
PrepareMediaFiles(Pres);
// setup a new recorder pane when an exist file opened
SetupRecorderTaskPane(Pres.Application.ActiveWindow);
}
catch (Exception e)
{
ErrorDialogWrapper.ShowDialog("Error opening file.", "File cannot be opened.", e);
throw;
}
=======
var activeWindow = Pres.Application.ActiveWindow;
var tempName = Pres.Name.GetHashCode().ToString();
documentHashcodeMapper[activeWindow] = tempName;
// extract embedded audio files to temp folder
PrepareMediaFiles(Pres);
// register all task panes when opening documents
RegisterTaskPane(new RecorderTaskPane(tempName), "Record Management", activeWindow,
TaskPaneVisibleValueChangedEventHandler, null);
RegisterTaskPane(new ColorPane(), "Color Panel", activeWindow, null, null);
// setup a new recorder pane when an exist file opened
//SetupRecorderTaskPane(Pres.Application.ActiveWindow);
>>>>>>>
var activeWindow = Pres.Application.ActiveWindow;
var tempName = Pres.Name.GetHashCode().ToString();
documentHashcodeMapper[activeWindow] = tempName;
// extract embedded audio files to temp folder
PrepareMediaFiles(Pres);
// register all task panes when opening documents
RegisterTaskPane(new RecorderTaskPane(tempName), "Record Management", activeWindow,
TaskPaneVisibleValueChangedEventHandler, null);
RegisterTaskPane(new ColorPane(), "Color Panel", activeWindow, null, null);
<<<<<<<
var copyFromRecorderPane = documentPaneMapper[_copyFromWnd].Control as RecorderTaskPane;
var activeRecorderPane = ActivateCustomTaskPane.Control as RecorderTaskPane;
=======
var copyFromRecorderPane = GetPaneFromWindow(Type.GetType("PowerPointLabs.RecorderTaskPane"), _copyFromWnd).Control as RecorderTaskPane;
var activeRecorderPane = GetActivePane(Type.GetType("PowerPointLabs.RecorderTaskPane")).Control as RecorderTaskPane;
var slideRange = selection.SlideRange;
var oriSlide = 0;
>>>>>>>
var copyFromRecorderPane = GetPaneFromWindow(Type.GetType("PowerPointLabs.RecorderTaskPane"), _copyFromWnd).Control as RecorderTaskPane;
var activeRecorderPane = GetActivePane(Type.GetType("PowerPointLabs.RecorderTaskPane")).Control as RecorderTaskPane; |
<<<<<<<
public string GetPositionsLabButtonLabel(Office.IRibbonControl control)
{
return TextCollection.PositionsLab.PositionsLabButtonLabel;
}
=======
public string GetResizeLabButtonLabel(Office.IRibbonControl control)
{
return TextCollection.ResizeLabButtonLabel;
}
>>>>>>>
public string GetPositionsLabButtonLabel(Office.IRibbonControl control)
{
return TextCollection.PositionsLab.PositionsLabButtonLabel;
}
public string GetResizeLabButtonLabel(Office.IRibbonControl control)
{
return TextCollection.ResizeLabButtonLabel;
}
<<<<<<<
#region Feature: Positions Lab
public void PositionsLabButtonClick(Office.IRibbonControl control)
{
try
{
Globals.ThisAddIn.RegisterPositionsPane(PowerPointPresentation.Current.Presentation);
var positionsPane = Globals.ThisAddIn.GetActivePane(typeof(PositionsPane));
// if currently the pane is hidden, show the pane
if (!positionsPane.Visible)
{
// fire the pane visble change event
positionsPane.Visible = true;
}
else
{
positionsPane.Visible = false;
}
}
catch (Exception e)
{
ErrorDialogWrapper.ShowDialog("Error in positions lab", e.Message, e);
PowerPointLabsGlobals.LogException(e, "PositionsLabButtonClicked");
throw;
}
}
// TODO: Add the image for the icon on the ribbon bar
//public Bitmap GetPositionsLabImage(Office.IRibbonControl control)
//{
// try
// {
// return new Bitmap(Properties.Resources.PositionsLab);
// }
// catch (Exception e)
// {
// PowerPointLabsGlobals.LogException(e, "GetPositionsLabImage");
// throw;
// }
//}
#endregion
=======
#region Feature: Resize Lab
public void ResizeLabButtonClick(Office.IRibbonControl control)
{
Globals.ThisAddIn.RegisterResizePane(PowerPointPresentation.Current.Presentation);
var resizePane = Globals.ThisAddIn.GetActivePane(typeof(ResizePane));
// if currently the pane is hidden, show the pane
if (!resizePane.Visible)
{
// fire the pane visble change event
resizePane.Visible = true;
}
else
{
resizePane.Visible = false;
}
}
#endregion
>>>>>>>
#region Feature: Positions Lab
public void PositionsLabButtonClick(Office.IRibbonControl control)
{
try
{
Globals.ThisAddIn.RegisterPositionsPane(PowerPointPresentation.Current.Presentation);
var positionsPane = Globals.ThisAddIn.GetActivePane(typeof(PositionsPane));
// if currently the pane is hidden, show the pane
if (!positionsPane.Visible)
{
// fire the pane visble change event
positionsPane.Visible = true;
}
else
{
positionsPane.Visible = false;
}
}
catch (Exception e)
{
ErrorDialogWrapper.ShowDialog("Error in positions lab", e.Message, e);
PowerPointLabsGlobals.LogException(e, "PositionsLabButtonClicked");
throw;
}
}
// TODO: Add the image for the icon on the ribbon bar
//public Bitmap GetPositionsLabImage(Office.IRibbonControl control)
//{
// try
// {
// return new Bitmap(Properties.Resources.PositionsLab);
// }
// catch (Exception e)
// {
// PowerPointLabsGlobals.LogException(e, "GetPositionsLabImage");
// throw;
// }
//}
#region Feature: Resize Lab
public void ResizeLabButtonClick(Office.IRibbonControl control)
{
Globals.ThisAddIn.RegisterResizePane(PowerPointPresentation.Current.Presentation);
var resizePane = Globals.ThisAddIn.GetActivePane(typeof(ResizePane));
// if currently the pane is hidden, show the pane
if (!resizePane.Visible)
{
// fire the pane visble change event
resizePane.Visible = true;
}
else
{
resizePane.Visible = false;
}
}
#endregion |
<<<<<<<
=======
# region Tab Labels
public const string PowerPointLabsAddInsTabLabel = "PowerPointLabs";
# endregion
# region Button Labels
public const string CombineShapesLabel = "Combine Shapes";
public const string AutoAnimateGroupLabel = "Auto Animate";
public const string AddAnimationButtonLabel = "Add Animation Slide";
public const string AddAnimationReloadButtonLabel = "Recreate Animation";
public const string AddAnimationInSlideAnimateButtonLabel = "Animate In Slide";
public const string AutoZoomGroupLabel = "Auto Zoom";
public const string AddZoomInButtonLabel = "Drill Down";
public const string AddZoomOutButtonLabel = "Step Back";
public const string ZoomToAreaButtonLabel = "Zoom To Area";
public const string AutoCropGroupLabel = "Auto Crop";
public const string MoveCropShapeButtonLabel = "Crop To Shape";
public const string SpotLightGroupLabel = "Spotlight";
public const string AddSpotlightButtonLabel = "Create Spotlight";
public const string ReloadSpotlightButtonLabel = "Recreate Spotlight";
public const string EmbedAudioGroupLabel = "Auto Narrate";
public const string AddAudioButtonLabel = "Add Audio";
public const string GenerateRecordButtonLabel = "Generate Audio Automatically";
public const string AddRecordButtonLabel = "Record Audio Manually";
public const string RemoveAudioButtonLabel = "Remove Audio";
public const string EmbedCaptionGroupLabel = "Auto Captions";
public const string AddCaptionsButtonLabel = "Add Captions";
public const string RemoveCaptionsButtonLabel = "Remove Captions";
public const string HighlightBulletsGroupLabel = "Highlight Bullets";
public const string HighlightBulletsTextButtonLabel = "Highlight Points";
public const string HighlightBulletsBackgroundButtonLabel = "Highlight Background";
public const string HighlightTextFragmentsButtonLabel = "Highlight Text";
public const string LabsGroupLabel = "Labs";
public const string ColorPickerButtonLabel = "Colors Lab";
public const string CustomeShapeButtonLabel = "Shapes Lab";
public const string PPTLabsHelpGroupLabel = "Help";
public const string HelpButtonLabel = "Help";
public const string FeedbackButtonLabel = "Report Issues/ Send Feedback";
public const string AboutButtonLabel = "About";
# endregion
# region Context Menu Labels
public const string NameEditShapeLabel = "Edit Name";
public const string SpotlightShapeLabel = "Add Spotlight";
public const string ZoomInContextMenuLabel = "Drill Down";
public const string ZoomOutContextMenuLabel = "Step Back";
public const string ZoomToAreaContextMenuLabel = "Zoom To Area";
public const string HighlightBulletsMenuShapeLabel = "Highlight Bullets";
public const string HighlightBulletsTextShapeLabel = "Highlight Text";
public const string HighlightBulletsBackgroundShapeLabel = "Highlight Background";
public const string ConvertToPictureShapeLabel = "Convert to Picture";
public const string AddCustomShapeShapeLabel = "Add to Shapes Lab";
public const string CutOutShapeShapeLabel = "Crop To Shape";
public const string FitToWidthShapeLabel = "Fit To Width";
public const string FitToHeightShapeLabel = "Fit To Height";
public const string InSlideAnimateGroupLabel = "Animate In-Slide";
public const string ApplyAutoMotionThumbnailLabel = "Add Animation Slide";
public const string ContextSpeakSelectedTextLabel = "Speak Selected Text";
public const string ContextAddCurrentSlideLabel = "Add Audio (Current Slide)";
public const string ContextReplaceAudioLabel = "Replace Audio";
# endregion
# endregion
# region Quick Tutorial Download Link
//for release ver
// public const string QuickTutorialLink = "http://www.comp.nus.edu.sg/~pptlabs/samples/tutorial.pptx";
//for dev ver
public const string QuickTutorialLink = "http://www.comp.nus.edu.sg/~pptlabs/samples/dev/tutorial.pptx";
# endregion
>>>>>>>
# region Tab Labels
public const string PowerPointLabsAddInsTabLabel = "PowerPointLabs";
# endregion
# region Button Labels
public const string CombineShapesLabel = "Combine Shapes";
public const string AutoAnimateGroupLabel = "Auto Animate";
public const string AddAnimationButtonLabel = "Add Animation Slide";
public const string AddAnimationReloadButtonLabel = "Recreate Animation";
public const string AddAnimationInSlideAnimateButtonLabel = "Animate In Slide";
public const string AutoZoomGroupLabel = "Auto Zoom";
public const string AddZoomInButtonLabel = "Drill Down";
public const string AddZoomOutButtonLabel = "Step Back";
public const string ZoomToAreaButtonLabel = "Zoom To Area";
public const string AutoCropGroupLabel = "Auto Crop";
public const string MoveCropShapeButtonLabel = "Crop To Shape";
public const string SpotLightGroupLabel = "Spotlight";
public const string AddSpotlightButtonLabel = "Create Spotlight";
public const string ReloadSpotlightButtonLabel = "Recreate Spotlight";
public const string EmbedAudioGroupLabel = "Auto Narrate";
public const string AddAudioButtonLabel = "Add Audio";
public const string GenerateRecordButtonLabel = "Generate Audio Automatically";
public const string AddRecordButtonLabel = "Record Audio Manually";
public const string RemoveAudioButtonLabel = "Remove Audio";
public const string EmbedCaptionGroupLabel = "Auto Captions";
public const string AddCaptionsButtonLabel = "Add Captions";
public const string RemoveCaptionsButtonLabel = "Remove Captions";
public const string HighlightBulletsGroupLabel = "Highlight Bullets";
public const string HighlightBulletsTextButtonLabel = "Highlight Points";
public const string HighlightBulletsBackgroundButtonLabel = "Highlight Background";
public const string HighlightTextFragmentsButtonLabel = "Highlight Text";
public const string LabsGroupLabel = "Labs";
public const string ColorPickerButtonLabel = "Colors Lab";
public const string CustomeShapeButtonLabel = "Shapes Lab";
public const string PPTLabsHelpGroupLabel = "Help";
public const string HelpButtonLabel = "Help";
public const string FeedbackButtonLabel = "Report Issues/ Send Feedback";
public const string AboutButtonLabel = "About";
# endregion
# region Context Menu Labels
public const string NameEditShapeLabel = "Edit Name";
public const string SpotlightShapeLabel = "Add Spotlight";
public const string ZoomInContextMenuLabel = "Drill Down";
public const string ZoomOutContextMenuLabel = "Step Back";
public const string ZoomToAreaContextMenuLabel = "Zoom To Area";
public const string HighlightBulletsMenuShapeLabel = "Highlight Bullets";
public const string HighlightBulletsTextShapeLabel = "Highlight Text";
public const string HighlightBulletsBackgroundShapeLabel = "Highlight Background";
public const string ConvertToPictureShapeLabel = "Convert to Picture";
public const string AddCustomShapeShapeLabel = "Add to Shapes Lab";
public const string CutOutShapeShapeLabel = "Crop To Shape";
public const string FitToWidthShapeLabel = "Fit To Width";
public const string FitToHeightShapeLabel = "Fit To Height";
public const string InSlideAnimateGroupLabel = "Animate In-Slide";
public const string ApplyAutoMotionThumbnailLabel = "Add Animation Slide";
public const string ContextSpeakSelectedTextLabel = "Speak Selected Text";
public const string ContextAddCurrentSlideLabel = "Add Audio (Current Slide)";
public const string ContextReplaceAudioLabel = "Replace Audio";
# endregion
# endregion
<<<<<<<
public static readonly string AboutInfo =
" PowerPointLabs Plugin Version " + Properties.Settings.Default.Version + " [Release date: " + Properties.Settings.Default.ReleaseDate + "]\n Developed at School of Computing, National University of Singapore.\n For more information, visit our website " + PowerPointLabsWebsiteUrl;
=======
public const string AboutInfo =
" PowerPointLabs Plugin Version 1.8.11 [Release date: 1 Aug 2014]\n Developed at School of Computing, National University of Singapore.\n For more information, visit our website " + PowerPointLabsWebsiteUrl;
>>>>>>>
public static readonly string AboutInfo =
" PowerPointLabs Plugin Version " + Properties.Settings.Default.Version + " [Release date: " + Properties.Settings.Default.ReleaseDate + "]\n Developed at School of Computing, National University of Singapore.\n For more information, visit our website " + PowerPointLabsWebsiteUrl; |
<<<<<<<
private bool IsChangeIconKeyPressed()
{
if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
{
return true;
}
else
{
return false;
}
}
=======
private void SyncShapes(PowerPoint.ShapeRange selected, PowerPoint.ShapeRange simulatedShapes)
{
for (int i = 1; i <= selected.Count; i++)
{
var selectedShape = selected[i];
var simulatedShape = simulatedShapes[i];
selectedShape.IncrementLeft(Graphics.GetCenterPoint(simulatedShape).X - Graphics.GetCenterPoint(selectedShape).X);
selectedShape.IncrementTop(Graphics.GetCenterPoint(simulatedShape).Y - Graphics.GetCenterPoint(selectedShape).Y);
selectedShape.Rotation = simulatedShape.Rotation;
}
}
>>>>>>>
private bool IsChangeIconKeyPressed()
{
if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
{
return true;
}
else
{
return false;
}
}
private void SyncShapes(PowerPoint.ShapeRange selected, PowerPoint.ShapeRange simulatedShapes)
{
for (int i = 1; i <= selected.Count; i++)
{
var selectedShape = selected[i];
var simulatedShape = simulatedShapes[i];
selectedShape.IncrementLeft(Graphics.GetCenterPoint(simulatedShape).X - Graphics.GetCenterPoint(selectedShape).X);
selectedShape.IncrementTop(Graphics.GetCenterPoint(simulatedShape).Y - Graphics.GetCenterPoint(selectedShape).Y);
selectedShape.Rotation = simulatedShape.Rotation;
}
} |
<<<<<<<
=======
var recorder = recorderPane.Control as RecorderTaskPane;
if (recorder == null)
{
return;
}
>>>>>>>
var recorder = recorderPane.Control as RecorderTaskPane;
if (recorder == null)
{
return;
}
<<<<<<<
List<String> nameListForPastedShapes = new List<string>();
Dictionary<String, String> nameDictForPastedShapes = new Dictionary<string, string>();
List<String> nameListForCopiedShapes = new List<string>();
List<PowerPoint.Shape> corruptedShapes = new List<PowerPoint.Shape>();
=======
var nameListForPastedShapes = new List<string>();
var nameDictForPastedShapes = new Dictionary<string, string>();
var nameListForCopiedShapes = new List<string>();
var namePattern = new Regex(@"^[^\[]\D+\s\d+$");
var corruptedShapes = new List<PowerPoint.Shape>();
>>>>>>>
var nameListForPastedShapes = new List<string>();
var nameDictForPastedShapes = new Dictionary<string, string>();
var nameListForCopiedShapes = new List<string>();
var namePattern = new Regex(@"^[^\[]\D+\s\d+$");
var corruptedShapes = new List<PowerPoint.Shape>();
<<<<<<<
=======
_copiedShapes.Sort((x, y) => (x.Id - y.Id));
>>>>>>>
_copiedShapes.Sort((x, y) => (x.Id - y.Id)); |
<<<<<<<
using Media = System.Windows.Media;
=======
>>>>>>>
<<<<<<<
var origin = Graphics.GetCenterPoint(_refPoint);
foreach (var currentShape in _shapesToBeRotated)
{
PositionsLabMain.Rotate(currentShape, origin, angle, PositionsLabMain.ReorientShapeOrientation);
}
=======
PositionsLabMain.Rotate(_shapesToBeRotated, _refPoint, angle);
>>>>>>>
var origin = Graphics.GetCenterPoint(_refPoint);
foreach (var currentShape in _shapesToBeRotated)
{
PositionsLabMain.Rotate(currentShape, origin, angle);
}
<<<<<<<
private void DuplicateRotationButton_Click(object sender, RoutedEventArgs e)
{
var noShapesSelected = this.GetCurrentSelection().Type != PowerPoint.PpSelectionType.ppSelectionShapes;
if (noShapesSelected)
{
ShowErrorMessageBox(ErrorMessageNoSelection);
return;
}
var selectedShapes = this.GetCurrentSelection().ShapeRange;
if (selectedShapes.Count <= 1)
{
ShowErrorMessageBox(ErrorMessageFewerThanTwoSelection);
return;
}
ClearAllEventHandlers();
var currentSlide = this.GetCurrentSlide();
_refPoint = selectedShapes[1];
_shapesToBeRotated = ConvertShapeRangeToShapeList(selectedShapes, 2);
_allShapesInSlide = ConvertShapesToShapeList(currentSlide.Shapes);
_selectedRange = selectedShapes;
_dispatcherTimer.Tick += RotationHandler;
_leftMouseUpListener = new LMouseUpListener();
_leftMouseUpListener.LButtonUpClicked += _leftMouseUpListener_Rotation;
_leftMouseDownListener = new LMouseDownListener();
_leftMouseDownListener.LButtonDownClicked += _leftMouseDownListener_DuplicateRotation;
HighlightButton(duplicateRotationButton, lightBlueBrush, darkBlueBrush);
}
=======
>>>>>>> |
<<<<<<<
LoadThemePanel();
=======
if (PowerPointCurrentPresentationInfo.SlideCount > 0)
{
Microsoft.Office.Core.ThemeColorScheme scheme =
PowerPointCurrentPresentationInfo.CurrentSlide.GetNativeSlide().ThemeColorScheme;
ThemePanel1.BackColor = Color.FromArgb(
ColorHelper.ReverseRGBToArgb(
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeLight1).RGB));
dataSource.themeColorOne = ThemePanel1.BackColor;
ThemePanel2.BackColor = Color.FromArgb(
ColorHelper.ReverseRGBToArgb(
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeDark1).RGB));
dataSource.themeColorTwo = ThemePanel2.BackColor;
ThemePanel3.BackColor = Color.FromArgb(
ColorHelper.ReverseRGBToArgb(
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeLight2).RGB));
dataSource.themeColorThree = ThemePanel3.BackColor;
ThemePanel4.BackColor = Color.FromArgb(
ColorHelper.ReverseRGBToArgb(
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeDark2).RGB));
dataSource.themeColorFour = ThemePanel4.BackColor;
ThemePanel5.BackColor = Color.FromArgb(
ColorHelper.ReverseRGBToArgb(
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent1).RGB));
dataSource.themeColorFive = ThemePanel5.BackColor;
ThemePanel6.BackColor = Color.FromArgb(
ColorHelper.ReverseRGBToArgb(
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent2).RGB));
dataSource.themeColorSix = ThemePanel6.BackColor;
ThemePanel7.BackColor = Color.FromArgb(
ColorHelper.ReverseRGBToArgb(
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent3).RGB));
dataSource.themeColorSeven = ThemePanel7.BackColor;
ThemePanel8.BackColor = Color.FromArgb(
ColorHelper.ReverseRGBToArgb(
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent4).RGB));
dataSource.themeColorEight = ThemePanel8.BackColor;
ThemePanel9.BackColor = Color.FromArgb(
ColorHelper.ReverseRGBToArgb(
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent5).RGB));
dataSource.themeColorNine = ThemePanel9.BackColor;
ThemePanel10.BackColor = Color.FromArgb(
ColorHelper.ReverseRGBToArgb(
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent6).RGB));
dataSource.themeColorTen = ThemePanel10.BackColor;
}
>>>>>>>
LoadThemePanel();
<<<<<<<
=======
private void ApplyCurrentThemeToSelectedSlides()
{
foreach (PowerPointSlide slide in PowerPointCurrentPresentationInfo.SelectedSlides)
{
ApplyCurrentThemeToSlide(slide);
}
}
private void ApplyCurrentThemeToSlide(PowerPointSlide slide)
{
Microsoft.Office.Core.ThemeColorScheme scheme =
slide.GetNativeSlide().ThemeColorScheme;
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeLight1).RGB =
ColorHelper.ReverseRGBToArgb((ThemePanel1.BackColor.ToArgb()));
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeDark1).RGB =
ColorHelper.ReverseRGBToArgb((ThemePanel2.BackColor.ToArgb()));
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeLight2).RGB =
ColorHelper.ReverseRGBToArgb((ThemePanel3.BackColor.ToArgb()));
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeDark2).RGB =
ColorHelper.ReverseRGBToArgb((ThemePanel4.BackColor.ToArgb()));
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent1).RGB =
ColorHelper.ReverseRGBToArgb((ThemePanel5.BackColor.ToArgb()));
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent2).RGB =
ColorHelper.ReverseRGBToArgb((ThemePanel6.BackColor.ToArgb()));
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent3).RGB =
ColorHelper.ReverseRGBToArgb((ThemePanel7.BackColor.ToArgb()));
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent4).RGB =
ColorHelper.ReverseRGBToArgb((ThemePanel8.BackColor.ToArgb()));
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent5).RGB =
ColorHelper.ReverseRGBToArgb((ThemePanel9.BackColor.ToArgb()));
scheme.Colors(Microsoft.Office.Core.MsoThemeColorSchemeIndex.msoThemeAccent6).RGB =
ColorHelper.ReverseRGBToArgb((ThemePanel10.BackColor.ToArgb()));
}
>>>>>>> |
<<<<<<<
public const string NoSlideSelectedMessage = "No slide is selected";
public const string OnLoadingMessage = "Now Loading...";
=======
public const string ExplanationItem_IsCallout = "IsCallout";
public const string ExplanationItem_IsCaption = "IsCaption";
public const string ExplanationItem_IsVoice = "IsVoice";
public const string ExplanationItem_HasShortVersion = "HasShortVersion";
public const string ExplanationItem_CalloutText = "CalloutText";
public const string ExplanationItem_CaptionText = "CaptionText";
public const string ExplanationItem_VoiceLabel = "VoiceLabel";
public const string ExplanationItem_TriggerIndex = "TriggerIndex";
public const string ExplanationItem_IsDummyItem = "IsDummyItem";
public const string ExplanationItem_IsTriggerTypeComboBoxEnabled = "IsTriggerTypeComboBoxEnabled";
public const string ExplanationItem_IsVoiceLabelInvalid = "IsVoiceLabelInvalid";
>>>>>>>
public const string NoSlideSelectedMessage = "No slide is selected";
public const string OnLoadingMessage = "Now Loading...";
public const string ExplanationItem_IsCallout = "IsCallout";
public const string ExplanationItem_IsCaption = "IsCaption";
public const string ExplanationItem_IsVoice = "IsVoice";
public const string ExplanationItem_HasShortVersion = "HasShortVersion";
public const string ExplanationItem_CalloutText = "CalloutText";
public const string ExplanationItem_CaptionText = "CaptionText";
public const string ExplanationItem_VoiceLabel = "VoiceLabel";
public const string ExplanationItem_TriggerIndex = "TriggerIndex";
public const string ExplanationItem_IsDummyItem = "IsDummyItem";
public const string ExplanationItem_IsTriggerTypeComboBoxEnabled = "IsTriggerTypeComboBoxEnabled";
public const string ExplanationItem_IsVoiceLabelInvalid = "IsVoiceLabelInvalid"; |
<<<<<<<
public bool HasCaptions()
{
foreach (PowerPoint.Shape shape in this.Shapes)
{
if (shape.Name.StartsWith("PowerPointLabs Caption"))
{
return true;
}
}
return false;
}
public bool HasAudio()
{
foreach (PowerPoint.Shape shape in this.Shapes)
{
if (shape.Name.Contains(NotesToAudio.SpeechShapePrefix) ||
shape.Name.Contains(NotesToAudio.SpeechShapePrefixOld))
{
return true;
}
}
return false;
}
public Effect AddShapeAsLastAutoplaying(Shape shape, MsoAnimEffect effect)
=======
public bool hasTextFragments()
{
foreach (Shape sh in _slide.Shapes)
{
if (sh.Name.StartsWith("PPTLabsHighlightTextFragmentsShape"))
{
return true;
}
}
return false;
}
public List<PowerPoint.Shape> getTextFragments()
{
List<PowerPoint.Shape> fragmentShapes = new List<Shape>();
foreach (Shape sh in _slide.Shapes)
{
if (sh.Name.StartsWith("PPTLabsHighlightTextFragmentsShape"))
{
fragmentShapes.Add(sh);
}
}
return fragmentShapes;
}
private Effect AddShapeAsLastAutoplaying(Shape shape, MsoAnimEffect effect)
>>>>>>>
public bool hasTextFragments()
{
foreach (Shape sh in _slide.Shapes)
{
if (sh.Name.StartsWith("PPTLabsHighlightTextFragmentsShape"))
{
return true;
}
}
return false;
}
public List<PowerPoint.Shape> getTextFragments()
{
List<PowerPoint.Shape> fragmentShapes = new List<Shape>();
foreach (Shape sh in _slide.Shapes)
{
if (sh.Name.StartsWith("PPTLabsHighlightTextFragmentsShape"))
{
fragmentShapes.Add(sh);
}
}
return fragmentShapes;
}
public bool HasCaptions()
{
foreach (PowerPoint.Shape shape in this.Shapes)
{
if (shape.Name.StartsWith("PowerPointLabs Caption"))
{
return true;
}
}
return false;
}
public bool HasAudio()
{
foreach (PowerPoint.Shape shape in this.Shapes)
{
if (shape.Name.Contains(NotesToAudio.SpeechShapePrefix) ||
shape.Name.Contains(NotesToAudio.SpeechShapePrefixOld))
{
return true;
}
}
return false;
}
public Effect AddShapeAsLastAutoplaying(Shape shape, MsoAnimEffect effect) |
<<<<<<<
public bool RecorderPaneVisible = false;
=======
public bool _embedAudioVisible = true;
public bool _recorderPaneVisible = false;
>>>>>>>
public bool _embedAudioVisible = true;
public bool _recorderPaneVisible = false;
<<<<<<<
=======
public bool GetEmbedAudioVisiblity(Office.IRibbonControl control)
{
return _embedAudioVisible;
}
# region AudioRecord Button Callbacks
>>>>>>>
public bool GetEmbedAudioVisiblity(Office.IRibbonControl control)
{
return _embedAudioVisible;
}
<<<<<<<
var recorderPane = Globals.ThisAddIn.GetActivePane(Type.GetType("PowerPointLabs.RecorderTaskPane"));
var recorder = recorderPane.Control as RecorderTaskPane;
=======
if (!Globals.ThisAddIn.VerifyVersion())
{
return;
}
var recorder = Globals.ThisAddIn.ActivateCustomTaskPane.Control as RecorderTaskPane;
>>>>>>>
if (!Globals.ThisAddIn.VerifyVersion())
{
return;
}
var recorderPane = Globals.ThisAddIn.GetActivePane(Type.GetType("PowerPointLabs.RecorderTaskPane"));
var recorder = recorderPane.Control as RecorderTaskPane;
<<<<<<<
var recorderPane = Globals.ThisAddIn.GetActivePane(Type.GetType("PowerPointLabs.RecorderTaskPane"));
var recorder = recorderPane.Control as RecorderTaskPane;
=======
if (!Globals.ThisAddIn.VerifyVersion())
{
return;
}
var recorderPane = Globals.ThisAddIn.ActivateCustomTaskPane.Control as RecorderTaskPane;
>>>>>>>
if (!Globals.ThisAddIn.VerifyVersion())
{
return;
}
var recorderPane = Globals.ThisAddIn.GetActivePane(Type.GetType("PowerPointLabs.RecorderTaskPane"));
var recorder = recorderPane.Control as RecorderTaskPane; |
<<<<<<<
Globals.ThisAddIn.RegisterRecorderPane(currentPresentation);
=======
# region feature: Auto-Narrate Management
public void RecManagementClick(Office.IRibbonControl control)
{
var currentPresentation = Globals.ThisAddIn.Application.ActivePresentation;
if (!IsValidPresentation(currentPresentation))
{
return;
}
// prepare media files
var tempPath = Globals.ThisAddIn.PrepareTempFolder(currentPresentation);
Globals.ThisAddIn.PrepareMediaFiles(currentPresentation, tempPath);
Globals.ThisAddIn.RegisterRecorderPane(currentPresentation.Windows[1], tempPath);
var recorderPane = Globals.ThisAddIn.GetActivePane(typeof(RecorderTaskPane));
var recorder = recorderPane.Control as RecorderTaskPane;
// if currently the pane is hidden, show the pane
if (recorder != null && !recorderPane.Visible)
{
// fire the pane visble change event
recorderPane.Visible = true;
// reload the pane
recorder.RecorderPaneReload();
}
}
# endregion
#region feature: Fit To Slide | Fit To Width | Fit To Height
>>>>>>>
Globals.ThisAddIn.RegisterRecorderPane(currentPresentation.Windows[1], tempPath); |
<<<<<<<
if (!Globals.ThisAddIn.VerifyVersion())
{
return;
}
var recorder = Globals.ThisAddIn.ActivateCustomTaskPane.Control as RecorderTaskPane;
=======
var recorderPane = Globals.ThisAddIn.GetActivePane(Type.GetType("PowerPointLabs.RecorderTaskPane"));
var recorder = recorderPane.Control as RecorderTaskPane;
>>>>>>>
if (!Globals.ThisAddIn.VerifyVersion())
{
return;
}
var recorderPane = Globals.ThisAddIn.GetActivePane(Type.GetType("PowerPointLabs.RecorderTaskPane"));
var recorder = recorderPane.Control as RecorderTaskPane;
<<<<<<<
if (!Globals.ThisAddIn.VerifyVersion())
{
return;
}
var recorderPane = Globals.ThisAddIn.ActivateCustomTaskPane.Control as RecorderTaskPane;
=======
var recorderPane = Globals.ThisAddIn.GetActivePane(Type.GetType("PowerPointLabs.RecorderTaskPane"));
var recorder = recorderPane.Control as RecorderTaskPane;
>>>>>>>
if (!Globals.ThisAddIn.VerifyVersion())
{
return;
}
var recorderPane = Globals.ThisAddIn.GetActivePane(Type.GetType("PowerPointLabs.RecorderTaskPane"));
var recorder = recorderPane.Control as RecorderTaskPane;
<<<<<<<
public bool GetVisibilityForCombineShapes(Office.IRibbonControl control)
{
const string officeVersion2010 = "14.0";
return Globals.ThisAddIn.Application.Version == officeVersion2010;
}
=======
#region feature: Color
public void ColorPickerButtonClick(Office.IRibbonControl control)
{
try
{
////PowerPoint.ShapeRange selectedShapes = Globals.ThisAddIn.Application.ActiveWindow.Selection.ShapeRange;
////Form ColorPickerForm = new ColorPickerForm(selectedShapes);
////ColorPickerForm.Show();
//ColorDialog MyDialog = new ColorDialog();
//// Keeps the user from selecting a custom color.
//MyDialog.AllowFullOpen = false;
//// Allows the user to get help. (The default is false.)
//MyDialog.ShowHelp = true;
//ColorPickerForm colorPickerForm = new ColorPickerForm();
//colorPickerForm.Show();
var colorPane = Globals.ThisAddIn.GetActivePane(Type.GetType("PowerPointLabs.ColorPane"));
var color = colorPane.Control as ColorPane;
// if currently the pane is hidden, show the pane
if (!colorPane.Visible)
{
// fire the pane visble change event
colorPane.Visible = true;
}
}
catch (Exception e)
{
MessageBox.Show("No Shape Selected", "Invalid Selection");
PowerPointLabsGlobals.LogException(e, "ColorPickerButtonClicked");
throw;
}
}
#endregion
>>>>>>>
public bool GetVisibilityForCombineShapes(Office.IRibbonControl control)
{
const string officeVersion2010 = "14.0";
return Globals.ThisAddIn.Application.Version == officeVersion2010;
}
#region feature: Color
public void ColorPickerButtonClick(Office.IRibbonControl control)
{
try
{
////PowerPoint.ShapeRange selectedShapes = Globals.ThisAddIn.Application.ActiveWindow.Selection.ShapeRange;
////Form ColorPickerForm = new ColorPickerForm(selectedShapes);
////ColorPickerForm.Show();
//ColorDialog MyDialog = new ColorDialog();
//// Keeps the user from selecting a custom color.
//MyDialog.AllowFullOpen = false;
//// Allows the user to get help. (The default is false.)
//MyDialog.ShowHelp = true;
//ColorPickerForm colorPickerForm = new ColorPickerForm();
//colorPickerForm.Show();
var colorPane = Globals.ThisAddIn.GetActivePane(Type.GetType("PowerPointLabs.ColorPane"));
var color = colorPane.Control as ColorPane;
// if currently the pane is hidden, show the pane
if (!colorPane.Visible)
{
// fire the pane visble change event
colorPane.Visible = true;
}
}
catch (Exception e)
{
MessageBox.Show("No Shape Selected", "Invalid Selection");
PowerPointLabsGlobals.LogException(e, "ColorPickerButtonClicked");
throw;
}
}
#endregion |
<<<<<<<
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>(); |
<<<<<<<
public static HDCamera GetHDCamera(Camera camera)
{
// The actual projection matrix used in shaders is actually massaged a bit to work across all platforms (different Z value ranges etc.)
Matrix4x4 projMatrix = GL.GetGPUProjectionMatrix(camera.projectionMatrix, true);
HDCamera hdCamera = new HDCamera();
hdCamera.viewMatrix = camera.worldToCameraMatrix;
hdCamera.projMatrix = projMatrix;
hdCamera.screenSize = new Vector4(camera.pixelWidth, camera.pixelHeight, 1.0f / camera.pixelWidth, 1.0f / camera.pixelHeight);;
hdCamera.camera = camera;
return hdCamera;
}
public static void SetupGlobalHDCamera(HDCamera hdCamera, CommandBuffer cmd)
{
cmd.SetGlobalMatrix("_ViewMatrix", hdCamera.viewMatrix);
cmd.SetGlobalMatrix("_InvViewMatrix", hdCamera.viewMatrix.inverse);
cmd.SetGlobalMatrix("_ProjMatrix", hdCamera.projMatrix);
cmd.SetGlobalMatrix("_InvProjMatrix", hdCamera.projMatrix.inverse);
cmd.SetGlobalMatrix("_ViewProjMatrix", hdCamera.viewProjMatrix);
cmd.SetGlobalMatrix("_InvViewProjMatrix", hdCamera.viewProjMatrix.inverse);
cmd.SetGlobalVector("_InvProjParam", hdCamera.invProjParam);
cmd.SetGlobalVector("_ScreenSize", hdCamera.screenSize);
}
// Does not modify global settings. Used for shadows, low res. rendering, etc.
public static void OverrideGlobalHDCamera(HDCamera hdCamera, Material material)
{
material.SetMatrix("_ViewMatrix", hdCamera.viewMatrix);
material.SetMatrix("_InvViewMatrix", hdCamera.viewMatrix.inverse);
material.SetMatrix("_ProjMatrix", hdCamera.projMatrix);
material.SetMatrix("_InvProjMatrix", hdCamera.projMatrix.inverse);
material.SetMatrix("_ViewProjMatrix", hdCamera.viewProjMatrix);
material.SetMatrix("_InvViewProjMatrix", hdCamera.viewProjMatrix.inverse);
material.SetVector("_InvProjParam", hdCamera.invProjParam);
material.SetVector("_ScreenSize", hdCamera.screenSize);
}
public static void SetupComputeShaderHDCamera(HDCamera hdCamera, ComputeShader cs, CommandBuffer cmd)
{
SetMatrixCS(cmd, cs, "_ViewMatrix", hdCamera.viewMatrix);
SetMatrixCS(cmd, cs, "_InvViewMatrix", hdCamera.viewMatrix.inverse);
SetMatrixCS(cmd, cs, "_ProjMatrix", hdCamera.projMatrix);
SetMatrixCS(cmd, cs, "_InvProjMatrix", hdCamera.projMatrix.inverse);
SetMatrixCS(cmd, cs, "_ViewProjMatrix", hdCamera.viewProjMatrix);
SetMatrixCS(cmd, cs, "_InvViewProjMatrix", hdCamera.viewProjMatrix.inverse);
cmd.SetComputeVectorParam(cs, "_InvProjParam", hdCamera.invProjParam);
cmd.SetComputeVectorParam(cs, "_ScreenSize", hdCamera.screenSize);
}
=======
>>>>>>>
public static void SetupGlobalHDCamera(HDCamera hdCamera, CommandBuffer cmd)
{
cmd.SetGlobalMatrix("_ViewMatrix", hdCamera.viewMatrix);
cmd.SetGlobalMatrix("_InvViewMatrix", hdCamera.viewMatrix.inverse);
cmd.SetGlobalMatrix("_ProjMatrix", hdCamera.projMatrix);
cmd.SetGlobalMatrix("_InvProjMatrix", hdCamera.projMatrix.inverse);
cmd.SetGlobalMatrix("_ViewProjMatrix", hdCamera.viewProjMatrix);
cmd.SetGlobalMatrix("_InvViewProjMatrix", hdCamera.viewProjMatrix.inverse);
cmd.SetGlobalVector("_InvProjParam", hdCamera.invProjParam);
cmd.SetGlobalVector("_ScreenSize", hdCamera.screenSize);
cmd.SetGlobalMatrix("_PrevViewProjMatrix", hdCamera.prevViewProjMatrix);
}
// Does not modify global settings. Used for shadows, low res. rendering, etc.
public static void OverrideGlobalHDCamera(HDCamera hdCamera, Material material)
{
material.SetMatrix("_ViewMatrix", hdCamera.viewMatrix);
material.SetMatrix("_InvViewMatrix", hdCamera.viewMatrix.inverse);
material.SetMatrix("_ProjMatrix", hdCamera.projMatrix);
material.SetMatrix("_InvProjMatrix", hdCamera.projMatrix.inverse);
material.SetMatrix("_ViewProjMatrix", hdCamera.viewProjMatrix);
material.SetMatrix("_InvViewProjMatrix", hdCamera.viewProjMatrix.inverse);
material.SetVector("_InvProjParam", hdCamera.invProjParam);
material.SetVector("_ScreenSize", hdCamera.screenSize);
material.SetMatrix("_PrevViewProjMatrix", hdCamera.prevViewProjMatrix);
}
public static void SetupComputeShaderHDCamera(HDCamera hdCamera, ComputeShader cs, CommandBuffer cmd)
{
SetMatrixCS(cmd, cs, "_ViewMatrix", hdCamera.viewMatrix);
SetMatrixCS(cmd, cs, "_InvViewMatrix", hdCamera.viewMatrix.inverse);
SetMatrixCS(cmd, cs, "_ProjMatrix", hdCamera.projMatrix);
SetMatrixCS(cmd, cs, "_InvProjMatrix", hdCamera.projMatrix.inverse);
SetMatrixCS(cmd, cs, "_ViewProjMatrix", hdCamera.viewProjMatrix);
SetMatrixCS(cmd, cs, "_InvViewProjMatrix", hdCamera.viewProjMatrix.inverse);
cmd.SetComputeVectorParam(cs, "_InvProjParam", hdCamera.invProjParam);
cmd.SetComputeVectorParam(cs, "_ScreenSize", hdCamera.screenSize);
SetMatrixCS(cmd, cs, "_PrevViewProjMatrix", hdCamera.prevViewProjMatrix);
}
<<<<<<<
=======
camera.SetupMaterial(material);
>>>>>>>
<<<<<<<
=======
camera.SetupMaterial(material);
>>>>>>>
<<<<<<<
=======
camera.SetupMaterial(material);
>>>>>>> |
<<<<<<<
NodejsPackage.Instance.CheckSurveyNews(false);
ModulesNode.ReloadHierarchySafe();
=======
SyncFileSystem();
foreach (var group in _refGroupDispenser.Groups) {
group.GenerateReferenceFile();
}
NodejsPackage.Instance.CheckSurveyNews(false);
>>>>>>>
SyncFileSystem();
foreach (var group in _refGroupDispenser.Groups) {
group.GenerateReferenceFile();
}
NodejsPackage.Instance.CheckSurveyNews(false);
ModulesNode.ReloadHierarchySafe(); |
<<<<<<<
private static string CheckForRegistrySpecifiedNodeParams()
{
var paramString = NodejsDialogPage.LoadString(name: "NodeCmdParams", cat: "Debugging");
return paramString;
}
private void StartAndAttachDebugger(string file, string nodePath)
=======
private void StartAndAttachDebugger(string file, string nodePath, bool startBrowser)
>>>>>>>
private static string CheckForRegistrySpecifiedNodeParams()
{
var paramString = NodejsDialogPage.LoadString(name: "NodeCmdParams", cat: "Debugging");
return paramString;
}
private void StartAndAttachDebugger(string file, string nodePath, bool startBrowser) |
<<<<<<<
//*********************************************************//
// Copyright (c) Microsoft. All rights reserved.
//
// Apache 2.0 License
//
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
// implied. See the License for the specific language governing
// permissions and limitations under the License.
//
//*********************************************************//
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Microsoft.NodejsTools {
class PkgCmdId {
public const int cmdidReplWindow = 0x200;
public const int cmdidOpenReplWindow = 0x201;
public const int cmdidOpenRemoteDebugProxyFolder = 0x202;
public const int cmdidSetAsNodejsStartupFile = 0x203;
public const int cmdidSurveyNews = 0x204;
public const int cmdidImportWizard = 0x205;
public const int cmdidOpenRemoteDebugDocumentation = 0x206;
public const uint cmdidAzureExplorerAttachNodejsDebugger = 0x207;
public const int cmdidDiagnostics = 0x208;
public const int cmdidSetAsContent = 0x209;
public const int cmdidSetAsCompile = 0x210;
public const int cmdidNpmManageModules = 0x300;
public const int cmdidNpmInstallModules = 0x301;
public const int cmdidNpmUpdateModules = 0x302;
public const int cmdidNpmUninstallModule = 0x303;
public const int cmdidNpmInstallSingleMissingModule = 0x304;
public const int cmdidNpmUpdateSingleModule = 0x305;
public const int cmdidNpmOpenModuleHomepage = 0x306;
public const int menuIdNpm = 0x3000;
}
}
=======
//*********************************************************//
// Copyright (c) Microsoft. All rights reserved.
//
// Apache 2.0 License
//
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
// implied. See the License for the specific language governing
// permissions and limitations under the License.
//
//*********************************************************//
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Microsoft.NodejsTools {
class PkgCmdId {
public const int cmdidReplWindow = 0x200;
public const int cmdidOpenReplWindow = 0x201;
public const int cmdidOpenRemoteDebugProxyFolder = 0x202;
public const int cmdidSetAsNodejsStartupFile = 0x203;
public const int cmdidSurveyNews = 0x204;
public const int cmdidImportWizard = 0x205;
public const int cmdidOpenRemoteDebugDocumentation = 0x206;
public const uint cmdidAzureExplorerAttachNodejsDebugger = 0x207;
public const int cmdidDiagnostics = 0x208;
public const int cmdidSetAsContent = 0x209;
public const int cmdidSetAsCompile = 0x210;
public const int cmdidAddNewJavaScriptFileCommand = 0x211;
public const int cmdidAddNewTypeScriptFileCommand = 0x212;
public const int cmdidAddNewHTMLFileCommand = 0x213;
public const int cmdidAddNewCSSFileCommand = 0x214;
public const int cmdidNpmManageModules = 0x300;
public const int cmdidNpmInstallModules = 0x301;
public const int cmdidNpmUpdateModules = 0x302;
public const int cmdidNpmUninstallModule = 0x303;
public const int cmdidNpmInstallSingleMissingModule = 0x304;
public const int cmdidNpmUpdateSingleModule = 0x305;
public const int cmdidNpmOpenModuleHomepage = 0x306;
public const int menuIdNpm = 0x3000;
}
}
>>>>>>>
//*********************************************************//
// Copyright (c) Microsoft. All rights reserved.
//
// Apache 2.0 License
//
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
// implied. See the License for the specific language governing
// permissions and limitations under the License.
//
//*********************************************************//
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Microsoft.NodejsTools {
class PkgCmdId {
public const int cmdidReplWindow = 0x200;
public const int cmdidOpenReplWindow = 0x201;
public const int cmdidOpenRemoteDebugProxyFolder = 0x202;
public const int cmdidSetAsNodejsStartupFile = 0x203;
public const int cmdidSurveyNews = 0x204;
public const int cmdidImportWizard = 0x205;
public const int cmdidOpenRemoteDebugDocumentation = 0x206;
public const uint cmdidAzureExplorerAttachNodejsDebugger = 0x207;
public const int cmdidDiagnostics = 0x208;
public const int cmdidSetAsContent = 0x209;
public const int cmdidSetAsCompile = 0x210;
public const int cmdidAddNewJavaScriptFileCommand = 0x211;
public const int cmdidAddNewTypeScriptFileCommand = 0x212;
public const int cmdidAddNewHTMLFileCommand = 0x213;
public const int cmdidAddNewCSSFileCommand = 0x214;
public const int cmdidNpmManageModules = 0x300;
public const int cmdidNpmInstallModules = 0x301;
public const int cmdidNpmUpdateModules = 0x302;
public const int cmdidNpmUninstallModule = 0x303;
public const int cmdidNpmInstallSingleMissingModule = 0x304;
public const int cmdidNpmUpdateSingleModule = 0x305;
public const int cmdidNpmOpenModuleHomepage = 0x306;
public const int menuIdNpm = 0x3000;
}
} |
<<<<<<<
using System.Threading;
using System.Threading.Tasks;
using Microsoft.NodejsTools.Debugger.Commands;
using Microsoft.NodejsTools.Debugger.Communication;
using Microsoft.NodejsTools.Debugger.Events;
=======
using System.Net.NetworkInformation;
using System.Text;
using System.Text.RegularExpressions;
>>>>>>>
using System.Net.NetworkInformation;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.NodejsTools.Debugger.Commands;
using Microsoft.NodejsTools.Debugger.Communication;
using Microsoft.NodejsTools.Debugger.Events;
<<<<<<<
Connection = Connection ?? new DebuggerConnection();
Client = Client ?? new DebuggerClient(Connection);
CommandFactory = CommandFactory ?? new CommandFactory(
new SequentialNumberGenerator(),
new EvaluationResultFactory());
if (Timeout == TimeSpan.Zero) {
Timeout = TimeSpan.FromSeconds(2);
}
=======
if (ResponseHandler == null) {
var evaluationResultFactory = new NodeEvaluationResultFactory();
ResponseHandler = new NodeResponseHandler(evaluationResultFactory);
}
>>>>>>>
Connection = Connection ?? new DebuggerConnection(_hostName, _portNumber);
Client = Client ?? new DebuggerClient(Connection);
CommandFactory = CommandFactory ?? new CommandFactory(
new SequentialNumberGenerator(),
new EvaluationResultFactory());
if (Timeout == TimeSpan.Zero) {
Timeout = TimeSpan.FromSeconds(2);
}
<<<<<<<
int id = newModule.ModuleId;
module = new NodeModule(id, name);
=======
int id = (int)script["id"];
module = new NodeModule(this, id, name);
>>>>>>>
int id = newModule.ModuleId;
module = new NodeModule(this, id, name);
<<<<<<<
internal async Task<bool> TestPredicateAsync(string expression) {
DebugWriteCommand("TestPredicate: " + expression);
var predicateExpression = string.Format("Boolean({0})", expression);
var evaluateCommand = CommandFactory.CreateEvaluateCommand(predicateExpression);
try {
await Client.SendRequestAsync(evaluateCommand);
} catch (Exception) {
return false;
}
return evaluateCommand.Result != null &&
evaluateCommand.Result.Type == NodeExpressionType.Boolean &&
evaluateCommand.Result.StringValue == "true";
}
=======
#region Source Map Support
/// <summary>
/// Maps a line number from the original code to the generated JavaScript.
///
/// Line numbers are zero based.
/// </summary>
internal void MapToJavaScript(string requestedFileName, int requestedLineNo, out string fileName, out int lineNo) {
fileName = requestedFileName;
lineNo = requestedLineNo;
SourceMap sourceMap = GetSourceMap(requestedFileName);
if (sourceMap != null) {
SourceMapping result;
if (sourceMap.TryMapPointBack(requestedLineNo, 0, out result)) {
lineNo = result.Line;
fileName = Path.Combine(Path.GetDirectoryName(fileName), result.FileName);
Debug.WriteLine("Mapped breakpoint from {0} {1} to {2} {3}", requestedFileName, requestedLineNo, fileName, lineNo);
}
}
}
class JavaScriptSourceMapInfo {
public readonly string[] Lines;
public readonly SourceMap Map;
public JavaScriptSourceMapInfo(SourceMap map, string[] lines) {
Map = map;
Lines = lines;
}
}
/// <summary>
/// Gets a source mapping for the given filename. Line numbers are zero based.
/// </summary>
internal SourceMapping MapToOriginal(string filename, int line) {
JavaScriptSourceMapInfo mapInfo;
if (!_originalFileToSourceMap.TryGetValue(filename, out mapInfo)) {
if (File.Exists(filename)) {
var contents = File.ReadAllLines(filename);
const string marker = "# sourceMappingURL=";
int markerStart;
var markerLine = contents.Reverse().FirstOrDefault(x => x.IndexOf(marker) != -1);
if (markerLine != null && (markerStart = markerLine.IndexOf(marker)) != -1) {
string sourceMapFilename = markerLine.Substring(markerStart + marker.Length).Trim();
if (!File.Exists(sourceMapFilename)) {
sourceMapFilename = Path.Combine(Path.GetDirectoryName(filename), Path.GetFileName(sourceMapFilename));
}
if (File.Exists(sourceMapFilename)) {
try {
_originalFileToSourceMap[filename] = mapInfo = new JavaScriptSourceMapInfo(new SourceMap(new StreamReader(sourceMapFilename)), contents);
} catch (InvalidOperationException) {
_originalFileToSourceMap[filename] = null;
} catch (NotSupportedException) {
_originalFileToSourceMap[filename] = null;
}
}
}
}
}
if (mapInfo != null) {
SourceMapping mapping;
int column = 0;
if (line < mapInfo.Lines.Length) {
var lineText = mapInfo.Lines[line];
// map to the 1st non-whitespace character on the line
// This ensures we get the correct line number, mapping to column 0
// can give us the previous line.
if (!String.IsNullOrWhiteSpace(lineText)) {
for (; column < lineText.Length; column++) {
if (!Char.IsWhiteSpace(lineText[column])) {
break;
}
}
}
}
if (mapInfo.Map.TryMapPoint(line, column, out mapping)) {
return mapping;
}
}
return null;
}
private SourceMap GetSourceMap(string fileName) {
SourceMap sourceMap;
if (!_generatedFileToSourceMap.TryGetValue(fileName, out sourceMap)) {
// see if we are using source maps for this file.
if (!String.Equals(Path.GetExtension(fileName), NodejsConstants.FileExtension, StringComparison.OrdinalIgnoreCase)) {
string baseFile = fileName.Substring(0, fileName.Length - Path.GetExtension(fileName).Length);
if (File.Exists(baseFile + ".js") && File.Exists(baseFile + ".js.map")) {
// we're using source maps...
try {
_generatedFileToSourceMap[fileName] = sourceMap = new SourceMap(new StreamReader(baseFile + ".js.map"));
} catch (NotSupportedException) {
_generatedFileToSourceMap[fileName] = null;
} catch (InvalidOperationException) {
_generatedFileToSourceMap[fileName] = null;
}
} else {
_generatedFileToSourceMap[fileName] = null;
}
}
}
return sourceMap;
}
#endregion
>>>>>>>
internal async Task<bool> TestPredicateAsync(string expression) {
DebugWriteCommand("TestPredicate: " + expression);
var predicateExpression = string.Format("Boolean({0})", expression);
var evaluateCommand = CommandFactory.CreateEvaluateCommand(predicateExpression);
try {
await Client.SendRequestAsync(evaluateCommand);
} catch (Exception) {
return false;
}
return evaluateCommand.Result != null &&
evaluateCommand.Result.Type == NodeExpressionType.Boolean &&
evaluateCommand.Result.StringValue == "true";
}
#region Source Map Support
/// <summary>
/// Maps a line number from the original code to the generated JavaScript.
///
/// Line numbers are zero based.
/// </summary>
internal void MapToJavaScript(string requestedFileName, int requestedLineNo, out string fileName, out int lineNo) {
fileName = requestedFileName;
lineNo = requestedLineNo;
SourceMap sourceMap = GetSourceMap(requestedFileName);
if (sourceMap != null) {
SourceMapping result;
if (sourceMap.TryMapPointBack(requestedLineNo, 0, out result)) {
lineNo = result.Line;
fileName = Path.Combine(Path.GetDirectoryName(fileName), result.FileName);
Debug.WriteLine("Mapped breakpoint from {0} {1} to {2} {3}", requestedFileName, requestedLineNo, fileName, lineNo);
}
}
}
class JavaScriptSourceMapInfo {
public readonly string[] Lines;
public readonly SourceMap Map;
public JavaScriptSourceMapInfo(SourceMap map, string[] lines) {
Map = map;
Lines = lines;
}
}
/// <summary>
/// Gets a source mapping for the given filename. Line numbers are zero based.
/// </summary>
public SourceMapping MapToOriginal(string filename, int line) {
JavaScriptSourceMapInfo mapInfo;
if (!_originalFileToSourceMap.TryGetValue(filename, out mapInfo)) {
if (File.Exists(filename)) {
var contents = File.ReadAllLines(filename);
const string marker = "# sourceMappingURL=";
int markerStart;
var markerLine = contents.Reverse().FirstOrDefault(x => x.IndexOf(marker) != -1);
if (markerLine != null && (markerStart = markerLine.IndexOf(marker)) != -1) {
string sourceMapFilename = markerLine.Substring(markerStart + marker.Length).Trim();
if (!File.Exists(sourceMapFilename)) {
sourceMapFilename = Path.Combine(Path.GetDirectoryName(filename), Path.GetFileName(sourceMapFilename));
}
if (File.Exists(sourceMapFilename)) {
try {
_originalFileToSourceMap[filename] = mapInfo = new JavaScriptSourceMapInfo(new SourceMap(new StreamReader(sourceMapFilename)), contents);
} catch (InvalidOperationException) {
_originalFileToSourceMap[filename] = null;
} catch (NotSupportedException) {
_originalFileToSourceMap[filename] = null;
}
}
}
}
}
if (mapInfo != null) {
SourceMapping mapping;
int column = 0;
if (line < mapInfo.Lines.Length) {
var lineText = mapInfo.Lines[line];
// map to the 1st non-whitespace character on the line
// This ensures we get the correct line number, mapping to column 0
// can give us the previous line.
if (!String.IsNullOrWhiteSpace(lineText)) {
for (; column < lineText.Length; column++) {
if (!Char.IsWhiteSpace(lineText[column])) {
break;
}
}
}
}
if (mapInfo.Map.TryMapPoint(line, column, out mapping)) {
return mapping;
}
}
return null;
}
private SourceMap GetSourceMap(string fileName) {
SourceMap sourceMap;
if (!_generatedFileToSourceMap.TryGetValue(fileName, out sourceMap)) {
// see if we are using source maps for this file.
if (!String.Equals(Path.GetExtension(fileName), NodejsConstants.FileExtension, StringComparison.OrdinalIgnoreCase)) {
string baseFile = fileName.Substring(0, fileName.Length - Path.GetExtension(fileName).Length);
if (File.Exists(baseFile + ".js") && File.Exists(baseFile + ".js.map")) {
// we're using source maps...
try {
_generatedFileToSourceMap[fileName] = sourceMap = new SourceMap(new StreamReader(baseFile + ".js.map"));
} catch (NotSupportedException) {
_generatedFileToSourceMap[fileName] = null;
} catch (InvalidOperationException) {
_generatedFileToSourceMap[fileName] = null;
}
} else {
_generatedFileToSourceMap[fileName] = null;
}
}
}
return sourceMap;
}
#endregion |
<<<<<<<
=======
string testFileAbsolutePath = fileAbsolutePath;
bool typeScriptTest = false;
>>>>>>>
bool typeScriptTest = false; |
<<<<<<<
public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
{
=======
/// <summary>
/// This is the equivalent of "Run Selected Tests" functionality.
/// </summary>
/// <param name="tests">The list of TestCases selected to run</param>
/// <param name="runContext">Defines the settings related to the current run</param>
/// <param name="frameworkHandle">Handle to framework. Used for recording results</param>
public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
{
>>>>>>>
/// <summary>
/// This is the equivalent of "Run Selected Tests" functionality.
/// </summary>
/// <param name="tests">The list of TestCases selected to run</param>
/// <param name="runContext">Defines the settings related to the current run</param>
/// <param name="frameworkHandle">Handle to framework. Used for recording results</param>
public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
{
<<<<<<<
private void RunTestCases(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
{
=======
private void RunTestCases(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle, NodejsProjectSettings settings) {
>>>>>>>
private void RunTestCases(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle, NodejsProjectSettings settings)
{
<<<<<<<
using (var app = VisualStudioApp.FromEnvironmentVariable(NodejsConstants.NodeToolsProcessIdEnvironmentVariable))
{
=======
if (tests.Count() == 0)
{
return;
}
using (var app = VisualStudioApp.FromEnvironmentVariable(NodejsConstants.NodeToolsProcessIdEnvironmentVariable)) {
int port = 0;
List<string> nodeArgs = new List<string>();
>>>>>>>
if (tests.Count() == 0)
{
return;
}
using (var app = VisualStudioApp.FromEnvironmentVariable(NodejsConstants.NodeToolsProcessIdEnvironmentVariable))
{
var port = 0;
var nodeArgs = new List<string>();
<<<<<<<
//Debug.Fail("attach debugger");
if (!File.Exists(settings.NodeExePath))
{
frameworkHandle.SendMessage(TestMessageLevel.Error, "Interpreter path does not exist: " + settings.NodeExePath);
return;
}
lock (_syncObject)
{
=======
>>>>>>>
<<<<<<<
_nodeProcess.Wait(TimeSpan.FromMilliseconds(500));
if (runContext.IsBeingDebugged && app != null)
{
try
{
=======
if (runContext.IsBeingDebugged && app != null) {
try {
>>>>>>>
if (runContext.IsBeingDebugged && app != null)
{
try
{
<<<<<<<
string qualifierUri = string.Format(CultureInfo.InvariantCulture, "tcp://localhost:{0}#ping=0", port);
while (!app.AttachToProcess(_nodeProcess, NodejsRemoteDebugPortSupplierUnsecuredId, qualifierUri))
{
if (_nodeProcess.Wait(TimeSpan.FromMilliseconds(500)))
{
=======
string qualifierUri = string.Format("tcp://localhost:{0}#ping=0", port);
while (!app.AttachToProcess(_nodeProcess, NodejsRemoteDebugPortSupplierUnsecuredId, qualifierUri)) {
if (_nodeProcess.Wait(TimeSpan.FromMilliseconds(500))) {
>>>>>>>
var qualifierUri = string.Format("tcp://localhost:{0}#ping=0", port);
while (!app.AttachToProcess(_nodeProcess, NodejsRemoteDebugPortSupplierUnsecuredId, qualifierUri))
{
if (_nodeProcess.Wait(TimeSpan.FromMilliseconds(500)))
{
<<<<<<<
private static void RecordEnd(IFrameworkHandle frameworkHandle, TestCase test, TestResult result, string stdout, string stderr, TestOutcome outcome)
{
=======
private void RecordEnd(IFrameworkHandle frameworkHandle, TestCase test, TestResult result, ResultObject resultObject) {
String[] standardOutputLines = resultObject.stdout.Split('\n');
String[] standardErrorLines = resultObject.stderr.Split('\n');
>>>>>>>
private void RecordEnd(IFrameworkHandle frameworkHandle, TestCase test, TestResult result, ResultObject resultObject)
{
var standardOutputLines = resultObject.stdout.Split('\n');
var standardErrorLines = resultObject.stderr.Split('\n');
<<<<<<<
}
=======
public string framework { get; set; }
public string testName { get; set; }
public string testFile { get; set; }
public string workingFolder { get; set; }
public string projectFolder { get; set; }
}
>>>>>>>
public string framework { get; set; }
public string testName { get; set; }
public string testFile { get; set; }
public string workingFolder { get; set; }
public string projectFolder { get; set; }
} |
<<<<<<<
public static string NodeExePath => GetPathToNodeExecutableFromEnvironment();
=======
public static Version GetNodeVersion(string path)
{
if (!string.IsNullOrEmpty(path))
{
var versionString = FileVersionInfo.GetVersionInfo(path).ProductVersion;
Version version;
if (Version.TryParse(versionString, out version))
{
return version;
}
}
return default(Version);
}
public static string NodeExePath {
get {
return GetPathToNodeExecutableFromEnvironment();
}
}
>>>>>>>
public static Version GetNodeVersion(string path)
{
if (!string.IsNullOrEmpty(path))
{
var versionString = FileVersionInfo.GetVersionInfo(path).ProductVersion;
Version version;
if (Version.TryParse(versionString, out version))
{
return version;
}
}
return default(Version);
}
public static string NodeExePath => GetPathToNodeExecutableFromEnvironment(); |
<<<<<<<
private static async Task<bool> DownloadTypings(
string pathToRootNpmDirectory,
string pathToRootProjectDirectory,
IEnumerable<string> packages,
Redirector redirector) {
=======
private async Task<bool> DownloadTypings(IEnumerable<IPackage> packages, Redirector redirector) {
>>>>>>>
private async Task<bool> DownloadTypings(IEnumerable<string> packages, Redirector redirector) {
<<<<<<<
private static IEnumerable<string> TsdInstallArguments(IEnumerable<string> packages) {
return new[] { "install", }.Concat(packages).Concat(new[] { "--save" });
=======
private async Task<string> EnsureTsdInstalled() {
var tsdPath = Path.Combine(_pathToRootNpmDirectory, TsdExe);
if (File.Exists(tsdPath)) {
return tsdPath;
}
if (_didTryToInstallTsd) {
return null;
} else {
_didTryToInstallTsd = true;
if (!await TryInstallTsd()) {
return null;
}
return await EnsureTsdInstalled();
}
}
private async Task<bool> TryInstallTsd() {
using (var commander = _npmController.CreateNpmCommander()) {
return await commander.InstallGlobalPackageByVersionAsync(Tsd, "*");
}
}
private static IEnumerable<string> TsdInstallArguments(IEnumerable<IPackage> packages) {
return new[] { "install", }.Concat(packages.Select(GetPackageTsdName)).Concat(new[] { "--save" });
>>>>>>>
private async Task<string> EnsureTsdInstalled() {
var tsdPath = Path.Combine(_pathToRootNpmDirectory, TsdExe);
if (File.Exists(tsdPath)) {
return tsdPath;
}
if (_didTryToInstallTsd) {
return null;
} else {
_didTryToInstallTsd = true;
if (!await TryInstallTsd()) {
return null;
}
return await EnsureTsdInstalled();
}
}
private async Task<bool> TryInstallTsd() {
using (var commander = _npmController.CreateNpmCommander()) {
return await commander.InstallGlobalPackageByVersionAsync(Tsd, "*");
}
}
private static IEnumerable<string> TsdInstallArguments(IEnumerable<string> packages) {
return new[] { "install", }.Concat(packages).Concat(new[] { "--save" }); |
<<<<<<<
using Newtonsoft.Json.Linq;
using Raven.Abstractions.MEF;
=======
>>>>>>>
using Raven.Abstractions.MEF; |
<<<<<<<
#if !NET35
=======
/// <summary>
/// Load documents with the specified key prefix
/// </summary>
IEnumerable<T> LoadStartingWith<T>(string keyPrefix, int start = 0, int pageSize = 25);
#if !NET_3_5
>>>>>>>
/// <summary>
/// Load documents with the specified key prefix
/// </summary>
IEnumerable<T> LoadStartingWith<T>(string keyPrefix, int start = 0, int pageSize = 25);
#if !NET35 |
<<<<<<<
public JsonDocument[] StartsWith(string keyPrefix, int start, int pageSize, bool metadataOnly = false)
=======
public JsonDocument[] StartsWith(string keyPrefix, string matches, int start, int pageSize)
>>>>>>>
public JsonDocument[] StartsWith(string keyPrefix, string matches, int start, int pageSize, bool metadataOnly = false)
<<<<<<<
return ExecuteWithReplication("GET", u => DirectStartsWith(u, keyPrefix, start, pageSize, metadataOnly));
=======
return ExecuteWithReplication("GET", u => DirectStartsWith(u, keyPrefix, matches, start, pageSize));
>>>>>>>
return ExecuteWithReplication("GET", u => DirectStartsWith(u, keyPrefix, matches, start, pageSize, metadataOnly)); |
<<<<<<<
public bool Remove(RavenJToken token)
{
return Items.Remove(token);
}
public void RemoveAt(int index)
{
Items.RemoveAt(index);
}
public void Insert(int index, RavenJToken token)
{
Items.Insert(index, token);
}
public override IEnumerable<T> Values<T>()
{
return Items.Convert<T>();
}
=======
internal void AddForCloning(string key, RavenJToken token)
{
Add(token);
}
>>>>>>>
public bool Remove(RavenJToken token)
{
return Items.Remove(token);
}
public void RemoveAt(int index)
{
Items.RemoveAt(index);
}
public void Insert(int index, RavenJToken token)
{
Items.Insert(index, token);
}
public override IEnumerable<T> Values<T>()
{
return Items.Convert<T>();
}
internal void AddForCloning(string key, RavenJToken token)
{
Add(token);
} |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.