Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
45 changes: 34 additions & 11 deletions src/src/SourceGenerator/SourceGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,55 @@
<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" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" />
<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"
PrivateAssets="all"
/>
<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>
Loading