Use Kind Artifact metadata (#4981)

Author: ViktorHofer

eng/Publishing.props

@@ -32,7 +32,7 @@
   <!-- This target only runs when EnableDefaultArtifacts=true which is a single build leg in CI. -->
   <Target Name="GenerateProductVersionFiles"
           DependsOnTargets="GetNonStableProductVersion"
-          BeforeTargets="PublishToAzureDevOpsArtifacts"
+          BeforeTargets="AddRelativeBlobPathToBlobArtifacts;PublishToAzureDevOpsArtifacts"
           Condition="'$(ShouldGenerateProductVersionFiles)' == 'true'">
     <!-- Retrieve the runtime pack version -->
     <MSBuild Projects="$(RepoRoot)src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj"
@@ -52,17 +52,16 @@
                       Encoding="ASCII" />
 
     <ItemGroup>
-      <Artifact Include="@(ProductVersionFile)"
-                RelativeBlobPath="WindowsDesktop/$(NonStableProductVersion)/%(Filename)%(Extension)" />
+      <Artifact Include="@(ProductVersionFile)" Kind="Blob" />
     </ItemGroup>
   </Target>
 
-  <Target Name="AddRelativeBlobPathToInstallerArtifacts"
+  <Target Name="AddRelativeBlobPathToBlobArtifacts"
           DependsOnTargets="GetNonStableProductVersion"
           BeforeTargets="PublishToAzureDevOpsArtifacts"
           AfterTargets="GenerateChecksumsFromArtifacts">
     <ItemGroup>
-      <Artifact Condition="'%(Artifact.PublishFlatContainer)' == 'true' and '%(Artifact.RelativeBlobPath)' == ''"
+      <Artifact Condition="'%(Artifact.Kind)' == 'Blob' and '%(Artifact.RelativeBlobPath)' == ''"
                 RelativeBlobPath="WindowsDesktop/$(NonStableProductVersion)/%(Filename)%(Extension)" />
     </ItemGroup>
   </Target>

eng/Signing.props

@@ -17,6 +17,7 @@
     <Artifact Include="$(ArtifactsPackagesDir)**\*.zip;
                        $(ArtifactsPackagesDir)**\*.exe;
                        $(ArtifactsPackagesDir)**\*.msi"
+              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>
@@ -28,7 +29,7 @@
     <Artifact Include="$(ArtifactsPackagesDir)**\Microsoft.WindowsDesktop.App.Runtime.*.nupkg;
                        $(ArtifactsPackagesDir)**\VS.Redist.Common.WindowsDesktop.*.nupkg"
               IsShipping="$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping'))"
-              PublishFlatContainer="false" />
+              Kind="Package" />
   </ItemGroup>
 
 </Project>