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

Switching to 7.0 test templates

Browse source
This commit is contained in:
Marc Paine 2022-01-24 10:30:13 -08:00
parent 1e35b16223
commit babb2cda6e
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@
<Bundled70Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates70PackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" /> <Bundled70Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates70PackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<!-- NUnit templates are shipped in Test.ProjectTemplates --> <!-- NUnit templates are shipped in Test.ProjectTemplates -->
<Bundled70Templates Include="Microsoft.DotNet.Test.ProjectTemplates.6.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates60PackageVersion)" /> <Bundled70Templates Include="Microsoft.DotNet.Test.ProjectTemplates.7.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates70PackageVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
test/EndToEnd/ProjectBuildTests.cs
View file

@ -396,11 +396,7 @@ 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("wpf"))
|| template.StartsWith("mstest")
|| template.StartsWith("nunit")
|| template.StartsWith("xunit")
|| template.StartsWith("wpf"))
{ {
return "net6.0"; return "net6.0";
} }