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

Merge pull request #180 from dsplaisted/support-2.2

Browse source 
Enable targeting .NET Core 2.2
This commit is contained in:
Daniel Plaisted 2018-11-26 20:14:48 -08:00 • committed by GitHub
commit 58e8e54141
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build/MSBuildExtensions.targets
View file

@ -71,6 +71,10 @@
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.0" DefaultVersion="2.1.0"
LatestVersion="2.1.6" /> LatestVersion="2.1.6" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0"
LatestVersion="2.2.0" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="3.0" TargetFrameworkVersion="3.0"
DefaultVersion="$(_NETCoreAppPackageVersion)" DefaultVersion="$(_NETCoreAppPackageVersion)"
@ -84,6 +88,15 @@
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1" DefaultVersion="2.1.1"
LatestVersion="2.1.6"/> LatestVersion="2.1.6"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0"
LatestVersion="2.2.0"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0"
LatestVersion="2.2.0"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
View file

@ -216,8 +216,7 @@ namespace EndToEnd
get get
{ {
yield return new object[] { "2.1" }; yield return new object[] { "2.1" };
// 2.2 not yet stable yield return new object[] { "2.2" };
//yield return new object[] { "2.2" };
yield return new object[] { LatestSupportedAspNetCoreAppVersion }; yield return new object[] { LatestSupportedAspNetCoreAppVersion };
} }
} }

3
test/EndToEnd/SupportedNetCoreAppVersions.cs
View file

@ -20,8 +20,7 @@ namespace EndToEnd
"1.1", "1.1",
"2.0", "2.0",
"2.1", "2.1",
// 2.2 currently disabled in master: https://github.com/dotnet/cli/issues/10125 "2.2",
// "2.2",
"3.0" "3.0"
}; };
} }