From f1e66b5a6fa6fa0b5a01d1cafba7b03f17156ddf Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Thu, 19 Jul 2018 16:50:53 -0700
Subject: [PATCH] Reset LZMA to only include the implicit package version
 (#1266)

---
 .../Scenario.ConsoleApp/Scenario.ConsoleApp.csproj        | 6 +++---
 src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/PackageArchive/Scenario.ConsoleApp/Scenario.ConsoleApp.csproj b/src/PackageArchive/Scenario.ConsoleApp/Scenario.ConsoleApp.csproj
index 4f71ad7ae0..db9ebdaf22 100644
--- a/src/PackageArchive/Scenario.ConsoleApp/Scenario.ConsoleApp.csproj
+++ b/src/PackageArchive/Scenario.ConsoleApp/Scenario.ConsoleApp.csproj
@@ -4,12 +4,12 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <MaxImplicitVersion>2.1.0</MaxImplicitVersion>
     <!-- Use pre-release versions up until 2.1.0, then don't lift higher than "2.1.0" -->
-    <MicrosoftNETCoreAppPackageVersion Condition="$(MicrosoftNETCoreApp21PackageVersion.StartsWith('$(MaxImplicitVersion)-'))">$(MicrosoftNETCoreApp21PackageVersion)</MicrosoftNETCoreAppPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>$([MSbuild]::ValueOrDefault('$(MicrosoftNETCoreAppPackageVersion)','$(MaxImplicitVersion)'))</MicrosoftNETCoreAppPackageVersion>
+    <NETCoreImplicitVersion Condition="$(MicrosoftNETCoreApp21PackageVersion.StartsWith('$(MaxImplicitVersion)-'))">$(MicrosoftNETCoreApp21PackageVersion)</NETCoreImplicitVersion>
+    <NETCoreImplicitVersion>$([MSbuild]::ValueOrDefault('$(NETCoreImplicitVersion)','$(MaxImplicitVersion)'))</NETCoreImplicitVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" />
+    <PackageReference Include="Microsoft.NETCore.App" Version="$(NETCoreImplicitVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj b/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj
index ed632e5fff..bf8012364b 100644
--- a/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj
+++ b/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj
@@ -2,11 +2,15 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
+    <MaxImplicitVersion>2.1.1</MaxImplicitVersion>
+    <!-- Use pre-release versions up until 2.1.1, then don't lift higher -->
+    <AspNetCoreImplicitVersion Condition="$(MicrosoftAspNetCoreAppPackageVersion.StartsWith('$(MaxImplicitVersion)-'))">$(MicrosoftAspNetCoreAppPackageVersion)</AspNetCoreImplicitVersion>
+    <AspNetCoreImplicitVersion>$([MSBuild]::ValueOrDefault('$(AspNetCoreImplicitVersion)','$(MaxImplicitVersion)'))</AspNetCoreImplicitVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="$(MicrosoftAspNetCoreAllPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="$(AspNetCoreImplicitVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="$(AspNetCoreImplicitVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="$(MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="$(MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Version="$(MicrosoftVisualStudioWebCodeGenerationContractsPackageVersion)" />