From fdb06ac3c88b6b1b158855a859ec84538e3b0fdc Mon Sep 17 00:00:00 2001
From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com>
Date: Wed, 19 Nov 2025 17:50:35 +0100
Subject: [PATCH 1/2] Fix gcdump publish and transitive references

---
 .../Build/Steeltoe.Management.Endpoint.props  | 30 ---------------
 .../Steeltoe.Management.Endpoint.csproj       | 37 ++++++++++---------
 versions.props                                |  2 +-
 3 files changed, 21 insertions(+), 48 deletions(-)
 delete mode 100644 src/Management/src/Endpoint/Build/Steeltoe.Management.Endpoint.props

diff --git a/src/Management/src/Endpoint/Build/Steeltoe.Management.Endpoint.props b/src/Management/src/Endpoint/Build/Steeltoe.Management.Endpoint.props
deleted file mode 100644
index be526711e5..0000000000
--- a/src/Management/src/Endpoint/Build/Steeltoe.Management.Endpoint.props
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <DotnetGCDumpVersion>9.0.652701</DotnetGCDumpVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="dotnet-gcdump" Version="$(DotnetGCDumpVersion)" IncludeAssets="None" ExcludeAssets="All" PrivateAssets="None"
-      GeneratePathProperty="true">
-      <!--
-          The dotnet-gcdump global tool can't be referenced, but we can download it.
-          GeneratePathProperty makes the path to the package available in $(Pkgdotnet-gcdump), so we can add an assembly reference.
-          See https://docs.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#generatepathproperty.
-          Based on: https://blog.maartenballiauw.be/post/2020/04/22/referencing-specific-assembly-nuget-package.html.
-		    -->
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="dotnet-gcdump">
-      <HintPath>$(Pkgdotnet-gcdump)\tools\net8.0\any\dotnet-gcdump.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Diagnostics.FastSerialization">
-      <!--
-        Caution: The version of this DLL must be binary compatible with the one embedded in Microsoft.Diagnostics.Tracing.TraceEvent,
-        otherwise a TypeLoadException will occur at runtime.
-      -->
-      <HintPath>$(Pkgdotnet-gcdump)\tools\net8.0\any\Microsoft.Diagnostics.FastSerialization.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-</Project>
diff --git a/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj b/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj
index 9ad83198a2..eba86e4344 100755
--- a/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj
+++ b/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj
@@ -9,10 +9,6 @@
 
   <Import Project="..\..\..\..\shared.props" />
 
-  <ItemGroup>
-    <None Include="Build\*.props" Pack="True" PackagePath="build" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="dotnet-gcdump" Version="$(DotnetGCDumpVersion)" IncludeAssets="None" ExcludeAssets="All" PrivateAssets="None"
       GeneratePathProperty="true">
@@ -28,19 +24,6 @@
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="dotnet-gcdump">
-      <HintPath>$(Pkgdotnet-gcdump)\tools\net8.0\any\dotnet-gcdump.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Diagnostics.FastSerialization">
-      <!--
-        Caution: The version of this DLL must be binary compatible with the one embedded in Microsoft.Diagnostics.Tracing.TraceEvent,
-        otherwise a TypeLoadException will occur at runtime.
-      -->
-      <HintPath>$(Pkgdotnet-gcdump)\tools\net8.0\any\Microsoft.Diagnostics.FastSerialization.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Hosting\Steeltoe.Common.Hosting.csproj" />
     <ProjectReference Include="..\..\..\Common\src\Http\Steeltoe.Common.Http.csproj" />
@@ -48,4 +31,24 @@
     <ProjectReference Include="..\..\..\Logging\src\DynamicConsole\Steeltoe.Logging.DynamicConsole.csproj" />
     <ProjectReference Include="..\Abstractions\Steeltoe.Management.Abstractions.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="dotnet-gcdump">
+      <!--
+        Caution: The embedded version of Microsoft.Diagnostics.FastSerialization must be binary compatible with the one
+        embedded in Microsoft.Diagnostics.Tracing.TraceEvent, otherwise a TypeLoadException will occur at runtime.
+      -->
+      <HintPath>$(Pkgdotnet-gcdump)\tools\net8.0\any\dotnet-gcdump.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <!-- Embed dotnet-gcdump.dll in our multi-targeted NuGet package. -->
+  <Target Name="IncludeDotNetGCDumpAssemblyInPack" BeforeTargets="_GetPackageFiles">
+    <ItemGroup>
+      <_DotNetGCDumpNet10 Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\net10.0\dotnet-gcdump.dll" Pack="True" PackagePath="lib\net10.0" />
+      <_DotNetGCDumpNet8 Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\net8.0\dotnet-gcdump.dll" Pack="True" PackagePath="lib\net8.0" />
+      <None Include="@(_DotNetGCDumpNet10)" />
+      <None Include="@(_DotNetGCDumpNet8)" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/versions.props b/versions.props
index e4d8fa7106..30aa8423a1 100644
--- a/versions.props
+++ b/versions.props
@@ -73,7 +73,7 @@
     </FoundationalVersion>
     <MicrosoftIdentityModelVersion>8.14.*</MicrosoftIdentityModelVersion>
     <MicrosoftDiagnosticsNETCoreClientVersion>0.2.652701</MicrosoftDiagnosticsNETCoreClientVersion>
-    <MicrosoftDiagnosticsTracingTraceEventVersion>3.1.26</MicrosoftDiagnosticsTracingTraceEventVersion>
+    <MicrosoftDiagnosticsTracingTraceEventVersion>3.1.23</MicrosoftDiagnosticsTracingTraceEventVersion>
     <OpenTelemetryExporterPrometheusVersion>1.14.*-*</OpenTelemetryExporterPrometheusVersion>
     <OpenTelemetryVersion>1.14.*</OpenTelemetryVersion>
     <SerilogVersion>9.0.*</SerilogVersion>

From b1b0e8a1e70a6f946dd5782e3fc6bee28da99231 Mon Sep 17 00:00:00 2001
From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com>
Date: Wed, 19 Nov 2025 19:33:28 +0100
Subject: [PATCH 2/2] Remove comment

---
 versions.props | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/versions.props b/versions.props
index 30aa8423a1..20d9d10375 100644
--- a/versions.props
+++ b/versions.props
@@ -59,10 +59,7 @@
 
     <BouncyCastleVersion>2.2.*</BouncyCastleVersion>
     <ConsulVersion>1.7.14.*</ConsulVersion>
-    <DotnetGCDumpVersion>
-      <!-- Caution: This constant occurs in multiple places and must be kept in sync. -->
-      9.0.652701
-    </DotnetGCDumpVersion>
+    <DotnetGCDumpVersion>9.0.652701</DotnetGCDumpVersion>
     <EntityFrameworkCoreVersion>8.0.*</EntityFrameworkCoreVersion>
     <FoundationalVersion>
       <!--