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

Merge pull request #12675 from dotnet/marcpopMSFT-WDarm64targeting50main

Browse source 
Enable targeting 5.0 for arm64
This commit is contained in:
Marc Paine 2021-11-22 13:58:33 -08:00 committed by GitHub
commit 9d1187e909
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/redist/targets/GenerateBundledVersions.targets
View file

@ -199,8 +199,8 @@
<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
<WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
<WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids)" />
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids);win-arm64" />
<WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids);win-arm64" />
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids)" />
</ItemGroup>
<!--

27
test/EndToEnd/ProjectBuildTests.cs
View file

@ -96,13 +96,20 @@ namespace EndToEnd.Tests
.Should().Pass().And.HaveStdOutContaining("Hello, World!");
}
[WindowsOnlyFact]
public void ItCanPublishArm64Winforms()
[WindowsOnlyTheory]
[InlineData("net5.0")]
[InlineData("current")]
public void ItCanPublishArm64Winforms(string TargetFramework)
{
DirectoryInfo directory = TestAssets.CreateTestDirectory();
string projectDirectory = directory.FullName;
string TargetFrameworkParameter = "";
string newArgs = "winforms --no-restore";
if (TargetFramework != "current")
{
TargetFrameworkParameter = $"-f {TargetFramework}";
}
string newArgs = $"winforms {TargetFrameworkParameter} --no-restore";
new NewCommandShim()
.WithWorkingDirectory(projectDirectory)
.Execute(newArgs)
@ -122,13 +129,21 @@ namespace EndToEnd.Tests
selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly);
}
[WindowsOnlyFact]
public void ItCanPublishArm64Wpf()
[WindowsOnlyTheory]
[InlineData("net5.0")]
[InlineData("current")]
public void ItCanPublishArm64Wpf(string TargetFramework)
{
DirectoryInfo directory = TestAssets.CreateTestDirectory();
string projectDirectory = directory.FullName;
string TargetFrameworkParameter = "";
string newArgs = "wpf --no-restore";
if (TargetFramework != "current")
{
TargetFrameworkParameter = $"-f {TargetFramework}";
}
string newArgs = $"wpf {TargetFrameworkParameter} --no-restore";
new NewCommandShim()
.WithWorkingDirectory(projectDirectory)
.Execute(newArgs)