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

Enable the 9.0 templates (#17673)

Browse source
This commit is contained in:
Marc Paine 2023-11-01 10:02:13 -07:00 committed by GitHub
commit b9f8a4b0ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/redist/targets/BundledTemplates.targets
View file

@ -187,7 +187,7 @@
</ItemGroup> </ItemGroup>
<Copy SourceFiles="%(BundledTemplatesWithInstallPaths.RestoredNupkgPath)" <Copy SourceFiles="%(BundledTemplatesWithInstallPaths.RestoredNupkgPath)"
DestinationFolder="$(RedistLayoutPath)templates/%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)" DestinationFolder="$(RedistLayoutPath)templates/%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)"
Condition="'%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)' == '8.0'"/> Condition="'%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)' == '9.0'"/>
</Target> </Target>
<Target Name="LayoutTemplatesForMSI" <Target Name="LayoutTemplatesForMSI"

4
test/EndToEnd/GivenFrameworkDependentApps.cs
View file

@ -18,7 +18,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedNetCoreAppVersions))] [ClassData(typeof(SupportedNetCoreAppVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion) public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion)
{ {
if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0" || minorVersion == "6.0" || minorVersion == "7.0" || minorVersion == "8.0") if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0" || minorVersion == "6.0" || minorVersion == "7.0" || minorVersion == "8.0" || minorVersion == "9.0")
{ {
// https://github.com/dotnet/core-sdk/issues/621 // https://github.com/dotnet/core-sdk/issues/621
return; return;
@ -30,7 +30,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedAspNetCoreVersions))] [ClassData(typeof(SupportedAspNetCoreVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion) public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion)
{ {
if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0" || minorVersion == "6.0" || minorVersion == "7.0" || minorVersion == "8.0") if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0" || minorVersion == "6.0" || minorVersion == "7.0" || minorVersion == "8.0" || minorVersion == "9.0")
{ {
// https://github.com/dotnet/core-sdk/issues/621 // https://github.com/dotnet/core-sdk/issues/621
return; return;

8
test/EndToEnd/ProjectBuildTests.cs
View file

@ -440,14 +440,6 @@ namespace EndToEnd.Tests
// TODO: This block need to be updated when every template updates their default tfm. // TODO: This block need to be updated when every template updates their default tfm.
// Currently winforms updated their default templates target but not others. // Currently winforms updated their default templates target but not others.
if (template.StartsWith("mstest") if (template.StartsWith("mstest")
|| template.StartsWith("winforms")
|| template.StartsWith("wpf")
|| template.StartsWith("web")
|| template.StartsWith("razor")
|| template.StartsWith("blazor")
|| template.StartsWith("mvc")
|| template.StartsWith("worker")
|| template.StartsWith("grpc")
|| template.StartsWith("classlib") || template.StartsWith("classlib")
|| template.StartsWith("console") || template.StartsWith("console")
|| template.StartsWith("nunit") || template.StartsWith("nunit")

3
test/EndToEnd/SupportedNetCoreAppVersions.cs
View file

@ -31,7 +31,8 @@ namespace EndToEnd
"5.0", "5.0",
"6.0", "6.0",
"7.0", "7.0",
"8.0" "8.0",
"9.0"
}; };
public static IEnumerable<string> TargetFrameworkShortFolderVersion public static IEnumerable<string> TargetFrameworkShortFolderVersion