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
This commit is contained in:
parent
7fc314f73b
commit
bdb6a38c47
|
|
@ -173,6 +173,7 @@
|
||||||
|
|
||||||
<ArchiveExtension>.tar.gz</ArchiveExtension>
|
<ArchiveExtension>.tar.gz</ArchiveExtension>
|
||||||
<ArchiveExtension Condition="'$(TargetOsName)' == 'win'">.zip</ArchiveExtension>
|
<ArchiveExtension Condition="'$(TargetOsName)' == 'win'">.zip</ArchiveExtension>
|
||||||
|
<ChecksumExtension>.sha512</ChecksumExtension>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Import Project="eng\Workarounds.props" />
|
<Import Project="eng\Workarounds.props" />
|
||||||
|
|
|
||||||
|
|
@ -3,17 +3,17 @@
|
||||||
<!-- The one use of ArtifactsDir in Publish.proj adds an additional slash, confusing itself. -->
|
<!-- The one use of ArtifactsDir in Publish.proj adds an additional slash, confusing itself. -->
|
||||||
<ArtifactsDir>$(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1))))</ArtifactsDir>
|
<ArtifactsDir>$(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1))))</ArtifactsDir>
|
||||||
|
|
||||||
<PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishInstallers</PublishDependsOnTargets>
|
<PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishInstallersAndChecksums</PublishDependsOnTargets>
|
||||||
|
|
||||||
<_UploadPathRoot>aspnetcore</_UploadPathRoot>
|
<_UploadPathRoot>aspnetcore</_UploadPathRoot>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- $(InstallersOutputPath) and $(SymbolsOutputPath) are not defined. Root Directory.Build.props is not imported. -->
|
<!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Include our "loose" PDBs when publishing symbols. -->
|
<!-- Include our "loose" PDBs when publishing symbols. -->
|
||||||
<FilesToPublishToSymbolServer Include="$(ArtifactsDir)\symbols\**\*.pdb" />
|
<FilesToPublishToSymbolServer Include="$(ArtifactsDir)\symbols\**\*.pdb" />
|
||||||
|
|
||||||
<!-- Prepare for _PublishInstallers target. -->
|
<!-- Prepare for _PublishInstallersAndChecksums target. -->
|
||||||
<_InstallersToPublish Remove="@(_InstallersToPublish)" />
|
<_InstallersToPublish Remove="@(_InstallersToPublish)" />
|
||||||
<_InstallersToPublish Include="$(ArtifactsDir)\packages\**\*.jar" UploadPathSegment="jar" />
|
<_InstallersToPublish Include="$(ArtifactsDir)\packages\**\*.jar" UploadPathSegment="jar" />
|
||||||
<_InstallersToPublish Include="$(ArtifactsDir)\packages\**\*.pom" UploadPathSegment="jar" />
|
<_InstallersToPublish Include="$(ArtifactsDir)\packages\**\*.pom" UploadPathSegment="jar" />
|
||||||
|
|
@ -27,9 +27,10 @@
|
||||||
Condition=" '$(PublishInstallerBaseVersion)' == 'true' " />
|
Condition=" '$(PublishInstallerBaseVersion)' == 'true' " />
|
||||||
<_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.wixlib" UploadPathSegment="Runtime" />
|
<_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.wixlib" UploadPathSegment="Runtime" />
|
||||||
<_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.zip" UploadPathSegment="Runtime" />
|
<_InstallersToPublish Include="$(ArtifactsDir)\installers\**\*.zip" UploadPathSegment="Runtime" />
|
||||||
|
<_ChecksumsToPublish Include="$(ArtifactsDir)\**\*.sha512" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Target Name="_PublishInstallers">
|
<Target Name="_PublishInstallersAndChecksums">
|
||||||
<!--
|
<!--
|
||||||
This target is defined in eng/targets/Packaging.targets and included in every C# and F# project.
|
This target is defined in eng/targets/Packaging.targets and included in every C# and F# project.
|
||||||
We use Microsoft.AspNetCore.DeveloperCertificates.XPlat because it is a nonshipping package, and we need a non-stable version string to use as our publish location.
|
We use Microsoft.AspNetCore.DeveloperCertificates.XPlat because it is a nonshipping package, and we need a non-stable version string to use as our publish location.
|
||||||
|
|
@ -48,6 +49,11 @@
|
||||||
<!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows. -->
|
<!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows. -->
|
||||||
<ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT'" />
|
<ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT'" />
|
||||||
|
|
||||||
|
<ItemsToPushToBlobFeed Include="@(_ChecksumsToPublish)">
|
||||||
|
<PublishFlatContainer>true</PublishFlatContainer>
|
||||||
|
<RelativeBlobPath>$(_UploadPathRoot)/Runtime/$(_PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
|
||||||
|
</ItemsToPushToBlobFeed>
|
||||||
|
|
||||||
<ItemsToPushToBlobFeed Include="@(_InstallersToPublish)">
|
<ItemsToPushToBlobFeed Include="@(_InstallersToPublish)">
|
||||||
<IsShipping>true</IsShipping>
|
<IsShipping>true</IsShipping>
|
||||||
<ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
|
<ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
|
||||||
<RedistArchiveOutputPath>$(InstallersOutputPath)$(RedistArchiveOutputFileName)</RedistArchiveOutputPath>
|
<RedistArchiveOutputPath>$(InstallersOutputPath)$(RedistArchiveOutputFileName)</RedistArchiveOutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||||
|
<GenerateChecksumItems Include="$(RedistArchiveOutputPath)">
|
||||||
|
<DestinationPath>$(RedistArchiveOutputPath)$(ChecksumExtension)</DestinationPath>
|
||||||
|
</GenerateChecksumItems>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- Target chain -->
|
<!-- Target chain -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ResolveReferencesDependsOn>
|
<ResolveReferencesDependsOn>
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@
|
||||||
|
|
||||||
<Target Name="CopyToArtifactsDirectory"
|
<Target Name="CopyToArtifactsDirectory"
|
||||||
Condition=" '$(IsShipping)' == 'true' AND '$(SkipCopyToArtifactsDirectory)' != 'true' "
|
Condition=" '$(IsShipping)' == 'true' AND '$(SkipCopyToArtifactsDirectory)' != 'true' "
|
||||||
AfterTargets="Build">
|
AfterTargets="Build" BeforeTargets="GenerateChecksums">
|
||||||
<Copy SourceFiles="$(TargetPath)" DestinationFiles="$(InstallersOutputPath)$(PackageFileName)" />
|
<Copy SourceFiles="$(TargetPath)" DestinationFiles="$(InstallersOutputPath)$(PackageFileName)" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<_cabs Include="$(TargetDir)**/*.cab" />
|
<_cabs Include="$(TargetDir)**/*.cab" />
|
||||||
|
|
@ -72,4 +72,10 @@
|
||||||
<Copy SourceFiles="@(_cabs)" DestinationFolder="$(InstallersOutputPath)" />
|
<Copy SourceFiles="@(_cabs)" DestinationFolder="$(InstallersOutputPath)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
<ItemGroup Condition=" '$(IsShipping)' == 'true' AND '$(SkipCopyToArtifactsDirectory)' != 'true' ">
|
||||||
|
<GenerateChecksumItems Include="$(InstallersOutputPath)$(PackageFileName)">
|
||||||
|
<DestinationPath>$(InstallersOutputPath)$(PackageFileName)$(ChecksumExtension)</DestinationPath>
|
||||||
|
</GenerateChecksumItems>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue