Fix #1575: SarifSdkTest conversion test does not run

microsoft · Aug 14, 2019 · c5957ff · c5957ff
1 parent 8bc1e45
commit c5957ff
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 58 deletions.
diff --git a/src/Test.FunctionalTests.Sarif/Test.FunctionalTests.Sarif.csproj b/src/Test.FunctionalTests.Sarif/Test.FunctionalTests.Sarif.csproj
@@ -2816,6 +2816,12 @@
     <None Include="v2\ConverterTestData\FxCop\FxCopNoTargets.xml.sarif">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="v2\ConverterTestData\FxCop\SarifSdkTest.fxcop.sarif">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="v2\ConverterTestData\FxCop\SarifSdkTest.xml.sarif">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="v2\SpecExamples\Comprehensive.sarif">
@@ -2906,6 +2912,12 @@
     <None Include="v2\ConverterTestData\FxCop\FxCopNoTargets.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="v2\ConverterTestData\FxCop\SarifSdkTest.fxcop">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="v2\ConverterTestData\FxCop\SarifSdkTest.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="v2\ConverterTestData\ClangAnalyzer\ArrayDataTypes.xml">
@@ -3552,21 +3564,6 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>bannedAPIs.cs</LastGenOutput>
     </None>
-    <None Update="v2\ConverterTestData\FxCop\SarifSdk.fxcop.sarif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="v2\ConverterTestData\FxCop\SarifSdk.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="v2\ConverterTestData\FxCop\SarifSdk.xml.sarif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="v2\ConverterTestData\FxCop\SarifSdkTest.fxcop.sarif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="v2\ConverterTestData\FxCop\SarifSdkTest.xml.sarif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="v2\ConverterTestData\PREfast\AB_IrrelevantBranch.cpp.xml">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>AB_IrrelevantBranch.cpp.cs</LastGenOutput>

diff --git a/src/Test.FunctionalTests.Sarif/v2/ConverterTestData/FxCop/FxCopExceptions-test.sarif b/src/Test.FunctionalTests.Sarif/v2/ConverterTestData/FxCop/FxCopExceptions-test.sarif