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

Merge pull request #778 from dotnet/livarcocc-patch-1

Browse source 
Updating self-contained app implicit versions
This commit is contained in:
Livar 2019-03-01 11:35:57 -08:00 • committed by GitHub
commit 39910d9edf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/redist/targets/GenerateBundledVersions.targets
View file

@ -106,11 +106,11 @@
<ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.1"
DefaultVersion="2.1.0"
LatestVersion="2.1.8" />
LatestVersion="2.1.9" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0"
LatestVersion="2.2.2" />
LatestVersion="2.2.3" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="3.0"
DefaultVersion="$(_NETCoreAppPackageVersion)"
@ -119,20 +119,20 @@
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1"
LatestVersion="2.1.8"/>
LatestVersion="2.1.9"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1"
LatestVersion="2.1.8"/>
LatestVersion="2.1.9"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0"
LatestVersion="2.2.2"/>
LatestVersion="2.2.3"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0"
LatestVersion="2.2.2"/>
LatestVersion="2.2.3"/>
</ItemGroup>
<PropertyGroup>

3
test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
View file

@ -226,7 +226,8 @@ namespace EndToEnd
get
{
yield return new object[] { "2.1" };
yield return new object[] { "2.2" };
// https://github.com/dotnet/core-sdk/issues/780
// yield return new object[] { "2.2" };
yield return new object[] { LatestSupportedAspNetCoreAppVersion };
}
}

3
test/EndToEnd/SupportedNetCoreAppVersions.cs
View file

@ -20,7 +20,8 @@ namespace EndToEnd
"1.1",
"2.0",
"2.1",
"2.2",
// https://github.com/dotnet/core-sdk/issues/780
// "2.2",
"3.0"
};
}