Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit d34d157

Browse files
mmitchemmitche
authored
Publish installers and checksums (#8426)
* 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/<version> instead of assets/core-setup/.. to line up with the desired paths. * Update arcade to one that will publish .sha512 properly
1 parent 29001e4 commit d34d157

File tree

7 files changed

+47
-109
lines changed

7 files changed

+47
-109
lines changed

‎Directory.Build.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
<HostPolicyVersion Condition="'$(UseShippedHostPolicyPackage)' != 'true'">$(ProductVersion)</HostPolicyVersion>
8383
<HostPolicyVersion Condition="'$(UseShippedHostPolicyPackage)' == 'true'">2.0.0</HostPolicyVersion>
8484

85-
<BinariesRelativePath>Runtime/$(SharedFrameworkNugetVersion)/</BinariesRelativePath>
8685
<InstallersRelativePath>Runtime/$(SharedFrameworkNugetVersion)/</InstallersRelativePath>
8786
</PropertyGroup>
8887

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,21 +135,21 @@
135135
</Dependency>
136136
</ProductDependencies>
137137
<ToolsetDependencies>
138-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19474.3">
138+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19502.6">
139139
<Uri>https://github.com/dotnet/arcade</Uri>
140-
<Sha>0e9ffd6464aff37aef2dc41dc2162d258f266e32</Sha>
140+
<Sha>f4823f5c2c1f95e85bb595f533b17afc71924dd6</Sha>
141141
</Dependency>
142-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19474.3">
142+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19502.6">
143143
<Uri>https://github.com/dotnet/arcade</Uri>
144-
<Sha>0e9ffd6464aff37aef2dc41dc2162d258f266e32</Sha>
144+
<Sha>f4823f5c2c1f95e85bb595f533b17afc71924dd6</Sha>
145145
</Dependency>
146-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19474.3">
146+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19502.6">
147147
<Uri>https://github.com/dotnet/arcade</Uri>
148-
<Sha>0e9ffd6464aff37aef2dc41dc2162d258f266e32</Sha>
148+
<Sha>f4823f5c2c1f95e85bb595f533b17afc71924dd6</Sha>
149149
</Dependency>
150-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19474.3">
150+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19502.6">
151151
<Uri>https://github.com/dotnet/arcade</Uri>
152-
<Sha>0e9ffd6464aff37aef2dc41dc2162d258f266e32</Sha>
152+
<Sha>f4823f5c2c1f95e85bb595f533b17afc71924dd6</Sha>
153153
</Dependency>
154154
<Dependency Name="Microsoft.SourceLink" Version="1.0.0-beta2-19367-01">
155155
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<!--Package versions-->
2525
<PropertyGroup>
2626
<!-- arcade -->
27-
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19474.3</MicrosoftDotNetBuildTasksFeedPackageVersion>
28-
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19474.3</MicrosoftDotNetBuildTasksPackagingPackageVersion>
29-
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19474.3</MicrosoftDotNetVersionToolsTasksPackageVersion>
27+
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19502.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
28+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19502.6</MicrosoftDotNetBuildTasksPackagingPackageVersion>
29+
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19502.6</MicrosoftDotNetVersionToolsTasksPackageVersion>
3030
<!-- sourcelink -->
3131
<MicrosoftSourceLinkVersion>1.0.0-beta2-19367-01</MicrosoftSourceLinkVersion>
3232
<!-- corefx -->

‎eng/stages/publish.yml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,19 @@ parameters:
33

44
stages:
55

6-
# Create extra stage per BAR channel that needs extra publish steps.
7-
- ${{ each dependency in parameters.dependsOnPublishStages }}:
8-
- stage: PublishBlob_${{ dependency.dependsOn }}
9-
displayName: '${{ dependency.channel.name }} Blob Publish'
10-
dependsOn: PrepareForPublish
11-
variables:
12-
- template: /eng/common/templates/post-build/common-variables.yml
13-
jobs:
14-
- template: /eng/jobs/run-publish-project.yml
15-
parameters:
16-
projectName: publish-blobs
17-
dependency: ${{ dependency }}
18-
196
# Stages-based publishing entry point
207
- template: /eng/common/templates/post-build/post-build.yml
218
parameters:
229
dependsOn:
23-
- ${{ each dependency in parameters.dependsOnPublishStages }}:
24-
- PublishBlob_${{ dependency.dependsOn }}
10+
- PrepareForPublish
2511
# Symbol validation is not ready yet. https://github.com/dotnet/arcade/issues/2871
2612
enableSymbolValidation: false
2713
# SourceLink validation doesn't work in dev builds: tries to pull from GitHub. https://github.com/dotnet/arcade/issues/3604
2814
enableSourceLinkValidation: false
2915
# Allow symbol publish to emit expected warnings without failing the build. Include single
3016
# quotes inside the string so that it passes through to MSBuild without script interference.
3117
symbolPublishingAdditionalParameters: "'-warnAsError:$false'"
18+
publishInstallersAndChecksums: true
3219

3320
# Create extra stage per BAR channel that needs extra publish steps. These run after the Arcade
3421
# stages because they depend on Arcade's NuGet package publish being complete.

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "3.0.100"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3"
6+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19502.6"
77
}
88
}

‎publish/prepare-artifacts.proj

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
<Project>
22
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
33

4+
<UsingTask TaskName="GenerateChecksums" AssemblyFile="$(LocalBuildToolsTaskFile)" />
5+
6+
<PropertyGroup>
7+
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
8+
</PropertyGroup>
9+
10+
<Target Name="CreateChecksums">
11+
<ItemGroup>
12+
<ArtifactsForGeneratingChecksums
13+
Include="@(UploadToBlobStorageFile)"
14+
DestinationPath="%(FullPath)$(ChecksumExtension)" />
15+
16+
<GeneratedChecksumFile Include="@(ArtifactsForGeneratingChecksums -> '%(DestinationPath)')" />
17+
</ItemGroup>
18+
19+
<GenerateChecksums Items="@(ArtifactsForGeneratingChecksums)" />
20+
</Target>
21+
422
<Target Name="SignPackages"
523
Condition="'$(SkipSigning)' != 'true' and '$(SignType)' != 'public'">
624
<Message Importance="High" Text="Signing final packages" />
@@ -13,12 +31,17 @@
1331
<Target Name="UploadPreparedArtifactsToPipeline"
1432
DependsOnTargets="
1533
FindDownloadedArtifacts;
16-
SignPackages">
34+
SignPackages;
35+
CreateChecksums">
1736
<PropertyGroup>
1837
<PreparedFileUploadDir>$(ArtifactsObjDir)PreparedFileUpload\</PreparedFileUploadDir>
1938
</PropertyGroup>
20-
21-
<Copy SourceFiles="@(UploadToBlobStorageFile)" DestinationFolder="$(PreparedFileUploadDir)">
39+
40+
<ItemGroup>
41+
<AllFilesToBlobStorage Include="@(UploadToBlobStorageFile);@(UploadToBlobStorageFile)" />
42+
</ItemGroup>
43+
44+
<Copy SourceFiles="@(AllFilesToBlobStorage)" DestinationFolder="$(PreparedFileUploadDir)">
2245
<Output TaskParameter="CopiedFiles" ItemName="CopiedUploadToBlobStorageFile" />
2346
</Copy>
2447

@@ -96,9 +119,13 @@
96119

97120
<ItemsToPush
98121
Include="@(UploadToBlobStorageFile)"
99-
Exclude="@(NupkgToPublishFile);@(SymbolNupkgToPublishFile)" />
100-
<ItemsToPush>
101-
<RelativeBlobPath>assets/core-setup/$(InstallersRelativePath)%(Filename)%(Extension)</RelativeBlobPath>
122+
Exclude="@(NupkgToPublishFile);@(SymbolNupkgToPublishFile)">
123+
<RelativeBlobPath>$(InstallersRelativePath)%(Filename)%(Extension)</RelativeBlobPath>
124+
</ItemsToPush>
125+
126+
<ItemsToPush Include="@(GeneratedChecksumFile)">
127+
<RelativeBlobPath>$(InstallersRelativePath)%(Filename)%(Extension)</RelativeBlobPath>
128+
<Category>Checksum</Category>
102129
</ItemsToPush>
103130
</ItemGroup>
104131

‎publish/publish-blobs.proj

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)