Skip to content

Fix blob and symbol package publishing #113377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions eng/Publishing.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
</PropertyGroup>

<PropertyGroup Condition="'$(DotNetFinalPublish)' != 'true' and '$(DotNetBuildOrchestrator)' != 'true'">
<PropertyGroup Condition="'$(DotNetFinalPublish)' != 'true' and '$(DotNetBuild)' != 'true'">
<PushToLocalStorage>true</PushToLocalStorage>
<PreserveRepoOrigin>true</PreserveRepoOrigin>
<ArtifactsStagingDir>$(ArtifactsDir)staging/</ArtifactsStagingDir>
Expand All @@ -22,19 +22,19 @@

<!-- In the runtime official build, we only sign a subset of files. Add all of our blob artifacts here again for publishing -->
<ItemGroup Condition="'$(DotNetFinalPublish)' == 'true'">
<BlobArtifact Include="$(ArtifactsPackagesDir)**\*.tar.gz;
$(ArtifactsPackagesDir)**\*.zip;
$(ArtifactsPackagesDir)**\*.deb;
$(ArtifactsPackagesDir)**\*.rpm;
$(ArtifactsPackagesDir)**\*.pkg;
$(ArtifactsPackagesDir)**\*.exe;
$(ArtifactsPackagesDir)**\*.msi;"
Exclude="$(ArtifactsPackagesDir)**\Symbols.runtime.tar.gz"
Kind="Blob"
IsShipping="$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping'))">
<Artifact Include="$(ArtifactsPackagesDir)**\*.tar.gz;
$(ArtifactsPackagesDir)**\*.zip;
$(ArtifactsPackagesDir)**\*.deb;
$(ArtifactsPackagesDir)**\*.rpm;
$(ArtifactsPackagesDir)**\*.pkg;
$(ArtifactsPackagesDir)**\*.exe;
$(ArtifactsPackagesDir)**\*.msi;"
Exclude="$(ArtifactsPackagesDir)**\Symbols.runtime.tar.gz"
Kind="Blob"
IsShipping="$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping'))">
<!-- Exclude wixpack.zip files from checksum generation -->
<ChecksumPath Condition="$([System.String]::Copy('%(Filename)%(Extension)').EndsWith('.wixpack.zip')) != 'true'">%(FullPath).sha512</ChecksumPath>
</BlobArtifact>
</Artifact>
</ItemGroup>

<!--
Expand Down Expand Up @@ -122,17 +122,17 @@
</ItemGroup>
<!-- In vertical dotnet/runtime legs outside of the VMR, set the "relative blob path" to shipping vs non-shipping to make our download/upload work. -->
<ItemGroup Condition="'$(DotNetFinalPublish)' != 'true' and '$(DotNetBuildOrchestrator)' != 'true'">
<Artifact Condition="'%(Artifact.IsVSSetup)' == 'true'"
RelativeBlobPath="VSSetup/%(Filename)%(Extension)" />

<Artifact Condition="'%(Artifact.Kind)' == 'Blob' and '%(Artifact.IsShipping)' == 'true'"
RelativeBlobPath="packages/$(Configuration)/Shipping/%(Filename)%(Extension)" />
<Artifact Condition="'%(Artifact.Kind)' == 'Blob' and '%(Artifact.IsShipping)' != 'true'"
RelativeBlobPath="packages/$(Configuration)/NonShipping/%(Filename)%(Extension)" />
<ItemsToPushToBlobFeed Condition="'%(Artifact.Kind)' == 'Blob' and '%(Artifact.IsShipping)' == 'true'"
<ItemsToPushToBlobFeed Condition="'%(ItemsToPushToBlobFeed.Kind)' == 'Blob' and '%(ItemsToPushToBlobFeed.IsShipping)' == 'true'"
RelativeBlobPath="packages/$(Configuration)/Shipping/%(Filename)%(Extension)" />
<ItemsToPushToBlobFeed Condition="'%(Artifact.Kind)' == 'Blob' and '%(Artifact.IsShipping)' != 'true'"
RelativeBlobPath="packages/$(Configuration)/NonShipping/%(RecursiveDir)%(Filename)%(Extension)" />
<ItemsToPushToBlobFeed Condition="'%(ItemsToPushToBlobFeed.Kind)' == 'Blob' and '%(ItemsToPushToBlobFeed.IsShipping)' != 'true'"
RelativeBlobPath="packages/$(Configuration)/NonShipping/%(Filename)%(Extension)" />

<Artifact Condition="'%(Artifact.IsVSSetup)' == 'true'"
RelativeBlobPath="VSSetup/%(Filename)%(Extension)" />
</ItemGroup>
</Target>
</Project>
1 change: 1 addition & 0 deletions eng/Signing.props
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
Kind="Blob"
ChecksumPath="%(FullPath).sha512"
IsVSSetup="true"
IsShipping="true"
SubBlobFolder="workloads/" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/runtime-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -402,14 +402,12 @@ extends:
artifactName: Build_browser_wasm_Linux_release_AllRuntimes_Artifacts
targetPath: $(Build.ArtifactStagingDirectory)/artifacts/workloadPackages
itemPattern: |
**/Microsoft.NET.Runtime.MonoAOTCompiler.Task*.nupkg
**/Microsoft.NETCore.App.Runtime.Mono.browser-wasm*.nupkg
**/Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest*.nupkg
**/Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest*.nupkg
**/Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest*.nupkg
**/Microsoft.NET.Workload.Mono.ToolChain.net8.Manifest*.nupkg
**/Microsoft.NET.Workload.Mono.ToolChain.net9.Manifest*.nupkg
**/Microsoft.NET.Runtime.MonoTargets.Sdk*.nupkg
**/Microsoft.NET.Runtime.WebAssembly.Sdk*.nupkg
**/Microsoft.NET.Runtime.WebAssembly.Templates*.nupkg
**/Microsoft.NET.Sdk.WebAssembly.Pack*.nupkg
Expand All @@ -428,6 +426,8 @@ extends:
artifactName: Build_ios_arm64_release_AllRuntimes_Artifacts
targetPath: $(Build.ArtifactStagingDirectory)/artifacts/workloadPackages
itemPattern: |
**/Microsoft.NET.Runtime.MonoTargets.Sdk*.nupkg
**/Microsoft.NET.Runtime.MonoAOTCompiler.Task*.nupkg
**/Microsoft.NETCore.App.Runtime.Mono.ios-*.nupkg
- input: pipelineArtifact
artifactName: Build_iossimulator_x64_release_AllRuntimes_Artifacts
Expand Down
1 change: 1 addition & 0 deletions src/workloads/workloads.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@

<ItemGroup>
<ManifestPackages Include="$(PackageSource)/Microsoft.NET.Workload.Mono.ToolChain.*Manifest-%(WorkloadSdkBandVersions.Identity)*.*.nupkg"
Exclude="$(PackageSource)/Microsoft.NET.Workload.Mono.ToolChain.*Manifest-%(WorkloadSdkBandVersions.Identity)*.*.symbols.nupkg"
MsiVersion="$(MsiVersion)"
SupportsMachineArch="%(SupportsMachineArch)" />
</ItemGroup>
Expand Down
Loading