From bdb6a38c47fdf502163e678994ec09913af2962d Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 14 Feb 2020 15:28:30 -0800 Subject: [PATCH] Publish Checksums to dotnetclichecksums storage account (#19038) * Update dependencies from Arcade * Try publishing checksums * Fix some errors * Set RelativeBlobPath * Fix publish location * Centralize ChecksumExtension * Fix use of ChecksumExtension in publishing.props --- Directory.Build.props | 1 + eng/Publishing.props | 14 ++++++++++---- .../src/Microsoft.AspNetCore.App.Runtime.csproj | 6 ++++++ src/Installers/Windows/Wix.targets | 8 +++++++- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 27c4622d2b..3adc325eaf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -173,6 +173,7 @@ .tar.gz .zip + .sha512 diff --git a/eng/Publishing.props b/eng/Publishing.props index ba728e1f71..47d6c9e010 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -3,17 +3,17 @@ $(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1)))) - $(PublishDependsOnTargets);_PublishInstallers + $(PublishDependsOnTargets);_PublishInstallersAndChecksums <_UploadPathRoot>aspnetcore - + - + <_InstallersToPublish Remove="@(_InstallersToPublish)" /> <_InstallersToPublish Include="$(ArtifactsDir)\packages\**\*.jar" UploadPathSegment="jar" /> <_InstallersToPublish Include="$(ArtifactsDir)\packages\**\*.pom" UploadPathSegment="jar" /> @@ -27,9 +27,10 @@ Condition=" '$(PublishInstallerBaseVersion)' == 'true' " /> <_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.wixlib" UploadPathSegment="Runtime" /> <_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.zip" UploadPathSegment="Runtime" /> + <_ChecksumsToPublish Include="$(ArtifactsDir)\**\*.sha512" /> - + + + true + $(_UploadPathRoot)/Runtime/$(_PackageVersion)/%(Filename)%(Extension) + + true ShipInstaller=dotnetcli diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index 4a7b1c9c4f..6cd9a075a4 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -154,6 +154,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant $(InstallersOutputPath)$(RedistArchiveOutputFileName) + + + $(RedistArchiveOutputPath)$(ChecksumExtension) + + + diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index a6c7224a84..2e4b8dca03 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -64,7 +64,7 @@ + AfterTargets="Build" BeforeTargets="GenerateChecksums"> <_cabs Include="$(TargetDir)**/*.cab" /> @@ -72,4 +72,10 @@ + + + $(InstallersOutputPath)$(PackageFileName)$(ChecksumExtension) + + +