Update generators.targets #68860
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,57 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <EnableLibraryImportGenerator Condition="'$(EnableLibraryImportGenerator)' == '' and | ||
| '$(MSBuildProjectName)' == 'System.Private.CoreLib'">true</EnableLibraryImportGenerator> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <EnabledGenerators Include="LibraryImportGenerator" Condition="'$(EnableLibraryImportGenerator)' == 'true'" /> | ||
| <!-- If the current project is not System.Private.CoreLib, we enable the LibraryImportGenerator source generator | ||
| when the project is a C# source project that: | ||
| - doesn't target the latest TFM or | ||
| - references everything from the targeting pack (OOB) or | ||
| - references System.Private.CoreLib, or | ||
| - references System.Runtime.InteropServices --> | ||
| <EnabledGenerators Include="LibraryImportGenerator" | ||
| Condition="'$(EnableLibraryImportGenerator)' == '' and | ||
| '$(IsSourceProject)' == 'true' and | ||
| '$(MSBuildProjectExtension)' == '.csproj' and | ||
| ( | ||
| '$(TargetFrameworkMoniker)' != '$(NetCoreAppCurrentTargetFrameworkMoniker)' or | ||
| '$(DisableImplicitFrameworkReferences)' != 'true' or | ||
| ( | ||
| '@(Reference)' != '' and | ||
| @(Reference->AnyHaveMetadataValue('Identity', 'System.Runtime.InteropServices')) | ||
| ) or | ||
| ( | ||
| '@(ProjectReference)' != '' and | ||
| @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)')) | ||
| ) | ||
| )" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'@(EnabledGenerators)' != '' and | ||
| @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'LibraryImportGenerator')) and | ||
| !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> | ||
| <Compile Include="$(CoreLibSharedDir)System\Runtime\InteropServices\LibraryImportAttribute.cs" /> | ||
| <Compile Include="$(CoreLibSharedDir)System\Runtime\InteropServices\StringMarshalling.cs" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Use this complex item list based filtering to add the ProjectReference to make sure dotnet/runtime stays compatible with NuGet Static Graph Restore. | ||
| That is required as the EnabledGenerators condition checks on the Reference and ProjectReference items and hence can't be a property condition. --> | ||
| <ItemGroup Condition="'@(EnabledGenerators)' != '' and | ||
| @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'LibraryImportGenerator'))"> | ||
| <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj; | ||
| $(LibrariesProjectRoot)System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" | ||
|
Comment on lines
+44
to
+45
There was a problem hiding this comment. Again, I'd (personally) prefer seeing this as two entries, since two things are being added. There was a problem hiding this comment. Same as above. When you define items with the same metadata (i.e. Condition or in this case the |
||
| OutputItemType="Analyzer" | ||
| ReferenceOutputAssembly="false" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Use a normal property condition as this source generator is opt-in and doesn't read from an item list. --> | ||
| <ItemGroup Condition="'$(EnableRegexGenerator)' == 'true'"> | ||
ViktorHofer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <ProjectReference Include="$(LibrariesProjectRoot)System.Text.RegularExpressions\gen\System.Text.RegularExpressions.Generator.csproj" | ||
|
There was a problem hiding this comment. Don't we always try to use Unix-style folder separators everywhere? There was a problem hiding this comment. I think it's the opposite. Under src/libraries we prefer Windows path separators.
|
||
| OutputItemType="Analyzer" | ||
| ReferenceOutputAssembly="false" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="ConfigureGenerators" | ||
|
|
@@ -79,5 +68,5 @@ | |
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
| <Import Project="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\LibraryImportGenerator\Microsoft.Interop.LibraryImportGenerator.props" /> | ||
| </Project> | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can probably simplify this more now that we aren't injecting as much source as before (only enums and an attribute type on downlevel). This can be left for a future PR though.