Merge branch 'main' into Update-DiffEngineTray-to-net10

Author: SimonCropp

src/DiffEngine.Tests/DiffToolsTest.cs

@@ -78,28 +78,22 @@ public void TextConvention()
         Assert.Equal("MyCustomDiffTool", tool.Name);
     }
 
-// #if DEBUG
-//     [Fact]
-//     public void AddToolBasedOn()
-//     {
-//         #region AddToolBasedOn
-//
-//         var resolvedTool = DiffTools.AddToolBasedOn(
-//             DiffTool.VisualStudio,
-//             name: "MyCustomDiffTool",
-//             launchArguments: new(
-//                 Left: (temp, target) => $"\"custom args \"{target}\" \"{temp}\"",
-//                 Right: (temp, target) => $"\"custom args \"{temp}\" \"{target}\""))!;
-//
-//         #endregion
-//
-//         Assert.Equal(resolvedTool, DiffTools.Resolved.First());
-//         Assert.True(DiffTools.TryFindByExtension(".txt", out var forExtension));
-//         Assert.Equal(resolvedTool, forExtension);
-//         Assert.Equal("\"custom args \"bar\" \"foo\"", resolvedTool.LaunchArguments.Left("foo", "bar"));
-//         Assert.Equal("\"custom args \"foo\" \"bar\"", resolvedTool.LaunchArguments.Right("foo", "bar"));
-//     }
-// #endif
+#if DEBUG
+     [Fact]
+     public void AddToolBasedOn()
+     {
+         #region AddToolBasedOn
+
+         var resolvedTool = DiffTools.AddToolBasedOn(
+             DiffTool.VisualStudio,
+             name: "MyCustomDiffTool",
+             launchArguments: new(
+                 Left: (temp, target) => $"\"custom args \"{target}\" \"{temp}\"",
+                 Right: (temp, target) => $"\"custom args \"{temp}\" \"{target}\""))!;
+
+         #endregion
+     }
+#endif
     static async Task AddToolAndLaunch()
     {
         #region AddToolAndLaunch

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649;NU1608;NU1109</NoWarn>
-    <Version>16.10.0</Version>
+    <Version>17.0.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>