From 0ce78a28f1f192f4d17b8d8aa9a1e4784ee49169 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 4 Jan 2024 12:13:13 -0800
Subject: [PATCH 1/5] Fix return value in _GetPackageVersionInfo

---
 eng/Npm.Workspace.nodeproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Npm.Workspace.nodeproj b/eng/Npm.Workspace.nodeproj
index 08656605190b..4b0a49ae607f 100644
--- a/eng/Npm.Workspace.nodeproj
+++ b/eng/Npm.Workspace.nodeproj
@@ -53,9 +53,9 @@
     <Message Text="Computed package version info: %(_NodePackageNameAndVersions.PackageName)=%(_NodePackageNameAndVersions.PackageVersion)" Importance="high" />
     -->
     <ItemGroup>
-      <_NodePackageNameAndVersions>
+      <_ResolvedPackageVersionInfo>
         <PackageVersion>$(PackageVersion)</PackageVersion>
-      </_NodePackageNameAndVersions>
+      </_ResolvedPackageVersionInfo>
     </ItemGroup>
   </Target>
 

From 5eb85b59d3fc0a12e2ee5bd3c9289a0924ada3f6 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 4 Jan 2024 12:44:12 -0800
Subject: [PATCH 2/5] Update Publishing.props

---
 eng/Publishing.props | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 25cfee6dc1a3..3c3ba3985e59 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -43,21 +43,16 @@
     DependsOnTargets="_WriteProductVersionFile">
     <!--
       This target is defined in eng/targets/Packaging.targets and Npm.Common.targets and included in every C#, F#,
-      and npm project. We use SignalR.Npm.FunctionalTests.nodeproj because it is non-shipping (we need a non-stable
-      version string to use as our publish location), non-packed (won't be shipped in the future), and it is _not_ a
-      C# or F# project. For now at least, C# and F# projects should not be referenced when using desktop msbuild.
+      and npm project. We use Microsoft.AspNetCore.InternalTesting.csproj because it is non-shipping (we need a non-stable
+      version string to use as our publish location) non-packed (won't be shipped in the future).
     -->
-    <MSBuild Projects="$(RepoRoot)eng\Npm.Workspace.nodeproj"
+    <MSBuild Projects="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj"
         Properties="ExcludeFromBuild=false"
         Targets="_GetPackageVersionInfo">
       <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />
     </MSBuild>
 
     <PropertyGroup>
-      <!-- _GetPackageVersionInfo will return all the versions for all public/shipping packages.
-           They are all the same, so we just take the last one.
-           If this changes in the future, we'll have to update this logic.
-       -->
       <_PackageVersion>@(_ResolvedPackageVersionInfo->'%(PackageVersion)')</_PackageVersion>
     </PropertyGroup>
 

From 7e70c04a8b133d86ea19481f1009fd93372ee883 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 4 Jan 2024 12:44:34 -0800
Subject: [PATCH 3/5] Update Npm.Workspace.nodeproj

---
 eng/Npm.Workspace.nodeproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Npm.Workspace.nodeproj b/eng/Npm.Workspace.nodeproj
index 4b0a49ae607f..08656605190b 100644
--- a/eng/Npm.Workspace.nodeproj
+++ b/eng/Npm.Workspace.nodeproj
@@ -53,9 +53,9 @@
     <Message Text="Computed package version info: %(_NodePackageNameAndVersions.PackageName)=%(_NodePackageNameAndVersions.PackageVersion)" Importance="high" />
     -->
     <ItemGroup>
-      <_ResolvedPackageVersionInfo>
+      <_NodePackageNameAndVersions>
         <PackageVersion>$(PackageVersion)</PackageVersion>
-      </_ResolvedPackageVersionInfo>
+      </_NodePackageNameAndVersions>
     </ItemGroup>
   </Target>
 

From f056695ae98f469114ad2ef5a4fafbaf4335015c Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 4 Jan 2024 15:15:39 -0800
Subject: [PATCH 4/5] Update Publishing.props

---
 eng/Publishing.props | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 3c3ba3985e59..094778c14492 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -100,22 +100,17 @@
     Name="_WriteProductVersionFile"
     Condition=" '$(PublishInstallerBaseVersion)' == 'true'">
     <!--
-      This target is defined in eng/targets/Packaging.targets and Npm.Workspace.nodeproj and included in every C#, F#,
-      and JS project. We use Microsoft.JSInterop.JS.nodeproj because it is shipping (we need a stable
-      version string to use for productVersion.txt), and because it won't break when the SDK requires a newer
-      desktop MSBuild than exists on the build machine.
+      This target is defined in eng/targets/Packaging.targets and Npm.Common.targets and included in every C#, F#,
+      and npm project. We use Microsoft.AspNetCore.InternalTesting.csproj because it is non-shipping (we need a non-stable
+      version string to use as our publish location) non-packed (won't be shipped in the future).
     -->
-    <MSBuild Projects="$(RepoRoot)eng\Npm.Workspace.nodeproj"
+    <MSBuild Projects="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj"
         Properties="ExcludeFromBuild=false"
         Targets="_GetPackageVersionInfo">
-      <Output TaskParameter="TargetOutputs" ItemName="_ResolvedProductVersionInfo" />
+      <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />
     </MSBuild>
 
     <PropertyGroup>
-      <!-- _GetPackageVersionInfo will return all the versions for all public/shipping packages.
-           They are all the same, so we just take the last one.
-           If this changes in the future, we'll have to update this logic.
-       -->
       <_ProductVersion>%(_ResolvedProductVersionInfo.PackageVersion)</_ProductVersion>
     </PropertyGroup>
 

From 4ed2c8f6e8572a3bf8439e571f6079b6c857a29e Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 4 Jan 2024 15:16:11 -0800
Subject: [PATCH 5/5] Update Publishing.props

---
 eng/Publishing.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 094778c14492..392dcb288895 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -107,7 +107,7 @@
     <MSBuild Projects="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj"
         Properties="ExcludeFromBuild=false"
         Targets="_GetPackageVersionInfo">
-      <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />
+      <Output TaskParameter="TargetOutputs" ItemName="_ResolvedProductVersionInfo" />
     </MSBuild>
 
     <PropertyGroup>