From e48b81f37e76a6d8180e46276845ecc3dc1c4b83 Mon Sep 17 00:00:00 2001
From: Bekir Ozturk <bozturk@microsoft.com>
Date: Fri, 27 Mar 2020 13:49:29 +0100
Subject: [PATCH] Generating a productCommit for each rid

---
 eng/Publishing.props                               | 2 +-
 src/redist/targets/GenerateBundledVersions.targets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 73aa46610..c9c74f54e 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -43,7 +43,7 @@
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.cab" />
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.svg" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)productVersion.txt" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
-    <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)productCommit.txt" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
+    <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)productCommit-*.txt" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
     <SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.nupkg" />
     <SdkNonShippingAssetsToPublish Include="$(ArtifactsNonShippingPackagesDir)*.swr" />
     <CheckSumsToPublish Include="$(ArtifactsShippingPackagesDir)*.sha" />
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 843a141e6..ac64ee489 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -27,7 +27,7 @@
       Content="$(PackageVersion)" />
 
     <WriteTextToFile
-      Path="$(ArtifactsShippingPackagesDir)productCommit.txt"
+      Path="$(ArtifactsShippingPackagesDir)productCommit-$(Rid).txt"
       Content="$(BUILD_SOURCEVERSION)%0A$(PackageVersion)" />
 
   </Target>