Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElinor Fung <elfung@microsoft.com>2022-03-04 09:17:23 +0300
committerGitHub <noreply@github.com>2022-03-04 09:17:23 +0300
commita0635832f1c4cf02423b4cb40cb8611a4163a78d (patch)
tree1600cb01c0d92831b185e8aba5bb12d44a950362 /src
parent20294957616061616e672b43f1d962460b7f4234 (diff)
Rename `DllImportGenerator` project to `LibraryImportGenerator` (#66029)
Diffstat (limited to 'src')
-rw-r--r--src/coreclr/nativeaot/Test.CoreLib/src/Test.CoreLib.csproj2
-rw-r--r--src/libraries/Common/Common.Tests.sln12
-rw-r--r--src/libraries/Common/src/System/Runtime/InteropServices/ArrayMarshaller.cs4
-rw-r--r--src/libraries/Common/src/System/Runtime/InteropServices/GeneratedDllImportAttribute.cs2
-rw-r--r--src/libraries/Common/src/System/Runtime/InteropServices/GeneratedMarshallingAttribute.cs8
-rw-r--r--src/libraries/Common/src/System/Runtime/InteropServices/StringMarshalling.cs2
-rw-r--r--src/libraries/Common/tests/Common.Tests.csproj2
-rw-r--r--src/libraries/Common/tests/TestUtilities/TestUtilities.csproj2
-rw-r--r--src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln12
-rw-r--r--src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln12
-rw-r--r--src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Caching.Abstractions/Microsoft.Extensions.Caching.Abstractions.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Microsoft.Extensions.FileProviders.Abstractions.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.FileProviders.Composite/Microsoft.Extensions.FileProviders.Composite.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.FileProviders.Physical/Microsoft.Extensions.FileProviders.Physical.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj2
-rw-r--r--src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj4
-rw-r--r--src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln12
-rw-r--r--src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln12
-rw-r--r--src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln12
-rw-r--r--src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln12
-rw-r--r--src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln40
-rw-r--r--src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln12
-rw-r--r--src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln12
-rw-r--r--src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj2
-rw-r--r--src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln12
-rw-r--r--src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj2
-rw-r--r--src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln12
-rw-r--r--src/libraries/System.AppContext/System.AppContext.sln40
-rw-r--r--src/libraries/System.Buffers/System.Buffers.sln40
-rw-r--r--src/libraries/System.CodeDom/System.CodeDom.sln12
-rw-r--r--src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln40
-rw-r--r--src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln12
-rw-r--r--src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln12
-rw-r--r--src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln12
-rw-r--r--src/libraries/System.Collections/System.Collections.sln40
-rw-r--r--src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln12
-rw-r--r--src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln12
-rw-r--r--src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln12
-rw-r--r--src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln12
-rw-r--r--src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln12
-rw-r--r--src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln19
-rw-r--r--src/libraries/System.ComponentModel/System.ComponentModel.sln12
-rw-r--r--src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln12
-rw-r--r--src/libraries/System.Composition.Convention/System.Composition.Convention.sln12
-rw-r--r--src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln12
-rw-r--r--src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln12
-rw-r--r--src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln12
-rw-r--r--src/libraries/System.Composition/System.Composition.sln12
-rw-r--r--src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln12
-rw-r--r--src/libraries/System.Console/System.Console.sln12
-rw-r--r--src/libraries/System.Console/tests/System.Console.Tests.csproj2
-rw-r--r--src/libraries/System.Data.Common/System.Data.Common.sln61
-rw-r--r--src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln12
-rw-r--r--src/libraries/System.Data.Odbc/System.Data.Odbc.sln12
-rw-r--r--src/libraries/System.Data.OleDb/System.Data.Oledb.sln12
-rw-r--r--src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln40
-rw-r--r--src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln40
-rw-r--r--src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln12
-rw-r--r--src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln12
-rw-r--r--src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj2
-rw-r--r--src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj2
-rw-r--r--src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln12
-rw-r--r--src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj2
-rw-r--r--src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln12
-rw-r--r--src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln12
-rw-r--r--src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj2
-rw-r--r--src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln40
-rw-r--r--src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln12
-rw-r--r--src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln40
-rw-r--r--src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln40
-rw-r--r--src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln40
-rw-r--r--src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln12
-rw-r--r--src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln12
-rw-r--r--src/libraries/System.DirectoryServices/System.DirectoryServices.sln12
-rw-r--r--src/libraries/System.Drawing.Common/System.Drawing.Common.sln12
-rw-r--r--src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln12
-rw-r--r--src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln12
-rw-r--r--src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln12
-rw-r--r--src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln12
-rw-r--r--src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln40
-rw-r--r--src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln12
-rw-r--r--src/libraries/System.Globalization/System.Globalization.sln40
-rw-r--r--src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln12
-rw-r--r--src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln12
-rw-r--r--src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj2
-rw-r--r--src/libraries/System.IO.Compression/System.IO.Compression.sln12
-rw-r--r--src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln12
-rw-r--r--src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln12
-rw-r--r--src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln12
-rw-r--r--src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln12
-rw-r--r--src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj2
-rw-r--r--src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln12
-rw-r--r--src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj2
-rw-r--r--src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj2
-rw-r--r--src/libraries/System.IO.Hashing/System.IO.Hashing.sln12
-rw-r--r--src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln12
-rw-r--r--src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln12
-rw-r--r--src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj2
-rw-r--r--src/libraries/System.IO.Packaging/System.IO.Packaging.sln12
-rw-r--r--src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln12
-rw-r--r--src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln12
-rw-r--r--src/libraries/System.IO.Pipes/System.IO.Pipes.sln12
-rw-r--r--src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj2
-rw-r--r--src/libraries/System.IO.Ports/System.IO.Ports.sln12
-rw-r--r--src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln40
-rw-r--r--src/libraries/System.IO/System.IO.sln12
-rw-r--r--src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln12
-rw-r--r--src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln12
-rw-r--r--src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln12
-rw-r--r--src/libraries/System.Linq/System.Linq.sln12
-rw-r--r--src/libraries/System.Management/System.Management.sln12
-rw-r--r--src/libraries/System.Memory.Data/System.Memory.Data.sln12
-rw-r--r--src/libraries/System.Memory/System.Memory.sln40
-rw-r--r--src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln12
-rw-r--r--src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln12
-rw-r--r--src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj2
-rw-r--r--src/libraries/System.Net.Http/System.Net.Http.sln12
-rw-r--r--src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj2
-rw-r--r--src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj2
-rw-r--r--src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln12
-rw-r--r--src/libraries/System.Net.Mail/System.Net.Mail.sln12
-rw-r--r--src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj2
-rw-r--r--src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln12
-rw-r--r--src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj2
-rw-r--r--src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln12
-rw-r--r--src/libraries/System.Net.Ping/System.Net.Ping.sln12
-rw-r--r--src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj2
-rw-r--r--src/libraries/System.Net.Primitives/System.Net.Primitives.sln12
-rw-r--r--src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj2
-rw-r--r--src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj2
-rw-r--r--src/libraries/System.Net.Quic/System.Net.Quic.sln12
-rw-r--r--src/libraries/System.Net.Requests/System.Net.Requests.sln12
-rw-r--r--src/libraries/System.Net.Security/System.Net.Security.sln12
-rw-r--r--src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj2
-rw-r--r--src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln12
-rw-r--r--src/libraries/System.Net.Sockets/System.Net.Sockets.sln12
-rw-r--r--src/libraries/System.Net.WebClient/System.Net.WebClient.sln12
-rw-r--r--src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln12
-rw-r--r--src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln12
-rw-r--r--src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln12
-rw-r--r--src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln12
-rw-r--r--src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln12
-rw-r--r--src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln40
-rw-r--r--src/libraries/System.ObjectModel/System.ObjectModel.sln12
-rw-r--r--src/libraries/System.Private.Runtime.InteropServices.JavaScript/System.Private.Runtime.InteropServices.JavaScript.sln12
-rw-r--r--src/libraries/System.Private.Uri/System.Private.Uri.sln40
-rw-r--r--src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln12
-rw-r--r--src/libraries/System.Private.Xml/System.Private.Xml.sln12
-rw-r--r--src/libraries/System.Reflection.Context/System.Reflection.Context.sln12
-rw-r--r--src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln12
-rw-r--r--src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln40
-rw-r--r--src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln40
-rw-r--r--src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln40
-rw-r--r--src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln12
-rw-r--r--src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln12
-rw-r--r--src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj2
-rw-r--r--src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln12
-rw-r--r--src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln40
-rw-r--r--src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln40
-rw-r--r--src/libraries/System.Reflection/System.Reflection.sln40
-rw-r--r--src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln12
-rw-r--r--src/libraries/System.Resources.Reader/System.Resources.Reader.sln12
-rw-r--r--src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln40
-rw-r--r--src/libraries/System.Resources.Writer/System.Resources.Writer.sln12
-rw-r--r--src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln12
-rw-r--r--src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln40
-rw-r--r--src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln12
-rw-r--r--src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln12
-rw-r--r--src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln40
-rw-r--r--src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj2
-rw-r--r--src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln12
-rw-r--r--src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln12
-rw-r--r--src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln120
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/Directory.Build.props4
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/AnalyzerDiagnostics.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/AnalyzerDiagnostics.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/ConvertToGeneratedDllImportAnalyzer.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/ConvertToGeneratedDllImportAnalyzer.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/ConvertToGeneratedDllImportFixer.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/ConvertToGeneratedDllImportFixer.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/ManualTypeMarshallingAnalyzer.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/ManualTypeMarshallingAnalyzer.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Comparers.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Comparers.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Diagnostics/Events.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Diagnostics/Events.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/DllImportGenerator.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportGenerator.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/DllImportGeneratorOptions.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportGeneratorOptions.cs)4
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/DllImportStubContext.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportStubContext.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/ForwarderMarshallingGeneratorFactory.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/ForwarderMarshallingGeneratorFactory.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/GeneratedDllImportData.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/GeneratedDllImportData.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/GeneratorDiagnostics.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/GeneratorDiagnostics.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LanguageSupport.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/LanguageSupport.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportGenerator.csproj)8
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Microsoft.Interop.LibraryImportGenerator.props (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Microsoft.Interop.DllImportGenerator.props)6
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/PInvokeStubCodeGenerator.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/PInvokeStubCodeGenerator.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Resources.Designer.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Resources.Designer.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Resources.resx (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Resources.resx)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/UnreachableException.cs (renamed from src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/UnreachableException.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/Ancillary.Interop/Ancillary.Interop.csproj4
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/ArrayTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/ArrayTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/BlittableStructTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/BlittableStructTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/BooleanTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/BooleanTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CallingConventionTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CallingConventionTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CharacterTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CharacterTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CollectionTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CollectionTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/Constants.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/Constants.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CustomMarshallingTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CustomMarshallingTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/DelegateTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/DelegateTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/Directory.Build.props (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/Directory.Build.props)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/EnumTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/EnumTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/FunctionPointerTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/FunctionPointerTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/LibraryImportGenerator.Tests.csproj (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/DllImportGenerator.Tests.csproj)4
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/PointerTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/PointerTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/SafeHandleTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/SafeHandleTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/SetLastErrorTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/SetLastErrorTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/SpanTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/SpanTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/StringTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/StringTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/AdditionalAttributesOnStub.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/AdditionalAttributesOnStub.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/AttributeForwarding.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/AttributeForwarding.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CodeSnippets.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/CodeSnippets.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CompileFails.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/CompileFails.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Compiles.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/ConvertToGeneratedDllImportAnalyzerTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/ConvertToGeneratedDllImportAnalyzerTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/ConvertToGeneratedDllImportFixerTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/ConvertToGeneratedDllImportFixerTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Diagnostics.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Diagnostics.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Directory.Build.props (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Directory.Build.props)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/DllImportGeneratorOptionsProvider.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/DllImportGeneratorOptionsProvider.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/IncrementalGenerationTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/IncrementalGenerationTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/DllImportGenerator.Unit.Tests.csproj)2
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/ManualTypeMarshallingAnalyzerTests.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/ManualTypeMarshallingAnalyzerTests.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/TestUtils.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/TestUtils.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Verifiers/CSharpAnalyzerVerifier.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Verifiers/CSharpAnalyzerVerifier.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Verifiers/CSharpCodeFixVerifier.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Verifiers/CSharpCodeFixVerifier.cs)0
-rw-r--r--src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Verifiers/CSharpVerifierHelper.cs (renamed from src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Verifiers/CSharpVerifierHelper.cs)0
-rw-r--r--src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln40
-rw-r--r--src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln40
-rw-r--r--src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln12
-rw-r--r--src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln40
-rw-r--r--src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln12
-rw-r--r--src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln12
-rw-r--r--src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln12
-rw-r--r--src/libraries/System.Runtime/System.Runtime.sln40
-rw-r--r--src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln12
-rw-r--r--src/libraries/System.Security.Claims/System.Security.Claims.sln12
-rw-r--r--src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln12
-rw-r--r--src/libraries/System.Security.Cryptography.Cose/System.Security.Cryptography.Cose.sln12
-rw-r--r--src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln12
-rw-r--r--src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln12
-rw-r--r--src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj2
-rw-r--r--src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln12
-rw-r--r--src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln12
-rw-r--r--src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln12
-rw-r--r--src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj2
-rw-r--r--src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln12
-rw-r--r--src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln12
-rw-r--r--src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj2
-rw-r--r--src/libraries/System.Security.Permissions/System.Security.Permissions.sln12
-rw-r--r--src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln12
-rw-r--r--src/libraries/System.Security.Principal/System.Security.Principal.sln40
-rw-r--r--src/libraries/System.Security.SecureString/System.Security.SecureString.sln12
-rw-r--r--src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln12
-rw-r--r--src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln12
-rw-r--r--src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj2
-rw-r--r--src/libraries/System.Speech/System.Speech.sln12
-rw-r--r--src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln12
-rw-r--r--src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln40
-rw-r--r--src/libraries/System.Text.Encoding/System.Text.Encoding.sln40
-rw-r--r--src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln12
-rw-r--r--src/libraries/System.Text.Json/System.Text.Json.sln12
-rw-r--r--src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln12
-rw-r--r--src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln12
-rw-r--r--src/libraries/System.Threading.Channels/System.Threading.Channels.sln12
-rw-r--r--src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln40
-rw-r--r--src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln12
-rw-r--r--src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln12
-rw-r--r--src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln40
-rw-r--r--src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln12
-rw-r--r--src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln40
-rw-r--r--src/libraries/System.Threading.Thread/System.Threading.Thread.sln40
-rw-r--r--src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln40
-rw-r--r--src/libraries/System.Threading.Timer/System.Threading.Timer.sln40
-rw-r--r--src/libraries/System.Threading/System.Threading.sln40
-rw-r--r--src/libraries/System.Transactions.Local/System.Transactions.Local.sln12
-rw-r--r--src/libraries/System.ValueTuple/System.ValueTuple.sln12
-rw-r--r--src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln12
-rw-r--r--src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln12
-rw-r--r--src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln12
-rw-r--r--src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln12
-rw-r--r--src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln12
-rw-r--r--src/libraries/System.Xml.XPath/System.Xml.XPath.sln12
-rw-r--r--src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln12
-rw-r--r--src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln12
-rw-r--r--src/libraries/shims/Directory.Build.props4
-rw-r--r--src/libraries/tests.proj30
-rw-r--r--src/samples/LibraryImportGeneratorSample/.editorconfig (renamed from src/samples/DllImportGeneratorSample/.editorconfig)0
-rw-r--r--src/samples/LibraryImportGeneratorSample/LibraryImportGeneratorSample.csproj (renamed from src/samples/DllImportGeneratorSample/DllImportGeneratorSample.csproj)6
-rw-r--r--src/samples/LibraryImportGeneratorSample/Program.cs (renamed from src/samples/DllImportGeneratorSample/Program.cs)0
323 files changed, 2084 insertions, 2056 deletions
diff --git a/src/coreclr/nativeaot/Test.CoreLib/src/Test.CoreLib.csproj b/src/coreclr/nativeaot/Test.CoreLib/src/Test.CoreLib.csproj
index 8cc4184d4dd..0cba6dfc1f5 100644
--- 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
index cd88c22ab38..440e6abc1c6 100644
--- 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
index 2be3997842f..d28dba25b39 100644
--- a/src/libraries/Common/src/System/Runtime/InteropServices/ArrayMarshaller.cs
+++ b/src/libraries/Common/src/System/Runtime/InteropServices/ArrayMarshaller.cs
@@ -12,7 +12,7 @@ using System.Runtime.CompilerServices;
namespace System.Runtime.InteropServices.GeneratedMarshalling
{
-#if DLLIMPORT_GENERATOR_TEST
+#if LIBRARYIMPORT_GENERATOR_TEST
public
#else
internal
@@ -106,7 +106,7 @@ namespace System.Runtime.InteropServices.GeneratedMarshalling
}
}
-#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
index 23c35745a4a..2dfd91adc65 100644
--- 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
index c594fa3e7b7..1ea2799beaa 100644
--- 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 @@ namespace System.Runtime.InteropServices
}
[AttributeUsage(AttributeTargets.Struct | AttributeTargets.Class)]
-#if DLLIMPORT_GENERATOR_TEST
+#if LIBRARYIMPORT_GENERATOR_TEST
public
#else
internal
@@ -35,7 +35,7 @@ namespace System.Runtime.InteropServices
}
[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.ReturnValue | AttributeTargets.Field, AllowMultiple = true)]
-#if DLLIMPORT_GENERATOR_TEST
+#if LIBRARYIMPORT_GENERATOR_TEST
public
#else
internal
@@ -65,7 +65,7 @@ namespace System.Runtime.InteropServices
}
[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
index 90f17af94ed..36c6adfb441 100644
--- 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
index 0dc2a91ebd8..f7c8e1c617b 100644
--- 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
index b24afba9d9e..5914a2e8de9 100644
--- 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
index 57c475fceaf..c4674c67bce 100644
--- 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
index c2da449d203..d98880e56bc 100644
--- 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
diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln
index 73a9139778b..1935344220b 100644
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Traci
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests", "tests\Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj", "{B25DF443-E116-4D44-B2AB-6D4333F59F32}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{78DDB7FF-F773-49B5-8A18-052AF1518D51}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{3E38F409-6289-4822-A387-3264844AE68F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1943D0D3-09C6-4B6A-AF96-CE50B5395631}"
EndProject
@@ -33,10 +33,10 @@ Global
{B25DF443-E116-4D44-B2AB-6D4333F59F32}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B25DF443-E116-4D44-B2AB-6D4333F59F32}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B25DF443-E116-4D44-B2AB-6D4333F59F32}.Release|Any CPU.Build.0 = Release|Any CPU
- {78DDB7FF-F773-49B5-8A18-052AF1518D51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {78DDB7FF-F773-49B5-8A18-052AF1518D51}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {78DDB7FF-F773-49B5-8A18-052AF1518D51}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {78DDB7FF-F773-49B5-8A18-052AF1518D51}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3E38F409-6289-4822-A387-3264844AE68F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E38F409-6289-4822-A387-3264844AE68F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3E38F409-6289-4822-A387-3264844AE68F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3E38F409-6289-4822-A387-3264844AE68F}.Release|Any CPU.Build.0 = Release|Any CPU
{1943D0D3-09C6-4B6A-AF96-CE50B5395631}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1943D0D3-09C6-4B6A-AF96-CE50B5395631}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1943D0D3-09C6-4B6A-AF96-CE50B5395631}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -49,7 +49,7 @@ Global
{D71CB9DA-6691-4A1A-80CA-45736E4B9272} = {DDF63C60-9514-44F6-BE59-551CCF38F5EB}
{B25DF443-E116-4D44-B2AB-6D4333F59F32} = {DDF63C60-9514-44F6-BE59-551CCF38F5EB}
{D7BDDDA5-180A-4CA8-864B-F9FC4E046D4F} = {3974376A-2BB7-4695-B012-A0DB15EE777A}
- {78DDB7FF-F773-49B5-8A18-052AF1518D51} = {34CAB486-402D-43AE-BA78-6D58A9A337B4}
+ {3E38F409-6289-4822-A387-3264844AE68F} = {34CAB486-402D-43AE-BA78-6D58A9A337B4}
{1943D0D3-09C6-4B6A-AF96-CE50B5395631} = {34CAB486-402D-43AE-BA78-6D58A9A337B4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/Microsoft.Extensions.Caching.Abstractions.sln b/src/libraries/Microsoft.Extensions.Caching.Abstractions/Microsoft.Extensions.Caching.Abstractions.sln
index 30c1b04dab1..8fba924384f 100644
--- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/Microsoft.Extensions.Caching.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/Microsoft.Extensions.Caching.Abstractions.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{9556B0C4-098C-45E3-A7EB-1A219B7F941C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D71A4150-166D-4195-90BC-5A44035FD836}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E1D67575-BF5F-43EB-A81E-6043A427FBEF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{22B98A76-A2BE-47ED-82F2-9BD0EF50B22D}"
EndProject
@@ -39,10 +39,10 @@ Global
{9556B0C4-098C-45E3-A7EB-1A219B7F941C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9556B0C4-098C-45E3-A7EB-1A219B7F941C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9556B0C4-098C-45E3-A7EB-1A219B7F941C}.Release|Any CPU.Build.0 = Release|Any CPU
- {D71A4150-166D-4195-90BC-5A44035FD836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D71A4150-166D-4195-90BC-5A44035FD836}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D71A4150-166D-4195-90BC-5A44035FD836}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D71A4150-166D-4195-90BC-5A44035FD836}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E1D67575-BF5F-43EB-A81E-6043A427FBEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E1D67575-BF5F-43EB-A81E-6043A427FBEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E1D67575-BF5F-43EB-A81E-6043A427FBEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E1D67575-BF5F-43EB-A81E-6043A427FBEF}.Release|Any CPU.Build.0 = Release|Any CPU
{22B98A76-A2BE-47ED-82F2-9BD0EF50B22D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{22B98A76-A2BE-47ED-82F2-9BD0EF50B22D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{22B98A76-A2BE-47ED-82F2-9BD0EF50B22D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
{3CE7A561-5A2F-4AF3-8CC2-8148BC5CCE90} = {4B23C940-1856-48C0-94F2-66D4ADC41EA4}
{5904EB23-3221-4992-A1F9-70F8B5478DF2} = {F5D1F8C5-8A12-4EE8-9ABA-D393EBBCB1AA}
{9556B0C4-098C-45E3-A7EB-1A219B7F941C} = {F5D1F8C5-8A12-4EE8-9ABA-D393EBBCB1AA}
- {D71A4150-166D-4195-90BC-5A44035FD836} = {CF895AB4-6805-4E7D-B8B3-7D363C7D6027}
+ {E1D67575-BF5F-43EB-A81E-6043A427FBEF} = {CF895AB4-6805-4E7D-B8B3-7D363C7D6027}
{22B98A76-A2BE-47ED-82F2-9BD0EF50B22D} = {CF895AB4-6805-4E7D-B8B3-7D363C7D6027}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln b/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln
index 0262e31a7d7..ab4bc722740 100644
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln
@@ -39,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{5ED0E794-E7DF-4C38-9510-0E3CFDF0BEFA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{88C1F3B9-B92E-4847-AF86-A437FA34382B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{94673D00-C1BB-48F3-8A1B-75DDEA247AB0}"
EndProject
@@ -137,10 +137,10 @@ Global
{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B}.Release|Any CPU.Build.0 = Release|Any CPU
- {5ED0E794-E7DF-4C38-9510-0E3CFDF0BEFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5ED0E794-E7DF-4C38-9510-0E3CFDF0BEFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5ED0E794-E7DF-4C38-9510-0E3CFDF0BEFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5ED0E794-E7DF-4C38-9510-0E3CFDF0BEFA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {88C1F3B9-B92E-4847-AF86-A437FA34382B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {88C1F3B9-B92E-4847-AF86-A437FA34382B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {88C1F3B9-B92E-4847-AF86-A437FA34382B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {88C1F3B9-B92E-4847-AF86-A437FA34382B}.Release|Any CPU.Build.0 = Release|Any CPU
{94673D00-C1BB-48F3-8A1B-75DDEA247AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{94673D00-C1BB-48F3-8A1B-75DDEA247AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{94673D00-C1BB-48F3-8A1B-75DDEA247AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -170,7 +170,7 @@ Global
{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
{A7F69E1A-D6DF-46A9-A347-66354425BC9E} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
{11D672F4-D640-423D-A79A-2A5EA498D3BF} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
- {5ED0E794-E7DF-4C38-9510-0E3CFDF0BEFA} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
+ {88C1F3B9-B92E-4847-AF86-A437FA34382B} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
{94673D00-C1BB-48F3-8A1B-75DDEA247AB0} = {C77F6550-84B5-4C20-8541-8B6118A8651A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.sln b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.sln
index ca1e1c9ba37..de9045cab35 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{EEE9E1A2-8512-4154-8B5D-532244B896CD}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{73971F14-741C-4B77-9D47-F5CE40D1B36C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{CB6528FF-88EB-402B-910C-9C64EABA0436}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{92E86957-5217-456B-B9CA-E0C204822367}"
EndProject
@@ -39,10 +39,10 @@ Global
{EEE9E1A2-8512-4154-8B5D-532244B896CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEE9E1A2-8512-4154-8B5D-532244B896CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EEE9E1A2-8512-4154-8B5D-532244B896CD}.Release|Any CPU.Build.0 = Release|Any CPU
- {73971F14-741C-4B77-9D47-F5CE40D1B36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {73971F14-741C-4B77-9D47-F5CE40D1B36C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {73971F14-741C-4B77-9D47-F5CE40D1B36C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {73971F14-741C-4B77-9D47-F5CE40D1B36C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CB6528FF-88EB-402B-910C-9C64EABA0436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CB6528FF-88EB-402B-910C-9C64EABA0436}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CB6528FF-88EB-402B-910C-9C64EABA0436}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CB6528FF-88EB-402B-910C-9C64EABA0436}.Release|Any CPU.Build.0 = Release|Any CPU
{92E86957-5217-456B-B9CA-E0C204822367}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92E86957-5217-456B-B9CA-E0C204822367}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92E86957-5217-456B-B9CA-E0C204822367}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
{711119F1-7759-49B9-8B66-EF72F4163729} = {B8E3F471-7DA8-4D1D-9468-21542AAD0A2B}
{CAA4A23C-2C58-4C93-87BA-CCC87260F20A} = {343DB133-E1E0-4FC0-896C-DA15D0C58AD5}
{EEE9E1A2-8512-4154-8B5D-532244B896CD} = {343DB133-E1E0-4FC0-896C-DA15D0C58AD5}
- {73971F14-741C-4B77-9D47-F5CE40D1B36C} = {0FE1CBCE-E173-4926-9CD1-64D7AE63A994}
+ {CB6528FF-88EB-402B-910C-9C64EABA0436} = {0FE1CBCE-E173-4926-9CD1-64D7AE63A994}
{92E86957-5217-456B-B9CA-E0C204822367} = {0FE1CBCE-E173-4926-9CD1-64D7AE63A994}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln b/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln
index 051f2ac7c60..3b3b52939f2 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln
@@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{9B21B87F-084B-411B-A513-C22B5B961BF3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{70E5410C-8839-4CBA-8999-1F393A5A57E2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{05B7F752-4991-4DC8-9B06-8269211E7817}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6E58AF2F-AB35-4279-9135-67E97BCE1432}"
EndProject
@@ -89,10 +89,10 @@ Global
{9B21B87F-084B-411B-A513-C22B5B961BF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B21B87F-084B-411B-A513-C22B5B961BF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9B21B87F-084B-411B-A513-C22B5B961BF3}.Release|Any CPU.Build.0 = Release|Any CPU
- {70E5410C-8839-4CBA-8999-1F393A5A57E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {70E5410C-8839-4CBA-8999-1F393A5A57E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {70E5410C-8839-4CBA-8999-1F393A5A57E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {70E5410C-8839-4CBA-8999-1F393A5A57E2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {05B7F752-4991-4DC8-9B06-8269211E7817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {05B7F752-4991-4DC8-9B06-8269211E7817}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {05B7F752-4991-4DC8-9B06-8269211E7817}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {05B7F752-4991-4DC8-9B06-8269211E7817}.Release|Any CPU.Build.0 = Release|Any CPU
{6E58AF2F-AB35-4279-9135-67E97BCE1432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6E58AF2F-AB35-4279-9135-67E97BCE1432}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6E58AF2F-AB35-4279-9135-67E97BCE1432}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -114,7 +114,7 @@ Global
{5177A566-05AF-4DF0-93CC-D2876F7E6EBB} = {94EEF122-C307-4BF0-88FE-263B89B59F9F}
{091844B8-A79E-4DF4-9A73-B2F01968E982} = {94EEF122-C307-4BF0-88FE-263B89B59F9F}
{9B21B87F-084B-411B-A513-C22B5B961BF3} = {94EEF122-C307-4BF0-88FE-263B89B59F9F}
- {70E5410C-8839-4CBA-8999-1F393A5A57E2} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5}
+ {05B7F752-4991-4DC8-9B06-8269211E7817} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5}
{6E58AF2F-AB35-4279-9135-67E97BCE1432} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.sln b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.sln
index bd3fd71c81d..5c2fed7e614 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.sln
@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DF2BF748-BD4D-40AD-A8D5-8969AC8DE4C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{085296E6-03AF-485A-BBF9-538E27DF269D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A}"
EndProject
@@ -101,10 +101,10 @@ Global
{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20}.Release|Any CPU.Build.0 = Release|Any CPU
- {DF2BF748-BD4D-40AD-A8D5-8969AC8DE4C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DF2BF748-BD4D-40AD-A8D5-8969AC8DE4C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DF2BF748-BD4D-40AD-A8D5-8969AC8DE4C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DF2BF748-BD4D-40AD-A8D5-8969AC8DE4C1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {085296E6-03AF-485A-BBF9-538E27DF269D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {085296E6-03AF-485A-BBF9-538E27DF269D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {085296E6-03AF-485A-BBF9-538E27DF269D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {085296E6-03AF-485A-BBF9-538E27DF269D}.Release|Any CPU.Build.0 = Release|Any CPU
{EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -128,7 +128,7 @@ Global
{9EF3E081-1D2F-40CC-B2B1-C7F05E261C21} = {F8D4BCC4-4B13-4EFC-A5AE-38C26519EDDF}
{27EB8901-D9CB-4814-8565-8D2CE564F2C8} = {F8D4BCC4-4B13-4EFC-A5AE-38C26519EDDF}
{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20} = {F8D4BCC4-4B13-4EFC-A5AE-38C26519EDDF}
- {DF2BF748-BD4D-40AD-A8D5-8969AC8DE4C1} = {24F3652F-573B-445E-8690-BE73B8F0A2C7}
+ {085296E6-03AF-485A-BBF9-538E27DF269D} = {24F3652F-573B-445E-8690-BE73B8F0A2C7}
{EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A} = {24F3652F-573B-445E-8690-BE73B8F0A2C7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.sln b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.sln
index cfbe2b3226d..25175a9e177 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.sln
@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{73CB2C25-1A22-479C-9FC0-CE65BFE272DB}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{78E7FCD7-5348-4878-AE59-6C083955A93B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{8931287A-8B13-415E-9043-2E2BB8A09F2D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{45730CA0-CC0F-4D63-8E2E-08A4414599EC}"
EndProject
@@ -101,10 +101,10 @@ Global
{73CB2C25-1A22-479C-9FC0-CE65BFE272DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73CB2C25-1A22-479C-9FC0-CE65BFE272DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73CB2C25-1A22-479C-9FC0-CE65BFE272DB}.Release|Any CPU.Build.0 = Release|Any CPU
- {78E7FCD7-5348-4878-AE59-6C083955A93B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {78E7FCD7-5348-4878-AE59-6C083955A93B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {78E7FCD7-5348-4878-AE59-6C083955A93B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {78E7FCD7-5348-4878-AE59-6C083955A93B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8931287A-8B13-415E-9043-2E2BB8A09F2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8931287A-8B13-415E-9043-2E2BB8A09F2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8931287A-8B13-415E-9043-2E2BB8A09F2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8931287A-8B13-415E-9043-2E2BB8A09F2D}.Release|Any CPU.Build.0 = Release|Any CPU
{45730CA0-CC0F-4D63-8E2E-08A4414599EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45730CA0-CC0F-4D63-8E2E-08A4414599EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45730CA0-CC0F-4D63-8E2E-08A4414599EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -128,7 +128,7 @@ Global
{618DB5A3-A158-4F25-9A81-9F35909506E6} = {D5A074D2-033F-4577-A5CC-568CAC9CC729}
{3D1CF09A-2A49-4F79-89F3-C04EC00FFC32} = {D5A074D2-033F-4577-A5CC-568CAC9CC729}
{73CB2C25-1A22-479C-9FC0-CE65BFE272DB} = {D5A074D2-033F-4577-A5CC-568CAC9CC729}
- {78E7FCD7-5348-4878-AE59-6C083955A93B} = {8F8CE472-78AF-419D-8D46-9DF1CAACD48E}
+ {8931287A-8B13-415E-9043-2E2BB8A09F2D} = {8F8CE472-78AF-419D-8D46-9DF1CAACD48E}
{45730CA0-CC0F-4D63-8E2E-08A4414599EC} = {8F8CE472-78AF-419D-8D46-9DF1CAACD48E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.sln b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.sln
index 1b918399a12..d0259194174 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.sln
@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{96F56B6D-B82D-433A-95CB-A35179529934}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{360ADB27-C53E-45CD-9F7F-A4603D8B7581}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{3064B45D-E4A3-47CC-8F7C-1635A647F738}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C57D0E23-18B5-4EAE-8E69-433171C57C01}"
EndProject
@@ -113,10 +113,10 @@ Global
{96F56B6D-B82D-433A-95CB-A35179529934}.Debug|Any CPU.Build.0 = Debug|Any CPU
{96F56B6D-B82D-433A-95CB-A35179529934}.Release|Any CPU.ActiveCfg = Release|Any CPU
{96F56B6D-B82D-433A-95CB-A35179529934}.Release|Any CPU.Build.0 = Release|Any CPU
- {360ADB27-C53E-45CD-9F7F-A4603D8B7581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {360ADB27-C53E-45CD-9F7F-A4603D8B7581}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {360ADB27-C53E-45CD-9F7F-A4603D8B7581}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {360ADB27-C53E-45CD-9F7F-A4603D8B7581}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3064B45D-E4A3-47CC-8F7C-1635A647F738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3064B45D-E4A3-47CC-8F7C-1635A647F738}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3064B45D-E4A3-47CC-8F7C-1635A647F738}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3064B45D-E4A3-47CC-8F7C-1635A647F738}.Release|Any CPU.Build.0 = Release|Any CPU
{C57D0E23-18B5-4EAE-8E69-433171C57C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C57D0E23-18B5-4EAE-8E69-433171C57C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C57D0E23-18B5-4EAE-8E69-433171C57C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -142,7 +142,7 @@ Global
{D49BC1CE-AE45-47D1-A662-9F4C0300930D} = {D55A8909-6199-44E5-A5DC-339F3FC2BF2B}
{7E4BF22A-B413-40E4-88C9-6579502B17F9} = {D55A8909-6199-44E5-A5DC-339F3FC2BF2B}
{96F56B6D-B82D-433A-95CB-A35179529934} = {D55A8909-6199-44E5-A5DC-339F3FC2BF2B}
- {360ADB27-C53E-45CD-9F7F-A4603D8B7581} = {4DFFE138-A7D8-4B2D-9FA6-B26635D29EFF}
+ {3064B45D-E4A3-47CC-8F7C-1635A647F738} = {4DFFE138-A7D8-4B2D-9FA6-B26635D29EFF}
{C57D0E23-18B5-4EAE-8E69-433171C57C01} = {4DFFE138-A7D8-4B2D-9FA6-B26635D29EFF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.sln b/src/libraries/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.sln
index 029f087d0fb..5e9017743f0 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.sln
@@ -39,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{3FAB6852-68A1-4317-B972-6B8088AB6DCF}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1E742310-B2DD-4F17-A0B0-C343C35A4D9D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{3C6E7802-EA64-4225-A695-583A1D08E3A6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{5CF9010C-D0A8-4DCA-800C-57F38FC9D159}"
EndProject
@@ -137,10 +137,10 @@ Global
{3FAB6852-68A1-4317-B972-6B8088AB6DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3FAB6852-68A1-4317-B972-6B8088AB6DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3FAB6852-68A1-4317-B972-6B8088AB6DCF}.Release|Any CPU.Build.0 = Release|Any CPU
- {1E742310-B2DD-4F17-A0B0-C343C35A4D9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1E742310-B2DD-4F17-A0B0-C343C35A4D9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1E742310-B2DD-4F17-A0B0-C343C35A4D9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1E742310-B2DD-4F17-A0B0-C343C35A4D9D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3C6E7802-EA64-4225-A695-583A1D08E3A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3C6E7802-EA64-4225-A695-583A1D08E3A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3C6E7802-EA64-4225-A695-583A1D08E3A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3C6E7802-EA64-4225-A695-583A1D08E3A6}.Release|Any CPU.Build.0 = Release|Any CPU
{5CF9010C-D0A8-4DCA-800C-57F38FC9D159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5CF9010C-D0A8-4DCA-800C-57F38FC9D159}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5CF9010C-D0A8-4DCA-800C-57F38FC9D159}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -170,7 +170,7 @@ Global
{92259CBF-FAC1-40F1-987E-DBF7631977EC} = {E562A241-4253-44F8-9E3F-2E03C4058D7B}
{F3FA11C3-612D-4F2B-9A2B-5D3FDCF1C077} = {E562A241-4253-44F8-9E3F-2E03C4058D7B}
{3FAB6852-68A1-4317-B972-6B8088AB6DCF} = {E562A241-4253-44F8-9E3F-2E03C4058D7B}
- {1E742310-B2DD-4F17-A0B0-C343C35A4D9D} = {1FEF4F42-130B-4504-A561-17191FE763C3}
+ {3C6E7802-EA64-4225-A695-583A1D08E3A6} = {1FEF4F42-130B-4504-A561-17191FE763C3}
{5CF9010C-D0A8-4DCA-800C-57F38FC9D159} = {1FEF4F42-130B-4504-A561-17191FE763C3}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln b/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
index 7571c85c60e..dafa84abe93 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
@@ -43,7 +43,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{B1723D4C-15E3-4A39-8976-C3E1740E5F00}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AC451CFA-10AE-4D49-823A-19CD184F891F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{774F9552-3770-461E-BAAA-9D50222497BA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{AFEFC5C1-C952-45EE-BCF9-DC246ADE43DF}"
EndProject
@@ -161,10 +161,10 @@ Global
{B1723D4C-15E3-4A39-8976-C3E1740E5F00}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1723D4C-15E3-4A39-8976-C3E1740E5F00}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1723D4C-15E3-4A39-8976-C3E1740E5F00}.Release|Any CPU.Build.0 = Release|Any CPU
- {AC451CFA-10AE-4D49-823A-19CD184F891F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AC451CFA-10AE-4D49-823A-19CD184F891F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AC451CFA-10AE-4D49-823A-19CD184F891F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AC451CFA-10AE-4D49-823A-19CD184F891F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {774F9552-3770-461E-BAAA-9D50222497BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {774F9552-3770-461E-BAAA-9D50222497BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {774F9552-3770-461E-BAAA-9D50222497BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {774F9552-3770-461E-BAAA-9D50222497BA}.Release|Any CPU.Build.0 = Release|Any CPU
{AFEFC5C1-C952-45EE-BCF9-DC246ADE43DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AFEFC5C1-C952-45EE-BCF9-DC246ADE43DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AFEFC5C1-C952-45EE-BCF9-DC246ADE43DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -224,7 +224,7 @@ Global
{B1723D4C-15E3-4A39-8976-C3E1740E5F00} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{BD19B1E7-CAFF-4009-874A-760D5A466E28} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{A49023C8-173A-4B8F-84B3-2FF37FE8344A} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
- {AC451CFA-10AE-4D49-823A-19CD184F891F} = {B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1}
+ {774F9552-3770-461E-BAAA-9D50222497BA} = {B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1}
{AFEFC5C1-C952-45EE-BCF9-DC246ADE43DF} = {B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1}
{CC3E9E0A-4417-4678-87CC-1D2B001C3232} = {B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1}
{701D92CA-90E0-4611-B1DF-F2D31503563F} = {B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
index 0fba435319e..53a21dc25a6 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
@@ -43,7 +43,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{BD85452C-1434-40FF-8A2C-36BF135A22FE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DF6EE118-7512-4D82-8460-F7A150A73D5D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{5C82F684-E28B-4487-9606-3AA0B6909EF7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{0243557C-E886-4392-8E9F-ECA0820E094B}"
EndProject
@@ -161,10 +161,10 @@ Global
{BD85452C-1434-40FF-8A2C-36BF135A22FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD85452C-1434-40FF-8A2C-36BF135A22FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD85452C-1434-40FF-8A2C-36BF135A22FE}.Release|Any CPU.Build.0 = Release|Any CPU
- {DF6EE118-7512-4D82-8460-F7A150A73D5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DF6EE118-7512-4D82-8460-F7A150A73D5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DF6EE118-7512-4D82-8460-F7A150A73D5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DF6EE118-7512-4D82-8460-F7A150A73D5D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5C82F684-E28B-4487-9606-3AA0B6909EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5C82F684-E28B-4487-9606-3AA0B6909EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5C82F684-E28B-4487-9606-3AA0B6909EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5C82F684-E28B-4487-9606-3AA0B6909EF7}.Release|Any CPU.Build.0 = Release|Any CPU
{0243557C-E886-4392-8E9F-ECA0820E094B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0243557C-E886-4392-8E9F-ECA0820E094B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0243557C-E886-4392-8E9F-ECA0820E094B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -224,7 +224,7 @@ Global
{BD85452C-1434-40FF-8A2C-36BF135A22FE} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
{1555B38A-E9CB-4734-AAB1-59CFB833A06D} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
- {DF6EE118-7512-4D82-8460-F7A150A73D5D} = {48CD61B8-2937-4229-8BAB-3F1167B54E61}
+ {5C82F684-E28B-4487-9606-3AA0B6909EF7} = {48CD61B8-2937-4229-8BAB-3F1167B54E61}
{0243557C-E886-4392-8E9F-ECA0820E094B} = {48CD61B8-2937-4229-8BAB-3F1167B54E61}
{C5BA84F6-C75B-4698-9733-38C67C285215} = {48CD61B8-2937-4229-8BAB-3F1167B54E61}
{D52BA380-089D-46CD-98E5-F471B9D7CCA4} = {48CD61B8-2937-4229-8BAB-3F1167B54E61}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln b/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln
index cb4562d81b8..d8ef195ff7d 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln
@@ -43,7 +43,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{84E43ED2-A2ED-49F9-B592-92270F0F2EC3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BF9A0BC8-05FE-4E14-8919-7E8BD590F94C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{03B854C7-609C-4C64-B7EA-266D65E2E548}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B9613E48-832E-496D-9788-C2304BBEAF1F}"
EndProject
@@ -157,10 +157,10 @@ Global
{84E43ED2-A2ED-49F9-B592-92270F0F2EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{84E43ED2-A2ED-49F9-B592-92270F0F2EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{84E43ED2-A2ED-49F9-B592-92270F0F2EC3}.Release|Any CPU.Build.0 = Release|Any CPU
- {BF9A0BC8-05FE-4E14-8919-7E8BD590F94C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BF9A0BC8-05FE-4E14-8919-7E8BD590F94C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BF9A0BC8-05FE-4E14-8919-7E8BD590F94C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BF9A0BC8-05FE-4E14-8919-7E8BD590F94C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {03B854C7-609C-4C64-B7EA-266D65E2E548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {03B854C7-609C-4C64-B7EA-266D65E2E548}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {03B854C7-609C-4C64-B7EA-266D65E2E548}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {03B854C7-609C-4C64-B7EA-266D65E2E548}.Release|Any CPU.Build.0 = Release|Any CPU
{B9613E48-832E-496D-9788-C2304BBEAF1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B9613E48-832E-496D-9788-C2304BBEAF1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B9613E48-832E-496D-9788-C2304BBEAF1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -212,7 +212,7 @@ Global
{84E43ED2-A2ED-49F9-B592-92270F0F2EC3} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
{A00E22C3-A552-4F4C-AF2C-813B96A54582} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
{8CBDDA63-8388-42AF-934E-7C60832A9B1C} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
- {BF9A0BC8-05FE-4E14-8919-7E8BD590F94C} = {A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9}
+ {03B854C7-609C-4C64-B7EA-266D65E2E548} = {A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9}
{B9613E48-832E-496D-9788-C2304BBEAF1F} = {A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
index 439ee6ff42b..0c9da0aa4f8 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
@@ -69,7 +69,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{F50B881E-8A70-48C3-80B0-2094F6868974}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{FE30F553-10C0-48DF-B0B6-0025729A8C6B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{D937FDF2-45B2-470B-98F0-ED57F768BC31}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{27A201BF-246A-44B2-A018-DF67C8A6DC02}"
EndProject
@@ -247,10 +247,10 @@ Global
{F50B881E-8A70-48C3-80B0-2094F6868974}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F50B881E-8A70-48C3-80B0-2094F6868974}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F50B881E-8A70-48C3-80B0-2094F6868974}.Release|Any CPU.Build.0 = Release|Any CPU
- {FE30F553-10C0-48DF-B0B6-0025729A8C6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FE30F553-10C0-48DF-B0B6-0025729A8C6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FE30F553-10C0-48DF-B0B6-0025729A8C6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FE30F553-10C0-48DF-B0B6-0025729A8C6B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D937FDF2-45B2-470B-98F0-ED57F768BC31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D937FDF2-45B2-470B-98F0-ED57F768BC31}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D937FDF2-45B2-470B-98F0-ED57F768BC31}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D937FDF2-45B2-470B-98F0-ED57F768BC31}.Release|Any CPU.Build.0 = Release|Any CPU
{27A201BF-246A-44B2-A018-DF67C8A6DC02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{27A201BF-246A-44B2-A018-DF67C8A6DC02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{27A201BF-246A-44B2-A018-DF67C8A6DC02}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -343,7 +343,7 @@ Global
{BAA953EF-6529-4F2C-8F89-C76A05258677} = {76107BEB-02C0-4A83-9631-B226340752A7}
{23F4102D-67BD-4865-BB19-195C47945733} = {76107BEB-02C0-4A83-9631-B226340752A7}
{41234DB5-1F3A-4E4A-8BD9-4A277C249666} = {76107BEB-02C0-4A83-9631-B226340752A7}
- {FE30F553-10C0-48DF-B0B6-0025729A8C6B} = {DCF01C23-85A0-4385-B480-D1276ED99A92}
+ {D937FDF2-45B2-470B-98F0-ED57F768BC31} = {DCF01C23-85A0-4385-B480-D1276ED99A92}
{27A201BF-246A-44B2-A018-DF67C8A6DC02} = {DCF01C23-85A0-4385-B480-D1276ED99A92}
{11C8AB75-D137-4A1B-85E5-1018EBFB422B} = {DCF01C23-85A0-4385-B480-D1276ED99A92}
{81104506-C075-4889-819C-F0B3D81A40A1} = {DCF01C23-85A0-4385-B480-D1276ED99A92}
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln
index 8990974912a..018bab88199 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9E3BD723-42DB-4109-9091-DB85C848E908}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B7469EEF-415C-485B-9FEC-3D9640400A7B}"
EndProject
@@ -39,10 +39,10 @@ Global
{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF}.Release|Any CPU.Build.0 = Release|Any CPU
- {9E3BD723-42DB-4109-9091-DB85C848E908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9E3BD723-42DB-4109-9091-DB85C848E908}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9E3BD723-42DB-4109-9091-DB85C848E908}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9E3BD723-42DB-4109-9091-DB85C848E908}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04}.Release|Any CPU.Build.0 = Release|Any CPU
{B7469EEF-415C-485B-9FEC-3D9640400A7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B7469EEF-415C-485B-9FEC-3D9640400A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B7469EEF-415C-485B-9FEC-3D9640400A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
{B8B63EFF-64D9-49AB-ACE9-6182DADC7574} = {C494A755-24D9-4E80-AEC3-CF8FEBAFCAC6}
{F170EDB3-E92B-456A-8749-F3ACE3471510} = {09E0C315-2A88-4F30-93DA-E22625BF82AB}
{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF} = {09E0C315-2A88-4F30-93DA-E22625BF82AB}
- {9E3BD723-42DB-4109-9091-DB85C848E908} = {BF723277-314D-45F4-B29A-6A8683860A93}
+ {DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04} = {BF723277-314D-45F4-B29A-6A8683860A93}
{B7469EEF-415C-485B-9FEC-3D9640400A7B} = {BF723277-314D-45F4-B29A-6A8683860A93}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln b/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln
index 9f9bfd54ea8..5cc2a549676 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Tests", "tests\DI.Tests\Microsoft.Extensions.DependencyInjection.Tests.csproj", "{1EE6CA66-6585-459D-8889-666D4C2D4C27}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{533E159E-A725-4C65-A588-DDD120FDD5F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FD3C8D4F-0EAA-4575-A685-F77C6D340E60}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9E5124E4-BEDA-4B2D-9699-60E2A7B1881D}"
EndProject
@@ -77,10 +77,10 @@ Global
{1EE6CA66-6585-459D-8889-666D4C2D4C27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1EE6CA66-6585-459D-8889-666D4C2D4C27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1EE6CA66-6585-459D-8889-666D4C2D4C27}.Release|Any CPU.Build.0 = Release|Any CPU
- {533E159E-A725-4C65-A588-DDD120FDD5F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {533E159E-A725-4C65-A588-DDD120FDD5F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {533E159E-A725-4C65-A588-DDD120FDD5F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {533E159E-A725-4C65-A588-DDD120FDD5F2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FD3C8D4F-0EAA-4575-A685-F77C6D340E60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FD3C8D4F-0EAA-4575-A685-F77C6D340E60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FD3C8D4F-0EAA-4575-A685-F77C6D340E60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FD3C8D4F-0EAA-4575-A685-F77C6D340E60}.Release|Any CPU.Build.0 = Release|Any CPU
{9E5124E4-BEDA-4B2D-9699-60E2A7B1881D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E5124E4-BEDA-4B2D-9699-60E2A7B1881D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E5124E4-BEDA-4B2D-9699-60E2A7B1881D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -100,7 +100,7 @@ Global
{9CD9F9EB-379C-44C1-9016-33DFEC821C76} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5}
{4532D9F9-1E0D-4A62-8038-D3454B255E86} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5}
{C5ECD02C-FA5A-4B56-9CA2-47AD8989714A} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5}
- {533E159E-A725-4C65-A588-DDD120FDD5F2} = {28065F40-B930-4A5D-95D8-A3BD5F86CE11}
+ {FD3C8D4F-0EAA-4575-A685-F77C6D340E60} = {28065F40-B930-4A5D-95D8-A3BD5F86CE11}
{9E5124E4-BEDA-4B2D-9699-60E2A7B1881D} = {28065F40-B930-4A5D-95D8-A3BD5F86CE11}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
index a6220ffc820..78079018b63 100644
--- a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
+++ b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nonentrypointassembly", "tests\nonentrypointassembly\nonentrypointassembly.csproj", "{5351C410-530D-4724-A8E6-430831E7332B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{81E7EE62-D28C-48DB-B19F-39F00822C84A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7B4B86A8-EF62-45F0-A431-05F4C11A2E0D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6F992337-EAEE-4F7A-BF3B-DDC526F054F7}"
EndProject
@@ -71,10 +71,10 @@ Global
{5351C410-530D-4724-A8E6-430831E7332B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5351C410-530D-4724-A8E6-430831E7332B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5351C410-530D-4724-A8E6-430831E7332B}.Release|Any CPU.Build.0 = Release|Any CPU
- {81E7EE62-D28C-48DB-B19F-39F00822C84A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {81E7EE62-D28C-48DB-B19F-39F00822C84A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {81E7EE62-D28C-48DB-B19F-39F00822C84A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {81E7EE62-D28C-48DB-B19F-39F00822C84A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7B4B86A8-EF62-45F0-A431-05F4C11A2E0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7B4B86A8-EF62-45F0-A431-05F4C11A2E0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7B4B86A8-EF62-45F0-A431-05F4C11A2E0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7B4B86A8-EF62-45F0-A431-05F4C11A2E0D}.Release|Any CPU.Build.0 = Release|Any CPU
{6F992337-EAEE-4F7A-BF3B-DDC526F054F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F992337-EAEE-4F7A-BF3B-DDC526F054F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F992337-EAEE-4F7A-BF3B-DDC526F054F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -119,7 +119,7 @@ Global
{5C580568-6072-4F27-B5C6-FA04556E3B98} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
{7902A0CA-E94D-4C96-A112-455A1E5E2390} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
{FA7201FE-097D-4197-BDEC-329986814D8D} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
- {81E7EE62-D28C-48DB-B19F-39F00822C84A} = {55D04C80-4A8F-40AC-967D-3FA77C814D7B}
+ {7B4B86A8-EF62-45F0-A431-05F4C11A2E0D} = {55D04C80-4A8F-40AC-967D-3FA77C814D7B}
{6F992337-EAEE-4F7A-BF3B-DDC526F054F7} = {55D04C80-4A8F-40AC-967D-3FA77C814D7B}
{240E7B1C-6D7D-4932-9598-815C2EA420AF} = {55D04C80-4A8F-40AC-967D-3FA77C814D7B}
{B4C5A0BE-3E21-4464-875C-E6EBED176EE3} = {55D04C80-4A8F-40AC-967D-3FA77C814D7B}
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Microsoft.Extensions.FileProviders.Abstractions.sln b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Microsoft.Extensions.FileProviders.Abstractions.sln
index bdeebe9886b..87ebb35424e 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Microsoft.Extensions.FileProviders.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Microsoft.Extensions.FileProviders.Abstractions.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6BC17084-3EC1-4D08-856D-C6F6EA065ED6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{D84E4D42-84EA-41B1-A689-00E964FED8DD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{4F62F683-8B2A-46EE-BC34-5CC192DE0C32}"
EndProject
@@ -39,10 +39,10 @@ Global
{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE}.Release|Any CPU.Build.0 = Release|Any CPU
- {6BC17084-3EC1-4D08-856D-C6F6EA065ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6BC17084-3EC1-4D08-856D-C6F6EA065ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6BC17084-3EC1-4D08-856D-C6F6EA065ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6BC17084-3EC1-4D08-856D-C6F6EA065ED6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D84E4D42-84EA-41B1-A689-00E964FED8DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D84E4D42-84EA-41B1-A689-00E964FED8DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D84E4D42-84EA-41B1-A689-00E964FED8DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D84E4D42-84EA-41B1-A689-00E964FED8DD}.Release|Any CPU.Build.0 = Release|Any CPU
{4F62F683-8B2A-46EE-BC34-5CC192DE0C32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4F62F683-8B2A-46EE-BC34-5CC192DE0C32}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4F62F683-8B2A-46EE-BC34-5CC192DE0C32}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
{F985DC40-F983-4464-B866-3BD17EE3B6B1} = {BE15F96C-8AA4-4F7D-9A69-9924531A6136}
{DD99D42D-60FD-45D8-9F55-BE3AE38626D0} = {D948D4F3-4232-4FEA-936D-5F554D335FEA}
{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE} = {D948D4F3-4232-4FEA-936D-5F554D335FEA}
- {6BC17084-3EC1-4D08-856D-C6F6EA065ED6} = {1EB544B8-7931-492C-BB70-82C96C195BCD}
+ {D84E4D42-84EA-41B1-A689-00E964FED8DD} = {1EB544B8-7931-492C-BB70-82C96C195BCD}
{4F62F683-8B2A-46EE-BC34-5CC192DE0C32} = {1EB544B8-7931-492C-BB70-82C96C195BCD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/Microsoft.Extensions.FileProviders.Composite.sln b/src/libraries/Microsoft.Extensions.FileProviders.Composite/Microsoft.Extensions.FileProviders.Composite.sln
index cfb7219f139..b58bfc13c34 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/Microsoft.Extensions.FileProviders.Composite.sln
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/Microsoft.Extensions.FileProviders.Composite.sln
@@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BA9792F3-FA23-457F-8974-0F6227E77AF2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{79F0E6DD-E665-4CAD-9C1D-D3570DBDA5FB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9FA8F495-A781-4D1E-8793-EB08E862AA37}"
EndProject
@@ -65,10 +65,10 @@ Global
{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3}.Release|Any CPU.Build.0 = Release|Any CPU
- {BA9792F3-FA23-457F-8974-0F6227E77AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BA9792F3-FA23-457F-8974-0F6227E77AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BA9792F3-FA23-457F-8974-0F6227E77AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BA9792F3-FA23-457F-8974-0F6227E77AF2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {79F0E6DD-E665-4CAD-9C1D-D3570DBDA5FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {79F0E6DD-E665-4CAD-9C1D-D3570DBDA5FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {79F0E6DD-E665-4CAD-9C1D-D3570DBDA5FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {79F0E6DD-E665-4CAD-9C1D-D3570DBDA5FB}.Release|Any CPU.Build.0 = Release|Any CPU
{9FA8F495-A781-4D1E-8793-EB08E862AA37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9FA8F495-A781-4D1E-8793-EB08E862AA37}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FA8F495-A781-4D1E-8793-EB08E862AA37}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -86,7 +86,7 @@ Global
{4A904B1E-5710-4D31-A734-33C734C9D989} = {998B15B4-464F-40EB-92DA-61637BE9C838}
{7A8F66B3-8D37-4D83-B54F-0955EC11F675} = {998B15B4-464F-40EB-92DA-61637BE9C838}
{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3} = {998B15B4-464F-40EB-92DA-61637BE9C838}
- {BA9792F3-FA23-457F-8974-0F6227E77AF2} = {94912E31-E514-4648-BD9F-3259A8116AC0}
+ {79F0E6DD-E665-4CAD-9C1D-D3570DBDA5FB} = {94912E31-E514-4648-BD9F-3259A8116AC0}
{9FA8F495-A781-4D1E-8793-EB08E862AA37} = {94912E31-E514-4648-BD9F-3259A8116AC0}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/Microsoft.Extensions.FileProviders.Physical.sln b/src/libraries/Microsoft.Extensions.FileProviders.Physical/Microsoft.Extensions.FileProviders.Physical.sln
index 25e91e14988..95f42bc9fac 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/Microsoft.Extensions.FileProviders.Physical.sln
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/Microsoft.Extensions.FileProviders.Physical.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{C55245FA-CAA6-43F7-917C-602E97BC8D52}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D6D15D5B-C680-4CE4-BDEF-BA58C3665662}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{9ECEF693-0104-4829-85E6-9CC81A8A0FA1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{FE431CFB-8AC4-4118-95D7-7EBE1722CB66}"
EndProject
@@ -77,10 +77,10 @@ Global
{C55245FA-CAA6-43F7-917C-602E97BC8D52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C55245FA-CAA6-43F7-917C-602E97BC8D52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C55245FA-CAA6-43F7-917C-602E97BC8D52}.Release|Any CPU.Build.0 = Release|Any CPU
- {D6D15D5B-C680-4CE4-BDEF-BA58C3665662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D6D15D5B-C680-4CE4-BDEF-BA58C3665662}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D6D15D5B-C680-4CE4-BDEF-BA58C3665662}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D6D15D5B-C680-4CE4-BDEF-BA58C3665662}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9ECEF693-0104-4829-85E6-9CC81A8A0FA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9ECEF693-0104-4829-85E6-9CC81A8A0FA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9ECEF693-0104-4829-85E6-9CC81A8A0FA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9ECEF693-0104-4829-85E6-9CC81A8A0FA1}.Release|Any CPU.Build.0 = Release|Any CPU
{FE431CFB-8AC4-4118-95D7-7EBE1722CB66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE431CFB-8AC4-4118-95D7-7EBE1722CB66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE431CFB-8AC4-4118-95D7-7EBE1722CB66}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -100,7 +100,7 @@ Global
{55A66A71-A400-4A36-9A19-9F8B549647D7} = {7DDADA4C-8D27-4582-93DD-ABE98D76B3FF}
{DBE052B4-23A7-4F40-BFFE-9604E39AAACF} = {7DDADA4C-8D27-4582-93DD-ABE98D76B3FF}
{C55245FA-CAA6-43F7-917C-602E97BC8D52} = {7DDADA4C-8D27-4582-93DD-ABE98D76B3FF}
- {D6D15D5B-C680-4CE4-BDEF-BA58C3665662} = {4A7AB018-13B5-44F7-BFF2-AE38E425BDD2}
+ {9ECEF693-0104-4829-85E6-9CC81A8A0FA1} = {4A7AB018-13B5-44F7-BFF2-AE38E425BDD2}
{FE431CFB-8AC4-4118-95D7-7EBE1722CB66} = {4A7AB018-13B5-44F7-BFF2-AE38E425BDD2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln
index c007d099164..047c8a34236 100644
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSy
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing.Tests", "tests\Microsoft.Extensions.FileSystemGlobbing.Tests.csproj", "{79B284F9-326E-4FEB-9A32-EA72A31B4B60}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7B1D4B96-174B-4222-8D9D-360CAC9B83C6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7A85F84A-4E74-471D-8F9C-3D06D5D8BD74}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{404A8198-B2DF-42AB-BA33-69509A8E0C91}"
EndProject
@@ -41,10 +41,10 @@ Global
{79B284F9-326E-4FEB-9A32-EA72A31B4B60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{79B284F9-326E-4FEB-9A32-EA72A31B4B60}.Release|Any CPU.ActiveCfg = Release|Any CPU
{79B284F9-326E-4FEB-9A32-EA72A31B4B60}.Release|Any CPU.Build.0 = Release|Any CPU
- {7B1D4B96-174B-4222-8D9D-360CAC9B83C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7B1D4B96-174B-4222-8D9D-360CAC9B83C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7B1D4B96-174B-4222-8D9D-360CAC9B83C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7B1D4B96-174B-4222-8D9D-360CAC9B83C6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7A85F84A-4E74-471D-8F9C-3D06D5D8BD74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7A85F84A-4E74-471D-8F9C-3D06D5D8BD74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7A85F84A-4E74-471D-8F9C-3D06D5D8BD74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7A85F84A-4E74-471D-8F9C-3D06D5D8BD74}.Release|Any CPU.Build.0 = Release|Any CPU
{404A8198-B2DF-42AB-BA33-69509A8E0C91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{404A8198-B2DF-42AB-BA33-69509A8E0C91}.Debug|Any CPU.Build.0 = Debug|Any CPU
{404A8198-B2DF-42AB-BA33-69509A8E0C91}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{79B284F9-326E-4FEB-9A32-EA72A31B4B60} = {7438714C-BB16-491E-8D9C-A2B7CB0EFA35}
{ECFF7A87-0D5F-4EA1-9FED-1126A51B5D55} = {4A9C0071-CAD0-4ABB-A489-04280BA258A5}
{A9547748-8B4F-450E-B0E3-CD9A1A80B319} = {AE2C386A-473E-46FF-97DB-4CB1727122BB}
- {7B1D4B96-174B-4222-8D9D-360CAC9B83C6} = {2EF45468-C4F8-4194-9720-592D0186B585}
+ {7A85F84A-4E74-471D-8F9C-3D06D5D8BD74} = {2EF45468-C4F8-4194-9720-592D0186B585}
{404A8198-B2DF-42AB-BA33-69509A8E0C91} = {2EF45468-C4F8-4194-9720-592D0186B585}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln
index 9c8a16bffca..6252df42a6f 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln
@@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{A7370C94-090B-4F79-A964-8029481D60FC}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6527A7DA-2218-4EA4-AC4C-F7950EAD7B50}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{BBDA0B2E-BC21-4B90-8704-60600A84CB35}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{984774FC-974E-422D-9C34-5DE60308EC02}"
EndProject
@@ -93,10 +93,10 @@ Global
{A7370C94-090B-4F79-A964-8029481D60FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7370C94-090B-4F79-A964-8029481D60FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7370C94-090B-4F79-A964-8029481D60FC}.Release|Any CPU.Build.0 = Release|Any CPU
- {6527A7DA-2218-4EA4-AC4C-F7950EAD7B50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6527A7DA-2218-4EA4-AC4C-F7950EAD7B50}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6527A7DA-2218-4EA4-AC4C-F7950EAD7B50}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6527A7DA-2218-4EA4-AC4C-F7950EAD7B50}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BBDA0B2E-BC21-4B90-8704-60600A84CB35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BBDA0B2E-BC21-4B90-8704-60600A84CB35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BBDA0B2E-BC21-4B90-8704-60600A84CB35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BBDA0B2E-BC21-4B90-8704-60600A84CB35}.Release|Any CPU.Build.0 = Release|Any CPU
{984774FC-974E-422D-9C34-5DE60308EC02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{984774FC-974E-422D-9C34-5DE60308EC02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{984774FC-974E-422D-9C34-5DE60308EC02}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -119,7 +119,7 @@ Global
{17917EA7-19F2-4CC0-AD52-B04AA4D254F8} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
{664450C6-102A-435A-875B-3445B3332E90} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
{A7370C94-090B-4F79-A964-8029481D60FC} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}
- {6527A7DA-2218-4EA4-AC4C-F7950EAD7B50} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}
+ {BBDA0B2E-BC21-4B90-8704-60600A84CB35} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}
{984774FC-974E-422D-9C34-5DE60308EC02} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
index 843b9a94f48..2ce1231dee2 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
@@ -127,7 +127,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{64A361E0-27B4-43F3-9BBA-3EE32D6807D4}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{501608B2-5F11-4A58-90A1-AEAC51F21615}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{EDF8F173-CFE7-40FB-8EEB-795A1DFB6D99}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D8A16E22-8BF8-49ED-A033-0150D6341282}"
EndProject
@@ -417,10 +417,10 @@ Global
{64A361E0-27B4-43F3-9BBA-3EE32D6807D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64A361E0-27B4-43F3-9BBA-3EE32D6807D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64A361E0-27B4-43F3-9BBA-3EE32D6807D4}.Release|Any CPU.Build.0 = Release|Any CPU
- {501608B2-5F11-4A58-90A1-AEAC51F21615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {501608B2-5F11-4A58-90A1-AEAC51F21615}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {501608B2-5F11-4A58-90A1-AEAC51F21615}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {501608B2-5F11-4A58-90A1-AEAC51F21615}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EDF8F173-CFE7-40FB-8EEB-795A1DFB6D99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EDF8F173-CFE7-40FB-8EEB-795A1DFB6D99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EDF8F173-CFE7-40FB-8EEB-795A1DFB6D99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EDF8F173-CFE7-40FB-8EEB-795A1DFB6D99}.Release|Any CPU.Build.0 = Release|Any CPU
{D8A16E22-8BF8-49ED-A033-0150D6341282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D8A16E22-8BF8-49ED-A033-0150D6341282}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D8A16E22-8BF8-49ED-A033-0150D6341282}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -532,7 +532,7 @@ Global
{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
{5F69DAFF-F4BC-4E29-A4FA-E96A4D55EC2D} = {694561D4-7901-4727-B87C-109C7CED0404}
{0D1BFEB4-CEF6-4319-9212-E3E7840B287A} = {694561D4-7901-4727-B87C-109C7CED0404}
- {501608B2-5F11-4A58-90A1-AEAC51F21615} = {694561D4-7901-4727-B87C-109C7CED0404}
+ {EDF8F173-CFE7-40FB-8EEB-795A1DFB6D99} = {694561D4-7901-4727-B87C-109C7CED0404}
{D8A16E22-8BF8-49ED-A033-0150D6341282} = {694561D4-7901-4727-B87C-109C7CED0404}
{5C6A1B61-B02B-46AA-8AD5-B8F61EE57453} = {694561D4-7901-4727-B87C-109C7CED0404}
{771CB4BB-4237-444E-82CE-C81A4979D89F} = {694561D4-7901-4727-B87C-109C7CED0404}
diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
index 881754f17ed..59c4f3cb384 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
@@ -123,7 +123,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{F042EF08-55E7-45A3-A1D2-BE19E896BE9F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{FCDC7714-1055-4A3B-A098-2F8E3AD23C55}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{34C7A201-C14D-4586-9903-8358EF179EAD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{11EE7722-5FA4-403C-B53B-59A154EE0267}"
EndProject
@@ -407,10 +407,10 @@ Global
{F042EF08-55E7-45A3-A1D2-BE19E896BE9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F042EF08-55E7-45A3-A1D2-BE19E896BE9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F042EF08-55E7-45A3-A1D2-BE19E896BE9F}.Release|Any CPU.Build.0 = Release|Any CPU
- {FCDC7714-1055-4A3B-A098-2F8E3AD23C55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FCDC7714-1055-4A3B-A098-2F8E3AD23C55}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FCDC7714-1055-4A3B-A098-2F8E3AD23C55}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FCDC7714-1055-4A3B-A098-2F8E3AD23C55}.Release|Any CPU.Build.0 = Release|Any CPU
+ {34C7A201-C14D-4586-9903-8358EF179EAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {34C7A201-C14D-4586-9903-8358EF179EAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {34C7A201-C14D-4586-9903-8358EF179EAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {34C7A201-C14D-4586-9903-8358EF179EAD}.Release|Any CPU.Build.0 = Release|Any CPU
{11EE7722-5FA4-403C-B53B-59A154EE0267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{11EE7722-5FA4-403C-B53B-59A154EE0267}.Debug|Any CPU.Build.0 = Debug|Any CPU
{11EE7722-5FA4-403C-B53B-59A154EE0267}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -530,7 +530,7 @@ Global
{C50BBD27-2445-4DF4-9A1D-C7919D016BBC} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
{D3A7C7B1-10DC-45E9-8678-2C964A1459D7} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
{59BC5420-D5C8-4689-8F9E-1E8AC338180E} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
- {FCDC7714-1055-4A3B-A098-2F8E3AD23C55} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
+ {34C7A201-C14D-4586-9903-8358EF179EAD} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
{11EE7722-5FA4-403C-B53B-59A154EE0267} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
{0EC461A2-083B-4E9E-AADE-935ECB15B951} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
{2CEA1741-8B0C-41F8-9CA9-B827D329261F} = {0D30E826-4EE9-4404-A74D-5255FDB76A12}
diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj
index 7db6b60f933..75dcaf58a41 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj
+++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj
@@ -8,7 +8,7 @@
<IsPackable>true</IsPackable>
<PackageDescription>.NET hosting infrastructure for Windows Services.</PackageDescription>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
index b0fccd45aa4..f28006027a5 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
@@ -127,7 +127,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{EB6CB1A4-1D66-49B8-9914-BA12B47C909F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B6CD6B30-5F64-4F36-9CF0-2014C64B8708}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C00722C2-E56B-424F-9216-FA6A91788986}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{90DD4D77-E3DC-456E-A27F-F13DA6194481}"
EndProject
@@ -417,10 +417,10 @@ Global
{EB6CB1A4-1D66-49B8-9914-BA12B47C909F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB6CB1A4-1D66-49B8-9914-BA12B47C909F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB6CB1A4-1D66-49B8-9914-BA12B47C909F}.Release|Any CPU.Build.0 = Release|Any CPU
- {B6CD6B30-5F64-4F36-9CF0-2014C64B8708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B6CD6B30-5F64-4F36-9CF0-2014C64B8708}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B6CD6B30-5F64-4F36-9CF0-2014C64B8708}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B6CD6B30-5F64-4F36-9CF0-2014C64B8708}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C00722C2-E56B-424F-9216-FA6A91788986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C00722C2-E56B-424F-9216-FA6A91788986}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C00722C2-E56B-424F-9216-FA6A91788986}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C00722C2-E56B-424F-9216-FA6A91788986}.Release|Any CPU.Build.0 = Release|Any CPU
{90DD4D77-E3DC-456E-A27F-F13DA6194481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{90DD4D77-E3DC-456E-A27F-F13DA6194481}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90DD4D77-E3DC-456E-A27F-F13DA6194481}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -532,7 +532,7 @@ Global
{0813853E-8C78-429A-B01A-3FB2EF1898F8} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
{1B235247-6666-4B62-95A4-AC043626FDEA} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
{5F6EF6F2-A742-445B-9418-682188F61130} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
- {B6CD6B30-5F64-4F36-9CF0-2014C64B8708} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
+ {C00722C2-E56B-424F-9216-FA6A91788986} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
{90DD4D77-E3DC-456E-A27F-F13DA6194481} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
{0A495D7B-44DE-4E59-8497-6CBF7C55CFA5} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
{B69B7D59-6E7D-43FC-B83F-AA481B677B06} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253}
diff --git a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
index 56be1b2f53d..5861fc469ba 100644
--- a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
+++ b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
@@ -45,7 +45,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Diagnost
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic", "..\System.Net.Quic\ref\System.Net.Quic.csproj", "{C04D08A3-196A-4ACF-983A-316B7ADF1D05}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{570C35EF-7D57-499C-A253-350708F144BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{083B8368-1518-40DE-904F-CD028C8E21F1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{167FDAED-3220-4516-AC8F-C506F593896D}"
EndProject
@@ -155,10 +155,10 @@ Global
{C04D08A3-196A-4ACF-983A-316B7ADF1D05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C04D08A3-196A-4ACF-983A-316B7ADF1D05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C04D08A3-196A-4ACF-983A-316B7ADF1D05}.Release|Any CPU.Build.0 = Release|Any CPU
- {570C35EF-7D57-499C-A253-350708F144BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {570C35EF-7D57-499C-A253-350708F144BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {570C35EF-7D57-499C-A253-350708F144BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {570C35EF-7D57-499C-A253-350708F144BB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {083B8368-1518-40DE-904F-CD028C8E21F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {083B8368-1518-40DE-904F-CD028C8E21F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {083B8368-1518-40DE-904F-CD028C8E21F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {083B8368-1518-40DE-904F-CD028C8E21F1}.Release|Any CPU.Build.0 = Release|Any CPU
{167FDAED-3220-4516-AC8F-C506F593896D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{167FDAED-3220-4516-AC8F-C506F593896D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{167FDAED-3220-4516-AC8F-C506F593896D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -191,7 +191,7 @@ Global
{1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
{2F7292AF-429F-4888-B938-B6615F06E838} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
{136C7622-75EE-4C95-9642-DAD4A5392274} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
- {570C35EF-7D57-499C-A253-350708F144BB} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
+ {083B8368-1518-40DE-904F-CD028C8E21F1} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
{167FDAED-3220-4516-AC8F-C506F593896D} = {D1CE7D63-2182-40E3-83E0-618DA3770779}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln b/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln
index c94c0155b77..46c0a9afbe5 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Loggin
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests", "tests\Microsoft.Extensions.Logging.Generators.Tests\Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj", "{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B4C84174-9BAE-4C59-B0D5-0AA7E80BE0CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{852D4E16-58C3-47C2-A6BC-A5B12B37209F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6645D0C4-83D1-4426-B9CD-67096CB7A60F}"
EndProject
@@ -59,10 +59,10 @@ Global
{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B}.Release|Any CPU.Build.0 = Release|Any CPU
- {B4C84174-9BAE-4C59-B0D5-0AA7E80BE0CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B4C84174-9BAE-4C59-B0D5-0AA7E80BE0CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B4C84174-9BAE-4C59-B0D5-0AA7E80BE0CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B4C84174-9BAE-4C59-B0D5-0AA7E80BE0CE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {852D4E16-58C3-47C2-A6BC-A5B12B37209F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {852D4E16-58C3-47C2-A6BC-A5B12B37209F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {852D4E16-58C3-47C2-A6BC-A5B12B37209F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {852D4E16-58C3-47C2-A6BC-A5B12B37209F}.Release|Any CPU.Build.0 = Release|Any CPU
{6645D0C4-83D1-4426-B9CD-67096CB7A60F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6645D0C4-83D1-4426-B9CD-67096CB7A60F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6645D0C4-83D1-4426-B9CD-67096CB7A60F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -77,7 +77,7 @@ Global
{1CB869A7-2EEC-4A53-9C33-DF9E0C75825B} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}
{1491B9C9-955D-4DB0-B1D5-70137A78EAAE} = {03F31CEE-D63E-4E7F-949F-139B33DC3385}
{A5439E79-96D6-4F02-8DD0-23DFF979851D} = {03F31CEE-D63E-4E7F-949F-139B33DC3385}
- {B4C84174-9BAE-4C59-B0D5-0AA7E80BE0CE} = {03F31CEE-D63E-4E7F-949F-139B33DC3385}
+ {852D4E16-58C3-47C2-A6BC-A5B12B37209F} = {03F31CEE-D63E-4E7F-949F-139B33DC3385}
{6645D0C4-83D1-4426-B9CD-67096CB7A60F} = {03F31CEE-D63E-4E7F-949F-139B33DC3385}
{7F536552-0E2A-4642-B7CF-863727C2F9CD} = {7631380A-FB73-4241-9987-0891A21E9769}
{75C579F7-F20B-41F1-8CAF-641DE7ADA4EE} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln b/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln
index 576a25b7de6..01f9867ecd5 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln
@@ -55,7 +55,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Diagnost
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{B077F55F-E15A-4B91-A1EB-8178B8313908}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{414EFABE-3D9D-4166-B0AA-E5D36B7E53CD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4531AA3F-D0FC-4C1F-BF54-71E0D29CBA16}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{5D09D653-A257-4673-810F-6157486964F4}"
EndProject
@@ -183,10 +183,10 @@ Global
{B077F55F-E15A-4B91-A1EB-8178B8313908}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B077F55F-E15A-4B91-A1EB-8178B8313908}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B077F55F-E15A-4B91-A1EB-8178B8313908}.Release|Any CPU.Build.0 = Release|Any CPU
- {414EFABE-3D9D-4166-B0AA-E5D36B7E53CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {414EFABE-3D9D-4166-B0AA-E5D36B7E53CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {414EFABE-3D9D-4166-B0AA-E5D36B7E53CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {414EFABE-3D9D-4166-B0AA-E5D36B7E53CD}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4531AA3F-D0FC-4C1F-BF54-71E0D29CBA16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4531AA3F-D0FC-4C1F-BF54-71E0D29CBA16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4531AA3F-D0FC-4C1F-BF54-71E0D29CBA16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4531AA3F-D0FC-4C1F-BF54-71E0D29CBA16}.Release|Any CPU.Build.0 = Release|Any CPU
{5D09D653-A257-4673-810F-6157486964F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D09D653-A257-4673-810F-6157486964F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D09D653-A257-4673-810F-6157486964F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -224,7 +224,7 @@ Global
{B077F55F-E15A-4B91-A1EB-8178B8313908} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
{77AA759E-5BF0-4C86-91EB-2A33263553EC} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
{A5BA71C3-A03C-43F7-B48E-96C301E87691} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
- {414EFABE-3D9D-4166-B0AA-E5D36B7E53CD} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
+ {4531AA3F-D0FC-4C1F-BF54-71E0D29CBA16} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
{5D09D653-A257-4673-810F-6157486964F4} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln b/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln
index 670ec78c59a..67788806cab 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln
@@ -63,7 +63,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Diagnost
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{0B0E7B5D-5F95-4E32-BBBA-E9DF82BCC772}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{17C4DD18-64B1-43FF-89A2-1D5EBFD4202E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{83BADB4A-BD97-4121-B0B8-78BD3E3A352A}"
EndProject
@@ -221,10 +221,10 @@ Global
{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}.Release|Any CPU.Build.0 = Release|Any CPU
- {0B0E7B5D-5F95-4E32-BBBA-E9DF82BCC772}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0B0E7B5D-5F95-4E32-BBBA-E9DF82BCC772}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0B0E7B5D-5F95-4E32-BBBA-E9DF82BCC772}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0B0E7B5D-5F95-4E32-BBBA-E9DF82BCC772}.Release|Any CPU.Build.0 = Release|Any CPU
+ {17C4DD18-64B1-43FF-89A2-1D5EBFD4202E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {17C4DD18-64B1-43FF-89A2-1D5EBFD4202E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {17C4DD18-64B1-43FF-89A2-1D5EBFD4202E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {17C4DD18-64B1-43FF-89A2-1D5EBFD4202E}.Release|Any CPU.Build.0 = Release|Any CPU
{83BADB4A-BD97-4121-B0B8-78BD3E3A352A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83BADB4A-BD97-4121-B0B8-78BD3E3A352A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83BADB4A-BD97-4121-B0B8-78BD3E3A352A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -294,7 +294,7 @@ Global
{C9F3D8F9-8646-432E-82FC-2E4E8411CFFE} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
{424A18FB-010E-4B03-B1E7-6747E1C5E31E} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
{2ECBDD0B-43A8-408E-B770-878F64620915} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
- {0B0E7B5D-5F95-4E32-BBBA-E9DF82BCC772} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
+ {17C4DD18-64B1-43FF-89A2-1D5EBFD4202E} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
{83BADB4A-BD97-4121-B0B8-78BD3E3A352A} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
{A276A0DD-B092-455B-90A7-6EE82BFF4C4B} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
{F26A20A7-F0B2-4410-972C-15DACEEBDB8C} = {561502B1-98F5-40E0-B9D5-0F720E88E657}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj
index ded0856d513..873941da0e6 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj
@@ -9,7 +9,7 @@
<!-- Use targeting pack references instead of granular ones in the project file. -->
<DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<IsPackable>true</IsPackable>
<PackageDescription>Console logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
</PropertyGroup>
@@ -42,7 +42,7 @@
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\StringSyntaxAttribute.cs" />
</ItemGroup>
-
+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj" />
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln b/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln
index 7458a1368a8..79d565a60b9 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln
@@ -39,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Diagnost
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{535FBBF7-6933-4E24-BDFA-86B22164CDF5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{04FB7C63-ACEF-41F4-98E4-35F5635B4D73}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{635C575E-2759-4F37-A7CA-2A51BDCC84C5}"
EndProject
@@ -135,10 +135,10 @@ Global
{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}.Release|Any CPU.Build.0 = Release|Any CPU
- {535FBBF7-6933-4E24-BDFA-86B22164CDF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {535FBBF7-6933-4E24-BDFA-86B22164CDF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {535FBBF7-6933-4E24-BDFA-86B22164CDF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {535FBBF7-6933-4E24-BDFA-86B22164CDF5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {04FB7C63-ACEF-41F4-98E4-35F5635B4D73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {04FB7C63-ACEF-41F4-98E4-35F5635B4D73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {04FB7C63-ACEF-41F4-98E4-35F5635B4D73}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {04FB7C63-ACEF-41F4-98E4-35F5635B4D73}.Release|Any CPU.Build.0 = Release|Any CPU
{635C575E-2759-4F37-A7CA-2A51BDCC84C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{635C575E-2759-4F37-A7CA-2A51BDCC84C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{635C575E-2759-4F37-A7CA-2A51BDCC84C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -168,7 +168,7 @@ Global
{A3AE4326-5EB6-454C-8276-93B1E5FA5A84} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
{6D60A144-E901-4BCB-8DE6-148B56157771} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
{B974A465-1912-4E4A-ADA6-B2BAF9DDE89D} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
- {535FBBF7-6933-4E24-BDFA-86B22164CDF5} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
+ {04FB7C63-ACEF-41F4-98E4-35F5635B4D73} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
{635C575E-2759-4F37-A7CA-2A51BDCC84C5} = {B1578203-268C-45C3-B62C-3D5CFC340AB4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln b/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln
index d021258bc38..2c2e4faec0c 100644
--- a/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln
@@ -47,7 +47,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{E266D70D-9B9E-485D-B739-87E1DD31D11D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{64A3B2A6-588B-496A-8A42-8A2BD00017E9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7D8210EC-014D-4901-97D4-0C8AC919804E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{82D7CA6B-8647-49A1-B4A1-40A8C6B9D7C2}"
EndProject
@@ -163,10 +163,10 @@ Global
{E266D70D-9B9E-485D-B739-87E1DD31D11D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E266D70D-9B9E-485D-B739-87E1DD31D11D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E266D70D-9B9E-485D-B739-87E1DD31D11D}.Release|Any CPU.Build.0 = Release|Any CPU
- {64A3B2A6-588B-496A-8A42-8A2BD00017E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {64A3B2A6-588B-496A-8A42-8A2BD00017E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {64A3B2A6-588B-496A-8A42-8A2BD00017E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {64A3B2A6-588B-496A-8A42-8A2BD00017E9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7D8210EC-014D-4901-97D4-0C8AC919804E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7D8210EC-014D-4901-97D4-0C8AC919804E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7D8210EC-014D-4901-97D4-0C8AC919804E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7D8210EC-014D-4901-97D4-0C8AC919804E}.Release|Any CPU.Build.0 = Release|Any CPU
{82D7CA6B-8647-49A1-B4A1-40A8C6B9D7C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{82D7CA6B-8647-49A1-B4A1-40A8C6B9D7C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82D7CA6B-8647-49A1-B4A1-40A8C6B9D7C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -210,7 +210,7 @@ Global
{204919F3-8E5C-4D4D-9E3B-ADFB1E453972} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
{2F5646F6-8247-42E5-ACF5-8732ACB7067A} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
{AA692D58-2C6C-4307-A13F-0884B6164026} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
- {64A3B2A6-588B-496A-8A42-8A2BD00017E9} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
+ {7D8210EC-014D-4901-97D4-0C8AC919804E} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
{82D7CA6B-8647-49A1-B4A1-40A8C6B9D7C2} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln b/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln
index 881aa0ea1f3..2421780a60f 100644
--- a/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln
@@ -43,7 +43,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Diagnost
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{23F45D4C-4E33-4334-A5BF-D34E24165E0B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{0257FBE8-330E-4B1F-8546-DF554DADB6F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{05F7A599-FAFB-4F24-ABB5-548219FF6492}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{F722EACC-BB4F-4A88-B833-BB931E20CFCD}"
EndProject
@@ -161,10 +161,10 @@ Global
{23F45D4C-4E33-4334-A5BF-D34E24165E0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23F45D4C-4E33-4334-A5BF-D34E24165E0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23F45D4C-4E33-4334-A5BF-D34E24165E0B}.Release|Any CPU.Build.0 = Release|Any CPU
- {0257FBE8-330E-4B1F-8546-DF554DADB6F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0257FBE8-330E-4B1F-8546-DF554DADB6F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0257FBE8-330E-4B1F-8546-DF554DADB6F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0257FBE8-330E-4B1F-8546-DF554DADB6F6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {05F7A599-FAFB-4F24-ABB5-548219FF6492}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {05F7A599-FAFB-4F24-ABB5-548219FF6492}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {05F7A599-FAFB-4F24-ABB5-548219FF6492}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {05F7A599-FAFB-4F24-ABB5-548219FF6492}.Release|Any CPU.Build.0 = Release|Any CPU
{F722EACC-BB4F-4A88-B833-BB931E20CFCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F722EACC-BB4F-4A88-B833-BB931E20CFCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F722EACC-BB4F-4A88-B833-BB931E20CFCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -224,7 +224,7 @@ Global
{5A956452-F322-4C4F-8689-D2B425764293} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
{332D5122-9FA6-41D5-ACDC-9EF680961C31} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
{9E6D88B5-926D-494D-BC52-A429EFBF419F} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
- {0257FBE8-330E-4B1F-8546-DF554DADB6F6} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
+ {05F7A599-FAFB-4F24-ABB5-548219FF6492} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
{F722EACC-BB4F-4A88-B833-BB931E20CFCD} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
{62AECDFA-699B-41B0-AE5F-4B7D5D8F26B1} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
{4280A906-80BD-406D-A591-B3C58B2BD72C} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405}
diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln b/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln
index 50d11ff624f..bb5fb423c72 100644
--- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln
@@ -39,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Diagnost
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{D72BF608-9C7C-41BE-9288-22BA49AF954F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{26C7C958-9C73-46BA-9FAD-FC1AD28BF7C9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{F5F7EA6D-5CBB-4711-8B79-17AF857DE2AC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{4559571A-68B4-40DD-B22F-76D6E06683EB}"
EndProject
@@ -135,10 +135,10 @@ Global
{D72BF608-9C7C-41BE-9288-22BA49AF954F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D72BF608-9C7C-41BE-9288-22BA49AF954F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D72BF608-9C7C-41BE-9288-22BA49AF954F}.Release|Any CPU.Build.0 = Release|Any CPU
- {26C7C958-9C73-46BA-9FAD-FC1AD28BF7C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {26C7C958-9C73-46BA-9FAD-FC1AD28BF7C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {26C7C958-9C73-46BA-9FAD-FC1AD28BF7C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {26C7C958-9C73-46BA-9FAD-FC1AD28BF7C9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F5F7EA6D-5CBB-4711-8B79-17AF857DE2AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F5F7EA6D-5CBB-4711-8B79-17AF857DE2AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F5F7EA6D-5CBB-4711-8B79-17AF857DE2AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F5F7EA6D-5CBB-4711-8B79-17AF857DE2AC}.Release|Any CPU.Build.0 = Release|Any CPU
{4559571A-68B4-40DD-B22F-76D6E06683EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4559571A-68B4-40DD-B22F-76D6E06683EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4559571A-68B4-40DD-B22F-76D6E06683EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -168,7 +168,7 @@ Global
{D72BF608-9C7C-41BE-9288-22BA49AF954F} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
{B3511D68-4F4C-4632-B993-649BCF73DE46} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
{D9B7AD79-A748-4D4F-9CF8-AB65D848085D} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
- {26C7C958-9C73-46BA-9FAD-FC1AD28BF7C9} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
+ {F5F7EA6D-5CBB-4711-8B79-17AF857DE2AC} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
{4559571A-68B4-40DD-B22F-76D6E06683EB} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
index 9410183e4ef..e48488058a0 100644
--- a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
+++ b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
@@ -105,7 +105,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9674CC3E-22FA-4CE5-BA42-26F6D3687057}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7268FF18-CAB4-4BC8-A767-161033C9D0BB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{2CBBB613-7A47-495A-839D-76824F6C2100}"
EndProject
@@ -351,10 +351,10 @@ Global
{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660}.Release|Any CPU.Build.0 = Release|Any CPU
- {9674CC3E-22FA-4CE5-BA42-26F6D3687057}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9674CC3E-22FA-4CE5-BA42-26F6D3687057}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9674CC3E-22FA-4CE5-BA42-26F6D3687057}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9674CC3E-22FA-4CE5-BA42-26F6D3687057}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7268FF18-CAB4-4BC8-A767-161033C9D0BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7268FF18-CAB4-4BC8-A767-161033C9D0BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7268FF18-CAB4-4BC8-A767-161033C9D0BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7268FF18-CAB4-4BC8-A767-161033C9D0BB}.Release|Any CPU.Build.0 = Release|Any CPU
{2CBBB613-7A47-495A-839D-76824F6C2100}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2CBBB613-7A47-495A-839D-76824F6C2100}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2CBBB613-7A47-495A-839D-76824F6C2100}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -455,7 +455,7 @@ Global
{34C22E86-B0A3-457D-B8D9-7CF47AAF2570} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
{765ABDD6-8C3B-4CD8-9DAC-BE9DAB674726} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
{95CB49D4-0754-49C6-8E97-868626614390} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
- {9674CC3E-22FA-4CE5-BA42-26F6D3687057} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
+ {7268FF18-CAB4-4BC8-A767-161033C9D0BB} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
{2CBBB613-7A47-495A-839D-76824F6C2100} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
{C1557157-7D8E-43A3-89D1-9F4F2621D838} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
{D8001B54-0361-40B9-A094-13063C5CF9A3} = {BCF59319-979C-42FA-9B5E-19EFCC91D288}
diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln
index 35e1012639b..983ef9d9e6b 100644
--- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln
+++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln
@@ -39,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{616C55BF-AE90-47F2-A005-980CADDBD990}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{08E60BE4-771F-4873-B7EF-7D8F7BA31F26}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{69B3A343-3883-4F35-8B8A-2A126A9B0762}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C}"
EndProject
@@ -137,10 +137,10 @@ Global
{616C55BF-AE90-47F2-A005-980CADDBD990}.Debug|Any CPU.Build.0 = Debug|Any CPU
{616C55BF-AE90-47F2-A005-980CADDBD990}.Release|Any CPU.ActiveCfg = Release|Any CPU
{616C55BF-AE90-47F2-A005-980CADDBD990}.Release|Any CPU.Build.0 = Release|Any CPU
- {08E60BE4-771F-4873-B7EF-7D8F7BA31F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {08E60BE4-771F-4873-B7EF-7D8F7BA31F26}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {08E60BE4-771F-4873-B7EF-7D8F7BA31F26}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {08E60BE4-771F-4873-B7EF-7D8F7BA31F26}.Release|Any CPU.Build.0 = Release|Any CPU
+ {69B3A343-3883-4F35-8B8A-2A126A9B0762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {69B3A343-3883-4F35-8B8A-2A126A9B0762}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {69B3A343-3883-4F35-8B8A-2A126A9B0762}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {69B3A343-3883-4F35-8B8A-2A126A9B0762}.Release|Any CPU.Build.0 = Release|Any CPU
{9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -170,7 +170,7 @@ Global
{4E761C7D-24C5-430B-AD84-1634164C6AF4} = {E6347567-2D24-4E99-8F15-3657FF95AB6D}
{AAB799C3-8D63-4334-A9AE-D645EC848174} = {E6347567-2D24-4E99-8F15-3657FF95AB6D}
{616C55BF-AE90-47F2-A005-980CADDBD990} = {E6347567-2D24-4E99-8F15-3657FF95AB6D}
- {08E60BE4-771F-4873-B7EF-7D8F7BA31F26} = {F4006304-5C88-478E-A93C-621D71A5097F}
+ {69B3A343-3883-4F35-8B8A-2A126A9B0762} = {F4006304-5C88-478E-A93C-621D71A5097F}
{9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C} = {F4006304-5C88-478E-A93C-621D71A5097F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln
index a5f040f8a6b..961432b2f8c 100644
--- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln
+++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{065B4B16-B618-41D8-B1DE-F31AFC9E6C84}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{63AE2BB8-FF71-464E-A53E-92C7560517DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{47E4AB7D-BC64-4323-B723-CD2B7DA9BB88}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{BBFDDC90-8F98-4DD7-8A18-8E2345C18904}"
EndProject
@@ -75,10 +75,10 @@ Global
{065B4B16-B618-41D8-B1DE-F31AFC9E6C84}.Debug|Any CPU.Build.0 = Debug|Any CPU
{065B4B16-B618-41D8-B1DE-F31AFC9E6C84}.Release|Any CPU.ActiveCfg = Release|Any CPU
{065B4B16-B618-41D8-B1DE-F31AFC9E6C84}.Release|Any CPU.Build.0 = Release|Any CPU
- {63AE2BB8-FF71-464E-A53E-92C7560517DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {63AE2BB8-FF71-464E-A53E-92C7560517DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {63AE2BB8-FF71-464E-A53E-92C7560517DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {63AE2BB8-FF71-464E-A53E-92C7560517DA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {47E4AB7D-BC64-4323-B723-CD2B7DA9BB88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {47E4AB7D-BC64-4323-B723-CD2B7DA9BB88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {47E4AB7D-BC64-4323-B723-CD2B7DA9BB88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {47E4AB7D-BC64-4323-B723-CD2B7DA9BB88}.Release|Any CPU.Build.0 = Release|Any CPU
{BBFDDC90-8F98-4DD7-8A18-8E2345C18904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BBFDDC90-8F98-4DD7-8A18-8E2345C18904}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BBFDDC90-8F98-4DD7-8A18-8E2345C18904}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -98,7 +98,7 @@ Global
{9022313F-BEEA-426E-8185-096E0516D1B6} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6}
{72D4F48A-A93B-471F-B9C7-64BC9BF22A09} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6}
{065B4B16-B618-41D8-B1DE-F31AFC9E6C84} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6}
- {63AE2BB8-FF71-464E-A53E-92C7560517DA} = {5B543880-D43D-48B8-9C46-CEE391D03B73}
+ {47E4AB7D-BC64-4323-B723-CD2B7DA9BB88} = {5B543880-D43D-48B8-9C46-CEE391D03B73}
{BBFDDC90-8F98-4DD7-8A18-8E2345C18904} = {5B543880-D43D-48B8-9C46-CEE391D03B73}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
index 1678eb6c938..37f610c961a 100644
--- a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
+++ b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
@@ -127,7 +127,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{C88CD350-8273-454E-825B-720DFFA5AE05}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{20A8DB98-FDD3-49FE-AC28-A5B21F7F6EC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{02425B61-8D98-4F4A-88AE-F77D4837DF9E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E0460280-2F49-474C-862D-1787D9244CC8}"
EndProject
@@ -417,10 +417,10 @@ Global
{C88CD350-8273-454E-825B-720DFFA5AE05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C88CD350-8273-454E-825B-720DFFA5AE05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C88CD350-8273-454E-825B-720DFFA5AE05}.Release|Any CPU.Build.0 = Release|Any CPU
- {20A8DB98-FDD3-49FE-AC28-A5B21F7F6EC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {20A8DB98-FDD3-49FE-AC28-A5B21F7F6EC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {20A8DB98-FDD3-49FE-AC28-A5B21F7F6EC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {20A8DB98-FDD3-49FE-AC28-A5B21F7F6EC0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {02425B61-8D98-4F4A-88AE-F77D4837DF9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {02425B61-8D98-4F4A-88AE-F77D4837DF9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {02425B61-8D98-4F4A-88AE-F77D4837DF9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {02425B61-8D98-4F4A-88AE-F77D4837DF9E}.Release|Any CPU.Build.0 = Release|Any CPU
{E0460280-2F49-474C-862D-1787D9244CC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E0460280-2F49-474C-862D-1787D9244CC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E0460280-2F49-474C-862D-1787D9244CC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -532,7 +532,7 @@ Global
{D7CEC738-5D2D-4FCB-9268-9650EB01BF31} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
{39EE5D71-77C5-4633-A47F-1062172FD121} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
{8A4E7CB4-9983-4B7F-BED9-7A94BAC7CA07} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
- {20A8DB98-FDD3-49FE-AC28-A5B21F7F6EC0} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
+ {02425B61-8D98-4F4A-88AE-F77D4837DF9E} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
{E0460280-2F49-474C-862D-1787D9244CC8} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
{B5F25A78-B7FB-460B-9B71-BE82D22923FD} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
{E06CE29E-15EB-4C0E-97B7-4367FFEDD98D} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}
diff --git a/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln b/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln
index c183c808a45..174f95f5aea 100644
--- a/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln
+++ b/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives.Tests", "tests\Microsoft.Extensions.Primitives.Tests.csproj", "{43DBAD84-A865-4F5F-AB76-7F3EB6784E99}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{EA783DDB-3B64-494F-B55C-9C31A9BAAB8C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{87AA8A4F-2785-4E1D-BAB2-3C6414C8D387}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{959348BC-2D38-41F4-9F3D-2E1CD18D9477}"
EndProject
@@ -41,10 +41,10 @@ Global
{43DBAD84-A865-4F5F-AB76-7F3EB6784E99}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43DBAD84-A865-4F5F-AB76-7F3EB6784E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43DBAD84-A865-4F5F-AB76-7F3EB6784E99}.Release|Any CPU.Build.0 = Release|Any CPU
- {EA783DDB-3B64-494F-B55C-9C31A9BAAB8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EA783DDB-3B64-494F-B55C-9C31A9BAAB8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EA783DDB-3B64-494F-B55C-9C31A9BAAB8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EA783DDB-3B64-494F-B55C-9C31A9BAAB8C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {87AA8A4F-2785-4E1D-BAB2-3C6414C8D387}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {87AA8A4F-2785-4E1D-BAB2-3C6414C8D387}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {87AA8A4F-2785-4E1D-BAB2-3C6414C8D387}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {87AA8A4F-2785-4E1D-BAB2-3C6414C8D387}.Release|Any CPU.Build.0 = Release|Any CPU
{959348BC-2D38-41F4-9F3D-2E1CD18D9477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{959348BC-2D38-41F4-9F3D-2E1CD18D9477}.Debug|Any CPU.Build.0 = Debug|Any CPU
{959348BC-2D38-41F4-9F3D-2E1CD18D9477}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{43DBAD84-A865-4F5F-AB76-7F3EB6784E99} = {76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3}
{EF75497C-6CB7-4471-980A-619EA1AB8CF6} = {9BF048D0-411D-4C2A-8C32-3A3255501D27}
{09E28D94-B771-48EB-800C-5A80C2C0055C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61}
- {EA783DDB-3B64-494F-B55C-9C31A9BAAB8C} = {069D6714-DE43-45C4-BABC-C8246B974CA7}
+ {87AA8A4F-2785-4E1D-BAB2-3C6414C8D387} = {069D6714-DE43-45C4-BABC-C8246B974CA7}
{959348BC-2D38-41F4-9F3D-2E1CD18D9477} = {069D6714-DE43-45C4-BABC-C8246B974CA7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln b/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln
index cbf9817a7a7..a73a17861a8 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln
+++ b/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NETCore.Platforms
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NETCore.Platforms.Tests", "tests\Microsoft.NETCore.Platforms.Tests.csproj", "{0C60F372-5C73-4BFA-9B91-5659C88F9750}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{06D5AA6A-A473-4A9B-A4CC-34277654C45F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{45449066-3A31-43E5-B705-20D667080A23}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{2E3568B1-EC27-4F02-BC0E-71DD3FD7735B}"
EndProject
@@ -33,10 +33,10 @@ Global
{0C60F372-5C73-4BFA-9B91-5659C88F9750}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C60F372-5C73-4BFA-9B91-5659C88F9750}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0C60F372-5C73-4BFA-9B91-5659C88F9750}.Release|Any CPU.Build.0 = Release|Any CPU
- {06D5AA6A-A473-4A9B-A4CC-34277654C45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {06D5AA6A-A473-4A9B-A4CC-34277654C45F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {06D5AA6A-A473-4A9B-A4CC-34277654C45F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {06D5AA6A-A473-4A9B-A4CC-34277654C45F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {45449066-3A31-43E5-B705-20D667080A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {45449066-3A31-43E5-B705-20D667080A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {45449066-3A31-43E5-B705-20D667080A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {45449066-3A31-43E5-B705-20D667080A23}.Release|Any CPU.Build.0 = Release|Any CPU
{2E3568B1-EC27-4F02-BC0E-71DD3FD7735B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E3568B1-EC27-4F02-BC0E-71DD3FD7735B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E3568B1-EC27-4F02-BC0E-71DD3FD7735B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -49,7 +49,7 @@ Global
{39BCA125-321F-490F-AD4E-28DCB4406969} = {E4827496-6F39-4CA0-8F4A-ACDE9DFEBE5C}
{0C60F372-5C73-4BFA-9B91-5659C88F9750} = {E4827496-6F39-4CA0-8F4A-ACDE9DFEBE5C}
{BFFF96CC-06AA-4291-9F93-3E77F23DBB11} = {F96FBD24-3BB3-4D02-9884-4D90F94DD3C0}
- {06D5AA6A-A473-4A9B-A4CC-34277654C45F} = {E8010E1D-FDAF-481D-AA34-3B115B667E4B}
+ {45449066-3A31-43E5-B705-20D667080A23} = {E8010E1D-FDAF-481D-AA34-3B115B667E4B}
{2E3568B1-EC27-4F02-BC0E-71DD3FD7735B} = {E8010E1D-FDAF-481D-AA34-3B115B667E4B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
index 18a3a1bc295..921838fe7ab 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
+++ b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
@@ -7,7 +7,7 @@ Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Microsoft.VisualBasic.Core"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualBasic.Core.Tests", "tests\Microsoft.VisualBasic.Core.Tests.csproj", "{476C0AEB-48CB-4978-9D35-06AA49F800B9}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{87BEF7AB-0679-4526-900E-6514F0C6F86C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{18CE2A0D-C20E-42E5-9845-A934A5073529}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{DD515FA9-D026-4B9B-9456-2D174634C12D}"
EndProject
@@ -45,10 +45,10 @@ Global
{476C0AEB-48CB-4978-9D35-06AA49F800B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{476C0AEB-48CB-4978-9D35-06AA49F800B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{476C0AEB-48CB-4978-9D35-06AA49F800B9}.Release|Any CPU.Build.0 = Release|Any CPU
- {87BEF7AB-0679-4526-900E-6514F0C6F86C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {87BEF7AB-0679-4526-900E-6514F0C6F86C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {87BEF7AB-0679-4526-900E-6514F0C6F86C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {87BEF7AB-0679-4526-900E-6514F0C6F86C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {18CE2A0D-C20E-42E5-9845-A934A5073529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {18CE2A0D-C20E-42E5-9845-A934A5073529}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {18CE2A0D-C20E-42E5-9845-A934A5073529}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {18CE2A0D-C20E-42E5-9845-A934A5073529}.Release|Any CPU.Build.0 = Release|Any CPU
{DD515FA9-D026-4B9B-9456-2D174634C12D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DD515FA9-D026-4B9B-9456-2D174634C12D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DD515FA9-D026-4B9B-9456-2D174634C12D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +72,7 @@ Global
{744F821F-99E9-4FF5-A84A-85432CC77548} = {3BC7B60B-4BE3-4D6F-8C03-8D6BDACC845E}
{E741B977-6B3F-4DA7-A22B-251A1B3E42F7} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483}
{30CC7F8D-60DB-49C5-BE59-81477BFE0376} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483}
- {87BEF7AB-0679-4526-900E-6514F0C6F86C} = {037CA0A6-EB43-4A49-A854-E13AE7B8972D}
+ {18CE2A0D-C20E-42E5-9845-A934A5073529} = {037CA0A6-EB43-4A49-A854-E13AE7B8972D}
{DD515FA9-D026-4B9B-9456-2D174634C12D} = {037CA0A6-EB43-4A49-A854-E13AE7B8972D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
index 76a84df0bcb..cf103d3b554 100644
--- a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
+++ b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{5F4ABB4F-CE69-47B7-860F-40B0DA68A7DB}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D0CB9D68-8D84-4C58-AF1B-A515960E97E0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{5918B01B-FCAE-4321-8DCA-44466A57C04E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{EE5972A3-AD58-430B-ACEB-4F608FD1C0D6}"
EndProject
@@ -144,24 +144,24 @@ Global
{5F4ABB4F-CE69-47B7-860F-40B0DA68A7DB}.Checked|x64.Build.0 = Debug|Any CPU
{5F4ABB4F-CE69-47B7-860F-40B0DA68A7DB}.Checked|x86.ActiveCfg = Debug|Any CPU
{5F4ABB4F-CE69-47B7-860F-40B0DA68A7DB}.Checked|x86.Build.0 = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Debug|x64.ActiveCfg = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Debug|x64.Build.0 = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Debug|x86.Build.0 = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Release|Any CPU.Build.0 = Release|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Release|x64.ActiveCfg = Release|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Release|x64.Build.0 = Release|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Release|x86.ActiveCfg = Release|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Release|x86.Build.0 = Release|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Checked|x64.ActiveCfg = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Checked|x64.Build.0 = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Checked|x86.ActiveCfg = Debug|Any CPU
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0}.Checked|x86.Build.0 = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Debug|x64.Build.0 = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Debug|x86.Build.0 = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Release|x64.ActiveCfg = Release|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Release|x64.Build.0 = Release|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Release|x86.ActiveCfg = Release|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Release|x86.Build.0 = Release|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Checked|x64.Build.0 = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E}.Checked|x86.Build.0 = Debug|Any CPU
{EE5972A3-AD58-430B-ACEB-4F608FD1C0D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EE5972A3-AD58-430B-ACEB-4F608FD1C0D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE5972A3-AD58-430B-ACEB-4F608FD1C0D6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -191,7 +191,7 @@ Global
{B43D6BB6-1760-4DB9-87CB-792D42846C62} = {CEC48784-C8F0-46DF-AA1E-07850E754180}
{EA142E29-EE37-4751-868B-27516AE0A209} = {08BAF9E0-068B-4201-91E6-91B725ABE3D2}
{5F4ABB4F-CE69-47B7-860F-40B0DA68A7DB} = {A48D1F08-4510-44F9-9E77-7164B2769064}
- {D0CB9D68-8D84-4C58-AF1B-A515960E97E0} = {A48D1F08-4510-44F9-9E77-7164B2769064}
+ {5918B01B-FCAE-4321-8DCA-44466A57C04E} = {A48D1F08-4510-44F9-9E77-7164B2769064}
{EE5972A3-AD58-430B-ACEB-4F608FD1C0D6} = {A48D1F08-4510-44F9-9E77-7164B2769064}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln b/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
index b3749793013..a8c4e17d070 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.Ac
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.AccessControl.Tests", "tests\Microsoft.Win32.Registry.AccessControl.Tests.csproj", "{BC8FAA75-A595-475E-B947-FA2D1E225B48}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{514CE97B-7E25-45F3-B169-2174C16DBF1D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{CD8304A8-4F14-45B7-B035-6D45D5ED3ECE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9BCDE466-92C1-45ED-A9F1-6973D93DF5DF}"
EndProject
@@ -41,10 +41,10 @@ Global
{BC8FAA75-A595-475E-B947-FA2D1E225B48}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC8FAA75-A595-475E-B947-FA2D1E225B48}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC8FAA75-A595-475E-B947-FA2D1E225B48}.Release|Any CPU.Build.0 = Release|Any CPU
- {514CE97B-7E25-45F3-B169-2174C16DBF1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {514CE97B-7E25-45F3-B169-2174C16DBF1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {514CE97B-7E25-45F3-B169-2174C16DBF1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {514CE97B-7E25-45F3-B169-2174C16DBF1D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CD8304A8-4F14-45B7-B035-6D45D5ED3ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CD8304A8-4F14-45B7-B035-6D45D5ED3ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CD8304A8-4F14-45B7-B035-6D45D5ED3ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CD8304A8-4F14-45B7-B035-6D45D5ED3ECE}.Release|Any CPU.Build.0 = Release|Any CPU
{9BCDE466-92C1-45ED-A9F1-6973D93DF5DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9BCDE466-92C1-45ED-A9F1-6973D93DF5DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9BCDE466-92C1-45ED-A9F1-6973D93DF5DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{BC8FAA75-A595-475E-B947-FA2D1E225B48} = {BF17487D-E9E3-4054-85A7-E64243B91780}
{97F37414-7633-4B76-AFA4-284E26894FB4} = {84D58703-7569-445A-89B8-14D024FB6091}
{9A0E9CD8-33FA-4E02-8EB6-5685CD84D727} = {29A3E154-E50B-49E7-96C3-32A91CAB9BA0}
- {514CE97B-7E25-45F3-B169-2174C16DBF1D} = {BEA56439-DD4D-4DF6-9F07-33670D77D7FD}
+ {CD8304A8-4F14-45B7-B035-6D45D5ED3ECE} = {BEA56439-DD4D-4DF6-9F07-33670D77D7FD}
{9BCDE466-92C1-45ED-A9F1-6973D93DF5DF} = {BEA56439-DD4D-4DF6-9F07-33670D77D7FD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln b/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
index c0971869754..f482596b25c 100644
--- a/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
+++ b/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.Tests", "tests\Microsoft.Win32.Registry.Tests.csproj", "{E9123189-58BC-41A8-83A0-C46E74ED8160}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E1A1E89F-AD14-4AE9-9974-7F33050E9F7E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2FD3F0C9-DB36-4156-9A78-51B476636685}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E8981301-50DC-4A1E-9BB0-537F9C5F2B8F}"
EndProject
@@ -41,10 +41,10 @@ Global
{E9123189-58BC-41A8-83A0-C46E74ED8160}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E9123189-58BC-41A8-83A0-C46E74ED8160}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E9123189-58BC-41A8-83A0-C46E74ED8160}.Release|Any CPU.Build.0 = Release|Any CPU
- {E1A1E89F-AD14-4AE9-9974-7F33050E9F7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E1A1E89F-AD14-4AE9-9974-7F33050E9F7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E1A1E89F-AD14-4AE9-9974-7F33050E9F7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E1A1E89F-AD14-4AE9-9974-7F33050E9F7E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2FD3F0C9-DB36-4156-9A78-51B476636685}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2FD3F0C9-DB36-4156-9A78-51B476636685}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2FD3F0C9-DB36-4156-9A78-51B476636685}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2FD3F0C9-DB36-4156-9A78-51B476636685}.Release|Any CPU.Build.0 = Release|Any CPU
{E8981301-50DC-4A1E-9BB0-537F9C5F2B8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E8981301-50DC-4A1E-9BB0-537F9C5F2B8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8981301-50DC-4A1E-9BB0-537F9C5F2B8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{E9123189-58BC-41A8-83A0-C46E74ED8160} = {D3839339-AF88-4867-BF81-44915AA883A2}
{FC5B0E37-024C-4A09-9080-AA78F2BCE4A0} = {DE8642D5-1264-473C-9896-35F348E89DBF}
{3446E090-1587-4D16-AE6A-99C1788E86A6} = {66BCDB38-AFF7-4B7C-97F5-8869D5C2EDA9}
- {E1A1E89F-AD14-4AE9-9974-7F33050E9F7E} = {DC4533A7-1325-497B-91FE-89765F77DFBF}
+ {2FD3F0C9-DB36-4156-9A78-51B476636685} = {DC4533A7-1325-497B-91FE-89765F77DFBF}
{E8981301-50DC-4A1E-9BB0-537F9C5F2B8F} = {DC4533A7-1325-497B-91FE-89765F77DFBF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
index 6ec4e027b6e..2038a83a542 100644
--- a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants>
<TargetFrameworks>$(NetCoreAppCurrent)-windows</TargetFrameworks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
diff --git a/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln b/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
index 2efea97820f..10fc52f963a 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
+++ b/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvent
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents.Tests", "tests\Microsoft.Win32.SystemEvents.Tests.csproj", "{86962B5A-AC38-44FA-B25B-74ABAC57E534}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{643587CB-EF49-4F0B-BEA6-FF40EA376EFA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2D9943FB-EBD4-4994-BDCA-7C0087CD499B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1F21915D-D799-4AAA-9053-8BFFD5102FF1}"
EndProject
@@ -41,10 +41,10 @@ Global
{86962B5A-AC38-44FA-B25B-74ABAC57E534}.Debug|Any CPU.Build.0 = Debug|Any CPU
{86962B5A-AC38-44FA-B25B-74ABAC57E534}.Release|Any CPU.ActiveCfg = Release|Any CPU
{86962B5A-AC38-44FA-B25B-74ABAC57E534}.Release|Any CPU.Build.0 = Release|Any CPU
- {643587CB-EF49-4F0B-BEA6-FF40EA376EFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {643587CB-EF49-4F0B-BEA6-FF40EA376EFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {643587CB-EF49-4F0B-BEA6-FF40EA376EFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {643587CB-EF49-4F0B-BEA6-FF40EA376EFA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2D9943FB-EBD4-4994-BDCA-7C0087CD499B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2D9943FB-EBD4-4994-BDCA-7C0087CD499B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2D9943FB-EBD4-4994-BDCA-7C0087CD499B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2D9943FB-EBD4-4994-BDCA-7C0087CD499B}.Release|Any CPU.Build.0 = Release|Any CPU
{1F21915D-D799-4AAA-9053-8BFFD5102FF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1F21915D-D799-4AAA-9053-8BFFD5102FF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F21915D-D799-4AAA-9053-8BFFD5102FF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{86962B5A-AC38-44FA-B25B-74ABAC57E534} = {F2A4093D-6291-4A9C-87FC-6B06D2324E38}
{A586D099-E8B0-4C2F-B4AD-BCFA98429DBF} = {8BF90E54-BE73-4BBF-89CB-E9BE5DD1FC9E}
{20C56707-2960-4DF2-BF76-5556304EE7CF} = {A9588D3E-04F0-4294-8D1A-84CF3D84804A}
- {643587CB-EF49-4F0B-BEA6-FF40EA376EFA} = {B7447478-7C05-441D-BDDF-538008B24CBD}
+ {2D9943FB-EBD4-4994-BDCA-7C0087CD499B} = {B7447478-7C05-441D-BDDF-538008B24CBD}
{1F21915D-D799-4AAA-9053-8BFFD5102FF1} = {B7447478-7C05-441D-BDDF-538008B24CBD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
index 79b0db6d25a..1a8e130bee4 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
@@ -3,7 +3,7 @@
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs"
diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln b/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
index a196c625b20..69bdfda0ee9 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.XmlSerializer.Gen
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SerializableAssembly", "tests\SerializableAssembly.csproj", "{9D614FC7-0A88-4E85-B8A9-25FFFD71C47A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{28A7B35D-620C-4E37-9252-4B88CD1D2887}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2307F11D-6FF4-45B0-9FA2-7B9807647E2B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B1A05556-02FE-4BC0-89E4-4C6CC751675B}"
EndProject
@@ -39,10 +39,10 @@ Global
{9D614FC7-0A88-4E85-B8A9-25FFFD71C47A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D614FC7-0A88-4E85-B8A9-25FFFD71C47A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D614FC7-0A88-4E85-B8A9-25FFFD71C47A}.Release|Any CPU.Build.0 = Release|Any CPU
- {28A7B35D-620C-4E37-9252-4B88CD1D2887}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {28A7B35D-620C-4E37-9252-4B88CD1D2887}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {28A7B35D-620C-4E37-9252-4B88CD1D2887}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {28A7B35D-620C-4E37-9252-4B88CD1D2887}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2307F11D-6FF4-45B0-9FA2-7B9807647E2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2307F11D-6FF4-45B0-9FA2-7B9807647E2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2307F11D-6FF4-45B0-9FA2-7B9807647E2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2307F11D-6FF4-45B0-9FA2-7B9807647E2B}.Release|Any CPU.Build.0 = Release|Any CPU
{B1A05556-02FE-4BC0-89E4-4C6CC751675B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B1A05556-02FE-4BC0-89E4-4C6CC751675B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1A05556-02FE-4BC0-89E4-4C6CC751675B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
{A90B6063-66BB-486C-8267-43AC8F9C5196} = {BA160273-1658-4D63-8BB0-BEDDA0DAF20D}
{9D614FC7-0A88-4E85-B8A9-25FFFD71C47A} = {BA160273-1658-4D63-8BB0-BEDDA0DAF20D}
{3C8417AB-8E73-4EBF-B090-1367F3D23468} = {CC406051-3EEC-4E4F-8152-2F1BE15D61BA}
- {28A7B35D-620C-4E37-9252-4B88CD1D2887} = {A3A8F98E-3524-4E5A-87C5-5324FD52E296}
+ {2307F11D-6FF4-45B0-9FA2-7B9807647E2B} = {A3A8F98E-3524-4E5A-87C5-5324FD52E296}
{B1A05556-02FE-4BC0-89E4-4C6CC751675B} = {A3A8F98E-3524-4E5A-87C5-5324FD52E296}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.AppContext/System.AppContext.sln b/src/libraries/System.AppContext/System.AppContext.sln
index 34c6dd1f618..286a2c7a0de 100644
--- a/src/libraries/System.AppContext/System.AppContext.sln
+++ b/src/libraries/System.AppContext/System.AppContext.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.AppContext.Tests", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{1CFA73AC-672E-4EED-8003-51682AF702E5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1BD36757-E399-4B26-B82C-96D807D2CB73}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4F487746-811B-469D-BFD4-A875FC4F1203}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{0AC4B104-CB58-4158-A301-5984BCBEE897}"
EndProject
@@ -144,24 +144,24 @@ Global
{1CFA73AC-672E-4EED-8003-51682AF702E5}.Checked|x64.Build.0 = Debug|Any CPU
{1CFA73AC-672E-4EED-8003-51682AF702E5}.Checked|x86.ActiveCfg = Debug|Any CPU
{1CFA73AC-672E-4EED-8003-51682AF702E5}.Checked|x86.Build.0 = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Debug|x64.ActiveCfg = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Debug|x64.Build.0 = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Debug|x86.Build.0 = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Release|Any CPU.Build.0 = Release|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Release|x64.ActiveCfg = Release|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Release|x64.Build.0 = Release|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Release|x86.ActiveCfg = Release|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Release|x86.Build.0 = Release|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Checked|x64.ActiveCfg = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Checked|x64.Build.0 = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Checked|x86.ActiveCfg = Debug|Any CPU
- {1BD36757-E399-4B26-B82C-96D807D2CB73}.Checked|x86.Build.0 = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Debug|x64.Build.0 = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Debug|x86.Build.0 = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Release|x64.ActiveCfg = Release|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Release|x64.Build.0 = Release|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Release|x86.ActiveCfg = Release|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Release|x86.Build.0 = Release|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Checked|x64.Build.0 = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {4F487746-811B-469D-BFD4-A875FC4F1203}.Checked|x86.Build.0 = Debug|Any CPU
{0AC4B104-CB58-4158-A301-5984BCBEE897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0AC4B104-CB58-4158-A301-5984BCBEE897}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0AC4B104-CB58-4158-A301-5984BCBEE897}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -191,7 +191,7 @@ Global
{007AD19C-8A80-4463-834C-BE7AE1808A04} = {0AE25156-94A3-4936-80FD-8343290DF4B4}
{BB689125-CDA7-4CFA-A4D6-1C932092A67F} = {4E4CBD83-24E2-49A2-B0A5-57368BB1A055}
{1CFA73AC-672E-4EED-8003-51682AF702E5} = {A1EFAD7B-1534-44CD-89D2-906AE96FB1F6}
- {1BD36757-E399-4B26-B82C-96D807D2CB73} = {A1EFAD7B-1534-44CD-89D2-906AE96FB1F6}
+ {4F487746-811B-469D-BFD4-A875FC4F1203} = {A1EFAD7B-1534-44CD-89D2-906AE96FB1F6}
{0AC4B104-CB58-4158-A301-5984BCBEE897} = {A1EFAD7B-1534-44CD-89D2-906AE96FB1F6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Buffers/System.Buffers.sln b/src/libraries/System.Buffers/System.Buffers.sln
index 061541bac98..4873d3df71b 100644
--- a/src/libraries/System.Buffers/System.Buffers.sln
+++ b/src/libraries/System.Buffers/System.Buffers.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers.Tests", "tes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{AA1510B5-19AF-488B-A390-AFFDA0109571}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{247DBC71-7AB6-411C-82C3-68EB66904CDB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{6CBC6ECE-606C-4784-AB3E-88D040E1DF30}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A0F803EB-E5D5-429A-A0C6-6A997BCB0128}"
EndProject
@@ -144,24 +144,24 @@ Global
{AA1510B5-19AF-488B-A390-AFFDA0109571}.Checked|x64.Build.0 = Debug|Any CPU
{AA1510B5-19AF-488B-A390-AFFDA0109571}.Checked|x86.ActiveCfg = Debug|Any CPU
{AA1510B5-19AF-488B-A390-AFFDA0109571}.Checked|x86.Build.0 = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Debug|x64.ActiveCfg = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Debug|x64.Build.0 = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Debug|x86.ActiveCfg = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Debug|x86.Build.0 = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Release|Any CPU.Build.0 = Release|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Release|x64.ActiveCfg = Release|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Release|x64.Build.0 = Release|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Release|x86.ActiveCfg = Release|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Release|x86.Build.0 = Release|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Checked|x64.ActiveCfg = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Checked|x64.Build.0 = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Checked|x86.ActiveCfg = Debug|Any CPU
- {247DBC71-7AB6-411C-82C3-68EB66904CDB}.Checked|x86.Build.0 = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Debug|x64.Build.0 = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Debug|x86.Build.0 = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Release|x64.ActiveCfg = Release|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Release|x64.Build.0 = Release|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Release|x86.ActiveCfg = Release|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Release|x86.Build.0 = Release|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Checked|x64.Build.0 = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30}.Checked|x86.Build.0 = Debug|Any CPU
{A0F803EB-E5D5-429A-A0C6-6A997BCB0128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0F803EB-E5D5-429A-A0C6-6A997BCB0128}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0F803EB-E5D5-429A-A0C6-6A997BCB0128}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -191,7 +191,7 @@ Global
{FF86CB73-2E54-4E89-9491-258324F291D0} = {A11072BB-28A6-44B6-A0A3-CAFE5E5309E5}
{7F713B83-1256-4108-B40D-FDD380BB9DB6} = {914126D6-2C5E-49E9-B9BF-F94749FB2329}
{AA1510B5-19AF-488B-A390-AFFDA0109571} = {C91D3A73-7AC3-413D-8E90-A9B48E6B0540}
- {247DBC71-7AB6-411C-82C3-68EB66904CDB} = {C91D3A73-7AC3-413D-8E90-A9B48E6B0540}
+ {6CBC6ECE-606C-4784-AB3E-88D040E1DF30} = {C91D3A73-7AC3-413D-8E90-A9B48E6B0540}
{A0F803EB-E5D5-429A-A0C6-6A997BCB0128} = {C91D3A73-7AC3-413D-8E90-A9B48E6B0540}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.CodeDom/System.CodeDom.sln b/src/libraries/System.CodeDom/System.CodeDom.sln
index 1cb728d517b..2a7cd44da99 100644
--- a/src/libraries/System.CodeDom/System.CodeDom.sln
+++ b/src/libraries/System.CodeDom/System.CodeDom.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom.Tests", "tes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{8B41F4FA-C804-4769-BDF0-467972E33997}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{CA537DA9-05A7-4AD6-9D5D-31529375FEF0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B9251B70-FF97-4950-ABA7-50AB281D8F8E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{BB92EB52-7A9C-49C7-AC26-53864BAD4E1A}"
EndProject
@@ -51,10 +51,10 @@ Global
{8B41F4FA-C804-4769-BDF0-467972E33997}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B41F4FA-C804-4769-BDF0-467972E33997}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8B41F4FA-C804-4769-BDF0-467972E33997}.Release|Any CPU.Build.0 = Release|Any CPU
- {CA537DA9-05A7-4AD6-9D5D-31529375FEF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CA537DA9-05A7-4AD6-9D5D-31529375FEF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CA537DA9-05A7-4AD6-9D5D-31529375FEF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CA537DA9-05A7-4AD6-9D5D-31529375FEF0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B9251B70-FF97-4950-ABA7-50AB281D8F8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B9251B70-FF97-4950-ABA7-50AB281D8F8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B9251B70-FF97-4950-ABA7-50AB281D8F8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B9251B70-FF97-4950-ABA7-50AB281D8F8E}.Release|Any CPU.Build.0 = Release|Any CPU
{BB92EB52-7A9C-49C7-AC26-53864BAD4E1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BB92EB52-7A9C-49C7-AC26-53864BAD4E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BB92EB52-7A9C-49C7-AC26-53864BAD4E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -79,7 +79,7 @@ Global
{F5C1865E-F81C-4041-8AFA-762C4422E419} = {54321C0F-1323-4962-A01C-AC07028C3FA8}
{A7D7C449-65F5-4B0F-94F1-2CA6EDDACD5C} = {54321C0F-1323-4962-A01C-AC07028C3FA8}
{14D5A803-D5BF-44E5-B2B5-0B0BC297748E} = {6591788E-0894-4655-AE2F-602407C4F766}
- {CA537DA9-05A7-4AD6-9D5D-31529375FEF0} = {91ED5DF2-6A20-4B11-B671-19BB53254EE7}
+ {B9251B70-FF97-4950-ABA7-50AB281D8F8E} = {91ED5DF2-6A20-4B11-B671-19BB53254EE7}
{BB92EB52-7A9C-49C7-AC26-53864BAD4E1A} = {91ED5DF2-6A20-4B11-B671-19BB53254EE7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
index 6a3a2cf7565..d0f5d90ed20 100644
--- a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
+++ b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
@@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{431D18E4-4464-45C0-BBF2-1834B73E8095}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{615C60FE-EF88-476C-83B0-728528D4F587}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{1E072489-1073-4526-8C5D-64AC2A97BF9B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{2DB3F8FB-BDD7-471E-BF8F-D3C4D6A2BDC3}"
EndProject
@@ -186,24 +186,24 @@ Global
{431D18E4-4464-45C0-BBF2-1834B73E8095}.Checked|x64.Build.0 = Debug|Any CPU
{431D18E4-4464-45C0-BBF2-1834B73E8095}.Checked|x86.ActiveCfg = Debug|Any CPU
{431D18E4-4464-45C0-BBF2-1834B73E8095}.Checked|x86.Build.0 = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Debug|x64.ActiveCfg = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Debug|x64.Build.0 = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Debug|x86.ActiveCfg = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Debug|x86.Build.0 = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Release|Any CPU.Build.0 = Release|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Release|x64.ActiveCfg = Release|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Release|x64.Build.0 = Release|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Release|x86.ActiveCfg = Release|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Release|x86.Build.0 = Release|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Checked|x64.ActiveCfg = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Checked|x64.Build.0 = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Checked|x86.ActiveCfg = Debug|Any CPU
- {615C60FE-EF88-476C-83B0-728528D4F587}.Checked|x86.Build.0 = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Debug|x64.Build.0 = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Debug|x86.Build.0 = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Release|x64.ActiveCfg = Release|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Release|x64.Build.0 = Release|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Release|x86.ActiveCfg = Release|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Release|x86.Build.0 = Release|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Checked|x64.Build.0 = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B}.Checked|x86.Build.0 = Debug|Any CPU
{2DB3F8FB-BDD7-471E-BF8F-D3C4D6A2BDC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2DB3F8FB-BDD7-471E-BF8F-D3C4D6A2BDC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2DB3F8FB-BDD7-471E-BF8F-D3C4D6A2BDC3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -254,7 +254,7 @@ Global
{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8} = {64657647-6C2C-4D36-A5D4-7E7534F3C66F}
{ADA6D062-1E28-47D8-A058-FE1F4551AA20} = {CA1F4ADE-3F2A-40E3-9242-549F88F0367F}
{431D18E4-4464-45C0-BBF2-1834B73E8095} = {93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD}
- {615C60FE-EF88-476C-83B0-728528D4F587} = {93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD}
+ {1E072489-1073-4526-8C5D-64AC2A97BF9B} = {93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD}
{2DB3F8FB-BDD7-471E-BF8F-D3C4D6A2BDC3} = {93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln b/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
index 734d4e3a0fb..64cf1ac37a4 100644
--- a/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
+++ b/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutabl
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable.Tests", "tests\System.Collections.Immutable.Tests.csproj", "{70EA8239-58B9-44E5-B1C5-ABEC2C9066E7}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BF4E44D8-5D9B-489D-AA99-73B645204291}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E52EB126-11CE-4437-AA53-2001EEEEF9BC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{FCC1AE83-36B9-464B-8A5B-8C9E8244905B}"
EndProject
@@ -41,10 +41,10 @@ Global
{70EA8239-58B9-44E5-B1C5-ABEC2C9066E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70EA8239-58B9-44E5-B1C5-ABEC2C9066E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{70EA8239-58B9-44E5-B1C5-ABEC2C9066E7}.Release|Any CPU.Build.0 = Release|Any CPU
- {BF4E44D8-5D9B-489D-AA99-73B645204291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BF4E44D8-5D9B-489D-AA99-73B645204291}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BF4E44D8-5D9B-489D-AA99-73B645204291}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BF4E44D8-5D9B-489D-AA99-73B645204291}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E52EB126-11CE-4437-AA53-2001EEEEF9BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E52EB126-11CE-4437-AA53-2001EEEEF9BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E52EB126-11CE-4437-AA53-2001EEEEF9BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E52EB126-11CE-4437-AA53-2001EEEEF9BC}.Release|Any CPU.Build.0 = Release|Any CPU
{FCC1AE83-36B9-464B-8A5B-8C9E8244905B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FCC1AE83-36B9-464B-8A5B-8C9E8244905B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCC1AE83-36B9-464B-8A5B-8C9E8244905B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{70EA8239-58B9-44E5-B1C5-ABEC2C9066E7} = {D5595EA2-934D-481D-9AB9-412276C05181}
{1514371B-8161-4A27-AD96-30E3F9EA7AAE} = {12BB8B2C-950F-4AA8-BFED-D87D2873FEDA}
{F9520C8A-A85B-4AB0-8535-D1F2124DAC76} = {50502C33-83FC-41E3-A25D-E870C5AAB7CE}
- {BF4E44D8-5D9B-489D-AA99-73B645204291} = {EEC12D52-2DAA-4D12-A123-BB4AC370814B}
+ {E52EB126-11CE-4437-AA53-2001EEEEF9BC} = {EEC12D52-2DAA-4D12-A123-BB4AC370814B}
{FCC1AE83-36B9-464B-8A5B-8C9E8244905B} = {EEC12D52-2DAA-4D12-A123-BB4AC370814B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
index 54ae429019a..a1b7537199a 100644
--- a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
+++ b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGener
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric.Tests", "tests\System.Collections.NonGeneric.Tests.csproj", "{AF7C053E-2774-4355-8541-945594C4AF9C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3AA49B22-FD1F-4BD2-AC61-96DA0753D80F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FC7A2623-48CD-4805-8C91-046D5E3D260F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{EC51C488-C247-436A-B610-C55A01DA3037}"
EndProject
@@ -41,10 +41,10 @@ Global
{AF7C053E-2774-4355-8541-945594C4AF9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF7C053E-2774-4355-8541-945594C4AF9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF7C053E-2774-4355-8541-945594C4AF9C}.Release|Any CPU.Build.0 = Release|Any CPU
- {3AA49B22-FD1F-4BD2-AC61-96DA0753D80F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3AA49B22-FD1F-4BD2-AC61-96DA0753D80F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3AA49B22-FD1F-4BD2-AC61-96DA0753D80F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3AA49B22-FD1F-4BD2-AC61-96DA0753D80F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FC7A2623-48CD-4805-8C91-046D5E3D260F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FC7A2623-48CD-4805-8C91-046D5E3D260F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FC7A2623-48CD-4805-8C91-046D5E3D260F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FC7A2623-48CD-4805-8C91-046D5E3D260F}.Release|Any CPU.Build.0 = Release|Any CPU
{EC51C488-C247-436A-B610-C55A01DA3037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC51C488-C247-436A-B610-C55A01DA3037}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC51C488-C247-436A-B610-C55A01DA3037}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{AF7C053E-2774-4355-8541-945594C4AF9C} = {40328A50-1C3B-412A-8176-C558898752EE}
{D3B134E9-5B26-4455-9F2D-22302BD8E350} = {3F8044D4-DD3D-46CA-8EAE-CD03358DA425}
{8B963C6C-CF59-433B-B8FB-6C1EB4650DF2} = {97782A88-6BFA-46E2-9027-E72BF7E3062E}
- {3AA49B22-FD1F-4BD2-AC61-96DA0753D80F} = {121A7C7D-3D67-4606-AE3E-4C9E55510A86}
+ {FC7A2623-48CD-4805-8C91-046D5E3D260F} = {121A7C7D-3D67-4606-AE3E-4C9E55510A86}
{EC51C488-C247-436A-B610-C55A01DA3037} = {121A7C7D-3D67-4606-AE3E-4C9E55510A86}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln b/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
index 6f78ef63b07..0ac25d352e9 100644
--- a/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
+++ b/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Speciali
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Specialized.Tests", "tests\System.Collections.Specialized.Tests.csproj", "{6708616F-5AFD-4AF1-B04E-81EAC42F2EB3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{81F98113-9FCF-45E7-93C6-16B78EF227F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C1FF9F3B-CDD2-493F-ACB6-C630FC5B3034}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{66B6FD95-517D-47E6-B08B-382EB32DE466}"
EndProject
@@ -41,10 +41,10 @@ Global
{6708616F-5AFD-4AF1-B04E-81EAC42F2EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6708616F-5AFD-4AF1-B04E-81EAC42F2EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6708616F-5AFD-4AF1-B04E-81EAC42F2EB3}.Release|Any CPU.Build.0 = Release|Any CPU
- {81F98113-9FCF-45E7-93C6-16B78EF227F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {81F98113-9FCF-45E7-93C6-16B78EF227F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {81F98113-9FCF-45E7-93C6-16B78EF227F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {81F98113-9FCF-45E7-93C6-16B78EF227F0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C1FF9F3B-CDD2-493F-ACB6-C630FC5B3034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C1FF9F3B-CDD2-493F-ACB6-C630FC5B3034}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C1FF9F3B-CDD2-493F-ACB6-C630FC5B3034}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C1FF9F3B-CDD2-493F-ACB6-C630FC5B3034}.Release|Any CPU.Build.0 = Release|Any CPU
{66B6FD95-517D-47E6-B08B-382EB32DE466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{66B6FD95-517D-47E6-B08B-382EB32DE466}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66B6FD95-517D-47E6-B08B-382EB32DE466}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{6708616F-5AFD-4AF1-B04E-81EAC42F2EB3} = {627B9774-B9B5-4118-A051-D2022B8ECFB4}
{D414DDBE-F5D9-4030-A576-DA2CBC96EB5D} = {129030A4-7D4E-401C-9F7E-722D99DC8407}
{FE0B5511-A5E1-4E19-A232-B89F628C417E} = {1799B533-6E09-44A9-BF2B-B723ADB5F2F2}
- {81F98113-9FCF-45E7-93C6-16B78EF227F0} = {02B8FF7B-DDCB-4A38-A626-39877203DF37}
+ {C1FF9F3B-CDD2-493F-ACB6-C630FC5B3034} = {02B8FF7B-DDCB-4A38-A626-39877203DF37}
{66B6FD95-517D-47E6-B08B-382EB32DE466} = {02B8FF7B-DDCB-4A38-A626-39877203DF37}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Collections/System.Collections.sln b/src/libraries/System.Collections/System.Collections.sln
index cb59dabcb5a..4410e7c0308 100644
--- a/src/libraries/System.Collections/System.Collections.sln
+++ b/src/libraries/System.Collections/System.Collections.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{F2E57833-4968-430D-8149-733DE03A7314}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{643044B5-5A04-469C-A691-DC172B09877C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{00398A78-1620-4996-9922-C82D1AF84714}"
EndProject
@@ -144,24 +144,24 @@ Global
{F2E57833-4968-430D-8149-733DE03A7314}.Checked|x64.Build.0 = Debug|Any CPU
{F2E57833-4968-430D-8149-733DE03A7314}.Checked|x86.ActiveCfg = Debug|Any CPU
{F2E57833-4968-430D-8149-733DE03A7314}.Checked|x86.Build.0 = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Debug|x64.ActiveCfg = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Debug|x64.Build.0 = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Debug|x86.ActiveCfg = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Debug|x86.Build.0 = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Release|Any CPU.Build.0 = Release|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Release|x64.ActiveCfg = Release|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Release|x64.Build.0 = Release|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Release|x86.ActiveCfg = Release|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Release|x86.Build.0 = Release|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Checked|x64.ActiveCfg = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Checked|x64.Build.0 = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Checked|x86.ActiveCfg = Debug|Any CPU
- {643044B5-5A04-469C-A691-DC172B09877C}.Checked|x86.Build.0 = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Debug|x64.Build.0 = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Debug|x86.Build.0 = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Release|x64.ActiveCfg = Release|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Release|x64.Build.0 = Release|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Release|x86.ActiveCfg = Release|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Release|x86.Build.0 = Release|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Checked|x64.Build.0 = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A}.Checked|x86.Build.0 = Debug|Any CPU
{00398A78-1620-4996-9922-C82D1AF84714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{00398A78-1620-4996-9922-C82D1AF84714}.Debug|Any CPU.Build.0 = Debug|Any CPU
{00398A78-1620-4996-9922-C82D1AF84714}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -191,7 +191,7 @@ Global
{BB54ED9D-FF71-4D91-B7C0-984AB0976798} = {6CD2C5E3-B5BA-4219-B8EF-9B5D486BF805}
{77E9C47D-4AC4-4402-8613-40DF427174BD} = {06AE90FB-F007-4E70-BCD2-5CAD106A7C97}
{F2E57833-4968-430D-8149-733DE03A7314} = {B958B834-96D2-4B18-AA42-22B312BE9925}
- {643044B5-5A04-469C-A691-DC172B09877C} = {B958B834-96D2-4B18-AA42-22B312BE9925}
+ {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A} = {B958B834-96D2-4B18-AA42-22B312BE9925}
{00398A78-1620-4996-9922-C82D1AF84714} = {B958B834-96D2-4B18-AA42-22B312BE9925}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln b/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
index 8d5fab81eb3..02bb7c620c9 100644
--- a/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
+++ b/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annot
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annotations.Tests", "tests\System.ComponentModel.Annotations.Tests.csproj", "{E4C76FCB-4583-475C-B042-FC44BD1D73F2}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BE45ED97-84FF-4D6E-88D5-F7B3BC599B3B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{1E2C1B63-290E-409E-ACF8-22E2752D2936}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{FBE888A3-6DCE-4766-A4E4-D1748AC5B688}"
EndProject
@@ -41,10 +41,10 @@ Global
{E4C76FCB-4583-475C-B042-FC44BD1D73F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4C76FCB-4583-475C-B042-FC44BD1D73F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4C76FCB-4583-475C-B042-FC44BD1D73F2}.Release|Any CPU.Build.0 = Release|Any CPU
- {BE45ED97-84FF-4D6E-88D5-F7B3BC599B3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BE45ED97-84FF-4D6E-88D5-F7B3BC599B3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BE45ED97-84FF-4D6E-88D5-F7B3BC599B3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BE45ED97-84FF-4D6E-88D5-F7B3BC599B3B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1E2C1B63-290E-409E-ACF8-22E2752D2936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1E2C1B63-290E-409E-ACF8-22E2752D2936}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1E2C1B63-290E-409E-ACF8-22E2752D2936}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1E2C1B63-290E-409E-ACF8-22E2752D2936}.Release|Any CPU.Build.0 = Release|Any CPU
{FBE888A3-6DCE-4766-A4E4-D1748AC5B688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FBE888A3-6DCE-4766-A4E4-D1748AC5B688}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBE888A3-6DCE-4766-A4E4-D1748AC5B688}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{E4C76FCB-4583-475C-B042-FC44BD1D73F2} = {A0596070-E285-49A1-A0AA-187B69E55A39}
{FD97F92D-762C-4657-9F80-AB7992681202} = {52233040-4669-4A28-8E8F-A35F80039C13}
{B60893E1-864C-4236-9D4B-F17540DEED86} = {E1ABC6C6-D95F-4452-A9E2-7DAB63667861}
- {BE45ED97-84FF-4D6E-88D5-F7B3BC599B3B} = {0BCBBCAE-BD70-482D-BA22-916184DB9EE6}
+ {1E2C1B63-290E-409E-ACF8-22E2752D2936} = {0BCBBCAE-BD70-482D-BA22-916184DB9EE6}
{FBE888A3-6DCE-4766-A4E4-D1748AC5B688} = {0BCBBCAE-BD70-482D-BA22-916184DB9EE6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln b/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln
index 2fb3d718d19..91f264c629d 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln
+++ b/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln
@@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context", "..\System.Reflection.Context\src\System.Reflection.Context.csproj", "{9154CFB5-AC90-4BC7-BECB-3BB588356ABE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{89063629-173F-4C3B-A4D4-9EAA902BBAE6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{AFA86D76-CB87-4031-BF82-5B2E091F4CA7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{70C60407-FA4F-47F9-8584-249E5528209D}"
EndProject
@@ -65,10 +65,10 @@ Global
{9154CFB5-AC90-4BC7-BECB-3BB588356ABE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9154CFB5-AC90-4BC7-BECB-3BB588356ABE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9154CFB5-AC90-4BC7-BECB-3BB588356ABE}.Release|Any CPU.Build.0 = Release|Any CPU
- {89063629-173F-4C3B-A4D4-9EAA902BBAE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {89063629-173F-4C3B-A4D4-9EAA902BBAE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {89063629-173F-4C3B-A4D4-9EAA902BBAE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {89063629-173F-4C3B-A4D4-9EAA902BBAE6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AFA86D76-CB87-4031-BF82-5B2E091F4CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AFA86D76-CB87-4031-BF82-5B2E091F4CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AFA86D76-CB87-4031-BF82-5B2E091F4CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AFA86D76-CB87-4031-BF82-5B2E091F4CA7}.Release|Any CPU.Build.0 = Release|Any CPU
{70C60407-FA4F-47F9-8584-249E5528209D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70C60407-FA4F-47F9-8584-249E5528209D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70C60407-FA4F-47F9-8584-249E5528209D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -86,7 +86,7 @@ Global
{E427BC70-0F51-4DA8-995A-AC46E8E3A31B} = {3D168EC8-5581-468D-BE77-0A787F5042F2}
{D598C12E-CFC4-42A8-A6D2-99FC7F527179} = {3D168EC8-5581-468D-BE77-0A787F5042F2}
{9154CFB5-AC90-4BC7-BECB-3BB588356ABE} = {3D168EC8-5581-468D-BE77-0A787F5042F2}
- {89063629-173F-4C3B-A4D4-9EAA902BBAE6} = {9A073A19-15DD-424C-A7B8-1DBEB11E690D}
+ {AFA86D76-CB87-4031-BF82-5B2E091F4CA7} = {9A073A19-15DD-424C-A7B8-1DBEB11E690D}
{70C60407-FA4F-47F9-8584-249E5528209D} = {9A073A19-15DD-424C-A7B8-1DBEB11E690D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln b/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
index e1d5e54376c..f56cc3a922c 100644
--- a/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
+++ b/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Compo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Tests", "tests\System.ComponentModel.Composition.Tests.csproj", "{B21E5872-33E7-40D6-8A7F-33C0264A83E9}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2F49FC4A-A8DC-4052-8DFB-89D505C2EA92}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2BD2DB5E-FB31-43E3-9184-BEFE59786826}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{90E6CD04-1022-4A7A-B6DD-114C6F61ECA0}"
EndProject
@@ -47,10 +47,10 @@ Global
{B21E5872-33E7-40D6-8A7F-33C0264A83E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B21E5872-33E7-40D6-8A7F-33C0264A83E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B21E5872-33E7-40D6-8A7F-33C0264A83E9}.Release|Any CPU.Build.0 = Release|Any CPU
- {2F49FC4A-A8DC-4052-8DFB-89D505C2EA92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2F49FC4A-A8DC-4052-8DFB-89D505C2EA92}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2F49FC4A-A8DC-4052-8DFB-89D505C2EA92}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2F49FC4A-A8DC-4052-8DFB-89D505C2EA92}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2BD2DB5E-FB31-43E3-9184-BEFE59786826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2BD2DB5E-FB31-43E3-9184-BEFE59786826}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2BD2DB5E-FB31-43E3-9184-BEFE59786826}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2BD2DB5E-FB31-43E3-9184-BEFE59786826}.Release|Any CPU.Build.0 = Release|Any CPU
{90E6CD04-1022-4A7A-B6DD-114C6F61ECA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{90E6CD04-1022-4A7A-B6DD-114C6F61ECA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90E6CD04-1022-4A7A-B6DD-114C6F61ECA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{B21E5872-33E7-40D6-8A7F-33C0264A83E9} = {E041B502-1C74-4540-9D57-0924674899B0}
{82F98B94-4E9D-457B-A391-F8F2766FBB2E} = {4857D2B5-405B-490F-BFC8-B730C8A3220A}
{B1B4D6FA-25CA-4F88-A7B4-BEADC53E9613} = {56CC716E-A917-46F2-8238-D809E1AF9D17}
- {2F49FC4A-A8DC-4052-8DFB-89D505C2EA92} = {902418FB-E47F-49F5-BC32-32E9022ECD94}
+ {2BD2DB5E-FB31-43E3-9184-BEFE59786826} = {902418FB-E47F-49F5-BC32-32E9022ECD94}
{90E6CD04-1022-4A7A-B6DD-114C6F61ECA0} = {902418FB-E47F-49F5-BC32-32E9022ECD94}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln b/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
index d9582925f7c..a25e82e5d8d 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Event
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.EventBasedAsync.Tests", "tests\System.ComponentModel.EventBasedAsync.Tests.csproj", "{E79356D9-2598-489C-9ADF-59B2D95EA22C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{FD7AD564-B4F9-4A42-AA81-4B114838AB98}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{DD873B5A-85F5-4C40-A33F-C998F5B5409D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{AA09E7A5-58F5-4BAB-B6EE-B594F50C17E2}"
EndProject
@@ -41,10 +41,10 @@ Global
{E79356D9-2598-489C-9ADF-59B2D95EA22C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E79356D9-2598-489C-9ADF-59B2D95EA22C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E79356D9-2598-489C-9ADF-59B2D95EA22C}.Release|Any CPU.Build.0 = Release|Any CPU
- {FD7AD564-B4F9-4A42-AA81-4B114838AB98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FD7AD564-B4F9-4A42-AA81-4B114838AB98}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FD7AD564-B4F9-4A42-AA81-4B114838AB98}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FD7AD564-B4F9-4A42-AA81-4B114838AB98}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DD873B5A-85F5-4C40-A33F-C998F5B5409D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DD873B5A-85F5-4C40-A33F-C998F5B5409D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DD873B5A-85F5-4C40-A33F-C998F5B5409D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DD873B5A-85F5-4C40-A33F-C998F5B5409D}.Release|Any CPU.Build.0 = Release|Any CPU
{AA09E7A5-58F5-4BAB-B6EE-B594F50C17E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA09E7A5-58F5-4BAB-B6EE-B594F50C17E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA09E7A5-58F5-4BAB-B6EE-B594F50C17E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{E79356D9-2598-489C-9ADF-59B2D95EA22C} = {53E9D5BA-677C-487C-A58E-A9C6622D8C0D}
{83BCEDA6-972E-4E26-9582-C53335A9F9C5} = {8F9719E0-3A02-421C-B564-64559817B4A7}
{04E0F296-DF67-45EB-8967-DADF4CBC9D6E} = {EEC4342D-1B9E-462C-98FE-2C8BC16B75BE}
- {FD7AD564-B4F9-4A42-AA81-4B114838AB98} = {B2151F7B-8333-4467-B311-145FAD7BC484}
+ {DD873B5A-85F5-4C40-A33F-C998F5B5409D} = {B2151F7B-8333-4467-B311-145FAD7BC484}
{AA09E7A5-58F5-4BAB-B6EE-B594F50C17E2} = {B2151F7B-8333-4467-B311-145FAD7BC484}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln b/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
index 5dff9f078f4..d9b39e41e27 100644
--- a/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
+++ b/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Primi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Primitives.Tests", "tests\System.ComponentModel.Primitives.Tests.csproj", "{F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{62C70FB7-F6CD-4FB1-9EB9-E9D069E06CE2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E8CC2715-0EA3-4ADC-9896-508FB1E7349A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{BE0F37D2-BEF7-4365-AFFB-B08271D25844}"
EndProject
@@ -41,10 +41,10 @@ Global
{F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C}.Release|Any CPU.Build.0 = Release|Any CPU
- {62C70FB7-F6CD-4FB1-9EB9-E9D069E06CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {62C70FB7-F6CD-4FB1-9EB9-E9D069E06CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {62C70FB7-F6CD-4FB1-9EB9-E9D069E06CE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {62C70FB7-F6CD-4FB1-9EB9-E9D069E06CE2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E8CC2715-0EA3-4ADC-9896-508FB1E7349A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E8CC2715-0EA3-4ADC-9896-508FB1E7349A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E8CC2715-0EA3-4ADC-9896-508FB1E7349A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E8CC2715-0EA3-4ADC-9896-508FB1E7349A}.Release|Any CPU.Build.0 = Release|Any CPU
{BE0F37D2-BEF7-4365-AFFB-B08271D25844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE0F37D2-BEF7-4365-AFFB-B08271D25844}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE0F37D2-BEF7-4365-AFFB-B08271D25844}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C} = {97E28BF9-DD92-440D-B9AD-AEE3454C07A5}
{BA8A7204-1534-43C3-8BBE-F237C7328C42} = {4D0700F8-3BC3-4CE5-8258-1004C0BD007D}
{E6024DD2-79AD-4639-A141-9DA38282F61B} = {F199F24A-6408-4204-84CF-7A2C9ED758CA}
- {62C70FB7-F6CD-4FB1-9EB9-E9D069E06CE2} = {2D5F3044-9A0F-46C5-B714-7816F501604F}
+ {E8CC2715-0EA3-4ADC-9896-508FB1E7349A} = {2D5F3044-9A0F-46C5-B714-7816F501604F}
{BE0F37D2-BEF7-4365-AFFB-B08271D25844} = {2D5F3044-9A0F-46C5-B714-7816F501604F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
index c6700f72185..35d0466be7a 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
+++ b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
@@ -7,10 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeC
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeConverter.Tests", "tests\System.ComponentModel.TypeConverter.Tests.csproj", "{6A370CD8-E44B-46C9-B29A-87F847483336}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{5844267C-DBDB-4520-B053-C90DD5D02220}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{113EA49F-2525-47A0-AD4D-EA510476F50B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{970B0849-990C-4368-B317-063BFD82CAD5}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "..\System.Text.RegularExpressions\gen\System.Text.RegularExpressions.Generator.csproj", "{B681D74E-6DAD-4C73-9EEF-CB1C17063E32}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E80037BD-B4E3-43B7-A7C8-F6C3C6DA4EF8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2F8CF65B-8616-42BC-A893-8C7C9FD990C5}"
@@ -41,14 +43,18 @@ Global
{6A370CD8-E44B-46C9-B29A-87F847483336}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A370CD8-E44B-46C9-B29A-87F847483336}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6A370CD8-E44B-46C9-B29A-87F847483336}.Release|Any CPU.Build.0 = Release|Any CPU
- {5844267C-DBDB-4520-B053-C90DD5D02220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5844267C-DBDB-4520-B053-C90DD5D02220}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5844267C-DBDB-4520-B053-C90DD5D02220}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5844267C-DBDB-4520-B053-C90DD5D02220}.Release|Any CPU.Build.0 = Release|Any CPU
+ {113EA49F-2525-47A0-AD4D-EA510476F50B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {113EA49F-2525-47A0-AD4D-EA510476F50B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {113EA49F-2525-47A0-AD4D-EA510476F50B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {113EA49F-2525-47A0-AD4D-EA510476F50B}.Release|Any CPU.Build.0 = Release|Any CPU
{970B0849-990C-4368-B317-063BFD82CAD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{970B0849-990C-4368-B317-063BFD82CAD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{970B0849-990C-4368-B317-063BFD82CAD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{970B0849-990C-4368-B317-063BFD82CAD5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B681D74E-6DAD-4C73-9EEF-CB1C17063E32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B681D74E-6DAD-4C73-9EEF-CB1C17063E32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B681D74E-6DAD-4C73-9EEF-CB1C17063E32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B681D74E-6DAD-4C73-9EEF-CB1C17063E32}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -58,8 +64,9 @@ Global
{6A370CD8-E44B-46C9-B29A-87F847483336} = {E80037BD-B4E3-43B7-A7C8-F6C3C6DA4EF8}
{0B2F32D4-9E58-4680-AB59-35D86E4162CE} = {2F8CF65B-8616-42BC-A893-8C7C9FD990C5}
{CE7DA286-D119-4087-A953-D542727AFA02} = {CD3CE573-0987-4590-8D30-EE1F1296D931}
- {5844267C-DBDB-4520-B053-C90DD5D02220} = {D06EAE06-636A-4A7A-B22F-5D106F7CCC75}
+ {113EA49F-2525-47A0-AD4D-EA510476F50B} = {D06EAE06-636A-4A7A-B22F-5D106F7CCC75}
{970B0849-990C-4368-B317-063BFD82CAD5} = {D06EAE06-636A-4A7A-B22F-5D106F7CCC75}
+ {B681D74E-6DAD-4C73-9EEF-CB1C17063E32} = {D06EAE06-636A-4A7A-B22F-5D106F7CCC75}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1D4639D9-A4BD-410A-9491-E5F8D82DE8BF}
diff --git a/src/libraries/System.ComponentModel/System.ComponentModel.sln b/src/libraries/System.ComponentModel/System.ComponentModel.sln
index f64261fda41..c6b27773931 100644
--- a/src/libraries/System.ComponentModel/System.ComponentModel.sln
+++ b/src/libraries/System.ComponentModel/System.ComponentModel.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel", "sr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Tests", "tests\System.ComponentModel.Tests.csproj", "{4E375A78-D856-4C1E-B7CB-A4026C9FD8E7}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B5852635-FC58-4BD0-984F-196C7E71726A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{AD87AB87-946C-4297-8ACB-C8FB1B604DE7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{22E91D96-49E2-4691-B4E5-4C22938C2F2A}"
EndProject
@@ -41,10 +41,10 @@ Global
{4E375A78-D856-4C1E-B7CB-A4026C9FD8E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E375A78-D856-4C1E-B7CB-A4026C9FD8E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E375A78-D856-4C1E-B7CB-A4026C9FD8E7}.Release|Any CPU.Build.0 = Release|Any CPU
- {B5852635-FC58-4BD0-984F-196C7E71726A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B5852635-FC58-4BD0-984F-196C7E71726A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B5852635-FC58-4BD0-984F-196C7E71726A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B5852635-FC58-4BD0-984F-196C7E71726A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AD87AB87-946C-4297-8ACB-C8FB1B604DE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AD87AB87-946C-4297-8ACB-C8FB1B604DE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AD87AB87-946C-4297-8ACB-C8FB1B604DE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AD87AB87-946C-4297-8ACB-C8FB1B604DE7}.Release|Any CPU.Build.0 = Release|Any CPU
{22E91D96-49E2-4691-B4E5-4C22938C2F2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{22E91D96-49E2-4691-B4E5-4C22938C2F2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{22E91D96-49E2-4691-B4E5-4C22938C2F2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{4E375A78-D856-4C1E-B7CB-A4026C9FD8E7} = {70E2F273-4083-402A-8AC4-4DB08A09813B}
{E954E33E-6349-4FA2-AF54-A3BCFE430879} = {C6EF640A-0AED-46F1-97D6-3206BD0186F0}
{EFFECBCD-A544-4649-AF79-3C2A7EEB4C6F} = {797FC0E7-1785-46B3-B280-2992A716A4ED}
- {B5852635-FC58-4BD0-984F-196C7E71726A} = {C3164BD9-1105-4795-B05D-3F2583479C41}
+ {AD87AB87-946C-4297-8ACB-C8FB1B604DE7} = {C3164BD9-1105-4795-B05D-3F2583479C41}
{22E91D96-49E2-4691-B4E5-4C22938C2F2A} = {C3164BD9-1105-4795-B05D-3F2583479C41}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln b/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
index c921ba19e3e..695ecd4f59e 100644
--- a/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
+++ b/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Attribut
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.AttributeModel.Tests", "tests\System.Composition.AttributeModel.Tests.csproj", "{C2EBC4C3-C97B-4F64-A647-87DAE2816A06}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{ABD7E428-23C1-4311-96C3-8D6394BFE731}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{24833E1B-95AF-4BB0-A290-5C6C79B3517F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1167919A-CDD3-4EBB-9659-A2515B8D81D5}"
EndProject
@@ -47,10 +47,10 @@ Global
{C2EBC4C3-C97B-4F64-A647-87DAE2816A06}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2EBC4C3-C97B-4F64-A647-87DAE2816A06}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2EBC4C3-C97B-4F64-A647-87DAE2816A06}.Release|Any CPU.Build.0 = Release|Any CPU
- {ABD7E428-23C1-4311-96C3-8D6394BFE731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {ABD7E428-23C1-4311-96C3-8D6394BFE731}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {ABD7E428-23C1-4311-96C3-8D6394BFE731}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {ABD7E428-23C1-4311-96C3-8D6394BFE731}.Release|Any CPU.Build.0 = Release|Any CPU
+ {24833E1B-95AF-4BB0-A290-5C6C79B3517F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {24833E1B-95AF-4BB0-A290-5C6C79B3517F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {24833E1B-95AF-4BB0-A290-5C6C79B3517F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {24833E1B-95AF-4BB0-A290-5C6C79B3517F}.Release|Any CPU.Build.0 = Release|Any CPU
{1167919A-CDD3-4EBB-9659-A2515B8D81D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1167919A-CDD3-4EBB-9659-A2515B8D81D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1167919A-CDD3-4EBB-9659-A2515B8D81D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{B62DF545-08AB-40E1-9DED-755583B0B3B3} = {5D6DA61D-2DBA-49B9-A8D0-1566890D3293}
{7C81E44B-A3A6-4707-AC60-8B6452FE35C2} = {378856D0-3326-428C-A8FB-FF958D0C4D49}
{3DD99E03-A4D3-456A-BA2F-A7351423B800} = {378856D0-3326-428C-A8FB-FF958D0C4D49}
- {ABD7E428-23C1-4311-96C3-8D6394BFE731} = {4E66055C-EBEE-4A40-BA5C-EDC98CEE758E}
+ {24833E1B-95AF-4BB0-A290-5C6C79B3517F} = {4E66055C-EBEE-4A40-BA5C-EDC98CEE758E}
{1167919A-CDD3-4EBB-9659-A2515B8D81D5} = {4E66055C-EBEE-4A40-BA5C-EDC98CEE758E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Composition.Convention/System.Composition.Convention.sln b/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
index c7279937b3f..d4957cedc57 100644
--- a/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
+++ b/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.TypedParts", "..\System.Composition.TypedParts\src\System.Composition.TypedParts.csproj", "{5AAFDB16-AACF-4446-9285-26AAC815101B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F8EB346D-B780-4523-A9C7-BAD43D95CBC3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0E526574-8462-4D78-BBCA-BD761904574A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{5D902FB1-35C6-4396-98B2-CBC0BF09F356}"
EndProject
@@ -57,10 +57,10 @@ Global
{5AAFDB16-AACF-4446-9285-26AAC815101B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5AAFDB16-AACF-4446-9285-26AAC815101B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5AAFDB16-AACF-4446-9285-26AAC815101B}.Release|Any CPU.Build.0 = Release|Any CPU
- {F8EB346D-B780-4523-A9C7-BAD43D95CBC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F8EB346D-B780-4523-A9C7-BAD43D95CBC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F8EB346D-B780-4523-A9C7-BAD43D95CBC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F8EB346D-B780-4523-A9C7-BAD43D95CBC3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0E526574-8462-4D78-BBCA-BD761904574A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0E526574-8462-4D78-BBCA-BD761904574A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0E526574-8462-4D78-BBCA-BD761904574A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0E526574-8462-4D78-BBCA-BD761904574A}.Release|Any CPU.Build.0 = Release|Any CPU
{5D902FB1-35C6-4396-98B2-CBC0BF09F356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D902FB1-35C6-4396-98B2-CBC0BF09F356}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D902FB1-35C6-4396-98B2-CBC0BF09F356}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -77,7 +77,7 @@ Global
{7839BCF8-8B5A-465B-A4B6-86CE4227AF81} = {D6A9A080-5B74-41A2-871E-F417FA9FF705}
{782AA503-8808-4741-AECF-D79A6BF3EFF7} = {D6A9A080-5B74-41A2-871E-F417FA9FF705}
{5AAFDB16-AACF-4446-9285-26AAC815101B} = {D6A9A080-5B74-41A2-871E-F417FA9FF705}
- {F8EB346D-B780-4523-A9C7-BAD43D95CBC3} = {DDADB978-93BC-489A-90C8-523AFE08EBC1}
+ {0E526574-8462-4D78-BBCA-BD761904574A} = {DDADB978-93BC-489A-90C8-523AFE08EBC1}
{5D902FB1-35C6-4396-98B2-CBC0BF09F356} = {DDADB978-93BC-489A-90C8-523AFE08EBC1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln b/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
index 8f399d65930..00745aa40c6 100644
--- a/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
+++ b/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Hosting.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime", "..\System.Composition.Runtime\src\System.Composition.Runtime.csproj", "{4C5E5AB8-480F-49F2-AF28-29C2EE713A39}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D55F96EA-0C21-43ED-A2EB-B7F785B4BB2C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FD8449C3-8A72-4ECF-B85D-C920253B88D8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629}"
EndProject
@@ -39,10 +39,10 @@ Global
{4C5E5AB8-480F-49F2-AF28-29C2EE713A39}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4C5E5AB8-480F-49F2-AF28-29C2EE713A39}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4C5E5AB8-480F-49F2-AF28-29C2EE713A39}.Release|Any CPU.Build.0 = Release|Any CPU
- {D55F96EA-0C21-43ED-A2EB-B7F785B4BB2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D55F96EA-0C21-43ED-A2EB-B7F785B4BB2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D55F96EA-0C21-43ED-A2EB-B7F785B4BB2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D55F96EA-0C21-43ED-A2EB-B7F785B4BB2C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FD8449C3-8A72-4ECF-B85D-C920253B88D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FD8449C3-8A72-4ECF-B85D-C920253B88D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FD8449C3-8A72-4ECF-B85D-C920253B88D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FD8449C3-8A72-4ECF-B85D-C920253B88D8}.Release|Any CPU.Build.0 = Release|Any CPU
{5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
{0F595512-D4BE-4042-9C8A-F0816A7B27AD} = {7AEF3556-BD3A-432D-A849-DFE1509F905E}
{991FC8D9-6A92-4A79-91EC-BD72005687AF} = {D140917D-0E52-4DC6-920A-B222BD2025AE}
{4C5E5AB8-480F-49F2-AF28-29C2EE713A39} = {D140917D-0E52-4DC6-920A-B222BD2025AE}
- {D55F96EA-0C21-43ED-A2EB-B7F785B4BB2C} = {1EEFB4CE-0917-418F-B83C-3B376CB39BC4}
+ {FD8449C3-8A72-4ECF-B85D-C920253B88D8} = {1EEFB4CE-0917-418F-B83C-3B376CB39BC4}
{5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629} = {1EEFB4CE-0917-418F-B83C-3B376CB39BC4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln b/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
index db53e563c48..4c0f144843c 100644
--- a/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
+++ b/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime.Tests", "tests\System.Composition.Runtime.Tests.csproj", "{B19B1509-313D-497D-9636-9A7AD5022DCF}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{EE80E035-BDF5-4A8C-ABFB-C0FA179CC3DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{669F1F31-D3A6-40CD-878C-90FCAE3108F4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1EE96691-E213-40A7-9392-A6A4417AFC4F}"
EndProject
@@ -33,10 +33,10 @@ Global
{B19B1509-313D-497D-9636-9A7AD5022DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B19B1509-313D-497D-9636-9A7AD5022DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B19B1509-313D-497D-9636-9A7AD5022DCF}.Release|Any CPU.Build.0 = Release|Any CPU
- {EE80E035-BDF5-4A8C-ABFB-C0FA179CC3DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EE80E035-BDF5-4A8C-ABFB-C0FA179CC3DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EE80E035-BDF5-4A8C-ABFB-C0FA179CC3DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EE80E035-BDF5-4A8C-ABFB-C0FA179CC3DB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {669F1F31-D3A6-40CD-878C-90FCAE3108F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {669F1F31-D3A6-40CD-878C-90FCAE3108F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {669F1F31-D3A6-40CD-878C-90FCAE3108F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {669F1F31-D3A6-40CD-878C-90FCAE3108F4}.Release|Any CPU.Build.0 = Release|Any CPU
{1EE96691-E213-40A7-9392-A6A4417AFC4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1EE96691-E213-40A7-9392-A6A4417AFC4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1EE96691-E213-40A7-9392-A6A4417AFC4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -49,7 +49,7 @@ Global
{31F52C37-63E5-46F9-A5DE-894E8AC91475} = {677DCCA2-C84B-4D33-AFA8-8906764CBAE7}
{B19B1509-313D-497D-9636-9A7AD5022DCF} = {677DCCA2-C84B-4D33-AFA8-8906764CBAE7}
{BAC53BBD-B949-419D-833B-54B6A03A1389} = {81E62E76-E824-4685-93D0-9C8C1F5C7AE2}
- {EE80E035-BDF5-4A8C-ABFB-C0FA179CC3DB} = {0D8AEC7B-1995-4D2C-90E4-8011BDA3D750}
+ {669F1F31-D3A6-40CD-878C-90FCAE3108F4} = {0D8AEC7B-1995-4D2C-90E4-8011BDA3D750}
{1EE96691-E213-40A7-9392-A6A4417AFC4F} = {0D8AEC7B-1995-4D2C-90E4-8011BDA3D750}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln b/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
index 6a897f529a0..8a89c060ae5 100644
--- a/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
+++ b/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.TypedPar
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.TypedParts.Tests", "tests\System.Composition.TypedParts.Tests.csproj", "{38C096D0-5E23-47E2-A074-5F9852075459}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E81ABF4E-85DF-40F2-BB13-920CD388BB2F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{73B190CC-D704-484D-BC34-F28A6E307D29}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{4FDFF976-E09D-4788-9AE2-BEB9AD129970}"
EndProject
@@ -57,10 +57,10 @@ Global
{38C096D0-5E23-47E2-A074-5F9852075459}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38C096D0-5E23-47E2-A074-5F9852075459}.Release|Any CPU.ActiveCfg = Release|Any CPU
{38C096D0-5E23-47E2-A074-5F9852075459}.Release|Any CPU.Build.0 = Release|Any CPU
- {E81ABF4E-85DF-40F2-BB13-920CD388BB2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E81ABF4E-85DF-40F2-BB13-920CD388BB2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E81ABF4E-85DF-40F2-BB13-920CD388BB2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E81ABF4E-85DF-40F2-BB13-920CD388BB2F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {73B190CC-D704-484D-BC34-F28A6E307D29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {73B190CC-D704-484D-BC34-F28A6E307D29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {73B190CC-D704-484D-BC34-F28A6E307D29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {73B190CC-D704-484D-BC34-F28A6E307D29}.Release|Any CPU.Build.0 = Release|Any CPU
{4FDFF976-E09D-4788-9AE2-BEB9AD129970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4FDFF976-E09D-4788-9AE2-BEB9AD129970}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FDFF976-E09D-4788-9AE2-BEB9AD129970}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -77,7 +77,7 @@ Global
{C8B6031E-5DD0-4BE8-9D70-960B24B1D23D} = {D9ED6745-3C2A-46CB-97DA-C46BA1A3A07B}
{E5E6C1F3-C318-47FF-B0BC-CFC04BC4AB15} = {D9ED6745-3C2A-46CB-97DA-C46BA1A3A07B}
{1B533355-A67E-4912-9605-A08FC7870291} = {D9ED6745-3C2A-46CB-97DA-C46BA1A3A07B}
- {E81ABF4E-85DF-40F2-BB13-920CD388BB2F} = {C335D433-9DCB-40C6-BF0E-556237F94898}
+ {73B190CC-D704-484D-BC34-F28A6E307D29} = {C335D433-9DCB-40C6-BF0E-556237F94898}
{4FDFF976-E09D-4788-9AE2-BEB9AD129970} = {C335D433-9DCB-40C6-BF0E-556237F94898}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Composition/System.Composition.sln b/src/libraries/System.Composition/System.Composition.sln
index b924eaf8b70..89cad41ee1f 100644
--- a/src/libraries/System.Composition/System.Composition.sln
+++ b/src/libraries/System.Composition/System.Composition.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLibrary", "tests\TestLibrary\TestLibrary.csproj", "{B16BCA17-DCA8-43B7-8E8A-89033F7A676E}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BA69D7E6-C402-437B-AD9B-68D9E7F6D535}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{872B3C94-AC4C-4CE3-B8B1-6FDE84C50CE3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63}"
EndProject
@@ -75,10 +75,10 @@ Global
{B16BCA17-DCA8-43B7-8E8A-89033F7A676E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B16BCA17-DCA8-43B7-8E8A-89033F7A676E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B16BCA17-DCA8-43B7-8E8A-89033F7A676E}.Release|Any CPU.Build.0 = Release|Any CPU
- {BA69D7E6-C402-437B-AD9B-68D9E7F6D535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BA69D7E6-C402-437B-AD9B-68D9E7F6D535}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BA69D7E6-C402-437B-AD9B-68D9E7F6D535}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BA69D7E6-C402-437B-AD9B-68D9E7F6D535}.Release|Any CPU.Build.0 = Release|Any CPU
+ {872B3C94-AC4C-4CE3-B8B1-6FDE84C50CE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {872B3C94-AC4C-4CE3-B8B1-6FDE84C50CE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {872B3C94-AC4C-4CE3-B8B1-6FDE84C50CE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {872B3C94-AC4C-4CE3-B8B1-6FDE84C50CE3}.Release|Any CPU.Build.0 = Release|Any CPU
{3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -98,7 +98,7 @@ Global
{60940C78-4DDA-4CDD-BA1C-8C9B6DB4FB64} = {A1E6CEE6-45AE-4A8A-A7FA-FFC34DB87C94}
{E3295CB6-16E3-497C-A696-71A077DD5828} = {A1E6CEE6-45AE-4A8A-A7FA-FFC34DB87C94}
{D1273F2F-1B6C-4EFB-ABF8-6072054E906C} = {A1E6CEE6-45AE-4A8A-A7FA-FFC34DB87C94}
- {BA69D7E6-C402-437B-AD9B-68D9E7F6D535} = {AB19313E-E606-4F39-AA2E-D3299DC26D7C}
+ {872B3C94-AC4C-4CE3-B8B1-6FDE84C50CE3} = {AB19313E-E606-4F39-AA2E-D3299DC26D7C}
{3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63} = {AB19313E-E606-4F39-AA2E-D3299DC26D7C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
index 39cd7ac1bb8..88ac5e88510 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
+++ b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
@@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{E49D2841-A288-4B5F-89FC-857CCE0401F0}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F2307FE5-652C-4525-A3D7-D91596A06E4E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}"
EndProject
@@ -77,10 +77,10 @@ Global
{E49D2841-A288-4B5F-89FC-857CCE0401F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E49D2841-A288-4B5F-89FC-857CCE0401F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E49D2841-A288-4B5F-89FC-857CCE0401F0}.Release|Any CPU.Build.0 = Release|Any CPU
- {F2307FE5-652C-4525-A3D7-D91596A06E4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F2307FE5-652C-4525-A3D7-D91596A06E4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F2307FE5-652C-4525-A3D7-D91596A06E4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F2307FE5-652C-4525-A3D7-D91596A06E4E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Release|Any CPU.Build.0 = Release|Any CPU
{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -128,7 +128,7 @@ Global
{7B2CA04A-9DFB-471E-B4CB-1937D0049B96} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
- {F2307FE5-652C-4525-A3D7-D91596A06E4E} = {BFBE3E0E-4E75-4665-A373-132D283D366D}
+ {355B775A-BFE1-4384-BC83-C6B5D1FB77BB} = {BFBE3E0E-4E75-4665-A373-132D283D366D}
{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630} = {BFBE3E0E-4E75-4665-A373-132D283D366D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Console/System.Console.sln b/src/libraries/System.Console/System.Console.sln
index 4fd2e5c1b42..15927bbc127 100644
--- a/src/libraries/System.Console/System.Console.sln
+++ b/src/libraries/System.Console/System.Console.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console.Tests", "tes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Runtime.InteropServices.JavaScript", "..\System.Private.Runtime.InteropServices.JavaScript\src\System.Private.Runtime.InteropServices.JavaScript.csproj", "{BAA75C96-57D9-4EDF-8DDF-392DB08B2047}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4908C4C5-A629-47F8-A141-5BE83DF96ADC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2B4D1069-DAB2-4A22-96A5-A12DF9B8CA22}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{128A0AF8-9794-49E3-8A07-E518EB9F1402}"
EndProject
@@ -53,10 +53,10 @@ Global
{BAA75C96-57D9-4EDF-8DDF-392DB08B2047}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BAA75C96-57D9-4EDF-8DDF-392DB08B2047}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BAA75C96-57D9-4EDF-8DDF-392DB08B2047}.Release|Any CPU.Build.0 = Release|Any CPU
- {4908C4C5-A629-47F8-A141-5BE83DF96ADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4908C4C5-A629-47F8-A141-5BE83DF96ADC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4908C4C5-A629-47F8-A141-5BE83DF96ADC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4908C4C5-A629-47F8-A141-5BE83DF96ADC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2B4D1069-DAB2-4A22-96A5-A12DF9B8CA22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2B4D1069-DAB2-4A22-96A5-A12DF9B8CA22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2B4D1069-DAB2-4A22-96A5-A12DF9B8CA22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2B4D1069-DAB2-4A22-96A5-A12DF9B8CA22}.Release|Any CPU.Build.0 = Release|Any CPU
{128A0AF8-9794-49E3-8A07-E518EB9F1402}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{128A0AF8-9794-49E3-8A07-E518EB9F1402}.Debug|Any CPU.Build.0 = Debug|Any CPU
{128A0AF8-9794-49E3-8A07-E518EB9F1402}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +72,7 @@ Global
{A998F8E4-797F-4852-8D38-CD322F637AA4} = {87011BFC-F4A7-4BEB-A794-ED75999604BF}
{7EAA30FF-8911-4427-BFAC-9FC8BF8B3606} = {5F676CAA-AE1E-4ACE-9769-FA07DA7F0F99}
{BAA75C96-57D9-4EDF-8DDF-392DB08B2047} = {5F676CAA-AE1E-4ACE-9769-FA07DA7F0F99}
- {4908C4C5-A629-47F8-A141-5BE83DF96ADC} = {6A697E68-D9B1-47F4-8AC0-B528E9AA3727}
+ {2B4D1069-DAB2-4A22-96A5-A12DF9B8CA22} = {6A697E68-D9B1-47F4-8AC0-B528E9AA3727}
{128A0AF8-9794-49E3-8A07-E518EB9F1402} = {6A697E68-D9B1-47F4-8AC0-B528E9AA3727}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj
index 076efd2213a..3592a18092a 100644
--- a/src/libraries/System.Console/tests/System.Console.Tests.csproj
+++ b/src/libraries/System.Console/tests/System.Console.Tests.csproj
@@ -3,7 +3,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows</TargetFrameworks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="CancelKeyPress.cs" />
diff --git a/src/libraries/System.Data.Common/System.Data.Common.sln b/src/libraries/System.Data.Common/System.Data.Common.sln
index d0592d54c2c..2127034b1a3 100644
--- a/src/libraries/System.Data.Common/System.Data.Common.sln
+++ b/src/libraries/System.Data.Common/System.Data.Common.sln
@@ -21,12 +21,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\Sy
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj", "{68D868F6-1311-47A2-9DDE-22B64B5FF85E}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{CE464FCD-853B-463E-990F-BDD39EC2FAE0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{44DCA516-EEB1-4976-9794-9D6A26A952E9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D291982D-1FC0-4CA2-A39F-4B490F809F01}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{09129981-6B0D-44C7-9F0A-AD2426106332}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "..\System.Text.RegularExpressions\gen\System.Text.RegularExpressions.Generator.csproj", "{EDDAE59E-8700-49DC-8E46-534037F7F476}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5924BF80-8349-4021-A4A3-853FE714A7C7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D}"
@@ -246,24 +248,24 @@ Global
{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Checked|x64.Build.0 = Debug|Any CPU
{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Checked|x86.ActiveCfg = Debug|Any CPU
{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Checked|x86.Build.0 = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Debug|x64.ActiveCfg = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Debug|x64.Build.0 = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Debug|x86.Build.0 = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Release|Any CPU.Build.0 = Release|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Release|x64.ActiveCfg = Release|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Release|x64.Build.0 = Release|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Release|x86.ActiveCfg = Release|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Release|x86.Build.0 = Release|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Checked|x64.ActiveCfg = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Checked|x64.Build.0 = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Checked|x86.ActiveCfg = Debug|Any CPU
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0}.Checked|x86.Build.0 = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Debug|x64.Build.0 = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Debug|x86.Build.0 = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Release|x64.ActiveCfg = Release|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Release|x64.Build.0 = Release|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Release|x86.ActiveCfg = Release|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Release|x86.Build.0 = Release|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Checked|x64.Build.0 = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9}.Checked|x86.Build.0 = Debug|Any CPU
{D291982D-1FC0-4CA2-A39F-4B490F809F01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D291982D-1FC0-4CA2-A39F-4B490F809F01}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D291982D-1FC0-4CA2-A39F-4B490F809F01}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -300,6 +302,24 @@ Global
{09129981-6B0D-44C7-9F0A-AD2426106332}.Checked|x64.Build.0 = Debug|Any CPU
{09129981-6B0D-44C7-9F0A-AD2426106332}.Checked|x86.ActiveCfg = Debug|Any CPU
{09129981-6B0D-44C7-9F0A-AD2426106332}.Checked|x86.Build.0 = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Debug|x64.Build.0 = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Debug|x86.Build.0 = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Release|x64.ActiveCfg = Release|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Release|x64.Build.0 = Release|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Release|x86.ActiveCfg = Release|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Release|x86.Build.0 = Release|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Checked|x64.Build.0 = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {EDDAE59E-8700-49DC-8E46-534037F7F476}.Checked|x86.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -317,8 +337,9 @@ Global
{BEBD7B5B-9544-42EB-B878-F009560CAAF4} = {B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D}
{F865C526-79F8-403B-B5E4-52A90ECE21E3} = {79588763-C99B-4C1B-88D3-181A92A98364}
{D5A85F0E-509A-424F-BFD0-A7CC38D43CCD} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}
- {CE464FCD-853B-463E-990F-BDD39EC2FAE0} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}
+ {44DCA516-EEB1-4976-9794-9D6A26A952E9} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}
{D291982D-1FC0-4CA2-A39F-4B490F809F01} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}
+ {EDDAE59E-8700-49DC-8E46-534037F7F476} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C1241AC3-6D55-48A6-9502-C46F806889AE}
diff --git a/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln b/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln
index 90b01267822..394584e08cb 100644
--- a/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln
+++ b/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.DataSetExtensio
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.DataSetExtensions.Tests", "tests\System.Data.DataSetExtensions.Tests.csproj", "{40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4B43BAEE-7A55-444A-BCAF-971E127C2C21}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{92A77424-607A-4AA3-A4EA-6CC6410B77D7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{499278B6-A3ED-4C95-9345-794A16289F97}"
EndProject
@@ -41,10 +41,10 @@ Global
{40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A}.Release|Any CPU.Build.0 = Release|Any CPU
- {4B43BAEE-7A55-444A-BCAF-971E127C2C21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4B43BAEE-7A55-444A-BCAF-971E127C2C21}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4B43BAEE-7A55-444A-BCAF-971E127C2C21}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4B43BAEE-7A55-444A-BCAF-971E127C2C21}.Release|Any CPU.Build.0 = Release|Any CPU
+ {92A77424-607A-4AA3-A4EA-6CC6410B77D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {92A77424-607A-4AA3-A4EA-6CC6410B77D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {92A77424-607A-4AA3-A4EA-6CC6410B77D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {92A77424-607A-4AA3-A4EA-6CC6410B77D7}.Release|Any CPU.Build.0 = Release|Any CPU
{499278B6-A3ED-4C95-9345-794A16289F97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{499278B6-A3ED-4C95-9345-794A16289F97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{499278B6-A3ED-4C95-9345-794A16289F97}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A} = {CDDA0573-35A0-446E-BBDF-AC852AF03B9E}
{8A0AA93A-ED36-4384-827E-F4D6E1E71B24} = {97D82FB6-EF60-4A52-9FEA-BDF71B2D91A1}
{5817F83A-8819-420F-B056-047D6515A02C} = {28909632-749A-4642-BDC0-8E7E03A0F051}
- {4B43BAEE-7A55-444A-BCAF-971E127C2C21} = {7DAFD1F9-39C6-449F-BFE8-7BB2D2F6C70B}
+ {92A77424-607A-4AA3-A4EA-6CC6410B77D7} = {7DAFD1F9-39C6-449F-BFE8-7BB2D2F6C70B}
{499278B6-A3ED-4C95-9345-794A16289F97} = {7DAFD1F9-39C6-449F-BFE8-7BB2D2F6C70B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
index 2aa344c2291..45caa6f3a02 100644
--- a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
+++ b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Odbc", "src\Sys
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Odbc.Tests", "tests\System.Data.Odbc.Tests.csproj", "{B0451507-A304-47CB-B14F-257E44B8AC18}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6DE8860C-D8AB-4FC5-9BFF-02A930B54750}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{76183E18-B488-4466-AEE5-3C5D0B3CD917}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C41CDCD9-00FB-4A87-893A-9E4788790EE7}"
EndProject
@@ -45,10 +45,10 @@ Global
{B0451507-A304-47CB-B14F-257E44B8AC18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B0451507-A304-47CB-B14F-257E44B8AC18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B0451507-A304-47CB-B14F-257E44B8AC18}.Release|Any CPU.Build.0 = Release|Any CPU
- {6DE8860C-D8AB-4FC5-9BFF-02A930B54750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6DE8860C-D8AB-4FC5-9BFF-02A930B54750}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6DE8860C-D8AB-4FC5-9BFF-02A930B54750}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6DE8860C-D8AB-4FC5-9BFF-02A930B54750}.Release|Any CPU.Build.0 = Release|Any CPU
+ {76183E18-B488-4466-AEE5-3C5D0B3CD917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {76183E18-B488-4466-AEE5-3C5D0B3CD917}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {76183E18-B488-4466-AEE5-3C5D0B3CD917}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {76183E18-B488-4466-AEE5-3C5D0B3CD917}.Release|Any CPU.Build.0 = Release|Any CPU
{C41CDCD9-00FB-4A87-893A-9E4788790EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C41CDCD9-00FB-4A87-893A-9E4788790EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C41CDCD9-00FB-4A87-893A-9E4788790EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +72,7 @@ Global
{D7E6B130-F82B-40B6-B76C-BD6451753BE1} = {08F7B256-AB13-4784-98C4-737888DC7428}
{EDE27BD9-9134-4118-94BD-C9782811684D} = {416AFA87-B3A9-4F0C-822F-BB08F8837609}
{BD3A8348-A2AC-468A-B8D9-B639190B0FD8} = {416AFA87-B3A9-4F0C-822F-BB08F8837609}
- {6DE8860C-D8AB-4FC5-9BFF-02A930B54750} = {4A564597-B792-466F-A641-DC264A3D6C66}
+ {76183E18-B488-4466-AEE5-3C5D0B3CD917} = {4A564597-B792-466F-A641-DC264A3D6C66}
{C41CDCD9-00FB-4A87-893A-9E4788790EE7} = {4A564597-B792-466F-A641-DC264A3D6C66}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
index 5f8e420d11f..6305461fc56 100644
--- a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
+++ b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
@@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{23D4BAFD-851B-4718-A3FA-B30631F87F91}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AD416319-4584-4A79-A9D4-4626C2FACF12}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}"
EndProject
@@ -101,10 +101,10 @@ Global
{23D4BAFD-851B-4718-A3FA-B30631F87F91}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23D4BAFD-851B-4718-A3FA-B30631F87F91}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23D4BAFD-851B-4718-A3FA-B30631F87F91}.Release|Any CPU.Build.0 = Release|Any CPU
- {AD416319-4584-4A79-A9D4-4626C2FACF12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AD416319-4584-4A79-A9D4-4626C2FACF12}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AD416319-4584-4A79-A9D4-4626C2FACF12}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AD416319-4584-4A79-A9D4-4626C2FACF12}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Release|Any CPU.Build.0 = Release|Any CPU
{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -156,7 +156,7 @@ Global
{15628477-9D25-41FA-81B0-59D43D1363F4} = {4B964147-AE9C-454F-B971-4F4BD9541280}
{877B4329-854A-412F-B631-6315D77F9C8A} = {4B964147-AE9C-454F-B971-4F4BD9541280}
{A3AC9584-763B-4686-B6D8-49140FC62EC4} = {4B964147-AE9C-454F-B971-4F4BD9541280}
- {AD416319-4584-4A79-A9D4-4626C2FACF12} = {39D097CC-4757-405F-B3C5-17B8050F438C}
+ {A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63} = {39D097CC-4757-405F-B3C5-17B8050F438C}
{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97} = {39D097CC-4757-405F-B3C5-17B8050F438C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
index c6b6d0c72f9..c3044e6558c 100644
--- a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
+++ b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Contract
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{452B9C44-BE4A-4D0E-9412-07280582D3BB}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{35183A91-B461-4D21-8DCC-8BD6CF9216A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B1366F4C-E5CC-4AF3-A67F-C28216E570B3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9C3EAF3C-A96C-4D5F-95FE-BBCB1580DECA}"
EndProject
@@ -144,24 +144,24 @@ Global
{452B9C44-BE4A-4D0E-9412-07280582D3BB}.Checked|x64.Build.0 = Debug|Any CPU
{452B9C44-BE4A-4D0E-9412-07280582D3BB}.Checked|x86.ActiveCfg = Debug|Any CPU
{452B9C44-BE4A-4D0E-9412-07280582D3BB}.Checked|x86.Build.0 = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Debug|x64.ActiveCfg = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Debug|x64.Build.0 = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Debug|x86.ActiveCfg = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Debug|x86.Build.0 = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Release|Any CPU.Build.0 = Release|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Release|x64.ActiveCfg = Release|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Release|x64.Build.0 = Release|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Release|x86.ActiveCfg = Release|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Release|x86.Build.0 = Release|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Checked|x64.ActiveCfg = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Checked|x64.Build.0 = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Checked|x86.ActiveCfg = Debug|Any CPU
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6}.Checked|x86.Build.0 = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Debug|x64.Build.0 = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Debug|x86.Build.0 = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Release|x64.ActiveCfg = Release|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Release|x64.Build.0 = Release|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Release|x86.ActiveCfg = Release|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Release|x86.Build.0 = Release|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Checked|x64.Build.0 = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3}.Checked|x86.Build.0 = Debug|Any CPU
{9C3EAF3C-A96C-4D5F-95FE-BBCB1580DECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9C3EAF3C-A96C-4D5F-95FE-BBCB1580DECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C3EAF3C-A96C-4D5F-95FE-BBCB1580DECA}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -191,7 +191,7 @@ Global
{2F113EAD-602B-4EBD-97E4-24C97CDFEB50} = {56A31E71-2D11-484D-A9D0-97E4A2AD9354}
{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0} = {8B71FA04-1D67-4607-94A4-E2A85977B1FA}
{452B9C44-BE4A-4D0E-9412-07280582D3BB} = {24204C7B-8FCC-4D46-8E72-BB7128DB5572}
- {35183A91-B461-4D21-8DCC-8BD6CF9216A6} = {24204C7B-8FCC-4D46-8E72-BB7128DB5572}
+ {B1366F4C-E5CC-4AF3-A67F-C28216E570B3} = {24204C7B-8FCC-4D46-8E72-BB7128DB5572}
{9C3EAF3C-A96C-4D5F-95FE-BBCB1580DECA} = {24204C7B-8FCC-4D46-8E72-BB7128DB5572}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln b/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
index b61034b08f0..c6aa0fc0187 100644
--- a/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
+++ b/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Gene
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{99BC2F73-199C-4E97-B247-FA99AEC9E24A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{BEE502AC-7208-4289-BAFD-57EBE4A4F188}"
EndProject
@@ -168,24 +168,24 @@ Global
{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Checked|x64.Build.0 = Debug|Any CPU
{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Checked|x86.ActiveCfg = Debug|Any CPU
{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Checked|x86.Build.0 = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Debug|x64.ActiveCfg = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Debug|x64.Build.0 = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Debug|x86.Build.0 = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Release|Any CPU.Build.0 = Release|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Release|x64.ActiveCfg = Release|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Release|x64.Build.0 = Release|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Release|x86.ActiveCfg = Release|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Release|x86.Build.0 = Release|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Checked|x64.ActiveCfg = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Checked|x64.Build.0 = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Checked|x86.ActiveCfg = Debug|Any CPU
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}.Checked|x86.Build.0 = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Debug|x64.Build.0 = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Debug|x86.Build.0 = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Release|x64.ActiveCfg = Release|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Release|x64.Build.0 = Release|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Release|x86.ActiveCfg = Release|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Release|x86.Build.0 = Release|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Checked|x64.Build.0 = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A}.Checked|x86.Build.0 = Debug|Any CPU
{BEE502AC-7208-4289-BAFD-57EBE4A4F188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BEE502AC-7208-4289-BAFD-57EBE4A4F188}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BEE502AC-7208-4289-BAFD-57EBE4A4F188}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -254,7 +254,7 @@ Global
{5B121A9E-061D-4FED-AA3A-26054F41E2B4} = {8D1E1DF1-BE04-43F9-8D9D-E73AAB20C311}
{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D} = {E1E2C99D-07AE-4C22-A2E1-B807B1AE61AF}
{6ED522FD-D0B0-4574-8F1A-82D339C7D0D3} = {A2474395-2701-4B91-A097-985495EFE750}
- {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B} = {A2474395-2701-4B91-A097-985495EFE750}
+ {99BC2F73-199C-4E97-B247-FA99AEC9E24A} = {A2474395-2701-4B91-A097-985495EFE750}
{BEE502AC-7208-4289-BAFD-57EBE4A4F188} = {A2474395-2701-4B91-A097-985495EFE750}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln b/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
index a59bc0aeea3..2d70e83cab1 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Diagnost
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource.Switches.Tests", "tests\TestWithConfigSwitches\System.Diagnostics.DiagnosticSource.Switches.Tests.csproj", "{95B7A616-C472-47CA-BC91-E88FB763A78B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E6E9E4A4-CA40-4B1E-AA92-1CC666C5A544}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C43479BA-BAF7-4F1D-B9AF-418869CF9143}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{F97FBDC1-22F3-4745-B934-2E2A650EDA6A}"
EndProject
@@ -47,10 +47,10 @@ Global
{95B7A616-C472-47CA-BC91-E88FB763A78B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{95B7A616-C472-47CA-BC91-E88FB763A78B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{95B7A616-C472-47CA-BC91-E88FB763A78B}.Release|Any CPU.Build.0 = Release|Any CPU
- {E6E9E4A4-CA40-4B1E-AA92-1CC666C5A544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E6E9E4A4-CA40-4B1E-AA92-1CC666C5A544}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E6E9E4A4-CA40-4B1E-AA92-1CC666C5A544}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E6E9E4A4-CA40-4B1E-AA92-1CC666C5A544}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C43479BA-BAF7-4F1D-B9AF-418869CF9143}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C43479BA-BAF7-4F1D-B9AF-418869CF9143}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C43479BA-BAF7-4F1D-B9AF-418869CF9143}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C43479BA-BAF7-4F1D-B9AF-418869CF9143}.Release|Any CPU.Build.0 = Release|Any CPU
{F97FBDC1-22F3-4745-B934-2E2A650EDA6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F97FBDC1-22F3-4745-B934-2E2A650EDA6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F97FBDC1-22F3-4745-B934-2E2A650EDA6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{95B7A616-C472-47CA-BC91-E88FB763A78B} = {5ACE392F-5FD1-4A91-B992-2D7562BEACDE}
{424489A3-270A-4AD2-A3C4-4F726BF5D490} = {4667237A-8A15-43B3-8CDF-2D0E9B212182}
{C841EE65-4F8E-4779-987C-7E64BACFAC59} = {995CF17B-85CD-4C9E-BE9D-8A2A3240FF6B}
- {E6E9E4A4-CA40-4B1E-AA92-1CC666C5A544} = {E2336D66-4276-48F1-9619-1F79CE7140EC}
+ {C43479BA-BAF7-4F1D-B9AF-418869CF9143} = {E2336D66-4276-48F1-9619-1F79CE7140EC}
{F97FBDC1-22F3-4745-B934-2E2A650EDA6A} = {E2336D66-4276-48F1-9619-1F79CE7140EC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln b/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
index 5e474e7f3a2..5491b64207f 100644
--- a/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
+++ b/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{EF2BA909-F545-45B6-A467-24CCB98E8370}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{189EB8E3-B28A-4D8C-80D2-E1BD21BF4F52}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C470A83B-8C8C-4C87-9A3F-31B2E0070A13}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D49EF33F-919D-4DE5-B4B1-CF6697EF3806}"
EndProject
@@ -57,10 +57,10 @@ Global
{EF2BA909-F545-45B6-A467-24CCB98E8370}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF2BA909-F545-45B6-A467-24CCB98E8370}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF2BA909-F545-45B6-A467-24CCB98E8370}.Release|Any CPU.Build.0 = Release|Any CPU
- {189EB8E3-B28A-4D8C-80D2-E1BD21BF4F52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {189EB8E3-B28A-4D8C-80D2-E1BD21BF4F52}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {189EB8E3-B28A-4D8C-80D2-E1BD21BF4F52}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {189EB8E3-B28A-4D8C-80D2-E1BD21BF4F52}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C470A83B-8C8C-4C87-9A3F-31B2E0070A13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C470A83B-8C8C-4C87-9A3F-31B2E0070A13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C470A83B-8C8C-4C87-9A3F-31B2E0070A13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C470A83B-8C8C-4C87-9A3F-31B2E0070A13}.Release|Any CPU.Build.0 = Release|Any CPU
{D49EF33F-919D-4DE5-B4B1-CF6697EF3806}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D49EF33F-919D-4DE5-B4B1-CF6697EF3806}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D49EF33F-919D-4DE5-B4B1-CF6697EF3806}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -86,7 +86,7 @@ Global
{6D90E38F-7633-4BB0-8D67-7397CE99B981} = {FFB9A9A0-BCDB-42B1-9D58-E25AC8B95C4C}
{A5B6EFFE-E24B-4DC8-B0FA-68ADCE59B74C} = {DBD1571C-0586-470C-83A4-84A174680603}
{5BB72C32-4B04-415E-A504-F41F2FE0E54D} = {DBD1571C-0586-470C-83A4-84A174680603}
- {189EB8E3-B28A-4D8C-80D2-E1BD21BF4F52} = {1096CED3-1AA7-4FA5-BF1A-EEFD977B6D3B}
+ {C470A83B-8C8C-4C87-9A3F-31B2E0070A13} = {1096CED3-1AA7-4FA5-BF1A-EEFD977B6D3B}
{D49EF33F-919D-4DE5-B4B1-CF6697EF3806} = {1096CED3-1AA7-4FA5-BF1A-EEFD977B6D3B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj b/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj
index d4160c2651a..e6bea72cf37 100644
--- a/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj
+++ b/src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj
@@ -4,6 +4,6 @@
<Win32Resource>EventLogMessages.res</Win32Resource>
<!-- Override the parent Directory.Build.props -->
<SupportedOSPlatforms />
- <EnableDllImportGenerator>false</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>false</EnableLibraryImportGenerator>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj b/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj
index 9898d2491ca..f96d3e38fa1 100644
--- a/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj
+++ b/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="EventInstanceTests.cs" />
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln b/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
index 32299a6e485..05e7040d904 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.FileVers
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.FileVersionInfo.Tests", "tests\System.Diagnostics.FileVersionInfo.Tests\System.Diagnostics.FileVersionInfo.Tests.csproj", "{2F5C48C2-CE74-49FD-BA41-25FCBCE53A49}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DC87501D-94B3-4867-985C-D53935C7843A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B9224F74-9714-4C37-895C-BFAE0FC97B59}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C07D96C2-F7BA-45D5-BAE2-C06B68FF9F05}"
EndProject
@@ -47,10 +47,10 @@ Global
{2F5C48C2-CE74-49FD-BA41-25FCBCE53A49}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2F5C48C2-CE74-49FD-BA41-25FCBCE53A49}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2F5C48C2-CE74-49FD-BA41-25FCBCE53A49}.Release|Any CPU.Build.0 = Release|Any CPU
- {DC87501D-94B3-4867-985C-D53935C7843A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DC87501D-94B3-4867-985C-D53935C7843A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DC87501D-94B3-4867-985C-D53935C7843A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DC87501D-94B3-4867-985C-D53935C7843A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B9224F74-9714-4C37-895C-BFAE0FC97B59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B9224F74-9714-4C37-895C-BFAE0FC97B59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B9224F74-9714-4C37-895C-BFAE0FC97B59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B9224F74-9714-4C37-895C-BFAE0FC97B59}.Release|Any CPU.Build.0 = Release|Any CPU
{C07D96C2-F7BA-45D5-BAE2-C06B68FF9F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C07D96C2-F7BA-45D5-BAE2-C06B68FF9F05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C07D96C2-F7BA-45D5-BAE2-C06B68FF9F05}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{2F5C48C2-CE74-49FD-BA41-25FCBCE53A49} = {8042448A-EB54-4EBB-A1E0-BAA0B5A343D8}
{46E9AC6C-347E-4F94-80CB-E1857EC0C5C6} = {36141B8B-E6F5-4AAF-A053-BDD189531BAF}
{922C96F5-9F92-4F0E-A83D-D1BCDDD187F2} = {888B9739-0B73-4F21-A3CC-4694AEFE55CA}
- {DC87501D-94B3-4867-985C-D53935C7843A} = {AC3F6844-B70D-4DC3-A930-43073DA6F2D8}
+ {B9224F74-9714-4C37-895C-BFAE0FC97B59} = {AC3F6844-B70D-4DC3-A930-43073DA6F2D8}
{C07D96C2-F7BA-45D5-BAE2-C06B68FF9F05} = {AC3F6844-B70D-4DC3-A930-43073DA6F2D8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
index 36f5ea370f9..4eb560a6798 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
@@ -3,7 +3,7 @@
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<!-- Checked in test binaries for FileVersionInfoTest -->
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
index 239f000595e..749af9b640f 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{A6AC1A1B-F02F-4F0B-8C6B-1A004EE79893}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4C1D1653-BCA3-4A1F-91E2-27B3EC58D2A9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{11F700BE-429D-4AAA-B797-4C6322503872}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}"
EndProject
@@ -89,10 +89,10 @@ Global
{A6AC1A1B-F02F-4F0B-8C6B-1A004EE79893}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6AC1A1B-F02F-4F0B-8C6B-1A004EE79893}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6AC1A1B-F02F-4F0B-8C6B-1A004EE79893}.Release|Any CPU.Build.0 = Release|Any CPU
- {4C1D1653-BCA3-4A1F-91E2-27B3EC58D2A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4C1D1653-BCA3-4A1F-91E2-27B3EC58D2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4C1D1653-BCA3-4A1F-91E2-27B3EC58D2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4C1D1653-BCA3-4A1F-91E2-27B3EC58D2A9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {11F700BE-429D-4AAA-B797-4C6322503872}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {11F700BE-429D-4AAA-B797-4C6322503872}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {11F700BE-429D-4AAA-B797-4C6322503872}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {11F700BE-429D-4AAA-B797-4C6322503872}.Release|Any CPU.Build.0 = Release|Any CPU
{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -142,7 +142,7 @@ Global
{43214093-FA08-4699-A62B-D7BC858BAC78} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
{1E0AB255-7FD0-4DE0-9675-59DE81B12E54} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
- {4C1D1653-BCA3-4A1F-91E2-27B3EC58D2A9} = {651A1BB1-501D-45DA-9284-77F8FC083889}
+ {11F700BE-429D-4AAA-B797-4C6322503872} = {651A1BB1-501D-45DA-9284-77F8FC083889}
{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3} = {651A1BB1-501D-45DA-9284-77F8FC083889}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
index 8f2e5f867e7..6a726eb3e7a 100644
--- a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
+++ b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
@@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{65CC713C-0735-4043-A4F2-9E1A2057A21B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DB8EA6C1-4C44-4CB1-8B4C-FB52563D4F63}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{FD985738-3603-4C41-9FDE-1C96F7922725}"
EndProject
@@ -97,10 +97,10 @@ Global
{65CC713C-0735-4043-A4F2-9E1A2057A21B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{65CC713C-0735-4043-A4F2-9E1A2057A21B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{65CC713C-0735-4043-A4F2-9E1A2057A21B}.Release|Any CPU.Build.0 = Release|Any CPU
- {DB8EA6C1-4C44-4CB1-8B4C-FB52563D4F63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DB8EA6C1-4C44-4CB1-8B4C-FB52563D4F63}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DB8EA6C1-4C44-4CB1-8B4C-FB52563D4F63}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DB8EA6C1-4C44-4CB1-8B4C-FB52563D4F63}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C8F1CF01-F4E9-4459-9FBB-34363A0C377E}.Release|Any CPU.Build.0 = Release|Any CPU
{FD985738-3603-4C41-9FDE-1C96F7922725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD985738-3603-4C41-9FDE-1C96F7922725}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD985738-3603-4C41-9FDE-1C96F7922725}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -142,7 +142,7 @@ Global
{6155E80C-6CE0-4A93-8BDF-80494E489BB1} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
{97763BA2-BD91-480C-8173-65EA2A72EAA8} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
{546D7B53-3A00-47A4-BBE0-F4BA12126D6F} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
- {DB8EA6C1-4C44-4CB1-8B4C-FB52563D4F63} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533}
+ {C8F1CF01-F4E9-4459-9FBB-34363A0C377E} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533}
{FD985738-3603-4C41-9FDE-1C96F7922725} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
index 089d4fdeb4d..396b584abd2 100644
--- a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
@@ -4,7 +4,7 @@
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
index a42d16d4398..d433edd2a08 100644
--- a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
+++ b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj", "{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{64554B4A-B6C5-4D22-A1D1-6757F510CAE0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{56B120CF-EBB5-4422-A7B5-5216FE4F71E3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C0FDA629-485A-4795-80D1-BC228F610163}"
EndProject
@@ -348,24 +348,24 @@ Global
{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x64.Build.0 = Debug|Any CPU
{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x86.ActiveCfg = Debug|Any CPU
{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x86.Build.0 = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Debug|x64.ActiveCfg = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Debug|x64.Build.0 = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Debug|x86.Build.0 = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Release|Any CPU.Build.0 = Release|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Release|x64.ActiveCfg = Release|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Release|x64.Build.0 = Release|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Release|x86.ActiveCfg = Release|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Release|x86.Build.0 = Release|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Checked|x64.ActiveCfg = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Checked|x64.Build.0 = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Checked|x86.ActiveCfg = Debug|Any CPU
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0}.Checked|x86.Build.0 = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Debug|x64.Build.0 = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Debug|x86.Build.0 = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Release|x64.ActiveCfg = Release|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Release|x64.Build.0 = Release|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Release|x86.ActiveCfg = Release|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Release|x86.Build.0 = Release|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Checked|x64.Build.0 = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3}.Checked|x86.Build.0 = Debug|Any CPU
{C0FDA629-485A-4795-80D1-BC228F610163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C0FDA629-485A-4795-80D1-BC228F610163}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C0FDA629-485A-4795-80D1-BC228F610163}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -443,7 +443,7 @@ Global
{A8BB1002-C4B3-4B77-9A99-908FC6C84811} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64}
{1885EF4C-6A85-4170-8E5B-7C158C4BECDB} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64}
{0269FFAF-E680-4BC8-A1B4-0333D77911BC} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA}
- {64554B4A-B6C5-4D22-A1D1-6757F510CAE0} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA}
+ {56B120CF-EBB5-4422-A7B5-5216FE4F71E3} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA}
{C0FDA629-485A-4795-80D1-BC228F610163} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln b/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
index 9eb449fc256..65613f9a77d 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TextWrit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TextWriterTraceListener.Tests", "tests\System.Diagnostics.TextWriterTraceListener.Tests.csproj", "{A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4EEC9BE6-88AC-4ABD-9CC5-0AE368425DA0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FA37050B-F735-43A3-A1AF-94BC06D88E1A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1E5E7A69-E4B6-44ED-BABB-327C2F32830B}"
EndProject
@@ -41,10 +41,10 @@ Global
{A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4}.Release|Any CPU.Build.0 = Release|Any CPU
- {4EEC9BE6-88AC-4ABD-9CC5-0AE368425DA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4EEC9BE6-88AC-4ABD-9CC5-0AE368425DA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4EEC9BE6-88AC-4ABD-9CC5-0AE368425DA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4EEC9BE6-88AC-4ABD-9CC5-0AE368425DA0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FA37050B-F735-43A3-A1AF-94BC06D88E1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FA37050B-F735-43A3-A1AF-94BC06D88E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FA37050B-F735-43A3-A1AF-94BC06D88E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FA37050B-F735-43A3-A1AF-94BC06D88E1A}.Release|Any CPU.Build.0 = Release|Any CPU
{1E5E7A69-E4B6-44ED-BABB-327C2F32830B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1E5E7A69-E4B6-44ED-BABB-327C2F32830B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E5E7A69-E4B6-44ED-BABB-327C2F32830B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4} = {C2EA1B5C-E1FF-491B-B243-17B133914DAE}
{7B2B6693-9877-47BB-A2A1-C1E94596AAE7} = {261ED6BF-3867-4A06-B9A3-4973BCAB5621}
{6D2D27DE-9BFF-4ABA-B520-D1C81AA9A847} = {AA9494D5-6DB3-4A88-B219-13746C6BC2AD}
- {4EEC9BE6-88AC-4ABD-9CC5-0AE368425DA0} = {4F17E201-98A0-44A6-8B34-BF3A4B5B5EA8}
+ {FA37050B-F735-43A3-A1AF-94BC06D88E1A} = {4F17E201-98A0-44A6-8B34-BF3A4B5B5EA8}
{1E5E7A69-E4B6-44ED-BABB-327C2F32830B} = {4F17E201-98A0-44A6-8B34-BF3A4B5B5EA8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln b/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
index 760da7c0089..635841baada 100644
--- a/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
+++ b/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tools.Te
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{103898BF-8D8F-4A35-A943-027A47E4BD36}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{0F3398E4-CD75-45E9-B8DB-0073BF8712B0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{78C30412-0737-4680-AC94-CBD44DBDFCB9}"
EndProject
@@ -144,24 +144,24 @@ Global
{103898BF-8D8F-4A35-A943-027A47E4BD36}.Checked|x64.Build.0 = Debug|Any CPU
{103898BF-8D8F-4A35-A943-027A47E4BD36}.Checked|x86.ActiveCfg = Debug|Any CPU
{103898BF-8D8F-4A35-A943-027A47E4BD36}.Checked|x86.Build.0 = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Debug|x64.ActiveCfg = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Debug|x64.Build.0 = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Debug|x86.Build.0 = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Release|Any CPU.Build.0 = Release|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Release|x64.ActiveCfg = Release|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Release|x64.Build.0 = Release|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Release|x86.ActiveCfg = Release|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Release|x86.Build.0 = Release|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Checked|x64.ActiveCfg = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Checked|x64.Build.0 = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Checked|x86.ActiveCfg = Debug|Any CPU
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0}.Checked|x86.Build.0 = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Debug|x64.Build.0 = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Debug|x86.Build.0 = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Release|x64.ActiveCfg = Release|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Release|x64.Build.0 = Release|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Release|x86.ActiveCfg = Release|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Release|x86.Build.0 = Release|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Checked|x64.Build.0 = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE}.Checked|x86.Build.0 = Debug|Any CPU
{78C30412-0737-4680-AC94-CBD44DBDFCB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{78C30412-0737-4680-AC94-CBD44DBDFCB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{78C30412-0737-4680-AC94-CBD44DBDFCB9}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -191,7 +191,7 @@ Global
{A63F3AEA-F4ED-4047-A11F-490325530D92} = {0EFD8A36-ACB0-4451-800E-DA867389324D}
{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B} = {F8D19CA8-D65B-4C4B-9851-8E2836CFD72E}
{103898BF-8D8F-4A35-A943-027A47E4BD36} = {F5CD84BD-2A56-47BD-A14E-531D0391918A}
- {0F3398E4-CD75-45E9-B8DB-0073BF8712B0} = {F5CD84BD-2A56-47BD-A14E-531D0391918A}
+ {EDA8C760-7617-4CD5-9320-CDE02AB6FDEE} = {F5CD84BD-2A56-47BD-A14E-531D0391918A}
{78C30412-0737-4680-AC94-CBD44DBDFCB9} = {F5CD84BD-2A56-47BD-A14E-531D0391918A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
index d10563baf47..b750ece9770 100644
--- a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
+++ b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
@@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\Sy
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj", "{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2F5DA438-6CBA-42AA-818A-64C633A56D55}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A17B970B-41B2-4C78-BA05-2B954357E46A}"
EndProject
@@ -268,24 +268,24 @@ Global
{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Checked|x64.Build.0 = Debug|Any CPU
{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Checked|x86.ActiveCfg = Debug|Any CPU
{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Checked|x86.Build.0 = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Debug|x64.ActiveCfg = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Debug|x64.Build.0 = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Debug|x86.ActiveCfg = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Debug|x86.Build.0 = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Release|Any CPU.Build.0 = Release|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Release|x64.ActiveCfg = Release|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Release|x64.Build.0 = Release|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Release|x86.ActiveCfg = Release|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Release|x86.Build.0 = Release|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Checked|x64.ActiveCfg = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Checked|x64.Build.0 = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Checked|x86.ActiveCfg = Debug|Any CPU
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}.Checked|x86.Build.0 = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Debug|x64.Build.0 = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Debug|x86.Build.0 = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Release|x64.ActiveCfg = Release|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Release|x64.Build.0 = Release|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Release|x86.ActiveCfg = Release|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Release|x86.Build.0 = Release|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Checked|x64.Build.0 = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55}.Checked|x86.Build.0 = Debug|Any CPU
{A17B970B-41B2-4C78-BA05-2B954357E46A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A17B970B-41B2-4C78-BA05-2B954357E46A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A17B970B-41B2-4C78-BA05-2B954357E46A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -359,7 +359,7 @@ Global
{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A}
{2F00396E-003A-4385-92DC-69FDBEF330D8} = {1826CD8D-A5E3-4C8E-A49A-E746D9682B87}
{8EAD8906-AF4E-42CA-983E-28CFE2224AEE} = {BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16}
- {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791} = {BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16}
+ {2F5DA438-6CBA-42AA-818A-64C633A56D55} = {BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16}
{A17B970B-41B2-4C78-BA05-2B954357E46A} = {BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
index 28658ff4d5a..55e9bc6f89b 100644
--- a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
+++ b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{3969DA9E-6C7D-421D-ABCC-BD02DFA36DA4}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2B753122-D85F-4D4D-8F4B-0C8BF4924275}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7D67652E-7840-42AF-A830-F9A336AD8CBE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{38416350-0E7B-4201-8B7E-3FA80FCFA81A}"
EndProject
@@ -144,24 +144,24 @@ Global
{3969DA9E-6C7D-421D-ABCC-BD02DFA36DA4}.Checked|x64.Build.0 = Debug|Any CPU
{3969DA9E-6C7D-421D-ABCC-BD02DFA36DA4}.Checked|x86.ActiveCfg = Debug|Any CPU
{3969DA9E-6C7D-421D-ABCC-BD02DFA36DA4}.Checked|x86.Build.0 = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Debug|x64.ActiveCfg = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Debug|x64.Build.0 = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Debug|x86.ActiveCfg = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Debug|x86.Build.0 = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Release|Any CPU.Build.0 = Release|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Release|x64.ActiveCfg = Release|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Release|x64.Build.0 = Release|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Release|x86.ActiveCfg = Release|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Release|x86.Build.0 = Release|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Checked|x64.ActiveCfg = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Checked|x64.Build.0 = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Checked|x86.ActiveCfg = Debug|Any CPU
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275}.Checked|x86.Build.0 = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Debug|x64.Build.0 = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Debug|x86.Build.0 = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Release|x64.ActiveCfg = Release|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Release|x64.Build.0 = Release|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Release|x86.ActiveCfg = Release|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Release|x86.Build.0 = Release|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Checked|x64.Build.0 = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE}.Checked|x86.Build.0 = Debug|Any CPU
{38416350-0E7B-4201-8B7E-3FA80FCFA81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{38416350-0E7B-4201-8B7E-3FA80FCFA81A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38416350-0E7B-4201-8B7E-3FA80FCFA81A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -191,7 +191,7 @@ Global
{24605C4D-2465-433D-A393-45CB950E0834} = {21E11D21-3706-49C7-ACA7-10BA9A021908}
{D7C16DED-127A-4CBB-BBCF-DF133816413B} = {61AC03AE-7090-458C-A3AB-5A4CCFF6AD08}
{3969DA9E-6C7D-421D-ABCC-BD02DFA36DA4} = {F2FD3769-35C6-481A-AF35-9BDDEE550B54}
- {2B753122-D85F-4D4D-8F4B-0C8BF4924275} = {F2FD3769-35C6-481A-AF35-9BDDEE550B54}
+ {7D67652E-7840-42AF-A830-F9A336AD8CBE} = {F2FD3769-35C6-481A-AF35-9BDDEE550B54}
{38416350-0E7B-4201-8B7E-3FA80FCFA81A} = {F2FD3769-35C6-481A-AF35-9BDDEE550B54}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
index 7ada21c346b..c30c71ec014 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
+++ b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{28D6099B-F9A5-4E38-AC58-DC659D66A781}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F94DCCFF-85FF-4D3E-8D77-06C2BA4CA79A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{083BBAF9-356A-4C4B-B928-EB2DAF8D251F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{052330E1-08F5-4AC3-987D-4C601D640414}"
EndProject
@@ -113,10 +113,10 @@ Global
{28D6099B-F9A5-4E38-AC58-DC659D66A781}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28D6099B-F9A5-4E38-AC58-DC659D66A781}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28D6099B-F9A5-4E38-AC58-DC659D66A781}.Release|Any CPU.Build.0 = Release|Any CPU
- {F94DCCFF-85FF-4D3E-8D77-06C2BA4CA79A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F94DCCFF-85FF-4D3E-8D77-06C2BA4CA79A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F94DCCFF-85FF-4D3E-8D77-06C2BA4CA79A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F94DCCFF-85FF-4D3E-8D77-06C2BA4CA79A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {083BBAF9-356A-4C4B-B928-EB2DAF8D251F}.Release|Any CPU.Build.0 = Release|Any CPU
{052330E1-08F5-4AC3-987D-4C601D640414}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{052330E1-08F5-4AC3-987D-4C601D640414}.Debug|Any CPU.Build.0 = Debug|Any CPU
{052330E1-08F5-4AC3-987D-4C601D640414}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -170,7 +170,7 @@ Global
{A6769C35-8C53-46BF-84AE-44C921C39BEA} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
{46B233B0-01EA-4569-BDA9-1A7526FAF6E6} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A} = {C2159C53-1E91-486D-A66C-E658FB73A87F}
- {F94DCCFF-85FF-4D3E-8D77-06C2BA4CA79A} = {CBDB0A5C-FDD0-4B00-8840-D40E4D6B17DB}
+ {083BBAF9-356A-4C4B-B928-EB2DAF8D251F} = {CBDB0A5C-FDD0-4B00-8840-D40E4D6B17DB}
{052330E1-08F5-4AC3-987D-4C601D640414} = {CBDB0A5C-FDD0-4B00-8840-D40E4D6B17DB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
index 3a0067d012d..56c5e4fc052 100644
--- a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
+++ b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{7D023C02-F4AB-456F-8106-88FD95798129}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9AEF4834-69FA-4002-88DA-D7708E5FA8AA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2C3750CD-EEE9-4452-B901-AF3084E6B9B2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}"
EndProject
@@ -85,10 +85,10 @@ Global
{7D023C02-F4AB-456F-8106-88FD95798129}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D023C02-F4AB-456F-8106-88FD95798129}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D023C02-F4AB-456F-8106-88FD95798129}.Release|Any CPU.Build.0 = Release|Any CPU
- {9AEF4834-69FA-4002-88DA-D7708E5FA8AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9AEF4834-69FA-4002-88DA-D7708E5FA8AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9AEF4834-69FA-4002-88DA-D7708E5FA8AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9AEF4834-69FA-4002-88DA-D7708E5FA8AA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2C3750CD-EEE9-4452-B901-AF3084E6B9B2}.Release|Any CPU.Build.0 = Release|Any CPU
{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -128,7 +128,7 @@ Global
{7D023C02-F4AB-456F-8106-88FD95798129} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}
{167E89F1-63F0-4E47-B67E-9931589E75CE} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}
{19B414C5-ACD0-4E78-B0A0-C698132F1988} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}
- {9AEF4834-69FA-4002-88DA-D7708E5FA8AA} = {6BC70A1F-00D5-482D-9603-DD6C6E84AE4B}
+ {2C3750CD-EEE9-4452-B901-AF3084E6B9B2} = {6BC70A1F-00D5-482D-9603-DD6C6E84AE4B}
{8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5} = {6BC70A1F-00D5-482D-9603-DD6C6E84AE4B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
index 080017301b0..3430c8d1463 100644
--- a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
+++ b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
@@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{6F0FF033-08A4-4DC3-8D86-46969C36972F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{33CA6B93-4555-4DD5-BF1E-3963C5975A21}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{5AB39023-05D5-48A2-9414-C289ECB1C13B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{29CA2D73-E756-4A81-A0A3-733C771FB0AB}"
EndProject
@@ -73,10 +73,10 @@ Global
{6F0FF033-08A4-4DC3-8D86-46969C36972F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F0FF033-08A4-4DC3-8D86-46969C36972F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F0FF033-08A4-4DC3-8D86-46969C36972F}.Release|Any CPU.Build.0 = Release|Any CPU
- {33CA6B93-4555-4DD5-BF1E-3963C5975A21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {33CA6B93-4555-4DD5-BF1E-3963C5975A21}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {33CA6B93-4555-4DD5-BF1E-3963C5975A21}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {33CA6B93-4555-4DD5-BF1E-3963C5975A21}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5AB39023-05D5-48A2-9414-C289ECB1C13B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5AB39023-05D5-48A2-9414-C289ECB1C13B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5AB39023-05D5-48A2-9414-C289ECB1C13B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5AB39023-05D5-48A2-9414-C289ECB1C13B}.Release|Any CPU.Build.0 = Release|Any CPU
{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -114,7 +114,7 @@ Global
{6F0FF033-08A4-4DC3-8D86-46969C36972F} = {87FDB279-F475-45C0-92EF-7893E25AA0A6}
{E2B0069E-C11C-4829-87C8-A98ED298CB8A} = {87FDB279-F475-45C0-92EF-7893E25AA0A6}
{B3473ABA-A06B-445E-AE21-C7432AD14482} = {87FDB279-F475-45C0-92EF-7893E25AA0A6}
- {33CA6B93-4555-4DD5-BF1E-3963C5975A21} = {C1A58B90-FE26-4840-9D69-60DFC77BF485}
+ {5AB39023-05D5-48A2-9414-C289ECB1C13B} = {C1A58B90-FE26-4840-9D69-60DFC77BF485}
{29CA2D73-E756-4A81-A0A3-733C771FB0AB} = {C1A58B90-FE26-4840-9D69-60DFC77BF485}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Drawing.Common/System.Drawing.Common.sln b/src/libraries/System.Drawing.Common/System.Drawing.Common.sln
index 1ecd916ad06..c8dc2bfe2ed 100644
--- a/src/libraries/System.Drawing.Common/System.Drawing.Common.sln
+++ b/src/libraries/System.Drawing.Common/System.Drawing.Common.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "sr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common.Tests", "tests\System.Drawing.Common.Tests.csproj", "{F14479F4-611E-49DA-BB07-74C0AB096FB5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{70DC9070-FD02-4288-90ED-C44FA3F74F11}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B6592EC7-9532-49C2-AC7E-FF83B9EBF943}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{958E19D9-4216-49C4-B7D6-5DAEA9166D35}"
EndProject
@@ -53,10 +53,10 @@ Global
{F14479F4-611E-49DA-BB07-74C0AB096FB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F14479F4-611E-49DA-BB07-74C0AB096FB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F14479F4-611E-49DA-BB07-74C0AB096FB5}.Release|Any CPU.Build.0 = Release|Any CPU
- {70DC9070-FD02-4288-90ED-C44FA3F74F11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {70DC9070-FD02-4288-90ED-C44FA3F74F11}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {70DC9070-FD02-4288-90ED-C44FA3F74F11}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {70DC9070-FD02-4288-90ED-C44FA3F74F11}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B6592EC7-9532-49C2-AC7E-FF83B9EBF943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B6592EC7-9532-49C2-AC7E-FF83B9EBF943}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B6592EC7-9532-49C2-AC7E-FF83B9EBF943}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B6592EC7-9532-49C2-AC7E-FF83B9EBF943}.Release|Any CPU.Build.0 = Release|Any CPU
{958E19D9-4216-49C4-B7D6-5DAEA9166D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{958E19D9-4216-49C4-B7D6-5DAEA9166D35}.Debug|Any CPU.Build.0 = Debug|Any CPU
{958E19D9-4216-49C4-B7D6-5DAEA9166D35}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +72,7 @@ Global
{790BF98D-7616-410C-BEF8-2CBA7E7601BB} = {7471DB83-C273-481B-9AD8-51B468C1F75E}
{4BBDE239-6D43-43C0-AF72-25116A49A9E0} = {4C4E5584-A0CC-441D-89EF-C0EA125E7120}
{F1A41550-378D-4651-915F-263BD9AB460E} = {4C4E5584-A0CC-441D-89EF-C0EA125E7120}
- {70DC9070-FD02-4288-90ED-C44FA3F74F11} = {B09E2F78-85C8-4353-90B3-79DB869E83D5}
+ {B6592EC7-9532-49C2-AC7E-FF83B9EBF943} = {B09E2F78-85C8-4353-90B3-79DB869E83D5}
{958E19D9-4216-49C4-B7D6-5DAEA9166D35} = {B09E2F78-85C8-4353-90B3-79DB869E83D5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
index 013b6b4b424..ae840b9f5e2 100644
--- a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
+++ b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives.Tests", "tests\System.Drawing.Primitives.Tests.csproj", "{515B6C1E-757F-497E-9707-37B5822FFC9A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B4071D6F-5102-49A1-B28D-CB745A179371}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{315E574D-6A26-4A89-83B5-1C948F3C83D2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9ECCC771-064F-403E-8E0E-7B049AAFAD36}"
EndProject
@@ -41,10 +41,10 @@ Global
{515B6C1E-757F-497E-9707-37B5822FFC9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{515B6C1E-757F-497E-9707-37B5822FFC9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{515B6C1E-757F-497E-9707-37B5822FFC9A}.Release|Any CPU.Build.0 = Release|Any CPU
- {B4071D6F-5102-49A1-B28D-CB745A179371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B4071D6F-5102-49A1-B28D-CB745A179371}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B4071D6F-5102-49A1-B28D-CB745A179371}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B4071D6F-5102-49A1-B28D-CB745A179371}.Release|Any CPU.Build.0 = Release|Any CPU
+ {315E574D-6A26-4A89-83B5-1C948F3C83D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {315E574D-6A26-4A89-83B5-1C948F3C83D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {315E574D-6A26-4A89-83B5-1C948F3C83D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {315E574D-6A26-4A89-83B5-1C948F3C83D2}.Release|Any CPU.Build.0 = Release|Any CPU
{9ECCC771-064F-403E-8E0E-7B049AAFAD36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9ECCC771-064F-403E-8E0E-7B049AAFAD36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9ECCC771-064F-403E-8E0E-7B049AAFAD36}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{515B6C1E-757F-497E-9707-37B5822FFC9A} = {B004DC3D-DA89-4C76-8D15-327CCDB6D7C0}
{D2E753F4-34A3-4641-9C0F-53539147CCF2} = {F2D0660B-B4A3-4039-A47D-63F9D1CE19B6}
{80A68643-0E37-4525-BF06-F50C3BF7B867} = {722DCDC1-7510-4B50-93F4-51E5FF833B2A}
- {B4071D6F-5102-49A1-B28D-CB745A179371} = {8349AD04-5979-4347-A869-7F76B043453E}
+ {315E574D-6A26-4A89-83B5-1C948F3C83D2} = {8349AD04-5979-4347-A869-7F76B043453E}
{9ECCC771-064F-403E-8E0E-7B049AAFAD36} = {8349AD04-5979-4347-A869-7F76B043453E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln b/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
index c0a04076dd2..2f890d8457c 100644
--- a/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
+++ b/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Dynamic.Runtime", "s
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Dynamic.Runtime.Tests", "tests\System.Dynamic.Runtime.Tests.csproj", "{3695B814-610C-41D5-A3F5-B0B55EF10863}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6428C5CC-7326-4614-BFD8-1288410CD1A4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{99DE2346-D955-46C1-BAFB-652AEF9AFB27}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{14610D93-4B51-4853-A328-D5B7B2A6B6A1}"
EndProject
@@ -41,10 +41,10 @@ Global
{3695B814-610C-41D5-A3F5-B0B55EF10863}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3695B814-610C-41D5-A3F5-B0B55EF10863}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3695B814-610C-41D5-A3F5-B0B55EF10863}.Release|Any CPU.Build.0 = Release|Any CPU
- {6428C5CC-7326-4614-BFD8-1288410CD1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6428C5CC-7326-4614-BFD8-1288410CD1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6428C5CC-7326-4614-BFD8-1288410CD1A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6428C5CC-7326-4614-BFD8-1288410CD1A4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {99DE2346-D955-46C1-BAFB-652AEF9AFB27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {99DE2346-D955-46C1-BAFB-652AEF9AFB27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {99DE2346-D955-46C1-BAFB-652AEF9AFB27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {99DE2346-D955-46C1-BAFB-652AEF9AFB27}.Release|Any CPU.Build.0 = Release|Any CPU
{14610D93-4B51-4853-A328-D5B7B2A6B6A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{14610D93-4B51-4853-A328-D5B7B2A6B6A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{14610D93-4B51-4853-A328-D5B7B2A6B6A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{3695B814-610C-41D5-A3F5-B0B55EF10863} = {B3F05E8C-539A-4D2E-BFEC-F4963970F5A0}
{1A6D5602-176D-4E7D-A7F5-F4D25044E171} = {09FD0366-1902-4E68-9EFE-20E78EA9E499}
{F4EF8420-0243-452F-879E-609F9AE7C05E} = {E7D88582-C912-4F52-BDD0-CADB896D95CF}
- {6428C5CC-7326-4614-BFD8-1288410CD1A4} = {77B35F51-2D3C-47F2-8BEF-CB8B741C70A5}
+ {99DE2346-D955-46C1-BAFB-652AEF9AFB27} = {77B35F51-2D3C-47F2-8BEF-CB8B741C70A5}
{14610D93-4B51-4853-A328-D5B7B2A6B6A1} = {77B35F51-2D3C-47F2-8BEF-CB8B741C70A5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln b/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
index cc5151164b2..3040ff0ddc3 100644
--- a/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
+++ b/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
@@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj", "{0E49FF32-6CC1-42B0-AF30-25098C7DA18F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{5947E587-4DA8-4BA5-B368-9D172D2186F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{078ADF8D-48B1-45A9-913E-20362B63590A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B64227A9-23C4-4B99-A5E0-7028CA40FF32}"
EndProject
@@ -65,10 +65,10 @@ Global
{0E49FF32-6CC1-42B0-AF30-25098C7DA18F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E49FF32-6CC1-42B0-AF30-25098C7DA18F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E49FF32-6CC1-42B0-AF30-25098C7DA18F}.Release|Any CPU.Build.0 = Release|Any CPU
- {5947E587-4DA8-4BA5-B368-9D172D2186F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5947E587-4DA8-4BA5-B368-9D172D2186F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5947E587-4DA8-4BA5-B368-9D172D2186F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5947E587-4DA8-4BA5-B368-9D172D2186F2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {078ADF8D-48B1-45A9-913E-20362B63590A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {078ADF8D-48B1-45A9-913E-20362B63590A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {078ADF8D-48B1-45A9-913E-20362B63590A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {078ADF8D-48B1-45A9-913E-20362B63590A}.Release|Any CPU.Build.0 = Release|Any CPU
{B64227A9-23C4-4B99-A5E0-7028CA40FF32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B64227A9-23C4-4B99-A5E0-7028CA40FF32}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B64227A9-23C4-4B99-A5E0-7028CA40FF32}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -86,7 +86,7 @@ Global
{B51B75BA-A1AF-42FB-9845-E9AAC42CFB22} = {7D4FCCCB-BD58-4ABE-A98D-140A5B303DF6}
{A078A4EB-27E8-42B1-BD44-3807732A4560} = {7D4FCCCB-BD58-4ABE-A98D-140A5B303DF6}
{0E49FF32-6CC1-42B0-AF30-25098C7DA18F} = {7D4FCCCB-BD58-4ABE-A98D-140A5B303DF6}
- {5947E587-4DA8-4BA5-B368-9D172D2186F2} = {425CDAF9-11CA-4C58-B6D4-0CB644481EF9}
+ {078ADF8D-48B1-45A9-913E-20362B63590A} = {425CDAF9-11CA-4C58-B6D4-0CB644481EF9}
{B64227A9-23C4-4B99-A5E0-7028CA40FF32} = {425CDAF9-11CA-4C58-B6D4-0CB644481EF9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln b/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln
index 69a5956de19..b814ec50040 100644
--- a/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln
+++ b/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln
@@ -9,7 +9,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "System.Formats.Cbor.Tests.D
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor.Tests", "tests\System.Formats.Cbor.Tests.csproj", "{29879823-0A6F-44A0-B0A5-D90DEC23E4EF}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{778BE70A-9A4B-47A1-A394-08AE5644465B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{1A5762F8-12A3-4731-BF4A-186FA9697828}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B054CCD9-E0FD-4F93-B8BC-DD1631B99F69}"
EndProject
@@ -47,10 +47,10 @@ Global
{29879823-0A6F-44A0-B0A5-D90DEC23E4EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29879823-0A6F-44A0-B0A5-D90DEC23E4EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{29879823-0A6F-44A0-B0A5-D90DEC23E4EF}.Release|Any CPU.Build.0 = Release|Any CPU
- {778BE70A-9A4B-47A1-A394-08AE5644465B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {778BE70A-9A4B-47A1-A394-08AE5644465B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {778BE70A-9A4B-47A1-A394-08AE5644465B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {778BE70A-9A4B-47A1-A394-08AE5644465B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1A5762F8-12A3-4731-BF4A-186FA9697828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1A5762F8-12A3-4731-BF4A-186FA9697828}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1A5762F8-12A3-4731-BF4A-186FA9697828}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1A5762F8-12A3-4731-BF4A-186FA9697828}.Release|Any CPU.Build.0 = Release|Any CPU
{B054CCD9-E0FD-4F93-B8BC-DD1631B99F69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B054CCD9-E0FD-4F93-B8BC-DD1631B99F69}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B054CCD9-E0FD-4F93-B8BC-DD1631B99F69}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{29879823-0A6F-44A0-B0A5-D90DEC23E4EF} = {172C0706-C81F-4DDD-A4B8-52B28481FD67}
{259A1DB6-EF7E-4D45-96EF-035E0605BB55} = {46BA9FAE-9204-455A-BB2D-518E5B5C3E4C}
{8D8A522D-D363-4594-81BF-0EB16C0B4713} = {B9017269-3067-4CD3-B1E7-2EA25BCE9F79}
- {778BE70A-9A4B-47A1-A394-08AE5644465B} = {F186B21D-7138-458B-AEB8-1C1B9711D005}
+ {1A5762F8-12A3-4731-BF4A-186FA9697828} = {F186B21D-7138-458B-AEB8-1C1B9711D005}
{B054CCD9-E0FD-4F93-B8BC-DD1631B99F69} = {F186B21D-7138-458B-AEB8-1C1B9711D005}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln
index 7ba0bef4feb..a920026b02b 100644
--- a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln
+++ b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Calend
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{617B4727-AA14-4840-8898-1947D7C6E437}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{27524A99-0D20-463E-B11E-95BFB6BD59CD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{85FFAE67-940A-4C58-AF73-0E0CF9722B29}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6AADBEF6-644B-4174-9AB4-EB6023E2404B}"
EndProject
@@ -164,24 +164,24 @@ Global
{617B4727-AA14-4840-8898-1947D7C6E437}.Checked|x64.Build.0 = Debug|Any CPU
{617B4727-AA14-4840-8898-1947D7C6E437}.Checked|x86.ActiveCfg = Debug|Any CPU
{617B4727-AA14-4840-8898-1947D7C6E437}.Checked|x86.Build.0 = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Debug|x64.ActiveCfg = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Debug|x64.Build.0 = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Debug|x86.ActiveCfg = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Debug|x86.Build.0 = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Release|Any CPU.Build.0 = Release|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Release|x64.ActiveCfg = Release|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Release|x64.Build.0 = Release|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Release|x86.ActiveCfg = Release|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Release|x86.Build.0 = Release|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Checked|x64.ActiveCfg = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Checked|x64.Build.0 = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Checked|x86.ActiveCfg = Debug|Any CPU
- {27524A99-0D20-463E-B11E-95BFB6BD59CD}.Checked|x86.Build.0 = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|x64.Build.0 = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Debug|x86.Build.0 = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|Any CPU.Build.0 = Release|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|x64.ActiveCfg = Release|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|x64.Build.0 = Release|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|x86.ActiveCfg = Release|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Release|x86.Build.0 = Release|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x64.Build.0 = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29}.Checked|x86.Build.0 = Debug|Any CPU
{6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6AADBEF6-644B-4174-9AB4-EB6023E2404B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -212,7 +212,7 @@ Global
{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706} = {CDAC58B3-78D7-482F-B3EF-798DFAF7A1A4}
{6553EF4A-C352-4034-835A-7679E589B5A6} = {4449A37B-FFED-470F-9F39-24611CB72D10}
{617B4727-AA14-4840-8898-1947D7C6E437} = {749527EE-F2D9-4169-A75A-B00BA30651A1}
- {27524A99-0D20-463E-B11E-95BFB6BD59CD} = {749527EE-F2D9-4169-A75A-B00BA30651A1}
+ {85FFAE67-940A-4C58-AF73-0E0CF9722B29} = {749527EE-F2D9-4169-A75A-B00BA30651A1}
{6AADBEF6-644B-4174-9AB4-EB6023E2404B} = {749527EE-F2D9-4169-A75A-B00BA30651A1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln b/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln
index 58c61eae990..0298de37ee6 100644
--- a/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln
+++ b/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extens
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions.Tests", "tests\System.Globalization.Extensions.Tests.csproj", "{E2C4269C-0009-4811-9FC0-CDC97554FBEE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2148E049-FDC9-4C8F-83B5-2FE2FD15B249}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{F715E82D-3256-45B6-8185-3A4EDC31F608}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C1DCC3F5-7615-4BC0-9F1E-10296CEAABAB}"
EndProject
@@ -47,10 +47,10 @@ Global
{E2C4269C-0009-4811-9FC0-CDC97554FBEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2C4269C-0009-4811-9FC0-CDC97554FBEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E2C4269C-0009-4811-9FC0-CDC97554FBEE}.Release|Any CPU.Build.0 = Release|Any CPU
- {2148E049-FDC9-4C8F-83B5-2FE2FD15B249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2148E049-FDC9-4C8F-83B5-2FE2FD15B249}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2148E049-FDC9-4C8F-83B5-2FE2FD15B249}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2148E049-FDC9-4C8F-83B5-2FE2FD15B249}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F715E82D-3256-45B6-8185-3A4EDC31F608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F715E82D-3256-45B6-8185-3A4EDC31F608}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F715E82D-3256-45B6-8185-3A4EDC31F608}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F715E82D-3256-45B6-8185-3A4EDC31F608}.Release|Any CPU.Build.0 = Release|Any CPU
{C1DCC3F5-7615-4BC0-9F1E-10296CEAABAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C1DCC3F5-7615-4BC0-9F1E-10296CEAABAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C1DCC3F5-7615-4BC0-9F1E-10296CEAABAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{E2C4269C-0009-4811-9FC0-CDC97554FBEE} = {67629EF1-20BE-495B-A130-2A8D2E4DE84C}
{03BF7E49-E28C-468E-8D90-E4022B608F00} = {05839DE3-A6DC-458D-908B-E227C8F90CCF}
{DCD0404E-234C-437B-A80A-EAFD567F7602} = {7EE611F4-CA1C-4CCA-AE26-23F11F5A60AC}
- {2148E049-FDC9-4C8F-83B5-2FE2FD15B249} = {87335DA1-4287-4642-BC7B-EEA4A4833407}
+ {F715E82D-3256-45B6-8185-3A4EDC31F608} = {87335DA1-4287-4642-BC7B-EEA4A4833407}
{C1DCC3F5-7615-4BC0-9F1E-10296CEAABAB} = {87335DA1-4287-4642-BC7B-EEA4A4833407}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Globalization/System.Globalization.sln b/src/libraries/System.Globalization/System.Globalization.sln
index 042e3abb5bb..404f55e1edd 100644
--- a/src/libraries/System.Globalization/System.Globalization.sln
+++ b/src/libraries/System.Globalization/System.Globalization.sln
@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Tests"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{74CAB3C9-1AE1-467E-B139-35E7113F4660}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{0C4322F3-548D-4B72-91D1-A0CBEAB240A5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{12E788BB-7E58-4780-B52E-DB5A91A49DFF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{F4A35959-8F1B-4CA9-B672-3ACFBDD54174}"
EndProject
@@ -204,24 +204,24 @@ Global
{74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|x64.Build.0 = Debug|Any CPU
{74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|x86.ActiveCfg = Debug|Any CPU
{74CAB3C9-1AE1-467E-B139-35E7113F4660}.Checked|x86.Build.0 = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Debug|x64.ActiveCfg = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Debug|x64.Build.0 = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Debug|x86.ActiveCfg = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Debug|x86.Build.0 = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Release|Any CPU.Build.0 = Release|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Release|x64.ActiveCfg = Release|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Release|x64.Build.0 = Release|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Release|x86.ActiveCfg = Release|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Release|x86.Build.0 = Release|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Checked|x64.ActiveCfg = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Checked|x64.Build.0 = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Checked|x86.ActiveCfg = Debug|Any CPU
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5}.Checked|x86.Build.0 = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|x64.Build.0 = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Debug|x86.Build.0 = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|x64.ActiveCfg = Release|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|x64.Build.0 = Release|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|x86.ActiveCfg = Release|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Release|x86.Build.0 = Release|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x64.Build.0 = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF}.Checked|x86.Build.0 = Debug|Any CPU
{F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F4A35959-8F1B-4CA9-B672-3ACFBDD54174}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -254,7 +254,7 @@ Global
{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379}
{55249BC9-201A-4418-AF14-7AC743D9A867} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA}
{74CAB3C9-1AE1-467E-B139-35E7113F4660} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB}
- {0C4322F3-548D-4B72-91D1-A0CBEAB240A5} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB}
+ {12E788BB-7E58-4780-B52E-DB5A91A49DFF} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB}
{F4A35959-8F1B-4CA9-B672-3ACFBDD54174} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln b/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln
index ba3d1375f2d..232e00632ac 100644
--- a/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln
+++ b/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Brotl
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Brotli.Tests", "tests\System.IO.Compression.Brotli.Tests.csproj", "{E62974EA-7E36-4183-8371-4C8EA02037B5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E6692761-D4BE-4528-A1FE-609D6A86F014}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{43B12013-5509-43BB-9173-2CFE43B135AA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{2AA8D3E7-D2E4-49E8-AE94-461CE261B1BF}"
EndProject
@@ -47,10 +47,10 @@ Global
{E62974EA-7E36-4183-8371-4C8EA02037B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E62974EA-7E36-4183-8371-4C8EA02037B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E62974EA-7E36-4183-8371-4C8EA02037B5}.Release|Any CPU.Build.0 = Release|Any CPU
- {E6692761-D4BE-4528-A1FE-609D6A86F014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E6692761-D4BE-4528-A1FE-609D6A86F014}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E6692761-D4BE-4528-A1FE-609D6A86F014}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E6692761-D4BE-4528-A1FE-609D6A86F014}.Release|Any CPU.Build.0 = Release|Any CPU
+ {43B12013-5509-43BB-9173-2CFE43B135AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {43B12013-5509-43BB-9173-2CFE43B135AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {43B12013-5509-43BB-9173-2CFE43B135AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {43B12013-5509-43BB-9173-2CFE43B135AA}.Release|Any CPU.Build.0 = Release|Any CPU
{2AA8D3E7-D2E4-49E8-AE94-461CE261B1BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2AA8D3E7-D2E4-49E8-AE94-461CE261B1BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2AA8D3E7-D2E4-49E8-AE94-461CE261B1BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{E62974EA-7E36-4183-8371-4C8EA02037B5} = {864B86AD-4BC9-4997-8370-EC8B2055FE08}
{7EC62394-2290-4075-AF5D-842C7A0F6325} = {1BC1DCD5-DECC-4712-8539-56E6D71A17FF}
{C2A30FF0-54C2-461B-BF16-5DC610F54B52} = {D7FE73BB-2F95-42D3-9392-FBAD87A73436}
- {E6692761-D4BE-4528-A1FE-609D6A86F014} = {4F867226-2107-455D-B378-2FC08BD3F064}
+ {43B12013-5509-43BB-9173-2CFE43B135AA} = {4F867226-2107-455D-B378-2FC08BD3F064}
{2AA8D3E7-D2E4-49E8-AE94-461CE261B1BF} = {4F867226-2107-455D-B378-2FC08BD3F064}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln b/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
index 76064f9617c..fcf695812d6 100644
--- a/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
+++ b/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.ZipFi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.ZipFile.Tests", "tests\System.IO.Compression.ZipFile.Tests.csproj", "{D5A89FC9-7913-4F80-BA16-6587EB6140E3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E7CAD543-D5BB-486F-85A4-9F914F973653}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{AE18A377-AAE7-488B-A873-8463A2706BC0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{5DC533A5-D0F0-488B-81C2-7AD7546528DD}"
EndProject
@@ -41,10 +41,10 @@ Global
{D5A89FC9-7913-4F80-BA16-6587EB6140E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5A89FC9-7913-4F80-BA16-6587EB6140E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D5A89FC9-7913-4F80-BA16-6587EB6140E3}.Release|Any CPU.Build.0 = Release|Any CPU
- {E7CAD543-D5BB-486F-85A4-9F914F973653}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E7CAD543-D5BB-486F-85A4-9F914F973653}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E7CAD543-D5BB-486F-85A4-9F914F973653}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E7CAD543-D5BB-486F-85A4-9F914F973653}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AE18A377-AAE7-488B-A873-8463A2706BC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AE18A377-AAE7-488B-A873-8463A2706BC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AE18A377-AAE7-488B-A873-8463A2706BC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AE18A377-AAE7-488B-A873-8463A2706BC0}.Release|Any CPU.Build.0 = Release|Any CPU
{5DC533A5-D0F0-488B-81C2-7AD7546528DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5DC533A5-D0F0-488B-81C2-7AD7546528DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DC533A5-D0F0-488B-81C2-7AD7546528DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{D5A89FC9-7913-4F80-BA16-6587EB6140E3} = {A46DB030-84B9-49C0-8F75-98FE1290EF88}
{E91931AD-977E-4608-9F40-997163322D8B} = {A8BAE96C-3EAD-4E68-BBB0-A4854F386CC4}
{A3C36A2F-2586-43DF-B39C-A9D14DF8524E} = {5C592E59-B3F3-4743-BC80-F5C799B16B74}
- {E7CAD543-D5BB-486F-85A4-9F914F973653} = {82C30050-0689-4C48-AA32-E7137F0417DC}
+ {AE18A377-AAE7-488B-A873-8463A2706BC0} = {82C30050-0689-4C48-AA32-E7137F0417DC}
{5DC533A5-D0F0-488B-81C2-7AD7546528DD} = {82C30050-0689-4C48-AA32-E7137F0417DC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
index 7e9194ebe8e..1e6345d68b7 100644
--- a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
+++ b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
</PropertyGroup>
diff --git a/src/libraries/System.IO.Compression/System.IO.Compression.sln b/src/libraries/System.IO.Compression/System.IO.Compression.sln
index b832cf191b4..3dddb26a081 100644
--- a/src/libraries/System.IO.Compression/System.IO.Compression.sln
+++ b/src/libraries/System.IO.Compression/System.IO.Compression.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression", "sr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Tests", "tests\System.IO.Compression.Tests.csproj", "{DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{168BB11E-EB88-4C0E-9CF6-46282DEB2EEE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{77B12FDD-F00D-4EA0-A802-2A0C12D0CE96}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9A07A277-2896-48FC-8A20-5E290069B07D}"
EndProject
@@ -47,10 +47,10 @@ Global
{DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A}.Release|Any CPU.Build.0 = Release|Any CPU
- {168BB11E-EB88-4C0E-9CF6-46282DEB2EEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {168BB11E-EB88-4C0E-9CF6-46282DEB2EEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {168BB11E-EB88-4C0E-9CF6-46282DEB2EEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {168BB11E-EB88-4C0E-9CF6-46282DEB2EEE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {77B12FDD-F00D-4EA0-A802-2A0C12D0CE96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {77B12FDD-F00D-4EA0-A802-2A0C12D0CE96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {77B12FDD-F00D-4EA0-A802-2A0C12D0CE96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {77B12FDD-F00D-4EA0-A802-2A0C12D0CE96}.Release|Any CPU.Build.0 = Release|Any CPU
{9A07A277-2896-48FC-8A20-5E290069B07D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A07A277-2896-48FC-8A20-5E290069B07D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A07A277-2896-48FC-8A20-5E290069B07D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A} = {BB657E6F-1D06-4E7A-B4C2-B40A071A2A44}
{9BFD204A-0DB1-466A-9704-0E869AC8940F} = {350F6B1E-B006-4EA5-BA9E-41F57FF84FF1}
{ED776381-E13D-4A0B-ACB4-74C5A784BD25} = {8541C42E-9FC4-4077-B828-720BD028F1F5}
- {168BB11E-EB88-4C0E-9CF6-46282DEB2EEE} = {BA616F42-6B1E-4333-9698-C39EA13AEEA2}
+ {77B12FDD-F00D-4EA0-A802-2A0C12D0CE96} = {BA616F42-6B1E-4333-9698-C39EA13AEEA2}
{9A07A277-2896-48FC-8A20-5E290069B07D} = {BA616F42-6B1E-4333-9698-C39EA13AEEA2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln b/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
index 52e5ae815f0..deb01e99e4d 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
+++ b/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Access
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl.Tests", "tests\System.IO.FileSystem.AccessControl.Tests.csproj", "{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{01009C12-AB2E-4A6C-A40F-760409351DD3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4E815F64-6F9A-485D-825D-930830F7EABB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E939A1C0-31C6-4EA6-9020-ADDE06272528}"
EndProject
@@ -85,10 +85,10 @@ Global
{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Release|Any CPU.Build.0 = Release|Any CPU
- {01009C12-AB2E-4A6C-A40F-760409351DD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {01009C12-AB2E-4A6C-A40F-760409351DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {01009C12-AB2E-4A6C-A40F-760409351DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {01009C12-AB2E-4A6C-A40F-760409351DD3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4E815F64-6F9A-485D-825D-930830F7EABB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4E815F64-6F9A-485D-825D-930830F7EABB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4E815F64-6F9A-485D-825D-930830F7EABB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4E815F64-6F9A-485D-825D-930830F7EABB}.Release|Any CPU.Build.0 = Release|Any CPU
{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E939A1C0-31C6-4EA6-9020-ADDE06272528}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -128,7 +128,7 @@ Global
{35D57A83-8A9D-4531-BF0D-EA1BCA62D475} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
{87E03C4D-FFE2-43AD-9CFE-BB67A2448186} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}
- {01009C12-AB2E-4A6C-A40F-760409351DD3} = {7227D008-BBBE-48D0-979B-9BC483BA7E60}
+ {4E815F64-6F9A-485D-825D-930830F7EABB} = {7227D008-BBBE-48D0-979B-9BC483BA7E60}
{E939A1C0-31C6-4EA6-9020-ADDE06272528} = {7227D008-BBBE-48D0-979B-9BC483BA7E60}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln b/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
index d2a6c587055..37e1ced6f7b 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.DriveI
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.DriveInfo.Tests", "tests\System.IO.FileSystem.DriveInfo.Tests.csproj", "{F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{355B2E23-3EA6-4C16-A153-3E9574220F6E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FBEEAA13-A404-4BB5-AE41-098F2D9B4E15}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B9E98144-5561-4CED-BC68-93021B390983}"
EndProject
@@ -41,10 +41,10 @@ Global
{F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41}.Release|Any CPU.Build.0 = Release|Any CPU
- {355B2E23-3EA6-4C16-A153-3E9574220F6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {355B2E23-3EA6-4C16-A153-3E9574220F6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {355B2E23-3EA6-4C16-A153-3E9574220F6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {355B2E23-3EA6-4C16-A153-3E9574220F6E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FBEEAA13-A404-4BB5-AE41-098F2D9B4E15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FBEEAA13-A404-4BB5-AE41-098F2D9B4E15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FBEEAA13-A404-4BB5-AE41-098F2D9B4E15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FBEEAA13-A404-4BB5-AE41-098F2D9B4E15}.Release|Any CPU.Build.0 = Release|Any CPU
{B9E98144-5561-4CED-BC68-93021B390983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B9E98144-5561-4CED-BC68-93021B390983}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B9E98144-5561-4CED-BC68-93021B390983}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41} = {F74D982D-DFE5-48DA-87C0-245FC612F118}
{8AF52F6B-61C2-4D23-A69C-6FCF8D138C58} = {4626E870-1F74-4ED4-AF80-DDDD42DEF47E}
{03A51C60-B41B-409B-97AA-4084042C78D7} = {F20F7286-4DFA-42EE-947B-8ABC6B7E088F}
- {355B2E23-3EA6-4C16-A153-3E9574220F6E} = {9BFF66A7-7077-4C69-BAB7-5FE6E2D9DBBC}
+ {FBEEAA13-A404-4BB5-AE41-098F2D9B4E15} = {9BFF66A7-7077-4C69-BAB7-5FE6E2D9DBBC}
{B9E98144-5561-4CED-BC68-93021B390983} = {9BFF66A7-7077-4C69-BAB7-5FE6E2D9DBBC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln b/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
index 887b7d6f65a..8da8c5f1405 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
+++ b/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Primit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Primitives.Tests", "tests\System.IO.FileSystem.Primitives.Tests.csproj", "{AA882A52-10CB-4272-BF22-A7964627E266}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BB213103-780E-4711-B8E8-4E85FB6DC047}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{377FE785-590B-417E-9F1F-4BE1F04751F5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{7B9309E5-1B27-4951-8F82-9E5DFC97BA72}"
EndProject
@@ -41,10 +41,10 @@ Global
{AA882A52-10CB-4272-BF22-A7964627E266}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA882A52-10CB-4272-BF22-A7964627E266}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA882A52-10CB-4272-BF22-A7964627E266}.Release|Any CPU.Build.0 = Release|Any CPU
- {BB213103-780E-4711-B8E8-4E85FB6DC047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BB213103-780E-4711-B8E8-4E85FB6DC047}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BB213103-780E-4711-B8E8-4E85FB6DC047}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BB213103-780E-4711-B8E8-4E85FB6DC047}.Release|Any CPU.Build.0 = Release|Any CPU
+ {377FE785-590B-417E-9F1F-4BE1F04751F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {377FE785-590B-417E-9F1F-4BE1F04751F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {377FE785-590B-417E-9F1F-4BE1F04751F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {377FE785-590B-417E-9F1F-4BE1F04751F5}.Release|Any CPU.Build.0 = Release|Any CPU
{7B9309E5-1B27-4951-8F82-9E5DFC97BA72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7B9309E5-1B27-4951-8F82-9E5DFC97BA72}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B9309E5-1B27-4951-8F82-9E5DFC97BA72}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{AA882A52-10CB-4272-BF22-A7964627E266} = {DB4B0A5D-51E4-44C4-9E0F-9E60ED3D5F7D}
{08B0A52E-C11E-4F88-957E-561E8E3621EE} = {A1C36837-2EE8-40FF-A6B1-96D09D3F2EA8}
{F0212CB8-23E6-4D89-A90E-C6F820778F53} = {D7A47DEE-DC4F-4BC0-9A9D-A7E14230B340}
- {BB213103-780E-4711-B8E8-4E85FB6DC047} = {BD73949B-3201-4737-8469-0E599744668C}
+ {377FE785-590B-417E-9F1F-4BE1F04751F5} = {BD73949B-3201-4737-8469-0E599744668C}
{7B9309E5-1B27-4951-8F82-9E5DFC97BA72} = {BD73949B-3201-4737-8469-0E599744668C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln b/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
index fd4fdd9de30..f7530a5edc9 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
+++ b/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Watche
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Watcher.Tests", "tests\System.IO.FileSystem.Watcher.Tests.csproj", "{8928F2EE-437E-4AB8-9038-077179F37939}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{CC9141D5-87FD-4716-9333-66286EA725ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B0C17840-DF58-49D8-9501-D2F1398E3BE4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{DB80E810-8B37-4116-9835-889E16FEC389}"
EndProject
@@ -41,10 +41,10 @@ Global
{8928F2EE-437E-4AB8-9038-077179F37939}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8928F2EE-437E-4AB8-9038-077179F37939}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8928F2EE-437E-4AB8-9038-077179F37939}.Release|Any CPU.Build.0 = Release|Any CPU
- {CC9141D5-87FD-4716-9333-66286EA725ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CC9141D5-87FD-4716-9333-66286EA725ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CC9141D5-87FD-4716-9333-66286EA725ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CC9141D5-87FD-4716-9333-66286EA725ED}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B0C17840-DF58-49D8-9501-D2F1398E3BE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B0C17840-DF58-49D8-9501-D2F1398E3BE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B0C17840-DF58-49D8-9501-D2F1398E3BE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B0C17840-DF58-49D8-9501-D2F1398E3BE4}.Release|Any CPU.Build.0 = Release|Any CPU
{DB80E810-8B37-4116-9835-889E16FEC389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB80E810-8B37-4116-9835-889E16FEC389}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DB80E810-8B37-4116-9835-889E16FEC389}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{8928F2EE-437E-4AB8-9038-077179F37939} = {A4E6A754-5006-4E2F-BC57-0A96E3A82A4D}
{318B6BCF-3AB6-40A7-B16A-E40EA4F3B202} = {FB3E732D-C87B-41E9-ADC2-C2D84B87D04F}
{310BA7DB-1A9E-46E1-B414-606474FFFFFA} = {BCDF2178-959A-48C9-B26D-18E62C80199C}
- {CC9141D5-87FD-4716-9333-66286EA725ED} = {1C8EC715-29EB-40DF-A78F-35636153B267}
+ {B0C17840-DF58-49D8-9501-D2F1398E3BE4} = {1C8EC715-29EB-40DF-A78F-35636153B267}
{DB80E810-8B37-4116-9835-889E16FEC389} = {1C8EC715-29EB-40DF-A78F-35636153B267}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
index 381f9dfc4e4..d72295f4036 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
@@ -4,7 +4,7 @@
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'tvOS'">true</IgnoreForCI>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
diff --git a/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln b/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln
index 5ac83db2901..f1def87fbaf 100644
--- a/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln
+++ b/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln
@@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Manual
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Tests", "tests\System.IO.FileSystem.Tests.csproj", "{3A8E16D3-8A22-4076-BB48-2CD1FBFAF81B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{555BFFEE-9189-41EC-AE9C-1D11449963D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{55B3FF71-9462-4C03-88CF-6649D9DC5591}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{DFC5F78F-6A33-4AB5-BC18-F8BAD14C9CBB}"
EndProject
@@ -97,10 +97,10 @@ Global
{3A8E16D3-8A22-4076-BB48-2CD1FBFAF81B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A8E16D3-8A22-4076-BB48-2CD1FBFAF81B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3A8E16D3-8A22-4076-BB48-2CD1FBFAF81B}.Release|Any CPU.Build.0 = Release|Any CPU
- {555BFFEE-9189-41EC-AE9C-1D11449963D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {555BFFEE-9189-41EC-AE9C-1D11449963D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {555BFFEE-9189-41EC-AE9C-1D11449963D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {555BFFEE-9189-41EC-AE9C-1D11449963D6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {55B3FF71-9462-4C03-88CF-6649D9DC5591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {55B3FF71-9462-4C03-88CF-6649D9DC5591}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {55B3FF71-9462-4C03-88CF-6649D9DC5591}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {55B3FF71-9462-4C03-88CF-6649D9DC5591}.Release|Any CPU.Build.0 = Release|Any CPU
{DFC5F78F-6A33-4AB5-BC18-F8BAD14C9CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DFC5F78F-6A33-4AB5-BC18-F8BAD14C9CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DFC5F78F-6A33-4AB5-BC18-F8BAD14C9CBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -142,7 +142,7 @@ Global
{8A502375-D99B-4C43-92C9-F5DFB336AF38} = {A0499117-998E-494E-943B-86F428E5C59F}
{877E39A8-51CB-463A-AF4C-6FAE4F438075} = {A0499117-998E-494E-943B-86F428E5C59F}
{3E06E543-2562-4AFB-B04F-520485B876A8} = {A0499117-998E-494E-943B-86F428E5C59F}
- {555BFFEE-9189-41EC-AE9C-1D11449963D6} = {0C49C624-3156-4A0C-A383-3F82EE65C478}
+ {55B3FF71-9462-4C03-88CF-6649D9DC5591} = {0C49C624-3156-4A0C-A383-3F82EE65C478}
{DFC5F78F-6A33-4AB5-BC18-F8BAD14C9CBB} = {0C49C624-3156-4A0C-A383-3F82EE65C478}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj
index 99230625e3c..792e40fee3c 100644
--- a/src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<!-- file locking can't be disabled on Windows -->
<TargetFrameworks>$(NetCoreAppCurrent)-Unix</TargetFrameworks>
diff --git a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
index 053c913a456..fbbe5ff0709 100644
--- a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
@@ -5,7 +5,7 @@
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<WasmXHarnessMonoArgs>--working-dir=/test-dir</WasmXHarnessMonoArgs>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="Base\BaseGetSetAttributes.cs" />
diff --git a/src/libraries/System.IO.Hashing/System.IO.Hashing.sln b/src/libraries/System.IO.Hashing/System.IO.Hashing.sln
index 3195189c42a..57d5526d0c5 100644
--- a/src/libraries/System.IO.Hashing/System.IO.Hashing.sln
+++ b/src/libraries/System.IO.Hashing/System.IO.Hashing.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Hashing", "src\Sy
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Hashing.Tests", "tests\System.IO.Hashing.Tests.csproj", "{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E937AD61-2A4B-4AD0-B9B2-D39213EE8FD1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0EBDAC1E-7132-406B-96B4-F8875A689C99}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39}"
EndProject
@@ -33,10 +33,10 @@ Global
{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294}.Release|Any CPU.Build.0 = Release|Any CPU
- {E937AD61-2A4B-4AD0-B9B2-D39213EE8FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E937AD61-2A4B-4AD0-B9B2-D39213EE8FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E937AD61-2A4B-4AD0-B9B2-D39213EE8FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E937AD61-2A4B-4AD0-B9B2-D39213EE8FD1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0EBDAC1E-7132-406B-96B4-F8875A689C99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0EBDAC1E-7132-406B-96B4-F8875A689C99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0EBDAC1E-7132-406B-96B4-F8875A689C99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0EBDAC1E-7132-406B-96B4-F8875A689C99}.Release|Any CPU.Build.0 = Release|Any CPU
{A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -49,7 +49,7 @@ Global
{F94DE827-A426-45CB-AE6E-4E1C154B5386} = {1E78399D-326B-4C9F-B8A9-A7E684EEA349}
{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294} = {1E78399D-326B-4C9F-B8A9-A7E684EEA349}
{A078A4EB-27E8-42B1-BD44-3807732A4560} = {F2826BE8-9FA1-40C8-8FD4-E98A4644733E}
- {E937AD61-2A4B-4AD0-B9B2-D39213EE8FD1} = {26D7BA38-5978-4423-814C-0C8D9F38C1A3}
+ {0EBDAC1E-7132-406B-96B4-F8875A689C99} = {26D7BA38-5978-4423-814C-0C8D9F38C1A3}
{A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39} = {26D7BA38-5978-4423-814C-0C8D9F38C1A3}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
index 88929870f1b..3ab16ded704 100644
--- a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
+++ b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.IsolatedStorage",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.IsolatedStorage.Tests", "tests\System.IO.IsolatedStorage.Tests.csproj", "{88125FEA-D679-4A1A-8736-A18EC13AFC75}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{0659E404-2029-41BA-8201-3C82FD5D7195}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{CB45B17E-7E90-4687-B5CB-697D761FAF8C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{4DAA9EA7-245F-45D6-8061-010F7AA64752}"
EndProject
@@ -85,10 +85,10 @@ Global
{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Debug|Any CPU.Build.0 = Debug|Any CPU
{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Release|Any CPU.ActiveCfg = Release|Any CPU
{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Release|Any CPU.Build.0 = Release|Any CPU
- {0659E404-2029-41BA-8201-3C82FD5D7195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0659E404-2029-41BA-8201-3C82FD5D7195}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0659E404-2029-41BA-8201-3C82FD5D7195}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0659E404-2029-41BA-8201-3C82FD5D7195}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CB45B17E-7E90-4687-B5CB-697D761FAF8C}.Release|Any CPU.Build.0 = Release|Any CPU
{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4DAA9EA7-245F-45D6-8061-010F7AA64752}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -128,7 +128,7 @@ Global
{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
{2C9EFD7A-F153-47BF-B2E6-73094696DF45} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA}
- {0659E404-2029-41BA-8201-3C82FD5D7195} = {3424E375-E1DA-46BA-91D2-E1EA86BAF98F}
+ {CB45B17E-7E90-4687-B5CB-697D761FAF8C} = {3424E375-E1DA-46BA-91D2-E1EA86BAF98F}
{4DAA9EA7-245F-45D6-8061-010F7AA64752} = {3424E375-E1DA-46BA-91D2-E1EA86BAF98F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
index 02eb8303e77..fa75df27614 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
+++ b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.MemoryMappedFiles
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.MemoryMappedFiles.Tests", "tests\System.IO.MemoryMappedFiles.Tests.csproj", "{AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{06826F87-1E78-4F0B-9BC0-63E78F560700}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{08C7C81E-76EF-49D1-A9AA-CB2E0AB6A913}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{3D0ED921-30AE-4D7C-BFE7-CC4BD0CE9B40}"
EndProject
@@ -47,10 +47,10 @@ Global
{AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860}.Release|Any CPU.Build.0 = Release|Any CPU
- {06826F87-1E78-4F0B-9BC0-63E78F560700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {06826F87-1E78-4F0B-9BC0-63E78F560700}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {06826F87-1E78-4F0B-9BC0-63E78F560700}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {06826F87-1E78-4F0B-9BC0-63E78F560700}.Release|Any CPU.Build.0 = Release|Any CPU
+ {08C7C81E-76EF-49D1-A9AA-CB2E0AB6A913}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {08C7C81E-76EF-49D1-A9AA-CB2E0AB6A913}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {08C7C81E-76EF-49D1-A9AA-CB2E0AB6A913}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {08C7C81E-76EF-49D1-A9AA-CB2E0AB6A913}.Release|Any CPU.Build.0 = Release|Any CPU
{3D0ED921-30AE-4D7C-BFE7-CC4BD0CE9B40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3D0ED921-30AE-4D7C-BFE7-CC4BD0CE9B40}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D0ED921-30AE-4D7C-BFE7-CC4BD0CE9B40}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860} = {E9193727-72AB-4A35-BABF-A11D7C1A8B04}
{F4ACA509-281C-43DA-A57D-52D9913321AE} = {E91F427C-6CD7-496B-B4E8-D837CB8B96F8}
{4A95E6CD-A466-46BC-A6C7-C65DA45B3388} = {7CDB9185-B436-4B6A-91A2-DD2C30BB49D9}
- {06826F87-1E78-4F0B-9BC0-63E78F560700} = {AF9FF36B-5C67-40C3-9BC4-5C8FE09956E2}
+ {08C7C81E-76EF-49D1-A9AA-CB2E0AB6A913} = {AF9FF36B-5C67-40C3-9BC4-5C8FE09956E2}
{3D0ED921-30AE-4D7C-BFE7-CC4BD0CE9B40} = {AF9FF36B-5C67-40C3-9BC4-5C8FE09956E2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
index 614f9b602b1..a8a88974aee 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
@@ -3,7 +3,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="MemoryMappedFile.CreateFromFile.Tests.cs" />
diff --git a/src/libraries/System.IO.Packaging/System.IO.Packaging.sln b/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
index feeb923ced5..41ce57ab5d9 100644
--- a/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
+++ b/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging", "src\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging.Tests", "tests\System.IO.Packaging.Tests.csproj", "{588B83D6-132B-4399-B31E-4B40CD9CCAE6}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D032DFE9-3CDF-43A6-AE11-367C2B505B19}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E58B740D-A353-4D96-857F-0C6898A0BAAB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0}"
EndProject
@@ -41,10 +41,10 @@ Global
{588B83D6-132B-4399-B31E-4B40CD9CCAE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{588B83D6-132B-4399-B31E-4B40CD9CCAE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{588B83D6-132B-4399-B31E-4B40CD9CCAE6}.Release|Any CPU.Build.0 = Release|Any CPU
- {D032DFE9-3CDF-43A6-AE11-367C2B505B19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D032DFE9-3CDF-43A6-AE11-367C2B505B19}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D032DFE9-3CDF-43A6-AE11-367C2B505B19}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D032DFE9-3CDF-43A6-AE11-367C2B505B19}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E58B740D-A353-4D96-857F-0C6898A0BAAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E58B740D-A353-4D96-857F-0C6898A0BAAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E58B740D-A353-4D96-857F-0C6898A0BAAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E58B740D-A353-4D96-857F-0C6898A0BAAB}.Release|Any CPU.Build.0 = Release|Any CPU
{5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{588B83D6-132B-4399-B31E-4B40CD9CCAE6} = {CDE13DDC-F9E2-4C5F-9379-26E3273B7270}
{6EF662E4-9A1E-4DAC-A04B-A1461BB6CA28} = {A31F533C-5EA6-4E97-91B1-C298BE0060E0}
{C553FA20-C4C0-48A2-B841-12F2F860E21F} = {A767928D-1A4C-4513-9FF6-CB395D45B6A8}
- {D032DFE9-3CDF-43A6-AE11-367C2B505B19} = {89942E1D-4F98-4CEF-B275-8A30127462BE}
+ {E58B740D-A353-4D96-857F-0C6898A0BAAB} = {89942E1D-4F98-4CEF-B275-8A30127462BE}
{5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0} = {89942E1D-4F98-4CEF-B275-8A30127462BE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln b/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
index 0b564194bcf..9af0eccd55a 100644
--- a/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
+++ b/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "src\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines.Tests", "tests\System.IO.Pipelines.Tests.csproj", "{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{8D129F0B-A3D3-4CF7-BE17-E70C954BD6F7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{EB66BC9F-8895-494C-81CD-5F64A7DA1D4D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1A609A5A-8D99-4849-AF21-BB7510070C49}"
EndProject
@@ -47,10 +47,10 @@ Global
{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08}.Release|Any CPU.Build.0 = Release|Any CPU
- {8D129F0B-A3D3-4CF7-BE17-E70C954BD6F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8D129F0B-A3D3-4CF7-BE17-E70C954BD6F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8D129F0B-A3D3-4CF7-BE17-E70C954BD6F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8D129F0B-A3D3-4CF7-BE17-E70C954BD6F7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EB66BC9F-8895-494C-81CD-5F64A7DA1D4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EB66BC9F-8895-494C-81CD-5F64A7DA1D4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EB66BC9F-8895-494C-81CD-5F64A7DA1D4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EB66BC9F-8895-494C-81CD-5F64A7DA1D4D}.Release|Any CPU.Build.0 = Release|Any CPU
{1A609A5A-8D99-4849-AF21-BB7510070C49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A609A5A-8D99-4849-AF21-BB7510070C49}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A609A5A-8D99-4849-AF21-BB7510070C49}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08} = {6FCDC00D-202F-4BFE-B799-DFD3F2E8F44D}
{DC148B85-05DB-43B2-B2AF-958C305C2C0A} = {BC2B926D-1416-4330-A62B-EC48667E0E7B}
{1DD520A2-ED75-4889-848E-DBDC7BE41873} = {0F960DB3-8D87-4D62-BF68-75299FED62F7}
- {8D129F0B-A3D3-4CF7-BE17-E70C954BD6F7} = {68B6BB77-1325-4BD7-95B1-67ECA89889E8}
+ {EB66BC9F-8895-494C-81CD-5F64A7DA1D4D} = {68B6BB77-1325-4BD7-95B1-67ECA89889E8}
{1A609A5A-8D99-4849-AF21-BB7510070C49} = {68B6BB77-1325-4BD7-95B1-67ECA89889E8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln b/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
index eea450bfdfd..3f74c2ef25f 100644
--- a/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
+++ b/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.AccessContr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes", "..\System.IO.Pipes\src\System.IO.Pipes.csproj", "{5AE837A0-E966-41E5-9230-0830BB3E727F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{914C72C6-0230-48F0-BF5C-D791D86C3F7E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{49F9208B-CEFC-402E-815C-2CF64FD0C85C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{123AF6E1-60BF-4360-9010-885AB140205F}"
EndProject
@@ -47,10 +47,10 @@ Global
{5AE837A0-E966-41E5-9230-0830BB3E727F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5AE837A0-E966-41E5-9230-0830BB3E727F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5AE837A0-E966-41E5-9230-0830BB3E727F}.Release|Any CPU.Build.0 = Release|Any CPU
- {914C72C6-0230-48F0-BF5C-D791D86C3F7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {914C72C6-0230-48F0-BF5C-D791D86C3F7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {914C72C6-0230-48F0-BF5C-D791D86C3F7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {914C72C6-0230-48F0-BF5C-D791D86C3F7E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {49F9208B-CEFC-402E-815C-2CF64FD0C85C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {49F9208B-CEFC-402E-815C-2CF64FD0C85C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {49F9208B-CEFC-402E-815C-2CF64FD0C85C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {49F9208B-CEFC-402E-815C-2CF64FD0C85C}.Release|Any CPU.Build.0 = Release|Any CPU
{123AF6E1-60BF-4360-9010-885AB140205F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{123AF6E1-60BF-4360-9010-885AB140205F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{123AF6E1-60BF-4360-9010-885AB140205F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{26E03980-4DB8-43B6-8737-1F7CAF7E5089} = {ADDC6FEE-EDF2-4EAD-B802-1BCF686E0D71}
{B6731AC0-E4F2-4E6C-B6DF-63EF396FCB71} = {F8E1D6D4-F8BF-4B79-8E2B-49BFE4145670}
{5AE837A0-E966-41E5-9230-0830BB3E727F} = {F8E1D6D4-F8BF-4B79-8E2B-49BFE4145670}
- {914C72C6-0230-48F0-BF5C-D791D86C3F7E} = {EB85C209-FC5D-455A-8BFE-E7B0D9CC48E8}
+ {49F9208B-CEFC-402E-815C-2CF64FD0C85C} = {EB85C209-FC5D-455A-8BFE-E7B0D9CC48E8}
{123AF6E1-60BF-4360-9010-885AB140205F} = {EB85C209-FC5D-455A-8BFE-E7B0D9CC48E8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
index 729d74b389f..4a29354ede1 100644
--- a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
+++ b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
@@ -33,7 +33,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes", "src\Syst
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.Tests", "tests\System.IO.Pipes.Tests.csproj", "{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F9392A09-41F0-4BAA-B80B-A0136542AFA8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C1B1DCD9-30B9-4E17-A049-A04DCED30D14}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}"
EndProject
@@ -131,10 +131,10 @@ Global
{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Release|Any CPU.Build.0 = Release|Any CPU
- {F9392A09-41F0-4BAA-B80B-A0136542AFA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F9392A09-41F0-4BAA-B80B-A0136542AFA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F9392A09-41F0-4BAA-B80B-A0136542AFA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F9392A09-41F0-4BAA-B80B-A0136542AFA8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C1B1DCD9-30B9-4E17-A049-A04DCED30D14}.Release|Any CPU.Build.0 = Release|Any CPU
{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -191,7 +191,7 @@ Global
{E565DD4A-0749-4F5E-8476-EF44D742E377} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
{15CB5F16-593B-460D-BDC3-134A56EF3B5F} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5} = {B90127A0-E005-44FE-9D2B-3DE06444CE37}
- {F9392A09-41F0-4BAA-B80B-A0136542AFA8} = {FE4693B5-3585-4555-BABA-A8BE2AA9C85E}
+ {C1B1DCD9-30B9-4E17-A049-A04DCED30D14} = {FE4693B5-3585-4555-BABA-A8BE2AA9C85E}
{D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA} = {FE4693B5-3585-4555-BABA-A8BE2AA9C85E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
index dcec96f7ec5..8f31d5dd604 100644
--- a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
+++ b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
@@ -4,7 +4,7 @@
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
diff --git a/src/libraries/System.IO.Ports/System.IO.Ports.sln b/src/libraries/System.IO.Ports/System.IO.Ports.sln
index 2906dc907be..c7555e34c7f 100644
--- a/src/libraries/System.IO.Ports/System.IO.Ports.sln
+++ b/src/libraries/System.IO.Ports/System.IO.Ports.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Ports", "src\Syst
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Ports.Tests", "tests\System.IO.Ports.Tests.csproj", "{32AD9913-7FC8-499A-9712-A5128998BFDA}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{073209AA-3CCC-4884-82B5-D895B2EAAF4C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{AAB67274-550C-40C2-92EA-38C12CC2060F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{094F1156-D8B8-420C-945C-B74E1454B6E5}"
EndProject
@@ -81,10 +81,10 @@ Global
{32AD9913-7FC8-499A-9712-A5128998BFDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{32AD9913-7FC8-499A-9712-A5128998BFDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{32AD9913-7FC8-499A-9712-A5128998BFDA}.Release|Any CPU.Build.0 = Release|Any CPU
- {073209AA-3CCC-4884-82B5-D895B2EAAF4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {073209AA-3CCC-4884-82B5-D895B2EAAF4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {073209AA-3CCC-4884-82B5-D895B2EAAF4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {073209AA-3CCC-4884-82B5-D895B2EAAF4C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AAB67274-550C-40C2-92EA-38C12CC2060F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AAB67274-550C-40C2-92EA-38C12CC2060F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AAB67274-550C-40C2-92EA-38C12CC2060F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AAB67274-550C-40C2-92EA-38C12CC2060F}.Release|Any CPU.Build.0 = Release|Any CPU
{094F1156-D8B8-420C-945C-B74E1454B6E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{094F1156-D8B8-420C-945C-B74E1454B6E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{094F1156-D8B8-420C-945C-B74E1454B6E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -114,7 +114,7 @@ Global
{50120440-409D-4B8A-B54C-F5FC637EF529} = {F3F3FD18-CF31-4E24-9BBD-5303D38CF86B}
{5594242D-5209-4F6F-AA08-44489B5B733F} = {88B0C0E7-B79E-4DFD-9A65-C3F506507924}
{08EC7EC2-BAE3-4E9D-AD50-14DBFFBC4154} = {88B0C0E7-B79E-4DFD-9A65-C3F506507924}
- {073209AA-3CCC-4884-82B5-D895B2EAAF4C} = {B86A1AC4-AE98-45BB-8548-2C369188D58A}
+ {AAB67274-550C-40C2-92EA-38C12CC2060F} = {B86A1AC4-AE98-45BB-8548-2C369188D58A}
{094F1156-D8B8-420C-945C-B74E1454B6E5} = {B86A1AC4-AE98-45BB-8548-2C369188D58A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln b/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
index 0fada07566e..f84f51184a3 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.UnmanagedMemorySt
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{5CB1579E-E830-4812-A7F5-0E33E1847BF6}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{87B6A1A5-72E6-4345-89CD-D591446D1698}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{00BCBF77-11E9-45BC-A663-D1904B92C0E9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D6653CCB-7EF2-4B4F-86D5-0FC47FDFBC9E}"
EndProject
@@ -164,24 +164,24 @@ Global
{5CB1579E-E830-4812-A7F5-0E33E1847BF6}.Checked|x64.Build.0 = Debug|Any CPU
{5CB1579E-E830-4812-A7F5-0E33E1847BF6}.Checked|x86.ActiveCfg = Debug|Any CPU
{5CB1579E-E830-4812-A7F5-0E33E1847BF6}.Checked|x86.Build.0 = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Debug|x64.ActiveCfg = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Debug|x64.Build.0 = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Debug|x86.ActiveCfg = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Debug|x86.Build.0 = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Release|Any CPU.Build.0 = Release|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Release|x64.ActiveCfg = Release|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Release|x64.Build.0 = Release|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Release|x86.ActiveCfg = Release|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Release|x86.Build.0 = Release|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Checked|x64.ActiveCfg = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Checked|x64.Build.0 = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Checked|x86.ActiveCfg = Debug|Any CPU
- {87B6A1A5-72E6-4345-89CD-D591446D1698}.Checked|x86.Build.0 = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Debug|x64.Build.0 = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Debug|x86.Build.0 = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Release|x64.ActiveCfg = Release|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Release|x64.Build.0 = Release|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Release|x86.ActiveCfg = Release|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Release|x86.Build.0 = Release|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Checked|x64.Build.0 = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9}.Checked|x86.Build.0 = Debug|Any CPU
{D6653CCB-7EF2-4B4F-86D5-0FC47FDFBC9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6653CCB-7EF2-4B4F-86D5-0FC47FDFBC9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6653CCB-7EF2-4B4F-86D5-0FC47FDFBC9E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -212,7 +212,7 @@ Global
{D14DC8D4-F45E-412D-AE98-CA07F900347B} = {7BB3C727-EA87-416E-84DD-34ADD5540067}
{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F} = {F0F69F17-CFD8-4C03-B86D-C95F0F8D78EC}
{5CB1579E-E830-4812-A7F5-0E33E1847BF6} = {8A43D0EF-B87B-4046-963C-3DFA9ADA62FB}
- {87B6A1A5-72E6-4345-89CD-D591446D1698} = {8A43D0EF-B87B-4046-963C-3DFA9ADA62FB}
+ {00BCBF77-11E9-45BC-A663-D1904B92C0E9} = {8A43D0EF-B87B-4046-963C-3DFA9ADA62FB}
{D6653CCB-7EF2-4B4F-86D5-0FC47FDFBC9E} = {8A43D0EF-B87B-4046-963C-3DFA9ADA62FB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.IO/System.IO.sln b/src/libraries/System.IO/System.IO.sln
index 3b2db9f4b1b..9c1a6c126a2 100644
--- a/src/libraries/System.IO/System.IO.sln
+++ b/src/libraries/System.IO/System.IO.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO", "src\System.IO.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Tests", "tests\System.IO.Tests.csproj", "{72923407-7B7B-44A8-BCA6-2DB562835A8F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{C6141F7B-C6ED-4538-B4D2-5017C19C7325}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{CEF7139D-32A2-4640-9E13-4AB4E5CE1846}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D0D58466-29D8-48CA-8FF4-257CC80A0AAD}"
EndProject
@@ -47,10 +47,10 @@ Global
{72923407-7B7B-44A8-BCA6-2DB562835A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72923407-7B7B-44A8-BCA6-2DB562835A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72923407-7B7B-44A8-BCA6-2DB562835A8F}.Release|Any CPU.Build.0 = Release|Any CPU
- {C6141F7B-C6ED-4538-B4D2-5017C19C7325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C6141F7B-C6ED-4538-B4D2-5017C19C7325}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C6141F7B-C6ED-4538-B4D2-5017C19C7325}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C6141F7B-C6ED-4538-B4D2-5017C19C7325}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CEF7139D-32A2-4640-9E13-4AB4E5CE1846}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CEF7139D-32A2-4640-9E13-4AB4E5CE1846}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CEF7139D-32A2-4640-9E13-4AB4E5CE1846}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CEF7139D-32A2-4640-9E13-4AB4E5CE1846}.Release|Any CPU.Build.0 = Release|Any CPU
{D0D58466-29D8-48CA-8FF4-257CC80A0AAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0D58466-29D8-48CA-8FF4-257CC80A0AAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0D58466-29D8-48CA-8FF4-257CC80A0AAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{72923407-7B7B-44A8-BCA6-2DB562835A8F} = {19882357-F402-4021-AF76-536E6B22C630}
{CB000FA4-3F31-4695-B221-60D59BEC0A5E} = {82C2D974-5333-4D45-9C4C-A6BF5F35A6DD}
{0769544B-1A5D-4D74-94FD-899DF6C39D62} = {5F2EDEEC-46BD-4327-BC64-79B6D5A5FF3B}
- {C6141F7B-C6ED-4538-B4D2-5017C19C7325} = {0CE1305C-FE49-448C-81D9-D6BFD32A3D03}
+ {CEF7139D-32A2-4640-9E13-4AB4E5CE1846} = {0CE1305C-FE49-448C-81D9-D6BFD32A3D03}
{D0D58466-29D8-48CA-8FF4-257CC80A0AAD} = {0CE1305C-FE49-448C-81D9-D6BFD32A3D03}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln b/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
index d73cac9d9e4..e31e50a65dc 100644
--- a/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
+++ b/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Expressions", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Expressions.Tests", "tests\System.Linq.Expressions.Tests.csproj", "{CAFF697E-0A65-49BA-9902-79D7D3B00326}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{52653B38-5617-4D17-A6FC-A1F35A44840A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{EA27BB4A-F841-4806-85F7-3ABF92F9E8CE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{06C7EEAC-167E-42C7-B678-621F7B6BE395}"
EndProject
@@ -41,10 +41,10 @@ Global
{CAFF697E-0A65-49BA-9902-79D7D3B00326}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CAFF697E-0A65-49BA-9902-79D7D3B00326}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CAFF697E-0A65-49BA-9902-79D7D3B00326}.Release|Any CPU.Build.0 = Release|Any CPU
- {52653B38-5617-4D17-A6FC-A1F35A44840A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {52653B38-5617-4D17-A6FC-A1F35A44840A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {52653B38-5617-4D17-A6FC-A1F35A44840A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {52653B38-5617-4D17-A6FC-A1F35A44840A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EA27BB4A-F841-4806-85F7-3ABF92F9E8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EA27BB4A-F841-4806-85F7-3ABF92F9E8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EA27BB4A-F841-4806-85F7-3ABF92F9E8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EA27BB4A-F841-4806-85F7-3ABF92F9E8CE}.Release|Any CPU.Build.0 = Release|Any CPU
{06C7EEAC-167E-42C7-B678-621F7B6BE395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{06C7EEAC-167E-42C7-B678-621F7B6BE395}.Debug|Any CPU.Build.0 = Debug|Any CPU
{06C7EEAC-167E-42C7-B678-621F7B6BE395}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{CAFF697E-0A65-49BA-9902-79D7D3B00326} = {CD3E533D-3658-46D9-90EE-4E8344A076FD}
{F3817B5F-98D8-4BE8-8C00-0C166EFBC2B7} = {2CFFD4E7-903A-4C6A-A580-5AE2285A7A26}
{1312B533-04ED-4268-8DAF-A7C69BC870A4} = {EB3E1752-35A9-438C-8C14-0B56F9461589}
- {52653B38-5617-4D17-A6FC-A1F35A44840A} = {7CAFBF55-2D7E-45C5-BEFD-47377A70237D}
+ {EA27BB4A-F841-4806-85F7-3ABF92F9E8CE} = {7CAFBF55-2D7E-45C5-BEFD-47377A70237D}
{06C7EEAC-167E-42C7-B678-621F7B6BE395} = {7CAFBF55-2D7E-45C5-BEFD-47377A70237D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
index f9e3b51f270..76791db07ed 100644
--- a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
+++ b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Parallel", "src
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Parallel.Tests", "tests\System.Linq.Parallel.Tests.csproj", "{0B9B4D1C-998E-4323-84E9-02400EFFBC05}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{57521546-4395-4287-8804-11E63754B204}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{775CCE4D-79E3-4D13-8C57-1FEDA8F7B773}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{CE258E72-5765-46B4-8B93-59D11F91FAE1}"
EndProject
@@ -41,10 +41,10 @@ Global
{0B9B4D1C-998E-4323-84E9-02400EFFBC05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B9B4D1C-998E-4323-84E9-02400EFFBC05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B9B4D1C-998E-4323-84E9-02400EFFBC05}.Release|Any CPU.Build.0 = Release|Any CPU
- {57521546-4395-4287-8804-11E63754B204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {57521546-4395-4287-8804-11E63754B204}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {57521546-4395-4287-8804-11E63754B204}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {57521546-4395-4287-8804-11E63754B204}.Release|Any CPU.Build.0 = Release|Any CPU
+ {775CCE4D-79E3-4D13-8C57-1FEDA8F7B773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {775CCE4D-79E3-4D13-8C57-1FEDA8F7B773}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {775CCE4D-79E3-4D13-8C57-1FEDA8F7B773}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {775CCE4D-79E3-4D13-8C57-1FEDA8F7B773}.Release|Any CPU.Build.0 = Release|Any CPU
{CE258E72-5765-46B4-8B93-59D11F91FAE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE258E72-5765-46B4-8B93-59D11F91FAE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE258E72-5765-46B4-8B93-59D11F91FAE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{0B9B4D1C-998E-4323-84E9-02400EFFBC05} = {75DB4DC3-5DD6-425B-BD36-19BF5B5E1180}
{6201BF54-B81C-456D-BF3E-46C3404E720E} = {20F9AEA0-7D11-4282-81E0-274CDF39D2DA}
{CDF79D0D-248D-48A5-A698-00D34FBA64E1} = {4E48C076-587B-43F6-81C7-3362BDC8D1D8}
- {57521546-4395-4287-8804-11E63754B204} = {B2591C6D-F523-4C15-9E29-2E2E01ACB2C4}
+ {775CCE4D-79E3-4D13-8C57-1FEDA8F7B773} = {B2591C6D-F523-4C15-9E29-2E2E01ACB2C4}
{CE258E72-5765-46B4-8B93-59D11F91FAE1} = {B2591C6D-F523-4C15-9E29-2E2E01ACB2C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln b/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
index d0442db63b8..393c5c5a340 100644
--- a/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
+++ b/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Queryable", "sr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Queryable.Tests", "tests\System.Linq.Queryable.Tests.csproj", "{40A8D49D-B8A3-4780-84D0-C6DBF37BF91E}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A8E67119-8D3A-4FD7-AE28-36CB29743011}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{D100FF6C-66B4-43A9-AB3E-80E8B3D87A7F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{ACFE06FC-0223-4F8F-88B9-AE977B9BEB30}"
EndProject
@@ -41,10 +41,10 @@ Global
{40A8D49D-B8A3-4780-84D0-C6DBF37BF91E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40A8D49D-B8A3-4780-84D0-C6DBF37BF91E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40A8D49D-B8A3-4780-84D0-C6DBF37BF91E}.Release|Any CPU.Build.0 = Release|Any CPU
- {A8E67119-8D3A-4FD7-AE28-36CB29743011}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A8E67119-8D3A-4FD7-AE28-36CB29743011}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A8E67119-8D3A-4FD7-AE28-36CB29743011}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A8E67119-8D3A-4FD7-AE28-36CB29743011}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D100FF6C-66B4-43A9-AB3E-80E8B3D87A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D100FF6C-66B4-43A9-AB3E-80E8B3D87A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D100FF6C-66B4-43A9-AB3E-80E8B3D87A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D100FF6C-66B4-43A9-AB3E-80E8B3D87A7F}.Release|Any CPU.Build.0 = Release|Any CPU
{ACFE06FC-0223-4F8F-88B9-AE977B9BEB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ACFE06FC-0223-4F8F-88B9-AE977B9BEB30}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ACFE06FC-0223-4F8F-88B9-AE977B9BEB30}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{40A8D49D-B8A3-4780-84D0-C6DBF37BF91E} = {55EA11AE-0CFF-47C3-AF61-FE49C04F5C94}
{3C8FC554-3184-46F3-9AFC-C11507020B5F} = {4175E0A1-D5C1-470E-8F0A-EB05DED9B1F4}
{EC9BDC43-2701-4942-AFAC-FED0555B60C9} = {E6F704C7-2418-4ADC-90E6-9C6570EF57BB}
- {A8E67119-8D3A-4FD7-AE28-36CB29743011} = {D124A349-76C6-4FD9-AE3F-D0B674D03CB3}
+ {D100FF6C-66B4-43A9-AB3E-80E8B3D87A7F} = {D124A349-76C6-4FD9-AE3F-D0B674D03CB3}
{ACFE06FC-0223-4F8F-88B9-AE977B9BEB30} = {D124A349-76C6-4FD9-AE3F-D0B674D03CB3}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Linq/System.Linq.sln b/src/libraries/System.Linq/System.Linq.sln
index 0a4ee678c00..639bf2fb65c 100644
--- a/src/libraries/System.Linq/System.Linq.sln
+++ b/src/libraries/System.Linq/System.Linq.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq", "src\System.L
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Tests", "tests\System.Linq.Tests.csproj", "{80A4051B-4A36-4A8B-BA43-A5AB8AA959F3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E8EDE508-3D46-47B8-8F54-D1529568D2B6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4BEC631E-B5FD-453F-82A0-C95C461798EA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C8F0459C-15D5-4624-8CE4-E93ADF96A28C}"
EndProject
@@ -41,10 +41,10 @@ Global
{80A4051B-4A36-4A8B-BA43-A5AB8AA959F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80A4051B-4A36-4A8B-BA43-A5AB8AA959F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80A4051B-4A36-4A8B-BA43-A5AB8AA959F3}.Release|Any CPU.Build.0 = Release|Any CPU
- {E8EDE508-3D46-47B8-8F54-D1529568D2B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E8EDE508-3D46-47B8-8F54-D1529568D2B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E8EDE508-3D46-47B8-8F54-D1529568D2B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E8EDE508-3D46-47B8-8F54-D1529568D2B6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4BEC631E-B5FD-453F-82A0-C95C461798EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4BEC631E-B5FD-453F-82A0-C95C461798EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4BEC631E-B5FD-453F-82A0-C95C461798EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4BEC631E-B5FD-453F-82A0-C95C461798EA}.Release|Any CPU.Build.0 = Release|Any CPU
{C8F0459C-15D5-4624-8CE4-E93ADF96A28C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C8F0459C-15D5-4624-8CE4-E93ADF96A28C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C8F0459C-15D5-4624-8CE4-E93ADF96A28C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{80A4051B-4A36-4A8B-BA43-A5AB8AA959F3} = {E291F4BF-7B8B-45AD-88F5-FB8B8380C126}
{7E4C1F09-B4F2-470E-9E7B-2C386E93D657} = {0BCB262A-FC13-4A48-BB0B-9FA293594701}
{14B966BB-CE23-4432-ADBB-89974389AC1D} = {E6102BFA-0803-4AB7-8E91-C4D3B42AFA20}
- {E8EDE508-3D46-47B8-8F54-D1529568D2B6} = {E61195C4-72B4-47A3-AC98-1F896A0C770F}
+ {4BEC631E-B5FD-453F-82A0-C95C461798EA} = {E61195C4-72B4-47A3-AC98-1F896A0C770F}
{C8F0459C-15D5-4624-8CE4-E93ADF96A28C} = {E61195C4-72B4-47A3-AC98-1F896A0C770F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Management/System.Management.sln b/src/libraries/System.Management/System.Management.sln
index f50689856d4..b81c9c6389a 100644
--- a/src/libraries/System.Management/System.Management.sln
+++ b/src/libraries/System.Management/System.Management.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Management", "src\Sy
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Management.Tests", "tests\System.Management.Tests.csproj", "{7113AE59-F125-4378-B93A-9C5C1450B306}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D282EB2E-CEFC-4600-AC9D-20044F0644DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{8A7BDD6F-B220-4FDD-BC2A-A909A7C01D61}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{AEECC1B0-80B3-4DD2-A309-76E4CF12310E}"
EndProject
@@ -63,10 +63,10 @@ Global
{7113AE59-F125-4378-B93A-9C5C1450B306}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7113AE59-F125-4378-B93A-9C5C1450B306}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7113AE59-F125-4378-B93A-9C5C1450B306}.Release|Any CPU.Build.0 = Release|Any CPU
- {D282EB2E-CEFC-4600-AC9D-20044F0644DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D282EB2E-CEFC-4600-AC9D-20044F0644DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D282EB2E-CEFC-4600-AC9D-20044F0644DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D282EB2E-CEFC-4600-AC9D-20044F0644DF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8A7BDD6F-B220-4FDD-BC2A-A909A7C01D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8A7BDD6F-B220-4FDD-BC2A-A909A7C01D61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8A7BDD6F-B220-4FDD-BC2A-A909A7C01D61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8A7BDD6F-B220-4FDD-BC2A-A909A7C01D61}.Release|Any CPU.Build.0 = Release|Any CPU
{AEECC1B0-80B3-4DD2-A309-76E4CF12310E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AEECC1B0-80B3-4DD2-A309-76E4CF12310E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AEECC1B0-80B3-4DD2-A309-76E4CF12310E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -93,7 +93,7 @@ Global
{C7C6E8BD-304B-499B-9A7E-E19CF4E3342C} = {441745A2-6E7F-48B9-8C9D-A48E0171B3A5}
{7B9EB977-908A-43CB-B2FB-E4E34373F3BF} = {6DC74D98-13B5-4230-87B4-ED3162AFC233}
{D31C6457-B81D-4503-938B-93877DDDBDB5} = {6DC74D98-13B5-4230-87B4-ED3162AFC233}
- {D282EB2E-CEFC-4600-AC9D-20044F0644DF} = {64360DAC-C8F2-4231-A678-CCEFD683949D}
+ {8A7BDD6F-B220-4FDD-BC2A-A909A7C01D61} = {64360DAC-C8F2-4231-A678-CCEFD683949D}
{AEECC1B0-80B3-4DD2-A309-76E4CF12310E} = {64360DAC-C8F2-4231-A678-CCEFD683949D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Memory.Data/System.Memory.Data.sln b/src/libraries/System.Memory.Data/System.Memory.Data.sln
index 3557074dfa9..60ed6491e42 100644
--- a/src/libraries/System.Memory.Data/System.Memory.Data.sln
+++ b/src/libraries/System.Memory.Data/System.Memory.Data.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory.Data", "src\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory.Data.Tests", "tests\System.Memory.Data.Tests.csproj", "{804B5D44-05A3-491E-A6AB-35C592E6703E}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{876EF0B1-6172-4A38-B1F2-382CCCAC929C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{D42EA0B4-9775-46FD-BAEC-FCE96172FCF4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{3B738A97-60C4-40EC-B38B-E41C38C18616}"
EndProject
@@ -65,10 +65,10 @@ Global
{804B5D44-05A3-491E-A6AB-35C592E6703E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{804B5D44-05A3-491E-A6AB-35C592E6703E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{804B5D44-05A3-491E-A6AB-35C592E6703E}.Release|Any CPU.Build.0 = Release|Any CPU
- {876EF0B1-6172-4A38-B1F2-382CCCAC929C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {876EF0B1-6172-4A38-B1F2-382CCCAC929C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {876EF0B1-6172-4A38-B1F2-382CCCAC929C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {876EF0B1-6172-4A38-B1F2-382CCCAC929C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D42EA0B4-9775-46FD-BAEC-FCE96172FCF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D42EA0B4-9775-46FD-BAEC-FCE96172FCF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D42EA0B4-9775-46FD-BAEC-FCE96172FCF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D42EA0B4-9775-46FD-BAEC-FCE96172FCF4}.Release|Any CPU.Build.0 = Release|Any CPU
{3B738A97-60C4-40EC-B38B-E41C38C18616}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B738A97-60C4-40EC-B38B-E41C38C18616}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B738A97-60C4-40EC-B38B-E41C38C18616}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -112,7 +112,7 @@ Global
{ACDB56AF-7B9F-4762-9764-D6FF09118D09} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
{6A2B5C68-14C3-4989-8530-D51A138C72AE} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
- {876EF0B1-6172-4A38-B1F2-382CCCAC929C} = {839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76}
+ {D42EA0B4-9775-46FD-BAEC-FCE96172FCF4} = {839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76}
{3B738A97-60C4-40EC-B38B-E41C38C18616} = {839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76}
{898AC186-6BE8-4266-954D-DFFF3EE6C428} = {839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76}
{C7F95DF5-1832-4AEA-943B-86ED0226D98B} = {839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76}
diff --git a/src/libraries/System.Memory/System.Memory.sln b/src/libraries/System.Memory/System.Memory.sln
index 6b5f39cd1e6..9315b9cbb51 100644
--- a/src/libraries/System.Memory/System.Memory.sln
+++ b/src/libraries/System.Memory/System.Memory.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory.Tests", "test
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{EFF00253-633C-4D2F-86EE-F40C721F6A68}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{880A76C5-DF94-4DAC-9E39-0E78C297C457}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{DA7CEED7-1A86-4221-B4AD-4307AB83A31F}"
EndProject
@@ -144,24 +144,24 @@ Global
{EFF00253-633C-4D2F-86EE-F40C721F6A68}.Checked|x64.Build.0 = Debug|Any CPU
{EFF00253-633C-4D2F-86EE-F40C721F6A68}.Checked|x86.ActiveCfg = Debug|Any CPU
{EFF00253-633C-4D2F-86EE-F40C721F6A68}.Checked|x86.Build.0 = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Debug|x64.ActiveCfg = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Debug|x64.Build.0 = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Debug|x86.ActiveCfg = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Debug|x86.Build.0 = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Release|Any CPU.Build.0 = Release|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Release|x64.ActiveCfg = Release|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Release|x64.Build.0 = Release|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Release|x86.ActiveCfg = Release|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Release|x86.Build.0 = Release|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Checked|x64.ActiveCfg = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Checked|x64.Build.0 = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Checked|x86.ActiveCfg = Debug|Any CPU
- {880A76C5-DF94-4DAC-9E39-0E78C297C457}.Checked|x86.Build.0 = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Debug|x64.Build.0 = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Debug|x86.Build.0 = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Release|x64.ActiveCfg = Release|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Release|x64.Build.0 = Release|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Release|x86.ActiveCfg = Release|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Release|x86.Build.0 = Release|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Checked|x64.Build.0 = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7}.Checked|x86.Build.0 = Debug|Any CPU
{DA7CEED7-1A86-4221-B4AD-4307AB83A31F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA7CEED7-1A86-4221-B4AD-4307AB83A31F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA7CEED7-1A86-4221-B4AD-4307AB83A31F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -191,7 +191,7 @@ Global
{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297} = {FA259C32-B79B-4DE2-9677-055D5D25FA33}
{9112BAE3-344D-4DD0-ADC9-478D82B84584} = {7212FBCF-E89D-4065-9DCE-D5F7E5D3EF1D}
{EFF00253-633C-4D2F-86EE-F40C721F6A68} = {2BEB1A89-DD2D-42BD-95DD-89860A0C9663}
- {880A76C5-DF94-4DAC-9E39-0E78C297C457} = {2BEB1A89-DD2D-42BD-95DD-89860A0C9663}
+ {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7} = {2BEB1A89-DD2D-42BD-95DD-89860A0C9663}
{DA7CEED7-1A86-4221-B4AD-4307AB83A31F} = {2BEB1A89-DD2D-42BD-95DD-89860A0C9663}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln b/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln
index 34e7ea9a06e..276c4675801 100644
--- a/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln
+++ b/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln
@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Json.Unit.T
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic", "..\System.Net.Quic\ref\System.Net.Quic.csproj", "{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E9F77940-ADB7-4439-A070-2EA1BF6E5F62}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4AED92A2-8DEB-41B4-862D-8B779FA1CFCE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E1A1EC7C-3257-46EB-8DBC-DE8DAB3F4F4F}"
EndProject
@@ -83,10 +83,10 @@ Global
{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}.Release|Any CPU.Build.0 = Release|Any CPU
- {E9F77940-ADB7-4439-A070-2EA1BF6E5F62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E9F77940-ADB7-4439-A070-2EA1BF6E5F62}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E9F77940-ADB7-4439-A070-2EA1BF6E5F62}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E9F77940-ADB7-4439-A070-2EA1BF6E5F62}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4AED92A2-8DEB-41B4-862D-8B779FA1CFCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4AED92A2-8DEB-41B4-862D-8B779FA1CFCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4AED92A2-8DEB-41B4-862D-8B779FA1CFCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4AED92A2-8DEB-41B4-862D-8B779FA1CFCE}.Release|Any CPU.Build.0 = Release|Any CPU
{E1A1EC7C-3257-46EB-8DBC-DE8DAB3F4F4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E1A1EC7C-3257-46EB-8DBC-DE8DAB3F4F4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E1A1EC7C-3257-46EB-8DBC-DE8DAB3F4F4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -133,7 +133,7 @@ Global
{7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
{FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
{BC7D3412-DBCB-4863-8BF8-41899E32608C} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
- {E9F77940-ADB7-4439-A070-2EA1BF6E5F62} = {5A418E02-B18A-41F1-9D4F-1BD6CB51F63C}
+ {4AED92A2-8DEB-41B4-862D-8B779FA1CFCE} = {5A418E02-B18A-41F1-9D4F-1BD6CB51F63C}
{E1A1EC7C-3257-46EB-8DBC-DE8DAB3F4F4F} = {5A418E02-B18A-41F1-9D4F-1BD6CB51F63C}
{E277B012-C6EE-4032-9E80-C1EE3BAD7F51} = {5A418E02-B18A-41F1-9D4F-1BD6CB51F63C}
{65F336C0-BFB7-4248-A56C-8F1AE8770590} = {5A418E02-B18A-41F1-9D4F-1BD6CB51F63C}
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln b/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
index 3291ed64e3f..d029ff1d5ed 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
+++ b/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
@@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.WinHttpHand
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic", "..\System.Net.Quic\ref\System.Net.Quic.csproj", "{F406CD45-4516-4DC3-AC4D-1B61835D3B71}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9D31B08F-4254-4A8C-A9F3-2F2C99F3740A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{8B4CF65D-B325-4ED8-B853-C22F12997836}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{834ECDE7-4B5D-4DBD-8BCA-98343A99179F}"
EndProject
@@ -107,10 +107,10 @@ Global
{F406CD45-4516-4DC3-AC4D-1B61835D3B71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F406CD45-4516-4DC3-AC4D-1B61835D3B71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F406CD45-4516-4DC3-AC4D-1B61835D3B71}.Release|Any CPU.Build.0 = Release|Any CPU
- {9D31B08F-4254-4A8C-A9F3-2F2C99F3740A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9D31B08F-4254-4A8C-A9F3-2F2C99F3740A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9D31B08F-4254-4A8C-A9F3-2F2C99F3740A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9D31B08F-4254-4A8C-A9F3-2F2C99F3740A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8B4CF65D-B325-4ED8-B853-C22F12997836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8B4CF65D-B325-4ED8-B853-C22F12997836}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8B4CF65D-B325-4ED8-B853-C22F12997836}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8B4CF65D-B325-4ED8-B853-C22F12997836}.Release|Any CPU.Build.0 = Release|Any CPU
{834ECDE7-4B5D-4DBD-8BCA-98343A99179F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{834ECDE7-4B5D-4DBD-8BCA-98343A99179F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{834ECDE7-4B5D-4DBD-8BCA-98343A99179F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -161,7 +161,7 @@ Global
{DE2A69CC-4962-4BF6-A714-41A87A6C045B} = {49E09973-383D-4AD6-9D88-B93A02031607}
{BACC5257-6CA8-45C7-970F-C8D501DA59AB} = {49E09973-383D-4AD6-9D88-B93A02031607}
{E470810A-BAF2-4B3C-92CB-72007B7F1B6A} = {49E09973-383D-4AD6-9D88-B93A02031607}
- {9D31B08F-4254-4A8C-A9F3-2F2C99F3740A} = {B8C52E24-376F-4E8D-AA8A-62E25C161863}
+ {8B4CF65D-B325-4ED8-B853-C22F12997836} = {B8C52E24-376F-4E8D-AA8A-62E25C161863}
{834ECDE7-4B5D-4DBD-8BCA-98343A99179F} = {B8C52E24-376F-4E8D-AA8A-62E25C161863}
{F37B0EB9-2882-42F9-88DE-BB55AD9DCA5D} = {B8C52E24-376F-4E8D-AA8A-62E25C161863}
{310F6EE8-5F12-4663-A5B8-01344C5CC821} = {B8C52E24-376F-4E8D-AA8A-62E25C161863}
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
index e9d68fbff06..d8793d56eca 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
@@ -5,7 +5,7 @@
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
<TargetFrameworks>$(NetCoreAppCurrent)-windows</TargetFrameworks>
<DefineConstants>UNITTEST</DefineConstants>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<Nullable>annotations</Nullable>
</PropertyGroup>
<ItemGroup>
diff --git a/src/libraries/System.Net.Http/System.Net.Http.sln b/src/libraries/System.Net.Http/System.Net.Http.sln
index 57789f99b7c..ce5233240eb 100644
--- a/src/libraries/System.Net.Http/System.Net.Http.sln
+++ b/src/libraries/System.Net.Http/System.Net.Http.sln
@@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic", "..\Syste
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Runtime.InteropServices.JavaScript", "..\System.Private.Runtime.InteropServices.JavaScript\src\System.Private.Runtime.InteropServices.JavaScript.csproj", "{819DB839-291D-4128-A2D8-719340A7DEBF}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BA43DFE7-A22D-4658-AE1E-2F8398BDA180}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{98AA859A-14F1-465D-80D6-343A4075CC7B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{786ED1A9-1EFF-4BC4-A833-E680D9960F72}"
EndProject
@@ -95,10 +95,10 @@ Global
{819DB839-291D-4128-A2D8-719340A7DEBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{819DB839-291D-4128-A2D8-719340A7DEBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{819DB839-291D-4128-A2D8-719340A7DEBF}.Release|Any CPU.Build.0 = Release|Any CPU
- {BA43DFE7-A22D-4658-AE1E-2F8398BDA180}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BA43DFE7-A22D-4658-AE1E-2F8398BDA180}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BA43DFE7-A22D-4658-AE1E-2F8398BDA180}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BA43DFE7-A22D-4658-AE1E-2F8398BDA180}.Release|Any CPU.Build.0 = Release|Any CPU
+ {98AA859A-14F1-465D-80D6-343A4075CC7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {98AA859A-14F1-465D-80D6-343A4075CC7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {98AA859A-14F1-465D-80D6-343A4075CC7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {98AA859A-14F1-465D-80D6-343A4075CC7B}.Release|Any CPU.Build.0 = Release|Any CPU
{786ED1A9-1EFF-4BC4-A833-E680D9960F72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{786ED1A9-1EFF-4BC4-A833-E680D9960F72}.Debug|Any CPU.Build.0 = Debug|Any CPU
{786ED1A9-1EFF-4BC4-A833-E680D9960F72}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -121,7 +121,7 @@ Global
{11F31E64-4000-47F3-AE19-C83EB4EC0ED8} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
{F1FFB6F5-628E-4DF5-8FD0-9ADFB9EF5E91} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
{819DB839-291D-4128-A2D8-719340A7DEBF} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
- {BA43DFE7-A22D-4658-AE1E-2F8398BDA180} = {7841027C-6B57-4756-A757-8B19ECA0D9C7}
+ {98AA859A-14F1-465D-80D6-343A4075CC7B} = {7841027C-6B57-4756-A757-8B19ECA0D9C7}
{786ED1A9-1EFF-4BC4-A833-E680D9960F72} = {7841027C-6B57-4756-A757-8B19ECA0D9C7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
index ab781d29742..6d390623b91 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
@@ -5,7 +5,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
index 0ad988c4e54..e0d05b17b0a 100644
--- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
@@ -5,7 +5,7 @@
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
<Nullable>annotations</Nullable>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
<ItemGroup>
diff --git a/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln b/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
index a027858ad4d..45f5deedf50 100644
--- a/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
+++ b/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.HttpListener", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.HttpListener.Tests", "tests\System.Net.HttpListener.Tests.csproj", "{9D6743F7-7918-4B74-A2C2-ECC6CE2AC0BB}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1D4AE507-BC2C-47DC-85DF-523EDB6B3E78}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{48A9D75A-BB0F-425F-A1B0-25741CB85E57}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{154F91AC-8E70-49E6-9C97-0DDBD50AFB56}"
EndProject
@@ -43,10 +43,10 @@ Global
{9D6743F7-7918-4B74-A2C2-ECC6CE2AC0BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D6743F7-7918-4B74-A2C2-ECC6CE2AC0BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D6743F7-7918-4B74-A2C2-ECC6CE2AC0BB}.Release|Any CPU.Build.0 = Release|Any CPU
- {1D4AE507-BC2C-47DC-85DF-523EDB6B3E78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1D4AE507-BC2C-47DC-85DF-523EDB6B3E78}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1D4AE507-BC2C-47DC-85DF-523EDB6B3E78}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1D4AE507-BC2C-47DC-85DF-523EDB6B3E78}.Release|Any CPU.Build.0 = Release|Any CPU
+ {48A9D75A-BB0F-425F-A1B0-25741CB85E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {48A9D75A-BB0F-425F-A1B0-25741CB85E57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {48A9D75A-BB0F-425F-A1B0-25741CB85E57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {48A9D75A-BB0F-425F-A1B0-25741CB85E57}.Release|Any CPU.Build.0 = Release|Any CPU
{154F91AC-8E70-49E6-9C97-0DDBD50AFB56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{154F91AC-8E70-49E6-9C97-0DDBD50AFB56}.Debug|Any CPU.Build.0 = Debug|Any CPU
{154F91AC-8E70-49E6-9C97-0DDBD50AFB56}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{24DD2F6E-B010-4654-B0ED-91279034846E} = {A3A29B10-F45E-487B-A2A0-EA809B62AF9D}
{706D27A6-E66A-4FF5-9E6A-EA1B8BC52FB2} = {633A5486-7617-411C-B724-172F4B4E3A4F}
{75DAAF3A-23E3-4C9C-A701-BA5494346925} = {633A5486-7617-411C-B724-172F4B4E3A4F}
- {1D4AE507-BC2C-47DC-85DF-523EDB6B3E78} = {D79781B1-8197-4641-9DE7-B9F22C71FBB9}
+ {48A9D75A-BB0F-425F-A1B0-25741CB85E57} = {D79781B1-8197-4641-9DE7-B9F22C71FBB9}
{154F91AC-8E70-49E6-9C97-0DDBD50AFB56} = {D79781B1-8197-4641-9DE7-B9F22C71FBB9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.Mail/System.Net.Mail.sln b/src/libraries/System.Net.Mail/System.Net.Mail.sln
index 2f6e598421b..543a8368124 100644
--- a/src/libraries/System.Net.Mail/System.Net.Mail.sln
+++ b/src/libraries/System.Net.Mail/System.Net.Mail.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Mail.Functional.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Mail.Unit.Tests", "tests\Unit\System.Net.Mail.Unit.Tests.csproj", "{78D06A89-4961-4441-8898-17FDB8BC99CE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{5744A1F6-D858-4106-AB38-620B837A377C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{34D84D8A-9D29-4ED5-B46D-A772E521E2CF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{301EA337-1D9A-47EF-966B-0ED0568C569A}"
EndProject
@@ -49,10 +49,10 @@ Global
{78D06A89-4961-4441-8898-17FDB8BC99CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{78D06A89-4961-4441-8898-17FDB8BC99CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{78D06A89-4961-4441-8898-17FDB8BC99CE}.Release|Any CPU.Build.0 = Release|Any CPU
- {5744A1F6-D858-4106-AB38-620B837A377C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5744A1F6-D858-4106-AB38-620B837A377C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5744A1F6-D858-4106-AB38-620B837A377C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5744A1F6-D858-4106-AB38-620B837A377C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {34D84D8A-9D29-4ED5-B46D-A772E521E2CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {34D84D8A-9D29-4ED5-B46D-A772E521E2CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {34D84D8A-9D29-4ED5-B46D-A772E521E2CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {34D84D8A-9D29-4ED5-B46D-A772E521E2CF}.Release|Any CPU.Build.0 = Release|Any CPU
{301EA337-1D9A-47EF-966B-0ED0568C569A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{301EA337-1D9A-47EF-966B-0ED0568C569A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{301EA337-1D9A-47EF-966B-0ED0568C569A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +72,7 @@ Global
{A743A5C2-5DE7-433B-A623-893B0BAE83D8} = {A08D08E8-610F-47A0-8747-01223F9430C5}
{AF805BBD-C4A4-4D69-A911-D651E008C655} = {04FF7F43-59FD-4A9A-AFE4-12D16836981C}
{8AE1AF68-EBDC-497B-A189-5B4C66FA57D8} = {04FF7F43-59FD-4A9A-AFE4-12D16836981C}
- {5744A1F6-D858-4106-AB38-620B837A377C} = {461D78A2-743F-40F0-B301-274F2687D84F}
+ {34D84D8A-9D29-4ED5-B46D-A772E521E2CF} = {461D78A2-743F-40F0-B301-274F2687D84F}
{301EA337-1D9A-47EF-966B-0ED0568C569A} = {461D78A2-743F-40F0-B301-274F2687D84F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
index 6ecf5f0bdd1..24ccc93a7ff 100644
--- a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
@@ -4,7 +4,7 @@
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<Nullable>annotations</Nullable>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="Base64EncodingTest.cs" />
diff --git a/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln b/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
index fc9525d8fb8..e5e8bd006c1 100644
--- a/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
+++ b/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution.F
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution.Pal.Tests", "tests\PalTests\System.Net.NameResolution.Pal.Tests.csproj", "{72B2CC3A-D66E-4F7E-BFA4-38EE373B5043}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{CAE1C084-4AED-447A-A194-820089161700}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FC0BD396-0280-434B-913B-A17D87892A78}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A8357213-6A4D-463F-8364-70ED86147098}"
EndProject
@@ -47,10 +47,10 @@ Global
{72B2CC3A-D66E-4F7E-BFA4-38EE373B5043}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72B2CC3A-D66E-4F7E-BFA4-38EE373B5043}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72B2CC3A-D66E-4F7E-BFA4-38EE373B5043}.Release|Any CPU.Build.0 = Release|Any CPU
- {CAE1C084-4AED-447A-A194-820089161700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CAE1C084-4AED-447A-A194-820089161700}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CAE1C084-4AED-447A-A194-820089161700}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CAE1C084-4AED-447A-A194-820089161700}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FC0BD396-0280-434B-913B-A17D87892A78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FC0BD396-0280-434B-913B-A17D87892A78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FC0BD396-0280-434B-913B-A17D87892A78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FC0BD396-0280-434B-913B-A17D87892A78}.Release|Any CPU.Build.0 = Release|Any CPU
{A8357213-6A4D-463F-8364-70ED86147098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A8357213-6A4D-463F-8364-70ED86147098}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A8357213-6A4D-463F-8364-70ED86147098}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{72B2CC3A-D66E-4F7E-BFA4-38EE373B5043} = {6E7B2B93-21B0-457F-84C3-AE62DABC73E2}
{15B66DCE-70BF-43D6-854D-42A6C840B22C} = {47DBE178-9476-4595-9C71-424D54314C2E}
{CC5371F7-FCD9-4BDE-8639-6DD5F3B71175} = {3DDE175F-17B6-4F30-8AA6-04C0AEBF39D5}
- {CAE1C084-4AED-447A-A194-820089161700} = {851CDB4C-B092-466E-93BA-D554120B182B}
+ {FC0BD396-0280-434B-913B-A17D87892A78} = {851CDB4C-B092-466E-93BA-D554120B182B}
{A8357213-6A4D-463F-8364-70ED86147098} = {851CDB4C-B092-466E-93BA-D554120B182B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
index 13bdf57acf3..ea167e20906 100644
--- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
@@ -5,7 +5,7 @@
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<Nullable>annotations</Nullable>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
<ItemGroup>
diff --git a/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln b/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
index 5f000ee3f3e..9d7ec356fe5 100644
--- a/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
+++ b/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NetworkInformati
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NetworkInformation.Functional.Tests", "tests\FunctionalTests\System.Net.NetworkInformation.Functional.Tests.csproj", "{A0F37A17-0D79-4A84-84CC-AEE604206F06}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7D4FC57B-AF9B-4163-868B-1503818BAF0C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{D6600B0A-FEE0-4D1E-B42F-88EB016403CF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1E0ED0DE-76B3-402F-8029-C432E638CE0C}"
EndProject
@@ -41,10 +41,10 @@ Global
{A0F37A17-0D79-4A84-84CC-AEE604206F06}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0F37A17-0D79-4A84-84CC-AEE604206F06}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A0F37A17-0D79-4A84-84CC-AEE604206F06}.Release|Any CPU.Build.0 = Release|Any CPU
- {7D4FC57B-AF9B-4163-868B-1503818BAF0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7D4FC57B-AF9B-4163-868B-1503818BAF0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7D4FC57B-AF9B-4163-868B-1503818BAF0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7D4FC57B-AF9B-4163-868B-1503818BAF0C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D6600B0A-FEE0-4D1E-B42F-88EB016403CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D6600B0A-FEE0-4D1E-B42F-88EB016403CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D6600B0A-FEE0-4D1E-B42F-88EB016403CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D6600B0A-FEE0-4D1E-B42F-88EB016403CF}.Release|Any CPU.Build.0 = Release|Any CPU
{1E0ED0DE-76B3-402F-8029-C432E638CE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1E0ED0DE-76B3-402F-8029-C432E638CE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E0ED0DE-76B3-402F-8029-C432E638CE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{A0F37A17-0D79-4A84-84CC-AEE604206F06} = {33058B90-33C6-4731-AF47-DC7678DC2739}
{EDF83CE6-22BB-45EA-B8CF-32AC2CFE5713} = {01C6C981-C56F-453F-B099-C8B9DF61CDEB}
{062F1189-143C-456B-A439-D9C1BE2DD640} = {A3CAA996-BF7C-48EE-A03A-2B2F78D88D86}
- {7D4FC57B-AF9B-4163-868B-1503818BAF0C} = {575528E7-33D8-4375-8B5A-D88215FEE447}
+ {D6600B0A-FEE0-4D1E-B42F-88EB016403CF} = {575528E7-33D8-4375-8B5A-D88215FEE447}
{1E0ED0DE-76B3-402F-8029-C432E638CE0C} = {575528E7-33D8-4375-8B5A-D88215FEE447}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.Ping/System.Net.Ping.sln b/src/libraries/System.Net.Ping/System.Net.Ping.sln
index 1164e7b09fe..1c7ec4abe94 100644
--- a/src/libraries/System.Net.Ping/System.Net.Ping.sln
+++ b/src/libraries/System.Net.Ping/System.Net.Ping.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Ping", "src\Syst
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Ping.Functional.Tests", "tests\FunctionalTests\System.Net.Ping.Functional.Tests.csproj", "{E2A63467-3D66-448C-BF81-5DF684E02AD3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2A7F8D83-147A-4F8F-897A-4C5DB5E68698}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{26E69A05-FCF8-4D01-A93A-F97FE4B92D74}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B59DB44D-8E1E-4F62-A223-E3AC71BB0370}"
EndProject
@@ -41,10 +41,10 @@ Global
{E2A63467-3D66-448C-BF81-5DF684E02AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2A63467-3D66-448C-BF81-5DF684E02AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E2A63467-3D66-448C-BF81-5DF684E02AD3}.Release|Any CPU.Build.0 = Release|Any CPU
- {2A7F8D83-147A-4F8F-897A-4C5DB5E68698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2A7F8D83-147A-4F8F-897A-4C5DB5E68698}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2A7F8D83-147A-4F8F-897A-4C5DB5E68698}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2A7F8D83-147A-4F8F-897A-4C5DB5E68698}.Release|Any CPU.Build.0 = Release|Any CPU
+ {26E69A05-FCF8-4D01-A93A-F97FE4B92D74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {26E69A05-FCF8-4D01-A93A-F97FE4B92D74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {26E69A05-FCF8-4D01-A93A-F97FE4B92D74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {26E69A05-FCF8-4D01-A93A-F97FE4B92D74}.Release|Any CPU.Build.0 = Release|Any CPU
{B59DB44D-8E1E-4F62-A223-E3AC71BB0370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B59DB44D-8E1E-4F62-A223-E3AC71BB0370}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B59DB44D-8E1E-4F62-A223-E3AC71BB0370}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{E2A63467-3D66-448C-BF81-5DF684E02AD3} = {FABDD2DA-5365-4FD2-8C67-4C643E618CE9}
{A16A6C85-DF86-44A1-9032-238C223A0AE0} = {AAB0D01D-C3A4-4E09-9BFD-CBC737A3CA73}
{65B08958-069E-4F8B-A996-2A987ACCAA49} = {A687595D-ACCE-4380-95B8-628F598C7229}
- {2A7F8D83-147A-4F8F-897A-4C5DB5E68698} = {D26792B6-6D00-4CC0-B60B-7028F377BD4F}
+ {26E69A05-FCF8-4D01-A93A-F97FE4B92D74} = {D26792B6-6D00-4CC0-B60B-7028F377BD4F}
{B59DB44D-8E1E-4F62-A223-E3AC71BB0370} = {D26792B6-6D00-4CC0-B60B-7028F377BD4F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
index b141b5ed3aa..0a068b65b72 100644
--- a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
@@ -4,7 +4,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<!-- Test APIs introduced after 1.0 -->
<ItemGroup>
diff --git a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
index f7c896f44be..6d770a33566 100644
--- a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
+++ b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives.Pal.T
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives.UnitTests.Tests", "tests\UnitTests\System.Net.Primitives.UnitTests.Tests.csproj", "{598326BD-BCA8-48EC-A897-602DF1F247A3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{5EE22177-D871-464A-9824-727D4A60B0A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{780F4FEF-204D-4EE0-8072-884A9EF7FE9E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{160E40E8-0148-4D87-86D2-1F1918BD36F0}"
EndProject
@@ -53,10 +53,10 @@ Global
{598326BD-BCA8-48EC-A897-602DF1F247A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{598326BD-BCA8-48EC-A897-602DF1F247A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{598326BD-BCA8-48EC-A897-602DF1F247A3}.Release|Any CPU.Build.0 = Release|Any CPU
- {5EE22177-D871-464A-9824-727D4A60B0A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5EE22177-D871-464A-9824-727D4A60B0A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5EE22177-D871-464A-9824-727D4A60B0A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5EE22177-D871-464A-9824-727D4A60B0A6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {780F4FEF-204D-4EE0-8072-884A9EF7FE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {780F4FEF-204D-4EE0-8072-884A9EF7FE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {780F4FEF-204D-4EE0-8072-884A9EF7FE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {780F4FEF-204D-4EE0-8072-884A9EF7FE9E}.Release|Any CPU.Build.0 = Release|Any CPU
{160E40E8-0148-4D87-86D2-1F1918BD36F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{160E40E8-0148-4D87-86D2-1F1918BD36F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{160E40E8-0148-4D87-86D2-1F1918BD36F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +72,7 @@ Global
{598326BD-BCA8-48EC-A897-602DF1F247A3} = {909A147A-476E-4E34-A931-C2C65FD656A6}
{9CCAA49E-21F5-407B-807F-A26A5F01FCF1} = {212A5562-EFE7-4220-94EC-6B49C0A6DCEF}
{08C53516-56AB-4D3B-B22F-7DC1B27EA7CE} = {97419593-C13A-4407-B489-1651C8D3E813}
- {5EE22177-D871-464A-9824-727D4A60B0A6} = {6DD9FC21-AB33-4068-BC80-B4B89B7C99C9}
+ {780F4FEF-204D-4EE0-8072-884A9EF7FE9E} = {6DD9FC21-AB33-4068-BC80-B4B89B7C99C9}
{160E40E8-0148-4D87-86D2-1F1918BD36F0} = {6DD9FC21-AB33-4068-BC80-B4B89B7C99C9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
index 2f413fd0a91..2fb034467dc 100644
--- a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
@@ -3,7 +3,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<PropertyGroup>
<!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the
diff --git a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
index a070c4488ab..8cc3d0ff90f 100644
--- a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
@@ -4,7 +4,7 @@
<NoWarn>169,649</NoWarn>
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<PropertyGroup>
<!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the
diff --git a/src/libraries/System.Net.Quic/System.Net.Quic.sln b/src/libraries/System.Net.Quic/System.Net.Quic.sln
index f6d77e3589c..7f0235b3d9d 100644
--- a/src/libraries/System.Net.Quic/System.Net.Quic.sln
+++ b/src/libraries/System.Net.Quic/System.Net.Quic.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic", "src\Syst
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic.Functional.Tests", "tests\FunctionalTests\System.Net.Quic.Functional.Tests.csproj", "{E8E7DD3A-EC3F-4472-9F70-B515A3D11038}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{33F96B02-0102-4949-A874-E31E4B2212D8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C1EDF9E8-5584-47B7-A7D5-C034134DEEC1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E1D4C4F2-B830-4E87-B10D-ADC667213957}"
EndProject
@@ -47,10 +47,10 @@ Global
{E8E7DD3A-EC3F-4472-9F70-B515A3D11038}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8E7DD3A-EC3F-4472-9F70-B515A3D11038}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E8E7DD3A-EC3F-4472-9F70-B515A3D11038}.Release|Any CPU.Build.0 = Release|Any CPU
- {33F96B02-0102-4949-A874-E31E4B2212D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {33F96B02-0102-4949-A874-E31E4B2212D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {33F96B02-0102-4949-A874-E31E4B2212D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {33F96B02-0102-4949-A874-E31E4B2212D8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C1EDF9E8-5584-47B7-A7D5-C034134DEEC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C1EDF9E8-5584-47B7-A7D5-C034134DEEC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C1EDF9E8-5584-47B7-A7D5-C034134DEEC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C1EDF9E8-5584-47B7-A7D5-C034134DEEC1}.Release|Any CPU.Build.0 = Release|Any CPU
{E1D4C4F2-B830-4E87-B10D-ADC667213957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E1D4C4F2-B830-4E87-B10D-ADC667213957}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E1D4C4F2-B830-4E87-B10D-ADC667213957}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{E8E7DD3A-EC3F-4472-9F70-B515A3D11038} = {12C4206E-D19B-44BF-8002-6236D65AAE1B}
{D7A52855-C6DE-4FD0-9CAF-E55F292C69E5} = {538F3900-95BF-423D-9912-F94B0ECE463C}
{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7} = {8EF7F530-1F45-48CE-AA30-30FFD83147B9}
- {33F96B02-0102-4949-A874-E31E4B2212D8} = {AA7C6283-6473-4B71-8877-CAB8D75F9469}
+ {C1EDF9E8-5584-47B7-A7D5-C034134DEEC1} = {AA7C6283-6473-4B71-8877-CAB8D75F9469}
{E1D4C4F2-B830-4E87-B10D-ADC667213957} = {AA7C6283-6473-4B71-8877-CAB8D75F9469}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.Requests/System.Net.Requests.sln b/src/libraries/System.Net.Requests/System.Net.Requests.sln
index 374479924fa..1e95b16bf0f 100644
--- a/src/libraries/System.Net.Requests/System.Net.Requests.sln
+++ b/src/libraries/System.Net.Requests/System.Net.Requests.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Requests", "src\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Requests.Tests", "tests\System.Net.Requests.Tests.csproj", "{45338E1A-5586-40E6-97AF-709DBBB85AEC}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{56DB4376-4181-4814-9056-F9DC55EAC026}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{622D51A8-954A-401B-91FD-21E650F2DE46}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{CE27441A-4D2F-4A63-8D02-148A0C51CA47}"
EndProject
@@ -41,10 +41,10 @@ Global
{45338E1A-5586-40E6-97AF-709DBBB85AEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45338E1A-5586-40E6-97AF-709DBBB85AEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45338E1A-5586-40E6-97AF-709DBBB85AEC}.Release|Any CPU.Build.0 = Release|Any CPU
- {56DB4376-4181-4814-9056-F9DC55EAC026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {56DB4376-4181-4814-9056-F9DC55EAC026}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {56DB4376-4181-4814-9056-F9DC55EAC026}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {56DB4376-4181-4814-9056-F9DC55EAC026}.Release|Any CPU.Build.0 = Release|Any CPU
+ {622D51A8-954A-401B-91FD-21E650F2DE46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {622D51A8-954A-401B-91FD-21E650F2DE46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {622D51A8-954A-401B-91FD-21E650F2DE46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {622D51A8-954A-401B-91FD-21E650F2DE46}.Release|Any CPU.Build.0 = Release|Any CPU
{CE27441A-4D2F-4A63-8D02-148A0C51CA47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE27441A-4D2F-4A63-8D02-148A0C51CA47}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE27441A-4D2F-4A63-8D02-148A0C51CA47}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{45338E1A-5586-40E6-97AF-709DBBB85AEC} = {2E80965D-0AB1-451E-AFE5-E4CAF49EE8E3}
{60B3EE55-D545-4817-A57D-99F38CBCD1A8} = {DB20495E-C9F0-4640-85A6-ACEF17C21670}
{CCD28DAE-FEF6-4732-A985-B814A95B3408} = {BE29C1CE-D2BC-43F8-9412-50F870CE5538}
- {56DB4376-4181-4814-9056-F9DC55EAC026} = {BCB9D4DE-1EC1-4826-A80F-E4D2E960D98D}
+ {622D51A8-954A-401B-91FD-21E650F2DE46} = {BCB9D4DE-1EC1-4826-A80F-E4D2E960D98D}
{CE27441A-4D2F-4A63-8D02-148A0C51CA47} = {BCB9D4DE-1EC1-4826-A80F-E4D2E960D98D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.Security/System.Net.Security.sln b/src/libraries/System.Net.Security/System.Net.Security.sln
index 93f79e54813..33188bf816c 100644
--- a/src/libraries/System.Net.Security/System.Net.Security.sln
+++ b/src/libraries/System.Net.Security/System.Net.Security.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security.Unit.Tests", "tests\UnitTests\System.Net.Security.Unit.Tests.csproj", "{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B9A7E8DB-EA3F-41EB-910C-DEDC1BA48CAA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{F492B006-8C7C-471C-90C4-08C6A28F250A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{BBF8C38F-E4A7-42E3-AEEB-8A2D08E9FF7E}"
EndProject
@@ -61,10 +61,10 @@ Global
{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA}.Release|Any CPU.Build.0 = Release|Any CPU
- {B9A7E8DB-EA3F-41EB-910C-DEDC1BA48CAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B9A7E8DB-EA3F-41EB-910C-DEDC1BA48CAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B9A7E8DB-EA3F-41EB-910C-DEDC1BA48CAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B9A7E8DB-EA3F-41EB-910C-DEDC1BA48CAA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F492B006-8C7C-471C-90C4-08C6A28F250A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F492B006-8C7C-471C-90C4-08C6A28F250A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F492B006-8C7C-471C-90C4-08C6A28F250A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F492B006-8C7C-471C-90C4-08C6A28F250A}.Release|Any CPU.Build.0 = Release|Any CPU
{BBF8C38F-E4A7-42E3-AEEB-8A2D08E9FF7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BBF8C38F-E4A7-42E3-AEEB-8A2D08E9FF7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BBF8C38F-E4A7-42E3-AEEB-8A2D08E9FF7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -86,7 +86,7 @@ Global
{97493212-ADF3-46AF-8669-F038964CDA22} = {19C079E3-367B-480E-A46E-8D56D47F94EA}
{20F20695-DB18-47EB-A005-AA432ADCF865} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF}
{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF}
- {B9A7E8DB-EA3F-41EB-910C-DEDC1BA48CAA} = {29A8D8F5-27EF-44B7-8C71-FC4E2D10EBBA}
+ {F492B006-8C7C-471C-90C4-08C6A28F250A} = {29A8D8F5-27EF-44B7-8C71-FC4E2D10EBBA}
{BBF8C38F-E4A7-42E3-AEEB-8A2D08E9FF7E} = {29A8D8F5-27EF-44B7-8C71-FC4E2D10EBBA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
index d6f02a397f9..da1847ee989 100644
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
@@ -5,7 +5,7 @@
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS</TargetFrameworks>
<Nullable>annotations</Nullable>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
diff --git a/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln b/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
index 4e0bea34335..36eab717838 100644
--- a/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
+++ b/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.ServicePoint", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.ServicePoint.Tests", "tests\System.Net.ServicePoint.Tests.csproj", "{550C82C8-F7C2-4EB6-B2C0-87523C2E6640}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7AC1C95E-02B1-4825-88AD-017028DF3952}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{11937440-4272-4B21-A536-230B62BD8D07}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A16FDE31-C850-412B-9541-3210D5D48AE1}"
EndProject
@@ -41,10 +41,10 @@ Global
{550C82C8-F7C2-4EB6-B2C0-87523C2E6640}.Debug|Any CPU.Build.0 = Debug|Any CPU
{550C82C8-F7C2-4EB6-B2C0-87523C2E6640}.Release|Any CPU.ActiveCfg = Release|Any CPU
{550C82C8-F7C2-4EB6-B2C0-87523C2E6640}.Release|Any CPU.Build.0 = Release|Any CPU
- {7AC1C95E-02B1-4825-88AD-017028DF3952}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7AC1C95E-02B1-4825-88AD-017028DF3952}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7AC1C95E-02B1-4825-88AD-017028DF3952}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7AC1C95E-02B1-4825-88AD-017028DF3952}.Release|Any CPU.Build.0 = Release|Any CPU
+ {11937440-4272-4B21-A536-230B62BD8D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {11937440-4272-4B21-A536-230B62BD8D07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {11937440-4272-4B21-A536-230B62BD8D07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {11937440-4272-4B21-A536-230B62BD8D07}.Release|Any CPU.Build.0 = Release|Any CPU
{A16FDE31-C850-412B-9541-3210D5D48AE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A16FDE31-C850-412B-9541-3210D5D48AE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A16FDE31-C850-412B-9541-3210D5D48AE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{550C82C8-F7C2-4EB6-B2C0-87523C2E6640} = {25E4C3E2-CEE1-4725-BB91-2AEB290C0953}
{024702F2-6C9B-483E-A229-22F8FB97517C} = {2A282996-B091-4BE8-BBD5-2F25A9C87A74}
{3AE6973A-7E59-4F78-8B3F-FFBFEF38D89A} = {7D37D576-0E85-4EEA-9852-B80E14E1053C}
- {7AC1C95E-02B1-4825-88AD-017028DF3952} = {47FBD2B8-E991-449C-A4D7-33A636AD5C7F}
+ {11937440-4272-4B21-A536-230B62BD8D07} = {47FBD2B8-E991-449C-A4D7-33A636AD5C7F}
{A16FDE31-C850-412B-9541-3210D5D48AE1} = {47FBD2B8-E991-449C-A4D7-33A636AD5C7F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
index 555b6828db0..8bfa961da9f 100644
--- a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
+++ b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets", "src\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets.Tests", "tests\FunctionalTests\System.Net.Sockets.Tests.csproj", "{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A15BD0D3-0F06-4CB3-B0B3-4233985AC837}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{0CAE4AA4-2C81-4CA4-978A-F86DD25FA338}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{3DD27643-568B-4BA1-82F2-FACFC8365836}"
EndProject
@@ -47,10 +47,10 @@ Global
{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2}.Release|Any CPU.Build.0 = Release|Any CPU
- {A15BD0D3-0F06-4CB3-B0B3-4233985AC837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A15BD0D3-0F06-4CB3-B0B3-4233985AC837}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A15BD0D3-0F06-4CB3-B0B3-4233985AC837}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A15BD0D3-0F06-4CB3-B0B3-4233985AC837}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0CAE4AA4-2C81-4CA4-978A-F86DD25FA338}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0CAE4AA4-2C81-4CA4-978A-F86DD25FA338}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0CAE4AA4-2C81-4CA4-978A-F86DD25FA338}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0CAE4AA4-2C81-4CA4-978A-F86DD25FA338}.Release|Any CPU.Build.0 = Release|Any CPU
{3DD27643-568B-4BA1-82F2-FACFC8365836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3DD27643-568B-4BA1-82F2-FACFC8365836}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3DD27643-568B-4BA1-82F2-FACFC8365836}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2} = {FAD51322-998C-42D4-8FAA-EA479A3A0E82}
{FDFDE647-E25F-4B21-B002-4EEEFC42EFA1} = {FC5FEA3E-33B9-4AEE-8E41-367BB73182EF}
{FD313302-FE04-414E-8A62-3BC8894115C1} = {2C7108F0-035E-44A5-8451-FE9535F53D43}
- {A15BD0D3-0F06-4CB3-B0B3-4233985AC837} = {51E336C9-CFE7-4459-B407-FD5D9E760D85}
+ {0CAE4AA4-2C81-4CA4-978A-F86DD25FA338} = {51E336C9-CFE7-4459-B407-FD5D9E760D85}
{3DD27643-568B-4BA1-82F2-FACFC8365836} = {51E336C9-CFE7-4459-B407-FD5D9E760D85}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.WebClient/System.Net.WebClient.sln b/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
index f921f3a47ce..df4a846a962 100644
--- a/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
+++ b/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebClient", "src
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebClient.Tests", "tests\System.Net.WebClient.Tests.csproj", "{F9889BAD-7D20-4581-9F91-7490EBF5F9CA}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AB52A6C4-216F-4D74-9197-E4A5CA242811}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{992323BD-CC20-4630-AFD2-1483726305B8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B1389C0F-EAEB-4E1A-AA8F-8A3CED861A2D}"
EndProject
@@ -41,10 +41,10 @@ Global
{F9889BAD-7D20-4581-9F91-7490EBF5F9CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9889BAD-7D20-4581-9F91-7490EBF5F9CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9889BAD-7D20-4581-9F91-7490EBF5F9CA}.Release|Any CPU.Build.0 = Release|Any CPU
- {AB52A6C4-216F-4D74-9197-E4A5CA242811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AB52A6C4-216F-4D74-9197-E4A5CA242811}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AB52A6C4-216F-4D74-9197-E4A5CA242811}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AB52A6C4-216F-4D74-9197-E4A5CA242811}.Release|Any CPU.Build.0 = Release|Any CPU
+ {992323BD-CC20-4630-AFD2-1483726305B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {992323BD-CC20-4630-AFD2-1483726305B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {992323BD-CC20-4630-AFD2-1483726305B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {992323BD-CC20-4630-AFD2-1483726305B8}.Release|Any CPU.Build.0 = Release|Any CPU
{B1389C0F-EAEB-4E1A-AA8F-8A3CED861A2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B1389C0F-EAEB-4E1A-AA8F-8A3CED861A2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1389C0F-EAEB-4E1A-AA8F-8A3CED861A2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{F9889BAD-7D20-4581-9F91-7490EBF5F9CA} = {B8630BF1-D7F2-4E01-B030-A4E981428E42}
{F1689AFC-F672-4407-B5C9-3515C301CF31} = {33D25EB4-FCAA-41F3-B411-5946DEF7CEFE}
{18F1E6CD-3568-4042-9EC3-6430FD60EC3A} = {ECCD7E4F-3B41-4CEA-AF93-152825598039}
- {AB52A6C4-216F-4D74-9197-E4A5CA242811} = {EBEFBFED-2B7D-4133-8D79-0F61D6E8A085}
+ {992323BD-CC20-4630-AFD2-1483726305B8} = {EBEFBFED-2B7D-4133-8D79-0F61D6E8A085}
{B1389C0F-EAEB-4E1A-AA8F-8A3CED861A2D} = {EBEFBFED-2B7D-4133-8D79-0F61D6E8A085}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln b/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
index 59a9abbb2dd..4c8bb838198 100644
--- a/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
+++ b/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebHeaderCollect
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebHeaderCollection.Tests", "tests\System.Net.WebHeaderCollection.Tests.csproj", "{D9180DE2-C834-47A6-B5E9-B95A5EE7FA76}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B6E17432-73DE-4372-84D4-8397C67847E6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{A17EB996-964B-4D9F-9859-3DECA2EB9169}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{7987D82C-3F1E-4B4B-B405-08AFD062C7EE}"
EndProject
@@ -41,10 +41,10 @@ Global
{D9180DE2-C834-47A6-B5E9-B95A5EE7FA76}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D9180DE2-C834-47A6-B5E9-B95A5EE7FA76}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D9180DE2-C834-47A6-B5E9-B95A5EE7FA76}.Release|Any CPU.Build.0 = Release|Any CPU
- {B6E17432-73DE-4372-84D4-8397C67847E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B6E17432-73DE-4372-84D4-8397C67847E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B6E17432-73DE-4372-84D4-8397C67847E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B6E17432-73DE-4372-84D4-8397C67847E6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A17EB996-964B-4D9F-9859-3DECA2EB9169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A17EB996-964B-4D9F-9859-3DECA2EB9169}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A17EB996-964B-4D9F-9859-3DECA2EB9169}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A17EB996-964B-4D9F-9859-3DECA2EB9169}.Release|Any CPU.Build.0 = Release|Any CPU
{7987D82C-3F1E-4B4B-B405-08AFD062C7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7987D82C-3F1E-4B4B-B405-08AFD062C7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7987D82C-3F1E-4B4B-B405-08AFD062C7EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{D9180DE2-C834-47A6-B5E9-B95A5EE7FA76} = {CFCD94CF-6369-4A15-A5BA-F93168B17E84}
{2050FA72-2FB5-4057-B33A-7716064BE254} = {28B0EDC8-886B-4811-BC62-6FEC32A9E80A}
{0C54036A-68E7-4D87-AE77-72279D8DC116} = {0F494C94-E4F3-4171-B171-BBB07EF645BE}
- {B6E17432-73DE-4372-84D4-8397C67847E6} = {7A189071-7ABF-4420-B91C-8ED1DF536EA3}
+ {A17EB996-964B-4D9F-9859-3DECA2EB9169} = {7A189071-7ABF-4420-B91C-8ED1DF536EA3}
{7987D82C-3F1E-4B4B-B405-08AFD062C7EE} = {7A189071-7ABF-4420-B91C-8ED1DF536EA3}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln b/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
index 507d682a7ad..6e49f3425fb 100644
--- a/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
+++ b/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebProxy", "src\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebProxy.Tests", "tests\System.Net.WebProxy.Tests.csproj", "{80A28FFF-68C8-431B-83BE-F04E3155F16A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{68828319-F66B-48F5-BF64-06DC0C333476}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2331FB61-25D7-4954-8289-D0CD834FBF4E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{5B219FB9-034D-4A72-976D-B9ED8412DAD3}"
EndProject
@@ -41,10 +41,10 @@ Global
{80A28FFF-68C8-431B-83BE-F04E3155F16A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80A28FFF-68C8-431B-83BE-F04E3155F16A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80A28FFF-68C8-431B-83BE-F04E3155F16A}.Release|Any CPU.Build.0 = Release|Any CPU
- {68828319-F66B-48F5-BF64-06DC0C333476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {68828319-F66B-48F5-BF64-06DC0C333476}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {68828319-F66B-48F5-BF64-06DC0C333476}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {68828319-F66B-48F5-BF64-06DC0C333476}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2331FB61-25D7-4954-8289-D0CD834FBF4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2331FB61-25D7-4954-8289-D0CD834FBF4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2331FB61-25D7-4954-8289-D0CD834FBF4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2331FB61-25D7-4954-8289-D0CD834FBF4E}.Release|Any CPU.Build.0 = Release|Any CPU
{5B219FB9-034D-4A72-976D-B9ED8412DAD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5B219FB9-034D-4A72-976D-B9ED8412DAD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B219FB9-034D-4A72-976D-B9ED8412DAD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{80A28FFF-68C8-431B-83BE-F04E3155F16A} = {76353E1C-A06B-4730-99EB-1C231937FF7B}
{D9D40485-7AAE-474C-833A-C21021A823BF} = {5A286671-85EC-4D44-9777-9ED685F78B6C}
{C841B625-5802-40BE-850C-FA935E3D6E9A} = {B5211952-F905-4BE8-A3CF-25F393F5E506}
- {68828319-F66B-48F5-BF64-06DC0C333476} = {5EE792D4-BBEA-43B7-B822-ED01F9F39343}
+ {2331FB61-25D7-4954-8289-D0CD834FBF4E} = {5EE792D4-BBEA-43B7-B822-ED01F9F39343}
{5B219FB9-034D-4A72-976D-B9ED8412DAD3} = {5EE792D4-BBEA-43B7-B822-ED01F9F39343}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln b/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
index b648a6980e1..c52be1ff7ae 100644
--- a/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
+++ b/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Clien
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Runtime.InteropServices.JavaScript", "..\System.Private.Runtime.InteropServices.JavaScript\src\System.Private.Runtime.InteropServices.JavaScript.csproj", "{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7A7356FB-DD87-4A5D-ABA5-44607B6488A0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7A0C1B6C-0439-4A1F-95CC-67F04A9657FE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6659E37B-9C84-4815-9CAB-19F367D3D66D}"
EndProject
@@ -53,10 +53,10 @@ Global
{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8}.Release|Any CPU.Build.0 = Release|Any CPU
- {7A7356FB-DD87-4A5D-ABA5-44607B6488A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7A7356FB-DD87-4A5D-ABA5-44607B6488A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7A7356FB-DD87-4A5D-ABA5-44607B6488A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7A7356FB-DD87-4A5D-ABA5-44607B6488A0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7A0C1B6C-0439-4A1F-95CC-67F04A9657FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7A0C1B6C-0439-4A1F-95CC-67F04A9657FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7A0C1B6C-0439-4A1F-95CC-67F04A9657FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7A0C1B6C-0439-4A1F-95CC-67F04A9657FE}.Release|Any CPU.Build.0 = Release|Any CPU
{6659E37B-9C84-4815-9CAB-19F367D3D66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6659E37B-9C84-4815-9CAB-19F367D3D66D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6659E37B-9C84-4815-9CAB-19F367D3D66D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +72,7 @@ Global
{BEA5BC2C-12D1-4D01-8D2C-5029578BD066} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05}
{0CD4C24D-7746-46F0-8D47-A396882B5468} = {6F9A42A0-A04B-4CD0-B8C9-9A728274C851}
{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8} = {6F9A42A0-A04B-4CD0-B8C9-9A728274C851}
- {7A7356FB-DD87-4A5D-ABA5-44607B6488A0} = {58925E96-1A39-4E29-ACB4-4C4DAB81F60A}
+ {7A0C1B6C-0439-4A1F-95CC-67F04A9657FE} = {58925E96-1A39-4E29-ACB4-4C4DAB81F60A}
{6659E37B-9C84-4815-9CAB-19F367D3D66D} = {58925E96-1A39-4E29-ACB4-4C4DAB81F60A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln b/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
index 64ea388dfaf..69e2944269f 100644
--- a/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
+++ b/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets", "sr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Tests", "tests\System.Net.WebSockets.Tests.csproj", "{5886B73F-4547-4C88-AD69-8D29668CB05B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{99AAA80A-1368-421B-A750-DB5E04971764}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B59FA95B-262E-4580-AB36-37DB5E16917A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{41157B1B-46DE-4775-8490-2FF9D9E8E4CA}"
EndProject
@@ -41,10 +41,10 @@ Global
{5886B73F-4547-4C88-AD69-8D29668CB05B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5886B73F-4547-4C88-AD69-8D29668CB05B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5886B73F-4547-4C88-AD69-8D29668CB05B}.Release|Any CPU.Build.0 = Release|Any CPU
- {99AAA80A-1368-421B-A750-DB5E04971764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {99AAA80A-1368-421B-A750-DB5E04971764}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {99AAA80A-1368-421B-A750-DB5E04971764}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {99AAA80A-1368-421B-A750-DB5E04971764}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B59FA95B-262E-4580-AB36-37DB5E16917A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B59FA95B-262E-4580-AB36-37DB5E16917A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B59FA95B-262E-4580-AB36-37DB5E16917A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B59FA95B-262E-4580-AB36-37DB5E16917A}.Release|Any CPU.Build.0 = Release|Any CPU
{41157B1B-46DE-4775-8490-2FF9D9E8E4CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{41157B1B-46DE-4775-8490-2FF9D9E8E4CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{41157B1B-46DE-4775-8490-2FF9D9E8E4CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{5886B73F-4547-4C88-AD69-8D29668CB05B} = {9099A547-2E14-439D-8A52-0AB72FF53DBB}
{0C3B9B1F-0C70-4ECE-83A7-21FD93E328CD} = {B31191C3-543F-486D-8273-506BD0717B38}
{D701D3C7-0CCD-4245-97C4-A90F3972DFDC} = {4518E3A1-BCE4-49EE-99C3-DD68D0420E36}
- {99AAA80A-1368-421B-A750-DB5E04971764} = {CA82EA7A-B4F6-4A96-A7B1-A6646E51586E}
+ {B59FA95B-262E-4580-AB36-37DB5E16917A} = {CA82EA7A-B4F6-4A96-A7B1-A6646E51586E}
{41157B1B-46DE-4775-8490-2FF9D9E8E4CA} = {CA82EA7A-B4F6-4A96-A7B1-A6646E51586E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
index 2a01dbf0856..af6973940bc 100644
--- a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
+++ b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors.Tests", "tests\System.Numerics.Tensors.Tests.csproj", "{4AF6A02D-82C8-4898-9EDF-01F107C25061}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{31FB5731-0E99-4747-9CB2-1B440A9ED74F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4588351F-4233-4957-B84C-7F8E22B8888A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{DB954E01-898A-4FE2-A3AA-180D041AB08F}"
EndProject
@@ -41,10 +41,10 @@ Global
{4AF6A02D-82C8-4898-9EDF-01F107C25061}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4AF6A02D-82C8-4898-9EDF-01F107C25061}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4AF6A02D-82C8-4898-9EDF-01F107C25061}.Release|Any CPU.Build.0 = Release|Any CPU
- {31FB5731-0E99-4747-9CB2-1B440A9ED74F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {31FB5731-0E99-4747-9CB2-1B440A9ED74F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {31FB5731-0E99-4747-9CB2-1B440A9ED74F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {31FB5731-0E99-4747-9CB2-1B440A9ED74F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4588351F-4233-4957-B84C-7F8E22B8888A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4588351F-4233-4957-B84C-7F8E22B8888A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4588351F-4233-4957-B84C-7F8E22B8888A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4588351F-4233-4957-B84C-7F8E22B8888A}.Release|Any CPU.Build.0 = Release|Any CPU
{DB954E01-898A-4FE2-A3AA-180D041AB08F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB954E01-898A-4FE2-A3AA-180D041AB08F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DB954E01-898A-4FE2-A3AA-180D041AB08F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{4AF6A02D-82C8-4898-9EDF-01F107C25061} = {DE94CA7D-BB10-4865-85A6-6B694631247F}
{21CB448A-3882-4337-B416-D1A3E0BCFFC5} = {6BC42E6D-848C-4533-B715-F116E7DB3610}
{848DD000-3D22-4A25-A9D9-05AFF857A116} = {AB415F5A-75E5-4E03-8A92-15CEDEC4CD3A}
- {31FB5731-0E99-4747-9CB2-1B440A9ED74F} = {083161E5-6049-4D84-9739-9D7797D7117D}
+ {4588351F-4233-4957-B84C-7F8E22B8888A} = {083161E5-6049-4D84-9739-9D7797D7117D}
{DB954E01-898A-4FE2-A3AA-180D041AB08F} = {083161E5-6049-4D84-9739-9D7797D7117D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
index 19042a9c277..c3e0c0d61e9 100644
--- a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
+++ b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Vectors.Tes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{88F4A78E-4EF9-4EB6-995E-CD24152C4704}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{C6EDFA8A-956E-4398-B31F-FA87312BDF9B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{547EC332-29FE-47A8-B477-4E19BE521235}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{F99EAF58-533E-4941-A0C5-5101309D8AB9}"
EndProject
@@ -144,24 +144,24 @@ Global
{88F4A78E-4EF9-4EB6-995E-CD24152C4704}.Checked|x64.Build.0 = Debug|Any CPU
{88F4A78E-4EF9-4EB6-995E-CD24152C4704}.Checked|x86.ActiveCfg = Debug|Any CPU
{88F4A78E-4EF9-4EB6-995E-CD24152C4704}.Checked|x86.Build.0 = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Debug|x64.ActiveCfg = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Debug|x64.Build.0 = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Debug|x86.Build.0 = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Release|Any CPU.Build.0 = Release|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Release|x64.ActiveCfg = Release|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Release|x64.Build.0 = Release|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Release|x86.ActiveCfg = Release|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Release|x86.Build.0 = Release|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Checked|x64.ActiveCfg = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Checked|x64.Build.0 = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Checked|x86.ActiveCfg = Debug|Any CPU
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B}.Checked|x86.Build.0 = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Debug|x64.Build.0 = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Debug|x86.Build.0 = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Release|Any CPU.Build.0 = Release|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Release|x64.ActiveCfg = Release|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Release|x64.Build.0 = Release|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Release|x86.ActiveCfg = Release|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Release|x86.Build.0 = Release|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Checked|x64.Build.0 = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {547EC332-29FE-47A8-B477-4E19BE521235}.Checked|x86.Build.0 = Debug|Any CPU
{F99EAF58-533E-4941-A0C5-5101309D8AB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F99EAF58-533E-4941-A0C5-5101309D8AB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F99EAF58-533E-4941-A0C5-5101309D8AB9}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -191,7 +191,7 @@ Global
{B38797B1-BB45-4B30-9D4F-79D9F4B3735B} = {2C4425BA-8478-4BCB-B616-E6FC28ADEAB9}
{5B2027FA-F43A-4E80-880F-B3A7A2720AA7} = {ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC}
{88F4A78E-4EF9-4EB6-995E-CD24152C4704} = {38837FDE-8CFE-4676-B3CE-48165E0FD6CF}
- {C6EDFA8A-956E-4398-B31F-FA87312BDF9B} = {38837FDE-8CFE-4676-B3CE-48165E0FD6CF}
+ {547EC332-29FE-47A8-B477-4E19BE521235} = {38837FDE-8CFE-4676-B3CE-48165E0FD6CF}
{F99EAF58-533E-4941-A0C5-5101309D8AB9} = {38837FDE-8CFE-4676-B3CE-48165E0FD6CF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.ObjectModel/System.ObjectModel.sln b/src/libraries/System.ObjectModel/System.ObjectModel.sln
index c9f2bf81a8a..79aec47cea4 100644
--- a/src/libraries/System.ObjectModel/System.ObjectModel.sln
+++ b/src/libraries/System.ObjectModel/System.ObjectModel.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel", "src\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel.Tests", "tests\System.ObjectModel.Tests.csproj", "{9DB5C0B8-959E-4B0A-99A6-88452FD3C10C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{EE920D2F-7823-4FD2-9313-024E2DF14C10}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{A42FE6C9-59F1-43E7-AD34-802F13254284}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A62E47A3-C3A7-421A-B3E6-2DD578A50781}"
EndProject
@@ -41,10 +41,10 @@ Global
{9DB5C0B8-959E-4B0A-99A6-88452FD3C10C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9DB5C0B8-959E-4B0A-99A6-88452FD3C10C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9DB5C0B8-959E-4B0A-99A6-88452FD3C10C}.Release|Any CPU.Build.0 = Release|Any CPU
- {EE920D2F-7823-4FD2-9313-024E2DF14C10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EE920D2F-7823-4FD2-9313-024E2DF14C10}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EE920D2F-7823-4FD2-9313-024E2DF14C10}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EE920D2F-7823-4FD2-9313-024E2DF14C10}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A42FE6C9-59F1-43E7-AD34-802F13254284}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A42FE6C9-59F1-43E7-AD34-802F13254284}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A42FE6C9-59F1-43E7-AD34-802F13254284}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A42FE6C9-59F1-43E7-AD34-802F13254284}.Release|Any CPU.Build.0 = Release|Any CPU
{A62E47A3-C3A7-421A-B3E6-2DD578A50781}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A62E47A3-C3A7-421A-B3E6-2DD578A50781}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A62E47A3-C3A7-421A-B3E6-2DD578A50781}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{9DB5C0B8-959E-4B0A-99A6-88452FD3C10C} = {7D905913-8F74-4711-80B7-CFAD20A5B57B}
{E13B9A3B-BA99-4FA3-9959-B95E14DCB9BC} = {2E5C2B29-721D-4DDF-985F-81CA593E4F42}
{583024EB-8FC7-45E3-9C37-85BE43FBD28A} = {35DDEBAA-829C-43C1-BB49-29A11589D22D}
- {EE920D2F-7823-4FD2-9313-024E2DF14C10} = {0534B176-48FC-4F4D-9D44-ADD06237B038}
+ {A42FE6C9-59F1-43E7-AD34-802F13254284} = {0534B176-48FC-4F4D-9D44-ADD06237B038}
{A62E47A3-C3A7-421A-B3E6-2DD578A50781} = {0534B176-48FC-4F4D-9D44-ADD06237B038}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/System.Private.Runtime.InteropServices.JavaScript.sln b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/System.Private.Runtime.InteropServices.JavaScript.sln
index dad46eaafa2..b64ac26550c 100644
--- a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/System.Private.Runtime.InteropServices.JavaScript.sln
+++ b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/System.Private.Runtime.InteropServices.JavaScript.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Runtime.Inte
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Runtime.InteropServices.JavaScript.Tests", "tests\System.Private.Runtime.InteropServices.JavaScript.Tests.csproj", "{4A88DCA2-2A9F-4497-AE84-C15B81F21782}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{133C6563-CA56-456A-9B63-CA5F3EA7E5CA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{A6F2F5A8-7B65-4B59-A1AF-5712E84CAE3A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{8061897F-550F-4932-8D35-126BE3CA894C}"
EndProject
@@ -33,10 +33,10 @@ Global
{4A88DCA2-2A9F-4497-AE84-C15B81F21782}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A88DCA2-2A9F-4497-AE84-C15B81F21782}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A88DCA2-2A9F-4497-AE84-C15B81F21782}.Release|Any CPU.Build.0 = Release|Any CPU
- {133C6563-CA56-456A-9B63-CA5F3EA7E5CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {133C6563-CA56-456A-9B63-CA5F3EA7E5CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {133C6563-CA56-456A-9B63-CA5F3EA7E5CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {133C6563-CA56-456A-9B63-CA5F3EA7E5CA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A6F2F5A8-7B65-4B59-A1AF-5712E84CAE3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A6F2F5A8-7B65-4B59-A1AF-5712E84CAE3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A6F2F5A8-7B65-4B59-A1AF-5712E84CAE3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A6F2F5A8-7B65-4B59-A1AF-5712E84CAE3A}.Release|Any CPU.Build.0 = Release|Any CPU
{8061897F-550F-4932-8D35-126BE3CA894C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8061897F-550F-4932-8D35-126BE3CA894C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8061897F-550F-4932-8D35-126BE3CA894C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -49,7 +49,7 @@ Global
{ABCD5AB6-389B-466D-96E6-B41A671B7454} = {0866D4B1-55B3-44F7-8683-61FF19EC2CFD}
{4A88DCA2-2A9F-4497-AE84-C15B81F21782} = {0866D4B1-55B3-44F7-8683-61FF19EC2CFD}
{1EF4B421-0137-4C27-A6D2-DFC2B09E52F0} = {F323228E-200C-4069-98A1-E2400F3061B3}
- {133C6563-CA56-456A-9B63-CA5F3EA7E5CA} = {53D4886A-6035-458C-834C-D7EDC02A0E26}
+ {A6F2F5A8-7B65-4B59-A1AF-5712E84CAE3A} = {53D4886A-6035-458C-834C-D7EDC02A0E26}
{8061897F-550F-4932-8D35-126BE3CA894C} = {53D4886A-6035-458C-834C-D7EDC02A0E26}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Private.Uri/System.Private.Uri.sln b/src/libraries/System.Private.Uri/System.Private.Uri.sln
index 6ab941e56ea..1cdddf27ea4 100644
--- a/src/libraries/System.Private.Uri/System.Private.Uri.sln
+++ b/src/libraries/System.Private.Uri/System.Private.Uri.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri.Function
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri.Unit.Tests", "tests\UnitTests\System.Private.Uri.Unit.Tests.csproj", "{650441DF-021A-45C3-9560-F9FDB3037A64}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9094F5BF-3AED-4473-A136-B91874528734}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{DC61379F-5CAE-4744-A71C-3E7AAF921877}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B532288A-97AF-473C-B334-E5F6F572907C}"
EndProject
@@ -162,24 +162,24 @@ Global
{650441DF-021A-45C3-9560-F9FDB3037A64}.Checked|x64.Build.0 = Debug|Any CPU
{650441DF-021A-45C3-9560-F9FDB3037A64}.Checked|x86.ActiveCfg = Debug|Any CPU
{650441DF-021A-45C3-9560-F9FDB3037A64}.Checked|x86.Build.0 = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Debug|x64.ActiveCfg = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Debug|x64.Build.0 = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Debug|x86.ActiveCfg = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Debug|x86.Build.0 = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Release|Any CPU.Build.0 = Release|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Release|x64.ActiveCfg = Release|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Release|x64.Build.0 = Release|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Release|x86.ActiveCfg = Release|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Release|x86.Build.0 = Release|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Checked|x64.ActiveCfg = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Checked|x64.Build.0 = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Checked|x86.ActiveCfg = Debug|Any CPU
- {9094F5BF-3AED-4473-A136-B91874528734}.Checked|x86.Build.0 = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Debug|x64.Build.0 = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Debug|x86.Build.0 = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Release|x64.ActiveCfg = Release|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Release|x64.Build.0 = Release|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Release|x86.ActiveCfg = Release|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Release|x86.Build.0 = Release|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Checked|x64.Build.0 = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877}.Checked|x86.Build.0 = Debug|Any CPU
{B532288A-97AF-473C-B334-E5F6F572907C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B532288A-97AF-473C-B334-E5F6F572907C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B532288A-97AF-473C-B334-E5F6F572907C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -210,7 +210,7 @@ Global
{BDD0866A-D856-40EE-A9D5-1DAC11095E42} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05}
{650441DF-021A-45C3-9560-F9FDB3037A64} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05}
{D9F21DA7-0FE6-419E-9CE3-DFFBC3F0067F} = {E3179181-D7ED-459C-B0ED-40DF10FC1959}
- {9094F5BF-3AED-4473-A136-B91874528734} = {E3179181-D7ED-459C-B0ED-40DF10FC1959}
+ {DC61379F-5CAE-4744-A71C-3E7AAF921877} = {E3179181-D7ED-459C-B0ED-40DF10FC1959}
{B532288A-97AF-473C-B334-E5F6F572907C} = {E3179181-D7ED-459C-B0ED-40DF10FC1959}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln b/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
index 216cd8a2183..d92daf48d89 100644
--- a/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
+++ b/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
@@ -37,7 +37,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.XDocument.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{A4F479E3-A0AD-4646-BD4B-F3CD2C29046B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{C3DDCB78-D522-4A6E-838C-B2E9034F2A74}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7F136EB7-C602-403B-84CD-753B32D699A8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D85F6247-9473-4AA3-80C8-06D65B035C98}"
EndProject
@@ -129,10 +129,10 @@ Global
{A4F479E3-A0AD-4646-BD4B-F3CD2C29046B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4F479E3-A0AD-4646-BD4B-F3CD2C29046B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4F479E3-A0AD-4646-BD4B-F3CD2C29046B}.Release|Any CPU.Build.0 = Release|Any CPU
- {C3DDCB78-D522-4A6E-838C-B2E9034F2A74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C3DDCB78-D522-4A6E-838C-B2E9034F2A74}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C3DDCB78-D522-4A6E-838C-B2E9034F2A74}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C3DDCB78-D522-4A6E-838C-B2E9034F2A74}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7F136EB7-C602-403B-84CD-753B32D699A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7F136EB7-C602-403B-84CD-753B32D699A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7F136EB7-C602-403B-84CD-753B32D699A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7F136EB7-C602-403B-84CD-753B32D699A8}.Release|Any CPU.Build.0 = Release|Any CPU
{D85F6247-9473-4AA3-80C8-06D65B035C98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D85F6247-9473-4AA3-80C8-06D65B035C98}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D85F6247-9473-4AA3-80C8-06D65B035C98}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -161,7 +161,7 @@ Global
{557CBDC5-16E6-44FD-B34B-6386AFDC300D} = {4CB964C2-C69D-4A48-96A7-ACB28FBCB223}
{61FD926A-2ED8-4CA5-8D75-854C8C9D9CCD} = {1C4146F1-CF77-449B-865C-5E67ECF0362B}
{A4F479E3-A0AD-4646-BD4B-F3CD2C29046B} = {1C4146F1-CF77-449B-865C-5E67ECF0362B}
- {C3DDCB78-D522-4A6E-838C-B2E9034F2A74} = {E9DEC5AA-D875-466B-9E3C-26CFD3C806D3}
+ {7F136EB7-C602-403B-84CD-753B32D699A8} = {E9DEC5AA-D875-466B-9E3C-26CFD3C806D3}
{D85F6247-9473-4AA3-80C8-06D65B035C98} = {E9DEC5AA-D875-466B-9E3C-26CFD3C806D3}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Private.Xml/System.Private.Xml.sln b/src/libraries/System.Private.Xml/System.Private.Xml.sln
index 99a5e6ccfda..b9c68d96de1 100644
--- a/src/libraries/System.Private.Xml/System.Private.Xml.sln
+++ b/src/libraries/System.Private.Xml/System.Private.Xml.sln
@@ -69,7 +69,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XsltCompiler.Tests", "tests
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Xsl.XslTransformApi.Tests", "tests\Xslt\XslTransformApi\System.Xml.Xsl.XslTransformApi.Tests.csproj", "{BBB6623D-BDF2-41B6-9165-A22A6C4D4159}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6D5DCBE4-A8BF-4AA6-BC9B-F3A3DBE8A999}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{6BC66CAC-5D61-48C2-8343-FF32DC7BC626}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9CDA14FB-7312-45E7-BF4C-1E446C2242BC}"
EndProject
@@ -225,10 +225,10 @@ Global
{BBB6623D-BDF2-41B6-9165-A22A6C4D4159}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BBB6623D-BDF2-41B6-9165-A22A6C4D4159}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BBB6623D-BDF2-41B6-9165-A22A6C4D4159}.Release|Any CPU.Build.0 = Release|Any CPU
- {6D5DCBE4-A8BF-4AA6-BC9B-F3A3DBE8A999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6D5DCBE4-A8BF-4AA6-BC9B-F3A3DBE8A999}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6D5DCBE4-A8BF-4AA6-BC9B-F3A3DBE8A999}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6D5DCBE4-A8BF-4AA6-BC9B-F3A3DBE8A999}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6BC66CAC-5D61-48C2-8343-FF32DC7BC626}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6BC66CAC-5D61-48C2-8343-FF32DC7BC626}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6BC66CAC-5D61-48C2-8343-FF32DC7BC626}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6BC66CAC-5D61-48C2-8343-FF32DC7BC626}.Release|Any CPU.Build.0 = Release|Any CPU
{9CDA14FB-7312-45E7-BF4C-1E446C2242BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CDA14FB-7312-45E7-BF4C-1E446C2242BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CDA14FB-7312-45E7-BF4C-1E446C2242BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -273,7 +273,7 @@ Global
{4A49FD39-51EF-42F4-AEF9-C60880FC41B3} = {E96EBB95-6AC7-4ECD-AD77-30F089F2C1F9}
{BBB6623D-BDF2-41B6-9165-A22A6C4D4159} = {E96EBB95-6AC7-4ECD-AD77-30F089F2C1F9}
{B49AD269-3938-4F33-AEF8-029D3A94138F} = {41E18B29-2DB1-495A-8460-E7A257F8EA07}
- {6D5DCBE4-A8BF-4AA6-BC9B-F3A3DBE8A999} = {75FE1E48-B986-46E6-874F-336D74FF6C94}
+ {6BC66CAC-5D61-48C2-8343-FF32DC7BC626} = {75FE1E48-B986-46E6-874F-336D74FF6C94}
{9CDA14FB-7312-45E7-BF4C-1E446C2242BC} = {75FE1E48-B986-46E6-874F-336D74FF6C94}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Reflection.Context/System.Reflection.Context.sln b/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
index 611211cf059..7249f9cf588 100644
--- a/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
+++ b/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context.Tests", "tests\System.Reflection.Context.Tests.csproj", "{34EA59F6-6177-4957-9894-563A73B02D63}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F4C16B80-9B9A-418B-9FCE-F288AD49F498}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{CDC2FCCA-3BDD-44D6-94E2-864684AFA61D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{7EEF6CAC-49D4-4D06-9414-2C9175898D13}"
EndProject
@@ -41,10 +41,10 @@ Global
{34EA59F6-6177-4957-9894-563A73B02D63}.Debug|Any CPU.Build.0 = Debug|Any CPU
{34EA59F6-6177-4957-9894-563A73B02D63}.Release|Any CPU.ActiveCfg = Release|Any CPU
{34EA59F6-6177-4957-9894-563A73B02D63}.Release|Any CPU.Build.0 = Release|Any CPU
- {F4C16B80-9B9A-418B-9FCE-F288AD49F498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F4C16B80-9B9A-418B-9FCE-F288AD49F498}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F4C16B80-9B9A-418B-9FCE-F288AD49F498}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F4C16B80-9B9A-418B-9FCE-F288AD49F498}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CDC2FCCA-3BDD-44D6-94E2-864684AFA61D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CDC2FCCA-3BDD-44D6-94E2-864684AFA61D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CDC2FCCA-3BDD-44D6-94E2-864684AFA61D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CDC2FCCA-3BDD-44D6-94E2-864684AFA61D}.Release|Any CPU.Build.0 = Release|Any CPU
{7EEF6CAC-49D4-4D06-9414-2C9175898D13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7EEF6CAC-49D4-4D06-9414-2C9175898D13}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7EEF6CAC-49D4-4D06-9414-2C9175898D13}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{34EA59F6-6177-4957-9894-563A73B02D63} = {C676A2DE-6F6F-44AF-B869-53C834A272AF}
{B2EBCE83-FA49-4ECD-9E8E-AF231AADFF67} = {31D51BA2-EB4E-4EC1-908D-EC23CB91C89D}
{794EAE71-36BA-436D-841A-A8C72AADF485} = {E460C3AC-CC68-44E7-9256-75062C1CF587}
- {F4C16B80-9B9A-418B-9FCE-F288AD49F498} = {AC2F6758-1191-4142-B369-6C2E27A4BEBC}
+ {CDC2FCCA-3BDD-44D6-94E2-864684AFA61D} = {AC2F6758-1191-4142-B369-6C2E27A4BEBC}
{7EEF6CAC-49D4-4D06-9414-2C9175898D13} = {AC2F6758-1191-4142-B369-6C2E27A4BEBC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln b/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
index 4c17e872265..15aa1be19e2 100644
--- a/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
+++ b/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.DispatchP
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.DispatchProxy.TestDependency", "tests\TestDependency\System.Reflection.DispatchProxy.TestDependency.csproj", "{86C30AC7-2B89-4757-A580-0FB318D9E784}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B1AB64B4-F907-4221-A93B-3D4B630E7AF7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{8FC6C206-76D5-4FE2-A7A4-C0B6597709AF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{318BE680-88DD-478B-ABA8-B19C1BBB93E9}"
EndProject
@@ -47,10 +47,10 @@ Global
{86C30AC7-2B89-4757-A580-0FB318D9E784}.Debug|Any CPU.Build.0 = Debug|Any CPU
{86C30AC7-2B89-4757-A580-0FB318D9E784}.Release|Any CPU.ActiveCfg = Release|Any CPU
{86C30AC7-2B89-4757-A580-0FB318D9E784}.Release|Any CPU.Build.0 = Release|Any CPU
- {B1AB64B4-F907-4221-A93B-3D4B630E7AF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B1AB64B4-F907-4221-A93B-3D4B630E7AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B1AB64B4-F907-4221-A93B-3D4B630E7AF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B1AB64B4-F907-4221-A93B-3D4B630E7AF7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8FC6C206-76D5-4FE2-A7A4-C0B6597709AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8FC6C206-76D5-4FE2-A7A4-C0B6597709AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8FC6C206-76D5-4FE2-A7A4-C0B6597709AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8FC6C206-76D5-4FE2-A7A4-C0B6597709AF}.Release|Any CPU.Build.0 = Release|Any CPU
{318BE680-88DD-478B-ABA8-B19C1BBB93E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{318BE680-88DD-478B-ABA8-B19C1BBB93E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{318BE680-88DD-478B-ABA8-B19C1BBB93E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,7 +65,7 @@ Global
{86C30AC7-2B89-4757-A580-0FB318D9E784} = {A93B0848-1831-47F3-AE2E-196950D1BBF0}
{DE8CF6FB-C4B6-42B4-ADEE-9CE6066DB6D8} = {F1A0875B-0263-4071-8847-F0A2C479F6F9}
{F5A284B5-10D3-43D4-BB3F-F0FB55033504} = {95661E1D-F86D-4EDC-AF44-E0F782BB7E4B}
- {B1AB64B4-F907-4221-A93B-3D4B630E7AF7} = {03BEF49E-85A2-49A8-9A48-EF93FA21B743}
+ {8FC6C206-76D5-4FE2-A7A4-C0B6597709AF} = {03BEF49E-85A2-49A8-9A48-EF93FA21B743}
{318BE680-88DD-478B-ABA8-B19C1BBB93E9} = {03BEF49E-85A2-49A8-9A48-EF93FA21B743}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln b/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
index cf7c9369d99..6621b55476c 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.ILGe
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.ILGeneration.Tests", "tests\System.Reflection.Emit.ILGeneration.Tests.csproj", "{EA6F01DF-1F63-49FF-A6E8-CA9104296196}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{3461E542-7F19-4B98-B206-BDF932529A5B}"
EndProject
@@ -144,24 +144,24 @@ Global
{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Checked|x64.Build.0 = Debug|Any CPU
{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Checked|x86.ActiveCfg = Debug|Any CPU
{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Checked|x86.Build.0 = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Debug|x64.ActiveCfg = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Debug|x64.Build.0 = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Debug|x86.Build.0 = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Release|Any CPU.Build.0 = Release|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Release|x64.ActiveCfg = Release|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Release|x64.Build.0 = Release|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Release|x86.ActiveCfg = Release|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Release|x86.Build.0 = Release|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Checked|x64.ActiveCfg = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Checked|x64.Build.0 = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Checked|x86.ActiveCfg = Debug|Any CPU
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}.Checked|x86.Build.0 = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Debug|x64.Build.0 = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Debug|x86.Build.0 = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Release|x64.ActiveCfg = Release|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Release|x64.Build.0 = Release|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Release|x86.ActiveCfg = Release|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Release|x86.Build.0 = Release|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Checked|x64.Build.0 = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D}.Checked|x86.Build.0 = Debug|Any CPU
{3461E542-7F19-4B98-B206-BDF932529A5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3461E542-7F19-4B98-B206-BDF932529A5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3461E542-7F19-4B98-B206-BDF932529A5B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{05696F45-ACF1-4C02-B8D9-E8C1F5E28717} = {61C529DF-66C4-42E9-AE70-3427838FAFE3}
{EA6F01DF-1F63-49FF-A6E8-CA9104296196} = {61C529DF-66C4-42E9-AE70-3427838FAFE3}
{8843EA69-AD8F-4C73-8436-1641470199DC} = {155A2103-05C1-4020-8922-4F6275F6AE7E}
- {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57} = {155A2103-05C1-4020-8922-4F6275F6AE7E}
+ {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D} = {155A2103-05C1-4020-8922-4F6275F6AE7E}
{3461E542-7F19-4B98-B206-BDF932529A5B} = {155A2103-05C1-4020-8922-4F6275F6AE7E}
{64BBA40A-8DB5-4829-815A-3D612A12222D} = {A20A0878-5647-4145-B224-C390446B7676}
EndGlobalSection
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln b/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
index 4f1907cf833..e345be2cd8f 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
+++ b/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.Ligh
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.Lightweight.Tests", "tests\System.Reflection.Emit.Lightweight.Tests.csproj", "{13447BAB-2762-4CCC-95DF-531FC82FE39A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DCA81145-5491-4A3A-9362-642435B33230}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{40E15C1B-0AB8-4FC5-9CE2-062B736F9021}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{913E983B-B16C-4B1E-BD37-906CFF93CAB4}"
EndProject
@@ -144,24 +144,24 @@ Global
{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Checked|x64.Build.0 = Debug|Any CPU
{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Checked|x86.ActiveCfg = Debug|Any CPU
{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Checked|x86.Build.0 = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Debug|x64.ActiveCfg = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Debug|x64.Build.0 = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Debug|x86.ActiveCfg = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Debug|x86.Build.0 = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Release|Any CPU.Build.0 = Release|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Release|x64.ActiveCfg = Release|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Release|x64.Build.0 = Release|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Release|x86.ActiveCfg = Release|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Release|x86.Build.0 = Release|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Checked|x64.ActiveCfg = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Checked|x64.Build.0 = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Checked|x86.ActiveCfg = Debug|Any CPU
- {DCA81145-5491-4A3A-9362-642435B33230}.Checked|x86.Build.0 = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Debug|x64.Build.0 = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Debug|x86.Build.0 = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Release|Any CPU.Build.0 = Release|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Release|x64.ActiveCfg = Release|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Release|x64.Build.0 = Release|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Release|x86.ActiveCfg = Release|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Release|x86.Build.0 = Release|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Checked|x64.Build.0 = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021}.Checked|x86.Build.0 = Debug|Any CPU
{913E983B-B16C-4B1E-BD37-906CFF93CAB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{913E983B-B16C-4B1E-BD37-906CFF93CAB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{913E983B-B16C-4B1E-BD37-906CFF93CAB4}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A} = {FF41EFDD-DD1F-428F-B25E-DD9B85D5A992}
{13447BAB-2762-4CCC-95DF-531FC82FE39A} = {FF41EFDD-DD1F-428F-B25E-DD9B85D5A992}
{165A3077-1F79-46E7-8BFA-88AACEB6D026} = {09AE6FA7-7363-4994-BC62-3685AE151227}
- {DCA81145-5491-4A3A-9362-642435B33230} = {09AE6FA7-7363-4994-BC62-3685AE151227}
+ {40E15C1B-0AB8-4FC5-9CE2-062B736F9021} = {09AE6FA7-7363-4994-BC62-3685AE151227}
{913E983B-B16C-4B1E-BD37-906CFF93CAB4} = {09AE6FA7-7363-4994-BC62-3685AE151227}
{EE535D8F-D21B-4C18-A915-60E94CE19CA2} = {2AB40A0A-24D5-40B9-AA94-5BF17878879A}
EndGlobalSection
diff --git a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
index f7211c07a7c..96f78fa5afd 100644
--- a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
+++ b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit", "s
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.Tests", "tests\System.Reflection.Emit.Tests.csproj", "{82899000-791E-42FF-A594-6DE65DE07C9E}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1801A03A-C09B-4641-B2CD-D986A7D36BF8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{73EA94AD-0C65-47C8-851C-12D136A0DCC1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{506EBBFA-FF57-4141-A725-882110C17598}"
EndProject
@@ -144,24 +144,24 @@ Global
{82899000-791E-42FF-A594-6DE65DE07C9E}.Checked|x64.Build.0 = Debug|Any CPU
{82899000-791E-42FF-A594-6DE65DE07C9E}.Checked|x86.ActiveCfg = Debug|Any CPU
{82899000-791E-42FF-A594-6DE65DE07C9E}.Checked|x86.Build.0 = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Debug|x64.ActiveCfg = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Debug|x64.Build.0 = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Debug|x86.Build.0 = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Release|Any CPU.Build.0 = Release|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Release|x64.ActiveCfg = Release|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Release|x64.Build.0 = Release|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Release|x86.ActiveCfg = Release|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Release|x86.Build.0 = Release|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Checked|x64.ActiveCfg = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Checked|x64.Build.0 = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Checked|x86.ActiveCfg = Debug|Any CPU
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8}.Checked|x86.Build.0 = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Debug|x64.Build.0 = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Debug|x86.Build.0 = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Release|x64.ActiveCfg = Release|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Release|x64.Build.0 = Release|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Release|x86.ActiveCfg = Release|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Release|x86.Build.0 = Release|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Checked|x64.Build.0 = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1}.Checked|x86.Build.0 = Debug|Any CPU
{506EBBFA-FF57-4141-A725-882110C17598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{506EBBFA-FF57-4141-A725-882110C17598}.Debug|Any CPU.Build.0 = Debug|Any CPU
{506EBBFA-FF57-4141-A725-882110C17598}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{E5543842-139D-43BD-B604-E65EBB91649E} = {2FC35C2F-76DB-4D84-B421-9700BEA4D161}
{82899000-791E-42FF-A594-6DE65DE07C9E} = {2FC35C2F-76DB-4D84-B421-9700BEA4D161}
{848EFB55-86B5-4259-BAA2-A49C6E3421A9} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B}
- {1801A03A-C09B-4641-B2CD-D986A7D36BF8} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B}
+ {73EA94AD-0C65-47C8-851C-12D136A0DCC1} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B}
{506EBBFA-FF57-4141-A725-882110C17598} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B}
{6A176C5B-206D-4550-AC36-0530218E29F5} = {C36D185D-9B3D-42E5-985F-E21B3BAF3B6D}
EndGlobalSection
diff --git a/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln b/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln
index c43f075611b..dc515a8a73f 100644
--- a/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln
+++ b/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Extension
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Extensions.Tests", "tests\System.Reflection.Extensions.Tests.csproj", "{1519BE4C-D14A-4741-B9BE-1516CDAE91D9}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2B67DB08-C9F1-4F21-B98F-117C5ACCBC69}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{229D5581-5289-40D5-BA0F-C0D203CC942C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{EB7DB8A7-06C5-4235-8E89-D918FAA5F279}"
EndProject
@@ -41,10 +41,10 @@ Global
{1519BE4C-D14A-4741-B9BE-1516CDAE91D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1519BE4C-D14A-4741-B9BE-1516CDAE91D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1519BE4C-D14A-4741-B9BE-1516CDAE91D9}.Release|Any CPU.Build.0 = Release|Any CPU
- {2B67DB08-C9F1-4F21-B98F-117C5ACCBC69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2B67DB08-C9F1-4F21-B98F-117C5ACCBC69}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2B67DB08-C9F1-4F21-B98F-117C5ACCBC69}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2B67DB08-C9F1-4F21-B98F-117C5ACCBC69}.Release|Any CPU.Build.0 = Release|Any CPU
+ {229D5581-5289-40D5-BA0F-C0D203CC942C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {229D5581-5289-40D5-BA0F-C0D203CC942C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {229D5581-5289-40D5-BA0F-C0D203CC942C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {229D5581-5289-40D5-BA0F-C0D203CC942C}.Release|Any CPU.Build.0 = Release|Any CPU
{EB7DB8A7-06C5-4235-8E89-D918FAA5F279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB7DB8A7-06C5-4235-8E89-D918FAA5F279}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB7DB8A7-06C5-4235-8E89-D918FAA5F279}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{1519BE4C-D14A-4741-B9BE-1516CDAE91D9} = {5843C437-47E1-4D29-880B-ECF7D5404620}
{C5FFC3AB-A8EC-430D-B8C7-35A583D0215B} = {0EDCC16B-76C1-404F-92FB-D7983226387F}
{2A71A275-D88D-48FA-B35A-CF27ADCF4EA7} = {83D8FA0E-C4ED-4C99-BEA5-7390AF616789}
- {2B67DB08-C9F1-4F21-B98F-117C5ACCBC69} = {7AE28A5D-C27D-4EB6-8E45-91C62F4DAE19}
+ {229D5581-5289-40D5-BA0F-C0D203CC942C} = {7AE28A5D-C27D-4EB6-8E45-91C62F4DAE19}
{EB7DB8A7-06C5-4235-8E89-D918FAA5F279} = {7AE28A5D-C27D-4EB6-8E45-91C62F4DAE19}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
index c9e09789bb9..137f001199c 100644
--- a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
+++ b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.Tests", "tests\System.Reflection.Metadata.Tests.csproj", "{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{80DB130A-55D8-47EB-9726-14AC069D28B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{1092AC3C-B01C-4AC4-9F05-6FDB23C699B3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{930B1167-83BE-42CC-BFED-096CB2BA19F1}"
EndProject
@@ -53,10 +53,10 @@ Global
{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE}.Release|Any CPU.Build.0 = Release|Any CPU
- {80DB130A-55D8-47EB-9726-14AC069D28B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {80DB130A-55D8-47EB-9726-14AC069D28B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {80DB130A-55D8-47EB-9726-14AC069D28B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {80DB130A-55D8-47EB-9726-14AC069D28B3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1092AC3C-B01C-4AC4-9F05-6FDB23C699B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1092AC3C-B01C-4AC4-9F05-6FDB23C699B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1092AC3C-B01C-4AC4-9F05-6FDB23C699B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1092AC3C-B01C-4AC4-9F05-6FDB23C699B3}.Release|Any CPU.Build.0 = Release|Any CPU
{930B1167-83BE-42CC-BFED-096CB2BA19F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{930B1167-83BE-42CC-BFED-096CB2BA19F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{930B1167-83BE-42CC-BFED-096CB2BA19F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +72,7 @@ Global
{587255BE-DC22-4B85-9E3F-02325E7B4FF7} = {0829DF11-6008-4678-B608-D754E87EBC70}
{A69B0EE0-BE0C-4D53-A16F-5465028D975D} = {5E8418DF-67A1-4FA6-9241-215415C4D50A}
{B905521A-FE25-4D35-9929-B2622F590263} = {5E8418DF-67A1-4FA6-9241-215415C4D50A}
- {80DB130A-55D8-47EB-9726-14AC069D28B3} = {3FDA41E5-7DFA-48DC-856B-09E5747E3C9C}
+ {1092AC3C-B01C-4AC4-9F05-6FDB23C699B3} = {3FDA41E5-7DFA-48DC-856B-09E5747E3C9C}
{930B1167-83BE-42CC-BFED-096CB2BA19F1} = {3FDA41E5-7DFA-48DC-856B-09E5747E3C9C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
index 632eea19a6e..fba5deaa36d 100644
--- a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
+++ b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
@@ -6,7 +6,7 @@
SYSLIB0037: AssemblyName members HashAlgorithm, ProcessorArchitecture, and VersionCompatibility are obsolete. -->
<NoWarn>$(NoWarn);436;SYSLIB0037</NoWarn>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs"
diff --git a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
index 6284b9983e7..79f34684deb 100644
--- a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
+++ b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
@@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.MetadataL
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.MetadataLoadContext.Tests", "tests\System.Reflection.MetadataLoadContext.Tests.csproj", "{D28B6414-C82C-4BDE-B8BB-A4E3297A0651}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DD83F8D4-2C22-4489-BB06-4468C5DADA00}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4361CEFA-8238-4247-9CC5-D99DF794843C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{7393C7CD-4C31-4B1C-96DC-1D46D240538A}"
EndProject
@@ -65,10 +65,10 @@ Global
{D28B6414-C82C-4BDE-B8BB-A4E3297A0651}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D28B6414-C82C-4BDE-B8BB-A4E3297A0651}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D28B6414-C82C-4BDE-B8BB-A4E3297A0651}.Release|Any CPU.Build.0 = Release|Any CPU
- {DD83F8D4-2C22-4489-BB06-4468C5DADA00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DD83F8D4-2C22-4489-BB06-4468C5DADA00}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DD83F8D4-2C22-4489-BB06-4468C5DADA00}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DD83F8D4-2C22-4489-BB06-4468C5DADA00}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4361CEFA-8238-4247-9CC5-D99DF794843C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4361CEFA-8238-4247-9CC5-D99DF794843C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4361CEFA-8238-4247-9CC5-D99DF794843C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4361CEFA-8238-4247-9CC5-D99DF794843C}.Release|Any CPU.Build.0 = Release|Any CPU
{7393C7CD-4C31-4B1C-96DC-1D46D240538A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7393C7CD-4C31-4B1C-96DC-1D46D240538A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7393C7CD-4C31-4B1C-96DC-1D46D240538A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -86,7 +86,7 @@ Global
{DDDE44A1-86F6-49C5-8DA5-5630C9F1E41C} = {C9409DA5-0A3B-4194-AEB8-3CA7A6D5387E}
{499E5241-B46A-4161-A27C-C6D599070148} = {C9409DA5-0A3B-4194-AEB8-3CA7A6D5387E}
{DD06D785-53D2-4C11-895C-E9A24E23E276} = {C9409DA5-0A3B-4194-AEB8-3CA7A6D5387E}
- {DD83F8D4-2C22-4489-BB06-4468C5DADA00} = {E86A915C-E800-4558-AFDC-F41C4095B2DF}
+ {4361CEFA-8238-4247-9CC5-D99DF794843C} = {E86A915C-E800-4558-AFDC-F41C4095B2DF}
{7393C7CD-4C31-4B1C-96DC-1D46D240538A} = {E86A915C-E800-4558-AFDC-F41C4095B2DF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
index dfb2e49e222..70b7ccc8fb5 100644
--- a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
+++ b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Primitive
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Primitives", "src\System.Reflection.Primitives.csproj", "{5D40069E-7CC2-4B40-A41D-6B003CCB4075}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AA8D698E-B854-4D0E-83A2-0EAD0BA62122}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6DF455E8-D2C8-40EC-AEF2-AE05A66405F7}"
EndProject
@@ -102,24 +102,24 @@ Global
{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Checked|x64.Build.0 = Debug|Any CPU
{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Checked|x86.ActiveCfg = Debug|Any CPU
{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Checked|x86.Build.0 = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Debug|x64.ActiveCfg = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Debug|x64.Build.0 = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Debug|x86.ActiveCfg = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Debug|x86.Build.0 = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Release|Any CPU.Build.0 = Release|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Release|x64.ActiveCfg = Release|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Release|x64.Build.0 = Release|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Release|x86.ActiveCfg = Release|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Release|x86.Build.0 = Release|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Checked|x64.ActiveCfg = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Checked|x64.Build.0 = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Checked|x86.ActiveCfg = Debug|Any CPU
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122}.Checked|x86.Build.0 = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Debug|x64.Build.0 = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Debug|x86.Build.0 = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Release|x64.ActiveCfg = Release|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Release|x64.Build.0 = Release|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Release|x86.ActiveCfg = Release|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Release|x86.Build.0 = Release|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Checked|x64.Build.0 = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2}.Checked|x86.Build.0 = Debug|Any CPU
{6DF455E8-D2C8-40EC-AEF2-AE05A66405F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6DF455E8-D2C8-40EC-AEF2-AE05A66405F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6DF455E8-D2C8-40EC-AEF2-AE05A66405F7}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -146,7 +146,7 @@ Global
{661E0A3D-E151-45B2-AA38-B30F8227A741} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50}
{5D40069E-7CC2-4B40-A41D-6B003CCB4075} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50}
{869B6F76-2329-474A-854E-5AD5541A1CA0} = {654344FB-C5C8-4364-B43B-C2C9530B96F8}
- {AA8D698E-B854-4D0E-83A2-0EAD0BA62122} = {654344FB-C5C8-4364-B43B-C2C9530B96F8}
+ {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2} = {654344FB-C5C8-4364-B43B-C2C9530B96F8}
{6DF455E8-D2C8-40EC-AEF2-AE05A66405F7} = {654344FB-C5C8-4364-B43B-C2C9530B96F8}
{9D308994-9721-4883-B32D-531FA8D9025B} = {4599348B-0480-47D4-9763-F3C6716D3CCC}
EndGlobalSection
diff --git a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
index 220b7f6e8ca..81b16c1de5f 100644
--- a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
+++ b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TypeExten
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TypeExtensions.Tests", "tests\System.Reflection.TypeExtensions.Tests.csproj", "{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F7D2A806-877A-4FCB-843E-920F86B226CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{58441636-1844-462C-A3DF-C63CE8442E8F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{8A6C5539-2206-4A07-8EBE-1C7260B29F31}"
EndProject
@@ -144,24 +144,24 @@ Global
{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Checked|x64.Build.0 = Debug|Any CPU
{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Checked|x86.ActiveCfg = Debug|Any CPU
{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Checked|x86.Build.0 = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Debug|x64.ActiveCfg = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Debug|x64.Build.0 = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Debug|x86.ActiveCfg = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Debug|x86.Build.0 = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Release|Any CPU.Build.0 = Release|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Release|x64.ActiveCfg = Release|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Release|x64.Build.0 = Release|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Release|x86.ActiveCfg = Release|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Release|x86.Build.0 = Release|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Checked|x64.ActiveCfg = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Checked|x64.Build.0 = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Checked|x86.ActiveCfg = Debug|Any CPU
- {F7D2A806-877A-4FCB-843E-920F86B226CE}.Checked|x86.Build.0 = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Debug|x64.Build.0 = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Debug|x86.Build.0 = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Release|x64.ActiveCfg = Release|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Release|x64.Build.0 = Release|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Release|x86.ActiveCfg = Release|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Release|x86.Build.0 = Release|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Checked|x64.Build.0 = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {58441636-1844-462C-A3DF-C63CE8442E8F}.Checked|x86.Build.0 = Debug|Any CPU
{8A6C5539-2206-4A07-8EBE-1C7260B29F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A6C5539-2206-4A07-8EBE-1C7260B29F31}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A6C5539-2206-4A07-8EBE-1C7260B29F31}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{41438432-4DC0-4724-8C8F-0D100083490F} = {9BB99B5C-97D7-4247-B682-27CBBFCF1BB4}
{FEFD49C5-E2A2-411E-ABF4-DE7B58861750} = {9BB99B5C-97D7-4247-B682-27CBBFCF1BB4}
{EAE41D82-CFFA-4934-89B2-399D12530E84} = {89B14D9D-2BBE-446A-8ED8-020F7BBA6CFC}
- {F7D2A806-877A-4FCB-843E-920F86B226CE} = {89B14D9D-2BBE-446A-8ED8-020F7BBA6CFC}
+ {58441636-1844-462C-A3DF-C63CE8442E8F} = {89B14D9D-2BBE-446A-8ED8-020F7BBA6CFC}
{8A6C5539-2206-4A07-8EBE-1C7260B29F31} = {89B14D9D-2BBE-446A-8ED8-020F7BBA6CFC}
{03C0F6B8-A04B-4822-8089-3918F02AD281} = {B05E90C8-0282-4D7D-955E-3BE8A400D3A6}
EndGlobalSection
diff --git a/src/libraries/System.Reflection/System.Reflection.sln b/src/libraries/System.Reflection/System.Reflection.sln
index a5d99f89c05..89fa9ef3cd3 100644
--- a/src/libraries/System.Reflection/System.Reflection.sln
+++ b/src/libraries/System.Reflection/System.Reflection.sln
@@ -43,7 +43,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TestExe",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnloadableAssembly", "tests\UnloadableAssembly\UnloadableAssembly.csproj", "{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{FEEE282F-1085-49AC-B501-0349BCC9A0BF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{A2B3A339-4792-4561-A973-11FE5EEEB54A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{7625A3EB-C76C-41FE-85DC-C8B792062F9C}"
EndProject
@@ -464,24 +464,24 @@ Global
{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Checked|x64.Build.0 = Debug|Any CPU
{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Checked|x86.ActiveCfg = Debug|Any CPU
{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Checked|x86.Build.0 = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Debug|x64.ActiveCfg = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Debug|x64.Build.0 = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Debug|x86.Build.0 = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Release|Any CPU.Build.0 = Release|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Release|x64.ActiveCfg = Release|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Release|x64.Build.0 = Release|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Release|x86.ActiveCfg = Release|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Release|x86.Build.0 = Release|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Checked|x64.ActiveCfg = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Checked|x64.Build.0 = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Checked|x86.ActiveCfg = Debug|Any CPU
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF}.Checked|x86.Build.0 = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Debug|x64.Build.0 = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Debug|x86.Build.0 = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Release|x64.ActiveCfg = Release|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Release|x64.Build.0 = Release|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Release|x86.ActiveCfg = Release|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Release|x86.Build.0 = Release|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Checked|x64.Build.0 = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A}.Checked|x86.Build.0 = Debug|Any CPU
{7625A3EB-C76C-41FE-85DC-C8B792062F9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7625A3EB-C76C-41FE-85DC-C8B792062F9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7625A3EB-C76C-41FE-85DC-C8B792062F9C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -526,7 +526,7 @@ Global
{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88} = {64590D3A-D464-4764-ABE3-EF62722D8FA7}
{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0} = {64590D3A-D464-4764-ABE3-EF62722D8FA7}
{1F5C28EE-FA69-4A3A-934C-88FEBBDE2489} = {5BEA3DA5-3D9A-4642-B049-C04392B78D4B}
- {FEEE282F-1085-49AC-B501-0349BCC9A0BF} = {5BEA3DA5-3D9A-4642-B049-C04392B78D4B}
+ {A2B3A339-4792-4561-A973-11FE5EEEB54A} = {5BEA3DA5-3D9A-4642-B049-C04392B78D4B}
{7625A3EB-C76C-41FE-85DC-C8B792062F9C} = {5BEA3DA5-3D9A-4642-B049-C04392B78D4B}
{319997BC-5DF6-4E23-A768-ED9905690EF4} = {548F3513-E3A5-4741-A8C5-00D0CF99B2D3}
EndGlobalSection
diff --git a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
index 74670705557..d57adbf0a0c 100644
--- a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
+++ b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
@@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions.Tests", "tests\System.Resources.Extensions.Tests.csproj", "{F4A98D66-BA15-4C42-94A9-4732965A969A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A9D883BE-71BF-4D71-9E46-F40930A6AA27}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}"
EndProject
@@ -69,10 +69,10 @@ Global
{F4A98D66-BA15-4C42-94A9-4732965A969A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F4A98D66-BA15-4C42-94A9-4732965A969A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F4A98D66-BA15-4C42-94A9-4732965A969A}.Release|Any CPU.Build.0 = Release|Any CPU
- {A9D883BE-71BF-4D71-9E46-F40930A6AA27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A9D883BE-71BF-4D71-9E46-F40930A6AA27}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A9D883BE-71BF-4D71-9E46-F40930A6AA27}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A9D883BE-71BF-4D71-9E46-F40930A6AA27}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872}.Release|Any CPU.Build.0 = Release|Any CPU
{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -100,7 +100,7 @@ Global
{2B34DE46-1915-46F7-BD5C-2C8A3B8D1113} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A}
{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A}
{0174A61A-7E2B-47FC-9CB7-E9EABB898820} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A}
- {A9D883BE-71BF-4D71-9E46-F40930A6AA27} = {6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22}
+ {1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872} = {6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22}
{E6F1606F-5731-44BA-B9F9-8FE32E2A4D84} = {6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Resources.Reader/System.Resources.Reader.sln b/src/libraries/System.Resources.Reader/System.Resources.Reader.sln
index aec0b2f2919..b7384a8cee6 100644
--- a/src/libraries/System.Resources.Reader/System.Resources.Reader.sln
+++ b/src/libraries/System.Resources.Reader/System.Resources.Reader.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Reader", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Reader.Tests", "tests\System.Resources.Reader.Tests.csproj", "{AF1E79F5-F489-4370-85DA-A7FBB173B2E4}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3BA8AE7D-DB9E-4D3D-B786-69E5F9696EA4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{44C13469-BBCB-424A-95C2-9D1C766AC128}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{742BFCA6-93BA-4AD2-A507-A28E3F34B69A}"
EndProject
@@ -41,10 +41,10 @@ Global
{AF1E79F5-F489-4370-85DA-A7FBB173B2E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF1E79F5-F489-4370-85DA-A7FBB173B2E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF1E79F5-F489-4370-85DA-A7FBB173B2E4}.Release|Any CPU.Build.0 = Release|Any CPU
- {3BA8AE7D-DB9E-4D3D-B786-69E5F9696EA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3BA8AE7D-DB9E-4D3D-B786-69E5F9696EA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3BA8AE7D-DB9E-4D3D-B786-69E5F9696EA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3BA8AE7D-DB9E-4D3D-B786-69E5F9696EA4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {44C13469-BBCB-424A-95C2-9D1C766AC128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {44C13469-BBCB-424A-95C2-9D1C766AC128}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {44C13469-BBCB-424A-95C2-9D1C766AC128}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {44C13469-BBCB-424A-95C2-9D1C766AC128}.Release|Any CPU.Build.0 = Release|Any CPU
{742BFCA6-93BA-4AD2-A507-A28E3F34B69A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{742BFCA6-93BA-4AD2-A507-A28E3F34B69A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{742BFCA6-93BA-4AD2-A507-A28E3F34B69A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{AF1E79F5-F489-4370-85DA-A7FBB173B2E4} = {C65C0220-BF19-4418-B26E-8FCD8895A0C2}
{07F0592A-7158-43AA-9196-135EBF555394} = {206A2884-33E0-41B5-A251-31731B96668D}
{037437D0-39B7-4086-8549-B3DFE0F37576} = {B9A76A9D-FF84-42A3-854E-B35445DC9611}
- {3BA8AE7D-DB9E-4D3D-B786-69E5F9696EA4} = {D62D11DF-4AA8-4647-A6A0-0F223B78D929}
+ {44C13469-BBCB-424A-95C2-9D1C766AC128} = {D62D11DF-4AA8-4647-A6A0-0F223B78D929}
{742BFCA6-93BA-4AD2-A507-A28E3F34B69A} = {D62D11DF-4AA8-4647-A6A0-0F223B78D929}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln b/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
index e7e35df4be6..051153bfd35 100644
--- a/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
+++ b/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
@@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.ResourceMa
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.ResourceManager.Tests", "tests\System.Resources.ResourceManager.Tests.csproj", "{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{496100D2-3229-4903-9753-E14FFACB5B2B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{889B5A3E-556F-42AE-B2D9-9C2E72CF0886}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{0DDB3EFF-A01D-463D-AEC1-4C472147A471}"
EndProject
@@ -264,24 +264,24 @@ Global
{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Checked|x64.Build.0 = Debug|Any CPU
{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Checked|x86.ActiveCfg = Debug|Any CPU
{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Checked|x86.Build.0 = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Debug|x64.ActiveCfg = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Debug|x64.Build.0 = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Debug|x86.Build.0 = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Release|Any CPU.Build.0 = Release|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Release|x64.ActiveCfg = Release|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Release|x64.Build.0 = Release|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Release|x86.ActiveCfg = Release|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Release|x86.Build.0 = Release|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Checked|x64.ActiveCfg = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Checked|x64.Build.0 = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Checked|x86.ActiveCfg = Debug|Any CPU
- {496100D2-3229-4903-9753-E14FFACB5B2B}.Checked|x86.Build.0 = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Debug|x64.Build.0 = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Debug|x86.Build.0 = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Release|Any CPU.Build.0 = Release|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Release|x64.ActiveCfg = Release|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Release|x64.Build.0 = Release|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Release|x86.ActiveCfg = Release|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Release|x86.Build.0 = Release|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Checked|x64.Build.0 = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886}.Checked|x86.Build.0 = Debug|Any CPU
{0DDB3EFF-A01D-463D-AEC1-4C472147A471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0DDB3EFF-A01D-463D-AEC1-4C472147A471}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0DDB3EFF-A01D-463D-AEC1-4C472147A471}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -317,7 +317,7 @@ Global
{F98F08E3-520B-49CA-B038-FF20857CEAA7} = {5F76ABD3-6169-46FF-A7B7-CB6CF5FBBFCD}
{16C50BBF-58E6-46B0-99EC-89927A65557B} = {5F76ABD3-6169-46FF-A7B7-CB6CF5FBBFCD}
{497FC2E7-EFA3-4F6F-A883-527900B60D4F} = {FF625A7E-4428-4823-B6F0-601BDC907564}
- {496100D2-3229-4903-9753-E14FFACB5B2B} = {FF625A7E-4428-4823-B6F0-601BDC907564}
+ {889B5A3E-556F-42AE-B2D9-9C2E72CF0886} = {FF625A7E-4428-4823-B6F0-601BDC907564}
{0DDB3EFF-A01D-463D-AEC1-4C472147A471} = {FF625A7E-4428-4823-B6F0-601BDC907564}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Resources.Writer/System.Resources.Writer.sln b/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
index f080b2c17f2..d9810e73fb3 100644
--- a/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
+++ b/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Writer", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Writer.Tests", "tests\System.Resources.Writer.Tests.csproj", "{2E27487F-36D6-42E9-BA91-F511686122E7}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2D19976E-00EB-4BE6-9078-3BB9EEAC0586}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{5596D7DF-5577-4349-A688-0B014626A7E4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{4EA24626-EACB-49F0-92EC-89502E566053}"
EndProject
@@ -41,10 +41,10 @@ Global
{2E27487F-36D6-42E9-BA91-F511686122E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E27487F-36D6-42E9-BA91-F511686122E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E27487F-36D6-42E9-BA91-F511686122E7}.Release|Any CPU.Build.0 = Release|Any CPU
- {2D19976E-00EB-4BE6-9078-3BB9EEAC0586}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2D19976E-00EB-4BE6-9078-3BB9EEAC0586}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2D19976E-00EB-4BE6-9078-3BB9EEAC0586}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2D19976E-00EB-4BE6-9078-3BB9EEAC0586}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5596D7DF-5577-4349-A688-0B014626A7E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5596D7DF-5577-4349-A688-0B014626A7E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5596D7DF-5577-4349-A688-0B014626A7E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5596D7DF-5577-4349-A688-0B014626A7E4}.Release|Any CPU.Build.0 = Release|Any CPU
{4EA24626-EACB-49F0-92EC-89502E566053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EA24626-EACB-49F0-92EC-89502E566053}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EA24626-EACB-49F0-92EC-89502E566053}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{2E27487F-36D6-42E9-BA91-F511686122E7} = {112C54A1-881D-4EE7-A279-DC719E667CFF}
{DF70E82A-3986-4E74-BF85-7CB4B0A6DED9} = {36F1D0ED-0960-4B7E-832F-F2A304803FC3}
{1C001837-6F9D-4C5A-94B4-4388225C34B5} = {E6EE9961-9C9A-4935-8AE2-18316677F47F}
- {2D19976E-00EB-4BE6-9078-3BB9EEAC0586} = {AB6CB51B-36BD-4444-BB33-86DADD78045C}
+ {5596D7DF-5577-4349-A688-0B014626A7E4} = {AB6CB51B-36BD-4444-BB33-86DADD78045C}
{4EA24626-EACB-49F0-92EC-89502E566053} = {AB6CB51B-36BD-4444-BB33-86DADD78045C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
index 304b94beed9..afc06fdf0eb 100644
--- a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
+++ b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Caching", "s
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Caching.Tests", "tests\System.Runtime.Caching.Tests.csproj", "{AA05074D-88AF-482E-A44A-F1AC13494E9F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{ADDFECC7-59EA-4339-9B98-5CB8B91105BF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B76EE305-CA7C-494C-8374-ABD93081F6AE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{447797DB-DF70-4568-A323-F88A45A91026}"
EndProject
@@ -89,10 +89,10 @@ Global
{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Release|Any CPU.Build.0 = Release|Any CPU
- {ADDFECC7-59EA-4339-9B98-5CB8B91105BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {ADDFECC7-59EA-4339-9B98-5CB8B91105BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {ADDFECC7-59EA-4339-9B98-5CB8B91105BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {ADDFECC7-59EA-4339-9B98-5CB8B91105BF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B76EE305-CA7C-494C-8374-ABD93081F6AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B76EE305-CA7C-494C-8374-ABD93081F6AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B76EE305-CA7C-494C-8374-ABD93081F6AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B76EE305-CA7C-494C-8374-ABD93081F6AE}.Release|Any CPU.Build.0 = Release|Any CPU
{447797DB-DF70-4568-A323-F88A45A91026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{447797DB-DF70-4568-A323-F88A45A91026}.Debug|Any CPU.Build.0 = Debug|Any CPU
{447797DB-DF70-4568-A323-F88A45A91026}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -142,7 +142,7 @@ Global
{AFBFBBE6-F5EC-4889-9F34-03E07562630D} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
{EC5D61F1-E77B-4E3D-968C-710FCFB9E028} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}
- {ADDFECC7-59EA-4339-9B98-5CB8B91105BF} = {5E28270B-1EEB-4D0E-9A3C-6959BEA9647E}
+ {B76EE305-CA7C-494C-8374-ABD93081F6AE} = {5E28270B-1EEB-4D0E-9A3C-6959BEA9647E}
{447797DB-DF70-4568-A323-F88A45A91026} = {5E28270B-1EEB-4D0E-9A3C-6959BEA9647E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln b/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
index b9f3d3052a2..f88840a3d84 100644
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe.Tests", "tests\System.Runtime.CompilerServices.Unsafe.Tests.csproj", "{03B3163A-B7D7-4BEC-90BC-12E04072969E}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{1727FEA0-51D7-48BF-AD76-3D6F67A1424F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{7D9E653A-38DF-4862-9C01-6CEA92098F8C}"
EndProject
@@ -144,24 +144,24 @@ Global
{03B3163A-B7D7-4BEC-90BC-12E04072969E}.Checked|x64.Build.0 = Debug|Any CPU
{03B3163A-B7D7-4BEC-90BC-12E04072969E}.Checked|x86.ActiveCfg = Debug|Any CPU
{03B3163A-B7D7-4BEC-90BC-12E04072969E}.Checked|x86.Build.0 = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Debug|x64.Build.0 = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Debug|x86.Build.0 = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Release|Any CPU.Build.0 = Release|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Release|x64.ActiveCfg = Release|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Release|x64.Build.0 = Release|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Release|x86.ActiveCfg = Release|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Release|x86.Build.0 = Release|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Checked|x64.ActiveCfg = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Checked|x64.Build.0 = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Checked|x86.ActiveCfg = Debug|Any CPU
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}.Checked|x86.Build.0 = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Debug|x64.Build.0 = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Debug|x86.Build.0 = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Release|x64.ActiveCfg = Release|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Release|x64.Build.0 = Release|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Release|x86.ActiveCfg = Release|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Release|x86.Build.0 = Release|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Checked|x64.Build.0 = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F}.Checked|x86.Build.0 = Debug|Any CPU
{7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{D1D35FBB-464B-4403-A933-9A96861999D1} = {F0795B33-3338-447C-A071-913F404DA6F2}
{03B3163A-B7D7-4BEC-90BC-12E04072969E} = {F0795B33-3338-447C-A071-913F404DA6F2}
{6B5FD502-FE51-4E0E-B153-568515646BBF} = {2C2CC48C-282A-4841-9893-485DDF29E13B}
- {3FF7E57E-FE55-4ECF-B535-B896FD53FD5E} = {2C2CC48C-282A-4841-9893-485DDF29E13B}
+ {1727FEA0-51D7-48BF-AD76-3D6F67A1424F} = {2C2CC48C-282A-4841-9893-485DDF29E13B}
{7D9E653A-38DF-4862-9C01-6CEA92098F8C} = {2C2CC48C-282A-4841-9893-485DDF29E13B}
{C75CDE9E-42CE-41E6-81BC-BD44FBC113E8} = {723971AB-AD5C-4E5D-B6F1-215004ED533F}
EndGlobalSection
diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln b/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
index c6b036faccd..7918f5e194e 100644
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.VisualC.Tests", "tests\System.Runtime.CompilerServices.VisualC.Tests.csproj", "{11D31B6C-3ECF-472B-8AD5-3D799BA3F052}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A0EC25E3-2BB1-416A-B31F-50FCEA32730C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{8DBC1B4C-6689-429E-9315-1D935BC8A26E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{61212F97-E2E3-4602-BDBC-B0BB4C3C7AFD}"
EndProject
@@ -41,10 +41,10 @@ Global
{11D31B6C-3ECF-472B-8AD5-3D799BA3F052}.Debug|Any CPU.Build.0 = Debug|Any CPU
{11D31B6C-3ECF-472B-8AD5-3D799BA3F052}.Release|Any CPU.ActiveCfg = Release|Any CPU
{11D31B6C-3ECF-472B-8AD5-3D799BA3F052}.Release|Any CPU.Build.0 = Release|Any CPU
- {A0EC25E3-2BB1-416A-B31F-50FCEA32730C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A0EC25E3-2BB1-416A-B31F-50FCEA32730C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A0EC25E3-2BB1-416A-B31F-50FCEA32730C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A0EC25E3-2BB1-416A-B31F-50FCEA32730C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8DBC1B4C-6689-429E-9315-1D935BC8A26E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8DBC1B4C-6689-429E-9315-1D935BC8A26E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8DBC1B4C-6689-429E-9315-1D935BC8A26E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8DBC1B4C-6689-429E-9315-1D935BC8A26E}.Release|Any CPU.Build.0 = Release|Any CPU
{61212F97-E2E3-4602-BDBC-B0BB4C3C7AFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61212F97-E2E3-4602-BDBC-B0BB4C3C7AFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61212F97-E2E3-4602-BDBC-B0BB4C3C7AFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{11D31B6C-3ECF-472B-8AD5-3D799BA3F052} = {ED06DBA3-D182-438E-A1EC-059194F3959D}
{6157FC12-0BEC-4A23-80F0-FBC8A8C71E22} = {65453C51-F488-4026-9596-05F765899247}
{941D72C5-CA37-4745-B89D-2257517C5761} = {27ADCE48-E139-48C1-A838-A0B8FBDECF95}
- {A0EC25E3-2BB1-416A-B31F-50FCEA32730C} = {07A6E36B-25A7-47FD-A399-7A722EABF7DF}
+ {8DBC1B4C-6689-429E-9315-1D935BC8A26E} = {07A6E36B-25A7-47FD-A399-7A722EABF7DF}
{61212F97-E2E3-4602-BDBC-B0BB4C3C7AFD} = {07A6E36B-25A7-47FD-A399-7A722EABF7DF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln b/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln
index 6ce0c0e5a4c..390e6abe6df 100644
--- a/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln
+++ b/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Experimental
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Experimental.Tests", "tests\System.Runtime.Experimental.Tests.csproj", "{4EE36055-AD7C-4779-B3F6-08687960DCC3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2D21BCB3-C0B4-4549-8E06-95848955ECB5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{575EC1A9-2420-47A9-ABBD-593CDA62D435}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{816C1785-F12B-44C6-9AB7-427E764E2B0A}"
EndProject
@@ -39,10 +39,10 @@ Global
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|Any CPU.Build.0 = Release|Any CPU
- {2D21BCB3-C0B4-4549-8E06-95848955ECB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2D21BCB3-C0B4-4549-8E06-95848955ECB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2D21BCB3-C0B4-4549-8E06-95848955ECB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2D21BCB3-C0B4-4549-8E06-95848955ECB5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {575EC1A9-2420-47A9-ABBD-593CDA62D435}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {575EC1A9-2420-47A9-ABBD-593CDA62D435}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {575EC1A9-2420-47A9-ABBD-593CDA62D435}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {575EC1A9-2420-47A9-ABBD-593CDA62D435}.Release|Any CPU.Build.0 = Release|Any CPU
{816C1785-F12B-44C6-9AB7-427E764E2B0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{816C1785-F12B-44C6-9AB7-427E764E2B0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{816C1785-F12B-44C6-9AB7-427E764E2B0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
{D75C4FA5-B1F6-4D01-BFA3-AB505232EAAB} = {76C68769-6068-48CE-9E73-4E43880DECFE}
{4EE36055-AD7C-4779-B3F6-08687960DCC3} = {76C68769-6068-48CE-9E73-4E43880DECFE}
{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C} = {D00764F9-F736-4072-A7DD-B4BF05CF4786}
- {2D21BCB3-C0B4-4549-8E06-95848955ECB5} = {A7C4D11F-9D4F-4C8C-9EBE-81CA2E0EC71E}
+ {575EC1A9-2420-47A9-ABBD-593CDA62D435} = {A7C4D11F-9D4F-4C8C-9EBE-81CA2E0EC71E}
{816C1785-F12B-44C6-9AB7-427E764E2B0A} = {A7C4D11F-9D4F-4C8C-9EBE-81CA2E0EC71E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln b/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln
index 678138f2974..232725de00d 100644
--- a/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln
+++ b/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln
@@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAppOutsideOfTPA", "test
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoidMainWithExitCodeApp", "tests\VoidMainWithExitCodeApp\VoidMainWithExitCodeApp.csproj", "{F55614A7-859C-4171-844B-46F37EDDD351}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{43D09D13-38C0-4504-AB84-D5F6B76170DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{599540D0-68C5-4644-85E6-6A266247639E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A2438CFE-792C-4217-B060-E85A38B37B07}"
EndProject
@@ -266,24 +266,24 @@ Global
{F55614A7-859C-4171-844B-46F37EDDD351}.Checked|x64.Build.0 = Debug|Any CPU
{F55614A7-859C-4171-844B-46F37EDDD351}.Checked|x86.ActiveCfg = Debug|Any CPU
{F55614A7-859C-4171-844B-46F37EDDD351}.Checked|x86.Build.0 = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Debug|x64.ActiveCfg = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Debug|x64.Build.0 = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Debug|x86.Build.0 = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Release|Any CPU.Build.0 = Release|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Release|x64.ActiveCfg = Release|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Release|x64.Build.0 = Release|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Release|x86.ActiveCfg = Release|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Release|x86.Build.0 = Release|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Checked|x64.ActiveCfg = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Checked|x64.Build.0 = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Checked|x86.ActiveCfg = Debug|Any CPU
- {43D09D13-38C0-4504-AB84-D5F6B76170DF}.Checked|x86.Build.0 = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Debug|x64.Build.0 = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Debug|x86.Build.0 = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Release|x64.ActiveCfg = Release|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Release|x64.Build.0 = Release|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Release|x86.ActiveCfg = Release|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Release|x86.Build.0 = Release|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Checked|x64.Build.0 = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {599540D0-68C5-4644-85E6-6A266247639E}.Checked|x86.Build.0 = Debug|Any CPU
{A2438CFE-792C-4217-B060-E85A38B37B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2438CFE-792C-4217-B060-E85A38B37B07}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2438CFE-792C-4217-B060-E85A38B37B07}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -337,7 +337,7 @@ Global
{397D1AB1-0A29-462A-9F05-14015B8B5796} = {F4E65A6B-CBA4-40E2-A0B5-6C50C8AAB25C}
{F55614A7-859C-4171-844B-46F37EDDD351} = {F4E65A6B-CBA4-40E2-A0B5-6C50C8AAB25C}
{C7112A41-1DC9-421E-88A0-8830D081A7B1} = {4B73FA84-77B3-4A74-94ED-4232D0A80196}
- {43D09D13-38C0-4504-AB84-D5F6B76170DF} = {4B73FA84-77B3-4A74-94ED-4232D0A80196}
+ {599540D0-68C5-4644-85E6-6A266247639E} = {4B73FA84-77B3-4A74-94ED-4232D0A80196}
{A2438CFE-792C-4217-B060-E85A38B37B07} = {4B73FA84-77B3-4A74-94ED-4232D0A80196}
{959EAFBC-9394-4E25-9A84-0B85152A7FCD} = {E603EA66-B62A-4B5E-93D1-30F8CC0AC497}
EndGlobalSection
diff --git a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
index 9574f7d433c..1e78f153394 100644
--- a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
@@ -3,7 +3,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TestRuntime>true</TestRuntime>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
diff --git a/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln b/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln
index a41e635badc..f33ffeebed5 100644
--- a/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln
+++ b/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Handles", "s
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Handles.Tests", "tests\System.Runtime.Handles.Tests.csproj", "{2C0117E7-BC37-4C3F-A291-9C45AEA68F02}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4A5E88CA-6A6D-4261-AFA6-112C0ED452E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{9B684E24-CCA4-4513-A5A4-0BFE2250EB46}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1D0EC779-8B5E-42F2-87D1-0A34C4C8B63D}"
EndProject
@@ -41,10 +41,10 @@ Global
{2C0117E7-BC37-4C3F-A291-9C45AEA68F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C0117E7-BC37-4C3F-A291-9C45AEA68F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C0117E7-BC37-4C3F-A291-9C45AEA68F02}.Release|Any CPU.Build.0 = Release|Any CPU
- {4A5E88CA-6A6D-4261-AFA6-112C0ED452E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4A5E88CA-6A6D-4261-AFA6-112C0ED452E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4A5E88CA-6A6D-4261-AFA6-112C0ED452E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4A5E88CA-6A6D-4261-AFA6-112C0ED452E3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9B684E24-CCA4-4513-A5A4-0BFE2250EB46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9B684E24-CCA4-4513-A5A4-0BFE2250EB46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9B684E24-CCA4-4513-A5A4-0BFE2250EB46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9B684E24-CCA4-4513-A5A4-0BFE2250EB46}.Release|Any CPU.Build.0 = Release|Any CPU
{1D0EC779-8B5E-42F2-87D1-0A34C4C8B63D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D0EC779-8B5E-42F2-87D1-0A34C4C8B63D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D0EC779-8B5E-42F2-87D1-0A34C4C8B63D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{2C0117E7-BC37-4C3F-A291-9C45AEA68F02} = {D3247F93-F1D3-4F4E-BBB0-C75AC9E60C98}
{26C50637-E915-450B-93DB-B11A2678CFAF} = {AEF7F826-AF56-49E3-B89C-5DC5D17814DE}
{8FB6B1B7-FA5C-4E13-BA3E-2FD95018237F} = {6049E50D-EE67-476B-9BE2-654AB188D628}
- {4A5E88CA-6A6D-4261-AFA6-112C0ED452E3} = {CBDAE503-B99C-44D3-A6E6-529651F65B1E}
+ {9B684E24-CCA4-4513-A5A4-0BFE2250EB46} = {CBDAE503-B99C-44D3-A6E6-529651F65B1E}
{1D0EC779-8B5E-42F2-87D1-0A34C4C8B63D} = {CBDAE503-B99C-44D3-A6E6-529651F65B1E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
index 440d1a29ee6..7a55f8c76bf 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.RuntimeInformation.Tests", "tests\System.Runtime.InteropServices.RuntimeInformation.Tests.csproj", "{4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E9AE8E44-B09F-4331-8DF7-405D9B0588AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{EAA82510-1B47-4F8A-A3FA-820F7993FBA4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{4C4A68FE-D71A-4EDE-957C-4D90B61FDCD1}"
EndProject
@@ -41,10 +41,10 @@ Global
{4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8}.Release|Any CPU.Build.0 = Release|Any CPU
- {E9AE8E44-B09F-4331-8DF7-405D9B0588AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E9AE8E44-B09F-4331-8DF7-405D9B0588AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E9AE8E44-B09F-4331-8DF7-405D9B0588AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E9AE8E44-B09F-4331-8DF7-405D9B0588AE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EAA82510-1B47-4F8A-A3FA-820F7993FBA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EAA82510-1B47-4F8A-A3FA-820F7993FBA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EAA82510-1B47-4F8A-A3FA-820F7993FBA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EAA82510-1B47-4F8A-A3FA-820F7993FBA4}.Release|Any CPU.Build.0 = Release|Any CPU
{4C4A68FE-D71A-4EDE-957C-4D90B61FDCD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4C4A68FE-D71A-4EDE-957C-4D90B61FDCD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4C4A68FE-D71A-4EDE-957C-4D90B61FDCD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,7 +58,7 @@ Global
{4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8} = {ADA9FAB8-9FD5-4035-86D4-4BE1BB564791}
{B2937043-2666-41F2-A72B-FA9CDBBC012A} = {D380D111-FFFE-4520-A0AE-3EA3E59F7820}
{375DB818-0E7E-4361-9C56-07658B666B8B} = {504FF0B7-B77B-4D63-9A18-C5614C9F4F0C}
- {E9AE8E44-B09F-4331-8DF7-405D9B0588AE} = {CA3C3D43-A781-40A4-BE23-3A273908FC86}
+ {EAA82510-1B47-4F8A-A3FA-820F7993FBA4} = {CA3C3D43-A781-40A4-BE23-3A273908FC86}
{4C4A68FE-D71A-4EDE-957C-4D90B61FDCD1} = {CA3C3D43-A781-40A4-BE23-3A273908FC86}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
index bfecc5e89c0..4bf06c51a5b 100644
--- a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
+++ b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{1B248B4C-7584-4C04-850A-A50EB592052C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "gen\DllImportGenerator\DllImportGenerator.csproj", "{07F19F91-D438-428D-99F0-61DAD87E78BA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{768B77B0-EA45-469D-B39E-545EB72F5A43}"
EndProject
@@ -15,9 +15,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ancillary.Interop", "tests\Ancillary.Interop\Ancillary.Interop.csproj", "{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator.Tests", "tests\DllImportGenerator.Tests\DllImportGenerator.Tests.csproj", "{57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator.Tests", "tests\LibraryImportGenerator.Tests\LibraryImportGenerator.Tests.csproj", "{9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator.Unit.Tests", "tests\DllImportGenerator.UnitTests\DllImportGenerator.Unit.Tests.csproj", "{4B516949-4AD4-44D6-AF86-C2E6058608D5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator.Unit.Tests", "tests\LibraryImportGenerator.UnitTests\LibraryImportGenerator.Unit.Tests.csproj", "{EA8DBC12-60BC-433E-ABFF-A89DFA795283}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.ComDisabled.Tests", "tests\System.Runtime.InteropServices.ComDisabled.UnitTests\System.Runtime.InteropServices.ComDisabled.Tests.csproj", "{25D66424-2EAF-464D-8460-10C04EDEF3C3}"
EndProject
@@ -102,24 +102,24 @@ Global
{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|x64.Build.0 = Debug|Any CPU
{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|x86.ActiveCfg = Debug|Any CPU
{1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|x86.Build.0 = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Debug|x64.ActiveCfg = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Debug|x64.Build.0 = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Debug|x86.ActiveCfg = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Debug|x86.Build.0 = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Release|Any CPU.Build.0 = Release|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Release|x64.ActiveCfg = Release|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Release|x64.Build.0 = Release|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Release|x86.ActiveCfg = Release|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Release|x86.Build.0 = Release|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Checked|x64.ActiveCfg = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Checked|x64.Build.0 = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Checked|x86.ActiveCfg = Debug|Any CPU
- {07F19F91-D438-428D-99F0-61DAD87E78BA}.Checked|x86.Build.0 = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Debug|x64.Build.0 = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Debug|x86.Build.0 = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Release|Any CPU.Build.0 = Release|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Release|x64.ActiveCfg = Release|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Release|x64.Build.0 = Release|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Release|x86.ActiveCfg = Release|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Release|x86.Build.0 = Release|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|x64.Build.0 = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40}.Checked|x86.Build.0 = Debug|Any CPU
{768B77B0-EA45-469D-B39E-545EB72F5A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{768B77B0-EA45-469D-B39E-545EB72F5A43}.Debug|Any CPU.Build.0 = Debug|Any CPU
{768B77B0-EA45-469D-B39E-545EB72F5A43}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -192,42 +192,42 @@ Global
{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|x64.Build.0 = Debug|Any CPU
{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|x86.ActiveCfg = Debug|Any CPU
{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|x86.Build.0 = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Debug|x64.ActiveCfg = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Debug|x64.Build.0 = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Debug|x86.ActiveCfg = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Debug|x86.Build.0 = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Release|Any CPU.Build.0 = Release|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Release|x64.ActiveCfg = Release|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Release|x64.Build.0 = Release|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Release|x86.ActiveCfg = Release|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Release|x86.Build.0 = Release|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Checked|x64.ActiveCfg = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Checked|x64.Build.0 = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Checked|x86.ActiveCfg = Debug|Any CPU
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3}.Checked|x86.Build.0 = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Debug|x64.ActiveCfg = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Debug|x64.Build.0 = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Debug|x86.ActiveCfg = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Debug|x86.Build.0 = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Release|Any CPU.Build.0 = Release|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Release|x64.ActiveCfg = Release|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Release|x64.Build.0 = Release|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Release|x86.ActiveCfg = Release|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Release|x86.Build.0 = Release|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Checked|x64.ActiveCfg = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Checked|x64.Build.0 = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Checked|x86.ActiveCfg = Debug|Any CPU
- {4B516949-4AD4-44D6-AF86-C2E6058608D5}.Checked|x86.Build.0 = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Debug|x64.Build.0 = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Debug|x86.Build.0 = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Release|x64.ActiveCfg = Release|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Release|x64.Build.0 = Release|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Release|x86.ActiveCfg = Release|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Release|x86.Build.0 = Release|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|x64.Build.0 = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1}.Checked|x86.Build.0 = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Debug|x64.Build.0 = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Debug|x86.Build.0 = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Release|x64.ActiveCfg = Release|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Release|x64.Build.0 = Release|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Release|x86.ActiveCfg = Release|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Release|x86.Build.0 = Release|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|x64.Build.0 = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283}.Checked|x86.Build.0 = Debug|Any CPU
{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25D66424-2EAF-464D-8460-10C04EDEF3C3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -309,14 +309,14 @@ Global
{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B}
{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
- {57A1A6FD-9231-4DFB-8619-F0EDEDA208E3} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
- {4B516949-4AD4-44D6-AF86-C2E6058608D5} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
+ {9C2C2B5C-5E75-4935-8A4A-DE3D3A5DBBC1} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
+ {EA8DBC12-60BC-433E-ABFF-A89DFA795283} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
{25D66424-2EAF-464D-8460-10C04EDEF3C3} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
{866D295E-424A-4747-9417-CD7746936138} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF}
{1B248B4C-7584-4C04-850A-A50EB592052C} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
- {07F19F91-D438-428D-99F0-61DAD87E78BA} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
+ {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
{768B77B0-EA45-469D-B39E-545EB72F5A43} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}
{8671F164-F78C-44FA-93B7-A310F67890FE} = {D893B9AA-57C5-49E3-97B1-12CC62D84307}
EndGlobalSection
diff --git a/src/libraries/System.Runtime.InteropServices/gen/Directory.Build.props b/src/libraries/System.Runtime.InteropServices/gen/Directory.Build.props
index a8a395620df..b48a519271a 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/Directory.Build.props
+++ b/src/libraries/System.Runtime.InteropServices/gen/Directory.Build.props
@@ -2,8 +2,8 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<IsShipping>false</IsShipping>
- <!-- We manually enable DllImportGenerator for projects in this folder as part of testing. -->
- <EnableDllImportGenerator>false</EnableDllImportGenerator>
+ <!-- We manually enable LibraryImportGenerator for projects in this folder as part of testing. -->
+ <EnableLibraryImportGenerator>false</EnableLibraryImportGenerator>
<EnableDefaultItems>true</EnableDefaultItems>
<CLSCompliant>false</CLSCompliant>
<ILLinkTrimAssembly>false</ILLinkTrimAssembly>
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/AnalyzerDiagnostics.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/AnalyzerDiagnostics.cs
index 6f12d762a1b..6f12d762a1b 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/AnalyzerDiagnostics.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/AnalyzerDiagnostics.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/ConvertToGeneratedDllImportAnalyzer.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/ConvertToGeneratedDllImportAnalyzer.cs
index 6ed2cc71e2e..6ed2cc71e2e 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/ConvertToGeneratedDllImportAnalyzer.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/ConvertToGeneratedDllImportAnalyzer.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/ConvertToGeneratedDllImportFixer.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/ConvertToGeneratedDllImportFixer.cs
index 092cbcddeab..092cbcddeab 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/ConvertToGeneratedDllImportFixer.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/ConvertToGeneratedDllImportFixer.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/ManualTypeMarshallingAnalyzer.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/ManualTypeMarshallingAnalyzer.cs
index 00abe866653..00abe866653 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Analyzers/ManualTypeMarshallingAnalyzer.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Analyzers/ManualTypeMarshallingAnalyzer.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Comparers.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Comparers.cs
index 39166e8c767..39166e8c767 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Comparers.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Comparers.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Diagnostics/Events.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Diagnostics/Events.cs
index 785d253bdcd..785d253bdcd 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Diagnostics/Events.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Diagnostics/Events.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportGenerator.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/DllImportGenerator.cs
index 6d46ce5f013..6d46ce5f013 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportGenerator.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/DllImportGenerator.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportGeneratorOptions.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/DllImportGeneratorOptions.cs
index bcee9c816bb..347ab4147fe 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportGeneratorOptions.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/DllImportGeneratorOptions.cs
@@ -15,8 +15,8 @@ namespace Microsoft.Interop
public static class OptionsHelper
{
- public const string UseMarshalTypeOption = "build_property.DllImportGenerator_UseMarshalType";
- public const string GenerateForwardersOption = "build_property.DllImportGenerator_GenerateForwarders";
+ public const string UseMarshalTypeOption = "build_property.LibraryImportGenerator_UseMarshalType";
+ public const string GenerateForwardersOption = "build_property.LibraryImportGenerator_GenerateForwarders";
private static bool GetBoolOption(this AnalyzerConfigOptions options, string key)
{
return options.TryGetValue(key, out string? value)
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportStubContext.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/DllImportStubContext.cs
index 0bfc2c0fffe..0bfc2c0fffe 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportStubContext.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/DllImportStubContext.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/ForwarderMarshallingGeneratorFactory.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/ForwarderMarshallingGeneratorFactory.cs
index 53fb3235c2d..53fb3235c2d 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/ForwarderMarshallingGeneratorFactory.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/ForwarderMarshallingGeneratorFactory.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/GeneratedDllImportData.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/GeneratedDllImportData.cs
index 7bb5a4d39bf..7bb5a4d39bf 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/GeneratedDllImportData.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/GeneratedDllImportData.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/GeneratorDiagnostics.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/GeneratorDiagnostics.cs
index 56589707b9f..56589707b9f 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/GeneratorDiagnostics.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/GeneratorDiagnostics.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/LanguageSupport.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LanguageSupport.cs
index 0f983ddc286..0f983ddc286 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/LanguageSupport.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LanguageSupport.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportGenerator.csproj b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
index e39e00bfb87..f2f1c273e5d 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/DllImportGenerator.csproj
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
@@ -14,13 +14,13 @@
<NoWarn>RS2008;$(NoWarn)</NoWarn>
<!-- Packaging properties -->
- <!-- In the future DllImportGenerator might ship as part of a package, but meanwhile disable packaging. -->
+ <!-- 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/DllImportGenerator</PackageProjectUrl>
- <Description>DllImportGenerator</Description>
- <PackageTags>DllImportGenerator, analyzers</PackageTags>
+ <PackageProjectUrl>https://github.com/dotnet/runtime/tree/main/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator</PackageProjectUrl>
+ <Description>LibraryImportGenerator</Description>
+ <PackageTags>LibraryImportGenerator, analyzers</PackageTags>
<!-- TODO: Enable when this package shipped. -->
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
</PropertyGroup>
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Microsoft.Interop.DllImportGenerator.props b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Microsoft.Interop.LibraryImportGenerator.props
index bf6b2d4a0d0..14caceaf8e4 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Microsoft.Interop.DllImportGenerator.props
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Microsoft.Interop.LibraryImportGenerator.props
@@ -1,6 +1,6 @@
<Project>
<!--
- Define all of the configuration options supported for the DllImportGenerator.
+ 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.
-->
@@ -9,11 +9,11 @@
Use the System.Runtime.InteropServices.Marshal type instead of
the System.Runtime.InteropServices.MarshalEx type when emitting code.
-->
- <CompilerVisibleProperty Include="DllImportGenerator_UseMarshalType" />
+ <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="DllImportGenerator_GenerateForwarders" />
+ <CompilerVisibleProperty Include="LibraryImportGenerator_GenerateForwarders" />
</ItemGroup>
</Project>
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/PInvokeStubCodeGenerator.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/PInvokeStubCodeGenerator.cs
index 5da6deb9cc8..5da6deb9cc8 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/PInvokeStubCodeGenerator.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/PInvokeStubCodeGenerator.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Resources.Designer.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Resources.Designer.cs
index 25b5ba11360..25b5ba11360 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Resources.Designer.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Resources.Designer.cs
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Resources.resx b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Resources.resx
index 7dba15aadf9..7dba15aadf9 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/Resources.resx
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/Resources.resx
diff --git a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/UnreachableException.cs b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/UnreachableException.cs
index ef9da5905e4..ef9da5905e4 100644
--- a/src/libraries/System.Runtime.InteropServices/gen/DllImportGenerator/UnreachableException.cs
+++ b/src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/UnreachableException.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/Ancillary.Interop/Ancillary.Interop.csproj b/src/libraries/System.Runtime.InteropServices/tests/Ancillary.Interop/Ancillary.Interop.csproj
index 8c35cd9ad01..054016b29c9 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/Ancillary.Interop/Ancillary.Interop.csproj
+++ b/src/libraries/System.Runtime.InteropServices/tests/Ancillary.Interop/Ancillary.Interop.csproj
@@ -6,8 +6,8 @@
<RootNamespace>System.Runtime.InteropServices</RootNamespace>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <Description>APIs required for usage of the DllImportGenerator and related tools.</Description>
- <DefineConstants>$(DefineConstants);DLLIMPORT_GENERATOR_TEST</DefineConstants>
+ <Description>APIs required for usage of the LibraryImportGenerator and related tools.</Description>
+ <DefineConstants>$(DefineConstants);LIBRARYIMPORT_GENERATOR_TEST</DefineConstants>
</PropertyGroup>
<ItemGroup>
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/ArrayTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/ArrayTests.cs
index dc72cfc9274..dc72cfc9274 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/ArrayTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/ArrayTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/BlittableStructTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/BlittableStructTests.cs
index 8fcc27093bb..8fcc27093bb 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/BlittableStructTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/BlittableStructTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/BooleanTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/BooleanTests.cs
index 11b8b4281d2..11b8b4281d2 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/BooleanTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/BooleanTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CallingConventionTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CallingConventionTests.cs
index 161b94f8c39..161b94f8c39 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CallingConventionTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CallingConventionTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CharacterTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CharacterTests.cs
index 38e03128d7a..38e03128d7a 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CharacterTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CharacterTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CollectionTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CollectionTests.cs
index e0b068ae5cb..e0b068ae5cb 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CollectionTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CollectionTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/Constants.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/Constants.cs
index 9ea08ea2fe8..9ea08ea2fe8 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/Constants.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/Constants.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CustomMarshallingTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CustomMarshallingTests.cs
index 09d47708652..09d47708652 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/CustomMarshallingTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/CustomMarshallingTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/DelegateTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/DelegateTests.cs
index 01f86616972..01f86616972 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/DelegateTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/DelegateTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/Directory.Build.props b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/Directory.Build.props
index fa9c3a4001d..fa9c3a4001d 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/Directory.Build.props
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/Directory.Build.props
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/EnumTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/EnumTests.cs
index 8002e260998..8002e260998 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/EnumTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/EnumTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/FunctionPointerTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/FunctionPointerTests.cs
index 87332f16e2d..87332f16e2d 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/FunctionPointerTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/FunctionPointerTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/DllImportGenerator.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/LibraryImportGenerator.Tests.csproj
index 7d06c65518f..bb1590cfb0d 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/DllImportGenerator.Tests.csproj
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/LibraryImportGenerator.Tests.csproj
@@ -4,9 +4,9 @@
<IsPackable>false</IsPackable>
<LangVersion>Preview</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<!-- These tests pull the attributes from Ancillary.Interop, so we don't need to include the attribute sources in this assembly. -->
- <IncludeDllImportGeneratorSources>false</IncludeDllImportGeneratorSources>
+ <IncludeLibraryImportGeneratorSources>false</IncludeLibraryImportGeneratorSources>
</PropertyGroup>
<ItemGroup>
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/PointerTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/PointerTests.cs
index 463ea434d36..463ea434d36 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/PointerTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/PointerTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/SafeHandleTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/SafeHandleTests.cs
index 96c21224e9d..96c21224e9d 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/SafeHandleTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/SafeHandleTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/SetLastErrorTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/SetLastErrorTests.cs
index a12cdd2245a..a12cdd2245a 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/SetLastErrorTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/SetLastErrorTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/SpanTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/SpanTests.cs
index ad61c89cf0d..ad61c89cf0d 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/SpanTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/SpanTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/StringTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/StringTests.cs
index 628bf103ec6..628bf103ec6 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.Tests/StringTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.Tests/StringTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/AdditionalAttributesOnStub.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/AdditionalAttributesOnStub.cs
index b6deed687c1..b6deed687c1 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/AdditionalAttributesOnStub.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/AdditionalAttributesOnStub.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/AttributeForwarding.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/AttributeForwarding.cs
index d00a0723124..d00a0723124 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/AttributeForwarding.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/AttributeForwarding.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/CodeSnippets.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CodeSnippets.cs
index 2ab311d7731..2ab311d7731 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/CodeSnippets.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CodeSnippets.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/CompileFails.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CompileFails.cs
index e16a7895ff2..e16a7895ff2 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/CompileFails.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/CompileFails.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Compiles.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs
index af9155cc2cd..af9155cc2cd 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Compiles.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/ConvertToGeneratedDllImportAnalyzerTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/ConvertToGeneratedDllImportAnalyzerTests.cs
index cffb7c46bb2..cffb7c46bb2 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/ConvertToGeneratedDllImportAnalyzerTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/ConvertToGeneratedDllImportAnalyzerTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/ConvertToGeneratedDllImportFixerTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/ConvertToGeneratedDllImportFixerTests.cs
index b2cdf73c5da..b2cdf73c5da 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/ConvertToGeneratedDllImportFixerTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/ConvertToGeneratedDllImportFixerTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Diagnostics.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Diagnostics.cs
index efa909f5486..efa909f5486 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Diagnostics.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Diagnostics.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Directory.Build.props b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Directory.Build.props
index fa9c3a4001d..fa9c3a4001d 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Directory.Build.props
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Directory.Build.props
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/DllImportGeneratorOptionsProvider.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/DllImportGeneratorOptionsProvider.cs
index 8459d2fd442..8459d2fd442 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/DllImportGeneratorOptionsProvider.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/DllImportGeneratorOptionsProvider.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/IncrementalGenerationTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/IncrementalGenerationTests.cs
index aa2fbc252a0..aa2fbc252a0 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/IncrementalGenerationTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/IncrementalGenerationTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/DllImportGenerator.Unit.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj
index e47d1719673..6addf6747ff 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/DllImportGenerator.Unit.Tests.csproj
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj
@@ -25,7 +25,7 @@
<ItemGroup>
<ProjectReference Include="..\Ancillary.Interop\Ancillary.Interop.csproj" />
- <ProjectReference Include="..\..\gen\DllImportGenerator\DllImportGenerator.csproj" />
+ <ProjectReference Include="..\..\gen\LibraryImportGenerator\LibraryImportGenerator.csproj" />
</ItemGroup>
<ItemGroup>
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/ManualTypeMarshallingAnalyzerTests.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/ManualTypeMarshallingAnalyzerTests.cs
index 793629f99a2..793629f99a2 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/ManualTypeMarshallingAnalyzerTests.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/ManualTypeMarshallingAnalyzerTests.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/TestUtils.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/TestUtils.cs
index f69862200bd..f69862200bd 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/TestUtils.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/TestUtils.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Verifiers/CSharpAnalyzerVerifier.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Verifiers/CSharpAnalyzerVerifier.cs
index bd54db652e4..bd54db652e4 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Verifiers/CSharpAnalyzerVerifier.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Verifiers/CSharpAnalyzerVerifier.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Verifiers/CSharpCodeFixVerifier.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Verifiers/CSharpCodeFixVerifier.cs
index 41148069101..41148069101 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Verifiers/CSharpCodeFixVerifier.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Verifiers/CSharpCodeFixVerifier.cs
diff --git a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Verifiers/CSharpVerifierHelper.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Verifiers/CSharpVerifierHelper.cs
index e55e91ea57f..e55e91ea57f 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/DllImportGenerator.UnitTests/Verifiers/CSharpVerifierHelper.cs
+++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Verifiers/CSharpVerifierHelper.cs
diff --git a/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln b/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
index 3359c23e0ce..54a873124fe 100644
--- a/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
+++ b/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{A4058388-97C1-492A-86A4-5240C4166BFF}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4B15412F-913A-48B5-8968-7B9BC494324A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9A0BF7EC-AD07-44C8-9B70-9DACB2C894C7}"
EndProject
@@ -110,24 +110,24 @@ Global
{A4058388-97C1-492A-86A4-5240C4166BFF}.Checked|x64.Build.0 = Debug|Any CPU
{A4058388-97C1-492A-86A4-5240C4166BFF}.Checked|x86.ActiveCfg = Debug|Any CPU
{A4058388-97C1-492A-86A4-5240C4166BFF}.Checked|x86.Build.0 = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Debug|x64.ActiveCfg = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Debug|x64.Build.0 = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Debug|x86.ActiveCfg = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Debug|x86.Build.0 = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Release|Any CPU.Build.0 = Release|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Release|x64.ActiveCfg = Release|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Release|x64.Build.0 = Release|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Release|x86.ActiveCfg = Release|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Release|x86.Build.0 = Release|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Checked|x64.ActiveCfg = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Checked|x64.Build.0 = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Checked|x86.ActiveCfg = Debug|Any CPU
- {4B15412F-913A-48B5-8968-7B9BC494324A}.Checked|x86.Build.0 = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Debug|x64.Build.0 = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Debug|x86.Build.0 = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Release|x64.ActiveCfg = Release|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Release|x64.Build.0 = Release|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Release|x86.ActiveCfg = Release|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Release|x86.Build.0 = Release|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Checked|x64.Build.0 = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF}.Checked|x86.Build.0 = Debug|Any CPU
{9A0BF7EC-AD07-44C8-9B70-9DACB2C894C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A0BF7EC-AD07-44C8-9B70-9DACB2C894C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A0BF7EC-AD07-44C8-9B70-9DACB2C894C7}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -211,7 +211,7 @@ Global
{EFF55B56-D92B-4573-94EA-AF5B3B001C34} = {C5014AA7-5C35-45D5-B7C6-48A5E93A758E}
{80AFB6EB-AB23-48A1-951C-76E6FEA29D19} = {C5014AA7-5C35-45D5-B7C6-48A5E93A758E}
{A4058388-97C1-492A-86A4-5240C4166BFF} = {A499E9EC-3C82-4B0A-AC49-111C706B1835}
- {4B15412F-913A-48B5-8968-7B9BC494324A} = {A499E9EC-3C82-4B0A-AC49-111C706B1835}
+ {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF} = {A499E9EC-3C82-4B0A-AC49-111C706B1835}
{9A0BF7EC-AD07-44C8-9B70-9DACB2C894C7} = {A499E9EC-3C82-4B0A-AC49-111C706B1835}
{28B808CE-B1F8-4B05-9ADA-8884525BD87F} = {E7A9B89D-A9F5-40FD-93CA-CAF4522A80E0}
EndGlobalSection
diff --git a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
index 191ea1374c1..02af22b9bde 100644
--- a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
+++ b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{BFED65C3-5AF6-4C81-8AE8-7CAC7E4867AE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{47FCBB78-4009-4B88-BC18-9DBCD4714152}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1FC1A751-C2A7-4CA8-B939-6F01B8AECBA8}"
EndProject
@@ -136,24 +136,24 @@ Global
{BFED65C3-5AF6-4C81-8AE8-7CAC7E4867AE}.Checked|x64.Build.0 = Debug|Any CPU
{BFED65C3-5AF6-4C81-8AE8-7CAC7E4867AE}.Checked|x86.ActiveCfg = Debug|Any CPU
{BFED65C3-5AF6-4C81-8AE8-7CAC7E4867AE}.Checked|x86.Build.0 = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Debug|x64.ActiveCfg = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Debug|x64.Build.0 = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Debug|x86.Build.0 = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Release|Any CPU.Build.0 = Release|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Release|x64.ActiveCfg = Release|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Release|x64.Build.0 = Release|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Release|x86.ActiveCfg = Release|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Release|x86.Build.0 = Release|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Checked|x64.ActiveCfg = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Checked|x64.Build.0 = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Checked|x86.ActiveCfg = Debug|Any CPU
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}.Checked|x86.Build.0 = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Debug|x64.Build.0 = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Debug|x86.Build.0 = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Release|Any CPU.Build.0 = Release|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Release|x64.ActiveCfg = Release|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Release|x64.Build.0 = Release|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Release|x86.ActiveCfg = Release|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Release|x86.Build.0 = Release|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Checked|x64.Build.0 = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152}.Checked|x86.Build.0 = Debug|Any CPU
{1FC1A751-C2A7-4CA8-B939-6F01B8AECBA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1FC1A751-C2A7-4CA8-B939-6F01B8AECBA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1FC1A751-C2A7-4CA8-B939-6F01B8AECBA8}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -673,7 +673,7 @@ Global
{9AD657ED-396B-4BE7-BCB6-BCA130825418} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
{29E02AA9-E3D5-400C-B2C5-970B6E6D8562} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}
{BFED65C3-5AF6-4C81-8AE8-7CAC7E4867AE} = {153EEF5A-58CF-4A61-B712-B14F270BD32E}
- {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B} = {153EEF5A-58CF-4A61-B712-B14F270BD32E}
+ {47FCBB78-4009-4B88-BC18-9DBCD4714152} = {153EEF5A-58CF-4A61-B712-B14F270BD32E}
{1FC1A751-C2A7-4CA8-B939-6F01B8AECBA8} = {153EEF5A-58CF-4A61-B712-B14F270BD32E}
{95B66B14-BCC7-407A-930C-4B34D4F7EC98} = {C75ECE17-3CF5-409D-B26F-E2F5053DD5B9}
EndGlobalSection
diff --git a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
index 3a4f6d838ec..7479af23369 100644
--- a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
+++ b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A22876CA-76C0-4ABD-8658-C2B3DFDFE537}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7C51DC48-EB7D-4AF5-BC4B-279CCD8BF3BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{55FC83C5-F34D-4B4B-BEAE-497DD5653BCE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{57EC916C-15B4-46BB-AE68-B4CD8BC7076C}"
EndProject
@@ -29,10 +29,10 @@ Global
{A22876CA-76C0-4ABD-8658-C2B3DFDFE537}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A22876CA-76C0-4ABD-8658-C2B3DFDFE537}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A22876CA-76C0-4ABD-8658-C2B3DFDFE537}.Release|Any CPU.Build.0 = Release|Any CPU
- {7C51DC48-EB7D-4AF5-BC4B-279CCD8BF3BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7C51DC48-EB7D-4AF5-BC4B-279CCD8BF3BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7C51DC48-EB7D-4AF5-BC4B-279CCD8BF3BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7C51DC48-EB7D-4AF5-BC4B-279CCD8BF3BE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {55FC83C5-F34D-4B4B-BEAE-497DD5653BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {55FC83C5-F34D-4B4B-BEAE-497DD5653BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {55FC83C5-F34D-4B4B-BEAE-497DD5653BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {55FC83C5-F34D-4B4B-BEAE-497DD5653BCE}.Release|Any CPU.Build.0 = Release|Any CPU
{57EC916C-15B4-46BB-AE68-B4CD8BC7076C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{57EC916C-15B4-46BB-AE68-B4CD8BC7076C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{57EC916C-15B4-46BB-AE68-B4CD8BC7076C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{A22876CA-76C0-4ABD-8658-C2B3DFDFE537} = {A80D3604-A8C8-4B23-B0D3-316E46CFE60A}
{2C4CBA2D-4C9D-4B83-85A4-2DF75C91B0FC} = {A80D3604-A8C8-4B23-B0D3-316E46CFE60A}
- {7C51DC48-EB7D-4AF5-BC4B-279CCD8BF3BE} = {94F2DDDF-A2DA-4F69-9613-A92D50D84A1C}
+ {55FC83C5-F34D-4B4B-BEAE-497DD5653BCE} = {94F2DDDF-A2DA-4F69-9613-A92D50D84A1C}
{57EC916C-15B4-46BB-AE68-B4CD8BC7076C} = {94F2DDDF-A2DA-4F69-9613-A92D50D84A1C}
{C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3} = {18C5FB7C-2DE7-4BED-BA2B-53776E78E1E5}
{91F8FBEF-C085-4542-BEE4-22449D80734A} = {F6066198-D324-499F-BEB7-55DF39460AB4}
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln b/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
index a8dd0872608..41388f920c2 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
+++ b/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
@@ -71,7 +71,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj", "{79F35586-A12D-4831-9D9D-5134FF07CC41}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A5755672-1361-48D8-8055-616A123519D0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4695E11B-4AB8-4376-832D-54344DD42316}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B6796238-B6F5-488E-97A9-50EC2966B633}"
EndProject
@@ -778,24 +778,24 @@ Global
{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x64.Build.0 = Debug|Any CPU
{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x86.ActiveCfg = Debug|Any CPU
{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x86.Build.0 = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Debug|x64.Build.0 = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Debug|x86.Build.0 = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Release|Any CPU.Build.0 = Release|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Release|x64.ActiveCfg = Release|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Release|x64.Build.0 = Release|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Release|x86.ActiveCfg = Release|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Release|x86.Build.0 = Release|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Checked|x64.ActiveCfg = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Checked|x64.Build.0 = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Checked|x86.ActiveCfg = Debug|Any CPU
- {A5755672-1361-48D8-8055-616A123519D0}.Checked|x86.Build.0 = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Debug|x64.Build.0 = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Debug|x86.Build.0 = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Release|x64.ActiveCfg = Release|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Release|x64.Build.0 = Release|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Release|x86.ActiveCfg = Release|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Release|x86.Build.0 = Release|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Checked|x64.Build.0 = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {4695E11B-4AB8-4376-832D-54344DD42316}.Checked|x86.Build.0 = Debug|Any CPU
{B6796238-B6F5-488E-97A9-50EC2966B633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6796238-B6F5-488E-97A9-50EC2966B633}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6796238-B6F5-488E-97A9-50EC2966B633}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1178,7 +1178,7 @@ Global
{E72B45B0-D05E-4F86-86E4-45B65FBB6617} = {56502718-F82A-46E2-9AD0-532C437EC51E}
{E92F7B7A-D34D-49B8-8857-09936624E038} = {56502718-F82A-46E2-9AD0-532C437EC51E}
{30C04925-08A1-4AFC-AE30-D7FA39945A5B} = {A8ED4215-E7B8-4F14-B61D-F737E24C856A}
- {A5755672-1361-48D8-8055-616A123519D0} = {A8ED4215-E7B8-4F14-B61D-F737E24C856A}
+ {4695E11B-4AB8-4376-832D-54344DD42316} = {A8ED4215-E7B8-4F14-B61D-F737E24C856A}
{B6796238-B6F5-488E-97A9-50EC2966B633} = {A8ED4215-E7B8-4F14-B61D-F737E24C856A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln b/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
index 14b4d6f3861..c564b6070c6 100644
--- a/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
+++ b/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
@@ -3,7 +3,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.DataContractSerialization", "..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj", "{6045DECE-8425-4EE2-8685-7F2F21A3F691}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{93F25E9D-7E11-4E31-A90A-B4AEC5AC7EEB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B5544BD7-96BD-47E8-A27A-F18D42B44D7B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{2D7FD180-D8EE-48B5-B71D-1AE8DEAB1F37}"
EndProject
@@ -37,10 +37,10 @@ Global
{6045DECE-8425-4EE2-8685-7F2F21A3F691}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6045DECE-8425-4EE2-8685-7F2F21A3F691}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6045DECE-8425-4EE2-8685-7F2F21A3F691}.Release|Any CPU.Build.0 = Release|Any CPU
- {93F25E9D-7E11-4E31-A90A-B4AEC5AC7EEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {93F25E9D-7E11-4E31-A90A-B4AEC5AC7EEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {93F25E9D-7E11-4E31-A90A-B4AEC5AC7EEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {93F25E9D-7E11-4E31-A90A-B4AEC5AC7EEB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B5544BD7-96BD-47E8-A27A-F18D42B44D7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B5544BD7-96BD-47E8-A27A-F18D42B44D7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B5544BD7-96BD-47E8-A27A-F18D42B44D7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B5544BD7-96BD-47E8-A27A-F18D42B44D7B}.Release|Any CPU.Build.0 = Release|Any CPU
{2D7FD180-D8EE-48B5-B71D-1AE8DEAB1F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D7FD180-D8EE-48B5-B71D-1AE8DEAB1F37}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D7FD180-D8EE-48B5-B71D-1AE8DEAB1F37}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -71,7 +71,7 @@ Global
{3898FE7A-F5E1-48BD-AD67-F8680B944631} = {23D70080-2668-4963-A7A0-4E5FC4CE7464}
{6045DECE-8425-4EE2-8685-7F2F21A3F691} = {A408DA52-13DD-4288-A88F-858DA05D936B}
{209F90AA-5CA1-4DFA-8641-05A0AA4FDC8E} = {A408DA52-13DD-4288-A88F-858DA05D936B}
- {93F25E9D-7E11-4E31-A90A-B4AEC5AC7EEB} = {BD161CEF-9B1C-45C0-B541-E4BA194BFCEC}
+ {B5544BD7-96BD-47E8-A27A-F18D42B44D7B} = {BD161CEF-9B1C-45C0-B541-E4BA194BFCEC}
{2D7FD180-D8EE-48B5-B71D-1AE8DEAB1F37} = {BD161CEF-9B1C-45C0-B541-E4BA194BFCEC}
{A0C8500C-06E8-4016-9A05-C6FC0D51BC01} = {A5940D03-8A5D-494C-B87F-4B9AAB6B21AE}
EndGlobalSection
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln b/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
index 3c88816be4d..d926e45b0b0 100644
--- a/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
+++ b/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5E9F435A-B4F6-4B3F-988B-80653A10F54D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E4148908-C334-48AD-871F-A0A3A64DC58D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7E3BBEEE-453F-4EE6-B09C-7AE2D2699CFF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1DD06D77-CFC0-478B-A415-54A45ED3E9B9}"
EndProject
@@ -29,10 +29,10 @@ Global
{5E9F435A-B4F6-4B3F-988B-80653A10F54D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E9F435A-B4F6-4B3F-988B-80653A10F54D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E9F435A-B4F6-4B3F-988B-80653A10F54D}.Release|Any CPU.Build.0 = Release|Any CPU
- {E4148908-C334-48AD-871F-A0A3A64DC58D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E4148908-C334-48AD-871F-A0A3A64DC58D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E4148908-C334-48AD-871F-A0A3A64DC58D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E4148908-C334-48AD-871F-A0A3A64DC58D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7E3BBEEE-453F-4EE6-B09C-7AE2D2699CFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7E3BBEEE-453F-4EE6-B09C-7AE2D2699CFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7E3BBEEE-453F-4EE6-B09C-7AE2D2699CFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7E3BBEEE-453F-4EE6-B09C-7AE2D2699CFF}.Release|Any CPU.Build.0 = Release|Any CPU
{1DD06D77-CFC0-478B-A415-54A45ED3E9B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1DD06D77-CFC0-478B-A415-54A45ED3E9B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DD06D77-CFC0-478B-A415-54A45ED3E9B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{5E9F435A-B4F6-4B3F-988B-80653A10F54D} = {8197F6DC-718C-4F71-9F13-771B1C1058E1}
{AB51C1E2-6308-4989-B037-5712B6503C77} = {8197F6DC-718C-4F71-9F13-771B1C1058E1}
- {E4148908-C334-48AD-871F-A0A3A64DC58D} = {A1607D7B-AA96-4EAD-99F7-9CA09E472C56}
+ {7E3BBEEE-453F-4EE6-B09C-7AE2D2699CFF} = {A1607D7B-AA96-4EAD-99F7-9CA09E472C56}
{1DD06D77-CFC0-478B-A415-54A45ED3E9B9} = {A1607D7B-AA96-4EAD-99F7-9CA09E472C56}
{9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D} = {E8F4D65F-BB03-4954-AB19-C85DEC5E286C}
{70F6A111-C73E-4989-BCE4-ED790E1E2882} = {39E6C76D-0897-4933-81F5-107D9947D90D}
diff --git a/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln b/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
index b8954d0165e..b6a6942c7ee 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
+++ b/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.DataContractSerialization", "..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj", "{76AC3DDD-2B38-489F-A8B0-8E43054595DB}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7F991911-EFB4-42E3-9AA2-A6DC8A121659}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7D7457FD-B88C-4375-926D-7D46C71E34A7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D5FF2DBA-F304-4ACB-8F82-B8F9321E22A9}"
EndProject
@@ -59,10 +59,10 @@ Global
{76AC3DDD-2B38-489F-A8B0-8E43054595DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{76AC3DDD-2B38-489F-A8B0-8E43054595DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{76AC3DDD-2B38-489F-A8B0-8E43054595DB}.Release|Any CPU.Build.0 = Release|Any CPU
- {7F991911-EFB4-42E3-9AA2-A6DC8A121659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7F991911-EFB4-42E3-9AA2-A6DC8A121659}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7F991911-EFB4-42E3-9AA2-A6DC8A121659}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7F991911-EFB4-42E3-9AA2-A6DC8A121659}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7D7457FD-B88C-4375-926D-7D46C71E34A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7D7457FD-B88C-4375-926D-7D46C71E34A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7D7457FD-B88C-4375-926D-7D46C71E34A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7D7457FD-B88C-4375-926D-7D46C71E34A7}.Release|Any CPU.Build.0 = Release|Any CPU
{D5FF2DBA-F304-4ACB-8F82-B8F9321E22A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D5FF2DBA-F304-4ACB-8F82-B8F9321E22A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5FF2DBA-F304-4ACB-8F82-B8F9321E22A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -107,7 +107,7 @@ Global
{1392041A-E2CA-4553-BEAF-363974651B81} = {DB29DBEF-FA4E-4334-AFB8-BFB2DA82D1DE}
{76AC3DDD-2B38-489F-A8B0-8E43054595DB} = {DB29DBEF-FA4E-4334-AFB8-BFB2DA82D1DE}
{6FD10BE0-24C8-456E-8B9A-FD101C05C961} = {DB29DBEF-FA4E-4334-AFB8-BFB2DA82D1DE}
- {7F991911-EFB4-42E3-9AA2-A6DC8A121659} = {DE71D38E-4154-477C-9C27-3FA4ADB4098F}
+ {7D7457FD-B88C-4375-926D-7D46C71E34A7} = {DE71D38E-4154-477C-9C27-3FA4ADB4098F}
{D5FF2DBA-F304-4ACB-8F82-B8F9321E22A9} = {DE71D38E-4154-477C-9C27-3FA4ADB4098F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln
index f789e3df84e..cde81eb9df3 100644
--- a/src/libraries/System.Runtime/System.Runtime.sln
+++ b/src/libraries/System.Runtime/System.Runtime.sln
@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Gene
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7301E27F-F136-4649-947D-17F7E8DBCA08}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37}"
EndProject
@@ -232,24 +232,24 @@ Global
{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Checked|x64.Build.0 = Debug|Any CPU
{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Checked|x86.ActiveCfg = Debug|Any CPU
{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Checked|x86.Build.0 = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Debug|x64.ActiveCfg = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Debug|x64.Build.0 = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Debug|x86.ActiveCfg = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Debug|x86.Build.0 = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Release|Any CPU.Build.0 = Release|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Release|x64.ActiveCfg = Release|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Release|x64.Build.0 = Release|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Release|x86.ActiveCfg = Release|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Release|x86.Build.0 = Release|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Checked|x64.ActiveCfg = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Checked|x64.Build.0 = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Checked|x86.ActiveCfg = Debug|Any CPU
- {7301E27F-F136-4649-947D-17F7E8DBCA08}.Checked|x86.Build.0 = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|x64.Build.0 = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Debug|x86.Build.0 = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Release|x64.ActiveCfg = Release|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Release|x64.Build.0 = Release|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Release|x86.ActiveCfg = Release|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Release|x86.Build.0 = Release|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Checked|x64.Build.0 = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9}.Checked|x86.Build.0 = Debug|Any CPU
{A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -548,7 +548,7 @@ Global
{25E8AB9D-2D10-44F5-9F83-5A5134526771} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
{82728202-1098-4E16-B598-5762EAF67D08} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
{CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
- {7301E27F-F136-4649-947D-17F7E8DBCA08} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
+ {4FA4A9A6-1D38-414B-96F0-3CFB63C687C9} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
{A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln b/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
index 3f44db9fb87..21703ab327b 100644
--- a/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
+++ b/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
@@ -3,7 +3,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3F65599A-84CA-4742-85BE-6C9E1EDCBEA0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{AABA6C21-1DC9-471F-979E-F35930A106F3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{CDB32066-5BD2-46EB-AFF1-07554FBF6942}"
EndProject
@@ -35,10 +35,10 @@ Global
{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340}.Release|Any CPU.Build.0 = Release|Any CPU
- {3F65599A-84CA-4742-85BE-6C9E1EDCBEA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3F65599A-84CA-4742-85BE-6C9E1EDCBEA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3F65599A-84CA-4742-85BE-6C9E1EDCBEA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3F65599A-84CA-4742-85BE-6C9E1EDCBEA0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AABA6C21-1DC9-471F-979E-F35930A106F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AABA6C21-1DC9-471F-979E-F35930A106F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AABA6C21-1DC9-471F-979E-F35930A106F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AABA6C21-1DC9-471F-979E-F35930A106F3}.Release|Any CPU.Build.0 = Release|Any CPU
{CDB32066-5BD2-46EB-AFF1-07554FBF6942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CDB32066-5BD2-46EB-AFF1-07554FBF6942}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CDB32066-5BD2-46EB-AFF1-07554FBF6942}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -64,7 +64,7 @@ Global
{0B9499DE-C86E-4F3F-8F92-73DCC244A13B} = {4ED5729F-DB06-4332-9876-354C28894824}
{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340} = {5A0B73BB-E1B6-4034-AA56-A82762FD405F}
{E1E671BC-A82F-400A-9C93-ACB199A43BDA} = {5A0B73BB-E1B6-4034-AA56-A82762FD405F}
- {3F65599A-84CA-4742-85BE-6C9E1EDCBEA0} = {82996086-0F1B-4E0F-9121-07C396EF0EC7}
+ {AABA6C21-1DC9-471F-979E-F35930A106F3} = {82996086-0F1B-4E0F-9121-07C396EF0EC7}
{CDB32066-5BD2-46EB-AFF1-07554FBF6942} = {82996086-0F1B-4E0F-9121-07C396EF0EC7}
{28201266-9EA3-4B92-83C5-ADEC5608E27A} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523}
EndGlobalSection
diff --git a/src/libraries/System.Security.Claims/System.Security.Claims.sln b/src/libraries/System.Security.Claims/System.Security.Claims.sln
index ba9f655271d..81ac8883882 100644
--- a/src/libraries/System.Security.Claims/System.Security.Claims.sln
+++ b/src/libraries/System.Security.Claims/System.Security.Claims.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{74402B68-53BF-4B2F-BDEA-91F665E130D2}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BEEDE76F-F71E-4B1F-AD9C-B3118DC1DD22}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{9CE6E82B-D921-40A2-AD3B-783EBABBC233}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C2E2876D-4DE3-45D2-A8B5-09D01CD080A4}"
EndProject
@@ -29,10 +29,10 @@ Global
{74402B68-53BF-4B2F-BDEA-91F665E130D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74402B68-53BF-4B2F-BDEA-91F665E130D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74402B68-53BF-4B2F-BDEA-91F665E130D2}.Release|Any CPU.Build.0 = Release|Any CPU
- {BEEDE76F-F71E-4B1F-AD9C-B3118DC1DD22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BEEDE76F-F71E-4B1F-AD9C-B3118DC1DD22}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BEEDE76F-F71E-4B1F-AD9C-B3118DC1DD22}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BEEDE76F-F71E-4B1F-AD9C-B3118DC1DD22}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9CE6E82B-D921-40A2-AD3B-783EBABBC233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9CE6E82B-D921-40A2-AD3B-783EBABBC233}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9CE6E82B-D921-40A2-AD3B-783EBABBC233}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9CE6E82B-D921-40A2-AD3B-783EBABBC233}.Release|Any CPU.Build.0 = Release|Any CPU
{C2E2876D-4DE3-45D2-A8B5-09D01CD080A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C2E2876D-4DE3-45D2-A8B5-09D01CD080A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2E2876D-4DE3-45D2-A8B5-09D01CD080A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{74402B68-53BF-4B2F-BDEA-91F665E130D2} = {58661765-A62B-4A5F-9950-A56DEFC0CDB0}
{12F9C4AA-F238-42A1-9324-2C3CB643595B} = {58661765-A62B-4A5F-9950-A56DEFC0CDB0}
- {BEEDE76F-F71E-4B1F-AD9C-B3118DC1DD22} = {66B48EC0-590C-40BD-A4E3-DB7DBA977B47}
+ {9CE6E82B-D921-40A2-AD3B-783EBABBC233} = {66B48EC0-590C-40BD-A4E3-DB7DBA977B47}
{C2E2876D-4DE3-45D2-A8B5-09D01CD080A4} = {66B48EC0-590C-40BD-A4E3-DB7DBA977B47}
{DBBE28DA-7239-4C32-8308-2A65C10410DE} = {3B6EF051-7EB4-454F-ACA8-AEF258B645E4}
{85FAD30C-2D0C-406D-9F3B-DB7236016CC5} = {3D2906A4-D990-48BA-B038-3465E82F36A4}
diff --git a/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln b/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
index 5c4dd21c768..22beadef6ba 100644
--- a/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
+++ b/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7FAF92EB-F974-4279-8ED4-431ADAF3584C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A275AAB4-EEA6-4891-A4A6-29A9AE477B76}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7CB4B1A2-F0C0-4893-9BE3-455261F1E3D1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{DD5E2B5F-C74F-4B2A-B8AA-E01CE20741D5}"
EndProject
@@ -31,10 +31,10 @@ Global
{7FAF92EB-F974-4279-8ED4-431ADAF3584C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7FAF92EB-F974-4279-8ED4-431ADAF3584C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7FAF92EB-F974-4279-8ED4-431ADAF3584C}.Release|Any CPU.Build.0 = Release|Any CPU
- {A275AAB4-EEA6-4891-A4A6-29A9AE477B76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A275AAB4-EEA6-4891-A4A6-29A9AE477B76}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A275AAB4-EEA6-4891-A4A6-29A9AE477B76}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A275AAB4-EEA6-4891-A4A6-29A9AE477B76}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7CB4B1A2-F0C0-4893-9BE3-455261F1E3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7CB4B1A2-F0C0-4893-9BE3-455261F1E3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7CB4B1A2-F0C0-4893-9BE3-455261F1E3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7CB4B1A2-F0C0-4893-9BE3-455261F1E3D1}.Release|Any CPU.Build.0 = Release|Any CPU
{DD5E2B5F-C74F-4B2A-B8AA-E01CE20741D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DD5E2B5F-C74F-4B2A-B8AA-E01CE20741D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DD5E2B5F-C74F-4B2A-B8AA-E01CE20741D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -62,7 +62,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{7FAF92EB-F974-4279-8ED4-431ADAF3584C} = {1D9900D4-8DD5-4936-BE7A-4D4126E16459}
{4DCE069F-1F04-45F7-AA64-CE095F9DA385} = {1D9900D4-8DD5-4936-BE7A-4D4126E16459}
- {A275AAB4-EEA6-4891-A4A6-29A9AE477B76} = {5FBF9A4A-3818-4FA0-8759-67340FCF889F}
+ {7CB4B1A2-F0C0-4893-9BE3-455261F1E3D1} = {5FBF9A4A-3818-4FA0-8759-67340FCF889F}
{DD5E2B5F-C74F-4B2A-B8AA-E01CE20741D5} = {5FBF9A4A-3818-4FA0-8759-67340FCF889F}
{B88D8B7E-7682-4F23-82AF-DF186BDD3255} = {3B5CC70E-D006-426A-BC91-6A7DEE2F7181}
{4BAA22AA-6F42-4C31-8CCF-256F30A26228} = {EC42BE1B-70E9-4248-9E0F-288C6677A579}
diff --git a/src/libraries/System.Security.Cryptography.Cose/System.Security.Cryptography.Cose.sln b/src/libraries/System.Security.Cryptography.Cose/System.Security.Cryptography.Cose.sln
index 5add382d4f6..0ddda472113 100644
--- a/src/libraries/System.Security.Cryptography.Cose/System.Security.Cryptography.Cose.sln
+++ b/src/libraries/System.Security.Cryptography.Cose/System.Security.Cryptography.Cose.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor", "..\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor", "..\System.Formats.Cbor\src\System.Formats.Cbor.csproj", "{0CB3F6B0-353E-47E4-8A62-AFA6115EF789}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{91C4D9D2-7EE1-4306-BBEA-68210EC1DEE7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{02892B95-D329-4428-B5DC-63AE65D4DB75}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{64D2E763-9717-4CE9-8500-6E6B0CF358F2}"
EndProject
@@ -41,10 +41,10 @@ Global
{0CB3F6B0-353E-47E4-8A62-AFA6115EF789}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CB3F6B0-353E-47E4-8A62-AFA6115EF789}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0CB3F6B0-353E-47E4-8A62-AFA6115EF789}.Release|Any CPU.Build.0 = Release|Any CPU
- {91C4D9D2-7EE1-4306-BBEA-68210EC1DEE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {91C4D9D2-7EE1-4306-BBEA-68210EC1DEE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {91C4D9D2-7EE1-4306-BBEA-68210EC1DEE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {91C4D9D2-7EE1-4306-BBEA-68210EC1DEE7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {02892B95-D329-4428-B5DC-63AE65D4DB75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {02892B95-D329-4428-B5DC-63AE65D4DB75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {02892B95-D329-4428-B5DC-63AE65D4DB75}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {02892B95-D329-4428-B5DC-63AE65D4DB75}.Release|Any CPU.Build.0 = Release|Any CPU
{64D2E763-9717-4CE9-8500-6E6B0CF358F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64D2E763-9717-4CE9-8500-6E6B0CF358F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64D2E763-9717-4CE9-8500-6E6B0CF358F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +72,7 @@ Global
{823EE247-FC47-444F-B9A0-32AF146D1789} = {5F962CC3-0DD0-4428-9CF4-99035553DB85}
{0CB3F6B0-353E-47E4-8A62-AFA6115EF789} = {29B55087-85A2-4FCE-8303-8EE6B43B0094}
{CD19385A-1EDD-45DD-B4E4-BD1F2047BB2B} = {29B55087-85A2-4FCE-8303-8EE6B43B0094}
- {91C4D9D2-7EE1-4306-BBEA-68210EC1DEE7} = {A1DDBD83-25B1-44F6-93A9-AB27A9710FD6}
+ {02892B95-D329-4428-B5DC-63AE65D4DB75} = {A1DDBD83-25B1-44F6-93A9-AB27A9710FD6}
{64D2E763-9717-4CE9-8500-6E6B0CF358F2} = {A1DDBD83-25B1-44F6-93A9-AB27A9710FD6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln b/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
index e0377008fe8..59d81769b4d 100644
--- a/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
+++ b/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CC4119F0-EEF6-4443-A3BD-D21063991D8B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{43B3E90B-034B-444F-80CF-1A3D5F0501F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C4D759BF-56D6-4C26-A58A-DEC682E5867A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{446043A6-6B64-462F-AEE2-05567BE5EFF5}"
EndProject
@@ -31,10 +31,10 @@ Global
{CC4119F0-EEF6-4443-A3BD-D21063991D8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC4119F0-EEF6-4443-A3BD-D21063991D8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CC4119F0-EEF6-4443-A3BD-D21063991D8B}.Release|Any CPU.Build.0 = Release|Any CPU
- {43B3E90B-034B-444F-80CF-1A3D5F0501F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {43B3E90B-034B-444F-80CF-1A3D5F0501F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {43B3E90B-034B-444F-80CF-1A3D5F0501F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {43B3E90B-034B-444F-80CF-1A3D5F0501F0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C4D759BF-56D6-4C26-A58A-DEC682E5867A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C4D759BF-56D6-4C26-A58A-DEC682E5867A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C4D759BF-56D6-4C26-A58A-DEC682E5867A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C4D759BF-56D6-4C26-A58A-DEC682E5867A}.Release|Any CPU.Build.0 = Release|Any CPU
{446043A6-6B64-462F-AEE2-05567BE5EFF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{446043A6-6B64-462F-AEE2-05567BE5EFF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{446043A6-6B64-462F-AEE2-05567BE5EFF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -62,7 +62,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{CC4119F0-EEF6-4443-A3BD-D21063991D8B} = {383B91A8-7022-4B83-82F5-0CF055472A0D}
{9136AFBB-5173-4AD7-AD77-641E1EB8506C} = {383B91A8-7022-4B83-82F5-0CF055472A0D}
- {43B3E90B-034B-444F-80CF-1A3D5F0501F0} = {C15BDF97-695A-4F94-97EE-060F20E63B2E}
+ {C4D759BF-56D6-4C26-A58A-DEC682E5867A} = {C15BDF97-695A-4F94-97EE-060F20E63B2E}
{446043A6-6B64-462F-AEE2-05567BE5EFF5} = {C15BDF97-695A-4F94-97EE-060F20E63B2E}
{3CA5ECAF-C3E1-48F2-905F-BFEE4E164E10} = {004448ED-CE3D-4EEE-B176-458440B11AEB}
{153000A6-96D2-4E0D-8E34-13B85E8ECACD} = {004448ED-CE3D-4EEE-B176-458440B11AEB}
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln b/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
index 9eb0f0ef794..236a228a270 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{29991657-E677-42A4-894C-6BE781C51DD7}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{C56036DA-810D-45AF-98AE-A982418CE234}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{90D71172-E256-4C28-8EEA-790E5E7A396D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C76222C7-F56E-44EA-9187-6A3A2DC72C44}"
EndProject
@@ -31,10 +31,10 @@ Global
{29991657-E677-42A4-894C-6BE781C51DD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29991657-E677-42A4-894C-6BE781C51DD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{29991657-E677-42A4-894C-6BE781C51DD7}.Release|Any CPU.Build.0 = Release|Any CPU
- {C56036DA-810D-45AF-98AE-A982418CE234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C56036DA-810D-45AF-98AE-A982418CE234}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C56036DA-810D-45AF-98AE-A982418CE234}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C56036DA-810D-45AF-98AE-A982418CE234}.Release|Any CPU.Build.0 = Release|Any CPU
+ {90D71172-E256-4C28-8EEA-790E5E7A396D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {90D71172-E256-4C28-8EEA-790E5E7A396D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {90D71172-E256-4C28-8EEA-790E5E7A396D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {90D71172-E256-4C28-8EEA-790E5E7A396D}.Release|Any CPU.Build.0 = Release|Any CPU
{C76222C7-F56E-44EA-9187-6A3A2DC72C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C76222C7-F56E-44EA-9187-6A3A2DC72C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C76222C7-F56E-44EA-9187-6A3A2DC72C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -62,7 +62,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{29991657-E677-42A4-894C-6BE781C51DD7} = {A253B72C-7AA0-416A-92E6-09D5DCF906E7}
{DE8A9283-1375-4651-B1B0-4E5C6D1D07AD} = {A253B72C-7AA0-416A-92E6-09D5DCF906E7}
- {C56036DA-810D-45AF-98AE-A982418CE234} = {56992064-4BA0-4CDD-95BD-9ED43B42CC59}
+ {90D71172-E256-4C28-8EEA-790E5E7A396D} = {56992064-4BA0-4CDD-95BD-9ED43B42CC59}
{C76222C7-F56E-44EA-9187-6A3A2DC72C44} = {56992064-4BA0-4CDD-95BD-9ED43B42CC59}
{12345E87-4C47-4857-B7E4-6673D6ECC05F} = {4562CA8C-1A07-4AFB-B5BC-977FD19605CB}
{A0136D6F-CF53-42F8-9227-2FFF2A1841AA} = {4562CA8C-1A07-4AFB-B5BC-977FD19605CB}
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
index c57a5864c55..676580f1349 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
@@ -7,7 +7,7 @@
<!-- The library is not supported on mobile platforms (PNSE) -->
<IgnoreForCI Condition="'$(TargetOS)' == 'Android' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">true</IgnoreForCI>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="EcDsaOpenSslTests.cs" />
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln b/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
index 4119574acf3..e22253c338d 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
+++ b/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6B40D2AA-3405-4AC5-A4B2-CAD11D0B4301}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{97CE28DB-B4AC-400B-A40D-C55789FCA0AB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E44D1E0E-5F76-41B8-AF5F-6112BCC6A39B}"
EndProject
@@ -43,10 +43,10 @@ Global
{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD}.Release|Any CPU.Build.0 = Release|Any CPU
- {6B40D2AA-3405-4AC5-A4B2-CAD11D0B4301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6B40D2AA-3405-4AC5-A4B2-CAD11D0B4301}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6B40D2AA-3405-4AC5-A4B2-CAD11D0B4301}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6B40D2AA-3405-4AC5-A4B2-CAD11D0B4301}.Release|Any CPU.Build.0 = Release|Any CPU
+ {97CE28DB-B4AC-400B-A40D-C55789FCA0AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {97CE28DB-B4AC-400B-A40D-C55789FCA0AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {97CE28DB-B4AC-400B-A40D-C55789FCA0AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {97CE28DB-B4AC-400B-A40D-C55789FCA0AB}.Release|Any CPU.Build.0 = Release|Any CPU
{E44D1E0E-5F76-41B8-AF5F-6112BCC6A39B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E44D1E0E-5F76-41B8-AF5F-6112BCC6A39B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E44D1E0E-5F76-41B8-AF5F-6112BCC6A39B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -79,7 +79,7 @@ Global
{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD} = {D5B768A4-9BA9-4E78-B735-60052C68035C}
{906CF937-8BCE-4ABF-B35C-23D51D59232E} = {D5B768A4-9BA9-4E78-B735-60052C68035C}
{DDD75646-C8BD-4B16-8E59-E6A3668FD9A2} = {D5B768A4-9BA9-4E78-B735-60052C68035C}
- {6B40D2AA-3405-4AC5-A4B2-CAD11D0B4301} = {94B59232-B99C-4224-B3E3-0F3385F06B64}
+ {97CE28DB-B4AC-400B-A40D-C55789FCA0AB} = {94B59232-B99C-4224-B3E3-0F3385F06B64}
{E44D1E0E-5F76-41B8-AF5F-6112BCC6A39B} = {94B59232-B99C-4224-B3E3-0F3385F06B64}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln b/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
index 33833e57b85..1a7c664308e 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{21CC9F35-ACAA-4452-BE92-BBAE2E927B20}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{85BEB7BC-C0AD-4B00-B328-8483067BE301}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{324E33F0-53FB-4DFD-AEDF-64BCFB2F7821}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D3B40403-2973-45CE-A0A4-97C38CBE86FE}"
EndProject
@@ -29,10 +29,10 @@ Global
{21CC9F35-ACAA-4452-BE92-BBAE2E927B20}.Debug|Any CPU.Build.0 = Debug|Any CPU
{21CC9F35-ACAA-4452-BE92-BBAE2E927B20}.Release|Any CPU.ActiveCfg = Release|Any CPU
{21CC9F35-ACAA-4452-BE92-BBAE2E927B20}.Release|Any CPU.Build.0 = Release|Any CPU
- {85BEB7BC-C0AD-4B00-B328-8483067BE301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {85BEB7BC-C0AD-4B00-B328-8483067BE301}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {85BEB7BC-C0AD-4B00-B328-8483067BE301}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {85BEB7BC-C0AD-4B00-B328-8483067BE301}.Release|Any CPU.Build.0 = Release|Any CPU
+ {324E33F0-53FB-4DFD-AEDF-64BCFB2F7821}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {324E33F0-53FB-4DFD-AEDF-64BCFB2F7821}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {324E33F0-53FB-4DFD-AEDF-64BCFB2F7821}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {324E33F0-53FB-4DFD-AEDF-64BCFB2F7821}.Release|Any CPU.Build.0 = Release|Any CPU
{D3B40403-2973-45CE-A0A4-97C38CBE86FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D3B40403-2973-45CE-A0A4-97C38CBE86FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3B40403-2973-45CE-A0A4-97C38CBE86FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{21CC9F35-ACAA-4452-BE92-BBAE2E927B20} = {E3C3C868-FBDB-4F07-A72E-F734016C0B3B}
{3A6C62D5-EFCA-4119-BC60-C917533848A8} = {E3C3C868-FBDB-4F07-A72E-F734016C0B3B}
- {85BEB7BC-C0AD-4B00-B328-8483067BE301} = {6F1E3122-547E-4134-BB45-6E33B880DC34}
+ {324E33F0-53FB-4DFD-AEDF-64BCFB2F7821} = {6F1E3122-547E-4134-BB45-6E33B880DC34}
{D3B40403-2973-45CE-A0A4-97C38CBE86FE} = {6F1E3122-547E-4134-BB45-6E33B880DC34}
{E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE} = {AE1B6C0D-2991-4048-9B81-5683599B0CA4}
{7773DB7A-494F-4508-9471-F737FDC7661E} = {87D86F17-7CEB-48DB-99FB-55922ED2A7D1}
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln b/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
index 9861442712c..ddedd46e0bb 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{C2D74126-653E-41C9-9CF8-E58F1FD110B8}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{C5C394FF-FBE7-4A00-82B0-075A8F8587FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{7AD6D18A-FEF8-4E9D-B256-A4B9FD82DFE8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{8A203663-E5D7-494B-93F9-F1205E9164BD}"
EndProject
@@ -47,10 +47,10 @@ Global
{C2D74126-653E-41C9-9CF8-E58F1FD110B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2D74126-653E-41C9-9CF8-E58F1FD110B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2D74126-653E-41C9-9CF8-E58F1FD110B8}.Release|Any CPU.Build.0 = Release|Any CPU
- {C5C394FF-FBE7-4A00-82B0-075A8F8587FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C5C394FF-FBE7-4A00-82B0-075A8F8587FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C5C394FF-FBE7-4A00-82B0-075A8F8587FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C5C394FF-FBE7-4A00-82B0-075A8F8587FE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7AD6D18A-FEF8-4E9D-B256-A4B9FD82DFE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7AD6D18A-FEF8-4E9D-B256-A4B9FD82DFE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7AD6D18A-FEF8-4E9D-B256-A4B9FD82DFE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7AD6D18A-FEF8-4E9D-B256-A4B9FD82DFE8}.Release|Any CPU.Build.0 = Release|Any CPU
{8A203663-E5D7-494B-93F9-F1205E9164BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A203663-E5D7-494B-93F9-F1205E9164BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A203663-E5D7-494B-93F9-F1205E9164BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -93,7 +93,7 @@ Global
{EEFBEDAF-C620-4C4E-867E-80A1EFEC4357} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD}
{76812DB0-A6A2-4F0C-B560-18FC7A97E419} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD}
{2A203F48-05D2-4E45-8A98-98F02EE639A8} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD}
- {C5C394FF-FBE7-4A00-82B0-075A8F8587FE} = {A00A0A16-D202-49A0-B2C0-C3BB53FA858D}
+ {7AD6D18A-FEF8-4E9D-B256-A4B9FD82DFE8} = {A00A0A16-D202-49A0-B2C0-C3BB53FA858D}
{8A203663-E5D7-494B-93F9-F1205E9164BD} = {A00A0A16-D202-49A0-B2C0-C3BB53FA858D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
index aa7406a0114..3fce6c8a16e 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
@@ -5,7 +5,7 @@
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<NoWarn>$(NoWarn);SYSLIB0026;SYSLIB0027;SYSLIB0028</NoWarn>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS</TargetFrameworks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln b/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
index 42d37644aea..ba5ca3fda41 100644
--- a/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
+++ b/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{65F8361F-13F3-4548-838F-53D6289EE77A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2CE79894-A115-4C92-86E2-7B392EBCBD83}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B15E7AF8-B446-425F-B22A-619A01DEDA16}"
EndProject
@@ -45,10 +45,10 @@ Global
{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}.Release|Any CPU.Build.0 = Release|Any CPU
- {65F8361F-13F3-4548-838F-53D6289EE77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {65F8361F-13F3-4548-838F-53D6289EE77A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {65F8361F-13F3-4548-838F-53D6289EE77A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {65F8361F-13F3-4548-838F-53D6289EE77A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2CE79894-A115-4C92-86E2-7B392EBCBD83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2CE79894-A115-4C92-86E2-7B392EBCBD83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2CE79894-A115-4C92-86E2-7B392EBCBD83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2CE79894-A115-4C92-86E2-7B392EBCBD83}.Release|Any CPU.Build.0 = Release|Any CPU
{B15E7AF8-B446-425F-B22A-619A01DEDA16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B15E7AF8-B446-425F-B22A-619A01DEDA16}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B15E7AF8-B446-425F-B22A-619A01DEDA16}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -86,7 +86,7 @@ Global
{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8} = {BA579BFF-D4D9-455A-A8AC-589361391420}
{474CEFD4-533F-4A2E-8CF9-860F388BC332} = {BA579BFF-D4D9-455A-A8AC-589361391420}
{848640EF-9F7D-4D01-AA87-E16617FDEE0B} = {BA579BFF-D4D9-455A-A8AC-589361391420}
- {65F8361F-13F3-4548-838F-53D6289EE77A} = {39704A56-DFD6-4CC6-A7E4-229E639D9611}
+ {2CE79894-A115-4C92-86E2-7B392EBCBD83} = {39704A56-DFD6-4CC6-A7E4-229E639D9611}
{B15E7AF8-B446-425F-B22A-619A01DEDA16} = {39704A56-DFD6-4CC6-A7E4-229E639D9611}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln b/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln
index 206763b63a1..7dcd38885d6 100644
--- a/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln
+++ b/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{3B1486E4-DCDE-4629-AACC-D1A6FF8A1993}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B8B8FF39-1961-441D-9295-9F8B0B59575C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{9E7AD0F4-0D4D-4E42-8C6C-513C006E0590}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1B999BF7-657A-4342-A97E-B5CC5916AFB4}"
EndProject
@@ -51,10 +51,10 @@ Global
{3B1486E4-DCDE-4629-AACC-D1A6FF8A1993}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B1486E4-DCDE-4629-AACC-D1A6FF8A1993}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B1486E4-DCDE-4629-AACC-D1A6FF8A1993}.Release|Any CPU.Build.0 = Release|Any CPU
- {B8B8FF39-1961-441D-9295-9F8B0B59575C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B8B8FF39-1961-441D-9295-9F8B0B59575C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B8B8FF39-1961-441D-9295-9F8B0B59575C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B8B8FF39-1961-441D-9295-9F8B0B59575C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9E7AD0F4-0D4D-4E42-8C6C-513C006E0590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9E7AD0F4-0D4D-4E42-8C6C-513C006E0590}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9E7AD0F4-0D4D-4E42-8C6C-513C006E0590}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9E7AD0F4-0D4D-4E42-8C6C-513C006E0590}.Release|Any CPU.Build.0 = Release|Any CPU
{1B999BF7-657A-4342-A97E-B5CC5916AFB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B999BF7-657A-4342-A97E-B5CC5916AFB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B999BF7-657A-4342-A97E-B5CC5916AFB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -93,7 +93,7 @@ Global
{3B1486E4-DCDE-4629-AACC-D1A6FF8A1993} = {A16B11D7-6732-45E2-894B-D5AFA879B68A}
{E72C02D0-CC28-4FE2-8A2F-D91ABD990065} = {A16B11D7-6732-45E2-894B-D5AFA879B68A}
{AF227727-11A6-4E5F-98DE-C362FC829633} = {A16B11D7-6732-45E2-894B-D5AFA879B68A}
- {B8B8FF39-1961-441D-9295-9F8B0B59575C} = {2B165D96-356D-409E-88BE-0CA0F407303E}
+ {9E7AD0F4-0D4D-4E42-8C6C-513C006E0590} = {2B165D96-356D-409E-88BE-0CA0F407303E}
{1B999BF7-657A-4342-A97E-B5CC5916AFB4} = {2B165D96-356D-409E-88BE-0CA0F407303E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj b/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
index 0f028bf8d14..3fd47902df5 100644
--- a/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
@@ -4,7 +4,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn);SYSLIB0021</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
diff --git a/src/libraries/System.Security.Permissions/System.Security.Permissions.sln b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
index be4b8cc77e5..2a1c6ea50db 100644
--- a/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
+++ b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{53FBF7A5-CF86-435A-B20C-47BD78847CF5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{81BC7EDB-94CC-4497-9D3F-FE60BAC03FAC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{86E25854-BE58-41CF-9DF6-4669C4D23D05}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E2926598-EE1D-4DA3-AD75-11D54F1EF318}"
EndProject
@@ -69,10 +69,10 @@ Global
{53FBF7A5-CF86-435A-B20C-47BD78847CF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53FBF7A5-CF86-435A-B20C-47BD78847CF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53FBF7A5-CF86-435A-B20C-47BD78847CF5}.Release|Any CPU.Build.0 = Release|Any CPU
- {81BC7EDB-94CC-4497-9D3F-FE60BAC03FAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {81BC7EDB-94CC-4497-9D3F-FE60BAC03FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {81BC7EDB-94CC-4497-9D3F-FE60BAC03FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {81BC7EDB-94CC-4497-9D3F-FE60BAC03FAC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {86E25854-BE58-41CF-9DF6-4669C4D23D05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {86E25854-BE58-41CF-9DF6-4669C4D23D05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {86E25854-BE58-41CF-9DF6-4669C4D23D05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {86E25854-BE58-41CF-9DF6-4669C4D23D05}.Release|Any CPU.Build.0 = Release|Any CPU
{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -114,7 +114,7 @@ Global
{53FBF7A5-CF86-435A-B20C-47BD78847CF5} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1}
{CE88C6B8-C9B6-4695-BA23-BE8955018E26} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1}
{F2FF3B73-B971-4C07-B9C9-9EA600C288BD} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1}
- {81BC7EDB-94CC-4497-9D3F-FE60BAC03FAC} = {EA13AEBA-B53D-4A6C-8BA1-FB1748B87675}
+ {86E25854-BE58-41CF-9DF6-4669C4D23D05} = {EA13AEBA-B53D-4A6C-8BA1-FB1748B87675}
{E2926598-EE1D-4DA3-AD75-11D54F1EF318} = {EA13AEBA-B53D-4A6C-8BA1-FB1748B87675}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln b/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
index 9be741ce7a3..cba7e61829b 100644
--- a/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
+++ b/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1F05702D-1F77-4EA3-AFB2-94893104F248}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{8B258AE4-045E-431A-844B-CAC5C94C5B45}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{BA9F61DE-A8C6-4DE2-85A4-C56D5D3AEAB6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{589D8BE1-E01B-48B0-859D-FC19DE266CAF}"
EndProject
@@ -29,10 +29,10 @@ Global
{1F05702D-1F77-4EA3-AFB2-94893104F248}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F05702D-1F77-4EA3-AFB2-94893104F248}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1F05702D-1F77-4EA3-AFB2-94893104F248}.Release|Any CPU.Build.0 = Release|Any CPU
- {8B258AE4-045E-431A-844B-CAC5C94C5B45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8B258AE4-045E-431A-844B-CAC5C94C5B45}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8B258AE4-045E-431A-844B-CAC5C94C5B45}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8B258AE4-045E-431A-844B-CAC5C94C5B45}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BA9F61DE-A8C6-4DE2-85A4-C56D5D3AEAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BA9F61DE-A8C6-4DE2-85A4-C56D5D3AEAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BA9F61DE-A8C6-4DE2-85A4-C56D5D3AEAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BA9F61DE-A8C6-4DE2-85A4-C56D5D3AEAB6}.Release|Any CPU.Build.0 = Release|Any CPU
{589D8BE1-E01B-48B0-859D-FC19DE266CAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{589D8BE1-E01B-48B0-859D-FC19DE266CAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{589D8BE1-E01B-48B0-859D-FC19DE266CAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{1F05702D-1F77-4EA3-AFB2-94893104F248} = {0CC51645-FA2D-44E8-9A91-562DF28F2236}
{9310D24A-AB63-4CB0-9718-A8C2D57C20FE} = {0CC51645-FA2D-44E8-9A91-562DF28F2236}
- {8B258AE4-045E-431A-844B-CAC5C94C5B45} = {5D05713D-8A07-4460-846C-4FAAE60211D3}
+ {BA9F61DE-A8C6-4DE2-85A4-C56D5D3AEAB6} = {5D05713D-8A07-4460-846C-4FAAE60211D3}
{589D8BE1-E01B-48B0-859D-FC19DE266CAF} = {5D05713D-8A07-4460-846C-4FAAE60211D3}
{F6A57CBE-E4F4-444A-8CFA-918D1124BC93} = {4D97C07E-8EAF-45ED-A729-AC7680C2F58F}
{AA2C3AEB-53FA-4F69-8769-89DCE8221299} = {8AA6E2BC-BA18-48AE-93DA-6F694A7FA8B1}
diff --git a/src/libraries/System.Security.Principal/System.Security.Principal.sln b/src/libraries/System.Security.Principal/System.Security.Principal.sln
index 652b718276e..0794768e7e8 100644
--- a/src/libraries/System.Security.Principal/System.Security.Principal.sln
+++ b/src/libraries/System.Security.Principal/System.Security.Principal.sln
@@ -3,7 +3,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", ".
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{9C81AA4B-B9FB-42CC-9BEF-D3B3768BC0C3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{78AB5DCA-38B8-4C2B-A795-5297F724DA98}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9CC911BC-E81D-477F-9545-564CEE69A909}"
EndProject
@@ -66,24 +66,24 @@ Global
{9C81AA4B-B9FB-42CC-9BEF-D3B3768BC0C3}.Checked|x64.Build.0 = Debug|Any CPU
{9C81AA4B-B9FB-42CC-9BEF-D3B3768BC0C3}.Checked|x86.ActiveCfg = Debug|Any CPU
{9C81AA4B-B9FB-42CC-9BEF-D3B3768BC0C3}.Checked|x86.Build.0 = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Debug|x64.ActiveCfg = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Debug|x64.Build.0 = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Debug|x86.Build.0 = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Release|Any CPU.Build.0 = Release|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Release|x64.ActiveCfg = Release|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Release|x64.Build.0 = Release|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Release|x86.ActiveCfg = Release|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Release|x86.Build.0 = Release|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Checked|x64.ActiveCfg = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Checked|x64.Build.0 = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Checked|x86.ActiveCfg = Debug|Any CPU
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0}.Checked|x86.Build.0 = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Debug|x64.Build.0 = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Debug|x86.Build.0 = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Release|Any CPU.Build.0 = Release|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Release|x64.ActiveCfg = Release|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Release|x64.Build.0 = Release|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Release|x86.ActiveCfg = Release|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Release|x86.Build.0 = Release|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Checked|x64.Build.0 = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98}.Checked|x86.Build.0 = Debug|Any CPU
{9CC911BC-E81D-477F-9545-564CEE69A909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CC911BC-E81D-477F-9545-564CEE69A909}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CC911BC-E81D-477F-9545-564CEE69A909}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -146,7 +146,7 @@ Global
{45602EBE-1508-43A8-A398-1B92BD243557} = {CB111901-48ED-4097-AAC2-7E8E9A41796D}
{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51} = {CB111901-48ED-4097-AAC2-7E8E9A41796D}
{9C81AA4B-B9FB-42CC-9BEF-D3B3768BC0C3} = {3D3EBB3C-5E3D-41A9-8634-434FC0E7E4FD}
- {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0} = {3D3EBB3C-5E3D-41A9-8634-434FC0E7E4FD}
+ {78AB5DCA-38B8-4C2B-A795-5297F724DA98} = {3D3EBB3C-5E3D-41A9-8634-434FC0E7E4FD}
{9CC911BC-E81D-477F-9545-564CEE69A909} = {3D3EBB3C-5E3D-41A9-8634-434FC0E7E4FD}
{23171947-F933-47A6-9D1A-D43A186E7C43} = {DC35DE57-330D-4DE1-822D-12AEA72B1015}
EndGlobalSection
diff --git a/src/libraries/System.Security.SecureString/System.Security.SecureString.sln b/src/libraries/System.Security.SecureString/System.Security.SecureString.sln
index 143cff7e4c8..e45a46df318 100644
--- a/src/libraries/System.Security.SecureString/System.Security.SecureString.sln
+++ b/src/libraries/System.Security.SecureString/System.Security.SecureString.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{04D77C80-10A2-4773-A7E5-12D89010CC1A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9F69FA79-4228-4369-A8BA-A42C07016FB6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{948CA422-F8F3-4D7A-B2B5-310C2FD3FBF1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E1544F80-3184-4CFB-B6E4-4A12CCDD2DFE}"
EndProject
@@ -29,10 +29,10 @@ Global
{04D77C80-10A2-4773-A7E5-12D89010CC1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{04D77C80-10A2-4773-A7E5-12D89010CC1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{04D77C80-10A2-4773-A7E5-12D89010CC1A}.Release|Any CPU.Build.0 = Release|Any CPU
- {9F69FA79-4228-4369-A8BA-A42C07016FB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9F69FA79-4228-4369-A8BA-A42C07016FB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9F69FA79-4228-4369-A8BA-A42C07016FB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9F69FA79-4228-4369-A8BA-A42C07016FB6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {948CA422-F8F3-4D7A-B2B5-310C2FD3FBF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {948CA422-F8F3-4D7A-B2B5-310C2FD3FBF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {948CA422-F8F3-4D7A-B2B5-310C2FD3FBF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {948CA422-F8F3-4D7A-B2B5-310C2FD3FBF1}.Release|Any CPU.Build.0 = Release|Any CPU
{E1544F80-3184-4CFB-B6E4-4A12CCDD2DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E1544F80-3184-4CFB-B6E4-4A12CCDD2DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E1544F80-3184-4CFB-B6E4-4A12CCDD2DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{04D77C80-10A2-4773-A7E5-12D89010CC1A} = {419AD2E2-6933-4D5C-8B7E-D3E743615259}
{FB504757-0A3F-49DD-B869-CE20502D23BF} = {419AD2E2-6933-4D5C-8B7E-D3E743615259}
- {9F69FA79-4228-4369-A8BA-A42C07016FB6} = {89279530-0643-4020-90A2-17864E3BDD2E}
+ {948CA422-F8F3-4D7A-B2B5-310C2FD3FBF1} = {89279530-0643-4020-90A2-17864E3BDD2E}
{E1544F80-3184-4CFB-B6E4-4A12CCDD2DFE} = {89279530-0643-4020-90A2-17864E3BDD2E}
{CE7DA336-6577-4960-892A-1313060055BE} = {00F45A02-3D9C-4842-BDA0-DEC763F67E0C}
{32CFD1C6-A8C4-45C1-BBD8-94D07B33674C} = {F9303BF1-2B99-4F02-8700-02E820B75DAD}
diff --git a/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln b/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
index 35b73ce1273..5a4ffd1cb23 100644
--- a/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
+++ b/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{66CD0AD6-EBEE-468B-9732-A4C49EF492F4}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{169768BD-C04F-452A-BD81-4701DF9F31DE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E97F3254-DDEB-4670-9BA0-2889D20873C6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{6FB3EC19-1083-4AFD-8F7D-FB1224C965A0}"
EndProject
@@ -29,10 +29,10 @@ Global
{66CD0AD6-EBEE-468B-9732-A4C49EF492F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66CD0AD6-EBEE-468B-9732-A4C49EF492F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66CD0AD6-EBEE-468B-9732-A4C49EF492F4}.Release|Any CPU.Build.0 = Release|Any CPU
- {169768BD-C04F-452A-BD81-4701DF9F31DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {169768BD-C04F-452A-BD81-4701DF9F31DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {169768BD-C04F-452A-BD81-4701DF9F31DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {169768BD-C04F-452A-BD81-4701DF9F31DE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E97F3254-DDEB-4670-9BA0-2889D20873C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E97F3254-DDEB-4670-9BA0-2889D20873C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E97F3254-DDEB-4670-9BA0-2889D20873C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E97F3254-DDEB-4670-9BA0-2889D20873C6}.Release|Any CPU.Build.0 = Release|Any CPU
{6FB3EC19-1083-4AFD-8F7D-FB1224C965A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6FB3EC19-1083-4AFD-8F7D-FB1224C965A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6FB3EC19-1083-4AFD-8F7D-FB1224C965A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{66CD0AD6-EBEE-468B-9732-A4C49EF492F4} = {38797FCA-196F-4A36-B6E6-1861269F84A8}
{0269CAF5-9979-49A1-AC7B-61139BBBA182} = {38797FCA-196F-4A36-B6E6-1861269F84A8}
- {169768BD-C04F-452A-BD81-4701DF9F31DE} = {9727DC59-CDC4-465C-BDCF-01C3CEEC18F5}
+ {E97F3254-DDEB-4670-9BA0-2889D20873C6} = {9727DC59-CDC4-465C-BDCF-01C3CEEC18F5}
{6FB3EC19-1083-4AFD-8F7D-FB1224C965A0} = {9727DC59-CDC4-465C-BDCF-01C3CEEC18F5}
{2A7BBE91-0165-45E9-8A10-D7346C5179B6} = {93DCE9EB-54B4-45FE-BA5D-046CBAD043FA}
{02AF5461-4FB0-48B1-AD93-9D5F1022B1E9} = {5C16F923-3CC4-41E8-A22C-ED99BEB8A497}
diff --git a/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln b/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
index e31ade10995..3a6b7027f74 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
+++ b/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{9E6A5D88-E929-40DB-B2E0-A2A3F83E9117}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3EFFCBC1-32A1-405D-A90B-4142863CFAB0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{FD427105-4DFB-4DD3-A8B6-99F6F6367B9F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C386F669-744B-4DC7-9A8C-C89B5B6C1B00}"
EndProject
@@ -59,10 +59,10 @@ Global
{9E6A5D88-E929-40DB-B2E0-A2A3F83E9117}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E6A5D88-E929-40DB-B2E0-A2A3F83E9117}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E6A5D88-E929-40DB-B2E0-A2A3F83E9117}.Release|Any CPU.Build.0 = Release|Any CPU
- {3EFFCBC1-32A1-405D-A90B-4142863CFAB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3EFFCBC1-32A1-405D-A90B-4142863CFAB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3EFFCBC1-32A1-405D-A90B-4142863CFAB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3EFFCBC1-32A1-405D-A90B-4142863CFAB0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FD427105-4DFB-4DD3-A8B6-99F6F6367B9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FD427105-4DFB-4DD3-A8B6-99F6F6367B9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FD427105-4DFB-4DD3-A8B6-99F6F6367B9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FD427105-4DFB-4DD3-A8B6-99F6F6367B9F}.Release|Any CPU.Build.0 = Release|Any CPU
{C386F669-744B-4DC7-9A8C-C89B5B6C1B00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C386F669-744B-4DC7-9A8C-C89B5B6C1B00}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C386F669-744B-4DC7-9A8C-C89B5B6C1B00}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -107,7 +107,7 @@ Global
{BCA9AEAA-30EF-4B5F-B773-219F200CDB25} = {CCD3324D-2948-43FE-B2F2-B386F7EBEC09}
{FC3FBFFE-B1BC-4C1B-AC1A-8714767A940E} = {CCD3324D-2948-43FE-B2F2-B386F7EBEC09}
{8B01C9B1-1B3A-47A1-9851-CCD3721237BF} = {CCD3324D-2948-43FE-B2F2-B386F7EBEC09}
- {3EFFCBC1-32A1-405D-A90B-4142863CFAB0} = {B5D3C592-0D89-4E68-AAE9-F0411AD9C72C}
+ {FD427105-4DFB-4DD3-A8B6-99F6F6367B9F} = {B5D3C592-0D89-4E68-AAE9-F0411AD9C72C}
{C386F669-744B-4DC7-9A8C-C89B5B6C1B00} = {B5D3C592-0D89-4E68-AAE9-F0411AD9C72C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
index ff11a453d6c..9e9e5a0b2b5 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
@@ -4,7 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
<Nullable>annotations</Nullable>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
</PropertyGroup>
<ItemGroup>
<Compile Include="Helpers.cs" />
diff --git a/src/libraries/System.Speech/System.Speech.sln b/src/libraries/System.Speech/System.Speech.sln
index d6b42f3b1ad..5d528d4046a 100644
--- a/src/libraries/System.Speech/System.Speech.sln
+++ b/src/libraries/System.Speech/System.Speech.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0C0DD088-AF6A-4508-9501-399B92F815A5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6E3BD4A4-0976-48A9-BDD7-71278F9B9533}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2B432AE1-F4E7-4A9B-83FC-EB0E8F2A89D4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B6DC3B86-B125-412A-81C6-0AFECFE4A08A}"
EndProject
@@ -29,10 +29,10 @@ Global
{0C0DD088-AF6A-4508-9501-399B92F815A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C0DD088-AF6A-4508-9501-399B92F815A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0C0DD088-AF6A-4508-9501-399B92F815A5}.Release|Any CPU.Build.0 = Release|Any CPU
- {6E3BD4A4-0976-48A9-BDD7-71278F9B9533}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6E3BD4A4-0976-48A9-BDD7-71278F9B9533}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6E3BD4A4-0976-48A9-BDD7-71278F9B9533}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6E3BD4A4-0976-48A9-BDD7-71278F9B9533}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2B432AE1-F4E7-4A9B-83FC-EB0E8F2A89D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2B432AE1-F4E7-4A9B-83FC-EB0E8F2A89D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2B432AE1-F4E7-4A9B-83FC-EB0E8F2A89D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2B432AE1-F4E7-4A9B-83FC-EB0E8F2A89D4}.Release|Any CPU.Build.0 = Release|Any CPU
{B6DC3B86-B125-412A-81C6-0AFECFE4A08A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6DC3B86-B125-412A-81C6-0AFECFE4A08A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6DC3B86-B125-412A-81C6-0AFECFE4A08A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{0C0DD088-AF6A-4508-9501-399B92F815A5} = {C516711E-47BF-4337-A52D-DF1E2B29EDCB}
{E26B6065-4016-4385-9AB2-EEBE2C97CEE7} = {C516711E-47BF-4337-A52D-DF1E2B29EDCB}
- {6E3BD4A4-0976-48A9-BDD7-71278F9B9533} = {59770FE6-B1BD-4817-8664-DC33233399F5}
+ {2B432AE1-F4E7-4A9B-83FC-EB0E8F2A89D4} = {59770FE6-B1BD-4817-8664-DC33233399F5}
{B6DC3B86-B125-412A-81C6-0AFECFE4A08A} = {59770FE6-B1BD-4817-8664-DC33233399F5}
{2D839561-1430-4CA5-9695-6FC9325FF876} = {6DC14447-3322-4AAA-8FDA-3B48D4AB3A17}
{D6377882-BD90-46D6-AC60-83498E4BA2B3} = {3C2EFE00-44E6-4803-BC19-A7DB02BE7747}
diff --git a/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln b/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
index 1579a57a5de..82a14c33246 100644
--- a/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
+++ b/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E9DABA44-B5F3-4E9B-B9FC-54E558831847}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{308267C4-548F-4DED-8DF1-A5BF60BDAEDF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{98A6E39D-1A5A-48F6-885F-C4638867437B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{AF9B7A62-8184-4D20-A237-7403EE03CB2E}"
EndProject
@@ -29,10 +29,10 @@ Global
{E9DABA44-B5F3-4E9B-B9FC-54E558831847}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E9DABA44-B5F3-4E9B-B9FC-54E558831847}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E9DABA44-B5F3-4E9B-B9FC-54E558831847}.Release|Any CPU.Build.0 = Release|Any CPU
- {308267C4-548F-4DED-8DF1-A5BF60BDAEDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {308267C4-548F-4DED-8DF1-A5BF60BDAEDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {308267C4-548F-4DED-8DF1-A5BF60BDAEDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {308267C4-548F-4DED-8DF1-A5BF60BDAEDF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {98A6E39D-1A5A-48F6-885F-C4638867437B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {98A6E39D-1A5A-48F6-885F-C4638867437B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {98A6E39D-1A5A-48F6-885F-C4638867437B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {98A6E39D-1A5A-48F6-885F-C4638867437B}.Release|Any CPU.Build.0 = Release|Any CPU
{AF9B7A62-8184-4D20-A237-7403EE03CB2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF9B7A62-8184-4D20-A237-7403EE03CB2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF9B7A62-8184-4D20-A237-7403EE03CB2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{E9DABA44-B5F3-4E9B-B9FC-54E558831847} = {8CB6F00C-76CE-4F7F-9748-64DD94323A65}
{41C87552-FF98-4814-AD4E-B8E63840C8D5} = {8CB6F00C-76CE-4F7F-9748-64DD94323A65}
- {308267C4-548F-4DED-8DF1-A5BF60BDAEDF} = {74B63852-3633-4913-8CA4-54713240919C}
+ {98A6E39D-1A5A-48F6-885F-C4638867437B} = {74B63852-3633-4913-8CA4-54713240919C}
{AF9B7A62-8184-4D20-A237-7403EE03CB2E} = {74B63852-3633-4913-8CA4-54713240919C}
{C6B27183-6436-4343-A722-17AAB6A11573} = {D39B4CF8-10D4-4167-BF2D-FE1BAF33D98D}
{4F894506-769C-4219-BDE7-E1DDE6F1A35D} = {BBC725DC-56DD-4D84-B24C-93B879FCCA94}
diff --git a/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln b/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
index 83b619b68b6..94b9b0816cd 100644
--- a/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
+++ b/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{0FB90CF0-6B17-4FAB-A737-0532B5BCAADB}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A2A728AD-8A0C-40F5-87AE-B6F57175B008}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2D766334-1ABC-46EF-9065-0945A3981D99}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{2A579CCA-3FAC-46A0-A49F-F63F1DC693BB}"
EndProject
@@ -90,24 +90,24 @@ Global
{0FB90CF0-6B17-4FAB-A737-0532B5BCAADB}.Checked|x64.Build.0 = Debug|Any CPU
{0FB90CF0-6B17-4FAB-A737-0532B5BCAADB}.Checked|x86.ActiveCfg = Debug|Any CPU
{0FB90CF0-6B17-4FAB-A737-0532B5BCAADB}.Checked|x86.Build.0 = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Debug|x64.Build.0 = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Debug|x86.Build.0 = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Release|Any CPU.Build.0 = Release|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Release|x64.ActiveCfg = Release|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Release|x64.Build.0 = Release|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Release|x86.ActiveCfg = Release|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Release|x86.Build.0 = Release|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Checked|x64.ActiveCfg = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Checked|x64.Build.0 = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Checked|x86.ActiveCfg = Debug|Any CPU
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008}.Checked|x86.Build.0 = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Debug|x64.Build.0 = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Debug|x86.Build.0 = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Release|x64.ActiveCfg = Release|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Release|x64.Build.0 = Release|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Release|x86.ActiveCfg = Release|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Release|x86.Build.0 = Release|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Checked|x64.Build.0 = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {2D766334-1ABC-46EF-9065-0945A3981D99}.Checked|x86.Build.0 = Debug|Any CPU
{2A579CCA-3FAC-46A0-A49F-F63F1DC693BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2A579CCA-3FAC-46A0-A49F-F63F1DC693BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A579CCA-3FAC-46A0-A49F-F63F1DC693BB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{CC6D3524-D6C8-468B-B908-CE746C1DB175} = {6A521BB6-5A53-4871-8EF7-15C4FCF0B416}
{777B4928-6EE5-42D2-8F95-E43EB027D14E} = {6A521BB6-5A53-4871-8EF7-15C4FCF0B416}
{0FB90CF0-6B17-4FAB-A737-0532B5BCAADB} = {6906BA55-F0A0-4E71-942D-E24C6C85A353}
- {A2A728AD-8A0C-40F5-87AE-B6F57175B008} = {6906BA55-F0A0-4E71-942D-E24C6C85A353}
+ {2D766334-1ABC-46EF-9065-0945A3981D99} = {6906BA55-F0A0-4E71-942D-E24C6C85A353}
{2A579CCA-3FAC-46A0-A49F-F63F1DC693BB} = {6906BA55-F0A0-4E71-942D-E24C6C85A353}
{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C} = {F4F19285-4785-496C-8F6C-579249EAA5BB}
EndGlobalSection
diff --git a/src/libraries/System.Text.Encoding/System.Text.Encoding.sln b/src/libraries/System.Text.Encoding/System.Text.Encoding.sln
index f3e28ebe978..4e55b7ed9b2 100644
--- a/src/libraries/System.Text.Encoding/System.Text.Encoding.sln
+++ b/src/libraries/System.Text.Encoding/System.Text.Encoding.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "..\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{604213DB-0DCD-41AC-A244-502BDBA57CB5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AD6E4919-0D0C-4D59-8789-25FB5F666288}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{108A17C9-3550-4FBD-86AB-32C771B300B7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{084FE3C6-4130-4F8E-AB6A-EB0560550664}"
EndProject
@@ -150,24 +150,24 @@ Global
{604213DB-0DCD-41AC-A244-502BDBA57CB5}.Checked|x64.Build.0 = Debug|Any CPU
{604213DB-0DCD-41AC-A244-502BDBA57CB5}.Checked|x86.ActiveCfg = Debug|Any CPU
{604213DB-0DCD-41AC-A244-502BDBA57CB5}.Checked|x86.Build.0 = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Debug|x64.ActiveCfg = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Debug|x64.Build.0 = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Debug|x86.ActiveCfg = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Debug|x86.Build.0 = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Release|Any CPU.Build.0 = Release|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Release|x64.ActiveCfg = Release|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Release|x64.Build.0 = Release|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Release|x86.ActiveCfg = Release|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Release|x86.Build.0 = Release|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Checked|x64.ActiveCfg = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Checked|x64.Build.0 = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Checked|x86.ActiveCfg = Debug|Any CPU
- {AD6E4919-0D0C-4D59-8789-25FB5F666288}.Checked|x86.Build.0 = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Debug|x64.Build.0 = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Debug|x86.Build.0 = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Release|x64.ActiveCfg = Release|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Release|x64.Build.0 = Release|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Release|x86.ActiveCfg = Release|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Release|x86.Build.0 = Release|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Checked|x64.Build.0 = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {108A17C9-3550-4FBD-86AB-32C771B300B7}.Checked|x86.Build.0 = Debug|Any CPU
{084FE3C6-4130-4F8E-AB6A-EB0560550664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{084FE3C6-4130-4F8E-AB6A-EB0560550664}.Debug|Any CPU.Build.0 = Debug|Any CPU
{084FE3C6-4130-4F8E-AB6A-EB0560550664}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -254,7 +254,7 @@ Global
{657AE296-9F0B-4D8C-B11B-BF454EF90E7C} = {F3E9EF8A-43E5-433A-84EA-EA5409091019}
{B4D27B82-8D9C-4699-9E37-06796D9981EB} = {F3E9EF8A-43E5-433A-84EA-EA5409091019}
{604213DB-0DCD-41AC-A244-502BDBA57CB5} = {81CF2B5E-4EF1-404B-9CA7-80197E1A7523}
- {AD6E4919-0D0C-4D59-8789-25FB5F666288} = {81CF2B5E-4EF1-404B-9CA7-80197E1A7523}
+ {108A17C9-3550-4FBD-86AB-32C771B300B7} = {81CF2B5E-4EF1-404B-9CA7-80197E1A7523}
{084FE3C6-4130-4F8E-AB6A-EB0560550664} = {81CF2B5E-4EF1-404B-9CA7-80197E1A7523}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln b/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
index b13369a02d6..27db56350d9 100644
--- a/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
+++ b/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{43450381-504E-4603-BF5D-99CCAC2B8A26}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3EDC0167-FF3A-494A-8D5C-DAC18B9F2F52}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{4D066E4F-1EF9-46CE-AECC-8D5252E41370}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1C02A4C6-2AEB-46E3-B1D3-84EE2153671A}"
EndProject
@@ -29,10 +29,10 @@ Global
{43450381-504E-4603-BF5D-99CCAC2B8A26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43450381-504E-4603-BF5D-99CCAC2B8A26}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43450381-504E-4603-BF5D-99CCAC2B8A26}.Release|Any CPU.Build.0 = Release|Any CPU
- {3EDC0167-FF3A-494A-8D5C-DAC18B9F2F52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3EDC0167-FF3A-494A-8D5C-DAC18B9F2F52}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3EDC0167-FF3A-494A-8D5C-DAC18B9F2F52}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3EDC0167-FF3A-494A-8D5C-DAC18B9F2F52}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4D066E4F-1EF9-46CE-AECC-8D5252E41370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4D066E4F-1EF9-46CE-AECC-8D5252E41370}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4D066E4F-1EF9-46CE-AECC-8D5252E41370}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4D066E4F-1EF9-46CE-AECC-8D5252E41370}.Release|Any CPU.Build.0 = Release|Any CPU
{1C02A4C6-2AEB-46E3-B1D3-84EE2153671A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C02A4C6-2AEB-46E3-B1D3-84EE2153671A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C02A4C6-2AEB-46E3-B1D3-84EE2153671A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{43450381-504E-4603-BF5D-99CCAC2B8A26} = {9DE01EE3-CDAF-4B6E-B778-B5B5D83A9214}
{A15B95D2-1DDF-47C9-A92F-03FD5DB720C9} = {9DE01EE3-CDAF-4B6E-B778-B5B5D83A9214}
- {3EDC0167-FF3A-494A-8D5C-DAC18B9F2F52} = {BAAA946F-C5D8-483D-9610-F229125AFEFC}
+ {4D066E4F-1EF9-46CE-AECC-8D5252E41370} = {BAAA946F-C5D8-483D-9610-F229125AFEFC}
{1C02A4C6-2AEB-46E3-B1D3-84EE2153671A} = {BAAA946F-C5D8-483D-9610-F229125AFEFC}
{635D1626-6D21-4DAB-BFEF-F5F13261967B} = {2E59B32B-BED2-4E24-9055-491C8DF351FB}
{9A8107A2-1AC1-44D5-A4D4-D8EB52C3CB18} = {C88B420B-1505-4CB6-AA13-263AD2D66D93}
diff --git a/src/libraries/System.Text.Json/System.Text.Json.sln b/src/libraries/System.Text.Json/System.Text.Json.sln
index 5bcde909331..e96de55b7a3 100644
--- a/src/libraries/System.Text.Json/System.Text.Json.sln
+++ b/src/libraries/System.Text.Json/System.Text.Json.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "..\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "..\System.IO.Pipelines\src\System.IO.Pipelines.csproj", "{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{06F41FE5-B7FC-424B-A721-8CFDA35B95B5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B815304D-502E-402C-ACE1-878DB4985CCC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{E4B72517-C694-486A-950E-6AB03C651FDC}"
EndProject
@@ -87,10 +87,10 @@ Global
{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}.Release|Any CPU.Build.0 = Release|Any CPU
- {06F41FE5-B7FC-424B-A721-8CFDA35B95B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {06F41FE5-B7FC-424B-A721-8CFDA35B95B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {06F41FE5-B7FC-424B-A721-8CFDA35B95B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {06F41FE5-B7FC-424B-A721-8CFDA35B95B5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B815304D-502E-402C-ACE1-878DB4985CCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B815304D-502E-402C-ACE1-878DB4985CCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B815304D-502E-402C-ACE1-878DB4985CCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B815304D-502E-402C-ACE1-878DB4985CCC}.Release|Any CPU.Build.0 = Release|Any CPU
{E4B72517-C694-486A-950E-6AB03C651FDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4B72517-C694-486A-950E-6AB03C651FDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4B72517-C694-486A-950E-6AB03C651FDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -175,7 +175,7 @@ Global
{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1}
{9BCCDA15-8907-4AE3-8871-2F17775DDE4C} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1}
{1285FF43-F491-4BE0-B92C-37DA689CBD4B} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1}
- {06F41FE5-B7FC-424B-A721-8CFDA35B95B5} = {F254F143-4704-4432-9995-20D87FA8BF8D}
+ {B815304D-502E-402C-ACE1-878DB4985CCC} = {F254F143-4704-4432-9995-20D87FA8BF8D}
{E4B72517-C694-486A-950E-6AB03C651FDC} = {F254F143-4704-4432-9995-20D87FA8BF8D}
{04AEB008-EE4F-44DE-A361-2DBD2D0FD6A4} = {F254F143-4704-4432-9995-20D87FA8BF8D}
{6485EED4-C313-4551-9865-8ADCED603629} = {F254F143-4704-4432-9995-20D87FA8BF8D}
diff --git a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
index b5ffc511c31..3001e042b7a 100644
--- a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
+++ b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{63551298-BFD4-43FC-8465-AC454228B83C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{08F0E5F4-BBD5-45CC-BB12-BA37A83AD7B6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{19F5ED62-25AE-462C-B168-CA72F078FFA4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{77CDA838-6489-4816-8847-DE2C7F5E1DCE}"
EndProject
@@ -33,10 +33,10 @@ Global
{63551298-BFD4-43FC-8465-AC454228B83C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{63551298-BFD4-43FC-8465-AC454228B83C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{63551298-BFD4-43FC-8465-AC454228B83C}.Release|Any CPU.Build.0 = Release|Any CPU
- {08F0E5F4-BBD5-45CC-BB12-BA37A83AD7B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {08F0E5F4-BBD5-45CC-BB12-BA37A83AD7B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {08F0E5F4-BBD5-45CC-BB12-BA37A83AD7B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {08F0E5F4-BBD5-45CC-BB12-BA37A83AD7B6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {19F5ED62-25AE-462C-B168-CA72F078FFA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {19F5ED62-25AE-462C-B168-CA72F078FFA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {19F5ED62-25AE-462C-B168-CA72F078FFA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {19F5ED62-25AE-462C-B168-CA72F078FFA4}.Release|Any CPU.Build.0 = Release|Any CPU
{77CDA838-6489-4816-8847-DE2C7F5E1DCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{77CDA838-6489-4816-8847-DE2C7F5E1DCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{77CDA838-6489-4816-8847-DE2C7F5E1DCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -69,7 +69,7 @@ Global
{63551298-BFD4-43FC-8465-AC454228B83C} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78}
{8EE1A7C4-3630-4900-8976-9B3ADAFF10DC} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78}
{A86931EC-34DC-40A8-BD8C-F5E13BDBA903} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78}
- {08F0E5F4-BBD5-45CC-BB12-BA37A83AD7B6} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC}
+ {19F5ED62-25AE-462C-B168-CA72F078FFA4} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC}
{77CDA838-6489-4816-8847-DE2C7F5E1DCE} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC}
{3699C8E2-C354-4AED-81DC-ECBAC3EFEB4B} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC}
{C043B00D-8662-43E4-9E87-8BB317059111} = {15319A22-BC91-407B-A795-334DD05C82A0}
diff --git a/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln b/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
index 511b454e969..634f87f06ae 100644
--- a/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
+++ b/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{75A28A51-74DA-451C-BF9B-D0167E2CC3DE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{9BA0DBB0-99CF-4DEE-A43F-2B49854798AA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{96AF90CB-B031-4F19-A6F2-957715703954}"
EndProject
@@ -29,10 +29,10 @@ Global
{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097}.Release|Any CPU.Build.0 = Release|Any CPU
- {75A28A51-74DA-451C-BF9B-D0167E2CC3DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {75A28A51-74DA-451C-BF9B-D0167E2CC3DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {75A28A51-74DA-451C-BF9B-D0167E2CC3DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {75A28A51-74DA-451C-BF9B-D0167E2CC3DE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9BA0DBB0-99CF-4DEE-A43F-2B49854798AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9BA0DBB0-99CF-4DEE-A43F-2B49854798AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9BA0DBB0-99CF-4DEE-A43F-2B49854798AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9BA0DBB0-99CF-4DEE-A43F-2B49854798AA}.Release|Any CPU.Build.0 = Release|Any CPU
{96AF90CB-B031-4F19-A6F2-957715703954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{96AF90CB-B031-4F19-A6F2-957715703954}.Debug|Any CPU.Build.0 = Debug|Any CPU
{96AF90CB-B031-4F19-A6F2-957715703954}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097} = {5ED4F157-B780-4295-9D2F-1DE86DBCDA24}
{66D93328-0A8C-44AD-923B-AD3EB69A9518} = {5ED4F157-B780-4295-9D2F-1DE86DBCDA24}
- {75A28A51-74DA-451C-BF9B-D0167E2CC3DE} = {C7B6A687-7D71-47EC-AC21-8B8DEA7EF016}
+ {9BA0DBB0-99CF-4DEE-A43F-2B49854798AA} = {C7B6A687-7D71-47EC-AC21-8B8DEA7EF016}
{96AF90CB-B031-4F19-A6F2-957715703954} = {C7B6A687-7D71-47EC-AC21-8B8DEA7EF016}
{6EA32BE1-8B5E-4807-B641-E7556C1E2C9D} = {D7D1A40A-E3E6-45DF-82CF-5BEE62109C70}
{6A444824-8479-4DB5-8DCA-9F50353ADE29} = {8F3D0B8C-8814-4A4C-9663-837D46DA0AC6}
diff --git a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
index b1f9c19d5c4..3c0196874ec 100644
--- a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
+++ b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C1F10802-5F76-472B-B164-C1D181DB5EBC}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BE5DFFDD-D344-42F8-AE01-EBD893FB3B2F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9158C7E3-284E-4D6F-BA23-B7534683E265}"
EndProject
@@ -29,10 +29,10 @@ Global
{C1F10802-5F76-472B-B164-C1D181DB5EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C1F10802-5F76-472B-B164-C1D181DB5EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C1F10802-5F76-472B-B164-C1D181DB5EBC}.Release|Any CPU.Build.0 = Release|Any CPU
- {BE5DFFDD-D344-42F8-AE01-EBD893FB3B2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BE5DFFDD-D344-42F8-AE01-EBD893FB3B2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BE5DFFDD-D344-42F8-AE01-EBD893FB3B2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BE5DFFDD-D344-42F8-AE01-EBD893FB3B2F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60}.Release|Any CPU.Build.0 = Release|Any CPU
{9158C7E3-284E-4D6F-BA23-B7534683E265}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9158C7E3-284E-4D6F-BA23-B7534683E265}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9158C7E3-284E-4D6F-BA23-B7534683E265}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{C1F10802-5F76-472B-B164-C1D181DB5EBC} = {07CE01C8-BDC8-4CED-AA33-6F3B35935CB6}
{845BFFC3-14F2-402E-81E5-B487D41B7CD9} = {07CE01C8-BDC8-4CED-AA33-6F3B35935CB6}
- {BE5DFFDD-D344-42F8-AE01-EBD893FB3B2F} = {42E20B4D-6489-4096-8DC3-A0C20D19B1D6}
+ {6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60} = {42E20B4D-6489-4096-8DC3-A0C20D19B1D6}
{9158C7E3-284E-4D6F-BA23-B7534683E265} = {42E20B4D-6489-4096-8DC3-A0C20D19B1D6}
{E427C88B-655E-43F9-A0C0-AA54D01BDBDF} = {F69B62DE-61AD-4978-81C4-C095B62B5B04}
{4CFA1610-00D7-4651-82C8-A7504C475837} = {D3FF5D0E-208E-408F-97AD-C81EB31BB115}
diff --git a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
index 9a3c7a571a2..791be452625 100644
--- a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
+++ b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{8BAAF37B-C3C1-4DED-A89A-5513AE866360}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B3314A3F-0044-4266-8A1D-62759FE403DE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C84846A6-ACFA-4145-AF76-AA56A5AC89FC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{8B4BE458-0DE2-42A8-B7A2-3C82F21BAB23}"
EndProject
@@ -90,24 +90,24 @@ Global
{8BAAF37B-C3C1-4DED-A89A-5513AE866360}.Checked|x64.Build.0 = Debug|Any CPU
{8BAAF37B-C3C1-4DED-A89A-5513AE866360}.Checked|x86.ActiveCfg = Debug|Any CPU
{8BAAF37B-C3C1-4DED-A89A-5513AE866360}.Checked|x86.Build.0 = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Debug|x64.ActiveCfg = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Debug|x64.Build.0 = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Debug|x86.ActiveCfg = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Debug|x86.Build.0 = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Release|Any CPU.Build.0 = Release|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Release|x64.ActiveCfg = Release|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Release|x64.Build.0 = Release|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Release|x86.ActiveCfg = Release|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Release|x86.Build.0 = Release|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Checked|x64.ActiveCfg = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Checked|x64.Build.0 = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Checked|x86.ActiveCfg = Debug|Any CPU
- {B3314A3F-0044-4266-8A1D-62759FE403DE}.Checked|x86.Build.0 = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Debug|x64.Build.0 = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Debug|x86.Build.0 = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Release|x64.ActiveCfg = Release|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Release|x64.Build.0 = Release|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Release|x86.ActiveCfg = Release|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Release|x86.Build.0 = Release|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Checked|x64.Build.0 = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC}.Checked|x86.Build.0 = Debug|Any CPU
{8B4BE458-0DE2-42A8-B7A2-3C82F21BAB23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8B4BE458-0DE2-42A8-B7A2-3C82F21BAB23}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B4BE458-0DE2-42A8-B7A2-3C82F21BAB23}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F} = {8B1F1ACE-FD0A-4083-8DE6-8148C541A2CA}
{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1} = {8B1F1ACE-FD0A-4083-8DE6-8148C541A2CA}
{8BAAF37B-C3C1-4DED-A89A-5513AE866360} = {D07DC3DB-723F-41C6-99A0-56F395D4D055}
- {B3314A3F-0044-4266-8A1D-62759FE403DE} = {D07DC3DB-723F-41C6-99A0-56F395D4D055}
+ {C84846A6-ACFA-4145-AF76-AA56A5AC89FC} = {D07DC3DB-723F-41C6-99A0-56F395D4D055}
{8B4BE458-0DE2-42A8-B7A2-3C82F21BAB23} = {D07DC3DB-723F-41C6-99A0-56F395D4D055}
{05F39036-EF46-438F-8033-084B5C14832B} = {1CC21763-DACE-400F-808F-7B9DCF90DCBA}
EndGlobalSection
diff --git a/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln b/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln
index 9132bca5733..780d94f715c 100644
--- a/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln
+++ b/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfac
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1E52F495-578C-4FDB-86DD-87EAAE0A0BE7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{394FA814-CF72-447D-AAE1-1B92CD63205D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{25495BDC-0614-4FAC-B6EA-DF3F0E35A871}"
EndProject
@@ -41,10 +41,10 @@ Global
{F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}.Release|Any CPU.Build.0 = Release|Any CPU
- {1E52F495-578C-4FDB-86DD-87EAAE0A0BE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1E52F495-578C-4FDB-86DD-87EAAE0A0BE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1E52F495-578C-4FDB-86DD-87EAAE0A0BE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1E52F495-578C-4FDB-86DD-87EAAE0A0BE7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {394FA814-CF72-447D-AAE1-1B92CD63205D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {394FA814-CF72-447D-AAE1-1B92CD63205D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {394FA814-CF72-447D-AAE1-1B92CD63205D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {394FA814-CF72-447D-AAE1-1B92CD63205D}.Release|Any CPU.Build.0 = Release|Any CPU
{25495BDC-0614-4FAC-B6EA-DF3F0E35A871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25495BDC-0614-4FAC-B6EA-DF3F0E35A871}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25495BDC-0614-4FAC-B6EA-DF3F0E35A871}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +72,7 @@ Global
{FD274A80-0D68-48A0-9AC7-279C9E69BC63} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB}
{F59F4FD7-EA00-47EA-A09A-6F76CB079F9B} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}
{CD96AFE9-0F7F-42FA-BBDA-F57EDCBB4609} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}
- {1E52F495-578C-4FDB-86DD-87EAAE0A0BE7} = {399BE36D-F2D9-420A-AA09-455D4BF52057}
+ {394FA814-CF72-447D-AAE1-1B92CD63205D} = {399BE36D-F2D9-420A-AA09-455D4BF52057}
{25495BDC-0614-4FAC-B6EA-DF3F0E35A871} = {399BE36D-F2D9-420A-AA09-455D4BF52057}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln b/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
index cc6ec6ae15f..ff79a32ac42 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
+++ b/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{48428161-C841-43D4-8BD3-195A3D5C36C5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4EFCE35C-DCDF-457D-AAAA-A3768F274405}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{986667FC-4DA5-4496-B998-7DEB9879B180}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C4865002-095A-4B99-A737-216DC112ACA4}"
EndProject
@@ -29,10 +29,10 @@ Global
{48428161-C841-43D4-8BD3-195A3D5C36C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{48428161-C841-43D4-8BD3-195A3D5C36C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{48428161-C841-43D4-8BD3-195A3D5C36C5}.Release|Any CPU.Build.0 = Release|Any CPU
- {4EFCE35C-DCDF-457D-AAAA-A3768F274405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4EFCE35C-DCDF-457D-AAAA-A3768F274405}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4EFCE35C-DCDF-457D-AAAA-A3768F274405}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4EFCE35C-DCDF-457D-AAAA-A3768F274405}.Release|Any CPU.Build.0 = Release|Any CPU
+ {986667FC-4DA5-4496-B998-7DEB9879B180}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {986667FC-4DA5-4496-B998-7DEB9879B180}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {986667FC-4DA5-4496-B998-7DEB9879B180}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {986667FC-4DA5-4496-B998-7DEB9879B180}.Release|Any CPU.Build.0 = Release|Any CPU
{C4865002-095A-4B99-A737-216DC112ACA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C4865002-095A-4B99-A737-216DC112ACA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4865002-095A-4B99-A737-216DC112ACA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{48428161-C841-43D4-8BD3-195A3D5C36C5} = {D7C6E667-E868-423C-883D-CBDE73BFF66E}
{51B191E6-C503-4949-8AD0-CF338FE13ADB} = {D7C6E667-E868-423C-883D-CBDE73BFF66E}
- {4EFCE35C-DCDF-457D-AAAA-A3768F274405} = {AA3208A1-2A91-46D3-B09C-1A9CCF90235E}
+ {986667FC-4DA5-4496-B998-7DEB9879B180} = {AA3208A1-2A91-46D3-B09C-1A9CCF90235E}
{C4865002-095A-4B99-A737-216DC112ACA4} = {AA3208A1-2A91-46D3-B09C-1A9CCF90235E}
{BD042162-B4E2-45AC-8225-699F25478852} = {E6ED6A93-5971-4E87-972C-23E80F6E0CFC}
{EA4AFF05-8124-4D15-A7A3-C731C21728BB} = {D4D4FFCB-0DAF-4CDC-8945-7B31D2197D66}
diff --git a/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln b/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
index 64b415c2ddb..de123ad0a56 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
+++ b/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{5650548E-4175-4BD3-B23C-11FCB86AD2EF}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{18B4A117-5F89-4AF3-836F-A2D13B31D61E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{197382D6-CA6C-4F33-BFE5-0902CE75876E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{8D2E0DCC-477B-44A4-A64B-775E6D024CD6}"
EndProject
@@ -90,24 +90,24 @@ Global
{5650548E-4175-4BD3-B23C-11FCB86AD2EF}.Checked|x64.Build.0 = Debug|Any CPU
{5650548E-4175-4BD3-B23C-11FCB86AD2EF}.Checked|x86.ActiveCfg = Debug|Any CPU
{5650548E-4175-4BD3-B23C-11FCB86AD2EF}.Checked|x86.Build.0 = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Debug|x64.Build.0 = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Debug|x86.Build.0 = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Release|Any CPU.Build.0 = Release|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Release|x64.ActiveCfg = Release|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Release|x64.Build.0 = Release|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Release|x86.ActiveCfg = Release|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Release|x86.Build.0 = Release|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Checked|x64.ActiveCfg = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Checked|x64.Build.0 = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Checked|x86.ActiveCfg = Debug|Any CPU
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E}.Checked|x86.Build.0 = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Debug|x64.Build.0 = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Debug|x86.Build.0 = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Release|x64.ActiveCfg = Release|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Release|x64.Build.0 = Release|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Release|x86.ActiveCfg = Release|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Release|x86.Build.0 = Release|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Checked|x64.Build.0 = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E}.Checked|x86.Build.0 = Debug|Any CPU
{8D2E0DCC-477B-44A4-A64B-775E6D024CD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D2E0DCC-477B-44A4-A64B-775E6D024CD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D2E0DCC-477B-44A4-A64B-775E6D024CD6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{FFB40D04-17A5-4F9B-BD47-994E5616ABD9} = {30ACA65A-DBD9-46CD-9DA4-D7894118EBF8}
{AE779AC7-EC2C-42BE-8E59-A2716799E098} = {30ACA65A-DBD9-46CD-9DA4-D7894118EBF8}
{5650548E-4175-4BD3-B23C-11FCB86AD2EF} = {158053CD-684A-4AF7-9DC4-5ADEFC3E79AC}
- {18B4A117-5F89-4AF3-836F-A2D13B31D61E} = {158053CD-684A-4AF7-9DC4-5ADEFC3E79AC}
+ {197382D6-CA6C-4F33-BFE5-0902CE75876E} = {158053CD-684A-4AF7-9DC4-5ADEFC3E79AC}
{8D2E0DCC-477B-44A4-A64B-775E6D024CD6} = {158053CD-684A-4AF7-9DC4-5ADEFC3E79AC}
{8E73F6BD-A0A2-4C98-B4E3-42391B135943} = {EC5157A4-9B43-4FDC-8FEF-8546A6423844}
EndGlobalSection
diff --git a/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln b/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
index a1a0bd8e6ea..f003deff08b 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
+++ b/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B3656D79-6414-4037-BBF7-B112DE133703}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{42742991-84A8-4468-ABE1-BE9523876F5C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{135CC435-FD9E-4CE9-AFB9-593B105FBAFC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{D0267433-C793-4450-94A0-1750388CE9CB}"
EndProject
@@ -29,10 +29,10 @@ Global
{B3656D79-6414-4037-BBF7-B112DE133703}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B3656D79-6414-4037-BBF7-B112DE133703}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B3656D79-6414-4037-BBF7-B112DE133703}.Release|Any CPU.Build.0 = Release|Any CPU
- {42742991-84A8-4468-ABE1-BE9523876F5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {42742991-84A8-4468-ABE1-BE9523876F5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {42742991-84A8-4468-ABE1-BE9523876F5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {42742991-84A8-4468-ABE1-BE9523876F5C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {135CC435-FD9E-4CE9-AFB9-593B105FBAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {135CC435-FD9E-4CE9-AFB9-593B105FBAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {135CC435-FD9E-4CE9-AFB9-593B105FBAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {135CC435-FD9E-4CE9-AFB9-593B105FBAFC}.Release|Any CPU.Build.0 = Release|Any CPU
{D0267433-C793-4450-94A0-1750388CE9CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0267433-C793-4450-94A0-1750388CE9CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0267433-C793-4450-94A0-1750388CE9CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{B3656D79-6414-4037-BBF7-B112DE133703} = {1BA41F95-8D9C-4C12-8A3A-9D31B27566E8}
{87B76C5B-3A28-455A-AFCC-921FC3615135} = {1BA41F95-8D9C-4C12-8A3A-9D31B27566E8}
- {42742991-84A8-4468-ABE1-BE9523876F5C} = {6D758B5C-C40A-4179-898E-B459165BF692}
+ {135CC435-FD9E-4CE9-AFB9-593B105FBAFC} = {6D758B5C-C40A-4179-898E-B459165BF692}
{D0267433-C793-4450-94A0-1750388CE9CB} = {6D758B5C-C40A-4179-898E-B459165BF692}
{C757F14B-E6F5-4B89-81A7-4D8D4F3A7F60} = {FBC5E558-FC17-4C58-B7F7-798E7CD58448}
{8F1FE81C-C15D-459A-8758-8B0853078EA7} = {A17071C3-99D6-40FF-947C-A15A9695FA91}
diff --git a/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln b/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln
index a6779743657..944cf041453 100644
--- a/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln
+++ b/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{A0477DE6-08C7-4793-A8B6-9974F2675AC7}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{261E65AA-FCED-4702-8FDE-694E2B029C23}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{879D329A-C5F7-46DE-887F-12928E015C8C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{25E8CA91-84A5-4917-90A2-5E077734B0B7}"
EndProject
@@ -90,24 +90,24 @@ Global
{A0477DE6-08C7-4793-A8B6-9974F2675AC7}.Checked|x64.Build.0 = Debug|Any CPU
{A0477DE6-08C7-4793-A8B6-9974F2675AC7}.Checked|x86.ActiveCfg = Debug|Any CPU
{A0477DE6-08C7-4793-A8B6-9974F2675AC7}.Checked|x86.Build.0 = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Debug|x64.ActiveCfg = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Debug|x64.Build.0 = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Debug|x86.ActiveCfg = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Debug|x86.Build.0 = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Release|Any CPU.Build.0 = Release|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Release|x64.ActiveCfg = Release|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Release|x64.Build.0 = Release|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Release|x86.ActiveCfg = Release|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Release|x86.Build.0 = Release|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Checked|x64.ActiveCfg = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Checked|x64.Build.0 = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Checked|x86.ActiveCfg = Debug|Any CPU
- {261E65AA-FCED-4702-8FDE-694E2B029C23}.Checked|x86.Build.0 = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Debug|x64.Build.0 = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Debug|x86.Build.0 = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Release|x64.ActiveCfg = Release|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Release|x64.Build.0 = Release|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Release|x86.ActiveCfg = Release|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Release|x86.Build.0 = Release|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Checked|x64.Build.0 = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {879D329A-C5F7-46DE-887F-12928E015C8C}.Checked|x86.Build.0 = Debug|Any CPU
{25E8CA91-84A5-4917-90A2-5E077734B0B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25E8CA91-84A5-4917-90A2-5E077734B0B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25E8CA91-84A5-4917-90A2-5E077734B0B7}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7} = {6C2B5085-E5A0-4732-90D5-BA35E9702990}
{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8} = {6C2B5085-E5A0-4732-90D5-BA35E9702990}
{A0477DE6-08C7-4793-A8B6-9974F2675AC7} = {BC4D3352-CF0C-44FA-8829-2845DEA0CC75}
- {261E65AA-FCED-4702-8FDE-694E2B029C23} = {BC4D3352-CF0C-44FA-8829-2845DEA0CC75}
+ {879D329A-C5F7-46DE-887F-12928E015C8C} = {BC4D3352-CF0C-44FA-8829-2845DEA0CC75}
{25E8CA91-84A5-4917-90A2-5E077734B0B7} = {BC4D3352-CF0C-44FA-8829-2845DEA0CC75}
{8C762956-7AB1-4806-9144-5E13771CB22B} = {AF511BE2-5550-4D73-921E-500E98B26AA0}
EndGlobalSection
diff --git a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
index cfc23c37a93..e38f2afab13 100644
--- a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
+++ b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{566DB44F-5EF1-4421-B09A-F202E76935A9}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B61C780A-7952-4981-842B-4771E7724F63}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{678A6F6C-BFF2-46BC-B512-745F32C229F6}"
EndProject
@@ -96,24 +96,24 @@ Global
{566DB44F-5EF1-4421-B09A-F202E76935A9}.Checked|x64.Build.0 = Debug|Any CPU
{566DB44F-5EF1-4421-B09A-F202E76935A9}.Checked|x86.ActiveCfg = Debug|Any CPU
{566DB44F-5EF1-4421-B09A-F202E76935A9}.Checked|x86.Build.0 = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Debug|x64.Build.0 = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Debug|x86.Build.0 = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Release|Any CPU.Build.0 = Release|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Release|x64.ActiveCfg = Release|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Release|x64.Build.0 = Release|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Release|x86.ActiveCfg = Release|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Release|x86.Build.0 = Release|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Checked|x64.ActiveCfg = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Checked|x64.Build.0 = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Checked|x86.ActiveCfg = Debug|Any CPU
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}.Checked|x86.Build.0 = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Debug|x64.Build.0 = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Debug|x86.Build.0 = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Release|x64.ActiveCfg = Release|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Release|x64.Build.0 = Release|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Release|x86.ActiveCfg = Release|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Release|x86.Build.0 = Release|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Checked|x64.Build.0 = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {B61C780A-7952-4981-842B-4771E7724F63}.Checked|x86.Build.0 = Debug|Any CPU
{678A6F6C-BFF2-46BC-B512-745F32C229F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{678A6F6C-BFF2-46BC-B512-745F32C229F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{678A6F6C-BFF2-46BC-B512-745F32C229F6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -253,7 +253,7 @@ Global
{33684F81-6E4B-4E90-A3B5-7C1BC02FF573} = {73AA6FCA-8FDC-41AA-8539-91562296190B}
{5093FB10-520B-45A1-942B-82AC0BC4FB3F} = {73AA6FCA-8FDC-41AA-8539-91562296190B}
{566DB44F-5EF1-4421-B09A-F202E76935A9} = {5B2563E3-FF5B-4DAD-A3B0-5E99B5054508}
- {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C} = {5B2563E3-FF5B-4DAD-A3B0-5E99B5054508}
+ {B61C780A-7952-4981-842B-4771E7724F63} = {5B2563E3-FF5B-4DAD-A3B0-5E99B5054508}
{678A6F6C-BFF2-46BC-B512-745F32C229F6} = {5B2563E3-FF5B-4DAD-A3B0-5E99B5054508}
{AD5C441F-05EA-452D-B3D2-514B304AA673} = {CC8272C5-AC82-4A51-B88C-018FF4284B25}
EndGlobalSection
diff --git a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
index 74812a0dc30..95dc8904eda 100644
--- a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
+++ b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{54E0AB0F-EB35-49AB-9A38-7C09FD7EC373}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1122A1B3-231D-4897-A86A-89433AAC93DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{3A5BA59D-C1B6-492F-BF2C-FDE2C274E9B3}"
EndProject
@@ -90,24 +90,24 @@ Global
{54E0AB0F-EB35-49AB-9A38-7C09FD7EC373}.Checked|x64.Build.0 = Debug|Any CPU
{54E0AB0F-EB35-49AB-9A38-7C09FD7EC373}.Checked|x86.ActiveCfg = Debug|Any CPU
{54E0AB0F-EB35-49AB-9A38-7C09FD7EC373}.Checked|x86.Build.0 = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Debug|x64.ActiveCfg = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Debug|x64.Build.0 = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Debug|x86.Build.0 = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Release|Any CPU.Build.0 = Release|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Release|x64.ActiveCfg = Release|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Release|x64.Build.0 = Release|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Release|x86.ActiveCfg = Release|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Release|x86.Build.0 = Release|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Checked|x64.ActiveCfg = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Checked|x64.Build.0 = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Checked|x86.ActiveCfg = Debug|Any CPU
- {1122A1B3-231D-4897-A86A-89433AAC93DF}.Checked|x86.Build.0 = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Debug|x64.Build.0 = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Debug|x86.Build.0 = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Release|x64.ActiveCfg = Release|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Release|x64.Build.0 = Release|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Release|x86.ActiveCfg = Release|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Release|x86.Build.0 = Release|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Checked|x64.Build.0 = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0}.Checked|x86.Build.0 = Debug|Any CPU
{3A5BA59D-C1B6-492F-BF2C-FDE2C274E9B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3A5BA59D-C1B6-492F-BF2C-FDE2C274E9B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A5BA59D-C1B6-492F-BF2C-FDE2C274E9B3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{CD477FC8-AF27-46A2-A451-4A2D4C11600D} = {DB513386-C3B1-4891-92E1-1BE5D38562DC}
{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75} = {DB513386-C3B1-4891-92E1-1BE5D38562DC}
{54E0AB0F-EB35-49AB-9A38-7C09FD7EC373} = {1445280F-1F07-45C3-93BC-D4025720B5FE}
- {1122A1B3-231D-4897-A86A-89433AAC93DF} = {1445280F-1F07-45C3-93BC-D4025720B5FE}
+ {B5732A3E-15DB-4BAA-A44C-41A7C29C68F0} = {1445280F-1F07-45C3-93BC-D4025720B5FE}
{3A5BA59D-C1B6-492F-BF2C-FDE2C274E9B3} = {1445280F-1F07-45C3-93BC-D4025720B5FE}
{54134937-585D-48D5-AB60-79493BE2C9E7} = {6A32653B-8FAC-4B01-A0E0-E6379DE90A1A}
EndGlobalSection
diff --git a/src/libraries/System.Threading.Timer/System.Threading.Timer.sln b/src/libraries/System.Threading.Timer/System.Threading.Timer.sln
index a2576589c9d..d52fee1834d 100644
--- a/src/libraries/System.Threading.Timer/System.Threading.Timer.sln
+++ b/src/libraries/System.Threading.Timer/System.Threading.Timer.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{629ACB77-0503-4501-8AD5-E574E3F498E6}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{814B2F8C-0070-4625-B998-9F92EA14F57F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{379EA015-CA7A-4D4E-BCEE-481CE1704C62}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{1B33BE1F-D914-465A-9E4D-460F22E3CB81}"
EndProject
@@ -90,24 +90,24 @@ Global
{629ACB77-0503-4501-8AD5-E574E3F498E6}.Checked|x64.Build.0 = Debug|Any CPU
{629ACB77-0503-4501-8AD5-E574E3F498E6}.Checked|x86.ActiveCfg = Debug|Any CPU
{629ACB77-0503-4501-8AD5-E574E3F498E6}.Checked|x86.Build.0 = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Debug|x64.ActiveCfg = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Debug|x64.Build.0 = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Debug|x86.ActiveCfg = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Debug|x86.Build.0 = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Release|Any CPU.Build.0 = Release|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Release|x64.ActiveCfg = Release|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Release|x64.Build.0 = Release|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Release|x86.ActiveCfg = Release|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Release|x86.Build.0 = Release|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Checked|x64.ActiveCfg = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Checked|x64.Build.0 = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Checked|x86.ActiveCfg = Debug|Any CPU
- {814B2F8C-0070-4625-B998-9F92EA14F57F}.Checked|x86.Build.0 = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Debug|x64.Build.0 = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Debug|x86.Build.0 = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Release|Any CPU.Build.0 = Release|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Release|x64.ActiveCfg = Release|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Release|x64.Build.0 = Release|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Release|x86.ActiveCfg = Release|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Release|x86.Build.0 = Release|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Checked|x64.Build.0 = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62}.Checked|x86.Build.0 = Debug|Any CPU
{1B33BE1F-D914-465A-9E4D-460F22E3CB81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B33BE1F-D914-465A-9E4D-460F22E3CB81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B33BE1F-D914-465A-9E4D-460F22E3CB81}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{567E9CC8-5751-4786-BCC6-C2A6C38044DF} = {0149D5FD-7BFC-4421-8B5E-74FD45D9B3D7}
{DAB761D6-EDD5-4F57-9BDE-E26589057403} = {0149D5FD-7BFC-4421-8B5E-74FD45D9B3D7}
{629ACB77-0503-4501-8AD5-E574E3F498E6} = {F0CC3A5B-3AF1-4351-982F-0EAB2D705A55}
- {814B2F8C-0070-4625-B998-9F92EA14F57F} = {F0CC3A5B-3AF1-4351-982F-0EAB2D705A55}
+ {379EA015-CA7A-4D4E-BCEE-481CE1704C62} = {F0CC3A5B-3AF1-4351-982F-0EAB2D705A55}
{1B33BE1F-D914-465A-9E4D-460F22E3CB81} = {F0CC3A5B-3AF1-4351-982F-0EAB2D705A55}
{CF3D7FED-A927-4611-891F-AB3516B71D44} = {CDBD0CE5-05CC-42B7-B111-FA46C0EEB657}
EndGlobalSection
diff --git a/src/libraries/System.Threading/System.Threading.sln b/src/libraries/System.Threading/System.Threading.sln
index bc984e0074a..def8cef1c40 100644
--- a/src/libraries/System.Threading/System.Threading.sln
+++ b/src/libraries/System.Threading/System.Threading.sln
@@ -5,7 +5,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{AB7F1F45-5C20-40C7-B6DA-192B37012DD8}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B2FDC017-1B69-472E-855A-87F519D5AB9C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{155B2ACA-D7B6-472E-90F9-5F68E62F7432}"
EndProject
@@ -90,24 +90,24 @@ Global
{AB7F1F45-5C20-40C7-B6DA-192B37012DD8}.Checked|x64.Build.0 = Debug|Any CPU
{AB7F1F45-5C20-40C7-B6DA-192B37012DD8}.Checked|x86.ActiveCfg = Debug|Any CPU
{AB7F1F45-5C20-40C7-B6DA-192B37012DD8}.Checked|x86.Build.0 = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Debug|x64.ActiveCfg = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Debug|x64.Build.0 = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Debug|x86.ActiveCfg = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Debug|x86.Build.0 = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Release|Any CPU.Build.0 = Release|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Release|x64.ActiveCfg = Release|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Release|x64.Build.0 = Release|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Release|x86.ActiveCfg = Release|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Release|x86.Build.0 = Release|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Checked|Any CPU.Build.0 = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Checked|x64.ActiveCfg = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Checked|x64.Build.0 = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Checked|x86.ActiveCfg = Debug|Any CPU
- {B2FDC017-1B69-472E-855A-87F519D5AB9C}.Checked|x86.Build.0 = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Debug|x64.Build.0 = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Debug|x86.Build.0 = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Release|x64.ActiveCfg = Release|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Release|x64.Build.0 = Release|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Release|x86.ActiveCfg = Release|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Release|x86.Build.0 = Release|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Checked|Any CPU.Build.0 = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Checked|x64.ActiveCfg = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Checked|x64.Build.0 = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Checked|x86.ActiveCfg = Debug|Any CPU
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE}.Checked|x86.Build.0 = Debug|Any CPU
{155B2ACA-D7B6-472E-90F9-5F68E62F7432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{155B2ACA-D7B6-472E-90F9-5F68E62F7432}.Debug|Any CPU.Build.0 = Debug|Any CPU
{155B2ACA-D7B6-472E-90F9-5F68E62F7432}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,7 +190,7 @@ Global
{387778C0-0405-4FE2-9D85-034254EAAD46} = {CCC80DF2-8B4E-497C-84A9-4E6344294566}
{3DD929D8-346F-4CF3-B157-22E052F73A91} = {CCC80DF2-8B4E-497C-84A9-4E6344294566}
{AB7F1F45-5C20-40C7-B6DA-192B37012DD8} = {A928B9C7-28EC-4D20-9A63-87221C52EC87}
- {B2FDC017-1B69-472E-855A-87F519D5AB9C} = {A928B9C7-28EC-4D20-9A63-87221C52EC87}
+ {80B607B4-4860-4E0E-B9A1-2AD24A9C72DE} = {A928B9C7-28EC-4D20-9A63-87221C52EC87}
{155B2ACA-D7B6-472E-90F9-5F68E62F7432} = {A928B9C7-28EC-4D20-9A63-87221C52EC87}
{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49} = {BEFD8C2C-3355-40A5-8C06-3CE0BFB66C36}
EndGlobalSection
diff --git a/src/libraries/System.Transactions.Local/System.Transactions.Local.sln b/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
index 8625c4536a9..982a4df7c09 100644
--- a/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
+++ b/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B67D04B7-C5ED-44ED-8DB3-8AD788232A5C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B847CF9D-AEB7-4BD8-A2E3-F482CF9B0110}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{2A01A433-50B7-4CFA-AA76-CB51971535BB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{193FBAA0-BAE2-484A-BB0E-1ADDDC810FC9}"
EndProject
@@ -29,10 +29,10 @@ Global
{B67D04B7-C5ED-44ED-8DB3-8AD788232A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B67D04B7-C5ED-44ED-8DB3-8AD788232A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B67D04B7-C5ED-44ED-8DB3-8AD788232A5C}.Release|Any CPU.Build.0 = Release|Any CPU
- {B847CF9D-AEB7-4BD8-A2E3-F482CF9B0110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B847CF9D-AEB7-4BD8-A2E3-F482CF9B0110}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B847CF9D-AEB7-4BD8-A2E3-F482CF9B0110}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B847CF9D-AEB7-4BD8-A2E3-F482CF9B0110}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2A01A433-50B7-4CFA-AA76-CB51971535BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2A01A433-50B7-4CFA-AA76-CB51971535BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2A01A433-50B7-4CFA-AA76-CB51971535BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2A01A433-50B7-4CFA-AA76-CB51971535BB}.Release|Any CPU.Build.0 = Release|Any CPU
{193FBAA0-BAE2-484A-BB0E-1ADDDC810FC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{193FBAA0-BAE2-484A-BB0E-1ADDDC810FC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{193FBAA0-BAE2-484A-BB0E-1ADDDC810FC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{B67D04B7-C5ED-44ED-8DB3-8AD788232A5C} = {E66BBFB5-F07D-4986-89C0-F0E395DD5BA1}
{C5519C4C-69AF-4437-8594-D2A019119988} = {E66BBFB5-F07D-4986-89C0-F0E395DD5BA1}
- {B847CF9D-AEB7-4BD8-A2E3-F482CF9B0110} = {2ECC9D1A-2EF1-4411-98D1-AFFCDAAF9D05}
+ {2A01A433-50B7-4CFA-AA76-CB51971535BB} = {2ECC9D1A-2EF1-4411-98D1-AFFCDAAF9D05}
{193FBAA0-BAE2-484A-BB0E-1ADDDC810FC9} = {2ECC9D1A-2EF1-4411-98D1-AFFCDAAF9D05}
{0C886713-72D7-43C7-A1BB-72CD0F8430D2} = {B4E1F144-E017-4E02-8320-DB7467E42BF8}
{6BFF19CB-C412-4D12-AA55-68D61F69C4F7} = {9D6D84CE-3891-482B-B7C0-0089CF93CF45}
diff --git a/src/libraries/System.ValueTuple/System.ValueTuple.sln b/src/libraries/System.ValueTuple/System.ValueTuple.sln
index f7a8e438103..076db6b04b8 100644
--- a/src/libraries/System.ValueTuple/System.ValueTuple.sln
+++ b/src/libraries/System.ValueTuple/System.ValueTuple.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E7F22DF6-4869-4B34-BCFA-D007FE89616C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A217321E-22DB-49B3-BDCC-50194251E0DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{12BF2749-652A-4EE2-AF6A-B20F8D2F7252}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{4600DD8A-9304-471B-96E7-D5AD346AE33A}"
EndProject
@@ -29,10 +29,10 @@ Global
{E7F22DF6-4869-4B34-BCFA-D007FE89616C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E7F22DF6-4869-4B34-BCFA-D007FE89616C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E7F22DF6-4869-4B34-BCFA-D007FE89616C}.Release|Any CPU.Build.0 = Release|Any CPU
- {A217321E-22DB-49B3-BDCC-50194251E0DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A217321E-22DB-49B3-BDCC-50194251E0DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A217321E-22DB-49B3-BDCC-50194251E0DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A217321E-22DB-49B3-BDCC-50194251E0DB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {12BF2749-652A-4EE2-AF6A-B20F8D2F7252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {12BF2749-652A-4EE2-AF6A-B20F8D2F7252}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {12BF2749-652A-4EE2-AF6A-B20F8D2F7252}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {12BF2749-652A-4EE2-AF6A-B20F8D2F7252}.Release|Any CPU.Build.0 = Release|Any CPU
{4600DD8A-9304-471B-96E7-D5AD346AE33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4600DD8A-9304-471B-96E7-D5AD346AE33A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4600DD8A-9304-471B-96E7-D5AD346AE33A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{E7F22DF6-4869-4B34-BCFA-D007FE89616C} = {39C86725-ED47-4B56-A20D-E6F21D1B1392}
{3070EAA5-CBA9-4359-844B-2EFCDDC37020} = {39C86725-ED47-4B56-A20D-E6F21D1B1392}
- {A217321E-22DB-49B3-BDCC-50194251E0DB} = {84579360-4D1F-4415-B8D0-EA1B17DA46E8}
+ {12BF2749-652A-4EE2-AF6A-B20F8D2F7252} = {84579360-4D1F-4415-B8D0-EA1B17DA46E8}
{4600DD8A-9304-471B-96E7-D5AD346AE33A} = {84579360-4D1F-4415-B8D0-EA1B17DA46E8}
{F48CCB0E-7FA3-490A-BCF0-9918C496D3B1} = {EEFB1DA3-0394-4185-B071-D2B98DE083B7}
{F4EDEAED-F616-41EE-9FBA-76986DCDB528} = {14C7742D-E5CB-4FB0-ABB6-C5F57AF130D5}
diff --git a/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln b/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
index 32ce3218ce5..f41835288d9 100644
--- a/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
+++ b/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DE086FBB-952B-491A-A59C-733C33682562}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6D37EFFB-117B-42D9-A961-17AF9EACE98D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{58FC2C69-816F-44D4-AE44-72F8864DFAE1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{02855E32-AB9B-4893-A9E3-50620FCA1287}"
EndProject
@@ -29,10 +29,10 @@ Global
{DE086FBB-952B-491A-A59C-733C33682562}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE086FBB-952B-491A-A59C-733C33682562}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DE086FBB-952B-491A-A59C-733C33682562}.Release|Any CPU.Build.0 = Release|Any CPU
- {6D37EFFB-117B-42D9-A961-17AF9EACE98D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6D37EFFB-117B-42D9-A961-17AF9EACE98D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6D37EFFB-117B-42D9-A961-17AF9EACE98D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6D37EFFB-117B-42D9-A961-17AF9EACE98D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {58FC2C69-816F-44D4-AE44-72F8864DFAE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {58FC2C69-816F-44D4-AE44-72F8864DFAE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {58FC2C69-816F-44D4-AE44-72F8864DFAE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {58FC2C69-816F-44D4-AE44-72F8864DFAE1}.Release|Any CPU.Build.0 = Release|Any CPU
{02855E32-AB9B-4893-A9E3-50620FCA1287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{02855E32-AB9B-4893-A9E3-50620FCA1287}.Debug|Any CPU.Build.0 = Debug|Any CPU
{02855E32-AB9B-4893-A9E3-50620FCA1287}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -56,7 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{DE086FBB-952B-491A-A59C-733C33682562} = {5A13596E-F762-470F-9B2C-92227CC6FF3F}
{BA3C5AE7-937C-47E1-B861-1F149499889F} = {5A13596E-F762-470F-9B2C-92227CC6FF3F}
- {6D37EFFB-117B-42D9-A961-17AF9EACE98D} = {DB94D23F-DB79-455A-9C55-37403C9BE9F6}
+ {58FC2C69-816F-44D4-AE44-72F8864DFAE1} = {DB94D23F-DB79-455A-9C55-37403C9BE9F6}
{02855E32-AB9B-4893-A9E3-50620FCA1287} = {DB94D23F-DB79-455A-9C55-37403C9BE9F6}
{063B8BE1-1713-40FE-BD22-A258FD50108E} = {E29510E3-01F1-4F13-885C-95690B2D2FDC}
{C294097C-8171-4FA2-9C58-11A7FE3BEBDA} = {36DE8D3F-5AAF-4464-A544-AF32A37307F5}
diff --git a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
index c615e602796..1d3e8f1c178 100644
--- a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
+++ b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{532CAA5E-15F7-4E76-9EBC-B08C56390172}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7686BAB8-AF68-4E0B-83D9-5090D4BB520A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{BF9DE7F9-08A1-4482-8F81-2895BB99D651}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}"
EndProject
@@ -53,10 +53,10 @@ Global
{532CAA5E-15F7-4E76-9EBC-B08C56390172}.Debug|Any CPU.Build.0 = Debug|Any CPU
{532CAA5E-15F7-4E76-9EBC-B08C56390172}.Release|Any CPU.ActiveCfg = Release|Any CPU
{532CAA5E-15F7-4E76-9EBC-B08C56390172}.Release|Any CPU.Build.0 = Release|Any CPU
- {7686BAB8-AF68-4E0B-83D9-5090D4BB520A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7686BAB8-AF68-4E0B-83D9-5090D4BB520A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7686BAB8-AF68-4E0B-83D9-5090D4BB520A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7686BAB8-AF68-4E0B-83D9-5090D4BB520A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BF9DE7F9-08A1-4482-8F81-2895BB99D651}.Release|Any CPU.Build.0 = Release|Any CPU
{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -86,7 +86,7 @@ Global
{63747E82-DCD9-445E-A20E-753B1A6D603B} = {099F43C3-B397-4871-AA29-0B32869E7B48}
{532CAA5E-15F7-4E76-9EBC-B08C56390172} = {099F43C3-B397-4871-AA29-0B32869E7B48}
{6324EAB4-058A-4D80-8D99-5DFB7AEA8928} = {099F43C3-B397-4871-AA29-0B32869E7B48}
- {7686BAB8-AF68-4E0B-83D9-5090D4BB520A} = {45BD3F1C-C44C-484B-8759-41BFCA7CEFF8}
+ {BF9DE7F9-08A1-4482-8F81-2895BB99D651} = {45BD3F1C-C44C-484B-8759-41BFCA7CEFF8}
{B5485369-6E0E-4F8E-AF41-FA9583C7B1CA} = {45BD3F1C-C44C-484B-8759-41BFCA7CEFF8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln b/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
index 75327a29e5f..a80ae8ae41e 100644
--- a/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
+++ b/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{4886A8C5-3546-459A-8800-ED0DA91C6B15}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{C7345EB2-E950-4A80-B6E6-C72C0845CDC1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{CA8BC7D5-9A5D-4055-BE69-6D469B38ED02}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{640CCB13-BBC5-4B1A-90ED-87DA28BCA4AC}"
EndProject
@@ -25,10 +25,10 @@ Global
{4886A8C5-3546-459A-8800-ED0DA91C6B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4886A8C5-3546-459A-8800-ED0DA91C6B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4886A8C5-3546-459A-8800-ED0DA91C6B15}.Release|Any CPU.Build.0 = Release|Any CPU
- {C7345EB2-E950-4A80-B6E6-C72C0845CDC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C7345EB2-E950-4A80-B6E6-C72C0845CDC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C7345EB2-E950-4A80-B6E6-C72C0845CDC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C7345EB2-E950-4A80-B6E6-C72C0845CDC1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CA8BC7D5-9A5D-4055-BE69-6D469B38ED02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CA8BC7D5-9A5D-4055-BE69-6D469B38ED02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CA8BC7D5-9A5D-4055-BE69-6D469B38ED02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CA8BC7D5-9A5D-4055-BE69-6D469B38ED02}.Release|Any CPU.Build.0 = Release|Any CPU
{640CCB13-BBC5-4B1A-90ED-87DA28BCA4AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{640CCB13-BBC5-4B1A-90ED-87DA28BCA4AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{640CCB13-BBC5-4B1A-90ED-87DA28BCA4AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -48,7 +48,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{4886A8C5-3546-459A-8800-ED0DA91C6B15} = {311C66CC-47AC-4965-B704-3C62E57FE29D}
{FA7C251C-D1FD-45C3-8CC8-D094F70A03AA} = {311C66CC-47AC-4965-B704-3C62E57FE29D}
- {C7345EB2-E950-4A80-B6E6-C72C0845CDC1} = {DD1FA45A-B14C-49B5-87C8-1760B478FE91}
+ {CA8BC7D5-9A5D-4055-BE69-6D469B38ED02} = {DD1FA45A-B14C-49B5-87C8-1760B478FE91}
{640CCB13-BBC5-4B1A-90ED-87DA28BCA4AC} = {DD1FA45A-B14C-49B5-87C8-1760B478FE91}
{2FE5F437-4CE1-4A27-8547-B950F8043D89} = {6AA53AA1-786A-4B35-B1C5-9D3B2EC10CF1}
EndGlobalSection
diff --git a/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln b/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
index a3ff038cadc..045f1ff4c3b 100644
--- a/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
+++ b/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
@@ -3,7 +3,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml.Linq", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{CE19D781-5542-4024-9829-FE589BA93146}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1F4C5C15-188B-478F-81C6-73A503F9AD16}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{1168A1A4-299C-4FE3-B0EC-A4F87ACE19B1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{AC583FDE-8E90-4EDC-A35E-1E39704E465D}"
EndProject
@@ -31,10 +31,10 @@ Global
{CE19D781-5542-4024-9829-FE589BA93146}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE19D781-5542-4024-9829-FE589BA93146}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE19D781-5542-4024-9829-FE589BA93146}.Release|Any CPU.Build.0 = Release|Any CPU
- {1F4C5C15-188B-478F-81C6-73A503F9AD16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1F4C5C15-188B-478F-81C6-73A503F9AD16}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1F4C5C15-188B-478F-81C6-73A503F9AD16}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1F4C5C15-188B-478F-81C6-73A503F9AD16}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1168A1A4-299C-4FE3-B0EC-A4F87ACE19B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1168A1A4-299C-4FE3-B0EC-A4F87ACE19B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1168A1A4-299C-4FE3-B0EC-A4F87ACE19B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1168A1A4-299C-4FE3-B0EC-A4F87ACE19B1}.Release|Any CPU.Build.0 = Release|Any CPU
{AC583FDE-8E90-4EDC-A35E-1E39704E465D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC583FDE-8E90-4EDC-A35E-1E39704E465D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC583FDE-8E90-4EDC-A35E-1E39704E465D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,7 +55,7 @@ Global
{09DBC219-3DE1-40E1-ABD2-CD972410F03E} = {AFC9144B-DAD7-470E-B068-C17C24862D23}
{CE19D781-5542-4024-9829-FE589BA93146} = {AFC9144B-DAD7-470E-B068-C17C24862D23}
{B229C42C-204A-43B4-AB71-587AD46F927E} = {AFC9144B-DAD7-470E-B068-C17C24862D23}
- {1F4C5C15-188B-478F-81C6-73A503F9AD16} = {74D73470-4D01-4B7F-A809-D406E7474807}
+ {1168A1A4-299C-4FE3-B0EC-A4F87ACE19B1} = {74D73470-4D01-4B7F-A809-D406E7474807}
{AC583FDE-8E90-4EDC-A35E-1E39704E465D} = {74D73470-4D01-4B7F-A809-D406E7474807}
{1516AD95-61E7-40F6-A9A8-59A6E8A0467A} = {8F3CD562-EA5E-4DD1-8B30-E6BA65887115}
EndGlobalSection
diff --git a/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln b/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
index 2d72247dc60..9d98ddb4a4e 100644
--- a/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
+++ b/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
@@ -3,7 +3,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml.Linq", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{C1BE1D97-D078-4882-A772-C3CA11FD1F73}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AAE777AF-5C13-4C6E-BB28-95A846442BD9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{48DB9946-6D0B-49E4-AB52-59C6CDE636A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{0E9E4E11-BBF5-42B0-AAAF-2C5C2197A4B6}"
EndProject
@@ -31,10 +31,10 @@ Global
{C1BE1D97-D078-4882-A772-C3CA11FD1F73}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C1BE1D97-D078-4882-A772-C3CA11FD1F73}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C1BE1D97-D078-4882-A772-C3CA11FD1F73}.Release|Any CPU.Build.0 = Release|Any CPU
- {AAE777AF-5C13-4C6E-BB28-95A846442BD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AAE777AF-5C13-4C6E-BB28-95A846442BD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AAE777AF-5C13-4C6E-BB28-95A846442BD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AAE777AF-5C13-4C6E-BB28-95A846442BD9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {48DB9946-6D0B-49E4-AB52-59C6CDE636A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {48DB9946-6D0B-49E4-AB52-59C6CDE636A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {48DB9946-6D0B-49E4-AB52-59C6CDE636A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {48DB9946-6D0B-49E4-AB52-59C6CDE636A2}.Release|Any CPU.Build.0 = Release|Any CPU
{0E9E4E11-BBF5-42B0-AAAF-2C5C2197A4B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E9E4E11-BBF5-42B0-AAAF-2C5C2197A4B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E9E4E11-BBF5-42B0-AAAF-2C5C2197A4B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,7 +55,7 @@ Global
{A03326C2-C437-44C6-91C5-07AA8F24D51C} = {7C3C9BDE-3FF9-4B26-BACB-59EB827A5C0C}
{C1BE1D97-D078-4882-A772-C3CA11FD1F73} = {7C3C9BDE-3FF9-4B26-BACB-59EB827A5C0C}
{D52C68D2-B6DD-4FFB-B3B5-011B76733202} = {7C3C9BDE-3FF9-4B26-BACB-59EB827A5C0C}
- {AAE777AF-5C13-4C6E-BB28-95A846442BD9} = {21CFCBC2-EE04-43D0-8432-6B4B4DA770F1}
+ {48DB9946-6D0B-49E4-AB52-59C6CDE636A2} = {21CFCBC2-EE04-43D0-8432-6B4B4DA770F1}
{0E9E4E11-BBF5-42B0-AAAF-2C5C2197A4B6} = {21CFCBC2-EE04-43D0-8432-6B4B4DA770F1}
{E0E5B798-30CC-4D39-B164-C009141E2ABC} = {47B3DDCB-3A95-4315-9D49-A2653C6F3A17}
EndGlobalSection
diff --git a/src/libraries/System.Xml.XPath/System.Xml.XPath.sln b/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
index 15049440e99..68295a78550 100644
--- a/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
+++ b/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{B7D48F78-4580-4398-A93F-FD02A15AD0BD}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{667113D9-989B-44F7-81B2-F0326066B50F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{E0AD66A8-D552-43C6-AB0F-305A2CD2A628}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{F02C927A-92DA-4212-A228-EE4E82317723}"
EndProject
@@ -25,10 +25,10 @@ Global
{B7D48F78-4580-4398-A93F-FD02A15AD0BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B7D48F78-4580-4398-A93F-FD02A15AD0BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B7D48F78-4580-4398-A93F-FD02A15AD0BD}.Release|Any CPU.Build.0 = Release|Any CPU
- {667113D9-989B-44F7-81B2-F0326066B50F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {667113D9-989B-44F7-81B2-F0326066B50F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {667113D9-989B-44F7-81B2-F0326066B50F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {667113D9-989B-44F7-81B2-F0326066B50F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E0AD66A8-D552-43C6-AB0F-305A2CD2A628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E0AD66A8-D552-43C6-AB0F-305A2CD2A628}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E0AD66A8-D552-43C6-AB0F-305A2CD2A628}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E0AD66A8-D552-43C6-AB0F-305A2CD2A628}.Release|Any CPU.Build.0 = Release|Any CPU
{F02C927A-92DA-4212-A228-EE4E82317723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F02C927A-92DA-4212-A228-EE4E82317723}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F02C927A-92DA-4212-A228-EE4E82317723}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -48,7 +48,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{B7D48F78-4580-4398-A93F-FD02A15AD0BD} = {73688A49-11B7-47C8-BF09-A6C1C11EA0BD}
{F825C114-FF6D-4826-BC8A-586246369695} = {73688A49-11B7-47C8-BF09-A6C1C11EA0BD}
- {667113D9-989B-44F7-81B2-F0326066B50F} = {543F6A8C-B245-464C-A7F5-50D5A1369909}
+ {E0AD66A8-D552-43C6-AB0F-305A2CD2A628} = {543F6A8C-B245-464C-A7F5-50D5A1369909}
{F02C927A-92DA-4212-A228-EE4E82317723} = {543F6A8C-B245-464C-A7F5-50D5A1369909}
{38040AE0-59E4-46CE-861D-A33A383BB0FC} = {1EF0B525-2611-41AB-AA69-28A1B9689C3A}
EndGlobalSection
diff --git a/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln b/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
index 3fd6e1c81ab..4371804ea2b 100644
--- a/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
+++ b/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{733E5502-5F1A-4ECC-8C44-0E057B11437D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4651410A-D857-456F-9ECC-5E195A3AC101}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{CD153E34-7239-4AA7-A5AD-C574E0933012}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{AE65C993-5ED0-4267-A2E8-95FDBE42088A}"
EndProject
@@ -25,10 +25,10 @@ Global
{733E5502-5F1A-4ECC-8C44-0E057B11437D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{733E5502-5F1A-4ECC-8C44-0E057B11437D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{733E5502-5F1A-4ECC-8C44-0E057B11437D}.Release|Any CPU.Build.0 = Release|Any CPU
- {4651410A-D857-456F-9ECC-5E195A3AC101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4651410A-D857-456F-9ECC-5E195A3AC101}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4651410A-D857-456F-9ECC-5E195A3AC101}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4651410A-D857-456F-9ECC-5E195A3AC101}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CD153E34-7239-4AA7-A5AD-C574E0933012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CD153E34-7239-4AA7-A5AD-C574E0933012}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CD153E34-7239-4AA7-A5AD-C574E0933012}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CD153E34-7239-4AA7-A5AD-C574E0933012}.Release|Any CPU.Build.0 = Release|Any CPU
{AE65C993-5ED0-4267-A2E8-95FDBE42088A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE65C993-5ED0-4267-A2E8-95FDBE42088A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE65C993-5ED0-4267-A2E8-95FDBE42088A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -48,7 +48,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{733E5502-5F1A-4ECC-8C44-0E057B11437D} = {9EB72201-88D9-48A5-858D-82F01B2382B6}
{8656FF2F-1024-4D56-B38C-F99BE27B732D} = {9EB72201-88D9-48A5-858D-82F01B2382B6}
- {4651410A-D857-456F-9ECC-5E195A3AC101} = {47CB5391-D9FA-4645-B2B3-805468A86893}
+ {CD153E34-7239-4AA7-A5AD-C574E0933012} = {47CB5391-D9FA-4645-B2B3-805468A86893}
{AE65C993-5ED0-4267-A2E8-95FDBE42088A} = {47CB5391-D9FA-4645-B2B3-805468A86893}
{9FA44EA8-BEDA-412E-A366-9334FDBA77A9} = {A6E661CC-CFD6-4866-BE5B-59ECB823DC70}
EndGlobalSection
diff --git a/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln b/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
index d4bb3d745dd..0082c601389 100644
--- a/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
+++ b/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{EF514C0C-ECA7-419A-BDED-A6735FEA16F9}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{EAD93EEB-8431-45C4-B147-EAC2BA0576B2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{3232286F-6DB1-46A6-AA45-CA9014FD8D9A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{91E43C52-718D-46CE-B832-230A3730A32F}"
EndProject
@@ -25,10 +25,10 @@ Global
{EF514C0C-ECA7-419A-BDED-A6735FEA16F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF514C0C-ECA7-419A-BDED-A6735FEA16F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF514C0C-ECA7-419A-BDED-A6735FEA16F9}.Release|Any CPU.Build.0 = Release|Any CPU
- {EAD93EEB-8431-45C4-B147-EAC2BA0576B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EAD93EEB-8431-45C4-B147-EAC2BA0576B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EAD93EEB-8431-45C4-B147-EAC2BA0576B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EAD93EEB-8431-45C4-B147-EAC2BA0576B2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3232286F-6DB1-46A6-AA45-CA9014FD8D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3232286F-6DB1-46A6-AA45-CA9014FD8D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3232286F-6DB1-46A6-AA45-CA9014FD8D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3232286F-6DB1-46A6-AA45-CA9014FD8D9A}.Release|Any CPU.Build.0 = Release|Any CPU
{91E43C52-718D-46CE-B832-230A3730A32F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{91E43C52-718D-46CE-B832-230A3730A32F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{91E43C52-718D-46CE-B832-230A3730A32F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -48,7 +48,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{EF514C0C-ECA7-419A-BDED-A6735FEA16F9} = {F0B2F254-B3E6-4BAA-8C92-2373990CF48B}
{67D79968-DF22-4273-B2FA-D3EEC905095C} = {F0B2F254-B3E6-4BAA-8C92-2373990CF48B}
- {EAD93EEB-8431-45C4-B147-EAC2BA0576B2} = {8B996FD2-F7BF-4196-9468-998117E8C7C1}
+ {3232286F-6DB1-46A6-AA45-CA9014FD8D9A} = {8B996FD2-F7BF-4196-9468-998117E8C7C1}
{91E43C52-718D-46CE-B832-230A3730A32F} = {8B996FD2-F7BF-4196-9468-998117E8C7C1}
{A463D0F1-1814-4276-B7A9-59780C755D0A} = {E0C34B2E-D8CC-4A13-9635-3FD9AF37EC9B}
EndGlobalSection
diff --git a/src/libraries/shims/Directory.Build.props b/src/libraries/shims/Directory.Build.props
index 54a3e784c7a..df43d1df571 100644
--- a/src/libraries/shims/Directory.Build.props
+++ b/src/libraries/shims/Directory.Build.props
@@ -14,7 +14,7 @@
netstandard.dll doesn't need to do this since it has no dangling dependencies -->
<GenFacadesForceZeroVersionSeeds Condition="'$(MSBuildProjectName)' != 'netstandard'">true</GenFacadesForceZeroVersionSeeds>
<!-- Opt out of some features which are on by default. -->
- <EnableDllImportGenerator>false</EnableDllImportGenerator>
+ <EnableLibraryImportGenerator>false</EnableLibraryImportGenerator>
<RunApiCompat>false</RunApiCompat>
<ILLinkTrimAssembly>false</ILLinkTrimAssembly>
<AddOSPlatformAttributes>false</AddOSPlatformAttributes>
@@ -46,7 +46,7 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)..\oob-src.proj" Condition="'$(RefOnly)' != 'true'" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\oob-ref.proj" Condition="'$(RefOnly)' == 'true'" />
</ItemGroup>
-
+
<ItemGroup>
<!-- System.Data.SqlClient is not live built anymore, reference it manually to avoid tfm nuget selection fallback errors
when the TargetOS i.e. is MacCatalyst. Set Private false so that it doesn't flow down to consuming projects. -->
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 1713468fbc4..248a8fabbbb 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -58,42 +58,42 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetsMobile)' == 'true' or '$(TargetArchitecture)' == 'ARMv6'">
- <!-- DllImportGenerator runtime tests depend on DNNE, which does not support mobile platforms. -->
- <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\DllImportGenerator.Tests\DllImportGenerator.Tests.csproj" />
- <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\DllImportGenerator.UnitTests\DllImportGenerator.Unit.Tests.csproj" />
+ <!-- LibraryImportGenerator runtime tests depend on DNNE, which does not support mobile platforms. -->
+ <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\LibraryImportGenerator.Tests\LibraryImportGenerator.Tests.csproj" />
+ <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\LibraryImportGenerator.UnitTests\LibraryImportGenerator.Unit.Tests.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'arm'">
- <!-- DllImportGenerator runtime tests depend on DNNE, which does not support Windows ARM32 as we don't officially support it. -->
- <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\DllImportGenerator.Tests\DllImportGenerator.Tests.csproj" />
+ <!-- LibraryImportGenerator runtime tests depend on DNNE, which does not support Windows ARM32 as we don't officially support it. -->
+ <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\LibraryImportGenerator.Tests\LibraryImportGenerator.Tests.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetArchitecture)' == 'armel'">
- <!-- DllImportGenerator runtime tests depend on DNNE, which does not support armel as we don't officially support it. -->
- <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\DllImportGenerator.Tests\DllImportGenerator.Tests.csproj" />
+ <!-- LibraryImportGenerator runtime tests depend on DNNE, which does not support armel as we don't officially support it. -->
+ <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\LibraryImportGenerator.Tests\LibraryImportGenerator.Tests.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm'">
<!-- Issue: https://github.com/dotnet/runtime/issues/60705 -->
- <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\DllImportGenerator.UnitTests\DllImportGenerator.Unit.Tests.csproj" />
+ <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\LibraryImportGenerator.UnitTests\LibraryImportGenerator.Unit.Tests.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetOS)' == 'FreeBSD'">
- <!-- DllImportGenerator runtime tests build depends pulling down a pre-built nethost binary, which is not available for FreeBSD. -->
- <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\DllImportGenerator.Tests\DllImportGenerator.Tests.csproj" />
+ <!-- LibraryImportGenerator runtime tests build depends pulling down a pre-built nethost binary, which is not available for FreeBSD. -->
+ <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\LibraryImportGenerator.Tests\LibraryImportGenerator.Tests.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetOS)' == 'linux' and '$(TargetArchitecture)' == 's390x'">
- <!-- DllImportGenerator runtime tests build depends pulling down a pre-built nethost binary, which is not available for s390x. -->
- <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\DllImportGenerator.Tests\DllImportGenerator.Tests.csproj" />
- <!-- DllImportGenerator unit tests fail since NuGet 5.6.0 signature verification does not work on big-endian systems (needs >= 5.11.0). -->
- <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\DllImportGenerator.UnitTests\DllImportGenerator.Unit.Tests.csproj" />
+ <!-- LibraryImportGenerator runtime tests build depends pulling down a pre-built nethost binary, which is not available for s390x. -->
+ <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\LibraryImportGenerator.Tests\LibraryImportGenerator.Tests.csproj" />
+ <!-- LibraryImportGenerator unit tests fail since NuGet 5.6.0 signature verification does not work on big-endian systems (needs >= 5.11.0). -->
+ <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\LibraryImportGenerator.UnitTests\LibraryImportGenerator.Unit.Tests.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetOS)' == 'Windows' and '$(RuntimeFlavor)' == 'Mono' and '$(RunDisabledMonoTestsOnWindows)' != 'true'">
<!-- Issue: https://github.com/dotnet/runtime/issues/53281 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.WebSockets.Client\tests\System.Net.WebSockets.Client.Tests.csproj" />
- <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\DllImportGenerator.UnitTests\DllImportGenerator.Unit.Tests.csproj" />
+ <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\LibraryImportGenerator.UnitTests\LibraryImportGenerator.Unit.Tests.csproj" />
<!-- Issue: https://github.com/dotnet/runtime/issues/63723 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Drawing.Common\tests\System.Drawing.Common.Tests.csproj" />
</ItemGroup>
diff --git a/src/samples/DllImportGeneratorSample/.editorconfig b/src/samples/LibraryImportGeneratorSample/.editorconfig
index 0c2c63edc1b..0c2c63edc1b 100644
--- a/src/samples/DllImportGeneratorSample/.editorconfig
+++ b/src/samples/LibraryImportGeneratorSample/.editorconfig
diff --git a/src/samples/DllImportGeneratorSample/DllImportGeneratorSample.csproj b/src/samples/LibraryImportGeneratorSample/LibraryImportGeneratorSample.csproj
index f42621f44c2..146275ae0a2 100644
--- a/src/samples/DllImportGeneratorSample/DllImportGeneratorSample.csproj
+++ b/src/samples/LibraryImportGeneratorSample/LibraryImportGeneratorSample.csproj
@@ -8,10 +8,10 @@
<Nullable>enable</Nullable>
<!-- Indicate to the compiler to output generated files to disk. Source addded
- by the DllImportGenerator can be found in the intermediate directory. -->
+ by the LibraryImportGenerator can be found in the intermediate directory. -->
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
- <EnableDllImportGenerator>true</EnableDllImportGenerator>
- <IncludeDllImportGeneratorSources>false</IncludeDllImportGeneratorSources>
+ <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
+ <IncludeLibraryImportGeneratorSources>false</IncludeLibraryImportGeneratorSources>
<IsPackable>false</IsPackable>
</PropertyGroup>
diff --git a/src/samples/DllImportGeneratorSample/Program.cs b/src/samples/LibraryImportGeneratorSample/Program.cs
index 4a1c8335bf4..4a1c8335bf4 100644
--- a/src/samples/DllImportGeneratorSample/Program.cs
+++ b/src/samples/LibraryImportGeneratorSample/Program.cs
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 23:45:32 +0300