Merge changes for #340: location.logicalLocation,

oasis-tcs · Mar 14, 2019 · 942d5ef · 942d5ef
1 parent ea3d497
commit 942d5ef
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/...0-issue-340-inline-logical-locations.docx → ...0-issue-340-inline-logical-locations.docx b/...0-issue-340-inline-logical-locations.docx → ...0-issue-340-inline-logical-locations.docx
diff --git a/Documents/ProvisionalDrafts/sarif-v2.0-csd02-provisional.docx b/Documents/ProvisionalDrafts/sarif-v2.0-csd02-provisional.docx
diff --git a/Documents/Schema changes between SARIF v1 and v2.md b/Documents/Schema changes between SARIF v1 and v2.md
@@ -1258,21 +1258,29 @@ Start of changes for CSD.2
 
     In the renamed `artifactChange` object:
 
-    - Rename the `fileLocation` property to `artifactLocation` of type `artifactLocation`.
+    - Rename the `fileLocation` property to `artifactLocation`.
 
     In the `fix` object:
 
-    - Rename the `fileChanges` property to `artifactChanges` of type `artifactChange[]`.
+    - Rename the `fileChanges` property to `artifactChanges`.
 
     In the `physicalLocation` object:
 
     - Rename the `fileLocation` property to `artifactLocation`.
 
     In the `run` object:
 
-    - Rename the `files` property to `artifacts` and change its type to `artifactLocation[]`.
+    - Rename the `files` property to `artifacts`.
     - Rename the `defaultFileEncoding` property to `defaultEncoding`.
 
+- [Issue #340](https://github.com/oasis-tcs/sarif-spec/issues/202): "Inline logical location object to location."
+
+    In the `location` object:
+
+    - Remove the `fullyQualifiedLogicalName` property.
+    - Remove the `logicalLocationIndex` property.
+    - Add a property `logicalLocation` of type `logicalLocation`.
+
 ## Changes not yet approved
 
 - [Issue #202](https://github.com/oasis-tcs/sarif-spec/issues/202): "Restore threadFlowLocation.kind"

diff --git a/EditorsReports/Editor's report 2019-04-03.md b/EditorsReports/Editor's report 2019-04-03.md
@@ -6,4 +6,10 @@ Presented at TC Meeting #34, April 3th, 2019
 
 1. After being approved as amended at the last TC meeting (#33), the following spec changes were merged into the provisional draft:
 
+    1. [Issue #340](https://github.com/oasis-tcs/sarif-spec/issues/340): "Inline logical location object to location."
+
+1. Change drafts were made available for the following issues which had previously been "design approved" by the TC:
+
     1. [Issue #341](https://github.com/oasis-tcs/sarif-spec/issues/341): "Rename all 'instanceGuid' properties to 'guid'"
+
+    1. [Issue #309](https://github.com/oasis-tcs/sarif-spec/issues/309): "Rename run.files to run.artifacts, fileLocation to artifactLocation."