Skip to content

Ensure Microsoft.Interop.SourceGeneration ships #74943

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

Merged
ericstj merged 4 commits into from
Sep 2, 2022
Merged

Ensure Microsoft.Interop.SourceGeneration ships #74943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8846903
Ensure Microsoft.Interop.SourceGeneration ships
ericstj Sep 1, 2022
81eb532
Fix project path
ericstj Sep 1, 2022
140c316
Remove packaging logic from interop source generator projects
ericstj Sep 1, 2022
3370e9b
Add back Microsoft.Interop.LibraryImportGenerator.props
ericstj Sep 1, 2022
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
1 change: 1 addition & 0 deletions src/libraries/NetCoreAppLibrary.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
<NetCoreAppLibraryGenerator>
LibraryImportGenerator;
JSImportGenerator;
Microsoft.Interop.SourceGeneration;
System.Text.Json.SourceGeneration.Roslyn4.0;
System.Text.RegularExpressions.Generator;
</NetCoreAppLibraryGenerator>
Expand Down
16 changes: 1 addition & 15 deletions .../System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSImportGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@
<!-- Disable RS2008: Enable analyzer release tracking
Diagnostics in runtime use a different mechanism (docs/project/list-of-diagnostics.md) -->
<NoWarn>RS2008;$(NoWarn)</NoWarn>

<!-- Packaging properties -->
<!-- In the future JSImportGenerator might ship as part of a package, but meanwhile disable packaging. -->
<IsPackable>false</IsPackable>
<IncludeBuildOutput>false</IncludeBuildOutput>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
<PackageProjectUrl>https://github.com/dotnet/runtime/tree/main/src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator</PackageProjectUrl>
<Description>JSImportGenerator</Description>
<PackageTags>JSImportGenerator, analyzers</PackageTags>
<DefineConstants>$(DefineConstants);JSIMPORTGENERATOR</DefineConstants>
<AnalyzerLanguage>cs</AnalyzerLanguage>
</PropertyGroup>
Expand All @@ -28,12 +19,7 @@
</ItemGroup>

<ItemGroup>
<None Include="$(TargetPath)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="$(AssemblyName).props" Pack="true" PackagePath="build" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" Pack="true" PackagePath="analyzers/dotnet/cs" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 2 additions & 16 deletions ...s/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,7 @@
<!-- Disable RS2008: Enable analyzer release tracking
Diagnostics in runtime use a different mechanism (docs/project/list-of-diagnostics.md) -->
<NoWarn>RS2008;$(NoWarn)</NoWarn>
<AnalyzerLanguage>cs</AnalyzerLanguage>

<!-- Packaging properties -->
<!-- In the future LibraryImportGenerator might ship as part of a package, but meanwhile disable packaging. -->
<IsPackable>false</IsPackable>
<IncludeBuildOutput>false</IncludeBuildOutput>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
<PackageProjectUrl>https://github.com/dotnet/runtime/tree/main/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator</PackageProjectUrl>
<Description>LibraryImportGenerator</Description>
<PackageTags>LibraryImportGenerator, analyzers</PackageTags>
<AnalyzerLanguage>cs</AnalyzerLanguage>
</PropertyGroup>

<ItemGroup>
Expand All @@ -27,12 +18,7 @@
</ItemGroup>

<ItemGroup>
<None Include="$(TargetPath)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="$(AssemblyName).props" Pack="true" PackagePath="build" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" Pack="true" PackagePath="analyzers/dotnet/cs" />
<ProjectReference Include="..\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions ...Services/gen/Microsoft.Interop.SourceGeneration/Microsoft.Interop.SourceGeneration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<RootNamespace>Microsoft.Interop</RootNamespace>
<DefineConstants>$(DefineConstants);MICROSOFT_INTEROP_SOURCEGENERATION</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AnalyzerLanguage>cs</AnalyzerLanguage>
</PropertyGroup>

<!-- Code included from System.Runtime.InteropServices -->
Expand Down