Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix logging source-gens duplication on WPF #5024

Merged
merged 10 commits into from
May 31, 2024
Merged

Fix logging source-gens duplication on WPF #5024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
60562f9
Fix logging source-gens duplication on WPF
xakep139 Mar 12, 2024
ea2c4a2
Update src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/buil…
xakep139 Mar 21, 2024
f4a74f6
Apply suggestions from code review
xakep139 May 17, 2024
9c40853
Merge branch 'main' into xakep139/log-source-gen-WPF-bug
xakep139 May 17, 2024
75a0ede
CR
xakep139 May 17, 2024
10283f0
Merge branch 'main' into xakep139/log-source-gen-WPF-bug
xakep139 May 22, 2024
74f4c81
fixes
xakep139 May 23, 2024
b638f07
minor fixes
xakep139 May 23, 2024
cb67f83
Merge branch 'main' into xakep139/log-source-gen-WPF-bug
xakep139 May 31, 2024
14e3977
CR;
xakep139 May 31, 2024
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.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</Target>

<!-- This target will make sure that projects targeting net462 will also have the Microsoft.Extensions.Logging.Abstractions analyzer removed. -->
<Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers"
<Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers"
Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
AfterTargets="ResolveReferences">
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions ...ware.PerformanceTests/Microsoft.AspNetCore.Diagnostics.Middleware.PerformanceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

<PropertyGroup>
<InjectSharedPools>true</InjectSharedPools>
<SkipSharedPoolsReferences>true</SkipSharedPoolsReferences>
RussKie marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/MSBuild/Shared.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<ItemGroup Condition="'$(InjectSharedPools)' == 'true'">
<Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\Pools\*.cs" LinkBase="Shared\Pools" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" />
<PackageReference Condition="'$(SkipSharedPoolsReferences)' != 'true'" Include="Microsoft.Extensions.ObjectPool" />
</ItemGroup>

<ItemGroup Condition="'$(InjectSharedBufferWriterPool)' == 'true'">
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "8.0.200"
"version": "8.0.300"
},
"tools": {
"dotnet": "8.0.200",
"dotnet": "8.0.300",
"runtimes": {
"dotnet/x64": [
"6.0.22"
Expand Down
28 changes: 24 additions & 4 deletions ...y.Abstractions/buildTransitive/net6.0/Microsoft.Extensions.Telemetry.Abstractions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,36 @@
<Project>
<!-- This package should replace the Microsoft.Extensions.Logging.Abstractions source generator. -->
<Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers"
<!-- This package should replace the "Microsoft.Extensions.Logging.Abstractions" source generator. -->
<Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzers"
Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
AfterTargets="ResolveReferences">
<ItemGroup>
<_Microsoft_Extensions_Logging_AbstractionsAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
'%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
<_Microsoft_Extensions_Logging_AbstractionsAnalyzer
Include="@(Analyzer)"
Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
'%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
</ItemGroup>

<!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer -->
<ItemGroup>
<Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzer)" />
</ItemGroup>
</Target>

<!-- We have a WPF-specific target because WPF projects generate and compile a temporary project (via "GenerateTemporaryTargetAssembly" target),
and that temp project doesn't have "ResolveReferences" target we expect.
This leads to the runtime's generator not being removed and to a compile-time error CS0757. This additional target resolves the problem. -->
<Target Name="_Microsoft_Extensions_Logging_AbstractionsRemoveAnalyzersWPF"
xakep139 marked this conversation as resolved.
Show resolved Hide resolved
Condition="'$(DisableMicrosoftExtensionsLoggingSourceGenerator)' == 'true'"
AfterTargets="RemoveDuplicateAnalyzers">
<ItemGroup>
<_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF
Include="@(Analyzer)"
Condition="'%(Analyzer.AssemblyName)' == 'Microsoft.Extensions.Logging.Generators' Or
'%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
</ItemGroup>
<!-- Remove Microsoft.Extensions.Logging.Abstractions Analyzer for WPF projects -->
<ItemGroup>
<Analyzer Remove="@(_Microsoft_Extensions_Logging_AbstractionsAnalyzerWPF)" />
</ItemGroup>
</Target>
</Project>