Skip to content
This repository was archived by the owner on Feb 15, 2023. It is now read-only.

Commit 9e595f7

Browse files
author
Nate McMaster
committed
Until 2.1.1 rtm, use the bundled aspnet metapackage versions as the default implicit version
1 parent 12da8c3 commit 9e595f7

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

src/Web/Microsoft.NET.Sdk.Web.Targets/Sdk.DefaultItems.targets

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,20 @@ Copyright (c) .NET Foundation. All rights reserved.
3636
<Choose>
3737
<When Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" >
3838

39-
<PropertyGroup>
40-
<!-- These properties will allow the latest patch versions to be set in the CLI (via BundledVersions.props) or overridden by tests -->
41-
<DefaultPatchVersionForAspNetCoreAll2_1 Condition="'$(DefaultPatchVersionForAspNetCoreAll2_1)' == ''">2.1.1</DefaultPatchVersionForAspNetCoreAll2_1>
42-
<DefaultPatchVersionForAspNetCoreApp2_1 Condition="'$(DefaultPatchVersionForAspNetCoreApp2_1)' == ''">2.1.1</DefaultPatchVersionForAspNetCoreApp2_1>
39+
<!--
40+
These properties will allow the latest patch versions to be set in the CLI (via BundledVersions.props)
41+
or overridden by tests. Set the default baseline to ASP.NET Core 2.1.1
42+
-->
43+
<PropertyGroup Condition="'$(DefaultPatchVersionForAspNetCoreAll2_1)' == ''">
44+
<DefaultPatchVersionForAspNetCoreAll2_1>2.1.1</DefaultPatchVersionForAspNetCoreAll2_1>
45+
<!-- Check the bundled version. It will start with 2.1.1 until create the final version of the 2.1.1 runtimes.-->
46+
<DefaultPatchVersionForAspNetCoreAll2_1 Condition="$(BundledAspNetCoreAllPackageVersion.StartsWith('2.1.1'))">$(BundledAspNetCoreAllPackageVersion)</DefaultPatchVersionForAspNetCoreAll2_1>
47+
</PropertyGroup>
48+
49+
<PropertyGroup Condition="'$(DefaultPatchVersionForAspNetCoreApp2_1)' == ''">
50+
<DefaultPatchVersionForAspNetCoreApp2_1>2.1.1</DefaultPatchVersionForAspNetCoreApp2_1>
51+
<!-- Check the bundled version. It will start with 2.1.1 until create the final version of the 2.1.1 runtimes.-->
52+
<DefaultPatchVersionForAspNetCoreApp2_1 Condition="$(BundledAspNetCoreAppPackageVersion.StartsWith('2.1.1'))">$(BundledAspNetCoreAppPackageVersion)</DefaultPatchVersionForAspNetCoreApp2_1>
4353
</PropertyGroup>
4454

4555
<!-- Default patch version of .All Framework -->

0 commit comments

Comments
 (0)