From cf8437506dbd5167a630845600e982aeba1769cc Mon Sep 17 00:00:00 2001
From: Kieron Lanning <kieronlanning@users.noreply.github.com>
Date: Fri, 25 Sep 2026 14:45:59 +0100
Subject: [PATCH] fix: regression on file copy

---
 Directory.Packages.props                      |  2 +-
 global.json                                   |  4 +-
 package.json                                  |  2 +-
 .../SourceGenerator/SourceGenerator.csproj    | 45 ++++++++++++++-----
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index e443a083..11d8a4f5 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,7 +3,7 @@
 		<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
 		<RoslynVersion>5.9.0</RoslynVersion>
 		<TUnitVersion>1.67.0</TUnitVersion>
-		<PurviewSGFVersion>1.0.0-prerelease.51</PurviewSGFVersion>
+		<PurviewSGFVersion>1.0.0-prerelease.52</PurviewSGFVersion>
 		<DotnetRuntimeVersion>10.0.12</DotnetRuntimeVersion>
 		<MSExtensionVersion>10.10.0</MSExtensionVersion>
 		<OpenTelemetryVersion>1.18.0</OpenTelemetryVersion>
diff --git a/global.json b/global.json
index cef1f45e..0961f097 100644
--- a/global.json
+++ b/global.json
@@ -3,9 +3,9 @@
 		"allowPrerelease": false
 	},
 	"msbuild-sdks": {
-		"Purview.BuildSdk": "1.0.0-prerelease.58"
+		"Purview.BuildSdk": "1.0.0-prerelease.60"
 	},
 	"test": {
 		"runner": "Microsoft.Testing.Platform"
 	}
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index d10244de..258c9ced 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "purview-telemetry-sourcegenerator",
-  "version": "5.0.0-prerelease.16",
+  "version": "5.0.0-prerelease.17",
   "description": "Generates [`ActivitySource`](https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.activitysource), [`ILogger`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.extensions.logging.ilogger), and [`Metrics`](https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.metrics) based on interface methods.",
   "license": "MIT",
   "readme": "README.md",
diff --git a/src/src/SourceGenerator/SourceGenerator.csproj b/src/src/SourceGenerator/SourceGenerator.csproj
index 2b53e199..6906cf79 100644
--- a/src/src/SourceGenerator/SourceGenerator.csproj
+++ b/src/src/SourceGenerator/SourceGenerator.csproj
@@ -12,6 +12,12 @@
 		<Description>.NET Source Generator for interface-based telemetry generating tracing, logs, and metrics.</Description>
 		<PackageTags>logs;log;logger;logging;source-generator;high-performance-logging;otel;open-telemetry;telemetry;traces;tracing;metric;metrics;meter;meters;instrumentation;instruments;events;distributed-traces;distributed-tracing;melt;dotnet;aspnet;</PackageTags>
 		<DisableTelemetryGenerator>true</DisableTelemetryGenerator>
+		<!--
+			The generator assembly itself is packed as a self-contained merged analyzer by
+			Purview.SourceGeneratorFramework/Purview.BuildSdk. The companion refactorings assembly is
+			contributed by PackTelemetryRefactoringGenerator below.
+		-->
+		<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackTelemetryRefactoringGenerator</TargetsForTfmSpecificContentInPackage>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
@@ -19,8 +25,9 @@
 		<PackageReference Include="Purview.SourceGeneratorFramework" PrivateAssets="all" />
 	</ItemGroup>
 	<ItemGroup>
-		<!-- Build-order only dependency: the refactorings assembly ships inside this package,
-		     so its DLL is packed explicitly below (it is not referenced by generator code). -->
+		<!-- Build-order only dependency: the refactorings assembly ships inside this package, so its
+		     merged output is packed explicitly by PackTelemetryRefactoringGenerator below (it is not
+		     referenced by generator code). -->
 		<ProjectReference
 			Include="..\SourceGenerator.Refactorings\SourceGenerator.Refactorings.csproj"
 			ReferenceOutputAssembly="false"
@@ -28,16 +35,32 @@
 		/>
 		<Compile Include="..\Shared\TelemetryAttributeNames.cs" Link="Shared\TelemetryAttributeNames.cs" />
 	</ItemGroup>
-	<!-- Package the build output into the "analyser" slot in the NuGet package.
-	     The generator assembly itself is packed by the SDK (Purview.BuildSdk)
-	     into analyzers/dotnet/cs; only the refactorings assembly is added here. -->
 	<ItemGroup>
 		<None Include="../../../assets/images/purview-logo-light.png" Pack="true" PackagePath="/" />
-		<None
-			Include="..\SourceGenerator.Refactorings\bin\$(Configuration)\netstandard2.0\Purview.Telemetry.SourceGenerator.Refactorings.dll"
-			Pack="true"
-			PackagePath="analyzers/dotnet/cs"
-			Visible="false"
-		/>
 	</ItemGroup>
+
+	<!--
+		Packs the merged, self-contained refactorings assembly under analyzers/dotnet/cs.
+
+		Packing the refactorings project's bin output would ship the *unmerged* assembly, which still
+		references Purview.SourceGeneratorFramework while the package ships no framework assembly
+		beneath analyzers/, so a consumer's compiler host fails to load it (CS8784
+		FileNotFoundException / a dead code-fix). GetPurviewMergedAnalyzerFile returns the merged,
+		content-internalized assembly without touching the refactorings project's bin output.
+	-->
+	<Target Name="PackTelemetryRefactoringGenerator" Label="Packs the self-contained telemetry refactorings assembly.">
+		<MSBuild
+			Projects="..\SourceGenerator.Refactorings\SourceGenerator.Refactorings.csproj"
+			Targets="GetPurviewMergedAnalyzerFile"
+			Properties="Configuration=$(Configuration)"
+			RemoveProperties="TargetFramework;TargetFrameworks;RuntimeIdentifier;SelfContained"
+		>
+			<Output TaskParameter="TargetOutputs" ItemName="_PurviewTelemetryMergedRefactorings" />
+		</MSBuild>
+		<ItemGroup Condition="'@(_PurviewTelemetryMergedRefactorings)' != ''">
+			<TfmSpecificPackageFile Include="@(_PurviewTelemetryMergedRefactorings)">
+				<PackagePath>analyzers/dotnet/cs/</PackagePath>
+			</TfmSpecificPackageFile>
+		</ItemGroup>
+	</Target>
 </Project>