Split dotnet/runtime-only downlevel LibraryImport support into its own source generator #106436
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ribute marshalling model handling
… a separate downlevel generator concept.
…erences to a project with the same simple name as an analyzer in the ref pack
…l downlevel scenarios and run the regular generator for only current-TFM scenarios (like ComInterfaceGenerator).
jkoritzinsky
added
area-System.Runtime.InteropServices
source-generator
jkoritzinsky
requested review from
agocke,
AaronRobinsonMSFT,
jtschuster and
elinor-fung
|
Tagging subscribers to this area: @dotnet/interop-contrib |
jtschuster
approved these changes
Aug 16, 2024
...raries/System.Runtime.InteropServices/gen/DownlevelLibraryImportGenerator/LanguageSupport.cs
Outdated
Show resolved
Hide resolved
…'s not considered "unreachable code"
This was referenced Aug 19, 2024
Open
This was referenced Aug 21, 2024
… had in the special COM generator
|
/ba-g failure is a network timeout that looks generally flaky |
This was referenced Aug 21, 2024
ViktorHofer
reviewed
Aug 22, 2024
| '$(DisableImplicitFrameworkReferences)' == 'true' and | ||
| ( | ||
| '@(Reference->AnyHaveMetadataValue('Identity', 'System.Runtime.InteropServices'))' == 'true' or | ||
| '@(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)'))' == 'true' | ||
| '@(Reference->AnyHaveMetadataValue('Identity', 'System.Private.CoreLib'))' == 'true' |
There was a problem hiding this comment.
This change looks wrong. System.Private.CoreLib is never a reference as it isn't part of the targeting pack.
ViktorHofer
reviewed
Aug 22, 2024
ViktorHofer
reviewed
Aug 22, 2024
| Condition="'$(EnableLibraryImportGenerator)' == '' and | ||
| ( | ||
| '$(IsSourceProject)' == 'true' or | ||
| '$(IsTestProject)' == 'true' or | ||
| '$(IsTestSupportProject)' == 'true' | ||
| ) and | ||
| '$(MSBuildProjectExtension)' == '.csproj' and | ||
| !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)'))" /> |
There was a problem hiding this comment.
This should just be $(TargetFrameworkIdentifier)' != '.NETCoreApp' as we shouldn't support targeting an out-of-support .NETCoreApp TFM.
ViktorHofer
reviewed
Aug 22, 2024
| @@ -1,51 +1,56 @@ | |||
| <Project> | |||
|
|
|||
| <PropertyGroup> | |||
| <!-- Enable LibraryImportGenerator for CoreLib. --> | |||
There was a problem hiding this comment.
I understand that this already existed before this change but it feels weird to special case CoreLib in here. Can we move this property into the shared CoreLib project instead?
|
@ViktorHofer I've addressed your feedback in #106827 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of shipping unusable downlevel support in LibraryImportGenerator and having to maintain how it works in combination with the non-downlevel support that we actually expect users to use, split the generator into two separate generators:
The Downlevel support only needs to support standard and NETFX as all .NETCoreApp TFMs we target for downlevel support all ship LibraryImportGenerator already (and they build using the version that shipped with the TFM).
This PR also shares the managed->unmanaged stub generation between LibraryImportGenerator and ComInterfaceGenerator to reuse more code cleanly.
The MSBuild changes in Directory.Build.targets help fix a problem where the TFM-included generators would be removed in the generator unit test projects, which also reference the projects directly as regular (non-analyzer) references. This would fail sporadically when working locally before this change, but the changes in generators.targets caused the intermittent failure to become consistent.