diff --git a/NuGet.config b/NuGet.config
index 315197afb..a5c8ba299 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,15 +7,22 @@
+
+
+
-
+
+
+
+
+
@@ -32,10 +39,17 @@
+
+
+
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 399b58223..3e032333a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -5,13 +5,13 @@
https://github.com/dotnet/windowsdesktop
ec2af60c1eb8b2665745750f6445b3ff133178fb
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- f87455227b7f349e26043daa2e1b5b86fb381627
+ c6b484729ae616e85f1899f1dc49bfc8f17a2393
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- f87455227b7f349e26043daa2e1b5b86fb381627
+ c6b484729ae616e85f1899f1dc49bfc8f17a2393
https://github.com/dotnet/windowsdesktop
@@ -21,21 +21,21 @@
https://github.com/dotnet/runtime
cf258a14b70ad9069470a108f13765e0e5988f51
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 556582d964cc21b82a88d7154e915076f6f9008e
+ 35964c9215613d66a687ebcb2d7fcd9496390ee7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 556582d964cc21b82a88d7154e915076f6f9008e
+ 35964c9215613d66a687ebcb2d7fcd9496390ee7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 556582d964cc21b82a88d7154e915076f6f9008e
+ 35964c9215613d66a687ebcb2d7fcd9496390ee7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 556582d964cc21b82a88d7154e915076f6f9008e
+ 35964c9215613d66a687ebcb2d7fcd9496390ee7
@@ -55,25 +55,25 @@
https://github.com/dotnet/aspnetcore
371a26f07b23ad77c636332c2dfc0cbd1d8137ba
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 67acc3d331454956fc06d6de2218a625e3e596f8
+ ae2eabad0e49302d0632a7dde917fdc68d960dc4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 67acc3d331454956fc06d6de2218a625e3e596f8
+ ae2eabad0e49302d0632a7dde917fdc68d960dc4
-
- https://github.com/dotnet/efcore
- f8a6198dad41e8ed584da6ff711837f3288f8a8d
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
+ 1af30fd9b4752ab36eff63d9bc75888d41c85657
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 67acc3d331454956fc06d6de2218a625e3e596f8
+ ae2eabad0e49302d0632a7dde917fdc68d960dc4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 67acc3d331454956fc06d6de2218a625e3e596f8
+ ae2eabad0e49302d0632a7dde917fdc68d960dc4
https://github.com/dotnet/test-templates
@@ -83,47 +83,47 @@
https://github.com/dotnet/test-templates
1b253e1026e865e9c7b125fcbf6a8765030370cf
-
+
https://github.com/dotnet/templating
- 592742371da1df5b459c4bbf68e05968b5eb750d
+ 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 1555c5a76cb15abb5350aeeffc63d83c3fd2f70f
+ e9667aef50fe25c58ea4310ec42a62a5e8813283
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 1555c5a76cb15abb5350aeeffc63d83c3fd2f70f
+ e9667aef50fe25c58ea4310ec42a62a5e8813283
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 3e5e4f7ca852c8b85899a18efcd114e7ed4ea163
+ 1f2d3e749e035c234cc9f248394b11725103a833
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- 36ec7266b65ec578b5524c998a80e6a8848efb41
+ c3afd220b9380b3b329e7eddc63224d74e6f25fe
-
+
https://github.com/dotnet/fsharp
- 1b23bbeda88ea3cb9be9af777f4c99fa8663df81
+ 70c1e5c3ac1e213e85831593fc65b7ca510cfae4
-
+
https://github.com/microsoft/vstest
5c9abb2ae1b0318dc52729a3639e72089c79fb3c
-
+
https://github.com/mono/linker
- 6a15056a9d71169bf04d007301edfd558afcfa6a
+ e6a47c70b7878b346ff0858085eb8a6379f6f0bb
linker
-
+
https://github.com/dotnet/roslyn
- 029847714208ebe49668667c60ea5b0a294e0fcb
+ 473e349f86b0f5c9dd47330cba22e0ea225c85a5
-
+
https://github.com/dotnet/msbuild
- 2fd48ab730134f7698a14fdd5752349737f0e3bd
+ 857e5a733346758dd6f32b034e253962b9fc2444
https://github.com/nuget/nuget.client
diff --git a/eng/Versions.props b/eng/Versions.props
index 0b486e639..e6ed415aa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,15 +23,15 @@
- 5.0.7-servicing.21263.7
+ 5.0.8-servicing.21315.4
- 5.0.6-servicing.21263.3
+ 5.0.8-servicing.21315.6
- 5.0.300-preview.21260.2
+ 5.0.301-servicing.21309.4
@@ -43,20 +43,20 @@
- 5.0.7
+ 5.0.8
5.0.0
5.0.0-rtm.20526.5
- 5.0.7-servicing.21263.9
- 5.0.7-servicing.21263.9
- 5.0.7-servicing.21263.9
+ 5.0.8-servicing.21318.5
+ 5.0.8-servicing.21318.5
+ 5.0.8-servicing.21318.5
0.2.0
- 5.0.301-servicing.21271.7
- 5.0.301-servicing.21271.7
+ 5.0.302-servicing.21318.17
+ 5.0.302-servicing.21318.17
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -67,17 +67,17 @@
- 5.0.7-servicing.21255.8
- 5.0.7
- 5.0.7
+ 5.0.8-servicing.21315.4
+ 5.0.8
+ 5.0.8
5.0.0
- 5.0.7
+ 5.0.8
2.1.0
- 5.0.7-servicing.21263.4
- 5.0.7
+ 5.0.8-servicing.21315.11
+ 5.0.8
5.0.0
5.0.0-rtm.20520.1
@@ -129,7 +129,7 @@
2.2.0-beta.19072.10
2.0.0
- 16.10.0-release-20210520-03
+ 16.10.0
diff --git a/eng/docker/alpine.3.6/Dockerfile b/eng/docker/alpine.3.6/Dockerfile
index 9f9461690..315e11e2a 100644
--- a/eng/docker/alpine.3.6/Dockerfile
+++ b/eng/docker/alpine.3.6/Dockerfile
@@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
-FROM microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-3148f11-20171119021156
RUN apk update && apk upgrade && apk add --no-cache curl ncurses
diff --git a/eng/docker/centos/Dockerfile b/eng/docker/centos/Dockerfile
index eec66c48c..49b3abede 100644
--- a/eng/docker/centos/Dockerfile
+++ b/eng/docker/centos/Dockerfile
@@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
-FROM microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-b46d863-20180719033416
RUN yum -q -y install sudo
diff --git a/eng/docker/fedora.29/Dockerfile b/eng/docker/fedora.29/Dockerfile
index a58f30b74..5f12085df 100644
--- a/eng/docker/fedora.29/Dockerfile
+++ b/eng/docker/fedora.29/Dockerfile
@@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
-FROM microsoft/dotnet-buildtools-prereqs:fedora-29-2f0798a-20181105183801
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-29-2f0798a-20181105183801
RUN dnf install -y nss
diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile
index cd5ec2d15..14fef0e6c 100644
--- a/eng/docker/rhel/Dockerfile
+++ b/eng/docker/rhel/Dockerfile
@@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
-FROM microsoft/dotnet-buildtools-prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359
# Setup User to match Host User, and give superuser permissions
ARG USER_ID=0
diff --git a/eng/docker/ubuntu.18.04/Dockerfile b/eng/docker/ubuntu.18.04/Dockerfile
index 39a9c0327..4c8a81b99 100644
--- a/eng/docker/ubuntu.18.04/Dockerfile
+++ b/eng/docker/ubuntu.18.04/Dockerfile
@@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
-FROM microsoft/dotnet-buildtools-prereqs:ubuntu-18.04-f90bc20-20180320154721
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-f90bc20-20180320154721
RUN apt-get update && \
apt-get -qqy install \
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 1ffa5daac..d8cd20b91 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -127,7 +127,7 @@
-
+
-
-
-
-
-
diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index 11c64c7f7..938b846e6 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -3,6 +3,7 @@
using System.IO;
using System.Runtime.InteropServices;
+using System.Linq;
using System.Xml.Linq;
using Microsoft.DotNet.TestFramework;
using Microsoft.DotNet.Tools.Test.Utilities;
@@ -82,6 +83,58 @@ namespace EndToEnd.Tests
.Should().Pass().And.HaveStdOutContaining("Hello World!");
}
+ [WindowsOnlyFact]
+ public void ItCanPublishArm64Winforms()
+ {
+ DirectoryInfo directory = TestAssets.CreateTestDirectory();
+ string projectDirectory = directory.FullName;
+
+ string newArgs = "winforms --no-restore";
+ new NewCommandShim()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute(newArgs)
+ .Should().Pass();
+
+ string publishArgs="-r win-arm64";
+ new PublishCommand()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute(publishArgs)
+ .Should().Pass();
+ var selfContainedPublishDir = new DirectoryInfo(projectDirectory)
+ .Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault()
+ .Sub("win-arm64").Sub("publish");
+
+ selfContainedPublishDir.Should().HaveFilesMatching("System.Windows.Forms.dll", SearchOption.TopDirectoryOnly);
+ selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly);
+ }
+
+ [WindowsOnlyFact]
+ public void ItCanPublishArm64Wpf()
+ {
+ DirectoryInfo directory = TestAssets.CreateTestDirectory();
+ string projectDirectory = directory.FullName;
+
+ string newArgs = "wpf --no-restore";
+ new NewCommandShim()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute(newArgs)
+ .Should().Pass();
+
+ string publishArgs="-r win-arm64";
+ new PublishCommand()
+ .WithWorkingDirectory(projectDirectory)
+ .Execute(publishArgs)
+ .Should().Pass();
+
+ var selfContainedPublishDir = new DirectoryInfo(projectDirectory)
+ .Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault()
+ .Sub("win-arm64").Sub("publish");
+
+ selfContainedPublishDir.Should().HaveFilesMatching("PresentationCore.dll", SearchOption.TopDirectoryOnly);
+ selfContainedPublishDir.Should().HaveFilesMatching("PresentationNative_*.dll", SearchOption.TopDirectoryOnly);
+ selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly);
+ }
+
[Theory]
[InlineData("console")]
[InlineData("classlib")]