From a3e8652e50008af0517f757c78258ee5c30c2533 Mon Sep 17 00:00:00 2001
From: martin-costello <martin.costello@just-eat.com>
Date: Thu, 21 Apr 2022 16:13:56 +0100
Subject: [PATCH] Extend productCommit-rid.txt

Extend the changes from #13132 to include the versions of the ASP.NET Core shared runtime, Windows Desktop and the .NET SDK itself.
---
 .../targets/GenerateBundledVersions.targets   | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 201f91ef4..a8c15657e 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -23,13 +23,37 @@
        <Output TaskParameter="DependencyCommit" PropertyName="DepRuntimeCommit" />
     </GetDependencyInfo>
 
+    <GetDependencyInfo
+      VersionDetailsXmlFile="$(RepoRoot)eng/Version.Details.xml"
+      DependencyName="Microsoft.AspNetCore.App.Ref">
+       <Output TaskParameter="DependencyVersion" PropertyName="DepAspNetCoreVersion" />
+       <Output TaskParameter="DependencyCommit" PropertyName="DepAspNetCoreCommit" />
+    </GetDependencyInfo>
+
+    <GetDependencyInfo
+      VersionDetailsXmlFile="$(RepoRoot)eng/Version.Details.xml"
+      DependencyName="Microsoft.WindowsDesktop.App.Ref">
+       <Output TaskParameter="DependencyVersion" PropertyName="DepWindowsDesktopVersion" />
+       <Output TaskParameter="DependencyCommit" PropertyName="DepWindowsDesktopCommit" />
+    </GetDependencyInfo>
+
+    <GetDependencyInfo
+      VersionDetailsXmlFile="$(RepoRoot)eng/Version.Details.xml"
+      DependencyName="Microsoft.NET.Sdk">
+       <Output TaskParameter="DependencyVersion" PropertyName="DepDotNetSdkVersion" />
+       <Output TaskParameter="DependencyCommit" PropertyName="DepDotNetSdCommit" />
+    </GetDependencyInfo>
+
     <!-- Format for productCommits-%rid%.txt:
        installer:%commit%, %version
        runtime:%commit%, $version
+       aspnetcore:%commit%, $version
+       windowsdesktop:%commit%, $version
+       sdk:%commit%, $version
     -->
     <WriteLinesToFile
       File="$(ArtifactsShippingPackagesDir)productCommit-$(Rid).txt"
-      Lines="installer%3A$(BUILD_SOURCEVERSION)%2C%20$(PackageVersion)%0Aruntime%3A$(DepRuntimeCommit)%2C%20$(DepRuntimeVersion)%0A"
+      Lines="installer%3A$(BUILD_SOURCEVERSION)%2C%20$(PackageVersion)%0Aruntime%3A$(DepRuntimeCommit)%2C%20$(DepRuntimeVersion)%0Aaspnetcore%3A$(DepAspNetCoreCommit)%2C%20$(DepAspNetCoreVersion)%0Awindowsdesktop%3A$(DepWindowsDesktopCommit)%2C%20$(DepWindowsDesktopVersion)%0Asdk%3A$(DepDotNetSdkCommit)%2C%20$(DepDotNetSdkVersion)%0A"
       Overwrite="true"
       Encoding="ASCII"/>