From 54b7d729e1499d7429765ce1a9fe245f718443ae Mon Sep 17 00:00:00 2001 From: Michelle McDaniel Date: Tue, 31 Aug 2021 12:30:03 -0700 Subject: [PATCH 1/4] Add Sign Check Exclusions from runtime (#11768) (#11770) These files are not signed, and therefore we should exclude them from sign check --- eng/SignCheckExclusionsFile.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/SignCheckExclusionsFile.txt b/eng/SignCheckExclusionsFile.txt index ea5b10fb8..ed889da10 100644 --- a/eng/SignCheckExclusionsFile.txt +++ b/eng/SignCheckExclusionsFile.txt @@ -2,3 +2,7 @@ ;; Format: https://github.com/dotnet/arcade/blob/397316e195639450b6c76bfeb9823b40bee72d6d/src/SignCheck/Microsoft.SignCheck/Verification/Exclusion.cs#L23-L35 *.js;; We do not sign JavaScript files. +*apphost.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 +*singlefilehost.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 +*comhost.dll;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 +*apphosttemplateapphostexe.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 From 9c49cd01683b2cebe8ebb70d8fb903e064779a4e Mon Sep 17 00:00:00 2001 From: Michelle McDaniel Date: Thu, 2 Sep 2021 12:16:55 -0700 Subject: [PATCH 2/4] [release/5.0.4xx] Add sign check exclusions for non-shipping files (#11845) * Add exclusions for nonshipping files * Remove that one --- eng/SignCheckExclusionsFile.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/SignCheckExclusionsFile.txt b/eng/SignCheckExclusionsFile.txt index ed889da10..b5de0fe0e 100644 --- a/eng/SignCheckExclusionsFile.txt +++ b/eng/SignCheckExclusionsFile.txt @@ -6,3 +6,5 @@ *singlefilehost.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 *comhost.dll;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 *apphosttemplateapphostexe.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 +VS.Redist.*;; Non-shipping packages are not signed +VS.Tools.*;; Non-shipping packages are not signed \ No newline at end of file From 9a4a1f78a5ec20cf03723d53c64643d06953944c Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 7 Sep 2021 14:03:59 -0700 Subject: [PATCH 3/4] Update branding for 5.0.402 (#11911) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 704a1a124..874ab6681 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 4 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 8fff68e255d06fada9e3333531e73493642e8f2b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Sep 2021 23:30:07 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/arcade build 20210827.7 (#11942) [release/5.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 25 ------------------------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/phases/base.yml | 2 +- global.json | 2 +- 6 files changed, 8 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a8ad7c31..ce99e4ee3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,14 @@ - - - - - - - - - - - - - @@ -44,24 +31,12 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b4cbb630..e18ef05c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - 7b8e78dced9b93e5d69fabb9fbc9a2eb5de8e95a + 2e26f9ebee3ac27803aa5f2df50192a46393d108 - + https://github.com/dotnet/arcade - 7b8e78dced9b93e5d69fabb9fbc9a2eb5de8e95a + 2e26f9ebee3ac27803aa5f2df50192a46393d108 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 874ab6681..c7ab469ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21409.4 + 5.0.0-beta.21427.7 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 8b81a7e51..2dcda1a8a 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -103,7 +103,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@2 + - task: MicroBuildSigningPlugin@3 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml index 0123cf43b..a87a0b2f6 100644 --- a/eng/common/templates/phases/base.yml +++ b/eng/common/templates/phases/base.yml @@ -82,7 +82,7 @@ phases: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: # Internal only resource, and Microbuild signing shouldn't be applied to PRs. - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildSigningPlugin@2 + - task: MicroBuildSigningPlugin@3 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/global.json b/global.json index d24051c54..d9225de5d 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21409.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21427.7" } }