Merge branch 'master' into users/ednakamu/moving-exporter-to-driver

microsoft · Sep 6, 2020 · d3fe08f · d3fe08f
2 parents bf3be91 + 9870138
commit d3fe08f
Show file tree

Hide file tree

Showing 104 changed files with 1,033 additions and 1,147 deletions.
diff --git a/scripts/Projects.psm1 b/scripts/Projects.psm1
@@ -26,7 +26,9 @@ $Projects.Libraries = @(
     "Sarif",
     "Sarif.Converters",
     "Sarif.Driver",
-    "Sarif.WorkItems"
+    "Sarif.Multitool.Library"
+    "Sarif.WorkItems",
+    "WorkItems"
 )
 
 $Projects.Applications = @(

diff --git a/src/ESLint.Formatter/readme.MD b/src/ESLint.Formatter/readme.MD
@@ -20,7 +20,7 @@ It is available as an npm module [@microsoft/eslint-formatter-sarif](https://www
     ./node-modules/.bin/eslint -f @microsoft/eslint-formatter-sarif -o yourfile.sarif yourfile.js
     ```
 
-Note that you *cannot* use the abbreviated form `-f sarif`, because that only works when the npm module name is of the form `eslint-formatter-example`, and the ESLint SARIF formatter module is not `eslint-formatter-sarif`; it's `@microsoft/eslint-formatter-sarif`.
+Note that you *cannot* use the abbreviated form `-f sarif`, because that only works when the npm module name is of the form `eslint-formatter-example`, and the ESLint SARIF formatter module is not `eslint-formatter-sarif`; it's `@microsoft/eslint-formatter-sarif`. Alternatively, you can use the form `-f @microsoft/sarif`.
 
 # Developer details
 

diff --git a/src/Nuget/Sarif.Multitool.nuspec b/src/Nuget/Sarif.Multitool.nuspec
@@ -56,8 +56,6 @@
           />
 
     <file src="src\ReleaseHistory.md" />
-    <file src="policies\github-dsp.config.xml" target="policies" />
-    <file src="policies\github-dsp.config.sarif-external-properties" target="policies" />
     <file src="src\Sarif.Multitool\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/ReleaseHistory.md b/src/ReleaseHistory.md
@@ -1,4 +1,12 @@
 # SARIF Package Release History (SDK, Driver, Converters, and Multitool)
+
+## **v2.3.5** [Sdk](https://www.nuget.org/packages/Sarif.Sdk/2.3.5) | [Driver](https://www.nuget.org/packages/Sarif.Driver/2.3.5) | [Converters](https://www.nuget.org/packages/Sarif.Converters/2.3.5) | [Multitool](https://www.nuget.org/packages/Sarif.Multitool/2.3.5) | [Multitool Library](https://www.nuget.org/packages/Sarif.Multitool.Library/2.3.5)
+* FEATURE: COMMAND-LINE BREAKING: Validation rule `SARIF2005.ProvideToolProperties` now requires `informationUri`, it allows `dottedQuadFileVersion` to satisfy the requirement that version information be present, and it is configurable.
+* FEATURE: COMMAND-LINE BREAKING: The analysis rules that validate a SARIF file's compatibility with the GitHub Developer Security Portal now have rule ids that begin with `DSP` rather than `SARIF`.
+* FEATURE: Extract the public APIs from Sarif.Multitool into a new dependency package Sarif.Multitool.Library. Sarif.Multitool remains as a dotnet tool package.
+* FEATURE: Validation rule `SARIF2012` now checks for the presence of a friendly name in PascalCase in the `name` property, and is renamed from `ProvideHelpUris` to `ProvideRuleProperties`.
+* FEATURE: The Multitool `rewrite` command now accepts `VersionControlInformation` as an argument to the `--insert` option. This argument populates `run.versionControlProvenance`, and it re-expresses all absolute URIs as relative references with respect to the nearest enclosing repository root, if any.
+
 ## **v2.3.4** [Sdk](https://www.nuget.org/packages/Sarif.Sdk/2.3.4) | [Driver](https://www.nuget.org/packages/Sarif.Driver/2.3.4) | [Converters](https://www.nuget.org/packages/Sarif.Converters/2.3.4) | [Multitool](https://www.nuget.org/packages/Sarif.Multitool/2.3.4)
 * COMMAND-LINE BREAKING: Change `merge` command output directory argument name to `output-directory`.
 * FEATURE: Add analysis rules appropriate for SARIF files that are to be uploaded to the GitHub Developer Security Portal.

diff --git a/src/Sarif.Multitool/AbsoluteUriCommand.cs → ...f.Multitool.Library/AbsoluteUriCommand.cs b/src/Sarif.Multitool/AbsoluteUriCommand.cs → ...f.Multitool.Library/AbsoluteUriCommand.cs
diff --git a/src/Sarif.Multitool/AbsoluteUriOptions.cs → ...f.Multitool.Library/AbsoluteUriOptions.cs b/src/Sarif.Multitool/AbsoluteUriOptions.cs → ...f.Multitool.Library/AbsoluteUriOptions.cs
diff --git a/src/Sarif.Multitool/CommandBase.cs → src/Sarif.Multitool.Library/CommandBase.cs b/src/Sarif.Multitool/CommandBase.cs → src/Sarif.Multitool.Library/CommandBase.cs
@@ -13,8 +13,8 @@ namespace Microsoft.CodeAnalysis.Sarif.Multitool
 {
     public abstract class CommandBase
     {
-        internal const int SUCCESS = 0;
-        internal const int FAILURE = 1;
+        public const int SUCCESS = 0;
+        public const int FAILURE = 1;
 
         protected static bool ValidateNonNegativeCommandLineOption<T>(long optionValue, string optionName)
         {

diff --git a/src/Sarif.Multitool/CommandUtilities.cs → ...rif.Multitool.Library/CommandUtilities.cs b/src/Sarif.Multitool/CommandUtilities.cs → ...rif.Multitool.Library/CommandUtilities.cs
diff --git a/src/Sarif.Multitool/ConvertCommand.cs → ...Sarif.Multitool.Library/ConvertCommand.cs b/src/Sarif.Multitool/ConvertCommand.cs → ...Sarif.Multitool.Library/ConvertCommand.cs
diff --git a/src/Sarif.Multitool/ConvertOptions.cs → ...Sarif.Multitool.Library/ConvertOptions.cs b/src/Sarif.Multitool/ConvertOptions.cs → ...Sarif.Multitool.Library/ConvertOptions.cs
diff --git a/...ltitool/ExportRuleDocumentationCommand.cs → ...Library/ExportRuleDocumentationCommand.cs b/...ltitool/ExportRuleDocumentationCommand.cs → ...Library/ExportRuleDocumentationCommand.cs
diff --git a/...f.Multitool/ExportRulesMetadataCommand.cs → ...ool.Library/ExportRulesMetadataCommand.cs b/...f.Multitool/ExportRulesMetadataCommand.cs → ...ool.Library/ExportRulesMetadataCommand.cs
diff --git a/src/Sarif.Multitool/Extensions.cs → src/Sarif.Multitool.Library/Extensions.cs b/src/Sarif.Multitool/Extensions.cs → src/Sarif.Multitool.Library/Extensions.cs
diff --git a/src/Sarif.Multitool/FileWorkItemsCommand.cs → ...Multitool.Library/FileWorkItemsCommand.cs b/src/Sarif.Multitool/FileWorkItemsCommand.cs → ...Multitool.Library/FileWorkItemsCommand.cs
diff --git a/src/Sarif.Multitool/FileWorkItemsOptions.cs → ...Multitool.Library/FileWorkItemsOptions.cs b/src/Sarif.Multitool/FileWorkItemsOptions.cs → ...Multitool.Library/FileWorkItemsOptions.cs
diff --git a/src/Sarif.Multitool/IntegerExtensions.cs → ...if.Multitool.Library/IntegerExtensions.cs b/src/Sarif.Multitool/IntegerExtensions.cs → ...if.Multitool.Library/IntegerExtensions.cs
diff --git a/src/Sarif.Multitool/JTokenExtensions.cs → ...rif.Multitool.Library/JTokenExtensions.cs b/src/Sarif.Multitool/JTokenExtensions.cs → ...rif.Multitool.Library/JTokenExtensions.cs
diff --git a/src/Sarif.Multitool/MergeCommand.cs → src/Sarif.Multitool.Library/MergeCommand.cs b/src/Sarif.Multitool/MergeCommand.cs → src/Sarif.Multitool.Library/MergeCommand.cs
@@ -4,16 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Runtime.InteropServices.WindowsRuntime;
 
 using Microsoft.CodeAnalysis.Sarif.Driver;
-using Microsoft.CodeAnalysis.Sarif.Driver.Sdk;
 using Microsoft.CodeAnalysis.Sarif.Processors;
-using Microsoft.CodeAnalysis.Sarif.Visitors;
 using Microsoft.CodeAnalysis.Sarif.Writers;
-using Microsoft.Extensions.Options;
-using Microsoft.TeamFoundation.Work.WebApi;
-using Microsoft.VisualStudio.Services.OAuth;
 
 using Newtonsoft.Json;
 

diff --git a/src/Sarif.Multitool/MergeOptions.cs → src/Sarif.Multitool.Library/MergeOptions.cs b/src/Sarif.Multitool/MergeOptions.cs → src/Sarif.Multitool.Library/MergeOptions.cs
diff --git a/....Multitool/MultitoolResources.Designer.cs → ...ol.Library/MultitoolResources.Designer.cs b/....Multitool/MultitoolResources.Designer.cs → ...ol.Library/MultitoolResources.Designer.cs
diff --git a/src/Sarif.Multitool/MultitoolResources.resx → ...Multitool.Library/MultitoolResources.resx b/src/Sarif.Multitool/MultitoolResources.resx → ...Multitool.Library/MultitoolResources.resx
diff --git a/src/Sarif.Multitool/PageCommand.cs → src/Sarif.Multitool.Library/PageCommand.cs b/src/Sarif.Multitool/PageCommand.cs → src/Sarif.Multitool.Library/PageCommand.cs
diff --git a/src/Sarif.Multitool/PageOptions.cs → src/Sarif.Multitool.Library/PageOptions.cs b/src/Sarif.Multitool/PageOptions.cs → src/Sarif.Multitool.Library/PageOptions.cs
diff --git a/src/Sarif.Multitool/QueryCommand.cs → src/Sarif.Multitool.Library/QueryCommand.cs b/src/Sarif.Multitool/QueryCommand.cs → src/Sarif.Multitool.Library/QueryCommand.cs
diff --git a/src/Sarif.Multitool/QueryOptions.cs → src/Sarif.Multitool.Library/QueryOptions.cs b/src/Sarif.Multitool/QueryOptions.cs → src/Sarif.Multitool.Library/QueryOptions.cs
diff --git a/src/Sarif.Multitool/RebaseUriCommand.cs → ...rif.Multitool.Library/RebaseUriCommand.cs b/src/Sarif.Multitool/RebaseUriCommand.cs → ...rif.Multitool.Library/RebaseUriCommand.cs
diff --git a/src/Sarif.Multitool/RebaseUriOptions.cs → ...rif.Multitool.Library/RebaseUriOptions.cs b/src/Sarif.Multitool/RebaseUriOptions.cs → ...rif.Multitool.Library/RebaseUriOptions.cs
diff --git a/src/Sarif.Multitool/ResultMatchSetCommand.cs → ...ultitool.Library/ResultMatchSetCommand.cs b/src/Sarif.Multitool/ResultMatchSetCommand.cs → ...ultitool.Library/ResultMatchSetCommand.cs
diff --git a/src/Sarif.Multitool/ResultMatchSetOptions.cs → ...ultitool.Library/ResultMatchSetOptions.cs b/src/Sarif.Multitool/ResultMatchSetOptions.cs → ...ultitool.Library/ResultMatchSetOptions.cs
diff --git a/src/Sarif.Multitool/ResultMatchingCommand.cs → ...ultitool.Library/ResultMatchingCommand.cs b/src/Sarif.Multitool/ResultMatchingCommand.cs → ...ultitool.Library/ResultMatchingCommand.cs
diff --git a/src/Sarif.Multitool/ResultMatchingOptions.cs → ...ultitool.Library/ResultMatchingOptions.cs b/src/Sarif.Multitool/ResultMatchingOptions.cs → ...ultitool.Library/ResultMatchingOptions.cs
diff --git a/src/Sarif.Multitool/RewriteCommand.cs → ...Sarif.Multitool.Library/RewriteCommand.cs b/src/Sarif.Multitool/RewriteCommand.cs → ...Sarif.Multitool.Library/RewriteCommand.cs
diff --git a/src/Sarif.Multitool/RewriteOptions.cs → ...Sarif.Multitool.Library/RewriteOptions.cs b/src/Sarif.Multitool/RewriteOptions.cs → ...Sarif.Multitool.Library/RewriteOptions.cs
diff --git a/...1001.ProvideRequiredLocationProperties.cs → ...1001.ProvideRequiredLocationProperties.cs b/...1001.ProvideRequiredLocationProperties.cs → ...1001.ProvideRequiredLocationProperties.cs
diff --git a/...ules/DSP1002.InlineThreadFlowLocations.cs → ...ules/DSP1002.InlineThreadFlowLocations.cs b/...ules/DSP1002.InlineThreadFlowLocations.cs → ...ules/DSP1002.InlineThreadFlowLocations.cs
diff --git a/...SP1003.ProvideRequiredRegionProperties.cs → ...SP1003.ProvideRequiredRegionProperties.cs b/...SP1003.ProvideRequiredRegionProperties.cs → ...SP1003.ProvideRequiredRegionProperties.cs
diff --git a/...ewArraysThatExceedConfigurableDefaults.cs → ...ewArraysThatExceedConfigurableDefaults.cs b/...ewArraysThatExceedConfigurableDefaults.cs → ...ewArraysThatExceedConfigurableDefaults.cs
diff --git a/...LocationsMustBeRelativeUrisOrFilePaths.cs → ...LocationsMustBeRelativeUrisOrFilePaths.cs b/...LocationsMustBeRelativeUrisOrFilePaths.cs → ...LocationsMustBeRelativeUrisOrFilePaths.cs
diff --git a/...tool/Rules/DSP1006.ProvideCheckoutPath.cs → ...rary/Rules/DSP1006.ProvideCheckoutPath.cs b/...tool/Rules/DSP1006.ProvideCheckoutPath.cs → ...rary/Rules/DSP1006.ProvideCheckoutPath.cs
diff --git a/...ovideRequiredRelatedLocationProperties.cs → ...ovideRequiredRelatedLocationProperties.cs b/...ovideRequiredRelatedLocationProperties.cs → ...ovideRequiredRelatedLocationProperties.cs
diff --git a/src/Sarif.Multitool/Rules/RuleId.cs → src/Sarif.Multitool.Library/Rules/RuleId.cs b/src/Sarif.Multitool/Rules/RuleId.cs → src/Sarif.Multitool.Library/Rules/RuleId.cs
diff --git a/...Multitool/Rules/RuleResources.Designer.cs → ...l.Library/Rules/RuleResources.Designer.cs b/...Multitool/Rules/RuleResources.Designer.cs → ...l.Library/Rules/RuleResources.Designer.cs
diff --git a/src/Sarif.Multitool/Rules/RuleResources.resx → ...ultitool.Library/Rules/RuleResources.resx b/src/Sarif.Multitool/Rules/RuleResources.resx → ...ultitool.Library/Rules/RuleResources.resx
diff --git a/...s/SARIF1001.RuleIdentifiersMustBeValid.cs → ...s/SARIF1001.RuleIdentifiersMustBeValid.cs b/...s/SARIF1001.RuleIdentifiersMustBeValid.cs → ...s/SARIF1001.RuleIdentifiersMustBeValid.cs
diff --git a/...titool/Rules/SARIF1002.UrisMustBeValid.cs → ...ibrary/Rules/SARIF1002.UrisMustBeValid.cs b/...titool/Rules/SARIF1002.UrisMustBeValid.cs → ...ibrary/Rules/SARIF1002.UrisMustBeValid.cs
diff --git a/...s/SARIF1004.ExpressUriBaseIdsCorrectly.cs → ...s/SARIF1004.ExpressUriBaseIdsCorrectly.cs b/...s/SARIF1004.ExpressUriBaseIdsCorrectly.cs → ...s/SARIF1004.ExpressUriBaseIdsCorrectly.cs
diff --git a/...tool/Rules/SARIF1005.UriMustBeAbsolute.cs → ...rary/Rules/SARIF1005.UriMustBeAbsolute.cs b/...tool/Rules/SARIF1005.UriMustBeAbsolute.cs → ...rary/Rules/SARIF1005.UriMustBeAbsolute.cs
diff --git a/...6.InvocationPropertiesMustBeConsistent.cs → ...6.InvocationPropertiesMustBeConsistent.cs b/...6.InvocationPropertiesMustBeConsistent.cs → ...6.InvocationPropertiesMustBeConsistent.cs
diff --git a/...F1007.RegionPropertiesMustBeConsistent.cs → ...F1007.RegionPropertiesMustBeConsistent.cs b/...F1007.RegionPropertiesMustBeConsistent.cs → ...F1007.RegionPropertiesMustBeConsistent.cs
diff --git a/...icalLocationPropertiesMustBeConsistent.cs → ...icalLocationPropertiesMustBeConsistent.cs b/...icalLocationPropertiesMustBeConsistent.cs → ...icalLocationPropertiesMustBeConsistent.cs
diff --git a/...exPropertiesMustBeConsistentWithArrays.cs → ...exPropertiesMustBeConsistentWithArrays.cs b/...exPropertiesMustBeConsistentWithArrays.cs → ...exPropertiesMustBeConsistentWithArrays.cs
diff --git a/...Rules/SARIF1010.RuleIdMustBeConsistent.cs → ...Rules/SARIF1010.RuleIdMustBeConsistent.cs b/...Rules/SARIF1010.RuleIdMustBeConsistent.cs → ...Rules/SARIF1010.RuleIdMustBeConsistent.cs
diff --git a/...l/Rules/SARIF1011.ReferenceFinalSchema.cs → ...y/Rules/SARIF1011.ReferenceFinalSchema.cs b/...l/Rules/SARIF1011.ReferenceFinalSchema.cs → ...y/Rules/SARIF1011.ReferenceFinalSchema.cs
diff --git a/...ssageArgumentsMustBeConsistentWithRule.cs → ...ssageArgumentsMustBeConsistentWithRule.cs b/...ssageArgumentsMustBeConsistentWithRule.cs → ...ssageArgumentsMustBeConsistentWithRule.cs
diff --git a/.../SARIF2001.TerminateMessagesWithPeriod.cs → .../SARIF2001.TerminateMessagesWithPeriod.cs b/.../SARIF2001.TerminateMessagesWithPeriod.cs → .../SARIF2001.TerminateMessagesWithPeriod.cs
diff --git a/...ules/SARIF2002.ProvideMessageArguments.cs → ...ules/SARIF2002.ProvideMessageArguments.cs b/...ules/SARIF2002.ProvideMessageArguments.cs → ...ules/SARIF2002.ProvideMessageArguments.cs
diff --git a/...IF2003.ProvideVersionControlProvenance.cs → ...IF2003.ProvideVersionControlProvenance.cs b/...IF2003.ProvideVersionControlProvenance.cs → ...IF2003.ProvideVersionControlProvenance.cs
diff --git a/...itool/Rules/SARIF2004.OptimizeFileSize.cs → ...brary/Rules/SARIF2004.OptimizeFileSize.cs b/...itool/Rules/SARIF2004.OptimizeFileSize.cs → ...brary/Rules/SARIF2004.OptimizeFileSize.cs
diff --git a/.../Rules/SARIF2005.ProvideToolProperties.cs → .../Rules/SARIF2005.ProvideToolProperties.cs b/.../Rules/SARIF2005.ProvideToolProperties.cs → .../Rules/SARIF2005.ProvideToolProperties.cs
diff --git a/.../Rules/SARIF2006.UrisShouldBeReachable.cs → .../Rules/SARIF2006.UrisShouldBeReachable.cs b/.../Rules/SARIF2006.UrisShouldBeReachable.cs → .../Rules/SARIF2006.UrisShouldBeReachable.cs
diff --git a/...RIF2007.ExpressPathsRelativeToRepoRoot.cs → ...RIF2007.ExpressPathsRelativeToRepoRoot.cs b/...RIF2007.ExpressPathsRelativeToRepoRoot.cs → ...RIF2007.ExpressPathsRelativeToRepoRoot.cs
diff --git a/...ultitool/Rules/SARIF2008.ProvideSchema.cs → ....Library/Rules/SARIF2008.ProvideSchema.cs b/...ultitool/Rules/SARIF2008.ProvideSchema.cs → ....Library/Rules/SARIF2008.ProvideSchema.cs
diff --git a/...9.ConsiderConventionalIdentifierValues.cs → ...9.ConsiderConventionalIdentifierValues.cs b/...9.ConsiderConventionalIdentifierValues.cs → ...9.ConsiderConventionalIdentifierValues.cs
diff --git a/...ol/Rules/SARIF2010.ProvideCodeSnippets.cs → ...ry/Rules/SARIF2010.ProvideCodeSnippets.cs b/...ol/Rules/SARIF2010.ProvideCodeSnippets.cs → ...ry/Rules/SARIF2010.ProvideCodeSnippets.cs
diff --git a/...l/Rules/SARIF2011.ProvideContextRegion.cs → ...y/Rules/SARIF2011.ProvideContextRegion.cs b/...l/Rules/SARIF2011.ProvideContextRegion.cs → ...y/Rules/SARIF2011.ProvideContextRegion.cs
diff --git a/.../Rules/SARIF2012.ProvideRuleProperties.cs → .../Rules/SARIF2012.ProvideRuleProperties.cs b/.../Rules/SARIF2012.ProvideRuleProperties.cs → .../Rules/SARIF2012.ProvideRuleProperties.cs
diff --git a/...s/SARIF2013.ProvideEmbeddedFileContent.cs → ...s/SARIF2013.ProvideEmbeddedFileContent.cs b/...s/SARIF2013.ProvideEmbeddedFileContent.cs → ...s/SARIF2013.ProvideEmbeddedFileContent.cs
diff --git a/...SARIF2014.ProvideDynamicMessageContent.cs → ...SARIF2014.ProvideDynamicMessageContent.cs b/...SARIF2014.ProvideDynamicMessageContent.cs → ...SARIF2014.ProvideDynamicMessageContent.cs
diff --git a/...SARIF2015.EnquoteDynamicMessageContent.cs → ...SARIF2015.EnquoteDynamicMessageContent.cs b/...SARIF2015.EnquoteDynamicMessageContent.cs → ...SARIF2015.EnquoteDynamicMessageContent.cs
diff --git a/...les/SARIF2016.FileUrisShouldBeRelative.cs → ...les/SARIF2016.FileUrisShouldBeRelative.cs b/...les/SARIF2016.FileUrisShouldBeRelative.cs → ...les/SARIF2016.FileUrisShouldBeRelative.cs
diff --git a/...itool/Rules/SarifValidationSkimmerBase.cs → ...brary/Rules/SarifValidationSkimmerBase.cs b/...itool/Rules/SarifValidationSkimmerBase.cs → ...brary/Rules/SarifValidationSkimmerBase.cs
diff --git a/src/Sarif.Multitool.Library/Sarif.Multitool.Library.csproj b/src/Sarif.Multitool.Library/Sarif.Multitool.Library.csproj
@@ -0,0 +1,70 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Label="AssemblyAttributes">
+    <AssemblyTitle>SARIF Multitool Library</AssemblyTitle>
+    <Description>The public API exposing the commands used by the SARIF Multitool.</Description>
+  </PropertyGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.props))\build.props" />
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <RootNamespace>Microsoft.CodeAnalysis.Sarif.Multitool</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Json.Pointer" Version="1.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="$(MsBuildThisFileDirectory)..\Sarif\Schemata\sarif-$(SchemaVersionAsPublishedToSchemaStoreOrg).json" Link="sarif-2.1.0.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="MultitoolResources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>MultitoolResources.resx</DependentUpon>
+    </Compile>
+    <Compile Update="Rules\RuleResources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>RuleResources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="MultitoolResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>MultitoolResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Rules\RuleResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>RuleResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="default.configuration.xml"
+          Pack="true"
+          PackagePath="lib/netstandard2.0;lib/net461"
+          CopyToOutputDirectory="PreserveNewest" />
+    <None Include="..\..\policies\*"
+          Pack="true"
+          PackagePath="policies" />
+    <None Include="**\*.cs"
+          Pack="true"
+          PackagePath="src" />
+    <None Include="..\ReleaseHistory.md"
+          Pack="true"
+          PackagePath="/" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Sarif.Converters\Sarif.Converters.csproj" />
+    <ProjectReference Include="..\Sarif.Driver\Sarif.Driver.csproj" />
+    <ProjectReference Include="..\Sarif.WorkItems\Sarif.WorkItems.csproj" />
+    <ProjectReference Include="..\Sarif\Sarif.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Sarif.Multitool/SarifPropertyName.cs → ...if.Multitool.Library/SarifPropertyName.cs b/src/Sarif.Multitool/SarifPropertyName.cs → ...if.Multitool.Library/SarifPropertyName.cs
diff --git a/...Sarif.Multitool/SarifValidationContext.cs → ...ltitool.Library/SarifValidationContext.cs b/...Sarif.Multitool/SarifValidationContext.cs → ...ltitool.Library/SarifValidationContext.cs
diff --git a/src/Sarif.Multitool/StringExtensions.cs → ...rif.Multitool.Library/StringExtensions.cs b/src/Sarif.Multitool/StringExtensions.cs → ...rif.Multitool.Library/StringExtensions.cs
diff --git a/src/Sarif.Multitool/TransformCommand.cs → ...rif.Multitool.Library/TransformCommand.cs b/src/Sarif.Multitool/TransformCommand.cs → ...rif.Multitool.Library/TransformCommand.cs
diff --git a/src/Sarif.Multitool/TransformOptions.cs → ...rif.Multitool.Library/TransformOptions.cs b/src/Sarif.Multitool/TransformOptions.cs → ...rif.Multitool.Library/TransformOptions.cs
diff --git a/src/Sarif.Multitool/ValidateCommand.cs → ...arif.Multitool.Library/ValidateCommand.cs b/src/Sarif.Multitool/ValidateCommand.cs → ...arif.Multitool.Library/ValidateCommand.cs
diff --git a/src/Sarif.Multitool/ValidateOptions.cs → ...arif.Multitool.Library/ValidateOptions.cs b/src/Sarif.Multitool/ValidateOptions.cs → ...arif.Multitool.Library/ValidateOptions.cs
diff --git a/...Sarif.Multitool/default.configuration.xml → ...ltitool.Library/default.configuration.xml b/...Sarif.Multitool/default.configuration.xml → ...ltitool.Library/default.configuration.xml
diff --git a/src/Sarif.Multitool/Sarif.Multitool.csproj b/src/Sarif.Multitool/Sarif.Multitool.csproj
@@ -28,7 +28,7 @@
 
   <PropertyGroup Label="AssemblyAttributes">
     <AssemblyTitle>SARIF Multitool</AssemblyTitle>
-    <Description>Command line tool to perform transformations of input files to SARIF.</Description>
+    <Description>Command line tool to manipulate SARIF files.</Description>
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.props))\build.props" />
@@ -39,45 +39,17 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.7.82" />
-    <PackageReference Include="Microsoft.Json.Pointer" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Json.Schema" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Json.Schema.Validation" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Json.Pointer" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Json.Schema" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Json.Schema.Validation" Version="1.1.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Sarif\Sarif.csproj" />
-    <ProjectReference Include="..\Sarif.Driver\Sarif.Driver.csproj" />
-    <ProjectReference Include="..\Sarif.WorkItems\Sarif.WorkItems.csproj" />
-    <ProjectReference Include="..\Sarif.Converters\Sarif.Converters.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="MultitoolResources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>MultitoolResources.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Rules\RuleResources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>RuleResources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="MultitoolResources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>MultitoolResources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Rules\RuleResources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>RuleResources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
+    <ProjectReference Include="..\Sarif.Multitool.Library\Sarif.Multitool.Library.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include=".\DotnetToolSettings.xml" CopyToOutputDirectory="PreserveNewest" />
-    <EmbeddedResource Include="$(MsBuildThisFileDirectory)..\Sarif\Schemata\sarif-$(SchemaVersionAsPublishedToSchemaStoreOrg).json" Link="sarif-2.1.0.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
@@ -87,9 +59,6 @@
     <None Update="appsettings.local.json">
       <CopyToOutputDirectory Condition="'$(Configuration)' == 'Debug'">PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="default.configuration.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
 </Project>