Until 2.1.1 rtm, use the bundled aspnet metapackage versions as the d…

…efault implicit version
dotnet · Jun 1, 2018 · 9e595f7 · 9e595f7
1 parent 12da8c3
commit 9e595f7
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/Web/Microsoft.NET.Sdk.Web.Targets/Sdk.DefaultItems.targets b/src/Web/Microsoft.NET.Sdk.Web.Targets/Sdk.DefaultItems.targets
@@ -36,10 +36,20 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Choose>
     <When Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" >
 
-      <PropertyGroup>
-        <!-- These properties will allow the latest patch versions to be set in the CLI (via BundledVersions.props) or overridden by tests -->
-        <DefaultPatchVersionForAspNetCoreAll2_1 Condition="'$(DefaultPatchVersionForAspNetCoreAll2_1)' == ''">2.1.1</DefaultPatchVersionForAspNetCoreAll2_1>
-        <DefaultPatchVersionForAspNetCoreApp2_1 Condition="'$(DefaultPatchVersionForAspNetCoreApp2_1)' == ''">2.1.1</DefaultPatchVersionForAspNetCoreApp2_1>
+      <!-- 
+        These properties will allow the latest patch versions to be set in the CLI (via BundledVersions.props) 
+        or overridden by tests. Set the default baseline to ASP.NET Core 2.1.1
+      -->
+      <PropertyGroup Condition="'$(DefaultPatchVersionForAspNetCoreAll2_1)' == ''">
+        <DefaultPatchVersionForAspNetCoreAll2_1>2.1.1</DefaultPatchVersionForAspNetCoreAll2_1>
+        <!-- Check the bundled version. It will start with 2.1.1 until create the final version of the 2.1.1 runtimes.-->
+        <DefaultPatchVersionForAspNetCoreAll2_1 Condition="$(BundledAspNetCoreAllPackageVersion.StartsWith('2.1.1'))">$(BundledAspNetCoreAllPackageVersion)</DefaultPatchVersionForAspNetCoreAll2_1>
+      </PropertyGroup>
+
+      <PropertyGroup Condition="'$(DefaultPatchVersionForAspNetCoreApp2_1)' == ''">
+        <DefaultPatchVersionForAspNetCoreApp2_1>2.1.1</DefaultPatchVersionForAspNetCoreApp2_1>
+        <!-- Check the bundled version. It will start with 2.1.1 until create the final version of the 2.1.1 runtimes.-->
+        <DefaultPatchVersionForAspNetCoreApp2_1 Condition="$(BundledAspNetCoreAppPackageVersion.StartsWith('2.1.1'))">$(BundledAspNetCoreAppPackageVersion)</DefaultPatchVersionForAspNetCoreApp2_1>
       </PropertyGroup>
 
       <!-- Default patch version of .All Framework -->