Merge branch 'main' of https://github.com/VerifyTests/DiffEngine

SimonCropp · SimonCropp · commit d01264e5123e · 2023-11-23T21:28:11.000+11:00
diff --git a/src/DiffEngine/EnvironmentHelper.cs b/src/DiffEngine/EnvironmentHelper.cs
@@ -0,0 +1,8 @@
+﻿static class EnvironmentHelper
+{
+    public static void Set(string name, string? value)
+    {
+        Environment.SetEnvironmentVariable(name, value, EnvironmentVariableTarget.User);
+        Environment.SetEnvironmentVariable(name, value, EnvironmentVariableTarget.Process);
+    }
+}
diff --git a/src/DiffEngine/MaxInstance.cs b/src/DiffEngine/MaxInstance.cs
@@ -1,12 +1,15 @@
 static class MaxInstance
 {
     public static int MaxInstancesToLaunch => capturedMaxInstancesToLaunch ??= GetMaxInstances();
+
     static int? capturedMaxInstancesToLaunch;
     static int? appDomainMaxInstancesToLaunch;
     static int launchedInstances;
     const int defaultMax = 5;
 
-    static int GetMaxInstances() => GetEnvironmentValue() ?? appDomainMaxInstancesToLaunch ?? defaultMax;
+    static int GetMaxInstances() => GetEnvironmentValue() ??
+                                    appDomainMaxInstancesToLaunch ??
+                                    defaultMax;
 
     static int? GetEnvironmentValue()
     {
@@ -37,7 +40,7 @@ public static void SetForAppDomain(int value)
     public static void SetForUser(int value)
     {
         Guard.AgainstNegativeAndZero(value, nameof(value));
-        Environment.SetEnvironmentVariable("DiffEngine_MaxInstances", value.ToString(), EnvironmentVariableTarget.User);
+        EnvironmentHelper.Set("DiffEngine_MaxInstances", value.ToString());
         ResetCapturedValue();
     }
 
diff --git a/src/DiffEngine/TargetPosition.cs b/src/DiffEngine/TargetPosition.cs
@@ -45,6 +45,6 @@ public static void SetTargetOnLeft(bool value)
             envVariable = null;
         }
 
-        Environment.SetEnvironmentVariable("DiffEngine_TargetOnLeft", envVariable, EnvironmentVariableTarget.User);
+        EnvironmentHelper.Set("DiffEngine_TargetOnLeft", envVariable);
     }
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649</NoWarn>
-    <Version>13.0.0</Version>
+    <Version>13.0.1</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Testing, Snapshot, Diff, Compare</PackageTags>
     <Description>Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.</Description>

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,15 @@`
`1`	`1`	`static class MaxInstance`
`2`	`2`	`{`
`3`	`3`	`public static int MaxInstancesToLaunch => capturedMaxInstancesToLaunch ??= GetMaxInstances();`
	`4`	`+`
`4`	`5`	`static int? capturedMaxInstancesToLaunch;`
`5`	`6`	`static int? appDomainMaxInstancesToLaunch;`
`6`	`7`	`static int launchedInstances;`
`7`	`8`	`const int defaultMax = 5;`
`8`	`9`
`9`		`- static int GetMaxInstances() => GetEnvironmentValue() ?? appDomainMaxInstancesToLaunch ?? defaultMax;`
	`10`	`+ static int GetMaxInstances() => GetEnvironmentValue() ??`
	`11`	`+ appDomainMaxInstancesToLaunch ??`
	`12`	`+ defaultMax;`
`10`	`13`
`11`	`14`	`static int? GetEnvironmentValue()`
`12`	`15`	`{`
`@@ -37,7 +40,7 @@ public static void SetForAppDomain(int value)`
`37`	`40`	`public static void SetForUser(int value)`
`38`	`41`	`{`
`39`	`42`	`Guard.AgainstNegativeAndZero(value, nameof(value));`
`40`		`- Environment.SetEnvironmentVariable("DiffEngine_MaxInstances", value.ToString(), EnvironmentVariableTarget.User);`
	`43`	`+ EnvironmentHelper.Set("DiffEngine_MaxInstances", value.ToString());`
`41`	`44`	`ResetCapturedValue();`
`42`	`45`	`}`
`43`	`46`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@ public static void SetTargetOnLeft(bool value)`
`45`	`45`	`envVariable = null;`
`46`	`46`	`}`
`47`	`47`
`48`		`- Environment.SetEnvironmentVariable("DiffEngine_TargetOnLeft", envVariable, EnvironmentVariableTarget.User);`
	`48`	`+ EnvironmentHelper.Set("DiffEngine_TargetOnLeft", envVariable);`
`49`	`49`	`}`
`50`	`50`	`}`