diff --git a/eng/pipelines/official/stages/publish.yml b/eng/pipelines/official/stages/publish.yml index 654e42921b0a6..6663be377359f 100644 --- a/eng/pipelines/official/stages/publish.yml +++ b/eng/pipelines/official/stages/publish.yml @@ -33,6 +33,8 @@ 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'" + # Publish to blob storage. + publishInstallersAndChecksums: true # Enable SDL validation, passing through values from the 'core-setup-sdl-validation' group. SDLValidationParameters: enable: false # TODO: (Consolidation) Decide who owns SDL validation errors and enable. https://github.com/dotnet/runtime/issues/1027 diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets index e31f535a7b4be..687aebcad6bac 100644 --- a/src/installer/Directory.Build.targets +++ b/src/installer/Directory.Build.targets @@ -90,7 +90,6 @@ $(ProductVersion) 2.0.0 - Runtime/$(SharedFrameworkNugetVersion)/ Runtime/$(SharedFrameworkNugetVersion)/ diff --git a/src/installer/publish/Directory.Build.targets b/src/installer/publish/Directory.Build.targets index de17992820018..b33d0f19f4b06 100644 --- a/src/installer/publish/Directory.Build.targets +++ b/src/installer/publish/Directory.Build.targets @@ -33,14 +33,30 @@ are published from every job. RID-agnostic nupkgs are built with the same ID/version by every job, so one specific job's outputs must be picked to sign and publish. --> + + + + + + + + + Include=" + @(NupkgToPublishFile->Replace('\NonShipping\', '\Shipping\')->Replace('.nupkg', '.symbols.nupkg')); + @(NupkgToPublishFile->Replace('\Shipping\', '\Shipping\symbols\')->Replace('.nupkg', '.symbols.nupkg'))" /> + + + diff --git a/src/installer/publish/prepare-artifacts.proj b/src/installer/publish/prepare-artifacts.proj index 69e4aa8d9d1a6..582fffa756307 100644 --- a/src/installer/publish/prepare-artifacts.proj +++ b/src/installer/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/src/installer/publish/publish-blobs.proj b/src/installer/publish/publish-blobs.proj deleted file mode 100644 index 46224565582b8..0000000000000 --- a/src/installer/publish/publish-blobs.proj +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -