From 7a767ab03a6671b216cde7e78bd2396904f2da6a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 26 May 2021 04:01:38 +0000 Subject: [PATCH 01/20] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210525.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.301-servicing.21271.7 -> To Version 5.0.301-servicing.21275.20 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 16.10.0-release-20210520-03 -> To Version 16.10.0 (parent: Microsoft.NET.Sdk --- NuGet.config | 38 +++++++++++++++++++++++++++++++++++--- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 6 +++--- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce028f67b..39c802f79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,11 +7,19 @@ + + + + + + + + @@ -20,11 +28,19 @@ + + + + + + + + @@ -47,20 +63,36 @@ + + + + + + + + + + + + + + + + + + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee245dd20..1e8e170a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 592742371da1df5b459c4bbf68e05968b5eb750d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1555c5a76cb15abb5350aeeffc63d83c3fd2f70f + 2301780038372b9dd2357e9ffeda06942f62e296 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1555c5a76cb15abb5350aeeffc63d83c3fd2f70f + 2301780038372b9dd2357e9ffeda06942f62e296 @@ -108,7 +108,7 @@ https://github.com/dotnet/fsharp 1b23bbeda88ea3cb9be9af777f4c99fa8663df81 - + https://github.com/microsoft/vstest 5c9abb2ae1b0318dc52729a3639e72089c79fb3c @@ -117,9 +117,9 @@ 6a15056a9d71169bf04d007301edfd558afcfa6a linker - + https://github.com/dotnet/roslyn - 029847714208ebe49668667c60ea5b0a294e0fcb + a408003c46b125f0c5fdc47472e5f0f5750f1e5d https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 78fe44bbd..ab4ea64f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.301-servicing.21271.7 - 5.0.301-servicing.21271.7 + 5.0.301-servicing.21275.20 + 5.0.301-servicing.21275.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.10.0-release-20210520-03 + 16.10.0 From caf8cf28968d51a65aff4791ec3aec47b54f0a44 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 9 Jun 2021 16:26:24 +0000 Subject: [PATCH 02/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21260.2 to 5.0.301-servicing.21277.3 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.10.1 to 16.10.2 (parent: Microsoft.NET.Sdk) --- NuGet.config | 58 +---------------------------------------- eng/Version.Details.xml | 16 ++++++------ eng/Versions.props | 6 ++--- 3 files changed, 12 insertions(+), 68 deletions(-) diff --git a/NuGet.config b/NuGet.config index 39c802f79..46b51e615 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,43 +7,15 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - @@ -60,38 +32,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e8e170a8..6d31741d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,17 +83,17 @@ https://github.com/dotnet/test-templates 1b253e1026e865e9c7b125fcbf6a8765030370cf - + https://github.com/dotnet/templating - 592742371da1df5b459c4bbf68e05968b5eb750d + 671312f7f9f0d06558479d412961f5fe6d1d1f4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2301780038372b9dd2357e9ffeda06942f62e296 + 08914b8da2520edd1fe5bebb99e5500d1bb02483 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2301780038372b9dd2357e9ffeda06942f62e296 + 08914b8da2520edd1fe5bebb99e5500d1bb02483 @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn a408003c46b125f0c5fdc47472e5f0f5750f1e5d - + https://github.com/dotnet/msbuild - 2fd48ab730134f7698a14fdd5752349737f0e3bd + 857e5a733346758dd6f32b034e253962b9fc2444 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index a7723fca4..5f50a9331 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.300-preview.21260.2 + 5.0.301-servicing.21277.3 @@ -55,8 +55,8 @@ - 5.0.301-servicing.21275.20 - 5.0.301-servicing.21275.20 + 5.0.302-servicing.21309.11 + 5.0.302-servicing.21309.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6076b1a3e7ef3f834d1d1abefdb913af8fe639f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 9 Jun 2021 22:08:59 +0000 Subject: [PATCH 03/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.301-servicing.21277.3 to 5.0.301-servicing.21309.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 937b134dd..281a7ef7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,17 +83,17 @@ https://github.com/dotnet/test-templates 1b253e1026e865e9c7b125fcbf6a8765030370cf - + https://github.com/dotnet/templating - 671312f7f9f0d06558479d412961f5fe6d1d1f4d + 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08914b8da2520edd1fe5bebb99e5500d1bb02483 + 4b45721361283269b96a281165216208917d4637 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08914b8da2520edd1fe5bebb99e5500d1bb02483 + 4b45721361283269b96a281165216208917d4637 diff --git a/eng/Versions.props b/eng/Versions.props index 8af69389b..a8ab5697e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.301-servicing.21277.3 + 5.0.301-servicing.21309.4 @@ -55,8 +55,8 @@ - 5.0.302-servicing.21309.11 - 5.0.302-servicing.21309.11 + 5.0.302-servicing.21309.20 + 5.0.302-servicing.21309.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 93148e7ddce479b610f8198c9cc946d175f1e678 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 10 Jun 2021 11:36:24 +0000 Subject: [PATCH 04/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.4.2-beta.21262.7 to 11.4.2-beta.21308.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 281a7ef7d..c1ae7b9aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b45721361283269b96a281165216208917d4637 + d9adbdea7be1ba9b9f2108cda632752912fafb32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4b45721361283269b96a281165216208917d4637 + d9adbdea7be1ba9b9f2108cda632752912fafb32 @@ -104,9 +104,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 36ec7266b65ec578b5524c998a80e6a8848efb41 - + https://github.com/dotnet/fsharp - 1b23bbeda88ea3cb9be9af777f4c99fa8663df81 + 4aa714b79fbc35c9a39f46fbc77e711eb10a7837 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index a8ab5697e..faa05b47b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.302-servicing.21309.20 - 5.0.302-servicing.21309.20 + 5.0.302-servicing.21310.7 + 5.0.302-servicing.21310.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2a10d4cfcdeb4dbf167f4163793f2187d46465a5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 11 Jun 2021 05:23:58 +0000 Subject: [PATCH 05/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.21221.2 to 5.0.0-rtm.21310.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1ae7b9aa..90816a66c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d9adbdea7be1ba9b9f2108cda632752912fafb32 + bcf08ad66701571b686e0d6f0c2533e40bc73e54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d9adbdea7be1ba9b9f2108cda632752912fafb32 + bcf08ad66701571b686e0d6f0c2533e40bc73e54 @@ -112,9 +112,9 @@ https://github.com/microsoft/vstest 5c9abb2ae1b0318dc52729a3639e72089c79fb3c - + https://github.com/mono/linker - 6a15056a9d71169bf04d007301edfd558afcfa6a + e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker diff --git a/eng/Versions.props b/eng/Versions.props index faa05b47b..dbd354dda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.302-servicing.21310.7 - 5.0.302-servicing.21310.7 + 5.0.302-servicing.21310.24 + 5.0.302-servicing.21310.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5771f4b00cc11df6e5cd423d642a411dd2d2a9c9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 11 Jun 2021 16:03:57 +0000 Subject: [PATCH 06/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.4.2-beta.21308.2 to 11.4.2-beta.21310.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90816a66c..c4731bd45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcf08ad66701571b686e0d6f0c2533e40bc73e54 + fa2ecce59157269b57f45a02ed9650479e61531c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bcf08ad66701571b686e0d6f0c2533e40bc73e54 + fa2ecce59157269b57f45a02ed9650479e61531c @@ -104,9 +104,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 36ec7266b65ec578b5524c998a80e6a8848efb41 - + https://github.com/dotnet/fsharp - 4aa714b79fbc35c9a39f46fbc77e711eb10a7837 + 70c1e5c3ac1e213e85831593fc65b7ca510cfae4 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index dbd354dda..6d09128ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.302-servicing.21310.24 - 5.0.302-servicing.21310.24 + 5.0.302-servicing.21311.4 + 5.0.302-servicing.21311.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3d22936c739aad0a500237a4656ef7e0ab08b04b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 11 Jun 2021 16:55:11 +0000 Subject: [PATCH 07/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.10.0-4.21273.6 to 3.10.0-4.21310.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4731bd45..3de4a96b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fa2ecce59157269b57f45a02ed9650479e61531c + b6e0c45acc154ce97066d37c29d60fe0be20a917 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fa2ecce59157269b57f45a02ed9650479e61531c + b6e0c45acc154ce97066d37c29d60fe0be20a917 @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - a408003c46b125f0c5fdc47472e5f0f5750f1e5d + 473e349f86b0f5c9dd47330cba22e0ea225c85a5 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 6d09128ad..0f033353c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.302-servicing.21311.4 - 5.0.302-servicing.21311.4 + 5.0.302-servicing.21311.8 + 5.0.302-servicing.21311.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d904dab19d08496c59bed788bc42e5aacdc425a3 Mon Sep 17 00:00:00 2001 From: Ryland Alaniz Date: Tue, 15 Jun 2021 17:53:29 +0000 Subject: [PATCH 08/20] Merged PR 15831: WindowsDesktop NET5 ARM64: Include WindowsDesktop ARM64 in the Installer (internal) This is a cherry-pick of https://github.com/dotnet/installer/pull/10699 (which targets the public Installer repo, branch release/5.0.3xx) to the internal Installer repo, branch internal/release/5.0.3xx. The public PR has been approved for 5.0.8 servicing. --- NuGet.config | 4 ++ eng/Version.Details.xml | 40 +++++++------- eng/Versions.props | 20 +++---- .../targets/GenerateBundledVersions.targets | 2 +- src/redist/targets/GenerateLayout.targets | 6 +-- .../windows/clisdk/LCID/1028/bundle.wxl | 15 ------ .../windows/clisdk/LCID/1029/bundle.wxl | 15 ------ .../windows/clisdk/LCID/1031/bundle.wxl | 15 ------ .../windows/clisdk/LCID/1033/bundle.wxl | 15 ------ .../windows/clisdk/LCID/1036/bundle.wxl | 17 +----- .../windows/clisdk/LCID/1040/bundle.wxl | 15 ------ .../windows/clisdk/LCID/1041/bundle.wxl | 15 ------ .../windows/clisdk/LCID/1042/bundle.wxl | 15 ------ .../windows/clisdk/LCID/1045/bundle.wxl | 15 ------ .../windows/clisdk/LCID/1046/bundle.wxl | 15 ------ .../windows/clisdk/LCID/1049/bundle.wxl | 15 ------ .../windows/clisdk/LCID/1055/bundle.wxl | 17 +----- .../windows/clisdk/LCID/2052/bundle.wxl | 15 ------ .../windows/clisdk/LCID/3082/bundle.wxl | 15 ------ .../packaging/windows/clisdk/bundle.wxs | 10 +--- test/EndToEnd/ProjectBuildTests.cs | 53 +++++++++++++++++++ 21 files changed, 94 insertions(+), 255 deletions(-) diff --git a/NuGet.config b/NuGet.config index 46b51e615..dd6b372ca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,8 +14,10 @@ + + @@ -35,7 +37,9 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3de4a96b3..27a519470 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 + afdfdb9b7fb0f085da05d55fcec29fdbeb23ffa5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f87455227b7f349e26043daa2e1b5b86fb381627 + afdfdb9b7fb0f085da05d55fcec29fdbeb23ffa5 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 + bff097881d0f3ed9243023da2bfc4e858e08b753 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 556582d964cc21b82a88d7154e915076f6f9008e + bff097881d0f3ed9243023da2bfc4e858e08b753 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 556582d964cc21b82a88d7154e915076f6f9008e + bff097881d0f3ed9243023da2bfc4e858e08b753 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 556582d964cc21b82a88d7154e915076f6f9008e + bff097881d0f3ed9243023da2bfc4e858e08b753 @@ -87,22 +87,22 @@ https://github.com/dotnet/templating 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6e0c45acc154ce97066d37c29d60fe0be20a917 + 4f434625f0958cc021e911beb3ae32072ebf3e34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6e0c45acc154ce97066d37c29d60fe0be20a917 + 4f434625f0958cc021e911beb3ae32072ebf3e34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3e5e4f7ca852c8b85899a18efcd114e7ed4ea163 + a6b70b6ce6b09e76ead58635dec4fd7f778f156e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 36ec7266b65ec578b5524c998a80e6a8848efb41 + 2bdf158c23a93d92362f2fc8c0dd7a5153e491a5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0f033353c..024e63b0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.7-servicing.21263.7 + 5.0.8-servicing.21314.2 - 5.0.6-servicing.21263.3 + 5.0.8-servicing.21314.6 @@ -55,8 +55,8 @@ - 5.0.302-servicing.21311.8 - 5.0.302-servicing.21311.8 + 5.0.302-servicing.21314.29 + 5.0.302-servicing.21314.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,17 +67,17 @@ - 5.0.7-servicing.21255.8 - 5.0.7 - 5.0.7 + 5.0.8-servicing.21314.8 + 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.21314.6 + 5.0.8 5.0.0 5.0.0-rtm.20520.1 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index aa2691f11..3785ac45b 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")] From fb975f1b56fb229fa92651706a1d6b605dfcc254 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 15 Jun 2021 21:24:23 +0000 Subject: [PATCH 09/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.8-servicing.21314.6 to 5.0.8-servicing.21315.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.7-servicing.21263.9 to 5.0.8-servicing.21315.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.7 to 5.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.7 to 5.0.8 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - dotnet-dev-certs: from 5.0.7-servicing.21263.9 to 5.0.8-servicing.21315.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.7-servicing.21263.9 to 5.0.8-servicing.21315.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.8 to 5.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.8-servicing.21314.2 to 5.0.8-servicing.21314.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.8 to 5.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.8-servicing.21314.6 to 5.0.8-servicing.21314.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++--------- 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd6b372ca..50238c242 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,10 @@ + + @@ -17,7 +19,7 @@ - + @@ -34,12 +36,14 @@ + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27a519470..487e3bb43 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 - afdfdb9b7fb0f085da05d55fcec29fdbeb23ffa5 + ad8c40cdf2145736fb5bc34e4b7ac7bd45764fa7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - afdfdb9b7fb0f085da05d55fcec29fdbeb23ffa5 + ad8c40cdf2145736fb5bc34e4b7ac7bd45764fa7 https://github.com/dotnet/windowsdesktop @@ -55,25 +55,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 67acc3d331454956fc06d6de2218a625e3e596f8 + 939ceedf31b5358c294c5a604425bc0837c7608f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 67acc3d331454956fc06d6de2218a625e3e596f8 + 939ceedf31b5358c294c5a604425bc0837c7608f - - https://github.com/dotnet/efcore - f8a6198dad41e8ed584da6ff711837f3288f8a8d + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + fc3840a59151a198df133a11aca6cb2a552fbbd4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 67acc3d331454956fc06d6de2218a625e3e596f8 + 939ceedf31b5358c294c5a604425bc0837c7608f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 67acc3d331454956fc06d6de2218a625e3e596f8 + 939ceedf31b5358c294c5a604425bc0837c7608f https://github.com/dotnet/test-templates @@ -87,22 +87,22 @@ https://github.com/dotnet/templating 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f434625f0958cc021e911beb3ae32072ebf3e34 + 280506f2f98e106234f6d493d3de4ca57a403c4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f434625f0958cc021e911beb3ae32072ebf3e34 + 280506f2f98e106234f6d493d3de4ca57a403c4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a6b70b6ce6b09e76ead58635dec4fd7f778f156e + 354867d2bf2e635a8b3cc1645359db5044f7c3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2bdf158c23a93d92362f2fc8c0dd7a5153e491a5 + 5a745dbe37080607acd30eaf0e5833cf4538b393 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 024e63b0c..1f9b44b8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.8-servicing.21314.2 + 5.0.8-servicing.21314.7 - 5.0.8-servicing.21314.6 + 5.0.8-servicing.21314.11 @@ -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.21315.3 + 5.0.8-servicing.21315.3 + 5.0.8-servicing.21315.3 0.2.0 - 5.0.302-servicing.21314.29 - 5.0.302-servicing.21314.29 + 5.0.302-servicing.21315.12 + 5.0.302-servicing.21315.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,7 +76,7 @@ - 5.0.8-servicing.21314.6 + 5.0.8-servicing.21315.2 5.0.8 5.0.0 5.0.0-rtm.20520.1 From 200f5b16ad7dbea429b99004f04ab4a5869ce016 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 15 Jun 2021 22:42:44 +0000 Subject: [PATCH 10/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 487e3bb43..a6f1f716c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 280506f2f98e106234f6d493d3de4ca57a403c4a + 91ad46e98d7ff962649052b5edeff373d38707d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 280506f2f98e106234f6d493d3de4ca57a403c4a + 91ad46e98d7ff962649052b5edeff373d38707d1 diff --git a/eng/Versions.props b/eng/Versions.props index 1f9b44b8e..bff28ced7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.302-servicing.21315.12 - 5.0.302-servicing.21315.12 + 5.0.302-servicing.21315.14 + 5.0.302-servicing.21315.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1279b9a9b01910f7d127a74aaca1c1a9e1487109 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 16 Jun 2021 08:58:40 +0000 Subject: [PATCH 11/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NETCore.App.Internal: from 5.0.8-servicing.21314.8 to 5.0.8-servicing.21315.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.8 to 5.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.8 to 5.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.8 to 5.0.8 (parent: Microsoft.NET.Sdk) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 50238c242..d8ea4fc44 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6f1f716c..0f7b28ada 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bff097881d0f3ed9243023da2bfc4e858e08b753 + 35964c9215613d66a687ebcb2d7fcd9496390ee7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bff097881d0f3ed9243023da2bfc4e858e08b753 + 35964c9215613d66a687ebcb2d7fcd9496390ee7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bff097881d0f3ed9243023da2bfc4e858e08b753 + 35964c9215613d66a687ebcb2d7fcd9496390ee7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bff097881d0f3ed9243023da2bfc4e858e08b753 + 35964c9215613d66a687ebcb2d7fcd9496390ee7 @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91ad46e98d7ff962649052b5edeff373d38707d1 + 7da68b8d8a78ece0648e4bc43aa6ef2722a0b516 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91ad46e98d7ff962649052b5edeff373d38707d1 + 7da68b8d8a78ece0648e4bc43aa6ef2722a0b516 diff --git a/eng/Versions.props b/eng/Versions.props index bff28ced7..6ea02fd61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.302-servicing.21315.14 - 5.0.302-servicing.21315.14 + 5.0.302-servicing.21315.19 + 5.0.302-servicing.21315.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,7 +67,7 @@ - 5.0.8-servicing.21314.8 + 5.0.8-servicing.21315.4 5.0.8 5.0.8 5.0.0 From 64085092db4a7c09511d683224cefbdd905d5b65 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 16 Jun 2021 16:21:29 +0000 Subject: [PATCH 12/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.8-servicing.21315.3 to 5.0.8-servicing.21315.17 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.8 to 5.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.EntityFrameworkCore: from 5.0.8 to 5.0.8 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - dotnet-dev-certs: from 5.0.8-servicing.21315.3 to 5.0.8-servicing.21315.17 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.8-servicing.21315.3 to 5.0.8-servicing.21315.17 (parent: Microsoft.NET.Sdk) --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index d8ea4fc44..81a373ff4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,10 @@ - + - + @@ -36,10 +36,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f7b28ada..a214aae56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,23 +57,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 939ceedf31b5358c294c5a604425bc0837c7608f + 342fdd09308a22eb9169ae626ec17afdbf841910 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 939ceedf31b5358c294c5a604425bc0837c7608f + 342fdd09308a22eb9169ae626ec17afdbf841910 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - fc3840a59151a198df133a11aca6cb2a552fbbd4 + 1af30fd9b4752ab36eff63d9bc75888d41c85657 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 939ceedf31b5358c294c5a604425bc0837c7608f + 342fdd09308a22eb9169ae626ec17afdbf841910 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 939ceedf31b5358c294c5a604425bc0837c7608f + 342fdd09308a22eb9169ae626ec17afdbf841910 https://github.com/dotnet/test-templates @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7da68b8d8a78ece0648e4bc43aa6ef2722a0b516 + ecbd4fabd67d4bbda8af4d0bd5d3621918cd5c1b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7da68b8d8a78ece0648e4bc43aa6ef2722a0b516 + ecbd4fabd67d4bbda8af4d0bd5d3621918cd5c1b diff --git a/eng/Versions.props b/eng/Versions.props index 6ea02fd61..06b23159b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,17 +46,17 @@ 5.0.8 5.0.0 5.0.0-rtm.20526.5 - 5.0.8-servicing.21315.3 - 5.0.8-servicing.21315.3 - 5.0.8-servicing.21315.3 + 5.0.8-servicing.21315.17 + 5.0.8-servicing.21315.17 + 5.0.8-servicing.21315.17 0.2.0 - 5.0.302-servicing.21315.19 - 5.0.302-servicing.21315.19 + 5.0.302-servicing.21316.3 + 5.0.302-servicing.21316.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 53ce8d0a55b736de51249ff24eae1ce8f67a03a6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 16 Jun 2021 17:23:50 +0000 Subject: [PATCH 13/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.8-servicing.21315.2 to 5.0.8-servicing.21315.11 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.8 to 5.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.8-servicing.21314.7 to 5.0.8-servicing.21315.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.8 to 5.0.8 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.8-servicing.21314.11 to 5.0.8-servicing.21315.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 81a373ff4..a152f02dd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a214aae56..1dee2a824 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 - ad8c40cdf2145736fb5bc34e4b7ac7bd45764fa7 + c6b484729ae616e85f1899f1dc49bfc8f17a2393 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad8c40cdf2145736fb5bc34e4b7ac7bd45764fa7 + c6b484729ae616e85f1899f1dc49bfc8f17a2393 https://github.com/dotnet/windowsdesktop @@ -87,22 +87,22 @@ https://github.com/dotnet/templating 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ecbd4fabd67d4bbda8af4d0bd5d3621918cd5c1b + ca554431fdb418540296cae98738f856066e8c0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ecbd4fabd67d4bbda8af4d0bd5d3621918cd5c1b + ca554431fdb418540296cae98738f856066e8c0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 354867d2bf2e635a8b3cc1645359db5044f7c3e0 + 1f2d3e749e035c234cc9f248394b11725103a833 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5a745dbe37080607acd30eaf0e5833cf4538b393 + c3afd220b9380b3b329e7eddc63224d74e6f25fe https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 06b23159b..86ad3abe9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.8-servicing.21314.7 + 5.0.8-servicing.21315.4 - 5.0.8-servicing.21314.11 + 5.0.8-servicing.21315.6 @@ -55,8 +55,8 @@ - 5.0.302-servicing.21316.3 - 5.0.302-servicing.21316.3 + 5.0.302-servicing.21316.6 + 5.0.302-servicing.21316.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,7 +76,7 @@ - 5.0.8-servicing.21315.2 + 5.0.8-servicing.21315.11 5.0.8 5.0.0 5.0.0-rtm.20520.1 From c005824e35b6b605b51d6e8ec6e477d1c38173cd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 18 Jun 2021 23:32:09 +0000 Subject: [PATCH 14/20] [internal/release/5.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.8-servicing.21315.17 to 5.0.8-servicing.21318.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.8 to 5.0.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.8-servicing.21315.17 to 5.0.8-servicing.21318.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.8-servicing.21315.17 to 5.0.8-servicing.21318.5 (parent: Microsoft.NET.Sdk) --- NuGet.config | 10 ++++++++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 10 +++++----- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index a152f02dd..a5c8ba299 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,18 +7,21 @@ - + + + + @@ -36,14 +39,17 @@ - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1dee2a824..2ac597a1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,23 +57,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 342fdd09308a22eb9169ae626ec17afdbf841910 + ae2eabad0e49302d0632a7dde917fdc68d960dc4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 342fdd09308a22eb9169ae626ec17afdbf841910 + ae2eabad0e49302d0632a7dde917fdc68d960dc4 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore 1af30fd9b4752ab36eff63d9bc75888d41c85657 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 342fdd09308a22eb9169ae626ec17afdbf841910 + ae2eabad0e49302d0632a7dde917fdc68d960dc4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 342fdd09308a22eb9169ae626ec17afdbf841910 + ae2eabad0e49302d0632a7dde917fdc68d960dc4 https://github.com/dotnet/test-templates @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 12fe3ad961eb9574f60c1c63b578dd5eac2fe9bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca554431fdb418540296cae98738f856066e8c0b + e9667aef50fe25c58ea4310ec42a62a5e8813283 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca554431fdb418540296cae98738f856066e8c0b + e9667aef50fe25c58ea4310ec42a62a5e8813283 diff --git a/eng/Versions.props b/eng/Versions.props index 86ad3abe9..d13d02501 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,17 +46,17 @@ 5.0.8 5.0.0 5.0.0-rtm.20526.5 - 5.0.8-servicing.21315.17 - 5.0.8-servicing.21315.17 - 5.0.8-servicing.21315.17 + 5.0.8-servicing.21318.5 + 5.0.8-servicing.21318.5 + 5.0.8-servicing.21318.5 0.2.0 - 5.0.302-servicing.21316.6 - 5.0.302-servicing.21316.6 + 5.0.302-servicing.21318.17 + 5.0.302-servicing.21318.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26d228c0b1a26c7a4e8d6ab3e0bd3aaef84786c2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 6 Jul 2021 11:19:50 -0700 Subject: [PATCH 15/20] Update branding for 5.0.3xx to 303 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index fe0d74bf3..9ec56acfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 3 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From f96f942f795b020429b314de04aad99e0478f863 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Jul 2021 18:17:11 +0000 Subject: [PATCH 16/20] Update dependencies from https://github.com/dotnet/arcade build 20210628.3 (#11068) [release/5.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- eng/common/generate-locproject.ps1 | 14 +++++++------- eng/common/templates/job/onelocbuild.yml | 14 ++++++++++++-- eng/common/tools.ps1 | 13 +++++++++++-- global.json | 2 +- 6 files changed, 36 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 978f05eaf..399b58223 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - dad4f3c62e24b94b1514427674af8ca899cddd5f + 5266aa9856457785b84739fda2616f21da7ee6b4 - + https://github.com/dotnet/arcade - dad4f3c62e24b94b1514427674af8ca899cddd5f + 5266aa9856457785b84739fda2616f21da7ee6b4 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9ec56acfb..0b486e639 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21262.2 + 5.0.0-beta.21328.3 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 2907f916d..de348a2e2 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -14,7 +14,7 @@ $ErrorActionPreference = "Stop" Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') -$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json" +$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json" $exclusions = @{ Exclusions = @() } if (Test-Path -Path $exclusionsFilePath) { @@ -38,7 +38,7 @@ if ($allXlfFiles) { $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf" } $langXlfFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf' + $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru @@ -92,14 +92,14 @@ Write-Host "LocProject.json generated:`n`n$json`n`n" Pop-Location if (!$UseCheckedInLocProjectJson) { - New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\Localize\LocProject.json" $json + New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\eng\Localize\LocProject.json" $json } else { - New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json + New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json - if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) { + if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) { Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." exit 1 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index b27d6faf3..e8bc77d2e 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -12,11 +12,15 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true AutoCompletePr: false + UseLfLineEndings: true UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo LclPackageId: '' RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main condition: '' jobs: @@ -52,18 +56,24 @@ jobs: env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) inputs: - locProj: Localize/LocProject.json + locProj: eng/Localize/LocProject.json outDir: $(Build.ArtifactStagingDirectory) lclSource: ${{ parameters.LclSource }} lclPackageId: ${{ parameters.LclPackageId }} isCreatePrSelected: ${{ parameters.CreatePr }} ${{ if eq(parameters.CreatePr, true) }}: isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} condition: ${{ parameters.condition }} - task: PublishBuildArtifacts@1 @@ -77,7 +87,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish LocProject.json inputs: - PathtoPublish: '$(Build.SourcesDirectory)/Localize/' + PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' PublishLocation: Container ArtifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 60eb601c8..eba7ed49d 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -371,7 +371,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } - return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe" + + $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" + $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false } + if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) { + $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe" + } else { + $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe" + } + + return $global:_MSBuildExe } function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) { @@ -527,7 +536,7 @@ function GetDefaultMSBuildEngine() { function GetNuGetPackageCachePath() { if ($env:NUGET_PACKAGES -eq $null) { - # Use local cache on CI to ensure deterministic build. + # Use local cache on CI to ensure deterministic build. # Avoid using the http cache as workaround for https://github.com/NuGet/Home/issues/3116 # use global cache in dev builds to avoid cost of downloading packages. # For directory normalization, see also: https://github.com/NuGet/Home/issues/7968 diff --git a/global.json b/global.json index edebab60f..a0a164ac3 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21262.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21328.3" } } From 19546e8e0a28d83b75f4c95718eb6db1def097af Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 13 Jul 2021 12:33:36 -0700 Subject: [PATCH 17/20] replace deprecated docker hub references --- eng/docker/alpine.3.6/Dockerfile | 2 +- eng/docker/centos/Dockerfile | 2 +- eng/docker/fedora.29/Dockerfile | 2 +- eng/docker/rhel/Dockerfile | 2 +- eng/docker/ubuntu.18.04/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 \ From f0367394f653158eb00ab1d95f1663ba9dc2fc0f Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 14 Jul 2021 12:14:57 -0700 Subject: [PATCH 18/20] Update aspnetcore 3.1 template versions (#11084) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e6ed415aa..c7421b301 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.16 + 3.1.17 3.2.1 4.8.0-rc2.19462.10 From f7da64faf4a938dfbd36d4e2a01250285283f9a4 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Thu, 15 Jul 2021 16:19:35 -0700 Subject: [PATCH 19/20] Update Windows SDK projection --- eng/ManualVersions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 5826e1bd4..7d8f6cdee 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,9 +9,9 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.18 - 10.0.18362.18 - 10.0.19041.18 - 10.0.20348.18 + 10.0.17763.19 + 10.0.18362.19 + 10.0.19041.19 + 10.0.20348.19 From 49fe2db931f6ff2960a13de77f506c0579d7872c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Aug 2021 22:09:41 +0000 Subject: [PATCH 20/20] Update dependencies from https://github.com/dotnet/arcade build 20210727.1 (#11400) [release/5.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 14 --------- eng/Version.Details.xml | 8 ++--- eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 4 +-- eng/common/sdl/execute-all-sdl-tools.ps1 | 11 ++++++- eng/common/sdl/init-sdl.ps1 | 2 +- eng/common/sdl/push-gdn.ps1 | 31 ++++++++++++-------- eng/common/sdl/run-sdl.ps1 | 2 +- global.json | 2 +- 9 files changed, 39 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index a5c8ba299..46b51e615 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,15 @@ - - - - - - - @@ -39,17 +32,10 @@ - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e032333a..a699c9278 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 - + https://github.com/dotnet/arcade - 5266aa9856457785b84739fda2616f21da7ee6b4 + 37d6692a72171966d9d1d786f03577cd5a3b8c12 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c7421b301..32376d1ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21328.3 + 5.0.0-beta.21377.1 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index a40ee827a..3396cd527 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -15,8 +15,8 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - # Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel - $darc = Get-Darc "1.1.0-beta.20418.1" + + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index b681d797c..b6a7de26b 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -32,7 +32,7 @@ try { $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true - $LASTEXITCODE = 0 + $global:LASTEXITCODE = 0 # `tools.ps1` checks $ci to perform some actions. Since the SDL # scripts don't necessarily execute in the same agent that run the @@ -82,13 +82,22 @@ try { if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) { & $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + if ($LASTEXITCODE -ne 0) { + ExitWithExitCode $LASTEXITCODE + } } if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { & $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + if ($LASTEXITCODE -ne 0) { + ExitWithExitCode $LASTEXITCODE + } } if ($UpdateBaseline) { & (Join-Path $PSScriptRoot 'push-gdn.ps1') -Repository $RepoName -BranchName $BranchName -GdnFolder $GdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason 'Update baseline' + if ($LASTEXITCODE -ne 0) { + ExitWithExitCode $LASTEXITCODE + } } if ($TsaPublish) { diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index bb6a42971..ac1bc4b87 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -10,7 +10,7 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true -$LASTEXITCODE = 0 +$global:LASTEXITCODE = 0 # `tools.ps1` checks $ci to perform some actions. Since the SDL # scripts don't necessarily execute in the same agent that run the diff --git a/eng/common/sdl/push-gdn.ps1 b/eng/common/sdl/push-gdn.ps1 index d8fd2d82a..c2eec7d92 100644 --- a/eng/common/sdl/push-gdn.ps1 +++ b/eng/common/sdl/push-gdn.ps1 @@ -9,7 +9,7 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true -$LASTEXITCODE = 0 +$global:LASTEXITCODE = 0 try { # `tools.ps1` checks $ci to perform some actions. Since the SDL @@ -46,19 +46,26 @@ try { Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git add failed with exit code $LASTEXITCODE." ExitWithExitCode $LASTEXITCODE } - Write-Host "git -c user.email=`"dn-bot@microsoft.com`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`"" - git -c user.email="dn-bot@microsoft.com" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName" + # check if there are any staged changes (0 = no changes, 1 = changes) + # if we don't do this and there's nothing to commit `git commit` will return + # exit code 1 and we will fail + Write-Host "git diff --cached --exit-code" + git diff --cached --exit-code + Write-Host "git diff exit code: $LASTEXITCODE" if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git commit failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE + Write-Host "git -c user.email=`"dn-bot@microsoft.com`" -c user.name=`"Dotnet Bot`" commit -m `"$PushReason for $Repository/$BranchName`"" + git -c user.email="dn-bot@microsoft.com" -c user.name="Dotnet Bot" commit -m "$PushReason for $Repository/$BranchName" + if ($LASTEXITCODE -ne 0) { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git commit failed with exit code $LASTEXITCODE." + ExitWithExitCode $LASTEXITCODE + } + Write-Host 'git push' + git push + if ($LASTEXITCODE -ne 0) { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git push failed with exit code $LASTEXITCODE." + ExitWithExitCode $LASTEXITCODE + } } - Write-Host 'git push' - git push - if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Git push failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE - } - # Return to the original directory Pop-Location } diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index fe95ab35a..3d9c87aba 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -13,7 +13,7 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true -$LASTEXITCODE = 0 +$global:LASTEXITCODE = 0 try { # `tools.ps1` checks $ci to perform some actions. Since the SDL diff --git a/global.json b/global.json index a0a164ac3..2183619c0 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21328.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21377.1" } }