From a8c803b4079c7292d0b0a96068bae3bf24e1c895 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 17 Feb 2023 17:26:59 +0100
Subject: [PATCH 1/2] Clean-up generators.targets

From what I can see, the two targets in generators.targets aren't used anymore. The `LibraryImportGenerator_UseMarshalType` setting was already defined in LibraryImportGenerator.props. Also, remove that props file and inline the values into generators.targets.
---
 eng/generators.targets | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/eng/generators.targets b/eng/generators.targets
index f14c60183a312..6c3072ab0c398 100644
--- a/eng/generators.targets
+++ b/eng/generators.targets
@@ -51,22 +51,26 @@
                       OutputItemType="Analyzer" />
   </ItemGroup>
 
-  <Target Name="ConfigureGenerators"
-          DependsOnTargets="ConfigureLibraryImportGenerator"
-          BeforeTargets="CoreCompile" />
-
-  <!-- Microsoft.Interop.LibraryImportGenerator -->
-  <Target Name="ConfigureLibraryImportGenerator"
-          Condition="'@(EnabledGenerators)' != '' and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'LibraryImportGenerator'))"
-          DependsOnTargets="ResolveProjectReferences"
-          BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun">
-    <PropertyGroup>
-        <LibraryImportGenerator_UseMarshalType>true</LibraryImportGenerator_UseMarshalType>
-    </PropertyGroup>
+  <!--
+    Define all of the configuration options supported for the LibraryImportGenerator.
+    To use, set an MSBuild property with the name of the option to `true`.
+    See OptionsHelper.cs for more information on usage.
+  -->
+  <ItemGroup>
+    <!--
+      Use the System.Runtime.InteropServices.Marshal type instead of
+      the System.Runtime.InteropServices.MarshalEx type when emitting code.
+    -->
+    <CompilerVisibleProperty Include="LibraryImportGenerator_UseMarshalType" />
+    <!--
+      Generate a stub that forwards to a runtime implemented P/Invoke stub instead
+      of generating a stub that handles all of the marshalling.
+    -->
+    <CompilerVisibleProperty Include="LibraryImportGenerator_GenerateForwarders" />
 
-    <ItemGroup Condition="'$(NetCoreAppCurrentTargetFrameworkMoniker)' == '$(TargetFrameworkMoniker)' and '$(IncludeLibraryImportGeneratorSources)' != 'false'">
-    </ItemGroup>
-  </Target>
+    <!-- These properies are defined by the MSBuild SDK but are used in the interop source generators' TFM calculations -->
+    <CompilerVisibleProperty Include="TargetFrameworkIdentifier" />
+    <CompilerVisibleProperty Include="TargetFrameworkVersion" />
+  </ItemGroup>
 
-  <Import Project="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\LibraryImportGenerator\Microsoft.Interop.LibraryImportGenerator.props" />
 </Project>

From 5e82487db55c837fdf8e8e16b0db9ec125fd3a0b Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 17 Feb 2023 17:27:32 +0100
Subject: [PATCH 2/2] Delete Microsoft.Interop.LibraryImportGenerator.props

---
 ...osoft.Interop.LibraryImportGenerator.props | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Microsoft.Interop.LibraryImportGenerator.props

diff --git a/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Microsoft.Interop.LibraryImportGenerator.props b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Microsoft.Interop.LibraryImportGenerator.props
deleted file mode 100644
index f4f1372459d20..0000000000000
--- a/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Microsoft.Interop.LibraryImportGenerator.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project>
-  <!--
-    Define all of the configuration options supported for the LibraryImportGenerator.
-    To use, set an MSBuild property with the name of the option to `true`.
-    See OptionsHelper.cs for more information on usage.
-  -->
-  <ItemGroup>
-      <!--
-        Use the System.Runtime.InteropServices.Marshal type instead of
-        the System.Runtime.InteropServices.MarshalEx type when emitting code.
-      -->
-      <CompilerVisibleProperty Include="LibraryImportGenerator_UseMarshalType" />
-      <!--
-        Generate a stub that forwards to a runtime implemented P/Invoke stub instead
-        of generating a stub that handles all of the marshalling.
-      -->
-      <CompilerVisibleProperty Include="LibraryImportGenerator_GenerateForwarders" />
-
-      <!-- These properies are defined by the MSBuild SDK but are used in the interop source generators' TFM calculations -->
-      <CompilerVisibleProperty Include="TargetFrameworkIdentifier" />
-      <CompilerVisibleProperty Include="TargetFrameworkVersion" />
-  </ItemGroup>
-</Project>