Fix sdk artifact classification (#46493)

Author: ViktorHofer

eng/Signing.props

@@ -87,33 +87,30 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'">
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.zip" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.tar.gz" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.pkg" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.exe" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.deb" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.rpm" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.msi" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.cab" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.svg" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.zip" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.tar.gz" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.pkg" IsShipping="true" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.exe" IsShipping="true" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.deb" IsShipping="true" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.rpm" IsShipping="true" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.msi" IsShipping="true" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.cab" IsShipping="true" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.svg" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
     <!-- Only publish this file from windows x64 so that we don't end up with duplicates -->
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt"
-        Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt"
-        Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.json" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.txt" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
-    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.swr" />
-    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.msi" />
-    <SdkArtifact Condition="'$(PublishBinariesAndBadge)' != 'false'" Include="$(ArtifactsNonShippingPackagesDir)*.tar.gz" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.json" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.txt" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
+    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.swr" IsShipping="false" />
+    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.msi" IsShipping="false" />
+    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.tar.gz" IsShipping="false" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
+
     <!-- dotnet-toolset zips are added above for specific builds only. -->
-    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)dotnet-toolset*.zip"
-                 Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
-    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.zip" Condition="'$(PublishBinariesAndBadge)' != 'false'" Exclude="$(ArtifactsNonShippingPackagesDir)dotnet-toolset*.zip" />
-    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.pkg" />
+    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)dotnet-toolset*.zip" IsShipping="false" Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
+    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.zip" IsShipping="false" Condition="'$(PublishBinariesAndBadge)' == 'true'" Exclude="$(ArtifactsNonShippingPackagesDir)dotnet-toolset*.zip" />
+    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.pkg" IsShipping="false" />
 
     <Artifact Include="@(SdkArtifact)"
-              IsShipping="$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping'))"
               RelativeBlobPath="$(RelativeBlobPathParent)/%(Filename)%(Extension)">
       <ChecksumPath Condition="$([System.String]::Copy('%(Filename)%(Extension)').EndsWith('.wixpack.zip')) != 'true'">%(FullPath).sha512</ChecksumPath>
     </Artifact>