mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #9770 from nguerrera/fix-bug-comment

Browse source 
Add CLI side of "latest patch for 2.1" in roll-forward logic
This commit is contained in:
Daniel Plaisted 2018-07-31 12:25:32 -07:00 • committed by GitHub
commit 74c1ae46ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build/MSBuildExtensions.targets
View file

@ -196,6 +196,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">1.0.12</LatestPatchVersionForNetCore1_0> <LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">1.0.12</LatestPatchVersionForNetCore1_0>
<LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">1.1.9</LatestPatchVersionForNetCore1_1> <LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">1.1.9</LatestPatchVersionForNetCore1_1>
<LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">2.0.9</LatestPatchVersionForNetCore2_0> <LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">2.0.9</LatestPatchVersionForNetCore2_0>
<LatestPatchVersionForNetCore2_1 Condition="'%24(LatestPatchVersionForNetCore2_1)' == ''">2.1.2</LatestPatchVersionForNetCore2_1>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
]]> ]]>

5
test/EndToEnd/GivenSelfContainedAppsRollForward.cs
View file

@ -21,8 +21,9 @@ namespace EndToEnd
[ClassData(typeof(SupportedNetCoreAppVersions))] [ClassData(typeof(SupportedNetCoreAppVersions))]
public void ItRollsForwardToTheLatestVersion(string minorVersion) public void ItRollsForwardToTheLatestVersion(string minorVersion)
{ {
// https://github.com/dotnet/cli/issues/9661: remove this once the ASP.NET version bump // https://github.com/dotnet/cli/issues/9661
// merges from 2.1.3xx -> 2.1.4xx -> 2.2.1xx // https://github.com/dotnet/sdk/issues/2446
// dotnet/sdk is missing handling for 2.1 when it isn't the latest runtime
if (minorVersion == "2.1") if (minorVersion == "2.1")
{ {
return; return;