Fix empty file resolution on MacOs (#80)

VerifyTests · Apr 7, 2020 · eb83c36 · eb83c36
1 parent c9278b4
commit eb83c36
Show file tree

Hide file tree

Showing 24 changed files with 98 additions and 25 deletions.
diff --git a/docs/diff-tool.md b/docs/diff-tool.md
@@ -87,6 +87,10 @@ This behavior is currently supported on Windows. On Linux and OSX, diff tool ins
 
  * `%ProgramFiles%\JetBrains\JetBrains Rider *\bin\rider64.exe`
 
+### OSX scanned paths:
+
+ * `/Applications/Rider*/Contents/MacOS/rider`
+
 ## [VisualStudio](https://docs.microsoft.com/en-us/visualstudio/ide/reference/diff)
 
   * IsMdi: True

diff --git a/src/DiffEngine.Tests/DiffEngine.Tests.csproj b/src/DiffEngine.Tests/DiffEngine.Tests.csproj
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

diff --git a/src/DiffEngine.Tests/DiffToolsTest.cs b/src/DiffEngine.Tests/DiffToolsTest.cs
@@ -65,6 +65,7 @@ public void WriteFoundTools()
                     writer.WriteLine($@" * `{path}`");
                 }
             }
+
             if (!tool.BinaryExtensions.Any())
             {
                 continue;
@@ -114,6 +115,8 @@ public void ExtensionLookup()
             Debug.WriteLine($"{tool.Key}: {tool.Value.Name}");
         }
     }
+
+#if DEBUG
     [Fact]
     public void TryFind()
     {
@@ -132,6 +135,7 @@ public void TryFind()
         Assert.False(DiffTools.TryFind(DiffTool.Kaleidoscope, "txt", out resolved));
         Assert.Null(resolved);
     }
+#endif
 
     public DiffToolsTest(ITestOutputHelper output) :
         base(output)

diff --git a/src/DiffEngine.Tests/ProcessCleanupTests.cs b/src/DiffEngine.Tests/ProcessCleanupTests.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics;
+#if DEBUG
+using System.Diagnostics;
 using System.Linq;
 using DiffEngine;
 using VerifyXunit;
@@ -22,4 +23,5 @@ public ProcessCleanupTests(ITestOutputHelper output) :
         base(output)
     {
     }
-}
+}
+#endif
diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md
@@ -8,6 +8,10 @@
 
  * `%ProgramFiles%\JetBrains\JetBrains Rider *\bin\rider64.exe`
 
+### OSX scanned paths:
+
+ * `/Applications/Rider*/Contents/MacOS/rider`
+
 ## [VisualStudio](https://docs.microsoft.com/en-us/visualstudio/ide/reference/diff)
 
   * IsMdi: True

diff --git a/src/DiffEngine/DiffEngine.csproj b/src/DiffEngine/DiffEngine.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Verify\Helpers\Guard.cs" Link="Guard.cs" />
-    <PackageReference Include="EmptyFiles" Version="1.0.0" PrivateAssets="None" />
+    <PackageReference Include="EmptyFiles" Version="1.0.1" PrivateAssets="None" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
     <PackageReference Include="ProjectDefaults" Version="1.0.42" PrivateAssets="All" />
     <PackageReference Include="Nullable" Version="1.2.1" PrivateAssets="All" />

diff --git a/src/DiffEngine/ProcessCleanup.cs b/src/DiffEngine/ProcessCleanup.cs
@@ -21,7 +21,6 @@ static ProcessCleanup()
 
         public static void Refresh()
         {
-            Thread.Sleep(100);
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 commands = FindAll().ToList();

diff --git a/src/DiffEngine/ToolDefinition.cs b/src/DiffEngine/ToolDefinition.cs
@@ -19,7 +19,8 @@ class ToolDefinition
     public string[] OsxExePaths { get; }
     public bool SupportsText { get; }
 
-    public ToolDefinition(DiffTool name,
+    public ToolDefinition(
+        DiffTool name,
         string url,
         bool supportsAutoRefresh,
         bool isMdi,

diff --git a/src/FakeDiffTool/FakeDiffTool.csproj b/src/FakeDiffTool/FakeDiffTool.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
-    <AppendTargetFrameworkToOutputPath >false</AppendTargetFrameworkToOutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>bin</OutputPath>
   </PropertyGroup>
 

diff --git a/src/Verify.Bunit/Verify.Bunit.csproj b/src/Verify.Bunit/Verify.Bunit.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <Content Include="buildMultiTargeting.targets" PackagePath="buildMultiTargeting\Verify.Bunit.targets" />
     <Content Include="build.targets" PackagePath="build\Verify.Bunit.targets" />
-    <PackageReference Include="EmptyFiles" Version="1.0.0" PrivateAssets="None" />
+    <PackageReference Include="EmptyFiles" Version="1.0.1" PrivateAssets="None" />
     <PackageReference Include="xunit.assert" Version="2.4.1" />
     <PackageReference Include="XunitContext" Version="1.9.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

diff --git a/src/Verify.Integration.Tests/AssemblyLocation.cs b/src/Verify.Integration.Tests/AssemblyLocation.cs
@@ -0,0 +1,17 @@
+using System;
+using System.IO;
+
+static class AssemblyLocation
+{
+    static AssemblyLocation()
+    {
+        var assembly = typeof(AssemblyLocation).Assembly;
+
+        var uri = new UriBuilder(assembly.CodeBase!);
+        var path = Uri.UnescapeDataString(uri.Path);
+
+        CurrentDirectory = Path.GetDirectoryName(path)!;
+    }
+
+    public static string CurrentDirectory;
+}
diff --git a/src/Verify.Integration.Tests/Tests.cs b/src/Verify.Integration.Tests/Tests.cs
@@ -1,4 +1,5 @@
-using System;
+#if DEBUG
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -21,7 +22,7 @@ public partial class Tests :
     static Tests()
     {
         BuildServerDetector.Detected = false;
-        var diffToolPath = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, "../../../../FakeDiffTool/bin/FakeDiffTool.exe"));
+        var diffToolPath = Path.GetFullPath(Path.Combine(AssemblyLocation.CurrentDirectory, "../../../../FakeDiffTool/bin/FakeDiffTool.exe"));
         tool = new ResolvedDiffTool(
             name: DiffTool.VisualStudio,
             exePath: diffToolPath,
@@ -131,4 +132,5 @@ public Tests(ITestOutputHelper output) :
     {
         ClipboardCapture.Clear();
     }
-}
+}
+#endif
diff --git a/src/Verify.Integration.Tests/Tests_Single.cs b/src/Verify.Integration.Tests/Tests_Single.cs
@@ -1,4 +1,5 @@
-using System;
+#if DEBUG
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using DiffEngine;
@@ -132,4 +133,5 @@ async Task InitialVerify(Func<object> target, bool hasMatchingDiffTool, VerifySe
             AssertExists(pair.Received);
         }
     }
-}
+}
+#endif
diff --git a/src/Verify.Integration.Tests/Tests_Split.cs b/src/Verify.Integration.Tests/Tests_Split.cs
@@ -1,4 +1,6 @@
-using System.IO;
+#if DEBUG
+
+using System.IO;
 using System.Threading.Tasks;
 using DiffEngine;
 using Verify;
@@ -122,4 +124,5 @@ async Task InitialVerifySplit(TypeToSplit target, bool hasMatchingDiffTool, Veri
             AssertExists(file2.Received);
         }
     }
-}
+}
+#endif
diff --git a/src/Verify.MSTest.Tests/Verify.MSTest.Tests.csproj b/src/Verify.MSTest.Tests/Verify.MSTest.Tests.csproj
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

diff --git a/src/Verify.MSTest/Verify.MSTest.csproj b/src/Verify.MSTest/Verify.MSTest.csproj
@@ -1,13 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0436</NoWarn>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net472</TargetFrameworks>
+  </PropertyGroup>
   <ItemGroup>
     <Content Include="buildMultiTargeting.targets" PackagePath="buildMultiTargeting\Verify.MSTest.targets" />
     <Content Include="build.targets" PackagePath="build\Verify.MSTest.targets" />
     <Compile Include="..\Shared\*.cs" />
-    <PackageReference Include="EmptyFiles" Version="1.0.0" PrivateAssets="None" />
+    <PackageReference Include="EmptyFiles" Version="1.0.1" PrivateAssets="None" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ProjectDefaults" Version="1.0.42" PrivateAssets="All" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />

diff --git a/src/Verify.NUnit.Tests/Verify.NUnit.Tests.csproj b/src/Verify.NUnit.Tests/Verify.NUnit.Tests.csproj
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

diff --git a/src/Verify.NUnit/Verify.NUnit.csproj b/src/Verify.NUnit/Verify.NUnit.csproj
@@ -1,12 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <TargetFrameworks>netstandard2.0;netstandard2.1;net472</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="build.targets" PackagePath="build\Verify.NUnit.targets" />
     <Content Include="buildMultiTargeting.targets" PackagePath="buildMultiTargeting\Verify.NUnit.targets" />
     <Compile Include="..\Shared\*.cs" />
-    <PackageReference Include="EmptyFiles" Version="1.0.0" PrivateAssets="None" />
+    <PackageReference Include="EmptyFiles" Version="1.0.1" PrivateAssets="None" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ProjectDefaults" Version="1.0.42" PrivateAssets="All" />

diff --git a/src/Verify.Tests/Converters/ExtensionConverterTests.cs b/src/Verify.Tests/Converters/ExtensionConverterTests.cs
@@ -1,4 +1,4 @@
-#if(NETCOREAPP3_1)
+#if(NETCOREAPP3_1 && DEBUG)
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;

diff --git a/src/Verify.Tests/Verify.Tests.csproj b/src/Verify.Tests/Verify.Tests.csproj
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <NoWarn>CS8002</NoWarn>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
+    <Compile Remove="Converters\TypeConverterTests.cs" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Shipwreck.Phash.Bitmaps" Version="0.5.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />

diff --git a/src/Verify.Xunit.Tests/Verify.Xunit.Tests.csproj b/src/Verify.Xunit.Tests/Verify.Xunit.Tests.csproj
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

diff --git a/src/Verify.Xunit/Verify.Xunit.csproj b/src/Verify.Xunit/Verify.Xunit.csproj
@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <TargetFrameworks>netstandard2.0;netstandard2.1;net472</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="build.targets" PackagePath="build\Verify.Xunit.targets" />
     <Content Include="buildMultiTargeting.targets" PackagePath="buildMultiTargeting\Verify.Xunit.targets" />
-    <PackageReference Include="EmptyFiles" Version="1.0.0" PrivateAssets="None" />
+    <PackageReference Include="EmptyFiles" Version="1.0.1" PrivateAssets="None" />
     <PackageReference Include="xunit.assert" Version="2.4.1" />
     <PackageReference Include="XunitContext" Version="1.9.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

diff --git a/src/Verify/Verify.csproj b/src/Verify/Verify.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <TargetFrameworks>netstandard2.0;netstandard2.1;net472</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/appveyor.yml b/src/appveyor.yml
@@ -1,4 +1,6 @@
-image: Visual Studio 2019
+image:
+- macos
+- Visual Studio 2019
 skip_commits:
   message: /doco|Merge pull request.*/
 build_script: