From c0ca29e201a0150c2a8a8e0235fa60ec1b716d0f Mon Sep 17 00:00:00 2001
From: Larry Golding <larrygolding@comcast.net>
Date: Thu, 9 May 2019 11:04:40 -0700
Subject: [PATCH] Fix #1487: .NET Fx version of Multitool crashes on startup

---
 src/ReleaseHistory.md                | 3 +++
 src/Sarif.Driver/Sarif.Driver.csproj | 4 ++--
 src/build.props                      | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/ReleaseHistory.md b/src/ReleaseHistory.md
index 9484b61c1..ea7b26713 100644
--- a/src/ReleaseHistory.md
+++ b/src/ReleaseHistory.md
@@ -377,3 +377,6 @@
 
 ## **v2.1.0** [Sdk](https://www.nuget.org/packages/Sarif.Sdk/2.1.0) | [Driver](https://www.nuget.org/packages/Sarif.Driver/2.1.0) | [Converters](https://www.nuget.org/packages/Sarif.Converters/2.1.0)) | [Multitool](https://www.nuget.org/packages/Sarif.Multitool/2.1.0)
 * API NON-BREAKING: `PhysicalLocation.id` property is getting lost during 2.1.0 pre-release transformation. https://github.com/microsoft/sarif-sdk/issues/1479
+
+## **v2.1.1** [Sdk](https://www.nuget.org/packages/Sarif.Sdk/2.1.1) | [Driver](https://www.nuget.org/packages/Sarif.Driver/2.1.1) | [Converters](https://www.nuget.org/packages/Sarif.Converters/2.1.1)) | [Multitool](https://www.nuget.org/packages/Sarif.Multitool/2.1.1)
+* BUGFIX: Multitool crashes on launch: Can't find CommandLine.dll. https://github.com/microsoft/sarif-sdk/issues/1487
diff --git a/src/Sarif.Driver/Sarif.Driver.csproj b/src/Sarif.Driver/Sarif.Driver.csproj
index 95b3f91a3..af5d14682 100644
--- a/src/Sarif.Driver/Sarif.Driver.csproj
+++ b/src/Sarif.Driver/Sarif.Driver.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.2.1" />
+    <PackageReference Include="CommandLineParser" Version="2.5.0" />
     <PackageReference Include="System.Composition" Version="1.2.0" />
   </ItemGroup>
 
diff --git a/src/build.props b/src/build.props
index b238a1187..6a2c89b1d 100644
--- a/src/build.props
+++ b/src/build.props
@@ -11,7 +11,7 @@
     <Copyright Condition=" '$(Copyright)' == '' ">© Microsoft Corporation. All rights reserved.</Copyright>
     
     <!-- VersionPrefix denotes the current Semantic Version for the SDK. Must be updated before every nuget drop. -->
-    <VersionPrefix>2.1.0</VersionPrefix>
+    <VersionPrefix>2.1.1</VersionPrefix>
     
      <!-- SchemaVersionAsPublishedToSchemaStoreOrg identifies the current published version on json schema store at http://json.schemastore.org/ -->
     <SchemaVersionAsPublishedToSchemaStoreOrg>2.1.0-rtm.0</SchemaVersionAsPublishedToSchemaStoreOrg>
@@ -29,9 +29,9 @@
     place. These properties are actually used by the PowerShell script that
     hides the previous package versions on nuget.org.
     -->
-    <PreviousVersionPrefix>2.0.0-csd.2.beta.2019-04-03</PreviousVersionPrefix>
+    <PreviousVersionPrefix>2.0.0</PreviousVersionPrefix>
     <PreviousSchemaVersionAsPublishedToSchemaStoreOrg>2.1.0-beta.2</PreviousSchemaVersionAsPublishedToSchemaStoreOrg>
-    <PreviousPackageVersion>2.1.0-rtm.0</PreviousPackageVersion>
+    <PreviousPackageVersion>2.1.0</PreviousPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Build">