VerifyTests · Mar 12, 2025 · Mar 12, 2025 · Mar 12, 2025 · Mar 12, 2025 · Mar 12, 2025
Showing with 15 additions and 13 deletions.

+2 −2 src/DiffEngine.Tests/DiffRunnerTests.cs

+3 −1 src/DiffEngine/DiffEngine.csproj

+5 −5 src/DiffEngine/OsSettingsResolver.cs

+1 −1 src/Directory.Build.props

+3 −3 src/Directory.Packages.props

+1 −1 src/global.json
diff --git a/src/DiffEngine.Tests/DiffRunnerTests.cs b/src/DiffEngine.Tests/DiffRunnerTests.cs
@@ -15,11 +15,11 @@ public async Task MaxInstancesToLaunch()
         {
             await Task.Delay(500);
             ProcessCleanup.Refresh();
-            var result = DiffRunner.Launch(file1, "fake.txt");
+            var result = await DiffRunner.LaunchAsync(file1, "fake.txt");
             await Task.Delay(300);
             Assert.Equal(LaunchResult.StartedNewInstance, result);
             ProcessCleanup.Refresh();
-            result = DiffRunner.Launch(file2, "fake.txt");
+            result = await DiffRunner.LaunchAsync(file2, "fake.txt");
             Assert.Equal(LaunchResult.TooManyRunningDiffTools, result);
             ProcessCleanup.Refresh();
             DiffRunner.Kill(file1, "fake.txt");

diff --git a/src/DiffEngine/DiffEngine.csproj b/src/DiffEngine/DiffEngine.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net472;net48;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net462;net472;net48;net9.0</TargetFrameworks>
     <TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
@@ -12,6 +12,8 @@
     <Using Include="System.Net.Sockets" />
     <Using Include="EmptyFiles" />
     <Using Include="System.ReadOnlySpan&lt;System.Char&gt;" Alias="CharSpan" />
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation"
+                      Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net472'" />
     <PackageReference Include="Caseless.Fody" PrivateAssets="All" />
     <PackageReference Include="EmptyFiles" PrivateAssets="None" />
     <PackageReference Include="Fody" PrivateAssets="all" />

diff --git a/src/DiffEngine/OsSettingsResolver.cs b/src/DiffEngine/OsSettingsResolver.cs
@@ -27,19 +27,19 @@ public static bool Resolve(
         [NotNullWhen(true)] out string? path,
         [NotNullWhen(true)] out LaunchArguments? launchArguments)
     {
-        if (TryResolveForOs(tool, osSupport.Windows, out path, OSPlatform.Windows))
+        if (TryResolveForOs(tool, osSupport.Windows, out path, "WINDOWS"))
         {
             launchArguments = osSupport.Windows.LaunchArguments;
             return true;
         }
 
-        if (TryResolveForOs(tool, osSupport.Linux, out path, OSPlatform.Linux))
+        if (TryResolveForOs(tool, osSupport.Linux, out path, "LINUX"))
         {
             launchArguments = osSupport.Linux.LaunchArguments;
             return true;
         }
 
-        if (TryResolveForOs(tool, osSupport.Osx, out path, OSPlatform.OSX))
+        if (TryResolveForOs(tool, osSupport.Osx, out path, "OSX"))
         {
             launchArguments = osSupport.Osx.LaunchArguments;
             return true;
@@ -54,11 +54,11 @@ static bool TryResolveForOs(
         string tool,
         [NotNullWhen(true)] OsSettings? os,
         [NotNullWhen(true)] out string? path,
-        OSPlatform platform)
+        string platform)
     {
         path = null;
 
-        if (os == null || !RuntimeInformation.IsOSPlatform(platform))
+        if (os == null || !OperatingSystemPolyfill.IsOSPlatform(platform))
         {
             return false;
         }

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649</NoWarn>
-    <Version>15.10.1</Version>
+    <Version>15.11.0</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>

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -4,9 +4,9 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Argon" Version="0.26.0" />
+    <PackageVersion Include="Argon" Version="0.27.0" />
     <PackageVersion Include="Caseless.Fody" Version="1.9.1" />
-    <PackageVersion Include="EmptyFiles" Version="8.7.1" />
+    <PackageVersion Include="EmptyFiles" Version="8.8.0" />
     <PackageVersion Include="Fody" Version="6.9.2" />
     <PackageVersion Include="MarkdownSnippets.MsBuild" Version="27.0.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
@@ -25,7 +25,7 @@
     <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
     <PackageVersion Include="Verify.ImageMagick" Version="3.6.0" />
     <PackageVersion Include="Verify.WinForms" Version="4.0.0" />
-    <PackageVersion Include="Verify.Xunit" Version="28.14.0" />
+    <PackageVersion Include="Verify.Xunit" Version="28.14.1" />
     <PackageVersion Include="Xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
     <PackageVersion Include="XunitContext" Version="3.3.2" />

diff --git a/src/global.json b/src/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.200",
+    "version": "9.0.201",
     "allowPrerelease": true,
     "rollForward": "latestFeature"
   }