From 6bd821df1b1f7de0ef9039cf08953e1783642cf5 Mon Sep 17 00:00:00 2001 From: mmitche Date: Tue, 1 Oct 2019 07:29:07 -0700 Subject: [PATCH 1/2] Publish installers and checksums - Use the arcade publishing process to publish the installers and checksums - Remove old blob publishing - Calculate the product version using an always-suffixed version - Change the blob path that we should upload to to be Runtime/ instead of assets/core-setup/.. to line up with the desired paths. --- Directory.Build.targets | 1 - eng/stages/publish.yml | 17 +------- publish/prepare-artifacts.proj | 39 +++++++++++++++--- publish/publish-blobs.proj | 75 ---------------------------------- 4 files changed, 35 insertions(+), 97 deletions(-) delete mode 100644 publish/publish-blobs.proj diff --git a/Directory.Build.targets b/Directory.Build.targets index 4616d30121..5ffc934c20 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -82,7 +82,6 @@ $(ProductVersion) 2.0.0 - Runtime/$(SharedFrameworkNugetVersion)/ Runtime/$(SharedFrameworkNugetVersion)/ diff --git a/eng/stages/publish.yml b/eng/stages/publish.yml index 25575ff4e5..c3f4f8ded3 100644 --- a/eng/stages/publish.yml +++ b/eng/stages/publish.yml @@ -3,25 +3,11 @@ parameters: stages: -# Create extra stage per BAR channel that needs extra publish steps. -- ${{ each dependency in parameters.dependsOnPublishStages }}: - - stage: PublishBlob_${{ dependency.dependsOn }} - displayName: '${{ dependency.channel.name }} Blob Publish' - dependsOn: PrepareForPublish - variables: - - template: /eng/common/templates/post-build/common-variables.yml - jobs: - - template: /eng/jobs/run-publish-project.yml - parameters: - projectName: publish-blobs - dependency: ${{ dependency }} - # Stages-based publishing entry point - template: /eng/common/templates/post-build/post-build.yml parameters: dependsOn: - - ${{ each dependency in parameters.dependsOnPublishStages }}: - - PublishBlob_${{ dependency.dependsOn }} + - PrepareForPublish # Symbol validation is not ready yet. https://github.com/dotnet/arcade/issues/2871 enableSymbolValidation: false # SourceLink validation doesn't work in dev builds: tries to pull from GitHub. https://github.com/dotnet/arcade/issues/3604 @@ -29,6 +15,7 @@ stages: # Allow symbol publish to emit expected warnings without failing the build. Include single # quotes inside the string so that it passes through to MSBuild without script interference. symbolPublishingAdditionalParameters: "'-warnAsError:$false'" + publishInstallersAndChecksums: true # Create extra stage per BAR channel that needs extra publish steps. These run after the Arcade # stages because they depend on Arcade's NuGet package publish being complete. diff --git a/publish/prepare-artifacts.proj b/publish/prepare-artifacts.proj index 4d66ad7652..10a7e54c23 100644 --- a/publish/prepare-artifacts.proj +++ b/publish/prepare-artifacts.proj @@ -1,6 +1,24 @@ + + + + true + + + + + + + + + + + + @@ -13,12 +31,17 @@ + SignPackages; + CreateChecksums"> $(ArtifactsObjDir)PreparedFileUpload\ - - + + + + + + @@ -96,9 +119,13 @@ - - assets/core-setup/$(InstallersRelativePath)%(Filename)%(Extension) + Exclude="@(NupkgToPublishFile);@(SymbolNupkgToPublishFile)"> + $(InstallersRelativePath)%(Filename)%(Extension) + + + + $(InstallersRelativePath)%(Filename)%(Extension) + Checksum diff --git a/publish/publish-blobs.proj b/publish/publish-blobs.proj deleted file mode 100644 index ed3b2d67d4..0000000000 --- a/publish/publish-blobs.proj +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From b4e2a1593cef4650f002a1417b7b79f180ee297f Mon Sep 17 00:00:00 2001 From: mmitche Date: Wed, 2 Oct 2019 14:48:59 -0700 Subject: [PATCH 2/2] Update arcade to one that will publish .sha512 properly --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e769ed5a43..7bc46893ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,21 +135,21 @@ - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + f4823f5c2c1f95e85bb595f533b17afc71924dd6 - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + f4823f5c2c1f95e85bb595f533b17afc71924dd6 - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + f4823f5c2c1f95e85bb595f533b17afc71924dd6 - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + f4823f5c2c1f95e85bb595f533b17afc71924dd6 https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index 5458de579b..e85ebf5bdf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,9 +24,9 @@ - 2.2.0-beta.19474.3 - 1.0.0-beta.19474.3 - 1.0.0-beta.19474.3 + 2.2.0-beta.19502.6 + 1.0.0-beta.19502.6 + 1.0.0-beta.19502.6 1.0.0-beta2-19367-01 diff --git a/global.json b/global.json index 0ae3965f11..9f2d51cc78 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19502.6" } }