Skip approval and PdbGit for TFMs not built

And upgrade ApprovalTests
FakeItEasy · Oct 22, 2019 · 22b25d8 · 22b25d8
1 parent 02cb42c
commit 22b25d8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/tests/FakeItEasy.Tests.Approval/ApiApproval.cs b/tests/FakeItEasy.Tests.Approval/ApiApproval.cs
@@ -13,7 +13,7 @@ namespace FakeItEasy.Tests.Approval
 
     public class ApiApproval
     {
-        [Theory]
+        [SkippableTheory]
         [InlineData("FakeItEasy", "net40")]
         [InlineData("FakeItEasy", "net45")]
         [InlineData("FakeItEasy", "netstandard1.6")]
@@ -36,6 +36,8 @@ public void ApproveApi(string projectName, string frameworkVersion)
                     GetSourceDirectory(),
                     $@"..\..\src\{projectName}\bin\{configurationName}\{frameworkVersion}\{projectName}.dll"));
 
+            Skip.IfNot(File.Exists(assemblyFile), "Assembly doesn't exist.");
+
             var assembly = Assembly.LoadFile(Path.GetFullPath(assemblyFile));
             var publicApi = ApiGenerator.GeneratePublicApi(assembly);
 

diff --git a/tests/FakeItEasy.Tests.Approval/FakeItEasy.Tests.Approval.csproj b/tests/FakeItEasy.Tests.Approval/FakeItEasy.Tests.Approval.csproj
@@ -6,9 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ApprovalTests" Version="3.0.11" />
-    <PackageReference Include="ApprovalUtilities" Version="3.0.11" />
+    <PackageReference Include="ApprovalTests" Version="4.2.2" />
+    <PackageReference Include="ApprovalUtilities" Version="4.2.2" />
     <PackageReference Include="PublicApiGenerator" Version="9.3.0" />
+    <PackageReference Include="Xunit.SkippableFact" Version="1.3.12" />
   </ItemGroup>
 
 </Project>
diff --git a/tools/FakeItEasy.Build/Program.cs b/tools/FakeItEasy.Build/Program.cs
@@ -80,7 +80,7 @@ public static void Main(string[] args)
             Target(
                 "pdbgit",
                 DependsOn("build"),
-                forEach: Pdbs,
+                forEach: Pdbs.Where(pdb => File.Exists(pdb.Path)),
                 action: pdb => Run(ToolPaths.PdbGit, $"-u https://github.com/FakeItEasy/FakeItEasy -s {pdb.Path}"));
 
             RunTargetsAndExit(args, messageOnly: ex => ex is NonZeroExitCodeException);