Fix blob and symbol package publishing (#113377)

* Fix metadata updating for symbol packages to ensure we still publish them

* Fix symbol package folders and publish VSSetup as shipping (as requested by upstack folks)

* Don't process symbol packages for the manifest packages. They're just duplicates.

* Fix publishing the asset manifest for source build (needed for SB intermediates)

* Fix input job for some artifacts

Author: jkoritzinsky

eng/Publishing.props

@@ -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>
@@ -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>
 
   <!--
@@ -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>

eng/Signing.props

@@ -112,6 +112,7 @@
               Kind="Blob"
               ChecksumPath="%(FullPath).sha512"
               IsVSSetup="true"
+              IsShipping="true"
               SubBlobFolder="workloads/" />
   </ItemGroup>
 

eng/pipelines/runtime-official.yml

@@ -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
@@ -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

src/workloads/workloads.csproj

@@ -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>