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

Merge pull request #14825 from dotnet/nohwnd-patch-2

Browse source
This commit is contained in:
Jakub Jareš 2022-11-01 14:04:56 +01:00 • committed by GitHub
commit 9a5f5afda2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -98,6 +98,10 @@
<Sha>b145717da7bd7ba7a11d28487e35c29a0d3ca297</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.22531.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>b145717da7bd7ba7a11d28487e35c29a0d3ca297</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>4a12ac49985e7c08abb245cd7e1a2019c0bf6435</Sha>

1
eng/Versions.props
View file

@ -46,6 +46,7 @@
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.1.0-rc.22531.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.22531.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.1.0-rc.22531.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.22531.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->

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

@ -29,9 +29,10 @@
<Bundled80Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWpfProjectTemplates80PackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<Bundled80Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates80PackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<Bundled80Templates Include="Microsoft.DotNet.Test.ProjectTemplates.8.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates80PackageVersion)" />
<!-- NUnit templates are shipped in Test.ProjectTemplates -->
<!-- Not available yet for 8.0 -->
<Bundled80Templates Include="Microsoft.DotNet.Test.ProjectTemplates.7.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates70PackageVersion)" />
<Bundled80Templates Include="Microsoft.DotNet.Common.ProjectTemplates.7.0" PackageVersion="$(MicrosoftDotNetCommonItemTemplates70PackageVersion)" />
</ItemGroup>

6
test/EndToEnd/ProjectBuildTests.cs
View file

@ -394,13 +394,11 @@ namespace EndToEnd.Tests
int latestMajorVersion = runtimeFolders.Select(folder => int.Parse(Path.GetFileName(folder).Split('.').First())).Max();
if (latestMajorVersion == 8)
{
// Return net7.0 for templates that don't support
// net8.0 yet.
if (template.StartsWith("blazor")
|| template.StartsWith("mstest")
|| template.StartsWith("classlib")
|| template.StartsWith("console")
|| template.StartsWith("nunit")
|| template.StartsWith("xunit")
|| template.StartsWith("xunit")
|| template.StartsWith("mvc")
|| template.StartsWith("web")
|| template.StartsWith("worker")