Don't emit v2 analysisTarget if there is no v1 resultFile. (#1247)

Don't emit v2 analysisTarget if there is no v1 resultFile.
microsoft · Jan 31, 2019 · ee0d5dc · ee0d5dc
1 parent d21b906
commit ee0d5dc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/Sarif.UnitTests/TestData/SarifVersionOneToCurrentVisitor/v2/BasicResult.sarif b/src/Sarif.UnitTests/TestData/SarifVersionOneToCurrentVisitor/v2/BasicResult.sarif
@@ -41,9 +41,6 @@
           "message": {
             "text": "Some testing occurred."
           },
-          "analysisTarget": {
-            "uri": "file:///home/buildAgent/src/myFile.cpp"
-          },
           "locations": [
             {
               "physicalLocation": {

diff --git a/src/Sarif/VersionConstants.cs b/src/Sarif/VersionConstants.cs
@@ -5,7 +5,7 @@ namespace Microsoft.CodeAnalysis.Sarif
 {
     public static class VersionConstants
     {
-        public const string Prerelease = "csd.2.beta.2018-10-10.1";
+        public const string Prerelease = "csd.2.beta.2018-10-10.2";
         public const string AssemblyVersion = "2.0.0";
         public const string FileVersion = AssemblyVersion + ".0";
     }

diff --git a/src/Sarif/Visitors/SarifVersionOneToCurrentVisitor.cs b/src/Sarif/Visitors/SarifVersionOneToCurrentVisitor.cs
@@ -748,8 +748,12 @@ internal Result CreateResult(ResultVersionOne v1Result)
                     SuppressionStates = Utilities.CreateSuppressionStates(v1Result.SuppressionStates)
                 };
 
-                // The spec says that analysisTarget is required only if it differs from the result file.
-                if (v1Result.Locations?[0]?.AnalysisTarget?.Uri != v1Result.Locations?[0]?.ResultFile?.Uri)
+                // The v2 spec says that analysisTarget is required only if it differs from the result location.
+                // On the other hand, the v1 spec says that if the result is found in the file that the tool
+                // was instructed to scan, then analysisTarget should be present and resultFile should be
+                // absent -- so we should _not_ populate the v2 analysisTarget in this case.
+                LocationVersionOne v1Location = v1Result.Locations?[0];
+                if (v1Location?.ResultFile != null && v1Location.AnalysisTarget?.Uri != v1Location.ResultFile.Uri)
                 {
                     result.AnalysisTarget = CreateFileLocation(v1Result.Locations[0].AnalysisTarget);
                 }