Fix follow-up feedback from the downlevel LibraryImportGenerator split (

#106827)
dotnet · Aug 22, 2024 · 2d34125 · 2d34125
1 parent 6c03c81
commit 2d34125
Show file tree

Hide file tree

Showing 202 changed files with 2,487 additions and 1,066 deletions.
diff --git a/eng/generators.targets b/eng/generators.targets
@@ -1,11 +1,4 @@
 <Project>
-
-  <PropertyGroup>
-    <!-- Enable LibraryImportGenerator for CoreLib. -->
-    <EnableLibraryImportGenerator Condition="'$(EnableLibraryImportGenerator)' == '' and
-                                             '$(MSBuildProjectName)' == 'System.Private.CoreLib'">true</EnableLibraryImportGenerator>
-  </PropertyGroup>
-
   <ItemGroup>
     <EnabledGenerators Include="LibraryImportGenerator" Condition="'$(EnableLibraryImportGenerator)' == 'true'" />
     <!-- We enable the Downlevel LibraryImportGenerator
@@ -19,7 +12,7 @@
                                     '$(IsTestSupportProject)' == 'true'
                                   ) and
                                   '$(MSBuildProjectExtension)' == '.csproj' and
-                                  !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppMinimum)'))" />
+                                  '$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
 
     <!-- We enable the LibraryImportGenerator source generator
          when the project is a C# source project that:
@@ -33,7 +26,7 @@
                                       '$(DisableImplicitFrameworkReferences)' == 'true' and
                                       (
                                         '@(Reference->AnyHaveMetadataValue('Identity', 'System.Runtime.InteropServices'))' == 'true' or
-                                        '@(Reference->AnyHaveMetadataValue('Identity', 'System.Private.CoreLib'))' == 'true'
+                                        '@(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)'))' == 'true'
                                       )
                                   )" />
 

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}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{DE396BFB-FED4-4967-B286-CD7C379B25E5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DownlevelLibraryImportGenerator", "..\System.Runtime.InteropServices\gen\DownlevelLibraryImportGenerator\DownlevelLibraryImportGenerator.csproj", "{2FA08317-6563-48DE-8602-6815F30A08D1}"
 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
-		{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
+		{2FA08317-6563-48DE-8602-6815F30A08D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FA08317-6563-48DE-8602-6815F30A08D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FA08317-6563-48DE-8602-6815F30A08D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FA08317-6563-48DE-8602-6815F30A08D1}.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}
-		{DE396BFB-FED4-4967-B286-CD7C379B25E5} = {D178FCB7-E393-496F-937A-C438941CED2B}
+		{2FA08317-6563-48DE-8602-6815F30A08D1} = {D178FCB7-E393-496F-937A-C438941CED2B}
 		{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07} = {D178FCB7-E393-496F-937A-C438941CED2B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/src/libraries/Fuzzing/DotnetFuzzing.sln b/src/libraries/Fuzzing/DotnetFuzzing.sln
@@ -1,31 +1,8 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.11.34807.36
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetFuzzing", "DotnetFuzzing\DotnetFuzzing.csproj", "{002673BF-11AE-4072-9CBE-FC312BF68613}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6DDAE3F1-325F-468C-92DB-5947A3AD757E}"
-	ProjectSection(SolutionItems) = preProject
-		.gitignore = .gitignore
-		..\..\..\eng\pipelines\libraries\fuzzing\deploy-to-onefuzz.yml = ..\..\..\eng\pipelines\libraries\fuzzing\deploy-to-onefuzz.yml
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		nuget.config = nuget.config
-		README.md = README.md
-		OneFuzz.md = OneFuzz.md
-	EndProjectSection
-EndProject
+Microsoft Visual Studio Solution File, Format Version 12.00
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{002673BF-11AE-4072-9CBE-FC312BF68613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{002673BF-11AE-4072-9CBE-FC312BF68613}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{002673BF-11AE-4072-9CBE-FC312BF68613}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{002673BF-11AE-4072-9CBE-FC312BF68613}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln
@@ -5,7 +5,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}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0AE44453-273B-4F0E-9901-A87891A73C1B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DownlevelLibraryImportGenerator", "..\System.Runtime.InteropServices\gen\DownlevelLibraryImportGenerator\DownlevelLibraryImportGenerator.csproj", "{E0D86B5A-9442-4E89-9B28-1869E23C824E}"
 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
@@ -51,10 +51,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
-		{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
+		{E0D86B5A-9442-4E89-9B28-1869E23C824E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0D86B5A-9442-4E89-9B28-1869E23C824E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0D86B5A-9442-4E89-9B28-1869E23C824E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0D86B5A-9442-4E89-9B28-1869E23C824E}.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
@@ -87,7 +87,7 @@ Global
 		{CAEE0409-CCC3-4EA6-AB54-177FD305D42D} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}
 		{51D9518A-464D-4257-9567-3BDCFF24F3EE} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}
 		{4D4BED71-8904-4A74-88CD-63D002CCACD0} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}
-		{0AE44453-273B-4F0E-9901-A87891A73C1B} = {D6A9108E-553B-445E-A037-FA4F3140A279}
+		{E0D86B5A-9442-4E89-9B28-1869E23C824E} = {D6A9108E-553B-445E-A037-FA4F3140A279}
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB} = {D6A9108E-553B-445E-A037-FA4F3140A279}
 		{59CE8DDB-AFFD-4C6F-B09F-94DE4DD0AAEA} = {F4939A3B-3316-4166-8AE6-34E1D0863CF5}
 		{0225750F-4DC0-4C71-9B33-314ACA0EF682} = {F4939A3B-3316-4166-8AE6-34E1D0863CF5}

diff --git a/src/libraries/Microsoft.Bcl.Cryptography/Microsoft.Bcl.Cryptography.sln b/src/libraries/Microsoft.Bcl.Cryptography/Microsoft.Bcl.Cryptography.sln
@@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{F512A7E1-C119-4803-9312-020005D4FF5F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DownlevelLibraryImportGenerator", "..\System.Runtime.InteropServices\gen\DownlevelLibraryImportGenerator\DownlevelLibraryImportGenerator.csproj", "{94AD69C1-FB03-4496-99D3-038CCE7C9917}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E9271403-BEF5-46E9-B68B-16EF69AA7149}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A4C2BDDC-1AFB-45A8-9E9B-4AD7396A4DF2}"
@@ -85,6 +87,10 @@ Global
 		{F512A7E1-C119-4803-9312-020005D4FF5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F512A7E1-C119-4803-9312-020005D4FF5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F512A7E1-C119-4803-9312-020005D4FF5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94AD69C1-FB03-4496-99D3-038CCE7C9917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94AD69C1-FB03-4496-99D3-038CCE7C9917}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94AD69C1-FB03-4496-99D3-038CCE7C9917}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94AD69C1-FB03-4496-99D3-038CCE7C9917}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E9271403-BEF5-46E9-B68B-16EF69AA7149}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E9271403-BEF5-46E9-B68B-16EF69AA7149}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E9271403-BEF5-46E9-B68B-16EF69AA7149}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -145,6 +151,7 @@ Global
 		{A2B1AF52-7F1C-49DA-A5B0-0BCF85031DC0} = {7E9F6DE1-771B-4E25-A603-EC43D0291C8B}
 		{FBFED603-DDBC-4EE3-B252-4C46883D8CC5} = {7E9F6DE1-771B-4E25-A603-EC43D0291C8B}
 		{F512A7E1-C119-4803-9312-020005D4FF5F} = {34897637-11A1-48A4-AF1F-E11463A61D0B}
+		{94AD69C1-FB03-4496-99D3-038CCE7C9917} = {34897637-11A1-48A4-AF1F-E11463A61D0B}
 		{E9271403-BEF5-46E9-B68B-16EF69AA7149} = {34897637-11A1-48A4-AF1F-E11463A61D0B}
 		{A4C2BDDC-1AFB-45A8-9E9B-4AD7396A4DF2} = {34897637-11A1-48A4-AF1F-E11463A61D0B}
 		{777AF5DE-3EB3-4E62-A0D8-CA10D77B5343} = {568C437D-072B-48BA-BBB4-20F39E2ADA15}

diff --git a/src/libraries/Microsoft.Bcl.Memory/Microsoft.Bcl.Memory.sln b/src/libraries/Microsoft.Bcl.Memory/Microsoft.Bcl.Memory.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Memory", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Memory.Tests", "tests\Microsoft.Bcl.Memory.Tests.csproj", "{6916DB98-2958-498D-83E7-90080BEA9D39}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C5E6E7BE-85A7-411C-942D-58D1CF536B69}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DownlevelLibraryImportGenerator", "..\System.Runtime.InteropServices\gen\DownlevelLibraryImportGenerator\DownlevelLibraryImportGenerator.csproj", "{2EB5E79B-65A9-45C6-9824-13D93F46F0ED}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{BDF81187-85CE-4BA7-8354-A248CF38F6A3}"
 EndProject
@@ -51,10 +51,10 @@ Global
 		{6916DB98-2958-498D-83E7-90080BEA9D39}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6916DB98-2958-498D-83E7-90080BEA9D39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6916DB98-2958-498D-83E7-90080BEA9D39}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C5E6E7BE-85A7-411C-942D-58D1CF536B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5E6E7BE-85A7-411C-942D-58D1CF536B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5E6E7BE-85A7-411C-942D-58D1CF536B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5E6E7BE-85A7-411C-942D-58D1CF536B69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2EB5E79B-65A9-45C6-9824-13D93F46F0ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2EB5E79B-65A9-45C6-9824-13D93F46F0ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EB5E79B-65A9-45C6-9824-13D93F46F0ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2EB5E79B-65A9-45C6-9824-13D93F46F0ED}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BDF81187-85CE-4BA7-8354-A248CF38F6A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BDF81187-85CE-4BA7-8354-A248CF38F6A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BDF81187-85CE-4BA7-8354-A248CF38F6A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -87,7 +87,7 @@ Global
 		{DC079FC4-E827-4F1C-9C85-803E2D92B3D4} = {E78D7A3F-384B-4AA3-ABF1-C4464BE9237C}
 		{6916DB98-2958-498D-83E7-90080BEA9D39} = {E78D7A3F-384B-4AA3-ABF1-C4464BE9237C}
 		{D4D9D9AC-E482-457A-8047-5267BDF2C2EE} = {76C22FE9-D65E-40C3-BE2D-98BD628779EC}
-		{C5E6E7BE-85A7-411C-942D-58D1CF536B69} = {101F8A3D-BAEB-4D16-B83E-1136CDF98795}
+		{2EB5E79B-65A9-45C6-9824-13D93F46F0ED} = {101F8A3D-BAEB-4D16-B83E-1136CDF98795}
 		{BDF81187-85CE-4BA7-8354-A248CF38F6A3} = {101F8A3D-BAEB-4D16-B83E-1136CDF98795}
 		{F1DE07AA-87C9-478A-9D43-7DF7813D6250} = {F2D0981A-13D5-4858-AE51-23BB61AE0E2B}
 		{BA90C3CA-BEA8-4E9E-9CB2-ADE8EAA1E975} = {F2D0981A-13D5-4858-AE51-23BB61AE0E2B}

diff --git a/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln b/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics.Tests", "tests\Microsoft.Bcl.Numerics.Tests.csproj", "{51D9518A-464D-4257-9567-3BDCFF24F3EE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0AE44453-273B-4F0E-9901-A87891A73C1B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DownlevelLibraryImportGenerator", "..\System.Runtime.InteropServices\gen\DownlevelLibraryImportGenerator\DownlevelLibraryImportGenerator.csproj", "{D81DAC34-FFE5-494C-9E80-A7696331FC6C}"
 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
@@ -51,10 +51,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
-		{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
+		{D81DAC34-FFE5-494C-9E80-A7696331FC6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D81DAC34-FFE5-494C-9E80-A7696331FC6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D81DAC34-FFE5-494C-9E80-A7696331FC6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D81DAC34-FFE5-494C-9E80-A7696331FC6C}.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
@@ -87,7 +87,7 @@ Global
 		{CAEE0409-CCC3-4EA6-AB54-177FD305D42D} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}
 		{51D9518A-464D-4257-9567-3BDCFF24F3EE} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}
 		{4D4BED71-8904-4A74-88CD-63D002CCACD0} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}
-		{0AE44453-273B-4F0E-9901-A87891A73C1B} = {D6A9108E-553B-445E-A037-FA4F3140A279}
+		{D81DAC34-FFE5-494C-9E80-A7696331FC6C} = {D6A9108E-553B-445E-A037-FA4F3140A279}
 		{D0F1936C-CF7C-4448-9F90-B9DEABE89EBB} = {D6A9108E-553B-445E-A037-FA4F3140A279}
 		{21224EF3-8706-4C95-8009-ADCA451B1513} = {0B6D6DEB-1D82-4C19-98F5-7CCDB5AEBACA}
 		{5455F8B5-6A95-42AE-9D6E-AA13D0324D9A} = {0B6D6DEB-1D82-4C19-98F5-7CCDB5AEBACA}

diff --git a/src/libraries/Microsoft.Bcl.TimeProvider/Microsoft.Bcl.TimeProvider.sln b/src/libraries/Microsoft.Bcl.TimeProvider/Microsoft.Bcl.TimeProvider.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.TimeProvider"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.TimeProvider.Tests", "tests\Microsoft.Bcl.TimeProvider.Tests.csproj", "{8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4FB1DB0F-1371-4635-8160-6AB3B3D3BB04}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DownlevelLibraryImportGenerator", "..\System.Runtime.InteropServices\gen\DownlevelLibraryImportGenerator\DownlevelLibraryImportGenerator.csproj", "{B1A650D0-0A3F-41FD-8DA6-08AE2FF667B8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6D351E62-CB41-4E2A-B7E7-55FAC33C6B16}"
 EndProject
@@ -57,10 +57,10 @@ Global
 		{8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FB1DB0F-1371-4635-8160-6AB3B3D3BB04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FB1DB0F-1371-4635-8160-6AB3B3D3BB04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FB1DB0F-1371-4635-8160-6AB3B3D3BB04}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FB1DB0F-1371-4635-8160-6AB3B3D3BB04}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1A650D0-0A3F-41FD-8DA6-08AE2FF667B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1A650D0-0A3F-41FD-8DA6-08AE2FF667B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1A650D0-0A3F-41FD-8DA6-08AE2FF667B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1A650D0-0A3F-41FD-8DA6-08AE2FF667B8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6D351E62-CB41-4E2A-B7E7-55FAC33C6B16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6D351E62-CB41-4E2A-B7E7-55FAC33C6B16}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D351E62-CB41-4E2A-B7E7-55FAC33C6B16}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -94,7 +94,7 @@ Global
 		{8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E} = {B7AA510C-BBAF-4D08-A81C-56A134460112}
 		{C3AF8C81-DFF3-474F-8CDD-3E30319AEBB4} = {C2DE61FC-AB38-4E50-8892-1363AFFCEC63}
 		{6BF3C14F-036A-4A04-90EC-82ADC2900805} = {C2DE61FC-AB38-4E50-8892-1363AFFCEC63}
-		{4FB1DB0F-1371-4635-8160-6AB3B3D3BB04} = {2DA8DE52-952C-4E9B-8C4D-5FF6AC27CA62}
+		{B1A650D0-0A3F-41FD-8DA6-08AE2FF667B8} = {2DA8DE52-952C-4E9B-8C4D-5FF6AC27CA62}
 		{6D351E62-CB41-4E2A-B7E7-55FAC33C6B16} = {2DA8DE52-952C-4E9B-8C4D-5FF6AC27CA62}
 		{E993DE92-F571-45CF-A879-87ADA3CCEF7E} = {F0432FE3-6BCD-4B1C-BF81-2CDEDA0B8F50}
 		{5E7E6A50-109D-45DA-A70C-B00AB5BCF964} = {F0432FE3-6BCD-4B1C-BF81-2CDEDA0B8F50}