Rename DllImportGenerator project to LibraryImportGenerator (#66029)

dotnet · Mar 4, 2022 · a063583 · a063583
1 parent 2029495
commit a063583
Show file tree

Hide file tree

Showing 329 changed files with 2,105 additions and 2,077 deletions.
diff --git a/docs/coding-guidelines/interop-guidelines.md b/docs/coding-guidelines/interop-guidelines.md
@@ -166,7 +166,7 @@ Using enums instead of partial, static classes can lead to needing lots of casts
 
 When defining the P/Invoke signatures and structs, we follow the guidelines in the [interop best practices documentation](https://docs.microsoft.com/en-us/dotnet/standard/native-interop/best-practices).
 
-The runtime repo makes use of [source-generated p/invokes](../design/features/source-generator-pinvokes.md) whenever possible (see [the compatibility doc](../design/libraries/DllImportGenerator/Compatibility.md) for unsupported scenarios). Methods should be marked `GeneratedDllImport` and be `static` and `partial`.
+The runtime repo makes use of [source-generated p/invokes](../design/features/source-generator-pinvokes.md) whenever possible (see [the compatibility doc](../design/libraries/LibraryImportGenerator/Compatibility.md) for unsupported scenarios). Methods should be marked `GeneratedDllImport` and be `static` and `partial`.
 
 If implicit framework references are disabled (as is the case for most libraries projects), explicit references to the below are required for marshalling arrays:
   - `System.Memory`

diff --git a/...aries/DllImportGenerator/Compatibility.md → ...s/LibraryImportGenerator/Compatibility.md b/...aries/DllImportGenerator/Compatibility.md → ...s/LibraryImportGenerator/Compatibility.md
diff --git a/.../libraries/DllImportGenerator/Pipeline.md → ...raries/LibraryImportGenerator/Pipeline.md b/.../libraries/DllImportGenerator/Pipeline.md → ...raries/LibraryImportGenerator/Pipeline.md
diff --git a/...ies/DllImportGenerator/SpanMarshallers.md → ...LibraryImportGenerator/SpanMarshallers.md b/...ies/DllImportGenerator/SpanMarshallers.md → ...LibraryImportGenerator/SpanMarshallers.md
diff --git a/...s/DllImportGenerator/StructMarshalling.md → ...braryImportGenerator/StructMarshalling.md b/...s/DllImportGenerator/StructMarshalling.md → ...braryImportGenerator/StructMarshalling.md
diff --git a/eng/generators.targets b/eng/generators.targets
@@ -1,18 +1,18 @@
 <Project>
 
   <PropertyGroup>
-    <EnableDllImportGenerator Condition="'$(EnableDllImportGenerator)' == ''
-                        and '$(MSBuildProjectName)' == 'System.Private.CoreLib'">true</EnableDllImportGenerator>
-    <IncludeDllImportGeneratorSources Condition="'$(IncludeDllImportGeneratorSources)' == ''">true</IncludeDllImportGeneratorSources>
+    <EnableLibraryImportGenerator Condition="'$(EnableLibraryImportGenerator)' == ''
+                        and '$(MSBuildProjectName)' == 'System.Private.CoreLib'">true</EnableLibraryImportGenerator>
+    <IncludeLibraryImportGeneratorSources Condition="'$(IncludeLibraryImportGeneratorSources)' == ''">true</IncludeLibraryImportGeneratorSources>
   </PropertyGroup>
   <ItemGroup>
-    <EnabledGenerators Include="DllImportGenerator" Condition="'$(EnableDllImportGenerator)' == 'true'" />
-    <!-- If the current project is not System.Private.CoreLib, we enable the DllImportGenerator source generator
+    <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 either:
          - references System.Private.CoreLib, or
          - references System.Runtime.InteropServices -->
-    <EnabledGenerators Include="DllImportGenerator"
-                       Condition="'$(EnableDllImportGenerator)' == ''
+    <EnabledGenerators Include="LibraryImportGenerator"
+                       Condition="'$(EnableLibraryImportGenerator)' == ''
                         and '$(IsSourceProject)' == 'true'
                         and '$(MSBuildProjectExtension)' == '.csproj'
                         and (
@@ -22,18 +22,18 @@
                             and @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)')))
                           or ('$(NetCoreAppCurrentTargetFrameworkMoniker)' == '$(TargetFrameworkMoniker)'
                             and '$(DisableImplicitAssemblyReferences)' == 'false'))" />
-    <EnabledGenerators Include="DllImportGenerator"
-                       Condition="'$(EnableDllImportGenerator)' == ''
+    <EnabledGenerators Include="LibraryImportGenerator"
+                       Condition="'$(EnableLibraryImportGenerator)' == ''
                         and '$(IsSourceProject)' == 'true'
                         and '$(MSBuildProjectExtension)' == '.csproj'
                         and ('$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == '.NETFramework' or ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '$(NetCoreAppCurrentVersion)'))))" />
   </ItemGroup>
 
   <!-- Use this complex ItemGroup-based filtering to add the ProjectReference to make sure dotnet/runtime stays compatible with NuGet Static Graph Restore. -->
   <ItemGroup Condition="'@(EnabledGenerators)' != ''
-                        and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'DllImportGenerator'))">
+                        and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'LibraryImportGenerator'))">
     <ProjectReference
-      Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj"
+      Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj"
       OutputItemType="Analyzer"
       ReferenceOutputAssembly="false" />
     <ProjectReference
@@ -42,8 +42,8 @@
       ReferenceOutputAssembly="false" />
   </ItemGroup>
   <ItemGroup Condition="'@(EnabledGenerators)' != ''
-                        and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'DllImportGenerator'))
-                        and '$(IncludeDllImportGeneratorSources)' == 'true'">
+                        and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'LibraryImportGenerator'))
+                        and '$(IncludeLibraryImportGeneratorSources)' == 'true'">
     <Compile Include="$(LibrariesProjectRoot)Common\src\System\Runtime\InteropServices\GeneratedDllImportAttribute.cs" />
     <Compile Include="$(LibrariesProjectRoot)Common\src\System\Runtime\InteropServices\StringMarshalling.cs" />
 
@@ -54,7 +54,7 @@
     <Compile Condition="'$(NetCoreAppCurrentTargetFrameworkMoniker)' == '$(TargetFrameworkMoniker)'
                         and (
                           '$(MSBuildProjectName)' == 'System.Private.CoreLib'
-                          or '$(EnableDllImportGenerator)' == 'true'
+                          or '$(EnableLibraryImportGenerator)' == 'true'
                           or ('@(Reference)' != ''
                             and @(Reference->AnyHaveMetadataValue('Identity', 'System.Memory')))
                           or ('@(ProjectReference)' != ''
@@ -75,18 +75,18 @@
   </ItemGroup>
 
   <Target Name="ConfigureGenerators"
-          DependsOnTargets="ConfigureDllImportGenerator"
+          DependsOnTargets="ConfigureLibraryImportGenerator"
           BeforeTargets="CoreCompile" />
 
-  <!-- Microsoft.Interop.DllImportGenerator -->
-  <Target Name="ConfigureDllImportGenerator"
-          Condition="'@(EnabledGenerators)' != '' and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'DllImportGenerator'))"
+  <!-- Microsoft.Interop.LibraryImportGenerator -->
+  <Target Name="ConfigureLibraryImportGenerator"
+          Condition="'@(EnabledGenerators)' != '' and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'LibraryImportGenerator'))"
           DependsOnTargets="ResolveProjectReferences"
           BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun">
     <PropertyGroup>
-        <DllImportGenerator_UseMarshalType>true</DllImportGenerator_UseMarshalType>
+        <LibraryImportGenerator_UseMarshalType>true</LibraryImportGenerator_UseMarshalType>
     </PropertyGroup>
   </Target>
 
-  <Import Project="$(LibrariesProjectRoot)System.Runtime.InteropServices/gen/DllImportGenerator/Microsoft.Interop.DllImportGenerator.props" />
+  <Import Project="$(LibrariesProjectRoot)System.Runtime.InteropServices/gen/LibraryImportGenerator/Microsoft.Interop.LibraryImportGenerator.props" />
 </Project>
diff --git a/src/coreclr/nativeaot/Test.CoreLib/src/Test.CoreLib.csproj b/src/coreclr/nativeaot/Test.CoreLib/src/Test.CoreLib.csproj
@@ -3,7 +3,7 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <EnableDllImportGenerator>true</EnableDllImportGenerator>
+    <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
     <!--
       SYSLIB1053: LibraryImportGenerator Target Framework Not Supported.
      -->

diff --git a/src/libraries/Common/Common.Tests.sln b/src/libraries/Common/Common.Tests.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", "t
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "tests\TestUtilities\TestUtilities.csproj", "{10215DC2-1255-4B60-B0AC-D8B09BCEA179}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{026037B4-2AC1-41C0-BB7C-1F8BAF64335D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{DE396BFB-FED4-4967-B286-CD7C379B25E5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07}"
 EndProject
@@ -31,10 +31,10 @@ Global
 		{10215DC2-1255-4B60-B0AC-D8B09BCEA179}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{10215DC2-1255-4B60-B0AC-D8B09BCEA179}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10215DC2-1255-4B60-B0AC-D8B09BCEA179}.Release|Any CPU.Build.0 = Release|Any CPU
-		{026037B4-2AC1-41C0-BB7C-1F8BAF64335D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{026037B4-2AC1-41C0-BB7C-1F8BAF64335D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{026037B4-2AC1-41C0-BB7C-1F8BAF64335D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{026037B4-2AC1-41C0-BB7C-1F8BAF64335D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE396BFB-FED4-4967-B286-CD7C379B25E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE396BFB-FED4-4967-B286-CD7C379B25E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE396BFB-FED4-4967-B286-CD7C379B25E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE396BFB-FED4-4967-B286-CD7C379B25E5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,7 +47,7 @@ Global
 		{504E9212-C8FD-4147-8FB2-2A32AE1CD4EA} = {F81003B8-54C4-42B1-AD93-255B62E9DC55}
 		{C7E66E1B-C442-48AF-B4AE-CB085F118F1D} = {F81003B8-54C4-42B1-AD93-255B62E9DC55}
 		{10215DC2-1255-4B60-B0AC-D8B09BCEA179} = {F81003B8-54C4-42B1-AD93-255B62E9DC55}
-		{026037B4-2AC1-41C0-BB7C-1F8BAF64335D} = {D178FCB7-E393-496F-937A-C438941CED2B}
+		{DE396BFB-FED4-4967-B286-CD7C379B25E5} = {D178FCB7-E393-496F-937A-C438941CED2B}
 		{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07} = {D178FCB7-E393-496F-937A-C438941CED2B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/src/libraries/Common/src/System/Runtime/InteropServices/ArrayMarshaller.cs b/src/libraries/Common/src/System/Runtime/InteropServices/ArrayMarshaller.cs
@@ -12,7 +12,7 @@
 
 namespace System.Runtime.InteropServices.GeneratedMarshalling
 {
-#if DLLIMPORT_GENERATOR_TEST
+#if LIBRARYIMPORT_GENERATOR_TEST
     public
 #else
     internal
@@ -106,7 +106,7 @@ public void FreeNative()
         }
     }
 
-#if DLLIMPORT_GENERATOR_TEST
+#if LIBRARYIMPORT_GENERATOR_TEST
     public
 #else
     internal

diff --git a/src/libraries/Common/src/System/Runtime/InteropServices/GeneratedDllImportAttribute.cs b/src/libraries/Common/src/System/Runtime/InteropServices/GeneratedDllImportAttribute.cs
@@ -12,7 +12,7 @@ namespace System.Runtime.InteropServices
     /// Indicates that method will be generated at compile time and invoke into an unmanaged library entry point
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
-#if DLLIMPORT_GENERATOR_TEST
+#if LIBRARYIMPORT_GENERATOR_TEST
     public
 #else
     internal

diff --git a/src/libraries/Common/src/System/Runtime/InteropServices/GeneratedMarshallingAttribute.cs b/src/libraries/Common/src/System/Runtime/InteropServices/GeneratedMarshallingAttribute.cs
@@ -9,7 +9,7 @@
 namespace System.Runtime.InteropServices
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
-#if DLLIMPORT_GENERATOR_TEST
+#if LIBRARYIMPORT_GENERATOR_TEST
     public
 #else
     internal
@@ -19,7 +19,7 @@ sealed class GeneratedMarshallingAttribute : Attribute
     }
 
     [AttributeUsage(AttributeTargets.Struct | AttributeTargets.Class)]
-#if DLLIMPORT_GENERATOR_TEST
+#if LIBRARYIMPORT_GENERATOR_TEST
     public
 #else
     internal
@@ -35,7 +35,7 @@ public NativeMarshallingAttribute(Type nativeType)
     }
 
     [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.ReturnValue | AttributeTargets.Field, AllowMultiple = true)]
-#if DLLIMPORT_GENERATOR_TEST
+#if LIBRARYIMPORT_GENERATOR_TEST
     public
 #else
     internal
@@ -65,7 +65,7 @@ public MarshalUsingAttribute(Type nativeType)
     }
 
     [AttributeUsage(AttributeTargets.Struct | AttributeTargets.Class)]
-#if DLLIMPORT_GENERATOR_TEST
+#if LIBRARYIMPORT_GENERATOR_TEST
     public
 #else
     internal

diff --git a/src/libraries/Common/src/System/Runtime/InteropServices/StringMarshalling.cs b/src/libraries/Common/src/System/Runtime/InteropServices/StringMarshalling.cs
@@ -9,7 +9,7 @@ namespace System.Runtime.InteropServices
     /// <summary>
     /// Specifies how strings should be marshalled for generated p/invokes
     /// </summary>
-#if DLLIMPORT_GENERATOR_TEST
+#if LIBRARYIMPORT_GENERATOR_TEST
     public
 #else
     internal

diff --git a/src/libraries/Common/tests/Common.Tests.csproj b/src/libraries/Common/tests/Common.Tests.csproj
@@ -4,7 +4,7 @@
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
     <Nullable>annotations</Nullable>
-    <EnableDllImportGenerator>true</EnableDllImportGenerator>
+    <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs"

diff --git a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
@@ -8,7 +8,7 @@
       and instead use runtime checks.
     -->
     <TargetFrameworks>$(NetCoreAppMinimum);$(NetFrameworkMinimum)</TargetFrameworks>
-    <EnableDllImportGenerator>true</EnableDllImportGenerator>
+    <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)ILLink.Substitutions.AggressiveTrimming.xml"

diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfac
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces.Tests", "tests\Microsoft.Bcl.AsyncInterfaces.Tests.csproj", "{51D9518A-464D-4257-9567-3BDCFF24F3EE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F6EB175D-190F-4C2E-9640-39B7BE047A17}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0AE44453-273B-4F0E-9901-A87891A73C1B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}"
 EndProject
@@ -41,10 +41,10 @@ Global
 		{51D9518A-464D-4257-9567-3BDCFF24F3EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{51D9518A-464D-4257-9567-3BDCFF24F3EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{51D9518A-464D-4257-9567-3BDCFF24F3EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6EB175D-190F-4C2E-9640-39B7BE047A17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6EB175D-190F-4C2E-9640-39B7BE047A17}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6EB175D-190F-4C2E-9640-39B7BE047A17}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6EB175D-190F-4C2E-9640-39B7BE047A17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AE44453-273B-4F0E-9901-A87891A73C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AE44453-273B-4F0E-9901-A87891A73C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AE44453-273B-4F0E-9901-A87891A73C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AE44453-273B-4F0E-9901-A87891A73C1B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
 		{51D9518A-464D-4257-9567-3BDCFF24F3EE} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}
 		{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB}
 		{4D4BED71-8904-4A74-88CD-63D002CCACD0} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}
-		{F6EB175D-190F-4C2E-9640-39B7BE047A17} = {D6A9108E-553B-445E-A037-FA4F3140A279}
+		{0AE44453-273B-4F0E-9901-A87891A73C1B} = {D6A9108E-553B-445E-A037-FA4F3140A279}
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB} = {D6A9108E-553B-445E-A037-FA4F3140A279}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln b/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CSharp", "src\Mic
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CSharp.Tests", "tests\Microsoft.CSharp.Tests.csproj", "{7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AA593349-BB82-43F0-AD9E-B4EEE8B4B97E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B78B9BD0-6D82-400A-A373-C42051D9C3D8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{7223E4B2-40ED-48FB-9BFA-07002AD674DB}"
 EndProject
@@ -41,10 +41,10 @@ Global
 		{7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA593349-BB82-43F0-AD9E-B4EEE8B4B97E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA593349-BB82-43F0-AD9E-B4EEE8B4B97E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA593349-BB82-43F0-AD9E-B4EEE8B4B97E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA593349-BB82-43F0-AD9E-B4EEE8B4B97E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B78B9BD0-6D82-400A-A373-C42051D9C3D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B78B9BD0-6D82-400A-A373-C42051D9C3D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B78B9BD0-6D82-400A-A373-C42051D9C3D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B78B9BD0-6D82-400A-A373-C42051D9C3D8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7223E4B2-40ED-48FB-9BFA-07002AD674DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7223E4B2-40ED-48FB-9BFA-07002AD674DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7223E4B2-40ED-48FB-9BFA-07002AD674DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
 		{7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA} = {E6224881-0E5B-4FDC-99C4-DDE6E59F806B}
 		{BF947490-D7AE-46E1-B4E0-D8A6D1EA8E5A} = {85A4D137-FEEC-4F3C-9358-F2BFFFF6D2DE}
 		{78073F44-8382-473D-8B24-90D54B57129E} = {E4FC7A8F-5024-4D51-9753-C2C61CF9DAD0}
-		{AA593349-BB82-43F0-AD9E-B4EEE8B4B97E} = {9C11B257-64B7-4EC9-BF3E-4859FB66281D}
+		{B78B9BD0-6D82-400A-A373-C42051D9C3D8} = {9C11B257-64B7-4EC9-BF3E-4859FB66281D}
 		{7223E4B2-40ED-48FB-9BFA-07002AD674DB} = {9C11B257-64B7-4EC9-BF3E-4859FB66281D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution