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

Enable 9.0 SDK templates (#17684)

Browse source
This commit is contained in:
Marc Paine 2023-11-01 15:00:24 -07:00 committed by GitHub
commit d476e4fdf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/SourceBuildPrebuiltBaseline.xml
View file

@ -13,9 +13,5 @@
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
<!-- Temporarily allow prebuilt for Microsoft.DotNet.Common.ProjectTemplates.8.0 since templates aren't available for 9.0 yet
Related to https://github.com/dotnet/installer/pull/17433/commits/c542cfcebe2f1677d05c05359fe9e7e04ea663ac -->
<UsagePattern IdentityGlob="Microsoft.DotNet.Common.ProjectTemplates.8.0/*" />
</IgnorePatterns>
</UsageData>

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

@ -26,8 +26,8 @@
<Bundled90Templates Include="Microsoft.DotNet.Web.ProjectTemplates.9.0" PackageVersion="$(AspNetCorePackageVersionFor90Templates)" UseVersionForTemplateInstallPath="true" />
<Bundled90Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates90PackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<Bundled90Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWpfProjectTemplates90PackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<Bundled90Templates Include="Microsoft.DotNet.Common.ProjectTemplates.9.0" PackageVersion="$(MicrosoftDotNetCommonItemTemplates90PackageVersion)" />
<!-- Not available yet for 9.0 -->
<Bundled90Templates Include="Microsoft.DotNet.Common.ProjectTemplates.8.0" PackageVersion="$(MicrosoftDotNetCommonItemTemplates80PackageVersion)" />
<Bundled90Templates Include="Microsoft.DotNet.Test.ProjectTemplates.8.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates80PackageVersion)" />
</ItemGroup>

2
test/EndToEnd/ProjectBuildTests.cs
View file

@ -440,8 +440,6 @@ namespace EndToEnd.Tests
// TODO: This block need to be updated when every template updates their default tfm.
// Currently winforms updated their default templates target but not others.
if (template.StartsWith("mstest")
|| template.StartsWith("classlib")
|| template.StartsWith("console")
|| template.StartsWith("nunit")
|| template.StartsWith("xunit"))
{