From 3c55e1e0b30aac0434bfda14c1aab3f584d9f492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Wed, 15 Dec 2021 16:56:27 +0900
Subject: [PATCH] Manifest DllImportSourceGenerator as a generator

The libraries build infra normally does this automatically but the interop source generator doesn't follow the path convention.

Without this manifestation, the build considers the generator part of framework and it gets binplaced into places where it shouldn't be.

Fixes #62372.
---
 .../gen/Directory.Build.props                              | 1 +
 src/tests/Common/Directory.Build.targets                   | 7 +------
 src/tests/build.proj                                       | 5 +----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/libraries/System.Runtime.InteropServices/gen/Directory.Build.props b/src/libraries/System.Runtime.InteropServices/gen/Directory.Build.props
index 9eff2af744867c..71d5e72314de78 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/Directory.Build.props
+++ b/src/libraries/System.Runtime.InteropServices/gen/Directory.Build.props
@@ -8,5 +8,6 @@
     <EnableDefaultItems>true</EnableDefaultItems>
     <CLSCompliant>false</CLSCompliant>
     <ILLinkTrimAssembly>false</ILLinkTrimAssembly>
+    <IsGeneratorProject>true</IsGeneratorProject>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/tests/Common/Directory.Build.targets b/src/tests/Common/Directory.Build.targets
index 71d489a31285f5..35a714d99aa1ac 100644
--- a/src/tests/Common/Directory.Build.targets
+++ b/src/tests/Common/Directory.Build.targets
@@ -176,12 +176,7 @@
       <AotCompilerCopyLocal Include="$(CoreCLRArtifactsPath)aotsdk/**/*" TargetDir="nativeaot/sdk/" />
       <AotCompilerCopyLocal Include="$(CoreCLRArtifactsPath)build/**/*" TargetDir="nativeaot/build/" />
       <AotCompilerCopyLocal Include="$(TargetingPackPath)/*" TargetDir="nativeaot/framework/" />
-
-      <!-- Works around https://github.com/dotnet/runtime/issues/62372 -->
-      <_FixedRuntimeCopyLocalItems Include="@(RuntimeCopyLocalItems)" />
-      <_FixedRuntimeCopyLocalItems Remove="@(_FixedRuntimeCopyLocalItems)" Condition="'%(Filename)' == 'Microsoft.Interop.DllImportGenerator'" />
-
-      <AotCompilerCopyLocal Include="@(_FixedRuntimeCopyLocalItems)" TargetDir="nativeaot/framework/" />
+      <AotCompilerCopyLocal Include="@(RuntimeCopyLocalItems)" TargetDir="nativeaot/framework/" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(RuntimeFlavor)' == 'mono' and '$(IsDesktopOS)' == 'true' " >
diff --git a/src/tests/build.proj b/src/tests/build.proj
index 315f8ed7507d43..16af0cd4d19c18 100644
--- a/src/tests/build.proj
+++ b/src/tests/build.proj
@@ -122,10 +122,7 @@
     </RemoveDuplicates>
     <ItemGroup>
       <TestsAndAssociatedAssemblies Include="%(TestDirs.Identity)/*.dll" />
-      <CoreRootDlls Include="$(CORE_ROOT)/*.dll"
-        Exclude="$(CORE_ROOT)/xunit.performance.api.dll;
-                 $(CORE_ROOT)/Microsoft.Interop.DllImportGenerator.dll;
-                 $(CORE_ROOT)/Microsoft.Interop.SourceGeneration.dll" />
+      <CoreRootDlls Include="$(CORE_ROOT)/*.dll" Exclude="$(CORE_ROOT)/xunit.performance.api.dll" />
       <AllDlls Condition="'$(MonoFullAot)' == 'true'" Include="@(TestsAndAssociatedAssemblies);@(CoreRootDlls)" />
       <AllDlls Condition="'$(MonoFullAot)' != 'true'" Include="@(TestsAndAssociatedAssemblies)" />
     </ItemGroup>