diff options
467 files changed, 4464 insertions, 6807 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2956685387..47d0d7b6a01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,10 +230,6 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>6e05d78deba320a54ef10a265c6025bbb686efe6</Sha> </Dependency> - <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22113.2"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>6e05d78deba320a54ef10a265c6025bbb686efe6</Sha> - </Dependency> <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22115.2"> <Uri>https://github.com/dotnet/linker</Uri> <Sha>6e11d057a88b3fb403bfbb90317518c94e3e84a7</Sha> diff --git a/eng/Versions.props b/eng/Versions.props index 2c0993b6f3a..2c8f5d3aad6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -125,7 +125,7 @@ <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion> <SystemServiceModelPrimitivesVersion>4.9.0</SystemServiceModelPrimitivesVersion> <SystemTextJsonVersion>7.0.0-preview.2.22113.2</SystemTextJsonVersion> - <SystemRuntimeCompilerServicesUnsafeVersion>7.0.0-preview.2.22113.2</SystemRuntimeCompilerServicesUnsafeVersion> + <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion> <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion> <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion> <runtimenativeSystemIOPortsVersion>7.0.0-preview.2.22113.2</runtimenativeSystemIOPortsVersion> diff --git a/eng/generators.targets b/eng/generators.targets index 843842937ef..d73019014a8 100644 --- a/eng/generators.targets +++ b/eng/generators.targets @@ -57,9 +57,6 @@ '$(MSBuildProjectName)' == 'System.Private.CoreLib' or '$(EnableDllImportGenerator)' == 'true' or ('@(Reference)' != '' - and (@(Reference->AnyHaveMetadataValue('Identity', 'System.Runtime.CompilerServices.Unsafe')) - or ('@(ProjectReference)' != '' - and @(ProjectReference->AnyHaveMetadataValue('Identity', $([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'System.Runtime.CompilerServices.Unsafe', 'src', 'System.Runtime.CompilerServices.Unsafe.ilproj')))))) and @(Reference->AnyHaveMetadataValue('Identity', 'System.Memory'))) or ('@(ProjectReference)' != '' and @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)'))))" Include="$(LibrariesProjectRoot)Common\src\System\Runtime\InteropServices\ArrayMarshaller.cs" /> @@ -77,13 +74,6 @@ <PropertyGroup> <DllImportGenerator_UseMarshalType>true</DllImportGenerator_UseMarshalType> </PropertyGroup> - <!-- Projects that directly reference System.Private.CoreLib are typically low level enough that they don't reference - System.Runtime.CompilerServices.Unsafe, so we use the Unsafe type defined in CoreLib (Internal.Runtime.CompilerServices.Unsafe) for these projects. --> - <PropertyGroup Condition="'$(MSBuildProjectName)' == 'System.Private.CoreLib' or - ('@(ProjectReference)' != '' and @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)')))"> - <DllImportGenerator_UseInternalUnsafeType>true</DllImportGenerator_UseInternalUnsafeType> - <DefineConstants>$(DefineConstants);DLLIMPORTGENERATOR_INTERNALUNSAFE</DefineConstants> - </PropertyGroup> </Target> <Import Project="$(LibrariesProjectRoot)System.Runtime.InteropServices/gen/DllImportGenerator/Microsoft.Interop.DllImportGenerator.props" /> diff --git a/eng/slngen.targets b/eng/slngen.targets index 4b68c388938..47905f85fed 100644 --- a/eng/slngen.targets +++ b/eng/slngen.targets @@ -10,7 +10,4 @@ Include the reference project in the solution file if it targets more than just NetCoreAppCurrent as other frameworks like .NETFramework, .NETStandard or older .NETCoreApp ones require it. --> <IncludeInSolutionFile Condition="'$(IsNETCoreAppRef)' == 'true' and '$(MSBuildProjectName)' != '$(SlnGenMainProject)' and '$(TargetFramework)' == '$(NetCoreAppCurrent)' and ('$(TargetFrameworks)' == '' or '$(TargetFrameworks)' == '$(NetCoreAppCurrent)')">false</IncludeInSolutionFile> </PropertyGroup> - <ItemGroup> - <SlnGenCustomProjectTypeGuid Include=".ilproj" ProjectTypeGuid="{9A19103F-16F7-4668-BE54-9A1E7A4F7556}" /> - </ItemGroup> </Project> diff --git a/src/coreclr/System.Private.CoreLib/src/System/Array.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Array.CoreCLR.cs index 4bec5538507..679637b4256 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Array.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Array.CoreCLR.cs @@ -7,7 +7,6 @@ using System.Diagnostics; using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/coreclr/System.Private.CoreLib/src/System/Buffer.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Buffer.CoreCLR.cs index 1a3d1b72d3b..002937ff063 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Buffer.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Buffer.CoreCLR.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/coreclr/System.Private.CoreLib/src/System/Diagnostics/Eventing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Diagnostics/Eventing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.CoreCLR.cs index ebc550375d9..d88e0395d72 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Diagnostics/Eventing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Diagnostics/Eventing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.CoreCLR.cs @@ -5,7 +5,6 @@ using System.Threading; using System.Diagnostics.Tracing; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Diagnostics.Tracing { diff --git a/src/coreclr/System.Private.CoreLib/src/System/GC.cs b/src/coreclr/System.Private.CoreLib/src/System/GC.cs index 3e28ba7d394..858cf4b2be6 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/GC.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/GC.cs @@ -16,7 +16,6 @@ using System.Diagnostics; using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs b/src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs index 4166d91f4f0..c0ae5b16fe7 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/MulticastDelegate.cs @@ -8,8 +8,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Serialization; -using Internal.Runtime.CompilerServices; - namespace System { [ClassInterface(ClassInterfaceType.None)] diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/MethodBase.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/MethodBase.CoreCLR.cs index ef988b742a8..b6b7b1fa7a0 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Reflection/MethodBase.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Reflection/MethodBase.CoreCLR.cs @@ -1,12 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using System.Runtime.InteropServices; using System.Threading; -using Internal.Runtime.CompilerServices; namespace System.Reflection { diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeCustomAttributeData.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeCustomAttributeData.cs index 9eecc089e72..bb642f913da 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeCustomAttributeData.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeCustomAttributeData.cs @@ -6,9 +6,6 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Text; - -using Internal.Runtime.CompilerServices; namespace System.Reflection { diff --git a/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs b/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs index a31f67b4ebb..a921099356e 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/CastHelpers.cs @@ -6,8 +6,6 @@ using System.Numerics; using System.Runtime.InteropServices; using System.Threading; -using Internal.Runtime.CompilerServices; - namespace System.Runtime.CompilerServices { internal static unsafe class CastHelpers diff --git a/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs index 953fbff5509..0fa3632b0d8 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs @@ -7,7 +7,6 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Serialization; -using Internal.Runtime.CompilerServices; namespace System.Runtime.CompilerServices { diff --git a/src/coreclr/System.Private.CoreLib/src/System/Runtime/DependentHandle.cs b/src/coreclr/System.Private.CoreLib/src/System/Runtime/DependentHandle.cs index f080ba28dda..a8ccb94aae2 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Runtime/DependentHandle.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Runtime/DependentHandle.cs @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.CompilerServices; -#if !DEBUG -using Internal.Runtime.CompilerServices; -#endif namespace System.Runtime { diff --git a/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.cs b/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.cs index 7e5d4a3f2d2..98713a2ec9f 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.cs @@ -6,7 +6,6 @@ using System.Collections; using System.Threading; using System.Runtime.CompilerServices; using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; namespace System.Runtime.InteropServices { diff --git a/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/GCHandle.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/GCHandle.CoreCLR.cs index fa342d4db70..8597e5c6ed8 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/GCHandle.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/GCHandle.CoreCLR.cs @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.CompilerServices; -#if !DEBUG -using Internal.Runtime.CompilerServices; -#endif namespace System.Runtime.InteropServices { diff --git a/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.CoreCLR.cs index ba247054e4b..407fbc23678 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.CoreCLR.cs @@ -3,7 +3,6 @@ using System.Runtime.CompilerServices; using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; namespace System.Runtime.InteropServices { diff --git a/src/coreclr/System.Private.CoreLib/src/System/Runtime/JitInfo.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Runtime/JitInfo.CoreCLR.cs index d66e52912c0..be45db0b56d 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Runtime/JitInfo.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Runtime/JitInfo.CoreCLR.cs @@ -3,7 +3,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Runtime { diff --git a/src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs b/src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs index 3708e71cb45..515a53fe6b5 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs @@ -10,7 +10,6 @@ using System.Runtime.Loader; using System.Runtime.Serialization; using System.Runtime.Versioning; using System.Threading; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs index 514184d4472..2fd6975e9fe 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs @@ -11,7 +11,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; using System.Threading; -using Internal.Runtime.CompilerServices; + using DebuggerStepThroughAttribute = System.Diagnostics.DebuggerStepThroughAttribute; using MdToken = System.Reflection.MetadataToken; diff --git a/src/coreclr/System.Private.CoreLib/src/System/String.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/String.CoreCLR.cs index 7fd1eef4b1f..abf1c828fdf 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/String.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/String.CoreCLR.cs @@ -3,7 +3,6 @@ using System.Runtime.CompilerServices; using System.Text; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/coreclr/System.Private.CoreLib/src/System/StubHelpers.cs b/src/coreclr/System.Private.CoreLib/src/System/StubHelpers.cs index bdb18da812f..21f352c9fcb 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/StubHelpers.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/StubHelpers.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Text; -using System.Collections.Generic; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; using System.Diagnostics; -using Internal.Runtime.CompilerServices; namespace System.StubHelpers { diff --git a/src/coreclr/System.Private.CoreLib/src/System/Threading/Interlocked.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Threading/Interlocked.CoreCLR.cs index 0b0c3500ec7..fb59a54c94f 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Threading/Interlocked.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Threading/Interlocked.CoreCLR.cs @@ -4,7 +4,6 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Threading { diff --git a/src/coreclr/System.Private.CoreLib/src/System/TypedReference.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/TypedReference.CoreCLR.cs index 72d9e0f4e9a..3698bf8365f 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/TypedReference.CoreCLR.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/TypedReference.CoreCLR.cs @@ -4,10 +4,6 @@ // TypedReference is basically only ever seen on the call stack, and in param arrays. // These are blob that must be dealt with by the compiler. -using System.Reflection; -using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; - namespace System { [System.Runtime.Versioning.NonVersionable] // This only applies to field layout diff --git a/src/coreclr/nativeaot/Common/src/Internal/Runtime/CompilerHelpers/StartupCodeHelpers.cs b/src/coreclr/nativeaot/Common/src/Internal/Runtime/CompilerHelpers/StartupCodeHelpers.cs index 6d2506c01d7..05a9c1e7f28 100644 --- a/src/coreclr/nativeaot/Common/src/Internal/Runtime/CompilerHelpers/StartupCodeHelpers.cs +++ b/src/coreclr/nativeaot/Common/src/Internal/Runtime/CompilerHelpers/StartupCodeHelpers.cs @@ -6,8 +6,6 @@ using System.Runtime; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; - using Debug = Internal.Runtime.CompilerHelpers.StartupDebug; namespace Internal.Runtime.CompilerHelpers diff --git a/src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs b/src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs index b610ba7cbb5..6d4e360b037 100644 --- a/src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs +++ b/src/coreclr/nativeaot/Common/src/Internal/Runtime/MethodTable.cs @@ -7,7 +7,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Internal.NativeFormat; -using Internal.Runtime.CompilerServices; using Debug = System.Diagnostics.Debug; diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Array.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Array.cs index e6f4b12ba86..b70ddd15312 100644 --- a/src/coreclr/nativeaot/Runtime.Base/src/System/Array.cs +++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Array.cs @@ -1,10 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; - namespace System { // CONTRACT with Runtime diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Object.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Object.cs index c64cd5000fe..b7e3d15bf6e 100644 --- a/src/coreclr/nativeaot/Runtime.Base/src/System/Object.cs +++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Object.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Internal.Runtime; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/CachedInterfaceDispatch.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/CachedInterfaceDispatch.cs index 6946733ebdf..ab7cdcaae63 100644 --- a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/CachedInterfaceDispatch.cs +++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/CachedInterfaceDispatch.cs @@ -6,7 +6,6 @@ using System.Runtime; using System.Runtime.CompilerServices; using Internal.Runtime; -using Internal.Runtime.CompilerServices; namespace System.Runtime { diff --git a/src/coreclr/nativeaot/Runtime.Base/src/Internal/Runtime/CompilerServices/Unsafe.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/CompilerServices/Unsafe.cs index a66ee4ce7c0..cd672bc4192 100644 --- a/src/coreclr/nativeaot/Runtime.Base/src/Internal/Runtime/CompilerServices/Unsafe.cs +++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/CompilerServices/Unsafe.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.CompilerServices; -namespace Internal.Runtime.CompilerServices +namespace System.Runtime.CompilerServices { // // Subsetted clone of System.Runtime.CompilerServices.Unsafe for internal runtime use. diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/InteropServices/UnsafeGCHandle.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/InteropServices/UnsafeGCHandle.cs index e19452064ea..2d4b13a92c5 100644 --- a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/InteropServices/UnsafeGCHandle.cs +++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/InteropServices/UnsafeGCHandle.cs @@ -5,8 +5,6 @@ using System; using System.Runtime.CompilerServices; using System.Diagnostics; -using Internal.Runtime.CompilerServices; - namespace System.Runtime.InteropServices { /// <summary> diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/MethodTable.Runtime.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/MethodTable.Runtime.cs index 8bf93cb40c4..4f538d555f8 100644 --- a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/MethodTable.Runtime.cs +++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/MethodTable.Runtime.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics; using System.Runtime; -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace Internal.Runtime { diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs index 84accea33dd..d92c8cc40c9 100644 --- a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs +++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs @@ -10,7 +10,6 @@ using System.Runtime.InteropServices; using System.Runtime.CompilerServices; using Internal.Runtime; -using Internal.Runtime.CompilerServices; namespace System.Runtime { diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/TypeCast.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/TypeCast.cs index f6af798344b..2c66ce0c379 100644 --- a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/TypeCast.cs +++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/TypeCast.cs @@ -6,7 +6,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Internal.Runtime; -using Internal.Runtime.CompilerServices; namespace System.Runtime { diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerServices/Unsafe.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerServices/Unsafe.cs deleted file mode 100644 index ce8ff17ba60..00000000000 --- a/src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerServices/Unsafe.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.Runtime.CompilerServices; - -namespace Internal.Runtime.CompilerServices -{ - [ReflectionBlocked] - public static partial class Unsafe - { - } -} diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj b/src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj index 57ba9e2a3ab..f757e1a5db4 100644 --- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj +++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj @@ -94,7 +94,6 @@ <Compile Include="Internal\IntrinsicSupport\ComparerHelpers.cs" /> <Compile Include="Internal\IntrinsicSupport\EqualityComparerHelpers.cs" /> <Compile Include="Internal\Reflection\Augments\ReflectionAugments.cs" /> - <Compile Include="Internal\Runtime\CompilerServices\Unsafe.cs" /> <Compile Include="Internal\Runtime\IDynamicInterfaceCastableSupport.cs" /> <Compile Include="Internal\Runtime\MethodTable.Runtime.cs" /> <Compile Include="Internal\Runtime\CompilerHelpers\ThrowHelpers.cs" /> diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreRT.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreRT.cs index a7c62a82c44..b15d63444af 100644 --- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreRT.cs +++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreRT.cs @@ -1,14 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Reflection; +using System.Runtime.CompilerServices; using System.Text; using Internal.Runtime.Augments; -using Internal.Runtime.CompilerServices; namespace System.Runtime.InteropServices { diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/ValueType.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/ValueType.cs index 6f0463ec9ac..6d7cd86ae2a 100644 --- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/ValueType.cs +++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/ValueType.cs @@ -12,8 +12,8 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime; +using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; using Internal.Runtime.Augments; using Debug = System.Diagnostics.Debug; @@ -146,11 +146,11 @@ namespace System if (fieldType.ElementType == Internal.Runtime.EETypeElementType.Single) { - hashCode = Unsafe.Read<float>(ref fieldData).GetHashCode(); + hashCode = Unsafe.As<byte, float>(ref fieldData).GetHashCode(); } else if (fieldType.ElementType == Internal.Runtime.EETypeElementType.Double) { - hashCode = Unsafe.Read<double>(ref fieldData).GetHashCode(); + hashCode = Unsafe.As<byte, double>(ref fieldData).GetHashCode(); } else if (fieldType.IsPrimitive) { @@ -178,7 +178,7 @@ namespace System } else { - object fieldValue = Unsafe.Read<object>(ref fieldData); + object fieldValue = Unsafe.As<byte, object>(ref fieldData); if (fieldValue != null) { hashCode = fieldValue.GetHashCode(); diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/WeakReference.T.CoreRT.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/WeakReference.T.CoreRT.cs index e98c423c4d9..680e9bb46b4 100644 --- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/WeakReference.T.CoreRT.cs +++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/WeakReference.T.CoreRT.cs @@ -2,11 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; -using Internal.Runtime.CompilerServices; - namespace System { public sealed partial class WeakReference<T> diff --git a/src/coreclr/nativeaot/System.Private.Reflection.Core/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.TypeComponentsCache.cs b/src/coreclr/nativeaot/System.Private.Reflection.Core/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.TypeComponentsCache.cs index 60b4a461b17..67a376af08f 100644 --- a/src/coreclr/nativeaot/System.Private.Reflection.Core/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.TypeComponentsCache.cs +++ b/src/coreclr/nativeaot/System.Private.Reflection.Core/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.TypeComponentsCache.cs @@ -11,7 +11,7 @@ using System.Reflection.Runtime.BindingFlagSupport; using Internal.Reflection.Core.Execution; -using Unsafe = Internal.Runtime.CompilerServices.Unsafe; +using Unsafe = System.Runtime.CompilerServices.Unsafe; namespace System.Reflection.Runtime.TypeInfos { diff --git a/src/coreclr/nativeaot/Test.CoreLib/src/System/Object.cs b/src/coreclr/nativeaot/Test.CoreLib/src/System/Object.cs index faa855843fc..62626be5aad 100644 --- a/src/coreclr/nativeaot/Test.CoreLib/src/System/Object.cs +++ b/src/coreclr/nativeaot/Test.CoreLib/src/System/Object.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Internal.Runtime; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/coreclr/nativeaot/Test.CoreLib/src/Test.CoreLib.csproj b/src/coreclr/nativeaot/Test.CoreLib/src/Test.CoreLib.csproj index 3f602c8f677..07791ebb0e7 100644 --- a/src/coreclr/nativeaot/Test.CoreLib/src/Test.CoreLib.csproj +++ b/src/coreclr/nativeaot/Test.CoreLib/src/Test.CoreLib.csproj @@ -216,8 +216,8 @@ <Compile Include="..\..\Runtime.Base\src\System\Void.cs"> <Link>System\Void.cs</Link> </Compile> - <Compile Include="..\..\Runtime.Base\src\Internal\Runtime\CompilerServices\Unsafe.cs"> - <Link>Internal\Runtime\CompilerServices\Unsafe.cs</Link> + <Compile Include="..\..\Runtime.Base\src\System\Runtime\CompilerServices\Unsafe.cs"> + <Link>System\Runtime\CompilerServices\Unsafe.cs</Link> </Compile> <Compile Include="Internal\Runtime\IDynamicInterfaceCastableSupport.cs" /> <Compile Include="System\Runtime\CompilerServices\ClassConstructorRunner.cs" /> diff --git a/src/coreclr/tools/Common/TypeSystem/IL/CoreRTILProvider.cs b/src/coreclr/tools/Common/TypeSystem/IL/CoreRTILProvider.cs index caebd36dd4c..95e8e7e9d27 100644 --- a/src/coreclr/tools/Common/TypeSystem/IL/CoreRTILProvider.cs +++ b/src/coreclr/tools/Common/TypeSystem/IL/CoreRTILProvider.cs @@ -54,7 +54,7 @@ namespace Internal.IL break; case "Unsafe": { - if (owningType.Namespace == "Internal.Runtime.CompilerServices") + if (owningType.Namespace == "System.Runtime.CompilerServices") return UnsafeIntrinsics.EmitIL(method); } break; diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/UnsafeIntrinsics.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/UnsafeIntrinsics.cs index 277e6bd67ef..c371ec782fe 100644 --- a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/UnsafeIntrinsics.cs +++ b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/UnsafeIntrinsics.cs @@ -31,12 +31,16 @@ namespace Internal.IL.Stubs return EmitAdd(method); case "AddByteOffset": return new ILStubMethodIL(method, new byte[] { (byte)ILOpcode.ldarg_0, (byte)ILOpcode.ldarg_1, (byte)ILOpcode.add, (byte)ILOpcode.ret }, Array.Empty<LocalVariableDefinition>(), null); + case "Copy": + return EmitCopy(method); + case "CopyBlock": + return EmitCopyBlock(method, unaligned: false); + case "CopyBlockUnaligned": + return EmitCopyBlock(method, unaligned: true); + case "InitBlock": + return EmitInitBlock(method, unaligned: false); case "InitBlockUnaligned": - return new ILStubMethodIL(method, new byte[] { - (byte)ILOpcode.ldarg_0, (byte)ILOpcode.ldarg_1, (byte)ILOpcode.ldarg_2, - (byte)ILOpcode.prefix1, unchecked((byte)ILOpcode.unaligned), 0x01, - (byte)ILOpcode.prefix1, unchecked((byte)ILOpcode.initblk), - (byte)ILOpcode.ret }, Array.Empty<LocalVariableDefinition>(), null); + return EmitInitBlock(method, unaligned: true); case "Read": return EmitReadWrite(method, write: false); case "Write": @@ -83,6 +87,12 @@ namespace Internal.IL.Stubs (byte)ILOpcode.ret }, Array.Empty<LocalVariableDefinition>(), null); case "SkipInit": return new ILStubMethodIL(method, new byte[] { (byte)ILOpcode.ret }, Array.Empty<LocalVariableDefinition>(), null); + case "Subtract": + return EmitSubtract(method); + case "SubtractByteOffset": + return new ILStubMethodIL(method, new byte[] { (byte)ILOpcode.ldarg_0, (byte)ILOpcode.ldarg_1, (byte)ILOpcode.sub, (byte)ILOpcode.ret }, Array.Empty<LocalVariableDefinition>(), null); + case "Unbox": + return EmitUnbox(method); } return null; @@ -119,6 +129,26 @@ namespace Internal.IL.Stubs return emit.Link(method); } + private static MethodIL EmitSubtract(MethodDesc method) + { + Debug.Assert(method.Signature.IsStatic && method.Signature.Length == 2); + + TypeSystemContext context = method.Context; + + ILEmitter emit = new ILEmitter(); + ILCodeStream codeStream = emit.NewCodeStream(); + + codeStream.Emit(ILOpcode.ldarg_0); + codeStream.Emit(ILOpcode.ldarg_1); + codeStream.Emit(ILOpcode.sizeof_, emit.NewToken(context.GetSignatureVariable(0, method: true))); + codeStream.Emit(ILOpcode.conv_i); + codeStream.Emit(ILOpcode.mul); + codeStream.Emit(ILOpcode.sub); + codeStream.Emit(ILOpcode.ret); + + return emit.Link(method); + } + private static MethodIL EmitReadWrite(MethodDesc method, bool write, bool unaligned = false) { Debug.Assert(method.Signature.IsStatic && method.Signature.Length == (write ? 2 : 1)); @@ -136,5 +166,76 @@ namespace Internal.IL.Stubs codeStream.Emit(ILOpcode.ret); return emit.Link(method); } + + private static MethodIL EmitCopy(MethodDesc method) + { + Debug.Assert(method.Signature.IsStatic && method.Signature.Length == 2); + + TypeSystemContext context = method.Context; + + ILEmitter emit = new ILEmitter(); + ILCodeStream codeStream = emit.NewCodeStream(); + ILToken token = emit.NewToken(context.GetSignatureVariable(0, method: true)); + + codeStream.EmitLdArg(0); + codeStream.EmitLdArg(1); + codeStream.Emit(ILOpcode.ldobj, token); + codeStream.Emit(ILOpcode.stobj, token); + codeStream.Emit(ILOpcode.ret); + + return emit.Link(method); + } + + private static MethodIL EmitCopyBlock(MethodDesc method, bool unaligned) + { + ILEmitter emit = new ILEmitter(); + ILCodeStream codeStream = emit.NewCodeStream(); + + codeStream.EmitLdArg(0); + codeStream.EmitLdArg(1); + codeStream.EmitLdArg(2); + if (unaligned) + { + codeStream.EmitUnaligned(); + } + codeStream.Emit(ILOpcode.cpblk); + codeStream.Emit(ILOpcode.ret); + + return emit.Link(method); + } + + private static MethodIL EmitInitBlock(MethodDesc method, bool unaligned) + { + ILEmitter emit = new ILEmitter(); + ILCodeStream codeStream = emit.NewCodeStream(); + + codeStream.EmitLdArg(0); + codeStream.EmitLdArg(1); + codeStream.EmitLdArg(2); + if (unaligned) + { + codeStream.EmitUnaligned(); + } + codeStream.Emit(ILOpcode.initblk); + codeStream.Emit(ILOpcode.ret); + + return emit.Link(method); + } + + private static MethodIL EmitUnbox(MethodDesc method) + { + Debug.Assert(method.Signature.IsStatic && method.Signature.Length == 1); + + TypeSystemContext context = method.Context; + + ILEmitter emit = new ILEmitter(); + ILCodeStream codeStream = emit.NewCodeStream(); + + codeStream.EmitLdArg(0); + codeStream.Emit(ILOpcode.unbox, emit.NewToken(context.GetSignatureVariable(0, method: true))); + codeStream.Emit(ILOpcode.ret); + + return emit.Link(method); + } } } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/IL/ReadyToRunILProvider.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/IL/ReadyToRunILProvider.cs index ec9ced76c8d..85cdcdc220d 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/IL/ReadyToRunILProvider.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/IL/ReadyToRunILProvider.cs @@ -46,7 +46,7 @@ namespace Internal.IL return RuntimeHelpersIntrinsics.EmitIL(method); } - if (mdType.Name == "Unsafe" && mdType.Namespace == "Internal.Runtime.CompilerServices") + if (mdType.Name == "Unsafe" && mdType.Namespace == "System.Runtime.CompilerServices") { return UnsafeIntrinsics.EmitIL(method); } diff --git a/src/coreclr/tools/aot/crossgen2.sln b/src/coreclr/tools/aot/crossgen2.sln index ee4d3a0973f..c1054e8c3cc 100644 --- a/src/coreclr/tools/aot/crossgen2.sln +++ b/src/coreclr/tools/aot/crossgen2.sln @@ -17,6 +17,9 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem.Tests", "ILCompiler.TypeSystem.Tests\ILCompiler.TypeSystem.Tests.csproj", "{9E65EC58-B500-4C4A-B57D-BF242129A3C6}" EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ILLink.Shared\ILLink.Shared.projitems*{83a832de-bf4a-44c4-b361-90f5f88b979b}*SharedItemsImports = 5 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Checked|Any CPU = Checked|Any CPU Checked|x64 = Checked|x64 diff --git a/src/coreclr/vm/corelib.h b/src/coreclr/vm/corelib.h index 54f17064fca..a3d89952bd0 100644 --- a/src/coreclr/vm/corelib.h +++ b/src/coreclr/vm/corelib.h @@ -722,7 +722,7 @@ DEFINE_METHOD(RUNTIME_HELPERS, ALLOC_TAILCALL_ARG_BUFFER, AllocTailCallArgB DEFINE_METHOD(RUNTIME_HELPERS, GET_TAILCALL_INFO, GetTailCallInfo, NoSig) DEFINE_METHOD(RUNTIME_HELPERS, DISPATCH_TAILCALLS, DispatchTailCalls, NoSig) -DEFINE_CLASS(UNSAFE, InternalCompilerServices, Unsafe) +DEFINE_CLASS(UNSAFE, CompilerServices, Unsafe) DEFINE_METHOD(UNSAFE, AS_POINTER, AsPointer, NoSig) DEFINE_METHOD(UNSAFE, BYREF_IS_NULL, IsNullRef, NoSig) DEFINE_METHOD(UNSAFE, BYREF_NULLREF, NullRef, NoSig) @@ -733,18 +733,38 @@ DEFINE_METHOD(UNSAFE, BYREF_AS, As, GM_RefTFrom_RetR DEFINE_METHOD(UNSAFE, OBJECT_AS, As, GM_Obj_RetT) DEFINE_METHOD(UNSAFE, BYREF_ADD, Add, GM_RefT_Int_RetRefT) DEFINE_METHOD(UNSAFE, BYREF_INTPTR_ADD, Add, GM_RefT_IntPtr_RetRefT) +DEFINE_METHOD(UNSAFE, BYREF_UINTPTR_ADD, Add, GM_RefT_UIntPtr_RetRefT) DEFINE_METHOD(UNSAFE, PTR_ADD, Add, GM_PtrVoid_Int_RetPtrVoid) DEFINE_METHOD(UNSAFE, BYREF_BYTE_OFFSET, ByteOffset, NoSig) -DEFINE_METHOD(UNSAFE, BYREF_ADD_BYTE_OFFSET, AddByteOffset, GM_RefT_IntPtr_RetRefT) +DEFINE_METHOD(UNSAFE, BYREF_INTPTR_ADD_BYTE_OFFSET, AddByteOffset, GM_RefT_IntPtr_RetRefT) +DEFINE_METHOD(UNSAFE, BYREF_UINTPTR_ADD_BYTE_OFFSET, AddByteOffset, GM_RefT_UIntPtr_RetRefT) DEFINE_METHOD(UNSAFE, BYREF_ARE_SAME, AreSame, NoSig) +DEFINE_METHOD(UNSAFE, PTR_BYREF_COPY, Copy, GM_PtrVoid_RefT_RetVoid) +DEFINE_METHOD(UNSAFE, BYREF_PTR_COPY, Copy, GM_RefT_PtrVoid_RetVoid) +DEFINE_METHOD(UNSAFE, PTR_COPY_BLOCK, CopyBlock, SM_PtrVoid_PtrVoid_UInt_RetVoid) +DEFINE_METHOD(UNSAFE, BYREF_COPY_BLOCK, CopyBlock, SM_RefByte_RefByte_UInt_RetVoid) +DEFINE_METHOD(UNSAFE, PTR_COPY_BLOCK_UNALIGNED, CopyBlockUnaligned, SM_PtrVoid_PtrVoid_UInt_RetVoid) +DEFINE_METHOD(UNSAFE, BYREF_COPY_BLOCK_UNALIGNED, CopyBlockUnaligned, SM_RefByte_RefByte_UInt_RetVoid) DEFINE_METHOD(UNSAFE, BYREF_IS_ADDRESS_GREATER_THAN, IsAddressGreaterThan, NoSig) DEFINE_METHOD(UNSAFE, BYREF_IS_ADDRESS_LESS_THAN, IsAddressLessThan, NoSig) -DEFINE_METHOD(UNSAFE, BYREF_INIT_BLOCK_UNALIGNED, InitBlockUnaligned, NoSig) +DEFINE_METHOD(UNSAFE, BYREF_INIT_BLOCK, InitBlockUnaligned, SM_RefByte_Byte_UInt_RetVoid) +DEFINE_METHOD(UNSAFE, PTR_INIT_BLOCK, InitBlock, SM_PtrVoid_Byte_UInt_RetVoid) +DEFINE_METHOD(UNSAFE, BYREF_INIT_BLOCK_UNALIGNED, InitBlock, SM_RefByte_Byte_UInt_RetVoid) +DEFINE_METHOD(UNSAFE, PTR_INIT_BLOCK_UNALIGNED, InitBlockUnaligned, SM_PtrVoid_Byte_UInt_RetVoid) DEFINE_METHOD(UNSAFE, BYREF_READ_UNALIGNED, ReadUnaligned, GM_RefByte_RetT) DEFINE_METHOD(UNSAFE, BYREF_WRITE_UNALIGNED, WriteUnaligned, GM_RefByte_T_RetVoid) DEFINE_METHOD(UNSAFE, PTR_READ_UNALIGNED, ReadUnaligned, GM_PtrVoid_RetT) DEFINE_METHOD(UNSAFE, PTR_WRITE_UNALIGNED, WriteUnaligned, GM_PtrVoid_T_RetVoid) +DEFINE_METHOD(UNSAFE, READ, Read, NoSig) DEFINE_METHOD(UNSAFE, SKIPINIT, SkipInit, GM_RefT_RetVoid) +DEFINE_METHOD(UNSAFE, BYREF_INT_SUBTRACT, Subtract, GM_RefT_Int_RetRefT) +DEFINE_METHOD(UNSAFE, BYREF_INTPTR_SUBTRACT, Subtract, GM_RefT_IntPtr_RetRefT) +DEFINE_METHOD(UNSAFE, BYREF_UINTPTR_SUBTRACT, Subtract, GM_RefT_UIntPtr_RetRefT) +DEFINE_METHOD(UNSAFE, PTR_INT_SUBTRACT, Subtract, GM_PtrVoid_Int_RetPtrVoid) +DEFINE_METHOD(UNSAFE, BYREF_INTPTR_SUBTRACT_BYTE_OFFSET, SubtractByteOffset, GM_RefT_IntPtr_RetRefT) +DEFINE_METHOD(UNSAFE, BYREF_UINTPTR_SUBTRACT_BYTE_OFFSET, SubtractByteOffset, GM_RefT_UIntPtr_RetRefT) +DEFINE_METHOD(UNSAFE, UNBOX, Unbox, NoSig) +DEFINE_METHOD(UNSAFE, WRITE, Write, NoSig) DEFINE_CLASS(MEMORY_MARSHAL, Interop, MemoryMarshal) DEFINE_METHOD(MEMORY_MARSHAL, GET_ARRAY_DATA_REFERENCE_SZARRAY, GetArrayDataReference, GM_ArrT_RetRefT) diff --git a/src/coreclr/vm/jitinterface.cpp b/src/coreclr/vm/jitinterface.cpp index c994329f968..752f2b23bf5 100644 --- a/src/coreclr/vm/jitinterface.cpp +++ b/src/coreclr/vm/jitinterface.cpp @@ -6555,15 +6555,18 @@ bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__AS_POINTER)->GetMemberDef()) { // Return the argument that was passed in. - static const BYTE ilcode[] = { CEE_LDARG_0, CEE_CONV_U, CEE_RET }; - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 1; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_CONV_U, + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 1); + return true; } - if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__SIZEOF)->GetMemberDef()) + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__SIZEOF)->GetMemberDef()) { _ASSERTE(ftn->HasMethodInstantiation()); Instantiation inst = ftn->GetMethodInstantiation(); @@ -6571,18 +6574,14 @@ bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, _ASSERTE(ftn->GetNumGenericMethodArgs() == 1); mdToken tokGenericArg = FindGenericMethodArgTypeSpec(CoreLibBinder::GetModule()->GetMDImport()); - static BYTE ilcode[] = { CEE_PREFIX1, (CEE_SIZEOF & 0xFF), 0,0,0,0, CEE_RET }; + static const BYTE ilcode[] = + { + CEE_PREFIX1, (CEE_SIZEOF & 0xFF), (BYTE)(tokGenericArg), (BYTE)(tokGenericArg >> 8), (BYTE)(tokGenericArg >> 16), (BYTE)(tokGenericArg >> 24), + CEE_RET + }; - ilcode[2] = (BYTE)(tokGenericArg); - ilcode[3] = (BYTE)(tokGenericArg >> 8); - ilcode[4] = (BYTE)(tokGenericArg >> 16); - ilcode[5] = (BYTE)(tokGenericArg >> 24); + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 1); - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 1; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; return true; } else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_AS)->GetMemberDef() || @@ -6591,12 +6590,14 @@ bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__AS_REF_IN)->GetMemberDef()) { // Return the argument that was passed in. - static const BYTE ilcode[] = { CEE_LDARG_0, CEE_RET }; - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 1; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 1); + return true; } else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_ADD)->GetMemberDef() || @@ -6604,101 +6605,165 @@ bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, { mdToken tokGenericArg = FindGenericMethodArgTypeSpec(CoreLibBinder::GetModule()->GetMDImport()); - static BYTE ilcode[] = { CEE_LDARG_1, - CEE_PREFIX1, (CEE_SIZEOF & 0xFF), 0,0,0,0, + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_PREFIX1, (CEE_SIZEOF & 0xFF), (BYTE)(tokGenericArg), (BYTE)(tokGenericArg >> 8), (BYTE)(tokGenericArg >> 16), (BYTE)(tokGenericArg >> 24), CEE_CONV_I, CEE_MUL, - CEE_LDARG_0, CEE_ADD, - CEE_RET }; + CEE_RET + }; - ilcode[3] = (BYTE)(tokGenericArg); - ilcode[4] = (BYTE)(tokGenericArg >> 8); - ilcode[5] = (BYTE)(tokGenericArg >> 16); - ilcode[6] = (BYTE)(tokGenericArg >> 24); + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 3); - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 2; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; return true; } - else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_INTPTR_ADD)->GetMemberDef()) + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_INTPTR_ADD)->GetMemberDef() || + tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_UINTPTR_ADD)->GetMemberDef()) { mdToken tokGenericArg = FindGenericMethodArgTypeSpec(CoreLibBinder::GetModule()->GetMDImport()); - static BYTE ilcode[] = { CEE_LDARG_1, - CEE_PREFIX1, (CEE_SIZEOF & 0xFF), 0,0,0,0, - CEE_MUL, + static const BYTE ilcode[] = + { CEE_LDARG_0, + CEE_LDARG_1, + CEE_PREFIX1, (CEE_SIZEOF & 0xFF), (BYTE)(tokGenericArg), (BYTE)(tokGenericArg >> 8), (BYTE)(tokGenericArg >> 16), (BYTE)(tokGenericArg >> 24), + CEE_MUL, CEE_ADD, - CEE_RET }; + CEE_RET + }; - ilcode[3] = (BYTE)(tokGenericArg); - ilcode[4] = (BYTE)(tokGenericArg >> 8); - ilcode[5] = (BYTE)(tokGenericArg >> 16); - ilcode[6] = (BYTE)(tokGenericArg >> 24); + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 3); - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 2; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; return true; } - else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_ADD_BYTE_OFFSET)->GetMemberDef()) + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_INTPTR_ADD_BYTE_OFFSET)->GetMemberDef() || + tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_UINTPTR_ADD_BYTE_OFFSET)->GetMemberDef()) { - static BYTE ilcode[] = { CEE_LDARG_0, CEE_LDARG_1, CEE_ADD, CEE_RET }; + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_ADD, + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 2; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; return true; } else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_ARE_SAME)->GetMemberDef()) { // Compare the two arguments - static const BYTE ilcode[] = { CEE_LDARG_0, CEE_LDARG_1, CEE_PREFIX1, (CEE_CEQ & 0xFF), CEE_RET }; - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 2; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_PREFIX1, (CEE_CEQ & 0xFF), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); + + return true; + } + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__PTR_BYREF_COPY)->GetMemberDef() || + tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_PTR_COPY)->GetMemberDef()) + { + _ASSERTE(ftn->HasMethodInstantiation()); + Instantiation inst = ftn->GetMethodInstantiation(); + _ASSERTE(ftn->GetNumGenericMethodArgs() == 1); + mdToken tokGenericArg = FindGenericMethodArgTypeSpec(CoreLibBinder::GetModule()->GetMDImport()); + + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_LDOBJ, (BYTE)(tokGenericArg), (BYTE)(tokGenericArg >> 8), (BYTE)(tokGenericArg >> 16), (BYTE)(tokGenericArg >> 24), + CEE_STOBJ, (BYTE)(tokGenericArg), (BYTE)(tokGenericArg >> 8), (BYTE)(tokGenericArg >> 16), (BYTE)(tokGenericArg >> 24), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 3); + + return true; + } + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__PTR_COPY_BLOCK)->GetMemberDef() || + tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_COPY_BLOCK)->GetMemberDef()) + { + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_LDARG_2, + CEE_PREFIX1, (CEE_CPBLK & 0xFF), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 3); + + return true; + } + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__PTR_COPY_BLOCK_UNALIGNED)->GetMemberDef() || + tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_COPY_BLOCK_UNALIGNED)->GetMemberDef()) + { + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_LDARG_2, + CEE_PREFIX1, (CEE_UNALIGNED & 0xFF), 0x01, + CEE_PREFIX1, (CEE_CPBLK & 0xFF), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 3); + return true; } else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_IS_ADDRESS_GREATER_THAN)->GetMemberDef()) { // Compare the two arguments - static const BYTE ilcode[] = { CEE_LDARG_0, CEE_LDARG_1, CEE_PREFIX1, (CEE_CGT_UN & 0xFF), CEE_RET }; - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 2; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_PREFIX1, (CEE_CGT_UN & 0xFF), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); + return true; } else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_IS_ADDRESS_LESS_THAN)->GetMemberDef()) { // Compare the two arguments - static const BYTE ilcode[] = { CEE_LDARG_0, CEE_LDARG_1, CEE_PREFIX1, (CEE_CLT_UN & 0xFF), CEE_RET }; - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 2; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_PREFIX1, (CEE_CLT_UN & 0xFF), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); + return true; } else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_NULLREF)->GetMemberDef()) { - static const BYTE ilcode[] = { CEE_LDC_I4_0, CEE_CONV_U, CEE_RET }; - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 1; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; + static const BYTE ilcode[] = + { + CEE_LDC_I4_0, + CEE_CONV_U, + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 1); + return true; } else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_IS_NULL)->GetMemberDef()) @@ -6706,22 +6771,50 @@ bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, // 'ldnull' opcode would produce type o, and we can't compare & against o (ECMA-335, Table III.4). // However, we can compare & against native int, so we'll use that instead. - static const BYTE ilcode[] = { CEE_LDARG_0, CEE_LDC_I4_0, CEE_CONV_U, CEE_PREFIX1, (CEE_CEQ & 0xFF), CEE_RET }; - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 2; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDC_I4_0, + CEE_CONV_U, + CEE_PREFIX1, (CEE_CEQ & 0xFF), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); + return true; } - else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_INIT_BLOCK_UNALIGNED)->GetMemberDef()) + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_INIT_BLOCK)->GetMemberDef() || + tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__PTR_INIT_BLOCK)->GetMemberDef()) { - static const BYTE ilcode[] = { CEE_LDARG_0, CEE_LDARG_1, CEE_LDARG_2, CEE_PREFIX1, (CEE_UNALIGNED & 0xFF), 0x01, CEE_PREFIX1, (CEE_INITBLK & 0xFF), CEE_RET }; - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 3; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_LDARG_2, + CEE_PREFIX1, (CEE_INITBLK & 0xFF), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 3); + + return true; + } + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_INIT_BLOCK_UNALIGNED)->GetMemberDef() || + tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__PTR_INIT_BLOCK_UNALIGNED)->GetMemberDef()) + { + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_LDARG_2, + CEE_PREFIX1, (CEE_UNALIGNED & 0xFF), 0x01, + CEE_PREFIX1, (CEE_INITBLK & 0xFF), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 3); + return true; } else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_BYTE_OFFSET)->GetMemberDef()) @@ -6734,11 +6827,8 @@ bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, CEE_RET }; - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 2; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); + return true; } else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_READ_UNALIGNED)->GetMemberDef() || @@ -6749,7 +6839,7 @@ bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, _ASSERTE(ftn->GetNumGenericMethodArgs() == 1); mdToken tokGenericArg = FindGenericMethodArgTypeSpec(CoreLibBinder::GetModule()->GetMDImport()); - static const BYTE ilcode[] + static const BYTE ilcode[] = { CEE_LDARG_0, CEE_PREFIX1, (CEE_UNALIGNED & 0xFF), 1, @@ -6757,11 +6847,8 @@ bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, CEE_RET }; - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 2; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); + return true; } else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_WRITE_UNALIGNED)->GetMemberDef() || @@ -6772,7 +6859,7 @@ bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, _ASSERTE(ftn->GetNumGenericMethodArgs() == 1); mdToken tokGenericArg = FindGenericMethodArgTypeSpec(CoreLibBinder::GetModule()->GetMDImport()); - static const BYTE ilcode[] + static const BYTE ilcode[] = { CEE_LDARG_0, CEE_LDARG_1, @@ -6781,22 +6868,128 @@ bool getILIntrinsicImplementationForUnsafe(MethodDesc * ftn, CEE_RET }; - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 2; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); + + return true; + } + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__READ)->GetMemberDef()) + { + _ASSERTE(ftn->HasMethodInstantiation()); + Instantiation inst = ftn->GetMethodInstantiation(); + _ASSERTE(ftn->GetNumGenericMethodArgs() == 1); + mdToken tokGenericArg = FindGenericMethodArgTypeSpec(CoreLibBinder::GetModule()->GetMDImport()); + + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDOBJ, (BYTE)(tokGenericArg), (BYTE)(tokGenericArg >> 8), (BYTE)(tokGenericArg >> 16), (BYTE)(tokGenericArg >> 24), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); + return true; } else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__SKIPINIT)->GetMemberDef()) { - static BYTE ilcode[] = { CEE_RET }; + static const BYTE ilcode[] = + { + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 0); + + return true; + } + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_INT_SUBTRACT)->GetMemberDef() || + tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__PTR_INT_SUBTRACT)->GetMemberDef()) + { + mdToken tokGenericArg = FindGenericMethodArgTypeSpec(CoreLibBinder::GetModule()->GetMDImport()); + + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_PREFIX1, (CEE_SIZEOF & 0xFF), (BYTE)(tokGenericArg), (BYTE)(tokGenericArg >> 8), (BYTE)(tokGenericArg >> 16), (BYTE)(tokGenericArg >> 24), + CEE_CONV_I, + CEE_MUL, + CEE_SUB, + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 3); + + return true; + } + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_INTPTR_SUBTRACT)->GetMemberDef() || + tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_UINTPTR_SUBTRACT)->GetMemberDef()) + { + mdToken tokGenericArg = FindGenericMethodArgTypeSpec(CoreLibBinder::GetModule()->GetMDImport()); + + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_PREFIX1, (CEE_SIZEOF & 0xFF), (BYTE)(tokGenericArg), (BYTE)(tokGenericArg >> 8), (BYTE)(tokGenericArg >> 16), (BYTE)(tokGenericArg >> 24), + CEE_MUL, + CEE_SUB, + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 3); + + return true; + } + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_INTPTR_SUBTRACT_BYTE_OFFSET)->GetMemberDef() || + tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__BYREF_UINTPTR_SUBTRACT_BYTE_OFFSET)->GetMemberDef()) + { + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_SUB, + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); + + return true; + } + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__WRITE)->GetMemberDef()) + { + _ASSERTE(ftn->HasMethodInstantiation()); + Instantiation inst = ftn->GetMethodInstantiation(); + _ASSERTE(ftn->GetNumGenericMethodArgs() == 1); + mdToken tokGenericArg = FindGenericMethodArgTypeSpec(CoreLibBinder::GetModule()->GetMDImport()); + + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_LDARG_1, + CEE_STOBJ, (BYTE)(tokGenericArg), (BYTE)(tokGenericArg >> 8), (BYTE)(tokGenericArg >> 16), (BYTE)(tokGenericArg >> 24), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); + + return true; + } + else if (tk == CoreLibBinder::GetMethod(METHOD__UNSAFE__UNBOX)->GetMemberDef()) + { + _ASSERTE(ftn->HasMethodInstantiation()); + Instantiation inst = ftn->GetMethodInstantiation(); + _ASSERTE(ftn->GetNumGenericMethodArgs() == 1); + mdToken tokGenericArg = FindGenericMethodArgTypeSpec(CoreLibBinder::GetModule()->GetMDImport()); + + static const BYTE ilcode[] = + { + CEE_LDARG_0, + CEE_UNBOX, (BYTE)(tokGenericArg), (BYTE)(tokGenericArg >> 8), (BYTE)(tokGenericArg >> 16), (BYTE)(tokGenericArg >> 24), + CEE_RET + }; + + setILIntrinsicMethodInfo(methInfo,const_cast<BYTE*>(ilcode),sizeof(ilcode), 2); - methInfo->ILCode = const_cast<BYTE*>(ilcode); - methInfo->ILCodeSize = sizeof(ilcode); - methInfo->maxStack = 0; - methInfo->EHcount = 0; - methInfo->options = (CorInfoOptions)0; return true; } @@ -7218,6 +7411,15 @@ bool getILIntrinsicImplementationForActivator(MethodDesc* ftn, return true; } +void setILIntrinsicMethodInfo(CORINFO_METHOD_INFO* methInfo,uint8_t* ilcode, int ilsize, int maxstack) +{ + methInfo->ILCode = ilcode; + methInfo->ILCodeSize = ilsize; + methInfo->maxStack = maxstack; + methInfo->EHcount = 0; + methInfo->options = (CorInfoOptions)0; +} + //--------------------------------------------------------------------------------------- // //static diff --git a/src/coreclr/vm/jitinterface.h b/src/coreclr/vm/jitinterface.h index 1afac1ba802..4c35ac5713c 100644 --- a/src/coreclr/vm/jitinterface.h +++ b/src/coreclr/vm/jitinterface.h @@ -71,6 +71,12 @@ PCODE UnsafeJitFunction(PrepareCodeConfig* config, CORJIT_FLAGS flags, ULONG* sizeOfCode = NULL); +void setILIntrinsicMethodInfo(CORINFO_METHOD_INFO* methInfo, + uint8_t* ilcode, + int ilsize, + int maxstack); + + void getMethodInfoHelper(MethodDesc * ftn, CORINFO_METHOD_HANDLE ftnHnd, COR_ILMETHOD_DECODER * header, diff --git a/src/coreclr/vm/metasig.h b/src/coreclr/vm/metasig.h index 54d3d4780b6..8be89bf3387 100644 --- a/src/coreclr/vm/metasig.h +++ b/src/coreclr/vm/metasig.h @@ -233,6 +233,7 @@ DEFINE_METASIG(SM(PtrSByt_RetInt, P(B), i)) DEFINE_METASIG(SM(IntPtr_RetIntPtr, I, I)) DEFINE_METASIG(SM(UIntPtr_RetIntPtr, U, I)) DEFINE_METASIG(SM(PtrByte_PtrByte_Int_RetVoid, P(b) P(b) i, v)) +DEFINE_METASIG(SM(PtrVoid_Byte_UInt_RetVoid, P(v) b K, v)) DEFINE_METASIG(SM(RefObj_IntPtr_RetVoid, r(j) I, v)) DEFINE_METASIG(SM(RefObj_RefIntPtr_RetVoid, r(j) r(I), v)) DEFINE_METASIG(SM(IntPtr_RefObj_IntPtr_RetVoid, I r(j) I, v)) @@ -267,6 +268,8 @@ DEFINE_METASIG(SM(RefSByt_RetSByt, r(B), B)) DEFINE_METASIG(SM(RefSByt_SByt, r(B) B, v)) DEFINE_METASIG(SM(RefByte_RetByte, r(b), b)) DEFINE_METASIG(SM(RefByte_Byte, r(b) b, v)) +DEFINE_METASIG(SM(RefByte_RefByte_UInt_RetVoid, r(b) r(b) K, v)) +DEFINE_METASIG(SM(RefByte_Byte_UInt_RetVoid, r(b) b K, v)) DEFINE_METASIG(SM(RefShrt_RetShrt, r(h), h)) DEFINE_METASIG(SM(RefShrt_Shrt, r(h) h, v)) DEFINE_METASIG(SM(RefUShrt_RetUShrt, r(H), H)) @@ -301,8 +304,11 @@ DEFINE_METASIG(GM(RefTFrom_RetRefTTo, IMAGE_CEE_CS_CALLCONV_DEFAULT, 2, r(M(0)), DEFINE_METASIG(GM(Obj_RetT, IMAGE_CEE_CS_CALLCONV_DEFAULT, 1, j, M(0))) DEFINE_METASIG(GM(RefT_Int_RetRefT, IMAGE_CEE_CS_CALLCONV_DEFAULT, 1, r(M(0)) i, r(M(0)))) DEFINE_METASIG(GM(RefT_IntPtr_RetRefT, IMAGE_CEE_CS_CALLCONV_DEFAULT, 1, r(M(0)) I, r(M(0)))) +DEFINE_METASIG(GM(RefT_UIntPtr_RetRefT, IMAGE_CEE_CS_CALLCONV_DEFAULT, 1, r(M(0)) U, r(M(0)))) DEFINE_METASIG(GM(PtrVoid_Int_RetPtrVoid, IMAGE_CEE_CS_CALLCONV_DEFAULT, 1, P(v) i, P(v))) DEFINE_METASIG(GM(RefT_RetVoid, IMAGE_CEE_CS_CALLCONV_DEFAULT, 1, r(M(0)), v)) +DEFINE_METASIG(GM(PtrVoid_RefT_RetVoid, IMAGE_CEE_CS_CALLCONV_DEFAULT, 1, P(v) r(M(0)), v)) +DEFINE_METASIG(GM(RefT_PtrVoid_RetVoid, IMAGE_CEE_CS_CALLCONV_DEFAULT, 1, r(M(0)) P(v), v)) DEFINE_METASIG(GM(ArrT_RetRefT, IMAGE_CEE_CS_CALLCONV_DEFAULT, 1, a(M(0)), r(M(0)))) DEFINE_METASIG_T(SM(Array_RetRefByte, C(ARRAY), r(b))) @@ -335,6 +341,7 @@ DEFINE_METASIG(SM(PtrChar_RetInt, P(u), i)) DEFINE_METASIG(SM(IntPtr_IntPtr_RetIntPtr, I I, I)) DEFINE_METASIG(SM(IntPtr_IntPtr_Int_RetIntPtr, I I i, I)) DEFINE_METASIG(SM(PtrVoid_PtrVoid_RetVoid, P(v) P(v), v)) +DEFINE_METASIG(SM(PtrVoid_PtrVoid_UInt_RetVoid, P(v) P(v) K, v)) DEFINE_METASIG(IM(Obj_RetBool, j, F)) DEFINE_METASIG(SM(Obj_RetVoid, j, v)) DEFINE_METASIG(SM(Obj_RetInt, j, i)) @@ -556,7 +563,6 @@ DEFINE_METASIG_T(SM(_ThreadPoolWaitOrTimerCallback_Bool_RetVoid, C(TPWAITORTIMER // For FailFast DEFINE_METASIG(SM(Str_RetVoid, s, v)) -DEFINE_METASIG(SM(Str_Uint_RetVoid, s K, v)) DEFINE_METASIG_T(SM(Str_Exception_RetVoid, s C(EXCEPTION), v)) DEFINE_METASIG_T(SM(Str_Exception_Str_RetVoid, s C(EXCEPTION) s, v)) diff --git a/src/coreclr/vm/namespace.h b/src/coreclr/vm/namespace.h index 3b1c409a9c5..a6e6d23cc4f 100644 --- a/src/coreclr/vm/namespace.h +++ b/src/coreclr/vm/namespace.h @@ -37,7 +37,6 @@ #define g_IntrinsicsNS g_RuntimeNS ".Intrinsics" #define g_NumericsNS g_SystemNS ".Numerics" -#define g_InternalCompilerServicesNS "Internal.Runtime.CompilerServices" #define g_CompilerServicesNS g_RuntimeNS ".CompilerServices" #define g_ConstrainedExecutionNS g_RuntimeNS ".ConstrainedExecution" diff --git a/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj b/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj index 64ac366ee39..8369b377437 100644 --- a/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj +++ b/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj @@ -21,7 +21,6 @@ <ItemGroup> <PackageReference Include="System.Reflection.Metadata" Version="1.8.0" /> <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" /> - <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> </ItemGroup> </Project> diff --git a/src/libraries/Common/Common.Tests.sln b/src/libraries/Common/Common.Tests.sln index 7666ff36de1..ecc7dd9a926 100644 --- a/src/libraries/Common/Common.Tests.sln +++ b/src/libraries/Common/Common.Tests.sln @@ -5,19 +5,13 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A0A180C4-8292-45EE-A4B9-0A359BC9C2FC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2141FEEA-0422-4319-B88D-DA15CBD77599}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{026037B4-2AC1-41C0-BB7C-1F8BAF64335D}" 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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F81003B8-54C4-42B1-AD93-255B62E9DC55}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A97E6A4A-8C69-4839-B3C5-3C7A716AC70A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{056FFC76-3DAC-4C6C-8E96-303B403EB50B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D178FCB7-E393-496F-937A-C438941CED2B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -37,14 +31,6 @@ 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 - {A0A180C4-8292-45EE-A4B9-0A359BC9C2FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0A180C4-8292-45EE-A4B9-0A359BC9C2FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0A180C4-8292-45EE-A4B9-0A359BC9C2FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0A180C4-8292-45EE-A4B9-0A359BC9C2FC}.Release|Any CPU.Build.0 = Release|Any CPU - {2141FEEA-0422-4319-B88D-DA15CBD77599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2141FEEA-0422-4319-B88D-DA15CBD77599}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2141FEEA-0422-4319-B88D-DA15CBD77599}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2141FEEA-0422-4319-B88D-DA15CBD77599}.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 @@ -61,10 +47,8 @@ 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} - {A0A180C4-8292-45EE-A4B9-0A359BC9C2FC} = {A97E6A4A-8C69-4839-B3C5-3C7A716AC70A} - {2141FEEA-0422-4319-B88D-DA15CBD77599} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B} - {026037B4-2AC1-41C0-BB7C-1F8BAF64335D} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B} - {9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B} + {026037B4-2AC1-41C0-BB7C-1F8BAF64335D} = {D178FCB7-E393-496F-937A-C438941CED2B} + {9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07} = {D178FCB7-E393-496F-937A-C438941CED2B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4543E82B-8616-438A-B58B-EE47079D6956} diff --git a/src/libraries/Common/src/System/HexConverter.cs b/src/libraries/Common/src/System/HexConverter.cs index c62aa8add55..7bae713b87c 100644 --- a/src/libraries/Common/src/System/HexConverter.cs +++ b/src/libraries/Common/src/System/HexConverter.cs @@ -7,7 +7,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; #endif namespace System diff --git a/src/libraries/Common/src/System/Runtime/InteropServices/ArrayMarshaller.cs b/src/libraries/Common/src/System/Runtime/InteropServices/ArrayMarshaller.cs index 7dfa067b001..2be3997842f 100644 --- a/src/libraries/Common/src/System/Runtime/InteropServices/ArrayMarshaller.cs +++ b/src/libraries/Common/src/System/Runtime/InteropServices/ArrayMarshaller.cs @@ -6,12 +6,9 @@ // // Types in this file are used for generated p/invokes (docs/design/features/source-generator-pinvokes.md). // -#if DLLIMPORTGENERATOR_INTERNALUNSAFE -using Internal.Runtime.CompilerServices; -#else -using System.Runtime.CompilerServices; -#endif + using System.Diagnostics; +using System.Runtime.CompilerServices; namespace System.Runtime.InteropServices.GeneratedMarshalling { diff --git a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj index 0a4b6219bae..ecbb20d8ee5 100644 --- a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj +++ b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj @@ -107,6 +107,5 @@ </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln index 967eb9650e3..c15e86ecb65 100644 --- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln +++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0D1C7DCB-970D-4099-AC9F-A01E75923EC6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F6EB175D-190F-4C2E-9640-39B7BE047A17}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{111B1B5B-A00 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D6A9108E-553B-445E-A037-FA4F3140A279}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Release|Any CPU.Build.0 = Release|Any CPU - {AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.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 + {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 + {D0F1936C-CF7C-4448-9F90-B9DEABE89EBB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {CAEE0409-CCC3-4EA6-AB54-177FD305D42D} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C} {51D9518A-464D-4257-9567-3BDCFF24F3EE} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C} {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB} - {0D1C7DCB-970D-4099-AC9F-A01E75923EC6} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB} {4D4BED71-8904-4A74-88CD-63D002CCACD0} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D} - {AF838F1D-5C1C-472B-B31C-9A3B7507BB4B} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D} + {F6EB175D-190F-4C2E-9640-39B7BE047A17} = {D6A9108E-553B-445E-A037-FA4F3140A279} + {D0F1936C-CF7C-4448-9F90-B9DEABE89EBB} = {D6A9108E-553B-445E-A037-FA4F3140A279} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A835CEDB-E9E2-49EE-8499-BD7FDD984E53} diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/Microsoft.Bcl.AsyncInterfaces.csproj b/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/Microsoft.Bcl.AsyncInterfaces.csproj index 2f9311e21bc..313bc2ab486 100644 --- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/Microsoft.Bcl.AsyncInterfaces.csproj +++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/Microsoft.Bcl.AsyncInterfaces.csproj @@ -43,7 +43,5 @@ System.Collections.Generic.IAsyncEnumerator</PackageDescription> </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln b/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln index 49b305ae7ab..e64823dd0a1 100644 --- a/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln +++ b/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9DA2C0A8-13C0-4F65-85AC-29AB97A039EB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AA593349-BB82-43F0-AD9E-B4EEE8B4B97E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DD0869E8-3AE5-43AA-AD9C-1E26859D9D49}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E6224881-0E5B-4FDC-99C4-DDE6E59F806B}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{85A4D137-FEE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E4FC7A8F-5024-4D51-9753-C2C61CF9DAD0}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{9C11B257-64B7-4EC9-BF3E-4859FB66281D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {9DA2C0A8-13C0-4F65-85AC-29AB97A039EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9DA2C0A8-13C0-4F65-85AC-29AB97A039EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9DA2C0A8-13C0-4F65-85AC-29AB97A039EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9DA2C0A8-13C0-4F65-85AC-29AB97A039EB}.Release|Any CPU.Build.0 = Release|Any CPU - {DD0869E8-3AE5-43AA-AD9C-1E26859D9D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD0869E8-3AE5-43AA-AD9C-1E26859D9D49}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD0869E8-3AE5-43AA-AD9C-1E26859D9D49}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD0869E8-3AE5-43AA-AD9C-1E26859D9D49}.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 + {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 + {7223E4B2-40ED-48FB-9BFA-07002AD674DB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {A18337A4-46D6-470C-A995-CA70E5311F19} = {E6224881-0E5B-4FDC-99C4-DDE6E59F806B} {7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA} = {E6224881-0E5B-4FDC-99C4-DDE6E59F806B} {BF947490-D7AE-46E1-B4E0-D8A6D1EA8E5A} = {85A4D137-FEEC-4F3C-9358-F2BFFFF6D2DE} - {9DA2C0A8-13C0-4F65-85AC-29AB97A039EB} = {85A4D137-FEEC-4F3C-9358-F2BFFFF6D2DE} {78073F44-8382-473D-8B24-90D54B57129E} = {E4FC7A8F-5024-4D51-9753-C2C61CF9DAD0} - {DD0869E8-3AE5-43AA-AD9C-1E26859D9D49} = {E4FC7A8F-5024-4D51-9753-C2C61CF9DAD0} + {AA593349-BB82-43F0-AD9E-B4EEE8B4B97E} = {9C11B257-64B7-4EC9-BF3E-4859FB66281D} + {7223E4B2-40ED-48FB-9BFA-07002AD674DB} = {9C11B257-64B7-4EC9-BF3E-4859FB66281D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A1ECF510-F5DB-4E7F-853E-DD3C0CE04C12} 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 6e4b5e8761b..fc148a7787b 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,15 +5,15 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{94318389-1E44-44D5-8584-ACE54E8AFAB7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{78DDB7FF-F773-49B5-8A18-052AF1518D51}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BEF8A648-9F38-4473-AE1D-EE4AB0B7531E}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DDF63C60-9514-44F6-BE59-551CCF38F5EB}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3974376A-2BB7-4695-B012-A0DB15EE777A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2397077B-82F7-498B-9013-96A0771E2197}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{34CAB486-402D-43AE-BA78-6D58A9A337B4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -33,14 +33,14 @@ 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 - {94318389-1E44-44D5-8584-ACE54E8AFAB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94318389-1E44-44D5-8584-ACE54E8AFAB7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94318389-1E44-44D5-8584-ACE54E8AFAB7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94318389-1E44-44D5-8584-ACE54E8AFAB7}.Release|Any CPU.Build.0 = Release|Any CPU - {BEF8A648-9F38-4473-AE1D-EE4AB0B7531E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BEF8A648-9F38-4473-AE1D-EE4AB0B7531E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEF8A648-9F38-4473-AE1D-EE4AB0B7531E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BEF8A648-9F38-4473-AE1D-EE4AB0B7531E}.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 + {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 + {1943D0D3-09C6-4B6A-AF96-CE50B5395631}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -49,8 +49,8 @@ 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} - {BEF8A648-9F38-4473-AE1D-EE4AB0B7531E} = {3974376A-2BB7-4695-B012-A0DB15EE777A} - {94318389-1E44-44D5-8584-ACE54E8AFAB7} = {2397077B-82F7-498B-9013-96A0771E2197} + {78DDB7FF-F773-49B5-8A18-052AF1518D51} = {34CAB486-402D-43AE-BA78-6D58A9A337B4} + {1943D0D3-09C6-4B6A-AF96-CE50B5395631} = {34CAB486-402D-43AE-BA78-6D58A9A337B4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8CAF340C-E3EF-4DF0-998D-A17DE2C72207} 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 8090c533edc..e2d284a0f40 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,14 +7,16 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{470D5AB0-A04A-46EE-8444-9247D000958E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D71A4150-166D-4195-90BC-5A44035FD836}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{8C891B23-07C9-4261-9DB2-C8EAE91A0EA0}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4B23C940-1856-48C0-94F2-66D4ADC41EA4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F5D1F8C5-8A12-4EE8-9ABA-D393EBBCB1AA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CF895AB4-6805-4E7D-B8B3-7D363C7D6027}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,14 +39,14 @@ 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 - {470D5AB0-A04A-46EE-8444-9247D000958E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {470D5AB0-A04A-46EE-8444-9247D000958E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {470D5AB0-A04A-46EE-8444-9247D000958E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {470D5AB0-A04A-46EE-8444-9247D000958E}.Release|Any CPU.Build.0 = Release|Any CPU - {8C891B23-07C9-4261-9DB2-C8EAE91A0EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C891B23-07C9-4261-9DB2-C8EAE91A0EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C891B23-07C9-4261-9DB2-C8EAE91A0EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C891B23-07C9-4261-9DB2-C8EAE91A0EA0}.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 + {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 + {22B98A76-A2BE-47ED-82F2-9BD0EF50B22D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -52,10 +54,10 @@ Global GlobalSection(NestedProjects) = preSolution {E206E7BE-3269-4E6E-BF22-0E20B687E90C} = {4B23C940-1856-48C0-94F2-66D4ADC41EA4} {3CE7A561-5A2F-4AF3-8CC2-8148BC5CCE90} = {4B23C940-1856-48C0-94F2-66D4ADC41EA4} - {470D5AB0-A04A-46EE-8444-9247D000958E} = {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} - {8C891B23-07C9-4261-9DB2-C8EAE91A0EA0} = {F5D1F8C5-8A12-4EE8-9ABA-D393EBBCB1AA} + {D71A4150-166D-4195-90BC-5A44035FD836} = {CF895AB4-6805-4E7D-B8B3-7D363C7D6027} + {22B98A76-A2BE-47ED-82F2-9BD0EF50B22D} = {CF895AB4-6805-4E7D-B8B3-7D363C7D6027} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {68BF65EA-B5BA-44C6-8463-45BA1F186520} 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 134bd735e9c..e5a2812b26c 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,9 +39,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{19883A68-1293-46AE-98FD-8C559D414EFD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{5ED0E794-E7DF-4C38-9510-0E3CFDF0BEFA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B6D30918-C1B7-4225-A809-E13A5817DE22}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D430F7D3-0FCA-4C78-9BBA-2E525DF7EABE}" EndProject @@ -49,6 +49,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FF162B75-76D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{67719AA1-52DC-4E35-B6F7-2F53A50B913A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C77F6550-84B5-4C20-8541-8B6118A8651A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -135,14 +137,14 @@ 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 - {19883A68-1293-46AE-98FD-8C559D414EFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {19883A68-1293-46AE-98FD-8C559D414EFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {19883A68-1293-46AE-98FD-8C559D414EFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {19883A68-1293-46AE-98FD-8C559D414EFD}.Release|Any CPU.Build.0 = Release|Any CPU - {B6D30918-C1B7-4225-A809-E13A5817DE22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6D30918-C1B7-4225-A809-E13A5817DE22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6D30918-C1B7-4225-A809-E13A5817DE22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6D30918-C1B7-4225-A809-E13A5817DE22}.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 + {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 + {94673D00-C1BB-48F3-8A1B-75DDEA247AB0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -158,18 +160,18 @@ Global {BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} {1958AE1D-55EA-4550-BE58-0AFDBB2EDB8A} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} {FCF170AC-100A-4EEE-849E-497A299EDE3F} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} - {19883A68-1293-46AE-98FD-8C559D414EFD} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} {21CD6C35-65E2-414A-B9A1-22A0DD57977A} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} {AA9524B1-37B3-4A6D-B2D5-A6A2C910E1A9} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} {CD3D6F5B-0500-4035-A60A-592A2E231011} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} {9A8C0B86-1CA3-4FFE-86FC-9EF0A733BEC0} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} {78971B06-2519-45B7-B761-C8A30C168EBE} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} - {A7F69E1A-D6DF-46A9-A347-66354425BC9E} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} - {11D672F4-D640-423D-A79A-2A5EA498D3BF} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} {C76753D0-F564-45E9-AA60-A846EFE0A414} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} {5A9310B4-82AB-46F8-83C1-72D21A6A761F} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} {DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} - {B6D30918-C1B7-4225-A809-E13A5817DE22} = {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} + {94673D00-C1BB-48F3-8A1B-75DDEA247AB0} = {C77F6550-84B5-4C20-8541-8B6118A8651A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {38ED157C-646E-43DD-B8B0-562DD5715E27} 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 ec52c0138fb..315066a433a 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,14 +7,16 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{63E86A57-8F84-435E-8D03-5464070A276F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{73971F14-741C-4B77-9D47-F5CE40D1B36C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D097AD3E-419C-4209-A7D0-52A53A16CED6}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B8E3F471-7DA8-4D1D-9468-21542AAD0A2B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{343DB133-E1E0-4FC0-896C-DA15D0C58AD5}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0FE1CBCE-E173-4926-9CD1-64D7AE63A994}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,14 +39,14 @@ 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 - {63E86A57-8F84-435E-8D03-5464070A276F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63E86A57-8F84-435E-8D03-5464070A276F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63E86A57-8F84-435E-8D03-5464070A276F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63E86A57-8F84-435E-8D03-5464070A276F}.Release|Any CPU.Build.0 = Release|Any CPU - {D097AD3E-419C-4209-A7D0-52A53A16CED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D097AD3E-419C-4209-A7D0-52A53A16CED6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D097AD3E-419C-4209-A7D0-52A53A16CED6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D097AD3E-419C-4209-A7D0-52A53A16CED6}.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 + {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 + {92E86957-5217-456B-B9CA-E0C204822367}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -52,10 +54,10 @@ Global GlobalSection(NestedProjects) = preSolution {9F7A72E7-041E-47C8-ABD7-C5EF028AFECF} = {B8E3F471-7DA8-4D1D-9468-21542AAD0A2B} {711119F1-7759-49B9-8B66-EF72F4163729} = {B8E3F471-7DA8-4D1D-9468-21542AAD0A2B} - {63E86A57-8F84-435E-8D03-5464070A276F} = {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} - {D097AD3E-419C-4209-A7D0-52A53A16CED6} = {343DB133-E1E0-4FC0-896C-DA15D0C58AD5} + {73971F14-741C-4B77-9D47-F5CE40D1B36C} = {0FE1CBCE-E173-4926-9CD1-64D7AE63A994} + {92E86957-5217-456B-B9CA-E0C204822367} = {0FE1CBCE-E173-4926-9CD1-64D7AE63A994} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {35095991-4720-4061-A85F-72B39261D8C0} 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 dab71d36373..f845dc97cc4 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,9 +23,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8D6A2F57-CCA3-4845-9569-29560465B6AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{70E5410C-8839-4CBA-8999-1F393A5A57E2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9E2A4D82-0CBF-4908-8801-11B1C209EB23}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AAE738F3-89AC-4406-B1D9-A61A2C3A1CF0}" EndProject @@ -33,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F43534CA-C41 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{94EEF122-C307-4BF0-88FE-263B89B59F9F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CC3961B0-C62D-44B9-91DB-11D94A3F91A5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -87,14 +89,14 @@ 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 - {8D6A2F57-CCA3-4845-9569-29560465B6AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D6A2F57-CCA3-4845-9569-29560465B6AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D6A2F57-CCA3-4845-9569-29560465B6AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D6A2F57-CCA3-4845-9569-29560465B6AC}.Release|Any CPU.Build.0 = Release|Any CPU - {9E2A4D82-0CBF-4908-8801-11B1C209EB23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E2A4D82-0CBF-4908-8801-11B1C209EB23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E2A4D82-0CBF-4908-8801-11B1C209EB23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E2A4D82-0CBF-4908-8801-11B1C209EB23}.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 + {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 + {6E58AF2F-AB35-4279-9135-67E97BCE1432}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -107,13 +109,13 @@ Global {39D99379-E744-4295-9CA8-B5C6DE286EA0} = {F43534CA-C419-405E-B239-CDE2BDC703BE} {42DAD2C1-0FD4-442E-B218-9CDACE6EEB01} = {F43534CA-C419-405E-B239-CDE2BDC703BE} {3C288A6A-17C9-40A9-A1AA-E0FC3927DFE3} = {F43534CA-C419-405E-B239-CDE2BDC703BE} - {8D6A2F57-CCA3-4845-9569-29560465B6AC} = {F43534CA-C419-405E-B239-CDE2BDC703BE} {958E5946-FD21-4167-B471-8CEC2CB8D75D} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} {8C7443D8-864A-4DAE-8835-108580C289F5} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} {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} - {9E2A4D82-0CBF-4908-8801-11B1C209EB23} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {70E5410C-8839-4CBA-8999-1F393A5A57E2} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5} + {6E58AF2F-AB35-4279-9135-67E97BCE1432} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A97DC4BF-32F0-46E8-B91C-84D1E7F2A27E} 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 cc3275bcfd2..cbb40ae12e4 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,9 +27,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3746E645-BFCF-4EF1-88E1-CF0D27805608}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DF2BF748-BD4D-40AD-A8D5-8969AC8DE4C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{54F971EC-DA31-4060-B0D3-CE89F62E4B40}" EndProject @@ -37,6 +37,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9AF531D0-D6C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F8D4BCC4-4B13-4EFC-A5AE-38C26519EDDF}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{24F3652F-573B-445E-8690-BE73B8F0A2C7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -99,14 +101,14 @@ 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 - {3746E645-BFCF-4EF1-88E1-CF0D27805608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3746E645-BFCF-4EF1-88E1-CF0D27805608}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3746E645-BFCF-4EF1-88E1-CF0D27805608}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3746E645-BFCF-4EF1-88E1-CF0D27805608}.Release|Any CPU.Build.0 = Release|Any CPU - {B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A}.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 + {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 + {EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -120,14 +122,14 @@ Global {15B92D3C-B29E-488B-90FC-324167935409} = {9AF531D0-D6CC-4C76-90BD-ED0F725A604E} {40653EBF-E569-4F85-843D-FFABBB70CFC8} = {9AF531D0-D6CC-4C76-90BD-ED0F725A604E} {384EE35D-2668-42B6-8615-6BD6C4AA5273} = {9AF531D0-D6CC-4C76-90BD-ED0F725A604E} - {3746E645-BFCF-4EF1-88E1-CF0D27805608} = {9AF531D0-D6CC-4C76-90BD-ED0F725A604E} {3752E6AE-0EBD-4A82-9FCF-375A39F99F0F} = {F8D4BCC4-4B13-4EFC-A5AE-38C26519EDDF} {4BB9602E-5233-4399-A4B5-D4E8AD38741B} = {F8D4BCC4-4B13-4EFC-A5AE-38C26519EDDF} {76656E96-A647-4098-934D-8F752A3F2FD6} = {F8D4BCC4-4B13-4EFC-A5AE-38C26519EDDF} {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} - {B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A} = {F8D4BCC4-4B13-4EFC-A5AE-38C26519EDDF} + {DF2BF748-BD4D-40AD-A8D5-8969AC8DE4C1} = {24F3652F-573B-445E-8690-BE73B8F0A2C7} + {EFCE9CE3-9F0E-442A-97CF-01113E3F2A0A} = {24F3652F-573B-445E-8690-BE73B8F0A2C7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B21C5DA8-5B94-485F-913D-CDF943AFCAD6} 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 7eb92f1fcad..352c0f4088c 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,9 +27,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{595B9904-FEEB-429A-BF89-F46081047BCA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{78E7FCD7-5348-4878-AE59-6C083955A93B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{171519BA-C402-43A8-9F72-A943B5275E6F}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{24FA2158-5073-48F7-94DE-11DD7AAE86DD}" EndProject @@ -37,6 +37,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{96A7E0DD-290 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5A074D2-033F-4577-A5CC-568CAC9CC729}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8F8CE472-78AF-419D-8D46-9DF1CAACD48E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -99,14 +101,14 @@ 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 - {595B9904-FEEB-429A-BF89-F46081047BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {595B9904-FEEB-429A-BF89-F46081047BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {595B9904-FEEB-429A-BF89-F46081047BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {595B9904-FEEB-429A-BF89-F46081047BCA}.Release|Any CPU.Build.0 = Release|Any CPU - {171519BA-C402-43A8-9F72-A943B5275E6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {171519BA-C402-43A8-9F72-A943B5275E6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {171519BA-C402-43A8-9F72-A943B5275E6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {171519BA-C402-43A8-9F72-A943B5275E6F}.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 + {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 + {45730CA0-CC0F-4D63-8E2E-08A4414599EC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -120,14 +122,14 @@ Global {B0677DDD-392C-4E79-9A80-ACCDCC5302F1} = {96A7E0DD-290C-45D7-9556-1B45F474F72E} {114BFD58-B1E4-49C0-A176-268710DD898A} = {96A7E0DD-290C-45D7-9556-1B45F474F72E} {70AE0C61-0BCA-4D93-BD42-514A83E4D7FF} = {96A7E0DD-290C-45D7-9556-1B45F474F72E} - {595B9904-FEEB-429A-BF89-F46081047BCA} = {96A7E0DD-290C-45D7-9556-1B45F474F72E} {44801F6B-40D0-4640-A749-3F5E6203CF94} = {D5A074D2-033F-4577-A5CC-568CAC9CC729} {64E40C62-4177-4F27-8C5C-C876E38103A6} = {D5A074D2-033F-4577-A5CC-568CAC9CC729} {EBEBE22F-F8AF-4976-B8B8-0A0A1C4065B1} = {D5A074D2-033F-4577-A5CC-568CAC9CC729} {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} - {171519BA-C402-43A8-9F72-A943B5275E6F} = {D5A074D2-033F-4577-A5CC-568CAC9CC729} + {78E7FCD7-5348-4878-AE59-6C083955A93B} = {8F8CE472-78AF-419D-8D46-9DF1CAACD48E} + {45730CA0-CC0F-4D63-8E2E-08A4414599EC} = {8F8CE472-78AF-419D-8D46-9DF1CAACD48E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FD52C33A-D95E-4E76-B817-12A125C4418A} 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 7108c1b8e46..e708803bbf3 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,9 +31,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F292F90B-FB0A-4EE5-8F8A-3CF24E22F914}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{360ADB27-C53E-45CD-9F7F-A4603D8B7581}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3E459CAE-C23F-4467-9845-F35943928C41}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AD777611-BD18-4241-9426-24B01BD78A22}" EndProject @@ -41,6 +41,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5D71F187-E70 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D55A8909-6199-44E5-A5DC-339F3FC2BF2B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4DFFE138-A7D8-4B2D-9FA6-B26635D29EFF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -111,14 +113,14 @@ 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 - {F292F90B-FB0A-4EE5-8F8A-3CF24E22F914}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F292F90B-FB0A-4EE5-8F8A-3CF24E22F914}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F292F90B-FB0A-4EE5-8F8A-3CF24E22F914}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F292F90B-FB0A-4EE5-8F8A-3CF24E22F914}.Release|Any CPU.Build.0 = Release|Any CPU - {3E459CAE-C23F-4467-9845-F35943928C41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E459CAE-C23F-4467-9845-F35943928C41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E459CAE-C23F-4467-9845-F35943928C41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E459CAE-C23F-4467-9845-F35943928C41}.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 + {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 + {C57D0E23-18B5-4EAE-8E69-433171C57C01}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -133,7 +135,6 @@ Global {8370539D-02B1-4D8E-B44B-0E845AED1B8E} = {5D71F187-E70B-413D-9819-03F6C1D7AA34} {A024CB01-C41F-4F2C-87B1-5E3B3D2979A3} = {5D71F187-E70B-413D-9819-03F6C1D7AA34} {F5E5E0E3-F2FF-405B-AD0D-7D92C6F85F4B} = {5D71F187-E70B-413D-9819-03F6C1D7AA34} - {F292F90B-FB0A-4EE5-8F8A-3CF24E22F914} = {5D71F187-E70B-413D-9819-03F6C1D7AA34} {4C97A79C-D5A5-4091-9A3A-3426BD7FF277} = {D55A8909-6199-44E5-A5DC-339F3FC2BF2B} {B1C9D55F-73E4-425F-ACCE-05E286CCF93B} = {D55A8909-6199-44E5-A5DC-339F3FC2BF2B} {5A242B96-3C69-456B-B4EA-969E6EE91C5C} = {D55A8909-6199-44E5-A5DC-339F3FC2BF2B} @@ -141,7 +142,8 @@ 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} - {3E459CAE-C23F-4467-9845-F35943928C41} = {D55A8909-6199-44E5-A5DC-339F3FC2BF2B} + {360ADB27-C53E-45CD-9F7F-A4603D8B7581} = {4DFFE138-A7D8-4B2D-9FA6-B26635D29EFF} + {C57D0E23-18B5-4EAE-8E69-433171C57C01} = {4DFFE138-A7D8-4B2D-9FA6-B26635D29EFF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9E1D104F-EEB9-457A-9942-83E43C869D8C} 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 abd24d37ade..fd0ba3585fb 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,9 +39,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9882F79B-592C-4E76-BDF4-50C030F67F0E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1E742310-B2DD-4F17-A0B0-C343C35A4D9D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F241C7D3-E80F-4C69-8418-4501DB1331B8}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2D219A1E-5D93-44B4-8BA2-64BA01E1FE93}" EndProject @@ -49,6 +49,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{54A3306A-C2A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E562A241-4253-44F8-9E3F-2E03C4058D7B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1FEF4F42-130B-4504-A561-17191FE763C3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -135,14 +137,14 @@ 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 - {9882F79B-592C-4E76-BDF4-50C030F67F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9882F79B-592C-4E76-BDF4-50C030F67F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9882F79B-592C-4E76-BDF4-50C030F67F0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9882F79B-592C-4E76-BDF4-50C030F67F0E}.Release|Any CPU.Build.0 = Release|Any CPU - {F241C7D3-E80F-4C69-8418-4501DB1331B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F241C7D3-E80F-4C69-8418-4501DB1331B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F241C7D3-E80F-4C69-8418-4501DB1331B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F241C7D3-E80F-4C69-8418-4501DB1331B8}.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 + {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 + {5CF9010C-D0A8-4DCA-800C-57F38FC9D159}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -159,7 +161,6 @@ Global {B2CEF482-0EBB-42EC-A37B-786492049E78} = {54A3306A-C2A0-4C59-8BC9-B0389E079ADB} {6260945D-105D-47CC-B256-D62BF3CA9448} = {54A3306A-C2A0-4C59-8BC9-B0389E079ADB} {B46B056A-EFA3-4AF7-9CE3-B62EDEABE286} = {54A3306A-C2A0-4C59-8BC9-B0389E079ADB} - {9882F79B-592C-4E76-BDF4-50C030F67F0E} = {54A3306A-C2A0-4C59-8BC9-B0389E079ADB} {98B116B8-2D6A-4AC1-925E-FA5E1F09247E} = {E562A241-4253-44F8-9E3F-2E03C4058D7B} {8A6B8D35-1C22-46AB-8C68-F31656337762} = {E562A241-4253-44F8-9E3F-2E03C4058D7B} {D3A401F7-2C54-45C4-BFF1-45269B2FA1EF} = {E562A241-4253-44F8-9E3F-2E03C4058D7B} @@ -169,7 +170,8 @@ 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} - {F241C7D3-E80F-4C69-8418-4501DB1331B8} = {E562A241-4253-44F8-9E3F-2E03C4058D7B} + {1E742310-B2DD-4F17-A0B0-C343C35A4D9D} = {1FEF4F42-130B-4504-A561-17191FE763C3} + {5CF9010C-D0A8-4DCA-800C-57F38FC9D159} = {1FEF4F42-130B-4504-A561-17191FE763C3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4D8FAA33-E9C8-48FB-ADBF-5AE1D87E9B2C} 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 43cdf200213..c7085b17c54 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,9 +43,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B9E03474-32B9-4D49-BF6F-2F17DAE8D699}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AC451CFA-10AE-4D49-823A-19CD184F891F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{7517D0A0-5596-48B7-96EF-CB24DAD72675}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{3203A6CE-6513-442C-9849-9DAAAFCCB759}" EndProject @@ -65,6 +65,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1F57E720-CBF EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1789A282-9C08-40AB-9FD0-0FB1FAB99621}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -159,14 +161,14 @@ 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 - {B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Release|Any CPU.Build.0 = Release|Any CPU - {7517D0A0-5596-48B7-96EF-CB24DAD72675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7517D0A0-5596-48B7-96EF-CB24DAD72675}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7517D0A0-5596-48B7-96EF-CB24DAD72675}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7517D0A0-5596-48B7-96EF-CB24DAD72675}.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 + {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 + {AFEFC5C1-C952-45EE-BCF9-DC246ADE43DF}.Release|Any CPU.Build.0 = Release|Any CPU {3203A6CE-6513-442C-9849-9DAAAFCCB759}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3203A6CE-6513-442C-9849-9DAAAFCCB759}.Debug|Any CPU.Build.0 = Debug|Any CPU {3203A6CE-6513-442C-9849-9DAAAFCCB759}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -208,7 +210,6 @@ Global {9B6760CA-AC54-4549-9EA1-823BDF841BCA} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} {4C29E3A6-45F5-4747-B471-A48EFDF88247} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} {F468EC97-5E8E-46F3-87A2-D2DEE53B4605} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} - {B9E03474-32B9-4D49-BF6F-2F17DAE8D699} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} {3203A6CE-6513-442C-9849-9DAAAFCCB759} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} {6EB2865B-C9F6-4F9B-82DA-4C577587B577} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} {68210977-E10C-4BC3-B235-31B6E2AF9830} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} @@ -221,11 +222,12 @@ Global {6A80D098-69EC-45FE-A064-4CBDFA44BA43} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} {FE50757B-7862-49D2-812E-1646F6FE0070} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} {B1723D4C-15E3-4A39-8976-C3E1740E5F00} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {7517D0A0-5596-48B7-96EF-CB24DAD72675} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} {BD19B1E7-CAFF-4009-874A-760D5A466E28} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {CC3E9E0A-4417-4678-87CC-1D2B001C3232} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {701D92CA-90E0-4611-B1DF-F2D31503563F} = {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2D9A0B20-A56C-4FBA-805A-DAAA97615597} 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 49dff7e3acf..d72b81fea27 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,9 +43,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{96003091-9E9D-42D5-85A6-C2DFBD9DD847}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DF6EE118-7512-4D82-8460-F7A150A73D5D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{D3256E08-CC12-4C90-848B-6A2F68DFFB97}" EndProject @@ -65,6 +65,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9A8D52D9-CDB EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{48CD61B8-2937-4229-8BAB-3F1167B54E61}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -159,14 +161,14 @@ 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 - {96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Release|Any CPU.Build.0 = Release|Any CPU - {1EF04395-4D84-43F1-BD99-7F6D6C3D70BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EF04395-4D84-43F1-BD99-7F6D6C3D70BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EF04395-4D84-43F1-BD99-7F6D6C3D70BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EF04395-4D84-43F1-BD99-7F6D6C3D70BB}.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 + {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 + {0243557C-E886-4392-8E9F-ECA0820E094B}.Release|Any CPU.Build.0 = Release|Any CPU {D3256E08-CC12-4C90-848B-6A2F68DFFB97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D3256E08-CC12-4C90-848B-6A2F68DFFB97}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3256E08-CC12-4C90-848B-6A2F68DFFB97}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -208,7 +210,6 @@ Global {F5120F23-273D-4B52-A599-BBED17A48A08} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} {EA96A79C-A11A-46ED-8123-BF0EE908EA40} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} {EA38DF6E-D08D-4404-AE10-026C0856834C} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} - {96003091-9E9D-42D5-85A6-C2DFBD9DD847} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} {D3256E08-CC12-4C90-848B-6A2F68DFFB97} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} {705F880D-3E27-4ACA-87CC-808BB7DDA610} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} {54B89407-FCD9-4B1A-8F83-04585D437443} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} @@ -221,11 +222,12 @@ Global {CB0A5C33-5CDF-441D-8166-459437381CDD} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} {AFB63B04-4583-45CD-BA20-C7FC005AE81A} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} {BD85452C-1434-40FF-8A2C-36BF135A22FE} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {1EF04395-4D84-43F1-BD99-7F6D6C3D70BB} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} {1555B38A-E9CB-4734-AAB1-59CFB833A06D} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {C5BA84F6-C75B-4698-9733-38C67C285215} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {D52BA380-089D-46CD-98E5-F471B9D7CCA4} = {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E7F79175-49DD-42AD-833B-AE64950FE3D2} 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 c395b072451..f8dac55517b 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,9 +43,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{78F4F9EE-7E1D-41B5-B55A-850C1282EA99}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BF9A0BC8-05FE-4E14-8919-7E8BD590F94C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5B866430-6F0B-49F1-8294-7B07F766797A}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\ref\System.Security.Cryptography.Pkcs.csproj", "{91F63A74-902E-44DF-8A78-FD74D030E619}" EndProject @@ -61,6 +61,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AB0BAC3A-1FE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -155,14 +157,14 @@ 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 - {78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Release|Any CPU.Build.0 = Release|Any CPU - {5B866430-6F0B-49F1-8294-7B07F766797A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B866430-6F0B-49F1-8294-7B07F766797A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B866430-6F0B-49F1-8294-7B07F766797A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B866430-6F0B-49F1-8294-7B07F766797A}.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 + {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 + {B9613E48-832E-496D-9788-C2304BBEAF1F}.Release|Any CPU.Build.0 = Release|Any CPU {91F63A74-902E-44DF-8A78-FD74D030E619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {91F63A74-902E-44DF-8A78-FD74D030E619}.Debug|Any CPU.Build.0 = Debug|Any CPU {91F63A74-902E-44DF-8A78-FD74D030E619}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -196,7 +198,6 @@ Global {981358A2-F5ED-45CE-B037-446BB0F4E859} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} {4039B868-612D-420F-BC25-481660475CA8} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} {F7D18116-335D-4CE6-980A-3330AAD05507} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} - {78F4F9EE-7E1D-41B5-B55A-850C1282EA99} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} {91F63A74-902E-44DF-8A78-FD74D030E619} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} {A3C9F01C-6D4D-413B-BADE-A8B9046F985F} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} {9C73A2E3-B370-4B24-ACB0-0C3A9069250D} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} @@ -209,9 +210,10 @@ Global {6824AD93-4154-4710-A018-81DA1FA98C40} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} {26C61EB7-2798-4314-B750-8CD2837D4216} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} {84E43ED2-A2ED-49F9-B592-92270F0F2EC3} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {5B866430-6F0B-49F1-8294-7B07F766797A} = {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} + {B9613E48-832E-496D-9788-C2304BBEAF1F} = {A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {830494DE-07B3-4C63-9D74-4A123677D469} diff --git a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln index 01435ef1bf9..59f974f2502 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln +++ b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln @@ -69,9 +69,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{5D0D6749-312A-4400-89D8-A7252D9A879B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{FE30F553-10C0-48DF-B0B6-0025729A8C6B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{75A03875-DC97-42AE-9EFE-78DC736B8BD6}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\ref\System.Security.Cryptography.Pkcs.csproj", "{8EA7F25A-0748-4EF4-ABE8-67688B646D47}" EndProject @@ -99,6 +99,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DC224BF8-12E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{76107BEB-02C0-4A83-9631-B226340752A7}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DCF01C23-85A0-4385-B480-D1276ED99A92}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -245,14 +247,14 @@ 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 - {5D0D6749-312A-4400-89D8-A7252D9A879B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D0D6749-312A-4400-89D8-A7252D9A879B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D0D6749-312A-4400-89D8-A7252D9A879B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D0D6749-312A-4400-89D8-A7252D9A879B}.Release|Any CPU.Build.0 = Release|Any CPU - {75A03875-DC97-42AE-9EFE-78DC736B8BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75A03875-DC97-42AE-9EFE-78DC736B8BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75A03875-DC97-42AE-9EFE-78DC736B8BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75A03875-DC97-42AE-9EFE-78DC736B8BD6}.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 + {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 + {27A201BF-246A-44B2-A018-DF67C8A6DC02}.Release|Any CPU.Build.0 = Release|Any CPU {8EA7F25A-0748-4EF4-ABE8-67688B646D47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8EA7F25A-0748-4EF4-ABE8-67688B646D47}.Debug|Any CPU.Build.0 = Debug|Any CPU {8EA7F25A-0748-4EF4-ABE8-67688B646D47}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -317,7 +319,6 @@ Global {F4B7B95E-F732-474A-BED7-782AD2F4A1A4} = {DC224BF8-12E5-4992-B750-B12011238C26} {EC8DB110-890E-4388-97FC-0E25D98BC6F4} = {DC224BF8-12E5-4992-B750-B12011238C26} {AA6BA95D-613F-4878-BF58-409A78FC3D1B} = {DC224BF8-12E5-4992-B750-B12011238C26} - {5D0D6749-312A-4400-89D8-A7252D9A879B} = {DC224BF8-12E5-4992-B750-B12011238C26} {8EA7F25A-0748-4EF4-ABE8-67688B646D47} = {DC224BF8-12E5-4992-B750-B12011238C26} {F74DB3B7-243F-447D-AE39-672348F661A1} = {DC224BF8-12E5-4992-B750-B12011238C26} {39AA6ECB-A46E-47B8-A90B-286C1C59D962} = {DC224BF8-12E5-4992-B750-B12011238C26} @@ -338,13 +339,14 @@ Global {8F65DFBB-9196-4E69-879A-C99C641B3E49} = {76107BEB-02C0-4A83-9631-B226340752A7} {165EBE5E-E512-4E7E-8C2D-1F4297483D3E} = {76107BEB-02C0-4A83-9631-B226340752A7} {F50B881E-8A70-48C3-80B0-2094F6868974} = {76107BEB-02C0-4A83-9631-B226340752A7} - {75A03875-DC97-42AE-9EFE-78DC736B8BD6} = {76107BEB-02C0-4A83-9631-B226340752A7} {95FB3CCD-3174-4BAA-8BF6-67E0A16B8965} = {76107BEB-02C0-4A83-9631-B226340752A7} {BAA953EF-6529-4F2C-8F89-C76A05258677} = {76107BEB-02C0-4A83-9631-B226340752A7} {23F4102D-67BD-4865-BB19-195C47945733} = {76107BEB-02C0-4A83-9631-B226340752A7} - {11C8AB75-D137-4A1B-85E5-1018EBFB422B} = {76107BEB-02C0-4A83-9631-B226340752A7} - {81104506-C075-4889-819C-F0B3D81A40A1} = {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {81EEF2A5-6387-4CC4-B7CD-908EEA4E5C79} 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 1e8e3030e4e..6b2fbc18ee1 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,14 +7,16 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0487880C-FB7C-4CAC-A6BB-0569DFCC216A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9E3BD723-42DB-4109-9091-DB85C848E908}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C2EB9BA2-5B6F-4845-811C-25DAD4FA5451}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C494A755-24D9-4E80-AEC3-CF8FEBAFCAC6}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{09E0C315-2A88-4F30-93DA-E22625BF82AB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BF723277-314D-45F4-B29A-6A8683860A93}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,14 +39,14 @@ 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 - {0487880C-FB7C-4CAC-A6BB-0569DFCC216A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0487880C-FB7C-4CAC-A6BB-0569DFCC216A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0487880C-FB7C-4CAC-A6BB-0569DFCC216A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0487880C-FB7C-4CAC-A6BB-0569DFCC216A}.Release|Any CPU.Build.0 = Release|Any CPU - {C2EB9BA2-5B6F-4845-811C-25DAD4FA5451}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2EB9BA2-5B6F-4845-811C-25DAD4FA5451}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2EB9BA2-5B6F-4845-811C-25DAD4FA5451}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2EB9BA2-5B6F-4845-811C-25DAD4FA5451}.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 + {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 + {B7469EEF-415C-485B-9FEC-3D9640400A7B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -52,10 +54,10 @@ Global GlobalSection(NestedProjects) = preSolution {57D9CDC0-FB4C-4408-8E75-B04079EAE7C8} = {C494A755-24D9-4E80-AEC3-CF8FEBAFCAC6} {B8B63EFF-64D9-49AB-ACE9-6182DADC7574} = {C494A755-24D9-4E80-AEC3-CF8FEBAFCAC6} - {0487880C-FB7C-4CAC-A6BB-0569DFCC216A} = {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} - {C2EB9BA2-5B6F-4845-811C-25DAD4FA5451} = {09E0C315-2A88-4F30-93DA-E22625BF82AB} + {9E3BD723-42DB-4109-9091-DB85C848E908} = {BF723277-314D-45F4-B29A-6A8683860A93} + {B7469EEF-415C-485B-9FEC-3D9640400A7B} = {BF723277-314D-45F4-B29A-6A8683860A93} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BD3A79CE-CF84-4543-99E4-D39D56E8DAEF} diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln b/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln index 4e1582da8d6..26f517fb725 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln @@ -19,9 +19,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{533E159E-A725-4C65-A588-DDD120FDD5F2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{04BA3E3C-6979-4792-B19E-C797AD607F42}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5F2D3A6A-76D3-4C22-A7F7-8D73D67A98F8}" EndProject @@ -29,6 +29,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E168C5B8-F2E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{74C4FAFF-491D-448C-8CA0-F8E5FC838CC5}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{28065F40-B930-4A5D-95D8-A3BD5F86CE11}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -75,14 +77,14 @@ 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 - {7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD}.Release|Any CPU.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.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 + {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 + {9E5124E4-BEDA-4B2D-9699-60E2A7B1881D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -94,12 +96,12 @@ Global {047FD3F2-B3A0-4639-B4F0-40D29E61725D} = {E168C5B8-F2EB-4BDE-942A-59C1EB130D59} {6D90C067-5CCD-4443-81A5-B9C385011F68} = {E168C5B8-F2EB-4BDE-942A-59C1EB130D59} {66E6ADF5-200F-41F3-9CA4-858EF69D2A61} = {E168C5B8-F2EB-4BDE-942A-59C1EB130D59} - {7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD} = {E168C5B8-F2EB-4BDE-942A-59C1EB130D59} {3068B34E-D975-4C11-B2F2-F10790051F2E} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5} {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} - {04BA3E3C-6979-4792-B19E-C797AD607F42} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5} + {533E159E-A725-4C65-A588-DDD120FDD5F2} = {28065F40-B930-4A5D-95D8-A3BD5F86CE11} + {9E5124E4-BEDA-4B2D-9699-60E2A7B1881D} = {28065F40-B930-4A5D-95D8-A3BD5F86CE11} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {68A7BDA7-8093-433C-BF7A-8A6A7560BD02} diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj index 23c3a776251..d0c5e8e9b80 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj @@ -55,8 +55,6 @@ <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj index b6eadff96d5..0f00fb80d5e 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj @@ -37,7 +37,6 @@ <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesVersion)" /> <PackageReference Include="System.Collections" Version="$(SystemCollectionsVersion)" /> <PackageReference Include="System.Runtime.InteropServices" Version="$(SystemRuntimeInteropServicesVersion)" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln index 896563aa168..389686426bd 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln +++ b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln @@ -13,9 +13,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F38E2965-8DBB-4795-89AF-C0109EB23574}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{81E7EE62-D28C-48DB-B19F-39F00822C84A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4A28B457-D950-486B-B59B-A4C977A733B1}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{50F89560-1449-44E4-844E-72815256534B}" EndProject @@ -35,6 +35,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{50BA55F5-BD0 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5725D7DF-DC33-47D2-90C9-D8736C579E77}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{55D04C80-4A8F-40AC-967D-3FA77C814D7B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -69,14 +71,14 @@ 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 - {F38E2965-8DBB-4795-89AF-C0109EB23574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F38E2965-8DBB-4795-89AF-C0109EB23574}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F38E2965-8DBB-4795-89AF-C0109EB23574}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F38E2965-8DBB-4795-89AF-C0109EB23574}.Release|Any CPU.Build.0 = Release|Any CPU - {4A28B457-D950-486B-B59B-A4C977A733B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A28B457-D950-486B-B59B-A4C977A733B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A28B457-D950-486B-B59B-A4C977A733B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A28B457-D950-486B-B59B-A4C977A733B1}.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 + {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 + {6F992337-EAEE-4F7A-BF3B-DDC526F054F7}.Release|Any CPU.Build.0 = Release|Any CPU {50F89560-1449-44E4-844E-72815256534B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {50F89560-1449-44E4-844E-72815256534B}.Debug|Any CPU.Build.0 = Debug|Any CPU {50F89560-1449-44E4-844E-72815256534B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -111,16 +113,16 @@ Global {5351C410-530D-4724-A8E6-430831E7332B} = {155C3F40-F63D-49DF-87D3-A3EEA27036E8} {696D69C9-C5F6-405E-A8B5-5375D08BBADC} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} {6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} - {F38E2965-8DBB-4795-89AF-C0109EB23574} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} {50F89560-1449-44E4-844E-72815256534B} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} {8E212A9D-391B-4EFA-943D-7D104A9D3D7E} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} {2AED2951-7724-4EFC-8E16-6DF877C6B4A6} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} {5C580568-6072-4F27-B5C6-FA04556E3B98} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} - {4A28B457-D950-486B-B59B-A4C977A733B1} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} {7902A0CA-E94D-4C96-A112-455A1E5E2390} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} - {240E7B1C-6D7D-4932-9598-815C2EA420AF} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} - {B4C5A0BE-3E21-4464-875C-E6EBED176EE3} = {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {810D114A-26F4-4151-9EFE-29A7F1BF62AA} diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj index 8fa0032fc79..3434cf0c8b5 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <Nullable>enable</Nullable> @@ -41,8 +41,6 @@ Microsoft.Extensions.DependencyModel.DependencyContext</PackageDescription> <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\src\System.Text.Json.csproj" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> </Project> 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 60eefe5cc56..67c951a6518 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,14 +7,16 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6BC17084-3EC1-4D08-856D-C6F6EA065ED6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{31FFC3D4-26EA-4261-81B1-380A4E5C4A6B}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BE15F96C-8AA4-4F7D-9A69-9924531A6136}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D948D4F3-4232-4FEA-936D-5F554D335FEA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1EB544B8-7931-492C-BB70-82C96C195BCD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,14 +39,14 @@ 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 - {AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A}.Release|Any CPU.Build.0 = Release|Any CPU - {31FFC3D4-26EA-4261-81B1-380A4E5C4A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31FFC3D4-26EA-4261-81B1-380A4E5C4A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31FFC3D4-26EA-4261-81B1-380A4E5C4A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31FFC3D4-26EA-4261-81B1-380A4E5C4A6B}.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 + {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 + {4F62F683-8B2A-46EE-BC34-5CC192DE0C32}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -52,10 +54,10 @@ Global GlobalSection(NestedProjects) = preSolution {D2B5E003-2790-43C3-93BD-923E874A4B85} = {BE15F96C-8AA4-4F7D-9A69-9924531A6136} {F985DC40-F983-4464-B866-3BD17EE3B6B1} = {BE15F96C-8AA4-4F7D-9A69-9924531A6136} - {AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A} = {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} - {31FFC3D4-26EA-4261-81B1-380A4E5C4A6B} = {D948D4F3-4232-4FEA-936D-5F554D335FEA} + {6BC17084-3EC1-4D08-856D-C6F6EA065ED6} = {1EB544B8-7931-492C-BB70-82C96C195BCD} + {4F62F683-8B2A-46EE-BC34-5CC192DE0C32} = {1EB544B8-7931-492C-BB70-82C96C195BCD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ADEB1F74-B672-4B9F-A221-7A548028621F} 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 a01609c31b7..d8e6dd2a198 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,9 +15,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{ABD00CF3-0D7E-42A1-B685-4127238C1534}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BA9792F3-FA23-457F-8974-0F6227E77AF2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F79164E2-EC00-4A9C-995D-64E9BCD6645B}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3237C857-6C3B-42C4-83B1-7AE4B4C74021}" EndProject @@ -25,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C329135D-872 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{998B15B4-464F-40EB-92DA-61637BE9C838}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{94912E31-E514-4648-BD9F-3259A8116AC0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -63,14 +65,14 @@ 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 - {ABD00CF3-0D7E-42A1-B685-4127238C1534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABD00CF3-0D7E-42A1-B685-4127238C1534}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABD00CF3-0D7E-42A1-B685-4127238C1534}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABD00CF3-0D7E-42A1-B685-4127238C1534}.Release|Any CPU.Build.0 = Release|Any CPU - {F79164E2-EC00-4A9C-995D-64E9BCD6645B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F79164E2-EC00-4A9C-995D-64E9BCD6645B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F79164E2-EC00-4A9C-995D-64E9BCD6645B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F79164E2-EC00-4A9C-995D-64E9BCD6645B}.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 + {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 + {9FA8F495-A781-4D1E-8793-EB08E862AA37}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -81,11 +83,11 @@ Global {0AF0AB89-EB1B-449B-B96C-1120B4261D47} = {C329135D-8725-4ABA-A2AE-63F51114EAF5} {BEB0AB80-D91D-4C29-B07A-9C2673DA4E29} = {C329135D-8725-4ABA-A2AE-63F51114EAF5} {22E22108-1ED0-4295-8CCC-2BBBAFA3DF78} = {C329135D-8725-4ABA-A2AE-63F51114EAF5} - {ABD00CF3-0D7E-42A1-B685-4127238C1534} = {C329135D-8725-4ABA-A2AE-63F51114EAF5} {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} - {F79164E2-EC00-4A9C-995D-64E9BCD6645B} = {998B15B4-464F-40EB-92DA-61637BE9C838} + {BA9792F3-FA23-457F-8974-0F6227E77AF2} = {94912E31-E514-4648-BD9F-3259A8116AC0} + {9FA8F495-A781-4D1E-8793-EB08E862AA37} = {94912E31-E514-4648-BD9F-3259A8116AC0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2C4F880D-DD85-46A9-881C-94C75D87D8A9} 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 51b2bb59be6..ec1fcdffa43 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,9 +19,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{54BEF25B-96F5-464D-BAD5-11E49854D244}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D6D15D5B-C680-4CE4-BDEF-BA58C3665662}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{AD097226-D10B-4423-BED6-49C3FF58A658}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{19152DEB-C902-49AF-A864-27D7E18B3DD1}" EndProject @@ -29,6 +29,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{496923C9-6CE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7DDADA4C-8D27-4582-93DD-ABE98D76B3FF}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4A7AB018-13B5-44F7-BFF2-AE38E425BDD2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -75,14 +77,14 @@ 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 - {54BEF25B-96F5-464D-BAD5-11E49854D244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54BEF25B-96F5-464D-BAD5-11E49854D244}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54BEF25B-96F5-464D-BAD5-11E49854D244}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54BEF25B-96F5-464D-BAD5-11E49854D244}.Release|Any CPU.Build.0 = Release|Any CPU - {AD097226-D10B-4423-BED6-49C3FF58A658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD097226-D10B-4423-BED6-49C3FF58A658}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD097226-D10B-4423-BED6-49C3FF58A658}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD097226-D10B-4423-BED6-49C3FF58A658}.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 + {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 + {FE431CFB-8AC4-4118-95D7-7EBE1722CB66}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -94,12 +96,12 @@ Global {BBF27B04-4E1A-482C-93BE-8F887773055A} = {496923C9-6CEE-4E94-A711-4CA3D99FB074} {85AC9873-8EE8-411C-A2B0-EBB910F9AB9A} = {496923C9-6CEE-4E94-A711-4CA3D99FB074} {AB2263E5-4509-4A94-BA1F-76451502DC6D} = {496923C9-6CEE-4E94-A711-4CA3D99FB074} - {54BEF25B-96F5-464D-BAD5-11E49854D244} = {496923C9-6CEE-4E94-A711-4CA3D99FB074} {907217D6-8690-4213-AD96-BA67A47499BF} = {7DDADA4C-8D27-4582-93DD-ABE98D76B3FF} {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} - {AD097226-D10B-4423-BED6-49C3FF58A658} = {7DDADA4C-8D27-4582-93DD-ABE98D76B3FF} + {D6D15D5B-C680-4CE4-BDEF-BA58C3665662} = {4A7AB018-13B5-44F7-BFF2-AE38E425BDD2} + {FE431CFB-8AC4-4118-95D7-7EBE1722CB66} = {4A7AB018-13B5-44F7-BFF2-AE38E425BDD2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4B425DE1-F167-465F-97A1-FA1E8C63DFB8} diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln index 1932d50cc6d..bcab69a9879 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{81FA9ECC-2671-4077-8F6F-2F8538917512}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7B1D4B96-174B-4222-8D9D-360CAC9B83C6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{965074B0-3EC8-426A-B944-EF60C78DC6BD}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7438714C-BB16-491E-8D9C-A2B7CB0EFA35}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4A9C0071-CAD EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AE2C386A-473E-46FF-97DB-4CB1727122BB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2EF45468-C4F8-4194-9720-592D0186B585}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {81FA9ECC-2671-4077-8F6F-2F8538917512}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81FA9ECC-2671-4077-8F6F-2F8538917512}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81FA9ECC-2671-4077-8F6F-2F8538917512}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81FA9ECC-2671-4077-8F6F-2F8538917512}.Release|Any CPU.Build.0 = Release|Any CPU - {965074B0-3EC8-426A-B944-EF60C78DC6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {965074B0-3EC8-426A-B944-EF60C78DC6BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {965074B0-3EC8-426A-B944-EF60C78DC6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {965074B0-3EC8-426A-B944-EF60C78DC6BD}.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 + {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 + {404A8198-B2DF-42AB-BA33-69509A8E0C91}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {C76E62F8-C898-4A2A-8D5C-EEE1D4505DF2} = {7438714C-BB16-491E-8D9C-A2B7CB0EFA35} {79B284F9-326E-4FEB-9A32-EA72A31B4B60} = {7438714C-BB16-491E-8D9C-A2B7CB0EFA35} {ECFF7A87-0D5F-4EA1-9FED-1126A51B5D55} = {4A9C0071-CAD0-4ABB-A489-04280BA258A5} - {81FA9ECC-2671-4077-8F6F-2F8538917512} = {4A9C0071-CAD0-4ABB-A489-04280BA258A5} {A9547748-8B4F-450E-B0E3-CD9A1A80B319} = {AE2C386A-473E-46FF-97DB-4CB1727122BB} - {965074B0-3EC8-426A-B944-EF60C78DC6BD} = {AE2C386A-473E-46FF-97DB-4CB1727122BB} + {7B1D4B96-174B-4222-8D9D-360CAC9B83C6} = {2EF45468-C4F8-4194-9720-592D0186B585} + {404A8198-B2DF-42AB-BA33-69509A8E0C91} = {2EF45468-C4F8-4194-9720-592D0186B585} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4FA3B475-4D82-4A80-8625-D5C98B8FF794} 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 6e8383ee40d..bae410fdb0c 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,14 +25,16 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{AF34ED02-1B95-41DE-A693-800E2770C5FA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6527A7DA-2218-4EA4-AC4C-F7950EAD7B50}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{56FC08B2-891F-42C3-8593-C01C447EB5CB}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{39B9C1F2-8309-41E5-B048-921219977818}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -91,14 +93,14 @@ 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 - {AF34ED02-1B95-41DE-A693-800E2770C5FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF34ED02-1B95-41DE-A693-800E2770C5FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF34ED02-1B95-41DE-A693-800E2770C5FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF34ED02-1B95-41DE-A693-800E2770C5FA}.Release|Any CPU.Build.0 = Release|Any CPU - {56FC08B2-891F-42C3-8593-C01C447EB5CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56FC08B2-891F-42C3-8593-C01C447EB5CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56FC08B2-891F-42C3-8593-C01C447EB5CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56FC08B2-891F-42C3-8593-C01C447EB5CB}.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 + {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 + {984774FC-974E-422D-9C34-5DE60308EC02}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -111,14 +113,14 @@ Global {7CCF5CE0-3840-4AA1-810F-138D001F2486} = {39B9C1F2-8309-41E5-B048-921219977818} {C4FD2984-3E22-47AF-8584-FF908D9D3E43} = {39B9C1F2-8309-41E5-B048-921219977818} {99CF7377-8E77-4EDB-B04F-E546ACCCE84D} = {39B9C1F2-8309-41E5-B048-921219977818} - {AF34ED02-1B95-41DE-A693-800E2770C5FA} = {39B9C1F2-8309-41E5-B048-921219977818} {E9CC25E1-367A-41E4-A710-5C5AB7475F40} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9} {7F238E01-3021-4F87-B463-A4AB5B91F753} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9} {60641184-B841-4F48-A917-76618114916A} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9} {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} - {56FC08B2-891F-42C3-8593-C01C447EB5CB} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9} + {6527A7DA-2218-4EA4-AC4C-F7950EAD7B50} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15} + {984774FC-974E-422D-9C34-5DE60308EC02} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7897D6F2-D18F-4ABB-9698-593AE45059C5} diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj index aae3d0bc2c4..cec24fe6929 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> @@ -24,8 +24,6 @@ <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> </Project> 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 4286ac7f4f4..2c5a3be9ff1 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 @@ -71,9 +71,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hostin EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting", "..\Microsoft.Extensions.Hosting\src\Microsoft.Extensions.Hosting.csproj", "{AFC1BDAA-7E40-4118-BB80-F8057752A600}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators.Roslyn3.11", "..\Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj", "{5F69DAFF-F4BC-4E29-A4FA-E96A4D55EC2D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "..\Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj", "{5F69DAFF-F4BC-4E29-A4FA-E96A4D55EC2D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators.Roslyn4.0", "..\Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj", "{0D1BFEB4-CEF6-4319-9212-E3E7840B287A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "..\Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj", "{0D1BFEB4-CEF6-4319-9212-E3E7840B287A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{860B845B-929F-4442-AED1-1F4186DBF497}" EndProject @@ -127,9 +127,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3749C284-FC40-47F1-BCAA-F9261455F3B6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{501608B2-5F11-4A58-90A1-AEAC51F21615}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E1053E73-AB5D-4593-8E00-7E048C314A28}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}" EndProject @@ -137,9 +137,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration.Roslyn3.11", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn3.11.csproj", "{5C6A1B61-B02B-46AA-8AD5-B8F61EE57453}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn3.11.csproj", "{5C6A1B61-B02B-46AA-8AD5-B8F61EE57453}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration.Roslyn4.0", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn4.0.csproj", "{771CB4BB-4237-444E-82CE-C81A4979D89F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn4.0.csproj", "{771CB4BB-4237-444E-82CE-C81A4979D89F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{AA2CD494-414F-42BF-9C68-7822DEB09255}" EndProject @@ -153,6 +153,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{087E4FD9-384 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{192FD259-E55F-40C5-82EE-9E924EA6C3CB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{694561D4-7901-4727-B87C-109C7CED0404}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -415,14 +417,14 @@ 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 - {3749C284-FC40-47F1-BCAA-F9261455F3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3749C284-FC40-47F1-BCAA-F9261455F3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3749C284-FC40-47F1-BCAA-F9261455F3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3749C284-FC40-47F1-BCAA-F9261455F3B6}.Release|Any CPU.Build.0 = Release|Any CPU - {E1053E73-AB5D-4593-8E00-7E048C314A28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1053E73-AB5D-4593-8E00-7E048C314A28}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1053E73-AB5D-4593-8E00-7E048C314A28}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1053E73-AB5D-4593-8E00-7E048C314A28}.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 + {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 + {D8A16E22-8BF8-49ED-A033-0150D6341282}.Release|Any CPU.Build.0 = Release|Any CPU {B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}.Debug|Any CPU.Build.0 = Debug|Any CPU {B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -492,7 +494,6 @@ Global {516D6FA4-89D2-4FE7-8653-1B391FAA2EB7} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} {B98B3A59-AEAF-4755-A1FF-2B7A36393BBC} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} {64A361E0-27B4-43F3-9BBA-3EE32D6807D4} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} - {3749C284-FC40-47F1-BCAA-F9261455F3B6} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} {B7BFBEDC-68F0-428B-ACA0-6E9861B9E534} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} {FAF186F6-CE14-4FBE-8757-97CC12704FA4} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} {AA2CD494-414F-42BF-9C68-7822DEB09255} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} @@ -514,8 +515,6 @@ Global {4B72FC27-F786-44B4-88DF-996D478873B8} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} {CFF29AA4-794A-416B-BF4C-FD2A442FB83F} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} {AFC1BDAA-7E40-4118-BB80-F8057752A600} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {5F69DAFF-F4BC-4E29-A4FA-E96A4D55EC2D} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {0D1BFEB4-CEF6-4319-9212-E3E7840B287A} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} {A0AF82AE-ED18-4EEB-AD9A-B44017510F0C} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} {D61B6530-0055-4DFE-85D1-58BEDFC7AA2F} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} {509B5AB4-8F9F-4856-811F-7C8E727BF2E6} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} @@ -529,11 +528,14 @@ Global {3488D63C-0C29-442C-8145-407DE19C7480} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} {01DB5E6D-40C5-42F7-8F9D-6F8DBC591129} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} {578661A4-C136-4533-819E-AF3352F79953} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {E1053E73-AB5D-4593-8E00-7E048C314A28} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} {47A3CDB0-8252-4536-B61F-C2E10F6EC2B9} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {5C6A1B61-B02B-46AA-8AD5-B8F61EE57453} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {771CB4BB-4237-444E-82CE-C81A4979D89F} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EFB87E5C-C4CE-4855-8CBB-B20180560CB1} 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 42635820b4b..5a6d86845fa 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,9 +123,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4146D2C3-BAAD-47FC-9571-2A18281942BB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{FCDC7714-1055-4A3B-A098-2F8E3AD23C55}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{78706510-4F89-4896-8E29-723C8F4B90AF}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{8FBBC1A7-3043-4707-A6BC-477A31D4307D}" EndProject @@ -151,6 +151,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BFC0CC54-678 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{76933DF1-12AA-4B5B-8863-EF38F10B1EC9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0D30E826-4EE9-4404-A74D-5255FDB76A12}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -405,14 +407,14 @@ 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 - {4146D2C3-BAAD-47FC-9571-2A18281942BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4146D2C3-BAAD-47FC-9571-2A18281942BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4146D2C3-BAAD-47FC-9571-2A18281942BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4146D2C3-BAAD-47FC-9571-2A18281942BB}.Release|Any CPU.Build.0 = Release|Any CPU - {78706510-4F89-4896-8E29-723C8F4B90AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78706510-4F89-4896-8E29-723C8F4B90AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78706510-4F89-4896-8E29-723C8F4B90AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78706510-4F89-4896-8E29-723C8F4B90AF}.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 + {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 + {11EE7722-5FA4-403C-B53B-59A154EE0267}.Release|Any CPU.Build.0 = Release|Any CPU {8FBBC1A7-3043-4707-A6BC-477A31D4307D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8FBBC1A7-3043-4707-A6BC-477A31D4307D}.Debug|Any CPU.Build.0 = Debug|Any CPU {8FBBC1A7-3043-4707-A6BC-477A31D4307D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -488,7 +490,6 @@ Global {2B13CBB4-E3B9-4AD1-983A-BA85EB3D5F8D} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} {BCF8EC9B-1FED-4A44-9E64-A59015D9B141} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} {F042EF08-55E7-45A3-A1D2-BE19E896BE9F} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} - {4146D2C3-BAAD-47FC-9571-2A18281942BB} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} {8FBBC1A7-3043-4707-A6BC-477A31D4307D} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} {55B88031-3C95-499F-B2AF-CF531312F1FD} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} {7233680A-1706-4A7C-906B-8D6C7E60D56A} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} @@ -511,8 +512,6 @@ Global {FB7C602E-3ED6-472A-85BD-420B61BA293D} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {89A6E38E-1118-4FC6-957D-17751DAD8EAF} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {36FAE390-EAAE-4193-98E7-34F10D3FA8E1} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {D3A7C7B1-10DC-45E9-8678-2C964A1459D7} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {59BC5420-D5C8-4689-8F9E-1E8AC338180E} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {E5F61C36-FB9B-4DA7-96C0-056FBEADBB53} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {C573763D-C24C-4222-AAF0-66B0C2260EB4} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} @@ -526,12 +525,15 @@ Global {3BB5B390-66F6-4FCD-A7FE-1A9326A4D914} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {166F8860-E965-4E2D-A6C6-4CA44C9B5A1E} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {E628527E-B7BD-4F3B-8045-EC7C887B1FC1} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {78706510-4F89-4896-8E29-723C8F4B90AF} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {3636C4FF-4BBD-4BB8-B60B-E62F2C429EA4} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {0EC461A2-083B-4E9E-AADE-935ECB15B951} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {2CEA1741-8B0C-41F8-9CA9-B827D329261F} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {81854B5B-5AA0-49DC-9B7B-9E2DB24D7507} diff --git a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln index 0cc5684c3a7..fd1087138c5 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln +++ b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln @@ -127,9 +127,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B6CD6B30-5F64-4F36-9CF0-2014C64B8708}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{FEC2349C-D18C-40B0-BA21-2111E383E972}" EndProject @@ -153,6 +153,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E041754F-1A9 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{59A29BF0-B76B-41F8-A733-E2A0847AB992}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A9A8D649-4C09-4FD1-9837-EE7B9D902253}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -415,14 +417,14 @@ 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 - {4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8}.Release|Any CPU.Build.0 = Release|Any CPU - {A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D}.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 + {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 + {90DD4D77-E3DC-456E-A27F-F13DA6194481}.Release|Any CPU.Build.0 = Release|Any CPU {FEC2349C-D18C-40B0-BA21-2111E383E972}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FEC2349C-D18C-40B0-BA21-2111E383E972}.Debug|Any CPU.Build.0 = Debug|Any CPU {FEC2349C-D18C-40B0-BA21-2111E383E972}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -493,7 +495,6 @@ Global {28726AEF-2732-4832-8930-074ACD9DC732} = {E041754F-1A93-443A-9294-87DC1C30B471} {34ECA788-A105-411B-AE8B-17B7CC1D703D} = {E041754F-1A93-443A-9294-87DC1C30B471} {EB6CB1A4-1D66-49B8-9914-BA12B47C909F} = {E041754F-1A93-443A-9294-87DC1C30B471} - {4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8} = {E041754F-1A93-443A-9294-87DC1C30B471} {FEC2349C-D18C-40B0-BA21-2111E383E972} = {E041754F-1A93-443A-9294-87DC1C30B471} {C595A27A-FA05-4BC8-9048-402338D7AF76} = {E041754F-1A93-443A-9294-87DC1C30B471} {1E3D79D4-51D6-46C6-BF0F-DF51A47C5952} = {E041754F-1A93-443A-9294-87DC1C30B471} @@ -514,8 +515,6 @@ Global {9C06E60B-2D45-4284-B7C8-7AE6D8194CE0} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} {973CE6DA-B55D-4E55-88D5-53BE69D44410} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} {F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {1B235247-6666-4B62-95A4-AC043626FDEA} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {5F6EF6F2-A742-445B-9418-682188F61130} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} {8845E6FF-94B2-4994-A8F4-DF30844A2168} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} {99C8FB58-8718-4E76-AEFA-3C42F2F729B1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} {F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} @@ -529,11 +528,14 @@ Global {0BC9E4F4-5C34-4B90-80AB-2933992D99A6} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} {A5DD36AF-F0AD-4616-AB91-BC63E89B2744} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} {4ED9C0A9-C1EF-47ED-99F8-74B7411C971B} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} {B41AA17B-5129-41CC-8EA4-250B80BABF87} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {0A495D7B-44DE-4E59-8497-6CBF7C55CFA5} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {B69B7D59-6E7D-43FC-B83F-AA481B677B06} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {971198CC-ACB9-4718-9024-42A87E02E503} diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj index 902c5ffc70f..9b414ff2e44 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> @@ -49,8 +49,6 @@ <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> diff --git a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln index e5c81c895dc..62baf4f5244 100644 --- a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln +++ b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln @@ -43,9 +43,11 @@ 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", "{1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{44EE40EE-2AD9-45D9-A939-A893FA76390C}" +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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{570C35EF-7D57-499C-A253-350708F144BB}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC22531E-0F15-4324-9241-2BD562CB7C6B}" EndProject @@ -53,6 +55,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ACFC297E-FE6 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{96EA71C4-C73B-4C6C-AA06-05635B20A2DC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D1CE7D63-2182-40E3-83E0-618DA3770779}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -147,14 +151,18 @@ Global {1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8}.Release|Any CPU.ActiveCfg = Release|Any CPU {1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8}.Release|Any CPU.Build.0 = Release|Any CPU - {44EE40EE-2AD9-45D9-A939-A893FA76390C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44EE40EE-2AD9-45D9-A939-A893FA76390C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44EE40EE-2AD9-45D9-A939-A893FA76390C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44EE40EE-2AD9-45D9-A939-A893FA76390C}.Release|Any CPU.Build.0 = Release|Any CPU - {E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Release|Any CPU.Build.0 = Release|Any CPU + {C04D08A3-196A-4ACF-983A-316B7ADF1D05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {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 + {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 + {167FDAED-3220-4516-AC8F-C506F593896D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -171,19 +179,20 @@ Global {BECC7A6E-1438-4EAC-B34B-276DEF463769} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} {DE012146-4D34-44CC-8701-53C42F2943D2} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} {9E199047-514B-4D38-A8A3-0F5F18547F88} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {44EE40EE-2AD9-45D9-A939-A893FA76390C} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {C04D08A3-196A-4ACF-983A-316B7ADF1D05} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} {8E552A7E-0C8C-49C2-8988-19469A732E26} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {B792E72A-0513-4359-B754-D0372610DDCE} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {1236A517-6B61-4A62-9495-1C945EDA4D12} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} - {2F7292AF-429F-4888-B938-B6615F06E838} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} - {136C7622-75EE-4C95-9642-DAD4A5392274} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {65079F8F-0653-4474-B105-551A9B6F102B} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {A12B92C6-071A-4C61-8934-371DBB240873} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {68B501BC-5281-4BC8-B631-C34013E4505E} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} - {E3660206-4E55-4A6A-AF4A-17EAB1BEDF50} = {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} + {167FDAED-3220-4516-AC8F-C506F593896D} = {D1CE7D63-2182-40E3-83E0-618DA3770779} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {02FCA09C-178B-4DE0-98E0-BCCDEBA97903} 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 6f3c58066d3..48cb21d5c55 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 @@ -1,12 +1,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32111.311 -MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{79CE8C7E-A4AF-413C-A54D-86F17073559C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators.Roslyn3.11", "gen\Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj", "{1491B9C9-955D-4DB0-B1D5-70137A78EAAE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "gen\Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj", "{1491B9C9-955D-4DB0-B1D5-70137A78EAAE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators.Roslyn4.0", "gen\Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj", "{A5439E79-96D6-4F02-8DD0-23DFF979851D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "gen\Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj", "{A5439E79-96D6-4F02-8DD0-23DFF979851D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{7F536552-0E2A-4642-B7CF-863727C2F9CD}" EndProject @@ -16,17 +13,17 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DAA1349E-960E-49EB-81F3-FF4F99D8A325}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B4C84174-9BAE-4C59-B0D5-0AA7E80BE0CE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F8CF3192-B902-4631-972A-C405FDECC48D}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{548DF5F7-790C-4A1C-89EB-BD904CA1BA86}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{03F31CEE-D63E-4E7F-949F-139B33DC3385}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7631380A-FB73-4241-9987-0891A21E9769}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{03F31CEE-D63E-4E7F-949F-139B33DC3385}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{548DF5F7-790C-4A1C-89EB-BD904CA1BA86}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -62,28 +59,28 @@ 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 - {DAA1349E-960E-49EB-81F3-FF4F99D8A325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DAA1349E-960E-49EB-81F3-FF4F99D8A325}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DAA1349E-960E-49EB-81F3-FF4F99D8A325}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DAA1349E-960E-49EB-81F3-FF4F99D8A325}.Release|Any CPU.Build.0 = Release|Any CPU - {F8CF3192-B902-4631-972A-C405FDECC48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8CF3192-B902-4631-972A-C405FDECC48D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8CF3192-B902-4631-972A-C405FDECC48D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8CF3192-B902-4631-972A-C405FDECC48D}.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 + {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 + {6645D0C4-83D1-4426-B9CD-67096CB7A60F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {79CE8C7E-A4AF-413C-A54D-86F17073559C} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B} + {C333EC5A-F386-4A01-AE20-12D499551304} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B} + {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} + {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} - {C333EC5A-F386-4A01-AE20-12D499551304} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B} - {1CB869A7-2EEC-4A53-9C33-DF9E0C75825B} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B} - {DAA1349E-960E-49EB-81F3-FF4F99D8A325} = {7631380A-FB73-4241-9987-0891A21E9769} - {F8CF3192-B902-4631-972A-C405FDECC48D} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {450DA749-CBDC-4BDC-950F-8A491CF59D49} 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 53e6949eb91..7ea681ea2a6 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,14 +55,16 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3CFBDC1C-B621-4921-9AEF-3891B2B644C5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{414EFABE-3D9D-4166-B0AA-E5D36B7E53CD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{907BD280-43B8-41A1-A306-8B903993DCE4}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3B592E91-F7DB-4B78-A1CE-CB1CA436220E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -181,14 +183,14 @@ 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 - {3CFBDC1C-B621-4921-9AEF-3891B2B644C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CFBDC1C-B621-4921-9AEF-3891B2B644C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CFBDC1C-B621-4921-9AEF-3891B2B644C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CFBDC1C-B621-4921-9AEF-3891B2B644C5}.Release|Any CPU.Build.0 = Release|Any CPU - {907BD280-43B8-41A1-A306-8B903993DCE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {907BD280-43B8-41A1-A306-8B903993DCE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {907BD280-43B8-41A1-A306-8B903993DCE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {907BD280-43B8-41A1-A306-8B903993DCE4}.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 + {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 + {5D09D653-A257-4673-810F-6157486964F4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -207,15 +209,12 @@ Global {8B2D67D3-9D41-45F0-9CDB-EFC9944C98AA} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} {5645B3B9-A523-4C61-8417-4EE0C90380AB} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} {723E756F-943A-438F-AC38-21A9670BF798} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {3CFBDC1C-B621-4921-9AEF-3891B2B644C5} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} {CD09F265-2818-40E4-8732-C41DE48A4EF7} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {1717DDEF-8917-4382-B5DC-073B2F2F4361} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {71755B81-EF5C-4C36-A278-60D69ECCC158} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {36176FF1-8C33-494D-A496-1D7E0DCFCD86} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {788150B7-B822-4466-A1DC-C875449DE449} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} - {77AA759E-5BF0-4C86-91EB-2A33263553EC} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} - {A5BA71C3-A03C-43F7-B48E-96C301E87691} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {E7035B72-0180-437E-A696-1F0CD8921279} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {B3829B05-AA4A-4A0D-B076-D0C3031C9D33} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {BBCC241D-0980-4735-8187-229D37ADC0E5} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} @@ -223,7 +222,10 @@ Global {93C7964F-6A2F-48C7-A3EA-322401532E8C} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {531F1DAF-B4DE-4240-B7BE-E206330E3792} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {B077F55F-E15A-4B91-A1EB-8178B8313908} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} - {907BD280-43B8-41A1-A306-8B903993DCE4} = {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} + {5D09D653-A257-4673-810F-6157486964F4} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E5154479-615B-4978-AE5A-A7DE55907E36} 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 cf61b80a1b5..173b61f9481 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,9 +63,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0FB1C55D-62A0-4537-93F8-294761B37CFB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{0B0E7B5D-5F95-4E32-BBBA-E9DF82BCC772}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{EB05EC17-2C21-47EC-A39D-90ABBA053318}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{83BE9E3B-ADB4-4E32-94A2-C827B7885A6B}" EndProject @@ -85,6 +85,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AB19DE2B-6A1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{561502B1-98F5-40E0-B9D5-0F720E88E657}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -219,14 +221,14 @@ 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 - {0FB1C55D-62A0-4537-93F8-294761B37CFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FB1C55D-62A0-4537-93F8-294761B37CFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FB1C55D-62A0-4537-93F8-294761B37CFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FB1C55D-62A0-4537-93F8-294761B37CFB}.Release|Any CPU.Build.0 = Release|Any CPU - {EB05EC17-2C21-47EC-A39D-90ABBA053318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB05EC17-2C21-47EC-A39D-90ABBA053318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB05EC17-2C21-47EC-A39D-90ABBA053318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB05EC17-2C21-47EC-A39D-90ABBA053318}.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 + {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 + {83BADB4A-BD97-4121-B0B8-78BD3E3A352A}.Release|Any CPU.Build.0 = Release|Any CPU {83BE9E3B-ADB4-4E32-94A2-C827B7885A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {83BE9E3B-ADB4-4E32-94A2-C827B7885A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU {83BE9E3B-ADB4-4E32-94A2-C827B7885A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -272,7 +274,6 @@ Global {AC6EFD37-CF1C-4893-B2BA-41826794F711} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} {D1A26695-26BD-45CE-BB18-F5CC75801992} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} {F8AB4884-236C-4CAE-9359-F734FBC3CA83} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} - {0FB1C55D-62A0-4537-93F8-294761B37CFB} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} {83BE9E3B-ADB4-4E32-94A2-C827B7885A6B} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} {8C8B3A3F-A9C1-4E72-BA3F-DE8A8FE5B040} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} {0A49D42B-0C4D-46E0-ABBC-AE8600CDC472} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} @@ -281,8 +282,6 @@ Global {EF05AB17-527F-40BC-B4D1-AAE510267F4E} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} {1F272F82-E9D1-454A-8E3C-6BEAF02219D4} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} {2E4D0EB0-E34B-4D47-A7F1-E35C696066E8} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {424A18FB-010E-4B03-B1E7-6747E1C5E31E} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {2ECBDD0B-43A8-408E-B770-878F64620915} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} {6A02D298-6899-4DD0-BFF4-40702BC30BCD} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} {E09FB553-28C4-4C1C-8E86-CFAB3374A656} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} {974792E2-0311-446A-BABF-18B3A8DDDEC5} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} @@ -291,11 +290,14 @@ Global {6316940A-1032-4A41-8D2E-4A9E08B612F6} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} {3C9A4019-6151-4D27-BCA5-3EBAA0C71B39} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} {5DCD1587-CC45-4105-8FFE-E4A43C60DA8D} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {EB05EC17-2C21-47EC-A39D-90ABBA053318} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} {BF5E5B5A-AC50-4FF1-AADB-0DFC1AA8E429} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {A276A0DD-B092-455B-90A7-6EE82BFF4C4B} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {F26A20A7-F0B2-4410-972C-15DACEEBDB8C} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1591684-381C-4761-A20A-4B7FA24E5557} 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 e3bc7f50b43..ded0856d513 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 @@ -48,9 +48,6 @@ <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> - </ItemGroup> <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> 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 4f24c4a9e7d..adfadc08367 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,14 +39,16 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C839B756-1681-4DFD-A73E-9EFB91C3495D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{535FBBF7-6933-4E24-BDFA-86B22164CDF5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{668A1DC6-089D-4ABA-A32B-E1F85EAD1790}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{33C65345-4AE9-41DF-8CC8-5C81979DBD03}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B1578203-268C-45C3-B62C-3D5CFC340AB4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -133,14 +135,14 @@ 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 - {C839B756-1681-4DFD-A73E-9EFB91C3495D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C839B756-1681-4DFD-A73E-9EFB91C3495D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C839B756-1681-4DFD-A73E-9EFB91C3495D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C839B756-1681-4DFD-A73E-9EFB91C3495D}.Release|Any CPU.Build.0 = Release|Any CPU - {668A1DC6-089D-4ABA-A32B-E1F85EAD1790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {668A1DC6-089D-4ABA-A32B-E1F85EAD1790}.Debug|Any CPU.Build.0 = Debug|Any CPU - {668A1DC6-089D-4ABA-A32B-E1F85EAD1790}.Release|Any CPU.ActiveCfg = Release|Any CPU - {668A1DC6-089D-4ABA-A32B-E1F85EAD1790}.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 + {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 + {635C575E-2759-4F37-A7CA-2A51BDCC84C5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -155,19 +157,19 @@ Global {B39EB467-7C81-482C-A1EA-D6B183E43DE9} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} {AD197619-E574-41FD-A70F-FDE7C750E6DF} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} {58DBC00E-C837-4232-BCE5-45DBDD8B89D3} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} - {C839B756-1681-4DFD-A73E-9EFB91C3495D} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} {544BBE63-3650-42E0-AD83-B613907BE753} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {5B4734D0-7CF9-4F4B-B27A-FAED72A81C71} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {850FBE78-DE29-480D-B4EE-6D260B0341B4} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} - {6D60A144-E901-4BCB-8DE6-148B56157771} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} - {B974A465-1912-4E4A-ADA6-B2BAF9DDE89D} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {3DDCFBB7-A438-46BB-9094-A1A39060DD2A} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {81AB6F03-2FF8-4F0F-AB21-B80A6C345DC1} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {7B89700F-897A-4CE8-B789-C9F915631845} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {6BDC5518-F6BA-4506-B9E6-505EDEEE340F} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {DACACFDC-C2ED-41A9-B2D4-2898FC4A938F} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {A3AE4326-5EB6-454C-8276-93B1E5FA5A84} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} - {668A1DC6-089D-4ABA-A32B-E1F85EAD1790} = {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} + {635C575E-2759-4F37-A7CA-2A51BDCC84C5} = {B1578203-268C-45C3-B62C-3D5CFC340AB4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4842DEC4-687D-48D9-B1FE-FF5456C0B60B} 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 a1c92d61eb5..d9fc0c79554 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,9 +47,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{18516F07-CC8B-4009-9822-0AE194B30407}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{64A3B2A6-588B-496A-8A42-8A2BD00017E9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CB85C76A-3E2A-4D2A-8B90-92CA5722A170}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB}" EndProject @@ -59,6 +59,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7787FAA0-0A1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{677D11A9-4811-41EA-8F93-F8DB15BF27DD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -161,14 +163,14 @@ 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 - {18516F07-CC8B-4009-9822-0AE194B30407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18516F07-CC8B-4009-9822-0AE194B30407}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18516F07-CC8B-4009-9822-0AE194B30407}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18516F07-CC8B-4009-9822-0AE194B30407}.Release|Any CPU.Build.0 = Release|Any CPU - {CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.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 + {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 + {82D7CA6B-8647-49A1-B4A1-40A8C6B9D7C2}.Release|Any CPU.Build.0 = Release|Any CPU {C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB}.Debug|Any CPU.Build.0 = Debug|Any CPU {C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -193,14 +195,11 @@ Global {C7296700-13E1-4D81-A479-992142F50718} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} {3D501DAC-12C1-4423-AE63-7157624B65DB} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} {E266D70D-9B9E-485D-B739-87E1DD31D11D} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} - {18516F07-CC8B-4009-9822-0AE194B30407} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} {C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} {FC75EA09-5D5C-4F63-8686-6ED99F5B503B} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} {B67E21A5-9B87-46DB-99A1-F04074CBE466} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} {A21DEE4B-F49B-4A19-95AC-7589757B8962} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} {62D0B220-DABD-4C56-A0E2-640D74465328} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} - {2F5646F6-8247-42E5-ACF5-8732ACB7067A} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} - {AA692D58-2C6C-4307-A13F-0884B6164026} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} {6C2850C7-56F0-4DCF-BFBF-4365DE2FC439} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} {5EA9057E-5887-4BDB-8785-A752D96D89F9} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} {515F097D-9FFB-4728-8B9E-18CFA6916AD3} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} @@ -209,7 +208,10 @@ Global {BD0C10F6-84AA-4B6F-95A6-E723A4DAC6BD} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} {3DCDA242-48D4-4611-B4A3-7EDBF84A9127} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} {204919F3-8E5C-4D4D-9E3B-ADFB1E453972} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} - {CB85C76A-3E2A-4D2A-8B90-92CA5722A170} = {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} + {82D7CA6B-8647-49A1-B4A1-40A8C6B9D7C2} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {88E9AE9C-34A3-4853-8244-9158CC50902D} 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 aa9d62a7319..78f19b94280 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,9 +43,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{5EAEB159-6569-4D3F-B7E4-313F8EBED61B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{0257FBE8-330E-4B1F-8546-DF554DADB6F6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9A16DEC0-1F88-4335-95B3-D7923FEB5283}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{F26D1D03-87AE-4E80-A3E2-6C085BC969ED}" EndProject @@ -65,6 +65,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5A06587C-82E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{887BF6A4-CB22-4DF4-8E24-A1B267161ECB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{590E1BD9-E5AD-456B-B954-E26EA0BFE405}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -159,14 +161,14 @@ 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 - {5EAEB159-6569-4D3F-B7E4-313F8EBED61B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5EAEB159-6569-4D3F-B7E4-313F8EBED61B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5EAEB159-6569-4D3F-B7E4-313F8EBED61B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5EAEB159-6569-4D3F-B7E4-313F8EBED61B}.Release|Any CPU.Build.0 = Release|Any CPU - {9A16DEC0-1F88-4335-95B3-D7923FEB5283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A16DEC0-1F88-4335-95B3-D7923FEB5283}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A16DEC0-1F88-4335-95B3-D7923FEB5283}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A16DEC0-1F88-4335-95B3-D7923FEB5283}.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 + {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 + {F722EACC-BB4F-4A88-B833-BB931E20CFCD}.Release|Any CPU.Build.0 = Release|Any CPU {F26D1D03-87AE-4E80-A3E2-6C085BC969ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F26D1D03-87AE-4E80-A3E2-6C085BC969ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {F26D1D03-87AE-4E80-A3E2-6C085BC969ED}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -207,25 +209,25 @@ Global {61F1BF49-0040-47CC-BBA9-14E80CECD6CC} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} {B73EC56E-61AB-4857-903D-F5C4BDDD2357} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} {9510CAA3-989C-4EED-AD97-F18B8285D8EF} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} - {5EAEB159-6569-4D3F-B7E4-313F8EBED61B} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} {F26D1D03-87AE-4E80-A3E2-6C085BC969ED} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} {3E80E645-8642-4944-9B45-0F317A8D2E58} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} {9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {AD133460-B832-44BE-BF0A-A699A77FA718} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {7834A5FC-A39B-4435-9D8C-2EEABFFA7A84} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {332D5122-9FA6-41D5-ACDC-9EF680961C31} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {9E6D88B5-926D-494D-BC52-A429EFBF419F} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {F4A703F8-3D69-4113-A86F-9AD908086092} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {85D5D364-5D5F-4D9F-A6DA-1EF4C9E5503F} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {4B621745-2446-4A51-96C1-E1F9D4FCE1E3} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {9B8BD276-447B-4E93-AC2F-2F5E9E355E8C} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {E06E4463-281C-46C1-A4D6-4593742C1CBC} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {23F45D4C-4E33-4334-A5BF-D34E24165E0B} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {9A16DEC0-1F88-4335-95B3-D7923FEB5283} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {50CC33E5-CB2C-4CFB-9CDE-BBD41B30FB86} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {62AECDFA-699B-41B0-AE5F-4B7D5D8F26B1} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {4280A906-80BD-406D-A591-B3C58B2BD72C} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {67B715CE-2E67-4605-BFB0-CA65F345C3A5} diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index aaba3a89e37..b4849803531 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> @@ -30,7 +30,6 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> <!-- Application tfms (.NETCoreApp, .NETFramework) need to use the same or higher version of .NETStandard's dependencies. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\src\System.Text.Json.csproj" /> </ItemGroup> 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 8705be66d53..1cacbf98aa9 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,14 +39,16 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{5D92F57D-42F4-4B37-907C-25D06233FDBB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{26C7C958-9C73-46BA-9FAD-FC1AD28BF7C9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9635EB28-5AEA-40A1-B59E-A2C7CA21376F}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C9FA428B-8564-4791-8CBF-2438F4783124}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E852D5A7-219C-4E2B-A327-6C6B988E65FC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -133,14 +135,14 @@ 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 - {5D92F57D-42F4-4B37-907C-25D06233FDBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D92F57D-42F4-4B37-907C-25D06233FDBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D92F57D-42F4-4B37-907C-25D06233FDBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D92F57D-42F4-4B37-907C-25D06233FDBB}.Release|Any CPU.Build.0 = Release|Any CPU - {9635EB28-5AEA-40A1-B59E-A2C7CA21376F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9635EB28-5AEA-40A1-B59E-A2C7CA21376F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9635EB28-5AEA-40A1-B59E-A2C7CA21376F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9635EB28-5AEA-40A1-B59E-A2C7CA21376F}.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 + {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 + {4559571A-68B4-40DD-B22F-76D6E06683EB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -155,19 +157,19 @@ Global {0BC6E16E-E4E8-4159-9A0B-B92C9D0CFB92} = {C9FA428B-8564-4791-8CBF-2438F4783124} {3F1FF12D-6CAF-409D-BF8D-E299646B545C} = {C9FA428B-8564-4791-8CBF-2438F4783124} {0948BA1C-2BEA-4F82-8B08-F2F6B7031CBF} = {C9FA428B-8564-4791-8CBF-2438F4783124} - {5D92F57D-42F4-4B37-907C-25D06233FDBB} = {C9FA428B-8564-4791-8CBF-2438F4783124} {1B7B708C-F860-478E-B3D4-1CB70E71A440} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {A9250A96-9B27-46C5-A043-11F67D63B128} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {A64CC82B-B781-4469-B009-49A43A0A2A96} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} - {B3511D68-4F4C-4632-B993-649BCF73DE46} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} - {D9B7AD79-A748-4D4F-9CF8-AB65D848085D} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {F63AB9DB-6E62-4FEC-BA06-E146615C08AC} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {BC92BF65-8FA0-49C0-911F-426F21090774} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {C0A5172A-162E-4CD8-B4E4-C8AE137EBC64} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {15D8CD42-77C9-4DEC-9C53-E6C6C766A646} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {59BC50A1-510F-44A4-A507-AEC051EA8908} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {D72BF608-9C7C-41BE-9288-22BA49AF954F} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} - {9635EB28-5AEA-40A1-B59E-A2C7CA21376F} = {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} + {4559571A-68B4-40DD-B22F-76D6E06683EB} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3375EACB-CFC1-4E7B-8A64-C346BD35E354} diff --git a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln index 10e502dcf26..64625529d5b 100644 --- a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln +++ b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln @@ -105,9 +105,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{012BA90D-8171-4C14-A811-5B1C7B239B9E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9674CC3E-22FA-4CE5-BA42-26F6D3687057}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{04BA3E3C-6979-4792-B19E-C797AD607F42}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}" EndProject @@ -131,6 +131,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E70034C8-3FE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D8928AB2-2939-4421-90C5-56B789BF93E5}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BCF59319-979C-42FA-9B5E-19EFCC91D288}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -349,14 +351,14 @@ 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 - {012BA90D-8171-4C14-A811-5B1C7B239B9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {012BA90D-8171-4C14-A811-5B1C7B239B9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {012BA90D-8171-4C14-A811-5B1C7B239B9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {012BA90D-8171-4C14-A811-5B1C7B239B9E}.Release|Any CPU.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.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 + {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 + {2CBBB613-7A47-495A-839D-76824F6C2100}.Release|Any CPU.Build.0 = Release|Any CPU {DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}.Debug|Any CPU.Build.0 = Debug|Any CPU {DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -421,7 +423,6 @@ Global {22D90254-1BE5-4D9E-A5F4-FA454B20C5A1} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} {DD948842-60C4-4385-9F0B-9B2702379A9E} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} {9EB3E70F-09B0-4DCB-8963-6A05E5B8E660} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} - {012BA90D-8171-4C14-A811-5B1C7B239B9E} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} {DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} {A5A45BB0-8993-4AFE-8D3C-BD1073D1B56A} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} {BB1EF0C4-822E-4476-8872-8620EA665C35} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} @@ -437,8 +438,6 @@ Global {31E317F8-F766-4EC3-8101-2D92CDB407CD} = {D8928AB2-2939-4421-90C5-56B789BF93E5} {5F0CF40F-D54D-4101-94EA-8FE7F9C843CB} = {D8928AB2-2939-4421-90C5-56B789BF93E5} {7C562B37-19E5-44BE-85D5-15FFA9FAEF5A} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {765ABDD6-8C3B-4CD8-9DAC-BE9DAB674726} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {95CB49D4-0754-49C6-8E97-868626614390} = {D8928AB2-2939-4421-90C5-56B789BF93E5} {4BEF5648-8DBF-4E16-B6E6-6F80694E140D} = {D8928AB2-2939-4421-90C5-56B789BF93E5} {9D96B3BD-B371-4E44-A43F-50B8EEBEC889} = {D8928AB2-2939-4421-90C5-56B789BF93E5} {F700E4AF-073D-4C1D-A8C2-84E744EBC374} = {D8928AB2-2939-4421-90C5-56B789BF93E5} @@ -452,11 +451,14 @@ Global {7CB59805-CD93-4D2A-BD21-A97820DD35B0} = {D8928AB2-2939-4421-90C5-56B789BF93E5} {D81BE8A0-A710-4B74-8AA7-1733B3DCC461} = {D8928AB2-2939-4421-90C5-56B789BF93E5} {425C299F-7D53-49EC-92D0-22B77BEA12D2} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {04BA3E3C-6979-4792-B19E-C797AD607F42} = {D8928AB2-2939-4421-90C5-56B789BF93E5} {B5B30447-25D0-42C0-920A-092247C95664} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {C1557157-7D8E-43A3-89D1-9F4F2621D838} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {D8001B54-0361-40B9-A094-13063C5CF9A3} = {D8928AB2-2939-4421-90C5-56B789BF93E5} {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B57B7C13-740F-4482-B7B6-B5E87014ACB1} 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 873b7659357..1fe0911720c 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,9 +39,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0175BBDC-9C0F-4648-AE71-C9A2304EA6F8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{08E60BE4-771F-4873-B7EF-7D8F7BA31F26}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E5447C9E-2B11-4D59-9159-7734785A9B5A}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3467065B-1F80-427C-81C1-09114914817F}" EndProject @@ -49,6 +49,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1FFB0A3C-B67 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E6347567-2D24-4E99-8F15-3657FF95AB6D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F4006304-5C88-478E-A93C-621D71A5097F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -135,14 +137,14 @@ 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 - {0175BBDC-9C0F-4648-AE71-C9A2304EA6F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0175BBDC-9C0F-4648-AE71-C9A2304EA6F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0175BBDC-9C0F-4648-AE71-C9A2304EA6F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0175BBDC-9C0F-4648-AE71-C9A2304EA6F8}.Release|Any CPU.Build.0 = Release|Any CPU - {E5447C9E-2B11-4D59-9159-7734785A9B5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5447C9E-2B11-4D59-9159-7734785A9B5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5447C9E-2B11-4D59-9159-7734785A9B5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5447C9E-2B11-4D59-9159-7734785A9B5A}.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 + {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 + {9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -159,7 +161,6 @@ Global {E9C0F645-340E-4310-95A3-4971B0272546} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} {3C4B33AA-C88E-4E36-B06D-AC8BE4FDCB5B} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} {E8051516-B4B6-479E-BA8D-F3355B169F8D} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} - {0175BBDC-9C0F-4648-AE71-C9A2304EA6F8} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} {3654E473-6D57-4442-A5F6-5642C09BDC95} = {E6347567-2D24-4E99-8F15-3657FF95AB6D} {294A92FD-4500-4691-8309-6D11E5E6E6CB} = {E6347567-2D24-4E99-8F15-3657FF95AB6D} {7AC93447-67F2-4445-86D2-E13D52156BAE} = {E6347567-2D24-4E99-8F15-3657FF95AB6D} @@ -169,7 +170,8 @@ 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} - {E5447C9E-2B11-4D59-9159-7734785A9B5A} = {E6347567-2D24-4E99-8F15-3657FF95AB6D} + {08E60BE4-771F-4873-B7EF-7D8F7BA31F26} = {F4006304-5C88-478E-A93C-621D71A5097F} + {9621BAB7-9AFF-4CAD-BFFF-B6BC1341155C} = {F4006304-5C88-478E-A93C-621D71A5097F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3A661B81-588D-49A6-A245-E9B7EA9C3FE4} 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 cfc9d6083ba..d199d194d02 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,14 +19,16 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{176D75D6-80A3-4B87-A2A1-316AFA637F3B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{63AE2BB8-FF71-464E-A53E-92C7560517DA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DAEC9B39-32E0-481A-972B-087755C49502}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DE5517CB-9721-49A0-9ECB-BC08460946AC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5B543880-D43D-48B8-9C46-CEE391D03B73}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,14 +75,14 @@ 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 - {176D75D6-80A3-4B87-A2A1-316AFA637F3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {176D75D6-80A3-4B87-A2A1-316AFA637F3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {176D75D6-80A3-4B87-A2A1-316AFA637F3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {176D75D6-80A3-4B87-A2A1-316AFA637F3B}.Release|Any CPU.Build.0 = Release|Any CPU - {DAEC9B39-32E0-481A-972B-087755C49502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DAEC9B39-32E0-481A-972B-087755C49502}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DAEC9B39-32E0-481A-972B-087755C49502}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DAEC9B39-32E0-481A-972B-087755C49502}.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 + {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 + {BBFDDC90-8F98-4DD7-8A18-8E2345C18904}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -91,13 +93,13 @@ Global {D1140557-6F25-44E9-9497-E354DC2576A1} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} {8F8A5D2D-A829-4E0E-9DCC-57FF2C89C544} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} {0E60E743-56C9-466D-A428-232FEAEEF41E} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} - {176D75D6-80A3-4B87-A2A1-316AFA637F3B} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} {C68DD6AF-7125-4FD6-A90D-25A82824780D} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6} {2DB8E45F-D3EF-47A7-847E-0311AE734314} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6} {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} - {DAEC9B39-32E0-481A-972B-087755C49502} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6} + {63AE2BB8-FF71-464E-A53E-92C7560517DA} = {5B543880-D43D-48B8-9C46-CEE391D03B73} + {BBFDDC90-8F98-4DD7-8A18-8E2345C18904} = {5B543880-D43D-48B8-9C46-CEE391D03B73} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {976CC898-9F51-4F78-825C-EF31520CD788} diff --git a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln index e86d7377d94..638449391c0 100644 --- a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln +++ b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln @@ -127,9 +127,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{6671471B-2885-457C-9F63-D43DF9DC31C3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{20A8DB98-FDD3-49FE-AC28-A5B21F7F6EC0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{8E7256F3-ACCF-4576-B091-CC8ADC60C33E}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{64388157-7D8E-41C3-B514-943A0E6E4250}" EndProject @@ -153,6 +153,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{72A090A3-FE1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7028EE0A-D314-4F48-91CA-51A1633BC3F4}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -415,14 +417,14 @@ 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 - {6671471B-2885-457C-9F63-D43DF9DC31C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6671471B-2885-457C-9F63-D43DF9DC31C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6671471B-2885-457C-9F63-D43DF9DC31C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6671471B-2885-457C-9F63-D43DF9DC31C3}.Release|Any CPU.Build.0 = Release|Any CPU - {8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.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 + {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 + {E0460280-2F49-474C-862D-1787D9244CC8}.Release|Any CPU.Build.0 = Release|Any CPU {64388157-7D8E-41C3-B514-943A0E6E4250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {64388157-7D8E-41C3-B514-943A0E6E4250}.Debug|Any CPU.Build.0 = Debug|Any CPU {64388157-7D8E-41C3-B514-943A0E6E4250}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -492,7 +494,6 @@ Global {6A1A3AFF-C018-498A-80A0-532396132AD5} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} {11773B90-8DAC-4B51-A4B6-7C64FD6942BD} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} {C88CD350-8273-454E-825B-720DFFA5AE05} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} - {6671471B-2885-457C-9F63-D43DF9DC31C3} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} {64388157-7D8E-41C3-B514-943A0E6E4250} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} {9F1389B4-A9A5-422F-89F5-A2D431292F0C} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} {6E2398EA-A64A-4493-A79B-63D2F072A690} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} @@ -513,8 +514,6 @@ Global {36D778AF-5EC3-433F-B03D-EB244DB3C227} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} {D0932BA0-70BF-4A98-9A30-ED563AB2BFB9} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} {6AD51705-102E-4E9D-B62E-6BF19025F3A7} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {39EE5D71-77C5-4633-A47F-1062172FD121} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {8A4E7CB4-9983-4B7F-BED9-7A94BAC7CA07} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} {56D37CB2-68A3-42D3-AA0E-416813ABAD8B} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} {9EBA168F-239A-46C4-8614-E1D3DB25DD0E} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} {47B5D904-4787-49E3-9894-31F8B7BE6755} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} @@ -529,11 +528,14 @@ Global {429C9D71-4BBD-489D-9C86-EC240F652008} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} {99007CDD-4840-4B94-8A8A-FECF72BCEE3F} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} {9175023F-6982-45CD-B360-C4FC1E145B25} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {8E7256F3-ACCF-4576-B091-CC8ADC60C33E} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} {59D31D62-3BF9-4F4A-9FF7-3A61F297F714} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {B5F25A78-B7FB-460B-9B71-BE82D22923FD} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {E06CE29E-15EB-4C0E-97B7-4367FFEDD98D} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FE89CDC6-6313-439C-85D7-A81D5DF593E9} diff --git a/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln b/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln index 23ea9b4081d..8a7ac58b986 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln +++ b/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7F0B7A9C-D76A-49E8-9BCF-731DD7806686}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{EA783DDB-3B64-494F-B55C-9C31A9BAAB8C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9BF048D0-411 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A447D0CB-601B-479E-A2B2-76E48F5D4D61}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{069D6714-DE43-45C4-BABC-C8246B974CA7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {7F0B7A9C-D76A-49E8-9BCF-731DD7806686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F0B7A9C-D76A-49E8-9BCF-731DD7806686}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F0B7A9C-D76A-49E8-9BCF-731DD7806686}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F0B7A9C-D76A-49E8-9BCF-731DD7806686}.Release|Any CPU.Build.0 = Release|Any CPU - {45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3}.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 + {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 + {959348BC-2D38-41F4-9F3D-2E1CD18D9477}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE} = {76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3} {43DBAD84-A865-4F5F-AB76-7F3EB6784E99} = {76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3} {EF75497C-6CB7-4471-980A-619EA1AB8CF6} = {9BF048D0-411D-4C2A-8C32-3A3255501D27} - {7F0B7A9C-D76A-49E8-9BCF-731DD7806686} = {9BF048D0-411D-4C2A-8C32-3A3255501D27} {09E28D94-B771-48EB-800C-5A80C2C0055C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {EA783DDB-3B64-494F-B55C-9C31A9BAAB8C} = {069D6714-DE43-45C4-BABC-C8246B974CA7} + {959348BC-2D38-41F4-9F3D-2E1CD18D9477} = {069D6714-DE43-45C4-BABC-C8246B974CA7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7D279EE5-E38F-4125-AE82-6ADE52D72F26} diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj index 53c7b1e16be..a91ef66641a 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -23,11 +23,6 @@ Microsoft.Extensions.Primitives.StringSegment</PackageDescription> Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> </ItemGroup> - <!-- Application tfms (.NETCoreApp, .NETFramework) need to use the same or higher version of .NETStandard's dependencies. --> - <ItemGroup> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln b/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln index 72779919db4..3a6101da65b 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln +++ b/src/libraries/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.sln @@ -5,15 +5,15 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{CD14091E-29C8-490F-8C9F-25FF87072E69}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{06D5AA6A-A473-4A9B-A4CC-34277654C45F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{8A09F5ED-494F-4F3E-9F17-F1845931E9FF}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E4827496-6F39-4CA0-8F4A-ACDE9DFEBE5C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F96FBD24-3BB3-4D02-9884-4D90F94DD3C0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{563395FB-B941-465B-B35B-A7D7F0B82825}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E8010E1D-FDAF-481D-AA34-3B115B667E4B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -33,14 +33,14 @@ 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 - {CD14091E-29C8-490F-8C9F-25FF87072E69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD14091E-29C8-490F-8C9F-25FF87072E69}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD14091E-29C8-490F-8C9F-25FF87072E69}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD14091E-29C8-490F-8C9F-25FF87072E69}.Release|Any CPU.Build.0 = Release|Any CPU - {8A09F5ED-494F-4F3E-9F17-F1845931E9FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A09F5ED-494F-4F3E-9F17-F1845931E9FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A09F5ED-494F-4F3E-9F17-F1845931E9FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A09F5ED-494F-4F3E-9F17-F1845931E9FF}.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 + {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 + {2E3568B1-EC27-4F02-BC0E-71DD3FD7735B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -49,8 +49,8 @@ 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} - {8A09F5ED-494F-4F3E-9F17-F1845931E9FF} = {F96FBD24-3BB3-4D02-9884-4D90F94DD3C0} - {CD14091E-29C8-490F-8C9F-25FF87072E69} = {563395FB-B941-465B-B35B-A7D7F0B82825} + {06D5AA6A-A473-4A9B-A4CC-34277654C45F} = {E8010E1D-FDAF-481D-AA34-3B115B667E4B} + {2E3568B1-EC27-4F02-BC0E-71DD3FD7735B} = {E8010E1D-FDAF-481D-AA34-3B115B667E4B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E946A528-C3E7-48EC-AD6D-AE84ED2B11AC} diff --git a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln index d1666e49331..945d19b8aad 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln +++ b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln @@ -7,20 +7,10 @@ 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}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{1970A570-2766-49C2-83A4-9898E295D6AF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{40E6CFD8-4203-49CA-A3D7-A93A2344F876}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{EE74172D-1E18-4130-B71E-C9FDF04DA0F6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{87BEF7AB-0679-4526-900E-6514F0C6F86C}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{CABE2B33-0131-4889-AF63-A7241629C96A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{3ECA4E78-310C-4E3F-BEB7-422340D9D87E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\ref\System.Text.Encoding.CodePages.csproj", "{744F821F-99E9-4FF5-A84A-85432CC77548}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj", "{30CC7F8D-60DB-49C5-BE59-81477BFE0376}" @@ -31,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3BC7B60B-4BE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{037CA0A6-EB43-4A49-A854-E13AE7B8972D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -53,18 +45,6 @@ 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 - {1970A570-2766-49C2-83A4-9898E295D6AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1970A570-2766-49C2-83A4-9898E295D6AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1970A570-2766-49C2-83A4-9898E295D6AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1970A570-2766-49C2-83A4-9898E295D6AF}.Release|Any CPU.Build.0 = Release|Any CPU - {40E6CFD8-4203-49CA-A3D7-A93A2344F876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40E6CFD8-4203-49CA-A3D7-A93A2344F876}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40E6CFD8-4203-49CA-A3D7-A93A2344F876}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40E6CFD8-4203-49CA-A3D7-A93A2344F876}.Release|Any CPU.Build.0 = Release|Any CPU - {EE74172D-1E18-4130-B71E-C9FDF04DA0F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE74172D-1E18-4130-B71E-C9FDF04DA0F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE74172D-1E18-4130-B71E-C9FDF04DA0F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE74172D-1E18-4130-B71E-C9FDF04DA0F6}.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 @@ -73,14 +53,6 @@ Global {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 {DD515FA9-D026-4B9B-9456-2D174634C12D}.Release|Any CPU.Build.0 = Release|Any CPU - {CABE2B33-0131-4889-AF63-A7241629C96A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CABE2B33-0131-4889-AF63-A7241629C96A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CABE2B33-0131-4889-AF63-A7241629C96A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CABE2B33-0131-4889-AF63-A7241629C96A}.Release|Any CPU.Build.0 = Release|Any CPU - {3ECA4E78-310C-4E3F-BEB7-422340D9D87E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3ECA4E78-310C-4E3F-BEB7-422340D9D87E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3ECA4E78-310C-4E3F-BEB7-422340D9D87E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3ECA4E78-310C-4E3F-BEB7-422340D9D87E}.Release|Any CPU.Build.0 = Release|Any CPU {744F821F-99E9-4FF5-A84A-85432CC77548}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {744F821F-99E9-4FF5-A84A-85432CC77548}.Debug|Any CPU.Build.0 = Debug|Any CPU {744F821F-99E9-4FF5-A84A-85432CC77548}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -97,16 +69,11 @@ Global {009D39C7-821B-44E4-ABB9-8ED94464A5CB} = {3FD0B41F-6CEA-4AE2-832F-60C8686858C4} {476C0AEB-48CB-4978-9D35-06AA49F800B9} = {3FD0B41F-6CEA-4AE2-832F-60C8686858C4} {EA1B5DA0-F263-4298-A8FC-564E9DF00771} = {3BC7B60B-4BE3-4D6F-8C03-8D6BDACC845E} - {40E6CFD8-4203-49CA-A3D7-A93A2344F876} = {3BC7B60B-4BE3-4D6F-8C03-8D6BDACC845E} {744F821F-99E9-4FF5-A84A-85432CC77548} = {3BC7B60B-4BE3-4D6F-8C03-8D6BDACC845E} {E741B977-6B3F-4DA7-A22B-251A1B3E42F7} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483} - {1970A570-2766-49C2-83A4-9898E295D6AF} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483} - {EE74172D-1E18-4130-B71E-C9FDF04DA0F6} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483} - {87BEF7AB-0679-4526-900E-6514F0C6F86C} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483} - {DD515FA9-D026-4B9B-9456-2D174634C12D} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483} - {CABE2B33-0131-4889-AF63-A7241629C96A} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483} - {3ECA4E78-310C-4E3F-BEB7-422340D9D87E} = {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} + {DD515FA9-D026-4B9B-9456-2D174634C12D} = {037CA0A6-EB43-4A49-A854-E13AE7B8972D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4C265A0A-56EF-41A8-B973-AA764175AA29} diff --git a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln index f5713d005e2..8023acb74cd 100644 --- a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln +++ b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{75E8E37F-C551-47B1-A62B-EE78C96BBDF0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D0CB9D68-8D84-4C58-AF1B-A515960E97E0}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CEC48784 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{08BAF9E0-068B-4201-91E6-91B725ABE3D2}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A48D1F08-4510-44F9-9E77-7164B2769064}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -146,42 +144,6 @@ 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 - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Debug|x64.ActiveCfg = Debug|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Debug|x64.Build.0 = Debug|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Debug|x86.ActiveCfg = Debug|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Debug|x86.Build.0 = Debug|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Release|Any CPU.Build.0 = Release|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Release|x64.ActiveCfg = Release|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Release|x64.Build.0 = Release|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Release|x86.ActiveCfg = Release|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Release|x86.Build.0 = Release|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Checked|Any CPU.Build.0 = Debug|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Checked|x64.ActiveCfg = Debug|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Checked|x64.Build.0 = Debug|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Checked|x86.ActiveCfg = Debug|Any CPU - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Checked|x86.Build.0 = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Debug|x64.ActiveCfg = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Debug|x64.Build.0 = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Debug|x86.ActiveCfg = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Debug|x86.Build.0 = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Release|Any CPU.Build.0 = Release|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Release|x64.ActiveCfg = Release|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Release|x64.Build.0 = Release|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Release|x86.ActiveCfg = Release|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Release|x86.Build.0 = Release|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Checked|Any CPU.Build.0 = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Checked|x64.ActiveCfg = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Checked|x64.Build.0 = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Checked|x86.ActiveCfg = Debug|Any CPU - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.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 @@ -225,14 +187,12 @@ Global GlobalSection(NestedProjects) = preSolution {7D1AFE3C-882D-4D27-A915-B87A1BC82D2D} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5} {B3BBD7D9-30F3-43D3-9D6A-C9BD5E19D32E} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5} - {5F4ABB4F-CE69-47B7-860F-40B0DA68A7DB} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5} - {75E8E37F-C551-47B1-A62B-EE78C96BBDF0} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5} - {D0CB9D68-8D84-4C58-AF1B-A515960E97E0} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5} - {EE5972A3-AD58-430B-ACEB-4F608FD1C0D6} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5} {069C76AC-B41A-4E17-A066-12233592145D} = {CEC48784-C8F0-46DF-AA1E-07850E754180} {B43D6BB6-1760-4DB9-87CB-792D42846C62} = {CEC48784-C8F0-46DF-AA1E-07850E754180} {EA142E29-EE37-4751-868B-27516AE0A209} = {08BAF9E0-068B-4201-91E6-91B725ABE3D2} - {04266CFA-9B2A-4A22-9FC1-92197EF2A9A9} = {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} + {EE5972A3-AD58-430B-ACEB-4F608FD1C0D6} = {A48D1F08-4510-44F9-9E77-7164B2769064} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B6D42557-6A7E-4DEB-83B6-1A5BD020735D} 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 427a3cc8ee2..1ba7dd40c5d 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,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9341070F-8A24-45FD-96FF-DC936EC9FE4C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{514CE97B-7E25-45F3-B169-2174C16DBF1D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DD5B2888-463A-4AB6-911F-EB0BEA47951A}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BF17487D-E9E3-4054-85A7-E64243B91780}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{84D58703-756 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{29A3E154-E50B-49E7-96C3-32A91CAB9BA0}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BEA56439-DD4D-4DF6-9F07-33670D77D7FD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {9341070F-8A24-45FD-96FF-DC936EC9FE4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9341070F-8A24-45FD-96FF-DC936EC9FE4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9341070F-8A24-45FD-96FF-DC936EC9FE4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9341070F-8A24-45FD-96FF-DC936EC9FE4C}.Release|Any CPU.Build.0 = Release|Any CPU - {DD5B2888-463A-4AB6-911F-EB0BEA47951A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD5B2888-463A-4AB6-911F-EB0BEA47951A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD5B2888-463A-4AB6-911F-EB0BEA47951A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD5B2888-463A-4AB6-911F-EB0BEA47951A}.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 + {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 + {9BCDE466-92C1-45ED-A9F1-6973D93DF5DF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {F9B18052-9FB9-474A-9A6A-F322DED4F7CD} = {BF17487D-E9E3-4054-85A7-E64243B91780} {BC8FAA75-A595-475E-B947-FA2D1E225B48} = {BF17487D-E9E3-4054-85A7-E64243B91780} {97F37414-7633-4B76-AFA4-284E26894FB4} = {84D58703-7569-445A-89B8-14D024FB6091} - {9341070F-8A24-45FD-96FF-DC936EC9FE4C} = {84D58703-7569-445A-89B8-14D024FB6091} {9A0E9CD8-33FA-4E02-8EB6-5685CD84D727} = {29A3E154-E50B-49E7-96C3-32A91CAB9BA0} - {DD5B2888-463A-4AB6-911F-EB0BEA47951A} = {29A3E154-E50B-49E7-96C3-32A91CAB9BA0} + {514CE97B-7E25-45F3-B169-2174C16DBF1D} = {BEA56439-DD4D-4DF6-9F07-33670D77D7FD} + {9BCDE466-92C1-45ED-A9F1-6973D93DF5DF} = {BEA56439-DD4D-4DF6-9F07-33670D77D7FD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E4C2B201-85CD-4255-91AF-B179414B9679} diff --git a/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln b/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln index 7faec7de40b..3e21068764a 100644 --- a/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln +++ b/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln @@ -7,24 +7,18 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CC7AEF63-5AE0-4A16-9DD7-0A55B539D906}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E1A1E89F-AD14-4AE9-9974-7F33050E9F7E}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{8469BFF7-430A-4C3B-BDFC-16E6F7F82280}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{CF9B2263-BA4F-4A70-9777-6E8E81DCB122}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D3839339-AF88-4867-BF81-44915AA883A2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DE8642D5-1264-473C-9896-35F348E89DBF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{66BCDB38-AFF7-4B7C-97F5-8869D5C2EDA9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DC4533A7-1325-497B-91FE-89765F77DFBF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -47,14 +41,6 @@ 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 - {F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F}.Release|Any CPU.Build.0 = Release|Any CPU - {CC7AEF63-5AE0-4A16-9DD7-0A55B539D906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC7AEF63-5AE0-4A16-9DD7-0A55B539D906}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC7AEF63-5AE0-4A16-9DD7-0A55B539D906}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC7AEF63-5AE0-4A16-9DD7-0A55B539D906}.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 @@ -63,14 +49,6 @@ Global {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 {E8981301-50DC-4A1E-9BB0-537F9C5F2B8F}.Release|Any CPU.Build.0 = Release|Any CPU - {8469BFF7-430A-4C3B-BDFC-16E6F7F82280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8469BFF7-430A-4C3B-BDFC-16E6F7F82280}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8469BFF7-430A-4C3B-BDFC-16E6F7F82280}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8469BFF7-430A-4C3B-BDFC-16E6F7F82280}.Release|Any CPU.Build.0 = Release|Any CPU - {CF9B2263-BA4F-4A70-9777-6E8E81DCB122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF9B2263-BA4F-4A70-9777-6E8E81DCB122}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF9B2263-BA4F-4A70-9777-6E8E81DCB122}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF9B2263-BA4F-4A70-9777-6E8E81DCB122}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -79,13 +57,9 @@ Global {F4F537EB-4436-4407-9A42-A75FE9CEECE0} = {D3839339-AF88-4867-BF81-44915AA883A2} {E9123189-58BC-41A8-83A0-C46E74ED8160} = {D3839339-AF88-4867-BF81-44915AA883A2} {FC5B0E37-024C-4A09-9080-AA78F2BCE4A0} = {DE8642D5-1264-473C-9896-35F348E89DBF} - {F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F} = {DE8642D5-1264-473C-9896-35F348E89DBF} {3446E090-1587-4D16-AE6A-99C1788E86A6} = {66BCDB38-AFF7-4B7C-97F5-8869D5C2EDA9} - {CC7AEF63-5AE0-4A16-9DD7-0A55B539D906} = {66BCDB38-AFF7-4B7C-97F5-8869D5C2EDA9} - {E1A1E89F-AD14-4AE9-9974-7F33050E9F7E} = {66BCDB38-AFF7-4B7C-97F5-8869D5C2EDA9} - {E8981301-50DC-4A1E-9BB0-537F9C5F2B8F} = {66BCDB38-AFF7-4B7C-97F5-8869D5C2EDA9} - {8469BFF7-430A-4C3B-BDFC-16E6F7F82280} = {66BCDB38-AFF7-4B7C-97F5-8869D5C2EDA9} - {CF9B2263-BA4F-4A70-9777-6E8E81DCB122} = {66BCDB38-AFF7-4B7C-97F5-8869D5C2EDA9} + {E1A1E89F-AD14-4AE9-9974-7F33050E9F7E} = {DC4533A7-1325-497B-91FE-89765F77DFBF} + {E8981301-50DC-4A1E-9BB0-537F9C5F2B8F} = {DC4533A7-1325-497B-91FE-89765F77DFBF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B41F6F2B-9220-4A42-A69F-4BF2CA7E201A} diff --git a/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln b/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln index 4945ff27cdf..a310c0fa3fb 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln +++ b/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D5E761C4-CFDD-4902-9C11-5B8A11192A56}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{643587CB-EF49-4F0B-BEA6-FF40EA376EFA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9956C4C9-53F3-4560-96D0-4519B40007BB}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F2A4093D-6291-4A9C-87FC-6B06D2324E38}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8BF90E54-BE7 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A9588D3E-04F0-4294-8D1A-84CF3D84804A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B7447478-7C05-441D-BDDF-538008B24CBD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {D5E761C4-CFDD-4902-9C11-5B8A11192A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5E761C4-CFDD-4902-9C11-5B8A11192A56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5E761C4-CFDD-4902-9C11-5B8A11192A56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5E761C4-CFDD-4902-9C11-5B8A11192A56}.Release|Any CPU.Build.0 = Release|Any CPU - {9956C4C9-53F3-4560-96D0-4519B40007BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9956C4C9-53F3-4560-96D0-4519B40007BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9956C4C9-53F3-4560-96D0-4519B40007BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9956C4C9-53F3-4560-96D0-4519B40007BB}.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 + {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 + {1F21915D-D799-4AAA-9053-8BFFD5102FF1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {B3F56323-6D66-4576-BBF3-32ACAADE3223} = {F2A4093D-6291-4A9C-87FC-6B06D2324E38} {86962B5A-AC38-44FA-B25B-74ABAC57E534} = {F2A4093D-6291-4A9C-87FC-6B06D2324E38} {A586D099-E8B0-4C2F-B4AD-BCFA98429DBF} = {8BF90E54-BE73-4BBF-89CB-E9BE5DD1FC9E} - {D5E761C4-CFDD-4902-9C11-5B8A11192A56} = {8BF90E54-BE73-4BBF-89CB-E9BE5DD1FC9E} {20C56707-2960-4DF2-BF76-5556304EE7CF} = {A9588D3E-04F0-4294-8D1A-84CF3D84804A} - {9956C4C9-53F3-4560-96D0-4519B40007BB} = {A9588D3E-04F0-4294-8D1A-84CF3D84804A} + {643587CB-EF49-4F0B-BEA6-FF40EA376EFA} = {B7447478-7C05-441D-BDDF-538008B24CBD} + {1F21915D-D799-4AAA-9053-8BFFD5102FF1} = {B7447478-7C05-441D-BDDF-538008B24CBD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {14621231-E5C2-4B46-9ADC-1182F2721D07} diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln b/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln index 5688fe05755..4f8b3f85e76 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln +++ b/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln @@ -7,15 +7,15 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B3EA9B7E-FB07-4906-8878-C9DC04988ABC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{28A7B35D-620C-4E37-9252-4B88CD1D2887}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5E286F47-DA0D-4F8A-A831-38F2426B23D3}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BA160273-1658-4D63-8BB0-BEDDA0DAF20D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CC406051-3EEC-4E4F-8152-2F1BE15D61BA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9F85FD72-A640-4607-966D-36FF8C229268}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A3A8F98E-3524-4E5A-87C5-5324FD52E296}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,14 +39,14 @@ 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 - {B3EA9B7E-FB07-4906-8878-C9DC04988ABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3EA9B7E-FB07-4906-8878-C9DC04988ABC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3EA9B7E-FB07-4906-8878-C9DC04988ABC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3EA9B7E-FB07-4906-8878-C9DC04988ABC}.Release|Any CPU.Build.0 = Release|Any CPU - {5E286F47-DA0D-4F8A-A831-38F2426B23D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E286F47-DA0D-4F8A-A831-38F2426B23D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E286F47-DA0D-4F8A-A831-38F2426B23D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E286F47-DA0D-4F8A-A831-38F2426B23D3}.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 + {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 + {B1A05556-02FE-4BC0-89E4-4C6CC751675B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -56,8 +56,8 @@ 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} - {5E286F47-DA0D-4F8A-A831-38F2426B23D3} = {CC406051-3EEC-4E4F-8152-2F1BE15D61BA} - {B3EA9B7E-FB07-4906-8878-C9DC04988ABC} = {9F85FD72-A640-4607-966D-36FF8C229268} + {28A7B35D-620C-4E37-9252-4B88CD1D2887} = {A3A8F98E-3524-4E5A-87C5-5324FD52E296} + {B1A05556-02FE-4BC0-89E4-4C6CC751675B} = {A3A8F98E-3524-4E5A-87C5-5324FD52E296} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E4BEDA84-BAED-4E86-B18F-8417E2FD10BB} diff --git a/src/libraries/System.AppContext/System.AppContext.sln b/src/libraries/System.AppContext/System.AppContext.sln index a4cdca4e0e7..28250b68f75 100644 --- a/src/libraries/System.AppContext/System.AppContext.sln +++ b/src/libraries/System.AppContext/System.AppContext.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{68E366F0-A62B-4528-8B26-CDFE17AA9C42}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{207F66C5-1274-445C-B69E-E2C5F0776843}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1BD36757-E399-4B26-B82C-96D807D2CB73}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AE25156 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4E4CBD83-24E2-49A2-B0A5-57368BB1A055}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A1EFAD7B-1534-44CD-89D2-906AE96FB1F6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -146,42 +144,6 @@ 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 - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|x64.ActiveCfg = Debug|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|x64.Build.0 = Debug|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|x86.ActiveCfg = Debug|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|x86.Build.0 = Debug|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|Any CPU.Build.0 = Release|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|x64.ActiveCfg = Release|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|x64.Build.0 = Release|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|x86.ActiveCfg = Release|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|x86.Build.0 = Release|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Checked|Any CPU.Build.0 = Debug|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Checked|x64.ActiveCfg = Debug|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Checked|x64.Build.0 = Debug|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Checked|x86.ActiveCfg = Debug|Any CPU - {68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Checked|x86.Build.0 = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|Any CPU.Build.0 = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|x64.ActiveCfg = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|x64.Build.0 = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|x86.ActiveCfg = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|x86.Build.0 = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Release|Any CPU.ActiveCfg = Release|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Release|Any CPU.Build.0 = Release|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Release|x64.ActiveCfg = Release|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Release|x64.Build.0 = Release|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Release|x86.ActiveCfg = Release|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Release|x86.Build.0 = Release|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Checked|Any CPU.Build.0 = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Checked|x64.ActiveCfg = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Checked|x64.Build.0 = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.Checked|x86.ActiveCfg = Debug|Any CPU - {207F66C5-1274-445C-B69E-E2C5F0776843}.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 @@ -225,14 +187,12 @@ Global GlobalSection(NestedProjects) = preSolution {751F6E52-BD51-406F-9EB6-06D3C27BF469} = {262B61F6-470E-46B6-B392-858692D3FB23} {1648AC4C-3BEF-4B93-933B-5EC520BF11D5} = {262B61F6-470E-46B6-B392-858692D3FB23} - {1CFA73AC-672E-4EED-8003-51682AF702E5} = {262B61F6-470E-46B6-B392-858692D3FB23} - {207F66C5-1274-445C-B69E-E2C5F0776843} = {262B61F6-470E-46B6-B392-858692D3FB23} - {1BD36757-E399-4B26-B82C-96D807D2CB73} = {262B61F6-470E-46B6-B392-858692D3FB23} - {0AC4B104-CB58-4158-A301-5984BCBEE897} = {262B61F6-470E-46B6-B392-858692D3FB23} {F9B2FCA3-69C0-45A6-B1FA-E989263536C4} = {0AE25156-94A3-4936-80FD-8343290DF4B4} {007AD19C-8A80-4463-834C-BE7AE1808A04} = {0AE25156-94A3-4936-80FD-8343290DF4B4} {BB689125-CDA7-4CFA-A4D6-1C932092A67F} = {4E4CBD83-24E2-49A2-B0A5-57368BB1A055} - {68E366F0-A62B-4528-8B26-CDFE17AA9C42} = {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} + {0AC4B104-CB58-4158-A301-5984BCBEE897} = {A1EFAD7B-1534-44CD-89D2-906AE96FB1F6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E66CC269-DA5B-4970-AAEE-78F703F4EB96} diff --git a/src/libraries/System.Buffers/System.Buffers.sln b/src/libraries/System.Buffers/System.Buffers.sln index e112e283ff4..0cd366ff7ba 100644 --- a/src/libraries/System.Buffers/System.Buffers.sln +++ b/src/libraries/System.Buffers/System.Buffers.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{247DBC71-7AB6-411C-82C3-68EB66904CDB}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A11072BB EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{914126D6-2C5E-49E9-B9BF-F94749FB2329}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C91D3A73-7AC3-413D-8E90-A9B48E6B0540}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -146,42 +144,6 @@ 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 - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|x64.ActiveCfg = Debug|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|x64.Build.0 = Debug|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|x86.ActiveCfg = Debug|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|x86.Build.0 = Debug|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|Any CPU.Build.0 = Release|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|x64.ActiveCfg = Release|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|x64.Build.0 = Release|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|x86.ActiveCfg = Release|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|x86.Build.0 = Release|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Checked|Any CPU.Build.0 = Debug|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Checked|x64.ActiveCfg = Debug|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Checked|x64.Build.0 = Debug|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Checked|x86.ActiveCfg = Debug|Any CPU - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Checked|x86.Build.0 = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|x64.ActiveCfg = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|x64.Build.0 = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|x86.ActiveCfg = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|x86.Build.0 = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|Any CPU.Build.0 = Release|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|x64.ActiveCfg = Release|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|x64.Build.0 = Release|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|x86.ActiveCfg = Release|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|x86.Build.0 = Release|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Checked|Any CPU.Build.0 = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Checked|x64.ActiveCfg = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Checked|x64.Build.0 = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Checked|x86.ActiveCfg = Debug|Any CPU - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.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 @@ -225,14 +187,12 @@ Global GlobalSection(NestedProjects) = preSolution {006429DB-0860-4688-BD1D-459C9364594D} = {07A3DCA1-A687-4607-81A5-3341D331D144} {4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6} = {07A3DCA1-A687-4607-81A5-3341D331D144} - {AA1510B5-19AF-488B-A390-AFFDA0109571} = {07A3DCA1-A687-4607-81A5-3341D331D144} - {5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5} = {07A3DCA1-A687-4607-81A5-3341D331D144} - {247DBC71-7AB6-411C-82C3-68EB66904CDB} = {07A3DCA1-A687-4607-81A5-3341D331D144} - {A0F803EB-E5D5-429A-A0C6-6A997BCB0128} = {07A3DCA1-A687-4607-81A5-3341D331D144} {350A679C-F690-49B3-AB97-340AF05E1250} = {A11072BB-28A6-44B6-A0A3-CAFE5E5309E5} {FF86CB73-2E54-4E89-9491-258324F291D0} = {A11072BB-28A6-44B6-A0A3-CAFE5E5309E5} {7F713B83-1256-4108-B40D-FDD380BB9DB6} = {914126D6-2C5E-49E9-B9BF-F94749FB2329} - {3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621} = {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} + {A0F803EB-E5D5-429A-A0C6-6A997BCB0128} = {C91D3A73-7AC3-413D-8E90-A9B48E6B0540} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FEF31CDB-D5C9-401F-BBBA-DFAF9CF6181B} diff --git a/src/libraries/System.CodeDom/System.CodeDom.sln b/src/libraries/System.CodeDom/System.CodeDom.sln index 0577fd93632..d3a9342e030 100644 --- a/src/libraries/System.CodeDom/System.CodeDom.sln +++ b/src/libraries/System.CodeDom/System.CodeDom.sln @@ -9,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A034C285-3898-4F28-AB63-1023FBD4D9C8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{CA537DA9-05A7-4AD6-9D5D-31529375FEF0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{F5C1865E-F81C-4041-8AFA-762C4422E419}" EndProject @@ -23,6 +23,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{54321C0F-132 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6591788E-0894-4655-AE2F-602407C4F766}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{91ED5DF2-6A20-4B11-B671-19BB53254EE7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,14 +51,14 @@ 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 - {A034C285-3898-4F28-AB63-1023FBD4D9C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A034C285-3898-4F28-AB63-1023FBD4D9C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A034C285-3898-4F28-AB63-1023FBD4D9C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A034C285-3898-4F28-AB63-1023FBD4D9C8}.Release|Any CPU.Build.0 = Release|Any CPU - {C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4}.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 + {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 + {BB92EB52-7A9C-49C7-AC26-53864BAD4E1A}.Release|Any CPU.Build.0 = Release|Any CPU {F5C1865E-F81C-4041-8AFA-762C4422E419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F5C1865E-F81C-4041-8AFA-762C4422E419}.Debug|Any CPU.Build.0 = Debug|Any CPU {F5C1865E-F81C-4041-8AFA-762C4422E419}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -74,11 +76,11 @@ Global {627FFEFC-A317-4AD1-809F-B26CA7F475BD} = {2D7D470B-B092-45BC-900A-CDB20CA94BE7} {74AE27CF-E940-4EEB-9A19-0968689B627E} = {54321C0F-1323-4962-A01C-AC07028C3FA8} {8B41F4FA-C804-4769-BDF0-467972E33997} = {54321C0F-1323-4962-A01C-AC07028C3FA8} - {A034C285-3898-4F28-AB63-1023FBD4D9C8} = {54321C0F-1323-4962-A01C-AC07028C3FA8} {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} - {C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4} = {6591788E-0894-4655-AE2F-602407C4F766} + {CA537DA9-05A7-4AD6-9D5D-31529375FEF0} = {91ED5DF2-6A20-4B11-B671-19BB53254EE7} + {BB92EB52-7A9C-49C7-AC26-53864BAD4E1A} = {91ED5DF2-6A20-4B11-B671-19BB53254EE7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {70EC5780-3C80-4D52-93B0-7FBF64E29572} diff --git a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln index 5e2c1daeeec..95b554a8e7e 100644 --- a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln +++ b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln @@ -15,10 +15,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1D4FEFF5-24CC-4725-90CD-651D389C0961}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A27E93BA-7A0C-417E-B178-F1727D50B7FF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{615C60FE-EF88-476C-83B0-728528D4F587}" 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}" @@ -31,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{64657647 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CA1F4ADE-3F2A-40E3-9242-549F88F0367F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -188,42 +186,6 @@ 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 - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|x64.ActiveCfg = Debug|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|x64.Build.0 = Debug|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|x86.ActiveCfg = Debug|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|x86.Build.0 = Debug|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|Any CPU.Build.0 = Release|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|x64.ActiveCfg = Release|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|x64.Build.0 = Release|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|x86.ActiveCfg = Release|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|x86.Build.0 = Release|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Checked|Any CPU.Build.0 = Debug|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Checked|x64.ActiveCfg = Debug|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Checked|x64.Build.0 = Debug|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Checked|x86.ActiveCfg = Debug|Any CPU - {1D4FEFF5-24CC-4725-90CD-651D389C0961}.Checked|x86.Build.0 = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|x64.ActiveCfg = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|x64.Build.0 = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|x86.ActiveCfg = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|x86.Build.0 = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|Any CPU.Build.0 = Release|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|x64.ActiveCfg = Release|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|x64.Build.0 = Release|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|x86.ActiveCfg = Release|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|x86.Build.0 = Release|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Checked|Any CPU.Build.0 = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Checked|x64.ActiveCfg = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Checked|x64.Build.0 = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Checked|x86.ActiveCfg = Debug|Any CPU - {A27E93BA-7A0C-417E-B178-F1727D50B7FF}.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 @@ -287,15 +249,13 @@ Global {BFA1A52C-48B4-45C7-8595-B98236A11ED1} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} {34C59132-692C-45D7-87BD-869A18F09E2C} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} {93FB3527-B9E6-4ECA-8F36-56835F4F9236} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} - {431D18E4-4464-45C0-BBF2-1834B73E8095} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} - {A27E93BA-7A0C-417E-B178-F1727D50B7FF} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} - {615C60FE-EF88-476C-83B0-728528D4F587} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} - {2DB3F8FB-BDD7-471E-BF8F-D3C4D6A2BDC3} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} {FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} {7C2B8279-F7BB-4AD4-BA44-B9071090AF46} = {64657647-6C2C-4D36-A5D4-7E7534F3C66F} {C391ADBE-DD23-4F4A-B3EC-011974CC6CE8} = {64657647-6C2C-4D36-A5D4-7E7534F3C66F} {ADA6D062-1E28-47D8-A058-FE1F4551AA20} = {CA1F4ADE-3F2A-40E3-9242-549F88F0367F} - {1D4FEFF5-24CC-4725-90CD-651D389C0961} = {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} + {2DB3F8FB-BDD7-471E-BF8F-D3C4D6A2BDC3} = {93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1A4F1A4C-4F4F-4E0C-9342-4B32674E2F00} diff --git a/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln b/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln index 92804ebb7f2..b1dda24a459 100644 --- a/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln +++ b/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C37D857D-7377-47C9-88BA-02A932A83D03}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BF4E44D8-5D9B-489D-AA99-73B645204291}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D5595EA2-934D-481D-9AB9-412276C05181}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{12BB8B2C-950 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{50502C33-83FC-41E3-A25D-E870C5AAB7CE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EEC12D52-2DAA-4D12-A123-BB4AC370814B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {C37D857D-7377-47C9-88BA-02A932A83D03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C37D857D-7377-47C9-88BA-02A932A83D03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C37D857D-7377-47C9-88BA-02A932A83D03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C37D857D-7377-47C9-88BA-02A932A83D03}.Release|Any CPU.Build.0 = Release|Any CPU - {5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938}.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 + {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 + {FCC1AE83-36B9-464B-8A5B-8C9E8244905B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {16338C21-1631-400F-951B-F501F2AB99DB} = {D5595EA2-934D-481D-9AB9-412276C05181} {70EA8239-58B9-44E5-B1C5-ABEC2C9066E7} = {D5595EA2-934D-481D-9AB9-412276C05181} {1514371B-8161-4A27-AD96-30E3F9EA7AAE} = {12BB8B2C-950F-4AA8-BFED-D87D2873FEDA} - {C37D857D-7377-47C9-88BA-02A932A83D03} = {12BB8B2C-950F-4AA8-BFED-D87D2873FEDA} {F9520C8A-A85B-4AB0-8535-D1F2124DAC76} = {50502C33-83FC-41E3-A25D-E870C5AAB7CE} - {5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938} = {50502C33-83FC-41E3-A25D-E870C5AAB7CE} + {BF4E44D8-5D9B-489D-AA99-73B645204291} = {EEC12D52-2DAA-4D12-A123-BB4AC370814B} + {FCC1AE83-36B9-464B-8A5B-8C9E8244905B} = {EEC12D52-2DAA-4D12-A123-BB4AC370814B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {62498458-77B4-4070-87BB-09F22AC54239} diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj index 3bd029f7d66..5c7aa5b9627 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -105,9 +105,6 @@ System.Collections.Immutable.ImmutableStack<T></PackageDescription> Link="Common\System\Runtime\Versioning\NonVersionableAttribute.cs" /> <None Include="Interfaces.cd" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> - </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Contracts" /> @@ -124,4 +121,7 @@ System.Collections.Immutable.ImmutableStack<T></PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFrameworkVersion)' == 'v6.0'"> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> + </ItemGroup> </Project> diff --git a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln index d53ea124697..00ce620269f 100644 --- a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln +++ b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{31A285E0-CBFF-46D1-84BC-312ABEB35A4F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3AA49B22-FD1F-4BD2-AC61-96DA0753D80F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C80ABA38-B1E9-4050-8F9B-B04CDC959EFD}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{40328A50-1C3B-412A-8176-C558898752EE}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3F8044D4-DD3 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{97782A88-6BFA-46E2-9027-E72BF7E3062E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{121A7C7D-3D67-4606-AE3E-4C9E55510A86}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {31A285E0-CBFF-46D1-84BC-312ABEB35A4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31A285E0-CBFF-46D1-84BC-312ABEB35A4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31A285E0-CBFF-46D1-84BC-312ABEB35A4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31A285E0-CBFF-46D1-84BC-312ABEB35A4F}.Release|Any CPU.Build.0 = Release|Any CPU - {C80ABA38-B1E9-4050-8F9B-B04CDC959EFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C80ABA38-B1E9-4050-8F9B-B04CDC959EFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C80ABA38-B1E9-4050-8F9B-B04CDC959EFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C80ABA38-B1E9-4050-8F9B-B04CDC959EFD}.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 + {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 + {EC51C488-C247-436A-B610-C55A01DA3037}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {8844EF4B-CE0F-4E76-B97B-4844B33CB3FB} = {40328A50-1C3B-412A-8176-C558898752EE} {AF7C053E-2774-4355-8541-945594C4AF9C} = {40328A50-1C3B-412A-8176-C558898752EE} {D3B134E9-5B26-4455-9F2D-22302BD8E350} = {3F8044D4-DD3D-46CA-8EAE-CD03358DA425} - {31A285E0-CBFF-46D1-84BC-312ABEB35A4F} = {3F8044D4-DD3D-46CA-8EAE-CD03358DA425} {8B963C6C-CF59-433B-B8FB-6C1EB4650DF2} = {97782A88-6BFA-46E2-9027-E72BF7E3062E} - {C80ABA38-B1E9-4050-8F9B-B04CDC959EFD} = {97782A88-6BFA-46E2-9027-E72BF7E3062E} + {3AA49B22-FD1F-4BD2-AC61-96DA0753D80F} = {121A7C7D-3D67-4606-AE3E-4C9E55510A86} + {EC51C488-C247-436A-B610-C55A01DA3037} = {121A7C7D-3D67-4606-AE3E-4C9E55510A86} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {42E679A9-01B2-446F-B26E-4CF16464E149} diff --git a/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln b/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln index 467e3cefade..fff2bbfab39 100644 --- a/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln +++ b/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8BFB50AF-BD65-489C-B77F-A0840982FC04}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{81F98113-9FCF-45E7-93C6-16B78EF227F0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{627B9774-B9B5-4118-A051-D2022B8ECFB4}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{129030A4-7D4 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1799B533-6E09-44A9-BF2B-B723ADB5F2F2}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{02B8FF7B-DDCB-4A38-A626-39877203DF37}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {8BFB50AF-BD65-489C-B77F-A0840982FC04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BFB50AF-BD65-489C-B77F-A0840982FC04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BFB50AF-BD65-489C-B77F-A0840982FC04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BFB50AF-BD65-489C-B77F-A0840982FC04}.Release|Any CPU.Build.0 = Release|Any CPU - {A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C}.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 + {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 + {66B6FD95-517D-47E6-B08B-382EB32DE466}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {8D9AEA48-C9C5-42EE-9FF1-A27B9973EE18} = {627B9774-B9B5-4118-A051-D2022B8ECFB4} {6708616F-5AFD-4AF1-B04E-81EAC42F2EB3} = {627B9774-B9B5-4118-A051-D2022B8ECFB4} {D414DDBE-F5D9-4030-A576-DA2CBC96EB5D} = {129030A4-7D4E-401C-9F7E-722D99DC8407} - {8BFB50AF-BD65-489C-B77F-A0840982FC04} = {129030A4-7D4E-401C-9F7E-722D99DC8407} {FE0B5511-A5E1-4E19-A232-B89F628C417E} = {1799B533-6E09-44A9-BF2B-B723ADB5F2F2} - {A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C} = {1799B533-6E09-44A9-BF2B-B723ADB5F2F2} + {81F98113-9FCF-45E7-93C6-16B78EF227F0} = {02B8FF7B-DDCB-4A38-A626-39877203DF37} + {66B6FD95-517D-47E6-B08B-382EB32DE466} = {02B8FF7B-DDCB-4A38-A626-39877203DF37} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BF9E2841-822A-4FDC-B8C5-AF262BB721D6} diff --git a/src/libraries/System.Collections/System.Collections.sln b/src/libraries/System.Collections/System.Collections.sln index daaf67b3fab..693ef840419 100644 --- a/src/libraries/System.Collections/System.Collections.sln +++ b/src/libraries/System.Collections/System.Collections.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{643044B5-5A04-469C-A691-DC172B09877C}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6CD2C5E3 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{06AE90FB-F007-4E70-BCD2-5CAD106A7C97}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B958B834-96D2-4B18-AA42-22B312BE9925}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -146,42 +144,6 @@ 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 - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|x64.ActiveCfg = Debug|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|x64.Build.0 = Debug|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|x86.ActiveCfg = Debug|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|x86.Build.0 = Debug|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|Any CPU.Build.0 = Release|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|x64.ActiveCfg = Release|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|x64.Build.0 = Release|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|x86.ActiveCfg = Release|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|x86.Build.0 = Release|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Checked|Any CPU.Build.0 = Debug|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Checked|x64.ActiveCfg = Debug|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Checked|x64.Build.0 = Debug|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Checked|x86.ActiveCfg = Debug|Any CPU - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Checked|x86.Build.0 = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|x64.ActiveCfg = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|x64.Build.0 = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|x86.ActiveCfg = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|x86.Build.0 = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|Any CPU.Build.0 = Release|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|x64.ActiveCfg = Release|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|x64.Build.0 = Release|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|x86.ActiveCfg = Release|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|x86.Build.0 = Release|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Checked|Any CPU.Build.0 = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Checked|x64.ActiveCfg = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Checked|x64.Build.0 = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Checked|x86.ActiveCfg = Debug|Any CPU - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.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 @@ -225,14 +187,12 @@ Global GlobalSection(NestedProjects) = preSolution {4385739F-14A1-4F21-96E3-12EA90580575} = {C848C534-DD16-4A69-81FF-894456E4B099} {DF501250-4105-4F79-A508-90B3A13A975A} = {C848C534-DD16-4A69-81FF-894456E4B099} - {F2E57833-4968-430D-8149-733DE03A7314} = {C848C534-DD16-4A69-81FF-894456E4B099} - {39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6} = {C848C534-DD16-4A69-81FF-894456E4B099} - {643044B5-5A04-469C-A691-DC172B09877C} = {C848C534-DD16-4A69-81FF-894456E4B099} - {00398A78-1620-4996-9922-C82D1AF84714} = {C848C534-DD16-4A69-81FF-894456E4B099} {38D8F258-655E-459B-B2CE-0DED144AFBF7} = {6CD2C5E3-B5BA-4219-B8EF-9B5D486BF805} {BB54ED9D-FF71-4D91-B7C0-984AB0976798} = {6CD2C5E3-B5BA-4219-B8EF-9B5D486BF805} {77E9C47D-4AC4-4402-8613-40DF427174BD} = {06AE90FB-F007-4E70-BCD2-5CAD106A7C97} - {0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3} = {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} + {00398A78-1620-4996-9922-C82D1AF84714} = {B958B834-96D2-4B18-AA42-22B312BE9925} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FDD40D53-AF3E-4A20-BE17-7555EB5494F9} diff --git a/src/libraries/System.Collections/src/System/Collections/BitArray.cs b/src/libraries/System.Collections/src/System/Collections/BitArray.cs index be3472ec600..f7d83451550 100644 --- a/src/libraries/System.Collections/src/System/Collections/BitArray.cs +++ b/src/libraries/System.Collections/src/System/Collections/BitArray.cs @@ -8,7 +8,6 @@ using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; using System.Runtime.Intrinsics.Arm; -using Internal.Runtime.CompilerServices; namespace System.Collections { diff --git a/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln b/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln index cf61fd0bc7b..1ec67cb75f7 100644 --- a/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln +++ b/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{260925B5-FFCD-447A-8CD1-3783B5F3C5D3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BE45ED97-84FF-4D6E-88D5-F7B3BC599B3B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{370A7C81-5E49-44C4-AC23-BDC838488D8E}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A0596070-E285-49A1-A0AA-187B69E55A39}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{52233040-466 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E1ABC6C6-D95F-4452-A9E2-7DAB63667861}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0BCBBCAE-BD70-482D-BA22-916184DB9EE6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {260925B5-FFCD-447A-8CD1-3783B5F3C5D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {260925B5-FFCD-447A-8CD1-3783B5F3C5D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {260925B5-FFCD-447A-8CD1-3783B5F3C5D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {260925B5-FFCD-447A-8CD1-3783B5F3C5D3}.Release|Any CPU.Build.0 = Release|Any CPU - {370A7C81-5E49-44C4-AC23-BDC838488D8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {370A7C81-5E49-44C4-AC23-BDC838488D8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {370A7C81-5E49-44C4-AC23-BDC838488D8E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {370A7C81-5E49-44C4-AC23-BDC838488D8E}.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 + {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 + {FBE888A3-6DCE-4766-A4E4-D1748AC5B688}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {5ACAB439-ADEF-4CAC-BAD7-5AEE6801BE33} = {A0596070-E285-49A1-A0AA-187B69E55A39} {E4C76FCB-4583-475C-B042-FC44BD1D73F2} = {A0596070-E285-49A1-A0AA-187B69E55A39} {FD97F92D-762C-4657-9F80-AB7992681202} = {52233040-4669-4A28-8E8F-A35F80039C13} - {260925B5-FFCD-447A-8CD1-3783B5F3C5D3} = {52233040-4669-4A28-8E8F-A35F80039C13} {B60893E1-864C-4236-9D4B-F17540DEED86} = {E1ABC6C6-D95F-4452-A9E2-7DAB63667861} - {370A7C81-5E49-44C4-AC23-BDC838488D8E} = {E1ABC6C6-D95F-4452-A9E2-7DAB63667861} + {BE45ED97-84FF-4D6E-88D5-F7B3BC599B3B} = {0BCBBCAE-BD70-482D-BA22-916184DB9EE6} + {FBE888A3-6DCE-4766-A4E4-D1748AC5B688} = {0BCBBCAE-BD70-482D-BA22-916184DB9EE6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4C1CDE35-7742-40EC-A075-B1ABF99F50B5} 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 993d788f23f..e014c755127 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,9 +15,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{12A42D4C-7FF5-4B2F-9910-50A413F5382F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{89063629-173F-4C3B-A4D4-9EAA902BBAE6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{906977E7-C5B4-4CBC-B2A5-E56DABC3B125}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9CA8C5D2-076D-4505-A79A-CDE929CC62F3}" EndProject @@ -25,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1FE28F13-DE3 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3D168EC8-5581-468D-BE77-0A787F5042F2}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{9A073A19-15DD-424C-A7B8-1DBEB11E690D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -63,14 +65,14 @@ 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 - {12A42D4C-7FF5-4B2F-9910-50A413F5382F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12A42D4C-7FF5-4B2F-9910-50A413F5382F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12A42D4C-7FF5-4B2F-9910-50A413F5382F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12A42D4C-7FF5-4B2F-9910-50A413F5382F}.Release|Any CPU.Build.0 = Release|Any CPU - {906977E7-C5B4-4CBC-B2A5-E56DABC3B125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {906977E7-C5B4-4CBC-B2A5-E56DABC3B125}.Debug|Any CPU.Build.0 = Debug|Any CPU - {906977E7-C5B4-4CBC-B2A5-E56DABC3B125}.Release|Any CPU.ActiveCfg = Release|Any CPU - {906977E7-C5B4-4CBC-B2A5-E56DABC3B125}.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 + {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 + {70C60407-FA4F-47F9-8584-249E5528209D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -81,11 +83,11 @@ Global {944AFEA1-B4FF-4309-9419-EFCA22347C60} = {1FE28F13-DE37-48A4-9B43-A32637555165} {2DE556D7-9EB8-4763-B585-4EA9B45A5D9A} = {1FE28F13-DE37-48A4-9B43-A32637555165} {0EFDCC75-E302-4A30-AC04-26DEF262333C} = {1FE28F13-DE37-48A4-9B43-A32637555165} - {12A42D4C-7FF5-4B2F-9910-50A413F5382F} = {1FE28F13-DE37-48A4-9B43-A32637555165} {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} - {906977E7-C5B4-4CBC-B2A5-E56DABC3B125} = {3D168EC8-5581-468D-BE77-0A787F5042F2} + {89063629-173F-4C3B-A4D4-9EAA902BBAE6} = {9A073A19-15DD-424C-A7B8-1DBEB11E690D} + {70C60407-FA4F-47F9-8584-249E5528209D} = {9A073A19-15DD-424C-A7B8-1DBEB11E690D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {05F0228A-52B7-460E-9A06-9D5A62E33BA6} diff --git a/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln b/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln index 3e1b79035a5..6f48b61e61f 100644 --- a/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln +++ b/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln @@ -9,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{96D9268A-76C1-4FD3-91F9-B73ACE9C86E8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2F49FC4A-A8DC-4052-8DFB-89D505C2EA92}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{92D2B31D-210D-48D3-8772-9539A801E460}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E041B502-1C74-4540-9D57-0924674899B0}" EndProject @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4857D2B5-405 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{56CC716E-A917-46F2-8238-D809E1AF9D17}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{902418FB-E47F-49F5-BC32-32E9022ECD94}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,14 +47,14 @@ 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 - {96D9268A-76C1-4FD3-91F9-B73ACE9C86E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96D9268A-76C1-4FD3-91F9-B73ACE9C86E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96D9268A-76C1-4FD3-91F9-B73ACE9C86E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96D9268A-76C1-4FD3-91F9-B73ACE9C86E8}.Release|Any CPU.Build.0 = Release|Any CPU - {92D2B31D-210D-48D3-8772-9539A801E460}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92D2B31D-210D-48D3-8772-9539A801E460}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92D2B31D-210D-48D3-8772-9539A801E460}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92D2B31D-210D-48D3-8772-9539A801E460}.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 + {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 + {90E6CD04-1022-4A7A-B6DD-114C6F61ECA0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -62,9 +64,9 @@ Global {E2EDA1F3-8971-4FBF-AFD4-FD1EA21D58C3} = {E041B502-1C74-4540-9D57-0924674899B0} {B21E5872-33E7-40D6-8A7F-33C0264A83E9} = {E041B502-1C74-4540-9D57-0924674899B0} {82F98B94-4E9D-457B-A391-F8F2766FBB2E} = {4857D2B5-405B-490F-BFC8-B730C8A3220A} - {96D9268A-76C1-4FD3-91F9-B73ACE9C86E8} = {4857D2B5-405B-490F-BFC8-B730C8A3220A} {B1B4D6FA-25CA-4F88-A7B4-BEADC53E9613} = {56CC716E-A917-46F2-8238-D809E1AF9D17} - {92D2B31D-210D-48D3-8772-9539A801E460} = {56CC716E-A917-46F2-8238-D809E1AF9D17} + {2F49FC4A-A8DC-4052-8DFB-89D505C2EA92} = {902418FB-E47F-49F5-BC32-32E9022ECD94} + {90E6CD04-1022-4A7A-B6DD-114C6F61ECA0} = {902418FB-E47F-49F5-BC32-32E9022ECD94} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7852190A-F724-4BBB-969F-ECD086712D41} diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln b/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln index 7f77d9facc5..ef0fa80aa12 100644 --- a/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln +++ b/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3350F98E-14CE-4192-B5F4-13E56202C01E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{FD7AD564-B4F9-4A42-AA81-4B114838AB98}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BCB250B7-3138-45E0-8A2D-32780A491B64}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{53E9D5BA-677C-487C-A58E-A9C6622D8C0D}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8F9719E0-3A0 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EEC4342D-1B9E-462C-98FE-2C8BC16B75BE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B2151F7B-8333-4467-B311-145FAD7BC484}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {3350F98E-14CE-4192-B5F4-13E56202C01E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3350F98E-14CE-4192-B5F4-13E56202C01E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3350F98E-14CE-4192-B5F4-13E56202C01E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3350F98E-14CE-4192-B5F4-13E56202C01E}.Release|Any CPU.Build.0 = Release|Any CPU - {BCB250B7-3138-45E0-8A2D-32780A491B64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCB250B7-3138-45E0-8A2D-32780A491B64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCB250B7-3138-45E0-8A2D-32780A491B64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCB250B7-3138-45E0-8A2D-32780A491B64}.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 + {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 + {AA09E7A5-58F5-4BAB-B6EE-B594F50C17E2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {40480524-42C3-405F-AE9A-7578B829C696} = {53E9D5BA-677C-487C-A58E-A9C6622D8C0D} {E79356D9-2598-489C-9ADF-59B2D95EA22C} = {53E9D5BA-677C-487C-A58E-A9C6622D8C0D} {83BCEDA6-972E-4E26-9582-C53335A9F9C5} = {8F9719E0-3A02-421C-B564-64559817B4A7} - {3350F98E-14CE-4192-B5F4-13E56202C01E} = {8F9719E0-3A02-421C-B564-64559817B4A7} {04E0F296-DF67-45EB-8967-DADF4CBC9D6E} = {EEC4342D-1B9E-462C-98FE-2C8BC16B75BE} - {BCB250B7-3138-45E0-8A2D-32780A491B64} = {EEC4342D-1B9E-462C-98FE-2C8BC16B75BE} + {FD7AD564-B4F9-4A42-AA81-4B114838AB98} = {B2151F7B-8333-4467-B311-145FAD7BC484} + {AA09E7A5-58F5-4BAB-B6EE-B594F50C17E2} = {B2151F7B-8333-4467-B311-145FAD7BC484} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {29FF2FD6-28B0-4B47-B6E4-A170FD327623} diff --git a/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln b/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln index 213b69032ad..b06152573e9 100644 --- a/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln +++ b/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{CBCF1CE8-40E6-4498-8F52-BFF97ECCE743}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{62C70FB7-F6CD-4FB1-9EB9-E9D069E06CE2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CFE7E578-B382-4363-95AC-10DAC343D332}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{97E28BF9-DD92-440D-B9AD-AEE3454C07A5}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4D0700F8-3BC EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F199F24A-6408-4204-84CF-7A2C9ED758CA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2D5F3044-9A0F-46C5-B714-7816F501604F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {CBCF1CE8-40E6-4498-8F52-BFF97ECCE743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBCF1CE8-40E6-4498-8F52-BFF97ECCE743}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBCF1CE8-40E6-4498-8F52-BFF97ECCE743}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBCF1CE8-40E6-4498-8F52-BFF97ECCE743}.Release|Any CPU.Build.0 = Release|Any CPU - {CFE7E578-B382-4363-95AC-10DAC343D332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFE7E578-B382-4363-95AC-10DAC343D332}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFE7E578-B382-4363-95AC-10DAC343D332}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFE7E578-B382-4363-95AC-10DAC343D332}.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 + {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 + {BE0F37D2-BEF7-4365-AFFB-B08271D25844}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {60864013-CB8C-4FA3-9D79-6293FCDB2E6B} = {97E28BF9-DD92-440D-B9AD-AEE3454C07A5} {F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C} = {97E28BF9-DD92-440D-B9AD-AEE3454C07A5} {BA8A7204-1534-43C3-8BBE-F237C7328C42} = {4D0700F8-3BC3-4CE5-8258-1004C0BD007D} - {CBCF1CE8-40E6-4498-8F52-BFF97ECCE743} = {4D0700F8-3BC3-4CE5-8258-1004C0BD007D} {E6024DD2-79AD-4639-A141-9DA38282F61B} = {F199F24A-6408-4204-84CF-7A2C9ED758CA} - {CFE7E578-B382-4363-95AC-10DAC343D332} = {F199F24A-6408-4204-84CF-7A2C9ED758CA} + {62C70FB7-F6CD-4FB1-9EB9-E9D069E06CE2} = {2D5F3044-9A0F-46C5-B714-7816F501604F} + {BE0F37D2-BEF7-4365-AFFB-B08271D25844} = {2D5F3044-9A0F-46C5-B714-7816F501604F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D4ED660D-B8E6-404D-B0B0-C7A31244A916} diff --git a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln index 2620923f602..e3fbf4c69c9 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln +++ b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{5844267C-DBDB-4520-B053-C90DD5D02220}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9A047A62-BF41-480D-B424-24DC8530124B}" +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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E80037BD-B4E3-43B7-A7C8-F6C3C6DA4EF8}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2F8CF65B-861 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CD3CE573-0987-4590-8D30-EE1F1296D931}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D06EAE06-636A-4A7A-B22F-5D106F7CCC75}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E}.Release|Any CPU.Build.0 = Release|Any CPU - {9A047A62-BF41-480D-B424-24DC8530124B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A047A62-BF41-480D-B424-24DC8530124B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A047A62-BF41-480D-B424-24DC8530124B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A047A62-BF41-480D-B424-24DC8530124B}.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 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {0CF88416-BA94-4C5C-8947-D21F4897C70B} = {E80037BD-B4E3-43B7-A7C8-F6C3C6DA4EF8} {6A370CD8-E44B-46C9-B29A-87F847483336} = {E80037BD-B4E3-43B7-A7C8-F6C3C6DA4EF8} {0B2F32D4-9E58-4680-AB59-35D86E4162CE} = {2F8CF65B-8616-42BC-A893-8C7C9FD990C5} - {CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E} = {2F8CF65B-8616-42BC-A893-8C7C9FD990C5} {CE7DA286-D119-4087-A953-D542727AFA02} = {CD3CE573-0987-4590-8D30-EE1F1296D931} - {9A047A62-BF41-480D-B424-24DC8530124B} = {CD3CE573-0987-4590-8D30-EE1F1296D931} + {5844267C-DBDB-4520-B053-C90DD5D02220} = {D06EAE06-636A-4A7A-B22F-5D106F7CCC75} + {970B0849-990C-4368-B317-063BFD82CAD5} = {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 c10039c38b3..d7472572eec 100644 --- a/src/libraries/System.ComponentModel/System.ComponentModel.sln +++ b/src/libraries/System.ComponentModel/System.ComponentModel.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{5B8652C4-99B5-4D03-B07B-88A5B96442A2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B5852635-FC58-4BD0-984F-196C7E71726A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0AAA2B20-75FC-42CE-9148-DBDA5840BDC2}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{70E2F273-4083-402A-8AC4-4DB08A09813B}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C6EF640A-0AE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{797FC0E7-1785-46B3-B280-2992A716A4ED}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C3164BD9-1105-4795-B05D-3F2583479C41}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {5B8652C4-99B5-4D03-B07B-88A5B96442A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B8652C4-99B5-4D03-B07B-88A5B96442A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B8652C4-99B5-4D03-B07B-88A5B96442A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B8652C4-99B5-4D03-B07B-88A5B96442A2}.Release|Any CPU.Build.0 = Release|Any CPU - {0AAA2B20-75FC-42CE-9148-DBDA5840BDC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AAA2B20-75FC-42CE-9148-DBDA5840BDC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AAA2B20-75FC-42CE-9148-DBDA5840BDC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AAA2B20-75FC-42CE-9148-DBDA5840BDC2}.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 + {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 + {22E91D96-49E2-4691-B4E5-4C22938C2F2A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {BB836E1E-706E-495A-85EA-0CDD9FEBF101} = {70E2F273-4083-402A-8AC4-4DB08A09813B} {4E375A78-D856-4C1E-B7CB-A4026C9FD8E7} = {70E2F273-4083-402A-8AC4-4DB08A09813B} {E954E33E-6349-4FA2-AF54-A3BCFE430879} = {C6EF640A-0AED-46F1-97D6-3206BD0186F0} - {5B8652C4-99B5-4D03-B07B-88A5B96442A2} = {C6EF640A-0AED-46F1-97D6-3206BD0186F0} {EFFECBCD-A544-4649-AF79-3C2A7EEB4C6F} = {797FC0E7-1785-46B3-B280-2992A716A4ED} - {0AAA2B20-75FC-42CE-9148-DBDA5840BDC2} = {797FC0E7-1785-46B3-B280-2992A716A4ED} + {B5852635-FC58-4BD0-984F-196C7E71726A} = {C3164BD9-1105-4795-B05D-3F2583479C41} + {22E91D96-49E2-4691-B4E5-4C22938C2F2A} = {C3164BD9-1105-4795-B05D-3F2583479C41} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F6E6B62A-C9F6-4CF9-BFC4-F169919B707A} diff --git a/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln b/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln index 37bd21392e2..c99a72adc04 100644 --- a/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln +++ b/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln @@ -9,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{ABD7E428-23C1-4311-96C3-8D6394BFE731}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9FEBA284-3545-42BB-8514-665D08114C5F}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E942B629-51B4-4435-9045-80D88603DE00}" EndProject @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5D6DA61D-2DB EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{378856D0-3326-428C-A8FB-FF958D0C4D49}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4E66055C-EBEE-4A40-BA5C-EDC98CEE758E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,14 +47,14 @@ 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 - {0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0}.Release|Any CPU.Build.0 = Release|Any CPU - {9FEBA284-3545-42BB-8514-665D08114C5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FEBA284-3545-42BB-8514-665D08114C5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FEBA284-3545-42BB-8514-665D08114C5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FEBA284-3545-42BB-8514-665D08114C5F}.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 + {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 + {1167919A-CDD3-4EBB-9659-A2515B8D81D5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -61,10 +63,10 @@ Global {DE339A1B-75B9-4D96-AC66-F497B37FEE96} = {E942B629-51B4-4435-9045-80D88603DE00} {C2EBC4C3-C97B-4F64-A647-87DAE2816A06} = {E942B629-51B4-4435-9045-80D88603DE00} {B62DF545-08AB-40E1-9DED-755583B0B3B3} = {5D6DA61D-2DBA-49B9-A8D0-1566890D3293} - {0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0} = {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} - {9FEBA284-3545-42BB-8514-665D08114C5F} = {378856D0-3326-428C-A8FB-FF958D0C4D49} + {ABD7E428-23C1-4311-96C3-8D6394BFE731} = {4E66055C-EBEE-4A40-BA5C-EDC98CEE758E} + {1167919A-CDD3-4EBB-9659-A2515B8D81D5} = {4E66055C-EBEE-4A40-BA5C-EDC98CEE758E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0C208CE9-53A6-4D20-9851-9D565EC19AAD} diff --git a/src/libraries/System.Composition.Convention/System.Composition.Convention.sln b/src/libraries/System.Composition.Convention/System.Composition.Convention.sln index 45ebc6e6bb8..832552bfbec 100644 --- a/src/libraries/System.Composition.Convention/System.Composition.Convention.sln +++ b/src/libraries/System.Composition.Convention/System.Composition.Convention.sln @@ -13,15 +13,15 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F98D4222-5D8F-4814-A86B-6706A88312DC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F8EB346D-B780-4523-A9C7-BAD43D95CBC3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{51F71AEF-7682-4D52-AF40-F31FFC82C60D}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2AB71E3F-3402-4537-AEF4-85EDB7FCA321}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D6A9A080-5B74-41A2-871E-F417FA9FF705}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{00B6760C-F945-4C6F-8434-9DCAEBAE662D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DDADB978-93BC-489A-90C8-523AFE08EBC1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -57,14 +57,14 @@ 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 - {F98D4222-5D8F-4814-A86B-6706A88312DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F98D4222-5D8F-4814-A86B-6706A88312DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F98D4222-5D8F-4814-A86B-6706A88312DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F98D4222-5D8F-4814-A86B-6706A88312DC}.Release|Any CPU.Build.0 = Release|Any CPU - {51F71AEF-7682-4D52-AF40-F31FFC82C60D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51F71AEF-7682-4D52-AF40-F31FFC82C60D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51F71AEF-7682-4D52-AF40-F31FFC82C60D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51F71AEF-7682-4D52-AF40-F31FFC82C60D}.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 + {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 + {5D902FB1-35C6-4396-98B2-CBC0BF09F356}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -77,8 +77,8 @@ 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} - {51F71AEF-7682-4D52-AF40-F31FFC82C60D} = {D6A9A080-5B74-41A2-871E-F417FA9FF705} - {F98D4222-5D8F-4814-A86B-6706A88312DC} = {00B6760C-F945-4C6F-8434-9DCAEBAE662D} + {F8EB346D-B780-4523-A9C7-BAD43D95CBC3} = {DDADB978-93BC-489A-90C8-523AFE08EBC1} + {5D902FB1-35C6-4396-98B2-CBC0BF09F356} = {DDADB978-93BC-489A-90C8-523AFE08EBC1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3F85CAA1-0651-4FD6-81E7-45CFF63779BA} diff --git a/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln b/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln index dddccc969a6..d97e2f2d2a9 100644 --- a/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln +++ b/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln @@ -7,15 +7,15 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D55F96EA-0C21-43ED-A2EB-B7F785B4BB2C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{46D78F2B-5DB4-43BF-BBA2-EB02CA97101D}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7AEF3556-BD3A-432D-A849-DFE1509F905E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D140917D-0E52-4DC6-920A-B222BD2025AE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F2BF3371-9314-4E51-AC74-933672283AFC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1EEFB4CE-0917-418F-B83C-3B376CB39BC4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,14 +39,14 @@ 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 - {2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16}.Release|Any CPU.Build.0 = Release|Any CPU - {46D78F2B-5DB4-43BF-BBA2-EB02CA97101D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46D78F2B-5DB4-43BF-BBA2-EB02CA97101D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46D78F2B-5DB4-43BF-BBA2-EB02CA97101D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46D78F2B-5DB4-43BF-BBA2-EB02CA97101D}.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 + {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 + {5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -56,8 +56,8 @@ 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} - {46D78F2B-5DB4-43BF-BBA2-EB02CA97101D} = {D140917D-0E52-4DC6-920A-B222BD2025AE} - {2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16} = {F2BF3371-9314-4E51-AC74-933672283AFC} + {D55F96EA-0C21-43ED-A2EB-B7F785B4BB2C} = {1EEFB4CE-0917-418F-B83C-3B376CB39BC4} + {5DBEE1CE-A97E-4F4A-98FF-DD689E5EF629} = {1EEFB4CE-0917-418F-B83C-3B376CB39BC4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EE971A55-D6EB-4648-BA96-BA8BC454EDC5} diff --git a/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln b/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln index b45aaa1e59d..faaff303910 100644 --- a/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln +++ b/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln @@ -5,15 +5,15 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{AA73B72F-7C6F-479D-8141-CDD66F2EA7FB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{EE80E035-BDF5-4A8C-ABFB-C0FA179CC3DB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C24C1E34-B65C-4DAA-A29D-382FCC04E9DC}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{677DCCA2-C84B-4D33-AFA8-8906764CBAE7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{81E62E76-E824-4685-93D0-9C8C1F5C7AE2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DA5BD051-A061-4FD8-99BE-35B999CE7B67}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0D8AEC7B-1995-4D2C-90E4-8011BDA3D750}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -33,14 +33,14 @@ 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 - {AA73B72F-7C6F-479D-8141-CDD66F2EA7FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA73B72F-7C6F-479D-8141-CDD66F2EA7FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA73B72F-7C6F-479D-8141-CDD66F2EA7FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA73B72F-7C6F-479D-8141-CDD66F2EA7FB}.Release|Any CPU.Build.0 = Release|Any CPU - {C24C1E34-B65C-4DAA-A29D-382FCC04E9DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C24C1E34-B65C-4DAA-A29D-382FCC04E9DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C24C1E34-B65C-4DAA-A29D-382FCC04E9DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C24C1E34-B65C-4DAA-A29D-382FCC04E9DC}.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 + {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 + {1EE96691-E213-40A7-9392-A6A4417AFC4F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -49,8 +49,8 @@ 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} - {C24C1E34-B65C-4DAA-A29D-382FCC04E9DC} = {81E62E76-E824-4685-93D0-9C8C1F5C7AE2} - {AA73B72F-7C6F-479D-8141-CDD66F2EA7FB} = {DA5BD051-A061-4FD8-99BE-35B999CE7B67} + {EE80E035-BDF5-4A8C-ABFB-C0FA179CC3DB} = {0D8AEC7B-1995-4D2C-90E4-8011BDA3D750} + {1EE96691-E213-40A7-9392-A6A4417AFC4F} = {0D8AEC7B-1995-4D2C-90E4-8011BDA3D750} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7686D4EE-C99C-4FC3-AF5C-F06B154E4A54} diff --git a/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln b/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln index 6518f2676fd..24e5446bc04 100644 --- a/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln +++ b/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln @@ -13,15 +13,15 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0774F258-3ADD-4791-B9B6-36234CFE5B0B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E81ABF4E-85DF-40F2-BB13-920CD388BB2F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2DC81D88-9EC5-4C8F-83CB-3102F2F626AB}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FCCB7E2F-DCC4-402B-BD61-15D0A2831072}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D9ED6745-3C2A-46CB-97DA-C46BA1A3A07B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{97AE738C-E936-4D08-B6A0-154D1B80745A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C335D433-9DCB-40C6-BF0E-556237F94898}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -57,14 +57,14 @@ 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 - {0774F258-3ADD-4791-B9B6-36234CFE5B0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0774F258-3ADD-4791-B9B6-36234CFE5B0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0774F258-3ADD-4791-B9B6-36234CFE5B0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0774F258-3ADD-4791-B9B6-36234CFE5B0B}.Release|Any CPU.Build.0 = Release|Any CPU - {2DC81D88-9EC5-4C8F-83CB-3102F2F626AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DC81D88-9EC5-4C8F-83CB-3102F2F626AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DC81D88-9EC5-4C8F-83CB-3102F2F626AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DC81D88-9EC5-4C8F-83CB-3102F2F626AB}.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 + {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 + {4FDFF976-E09D-4788-9AE2-BEB9AD129970}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -77,8 +77,8 @@ 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} - {2DC81D88-9EC5-4C8F-83CB-3102F2F626AB} = {D9ED6745-3C2A-46CB-97DA-C46BA1A3A07B} - {0774F258-3ADD-4791-B9B6-36234CFE5B0B} = {97AE738C-E936-4D08-B6A0-154D1B80745A} + {E81ABF4E-85DF-40F2-BB13-920CD388BB2F} = {C335D433-9DCB-40C6-BF0E-556237F94898} + {4FDFF976-E09D-4788-9AE2-BEB9AD129970} = {C335D433-9DCB-40C6-BF0E-556237F94898} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {699ABEC3-0D6B-4050-B86A-C6E1317DE039} diff --git a/src/libraries/System.Composition/System.Composition.sln b/src/libraries/System.Composition/System.Composition.sln index b2bbb04fa7d..07bc7e07557 100644 --- a/src/libraries/System.Composition/System.Composition.sln +++ b/src/libraries/System.Composition/System.Composition.sln @@ -19,15 +19,15 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{ABFBB6AD-0A7C-4545-A129-3B7D5327E277}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BA69D7E6-C402-437B-AD9B-68D9E7F6D535}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E2A40304-1D7F-4BDA-B3A8-150A6B732A82}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A1E6CEE6-45AE-4A8A-A7FA-FFC34DB87C94}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9E81CF07-5F10-4E1B-96F6-C3A0A53C428B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AB19313E-E606-4F39-AA2E-D3299DC26D7C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -75,14 +75,14 @@ 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 - {ABFBB6AD-0A7C-4545-A129-3B7D5327E277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABFBB6AD-0A7C-4545-A129-3B7D5327E277}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABFBB6AD-0A7C-4545-A129-3B7D5327E277}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABFBB6AD-0A7C-4545-A129-3B7D5327E277}.Release|Any CPU.Build.0 = Release|Any CPU - {0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8}.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 + {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 + {3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -98,8 +98,8 @@ 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} - {0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8} = {A1E6CEE6-45AE-4A8A-A7FA-FFC34DB87C94} - {ABFBB6AD-0A7C-4545-A129-3B7D5327E277} = {9E81CF07-5F10-4E1B-96F6-C3A0A53C428B} + {BA69D7E6-C402-437B-AD9B-68D9E7F6D535} = {AB19313E-E606-4F39-AA2E-D3299DC26D7C} + {3EA50BD8-ABA5-47D8-AC31-4C6D1C2CAE63} = {AB19313E-E606-4F39-AA2E-D3299DC26D7C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {66F5BC63-E142-4B22-8B5D-1FF5206A7171} diff --git a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln index 0dece744c61..f74d7c9330e 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln +++ b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln @@ -15,9 +15,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C2304393-E1F2-41A9-8ED2-6513F654E6D2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F2307FE5-652C-4525-A3D7-D91596A06E4E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BD71A962-9AA8-46C2-A44D-B6B1CB605015}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}" EndProject @@ -37,6 +37,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{751DA007-D91 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BFBE3E0E-4E75-4665-A373-132D283D366D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -75,14 +77,14 @@ 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 - {C2304393-E1F2-41A9-8ED2-6513F654E6D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2304393-E1F2-41A9-8ED2-6513F654E6D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2304393-E1F2-41A9-8ED2-6513F654E6D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2304393-E1F2-41A9-8ED2-6513F654E6D2}.Release|Any CPU.Build.0 = Release|Any CPU - {BD71A962-9AA8-46C2-A44D-B6B1CB605015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD71A962-9AA8-46C2-A44D-B6B1CB605015}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD71A962-9AA8-46C2-A44D-B6B1CB605015}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD71A962-9AA8-46C2-A44D-B6B1CB605015}.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 + {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 + {66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}.Release|Any CPU.Build.0 = Release|Any CPU {1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -117,17 +119,17 @@ Global {C7D1410B-8CF0-48DB-A0DF-C8E3A341FD12} = {751DA007-D916-4F22-AF16-85F343C2992C} {6F662E39-BB56-4BCF-B053-B4A1782A33E1} = {751DA007-D916-4F22-AF16-85F343C2992C} {6B586A50-5DFE-4FBE-A65B-9152B992C2E1} = {751DA007-D916-4F22-AF16-85F343C2992C} - {C2304393-E1F2-41A9-8ED2-6513F654E6D2} = {751DA007-D916-4F22-AF16-85F343C2992C} {1C48B652-BA62-4D46-9CDD-24A1670EE3E3} = {751DA007-D916-4F22-AF16-85F343C2992C} {CFF7519C-4D41-4713-991D-27777DA2DB21} = {751DA007-D916-4F22-AF16-85F343C2992C} {3278A0F9-8E0A-42E1-8FE3-1A01851A6248} = {751DA007-D916-4F22-AF16-85F343C2992C} {D54AFFF7-9BEE-42C8-89C3-96E7228A23FA} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A} {7C9D7BE4-BF9C-486C-8ADF-53DE282E018A} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A} {E49D2841-A288-4B5F-89FC-857CCE0401F0} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A} - {BD71A962-9AA8-46C2-A44D-B6B1CB605015} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A} {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} + {66EC63BC-99DC-40CA-B53B-B4D8BF6D1630} = {BFBE3E0E-4E75-4665-A373-132D283D366D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {942CAD8E-C19B-4B9A-BEDE-09B43F45F535} diff --git a/src/libraries/System.Console/System.Console.sln b/src/libraries/System.Console/System.Console.sln index f86f8a02680..65eca371350 100644 --- a/src/libraries/System.Console/System.Console.sln +++ b/src/libraries/System.Console/System.Console.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F454A4F9-AFA0-47F4-9690-75058B2C68DF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4908C4C5-A629-47F8-A141-5BE83DF96ADC}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{87011BFC-F4A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5F676CAA-AE1E-4ACE-9769-FA07DA7F0F99}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6A697E68-D9B1-47F4-8AC0-B528E9AA3727}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -55,14 +53,6 @@ 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 - {F454A4F9-AFA0-47F4-9690-75058B2C68DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F454A4F9-AFA0-47F4-9690-75058B2C68DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F454A4F9-AFA0-47F4-9690-75058B2C68DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F454A4F9-AFA0-47F4-9690-75058B2C68DF}.Release|Any CPU.Build.0 = Release|Any CPU - {ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B}.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 @@ -80,12 +70,10 @@ Global {E1A675DB-487B-4119-9F47-1E4EF38CF158} = {DF6461C4-C26B-4911-BA9F-E9EBE09BE018} {3B84D3D5-57C0-47E6-B763-3D51BB62AD7B} = {DF6461C4-C26B-4911-BA9F-E9EBE09BE018} {A998F8E4-797F-4852-8D38-CD322F637AA4} = {87011BFC-F4A7-4BEB-A794-ED75999604BF} - {F454A4F9-AFA0-47F4-9690-75058B2C68DF} = {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} - {ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B} = {5F676CAA-AE1E-4ACE-9769-FA07DA7F0F99} - {4908C4C5-A629-47F8-A141-5BE83DF96ADC} = {5F676CAA-AE1E-4ACE-9769-FA07DA7F0F99} - {128A0AF8-9794-49E3-8A07-E518EB9F1402} = {5F676CAA-AE1E-4ACE-9769-FA07DA7F0F99} + {4908C4C5-A629-47F8-A141-5BE83DF96ADC} = {6A697E68-D9B1-47F4-8AC0-B528E9AA3727} + {128A0AF8-9794-49E3-8A07-E518EB9F1402} = {6A697E68-D9B1-47F4-8AC0-B528E9AA3727} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3E14E904-00F2-414A-BCF1-0EB09A861A21} diff --git a/src/libraries/System.Data.Common/System.Data.Common.sln b/src/libraries/System.Data.Common/System.Data.Common.sln index 052a1af043c..7bd5a2118dd 100644 --- a/src/libraries/System.Data.Common/System.Data.Common.sln +++ b/src/libraries/System.Data.Common/System.Data.Common.sln @@ -19,10 +19,6 @@ 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", "{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A404332F-CCAA-4E22-94C1-635F7F19176F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6E353933-8CBD-467D-8FF1-00133C3F2036}" -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}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{CE464FCD-853B-463E-990F-BDD39EC2FAE0}" @@ -37,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B1861E5E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{79588763-C99B-4C1B-88D3-181A92A98364}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -230,42 +228,6 @@ Global {7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Checked|x64.Build.0 = Debug|Any CPU {7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Checked|x86.ActiveCfg = Debug|Any CPU {7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Checked|x86.Build.0 = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|x64.ActiveCfg = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|x64.Build.0 = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|x86.ActiveCfg = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|x86.Build.0 = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|Any CPU.Build.0 = Release|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|x64.ActiveCfg = Release|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|x64.Build.0 = Release|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|x86.ActiveCfg = Release|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|x86.Build.0 = Release|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Checked|Any CPU.Build.0 = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Checked|x64.ActiveCfg = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Checked|x64.Build.0 = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Checked|x86.ActiveCfg = Debug|Any CPU - {A404332F-CCAA-4E22-94C1-635F7F19176F}.Checked|x86.Build.0 = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|x64.ActiveCfg = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|x64.Build.0 = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|x86.ActiveCfg = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|x86.Build.0 = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|Any CPU.Build.0 = Release|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|x64.ActiveCfg = Release|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|x64.Build.0 = Release|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|x86.ActiveCfg = Release|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|x86.Build.0 = Release|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Checked|Any CPU.Build.0 = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Checked|x64.ActiveCfg = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Checked|x64.Build.0 = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Checked|x86.ActiveCfg = Debug|Any CPU - {6E353933-8CBD-467D-8FF1-00133C3F2036}.Checked|x86.Build.0 = Debug|Any CPU {68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Debug|Any CPU.Build.0 = Debug|Any CPU {68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -348,17 +310,15 @@ Global {0FCF2BA6-A5B3-4E1C-A49A-424E77602313} = {5924BF80-8349-4021-A4A3-853FE714A7C7} {0AE3ABFE-6284-4119-A5DC-1844E6AB8E02} = {5924BF80-8349-4021-A4A3-853FE714A7C7} {C3F9A601-07D8-43A3-A3CA-7A002358A102} = {5924BF80-8349-4021-A4A3-853FE714A7C7} - {D5A85F0E-509A-424F-BFD0-A7CC38D43CCD} = {5924BF80-8349-4021-A4A3-853FE714A7C7} {7AB121D2-0AAC-48E0-A834-6E220ECFEC4D} = {5924BF80-8349-4021-A4A3-853FE714A7C7} - {6E353933-8CBD-467D-8FF1-00133C3F2036} = {5924BF80-8349-4021-A4A3-853FE714A7C7} {68D868F6-1311-47A2-9DDE-22B64B5FF85E} = {5924BF80-8349-4021-A4A3-853FE714A7C7} - {CE464FCD-853B-463E-990F-BDD39EC2FAE0} = {5924BF80-8349-4021-A4A3-853FE714A7C7} - {D291982D-1FC0-4CA2-A39F-4B490F809F01} = {5924BF80-8349-4021-A4A3-853FE714A7C7} {09129981-6B0D-44C7-9F0A-AD2426106332} = {5924BF80-8349-4021-A4A3-853FE714A7C7} {0BD22D2A-C12C-4641-8F12-73D21AAAFBA3} = {B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D} {BEBD7B5B-9544-42EB-B878-F009560CAAF4} = {B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D} {F865C526-79F8-403B-B5E4-52A90ECE21E3} = {79588763-C99B-4C1B-88D3-181A92A98364} - {A404332F-CCAA-4E22-94C1-635F7F19176F} = {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} + {D291982D-1FC0-4CA2-A39F-4B490F809F01} = {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 97f1b61596d..65ec622f9e1 100644 --- a/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln +++ b/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{657BEF08-3BC4-47E2-A4A3-D59704D9A26B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4B43BAEE-7A55-444A-BCAF-971E127C2C21}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9277BDD6-3AD3-4440-A596-8268D040F277}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CDDA0573-35A0-446E-BBDF-AC852AF03B9E}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{97D82FB6-EF6 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{28909632-749A-4642-BDC0-8E7E03A0F051}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{7DAFD1F9-39C6-449F-BFE8-7BB2D2F6C70B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {657BEF08-3BC4-47E2-A4A3-D59704D9A26B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {657BEF08-3BC4-47E2-A4A3-D59704D9A26B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {657BEF08-3BC4-47E2-A4A3-D59704D9A26B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {657BEF08-3BC4-47E2-A4A3-D59704D9A26B}.Release|Any CPU.Build.0 = Release|Any CPU - {9277BDD6-3AD3-4440-A596-8268D040F277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9277BDD6-3AD3-4440-A596-8268D040F277}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9277BDD6-3AD3-4440-A596-8268D040F277}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9277BDD6-3AD3-4440-A596-8268D040F277}.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 + {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 + {499278B6-A3ED-4C95-9345-794A16289F97}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {09677ECF-3068-472F-B9CF-43E1E4F081D8} = {CDDA0573-35A0-446E-BBDF-AC852AF03B9E} {40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A} = {CDDA0573-35A0-446E-BBDF-AC852AF03B9E} {8A0AA93A-ED36-4384-827E-F4D6E1E71B24} = {97D82FB6-EF60-4A52-9FEA-BDF71B2D91A1} - {657BEF08-3BC4-47E2-A4A3-D59704D9A26B} = {97D82FB6-EF60-4A52-9FEA-BDF71B2D91A1} {5817F83A-8819-420F-B056-047D6515A02C} = {28909632-749A-4642-BDC0-8E7E03A0F051} - {9277BDD6-3AD3-4440-A596-8268D040F277} = {28909632-749A-4642-BDC0-8E7E03A0F051} + {4B43BAEE-7A55-444A-BCAF-971E127C2C21} = {7DAFD1F9-39C6-449F-BFE8-7BB2D2F6C70B} + {499278B6-A3ED-4C95-9345-794A16289F97} = {7DAFD1F9-39C6-449F-BFE8-7BB2D2F6C70B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {75CB77F6-4A71-40F5-84E9-44DC5ABC6B4B} diff --git a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln index d443a14f9bf..b58c073b6bf 100644 --- a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln +++ b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9850C6FD-DC3E-4568-97CC-6B14DF58C232}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6DE8860C-D8AB-4FC5-9BFF-02A930B54750}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F0E1F779-C711-4AA0-A938-BA1EB1D22ACE}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\ref\System.Text.Encoding.CodePages.csproj", "{D7E6B130-F82B-40B6-B76C-BD6451753BE1}" EndProject @@ -21,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{08F7B256-AB1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{416AFA87-B3A9-4F0C-822F-BB08F8837609}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4A564597-B792-466F-A641-DC264A3D6C66}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,14 +45,14 @@ 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 - {9850C6FD-DC3E-4568-97CC-6B14DF58C232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9850C6FD-DC3E-4568-97CC-6B14DF58C232}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9850C6FD-DC3E-4568-97CC-6B14DF58C232}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9850C6FD-DC3E-4568-97CC-6B14DF58C232}.Release|Any CPU.Build.0 = Release|Any CPU - {F0E1F779-C711-4AA0-A938-BA1EB1D22ACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0E1F779-C711-4AA0-A938-BA1EB1D22ACE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0E1F779-C711-4AA0-A938-BA1EB1D22ACE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0E1F779-C711-4AA0-A938-BA1EB1D22ACE}.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 + {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 + {C41CDCD9-00FB-4A87-893A-9E4788790EE7}.Release|Any CPU.Build.0 = Release|Any CPU {D7E6B130-F82B-40B6-B76C-BD6451753BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D7E6B130-F82B-40B6-B76C-BD6451753BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU {D7E6B130-F82B-40B6-B76C-BD6451753BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -67,11 +69,11 @@ Global {04309507-4EF4-4B93-9C4C-B2B538227C65} = {D561F200-5EE8-46AF-A1B8-537A2A0EFA8F} {B0451507-A304-47CB-B14F-257E44B8AC18} = {D561F200-5EE8-46AF-A1B8-537A2A0EFA8F} {531EA13B-CADA-4EBF-840B-4CE996247317} = {08F7B256-AB13-4784-98C4-737888DC7428} - {9850C6FD-DC3E-4568-97CC-6B14DF58C232} = {08F7B256-AB13-4784-98C4-737888DC7428} {D7E6B130-F82B-40B6-B76C-BD6451753BE1} = {08F7B256-AB13-4784-98C4-737888DC7428} {EDE27BD9-9134-4118-94BD-C9782811684D} = {416AFA87-B3A9-4F0C-822F-BB08F8837609} - {F0E1F779-C711-4AA0-A938-BA1EB1D22ACE} = {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} + {C41CDCD9-00FB-4A87-893A-9E4788790EE7} = {4A564597-B792-466F-A641-DC264A3D6C66} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D222D648-ABA4-4D02-9230-A2B2CC3F3C39} diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj index de391f5ebf3..db95729a7d0 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -154,7 +154,6 @@ System.Data.Odbc.OdbcTransaction</PackageDescription> <None Include="DatabaseSetupInstructions.md" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> diff --git a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln index 247adc083a6..0e85fee86c2 100644 --- a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln +++ b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln @@ -23,9 +23,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{86F4BEE6-73B9-4788-8076-D01C4A1D9A1B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AD416319-4584-4A79-A9D4-4626C2FACF12}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{31AE7C18-9A29-4F1A-BE6E-6907CB954285}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{EF8D1526-9463-401B-9EAE-D4B98C86E046}" EndProject @@ -45,6 +45,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9AB0B44D-9A6 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4B964147-AE9C-454F-B971-4F4BD9541280}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{39D097CC-4757-405F-B3C5-17B8050F438C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -99,14 +101,14 @@ 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 - {86F4BEE6-73B9-4788-8076-D01C4A1D9A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86F4BEE6-73B9-4788-8076-D01C4A1D9A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86F4BEE6-73B9-4788-8076-D01C4A1D9A1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86F4BEE6-73B9-4788-8076-D01C4A1D9A1B}.Release|Any CPU.Build.0 = Release|Any CPU - {31AE7C18-9A29-4F1A-BE6E-6907CB954285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31AE7C18-9A29-4F1A-BE6E-6907CB954285}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31AE7C18-9A29-4F1A-BE6E-6907CB954285}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31AE7C18-9A29-4F1A-BE6E-6907CB954285}.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 + {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 + {C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}.Release|Any CPU.Build.0 = Release|Any CPU {EF8D1526-9463-401B-9EAE-D4B98C86E046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EF8D1526-9463-401B-9EAE-D4B98C86E046}.Debug|Any CPU.Build.0 = Debug|Any CPU {EF8D1526-9463-401B-9EAE-D4B98C86E046}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -143,7 +145,6 @@ Global {55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343} {F5BFD2E9-5399-4D16-901A-554E1DF2D6E1} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343} {C4B1668A-2512-4832-A298-3A10230C8B82} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343} - {86F4BEE6-73B9-4788-8076-D01C4A1D9A1B} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343} {EF8D1526-9463-401B-9EAE-D4B98C86E046} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343} {C73C11A5-863A-440D-B568-00CA5E7C9DA0} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343} {D7C9E59C-0B7B-491E-9FC5-63A29290EE06} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343} @@ -152,10 +153,11 @@ Global {9C557B87-DEE3-4B28-A82D-796418B3F608} = {4B964147-AE9C-454F-B971-4F4BD9541280} {362A9152-D46A-4DD0-8EB7-D36FC95D1AF1} = {4B964147-AE9C-454F-B971-4F4BD9541280} {23D4BAFD-851B-4718-A3FA-B30631F87F91} = {4B964147-AE9C-454F-B971-4F4BD9541280} - {31AE7C18-9A29-4F1A-BE6E-6907CB954285} = {4B964147-AE9C-454F-B971-4F4BD9541280} {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} + {C273C3A4-5651-489C-9FA4-2DCAAA7A7D97} = {39D097CC-4757-405F-B3C5-17B8050F438C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4895E2D2-31A2-4EB8-9C53-04C408F62DC4} diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj index 1f83a1ca294..3a5bb62de84 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -179,7 +179,5 @@ System.Data.OleDb.OleDbTransaction</PackageDescription> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 --> <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" PrivateAssets="all" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln index 6bce146a334..9f5b2907ff4 100644 --- a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln +++ b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{35183A91-B461-4D21-8DCC-8BD6CF9216A6}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{56A31E71 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8B71FA04-1D67-4607-94A4-E2A85977B1FA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{24204C7B-8FCC-4D46-8E72-BB7128DB5572}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -146,42 +144,6 @@ 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 - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|x64.ActiveCfg = Debug|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|x64.Build.0 = Debug|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|x86.ActiveCfg = Debug|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|x86.Build.0 = Debug|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|Any CPU.Build.0 = Release|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|x64.ActiveCfg = Release|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|x64.Build.0 = Release|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|x86.ActiveCfg = Release|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|x86.Build.0 = Release|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Checked|Any CPU.Build.0 = Debug|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Checked|x64.ActiveCfg = Debug|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Checked|x64.Build.0 = Debug|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Checked|x86.ActiveCfg = Debug|Any CPU - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Checked|x86.Build.0 = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|x64.ActiveCfg = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|x64.Build.0 = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|x86.ActiveCfg = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|x86.Build.0 = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|Any CPU.Build.0 = Release|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|x64.ActiveCfg = Release|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|x64.Build.0 = Release|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|x86.ActiveCfg = Release|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|x86.Build.0 = Release|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Checked|Any CPU.Build.0 = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Checked|x64.ActiveCfg = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Checked|x64.Build.0 = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Checked|x86.ActiveCfg = Debug|Any CPU - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.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 @@ -225,14 +187,12 @@ Global GlobalSection(NestedProjects) = preSolution {D5A81248-C2F8-464A-8EA4-2AB2528206BC} = {ABC2D63C-77D2-49D8-AF86-2530D6672269} {158DD2BA-5789-49B8-A801-77EF5D4FD324} = {ABC2D63C-77D2-49D8-AF86-2530D6672269} - {452B9C44-BE4A-4D0E-9412-07280582D3BB} = {ABC2D63C-77D2-49D8-AF86-2530D6672269} - {CE9500E9-92BE-4357-8CE9-876DCF5CEFEB} = {ABC2D63C-77D2-49D8-AF86-2530D6672269} - {35183A91-B461-4D21-8DCC-8BD6CF9216A6} = {ABC2D63C-77D2-49D8-AF86-2530D6672269} - {9C3EAF3C-A96C-4D5F-95FE-BBCB1580DECA} = {ABC2D63C-77D2-49D8-AF86-2530D6672269} {E4B95B10-EC2A-4874-8E71-858A90A4BDFE} = {56A31E71-2D11-484D-A9D0-97E4A2AD9354} {2F113EAD-602B-4EBD-97E4-24C97CDFEB50} = {56A31E71-2D11-484D-A9D0-97E4A2AD9354} {DD15B8D0-013A-43B3-AC3D-1B0D626B35E0} = {8B71FA04-1D67-4607-94A4-E2A85977B1FA} - {CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE} = {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} + {9C3EAF3C-A96C-4D5F-95FE-BBCB1580DECA} = {24204C7B-8FCC-4D46-8E72-BB7128DB5572} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D03A9093-136B-4C69-AFC1-106658815511} diff --git a/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln b/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln index 7e99b294a1d..ef4eaa7c691 100644 --- a/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln +++ b/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln @@ -13,10 +13,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{34A31418-59CF-42EC-8DC9-BD1C1D95DB7B}" 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}" @@ -31,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8D1E1DF1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E1E2C99D-07AE-4C22-A2E1-B807B1AE61AF}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A2474395-2701-4B91-A097-985495EFE750}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -170,42 +168,6 @@ 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 - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|x64.ActiveCfg = Debug|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|x64.Build.0 = Debug|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|x86.ActiveCfg = Debug|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|x86.Build.0 = Debug|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|Any CPU.Build.0 = Release|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|x64.ActiveCfg = Release|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|x64.Build.0 = Release|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|x86.ActiveCfg = Release|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|x86.Build.0 = Release|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Checked|Any CPU.Build.0 = Debug|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Checked|x64.ActiveCfg = Debug|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Checked|x64.Build.0 = Debug|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Checked|x86.ActiveCfg = Debug|Any CPU - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Checked|x86.Build.0 = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|x64.ActiveCfg = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|x64.Build.0 = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|x86.ActiveCfg = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|x86.Build.0 = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|Any CPU.Build.0 = Release|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|x64.ActiveCfg = Release|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|x64.Build.0 = Release|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|x86.ActiveCfg = Release|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|x86.Build.0 = Release|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Checked|Any CPU.Build.0 = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Checked|x64.ActiveCfg = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Checked|x64.Build.0 = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Checked|x86.ActiveCfg = Debug|Any CPU - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.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 @@ -285,17 +247,15 @@ Global GlobalSection(NestedProjects) = preSolution {6CBF7573-4865-4DD2-A38B-74003FB43C9E} = {6C5230A5-919B-465B-9C98-852B85C96947} {05AA43B5-733A-43EF-8CE5-8BF4A18BD516} = {6C5230A5-919B-465B-9C98-852B85C96947} - {6ED522FD-D0B0-4574-8F1A-82D339C7D0D3} = {6C5230A5-919B-465B-9C98-852B85C96947} {8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04} = {6C5230A5-919B-465B-9C98-852B85C96947} - {5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B} = {6C5230A5-919B-465B-9C98-852B85C96947} - {34A31418-59CF-42EC-8DC9-BD1C1D95DB7B} = {6C5230A5-919B-465B-9C98-852B85C96947} - {BEE502AC-7208-4289-BAFD-57EBE4A4F188} = {6C5230A5-919B-465B-9C98-852B85C96947} {C4E264C7-91E7-4100-BA47-47CB12964025} = {6C5230A5-919B-465B-9C98-852B85C96947} {C61770DF-C267-4B18-8822-D9C062FE806E} = {6C5230A5-919B-465B-9C98-852B85C96947} {1C01EFBD-2332-4392-BB4A-918178861EDC} = {8D1E1DF1-BE04-43F9-8D9D-E73AAB20C311} {5B121A9E-061D-4FED-AA3A-26054F41E2B4} = {8D1E1DF1-BE04-43F9-8D9D-E73AAB20C311} {2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D} = {E1E2C99D-07AE-4C22-A2E1-B807B1AE61AF} - {FD976FDB-4CEE-4D91-B2A0-9264F391D2B7} = {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} + {BEE502AC-7208-4289-BAFD-57EBE4A4F188} = {A2474395-2701-4B91-A097-985495EFE750} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E0E463DC-7C7C-48D9-9806-88AFFFA1F54F} diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln b/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln index 9d95c5003b0..af306f9935a 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln +++ b/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln @@ -9,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D2A7F166-96E6-4E0B-89CA-8869866AF10B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E6E9E4A4-CA40-4B1E-AA92-1CC666C5A544}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{1C28E125-BC75-4E11-B69A-0E56BD615C57}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5ACE392F-5FD1-4A91-B992-2D7562BEACDE}" EndProject @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4667237A-8A1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{995CF17B-85CD-4C9E-BE9D-8A2A3240FF6B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E2336D66-4276-48F1-9619-1F79CE7140EC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,14 +47,14 @@ 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 - {D2A7F166-96E6-4E0B-89CA-8869866AF10B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D2A7F166-96E6-4E0B-89CA-8869866AF10B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D2A7F166-96E6-4E0B-89CA-8869866AF10B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D2A7F166-96E6-4E0B-89CA-8869866AF10B}.Release|Any CPU.Build.0 = Release|Any CPU - {1C28E125-BC75-4E11-B69A-0E56BD615C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C28E125-BC75-4E11-B69A-0E56BD615C57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C28E125-BC75-4E11-B69A-0E56BD615C57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C28E125-BC75-4E11-B69A-0E56BD615C57}.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 + {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 + {F97FBDC1-22F3-4745-B934-2E2A650EDA6A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -62,9 +64,9 @@ Global {81E7CBE3-9763-4935-94D4-512480A85C46} = {5ACE392F-5FD1-4A91-B992-2D7562BEACDE} {95B7A616-C472-47CA-BC91-E88FB763A78B} = {5ACE392F-5FD1-4A91-B992-2D7562BEACDE} {424489A3-270A-4AD2-A3C4-4F726BF5D490} = {4667237A-8A15-43B3-8CDF-2D0E9B212182} - {D2A7F166-96E6-4E0B-89CA-8869866AF10B} = {4667237A-8A15-43B3-8CDF-2D0E9B212182} {C841EE65-4F8E-4779-987C-7E64BACFAC59} = {995CF17B-85CD-4C9E-BE9D-8A2A3240FF6B} - {1C28E125-BC75-4E11-B69A-0E56BD615C57} = {995CF17B-85CD-4C9E-BE9D-8A2A3240FF6B} + {E6E9E4A4-CA40-4B1E-AA92-1CC666C5A544} = {E2336D66-4276-48F1-9619-1F79CE7140EC} + {F97FBDC1-22F3-4745-B934-2E2A650EDA6A} = {E2336D66-4276-48F1-9619-1F79CE7140EC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6C0E44F7-3944-4BCA-94DA-2E558CEA1FE8} diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj index 0453c897a18..fb84a6f05a3 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLSCompliant>false</CLSCompliant> @@ -111,9 +111,6 @@ System.Diagnostics.DiagnosticSource</PackageDescription> <Compile Include="AssemblyInfo.netfx.cs" /> <Compile Include="System\Diagnostics\Activity.DateTime.netfx.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> - </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> @@ -131,4 +128,7 @@ System.Diagnostics.DiagnosticSource</PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFrameworkVersion)' == 'v6.0'"> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> + </ItemGroup> </Project> diff --git a/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln b/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln index a55a522c86b..efa850f1e75 100644 --- a/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln +++ b/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln @@ -11,9 +11,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{010F66ED-FE0D-49B2-A708-0C9ADF6D08F0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{189EB8E3-B28A-4D8C-80D2-E1BD21BF4F52}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{96BF2393-E065-4F51-8CDF-2D767A39C301}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{673B2D1D-A19E-4866-A95B-F9F458C07581}" EndProject @@ -25,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FFB9A9A0-BCD EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DBD1571C-0586-470C-83A4-84A174680603}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1096CED3-1AA7-4FA5-BF1A-EEFD977B6D3B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -55,14 +57,14 @@ 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 - {010F66ED-FE0D-49B2-A708-0C9ADF6D08F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {010F66ED-FE0D-49B2-A708-0C9ADF6D08F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {010F66ED-FE0D-49B2-A708-0C9ADF6D08F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {010F66ED-FE0D-49B2-A708-0C9ADF6D08F0}.Release|Any CPU.Build.0 = Release|Any CPU - {96BF2393-E065-4F51-8CDF-2D767A39C301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96BF2393-E065-4F51-8CDF-2D767A39C301}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96BF2393-E065-4F51-8CDF-2D767A39C301}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96BF2393-E065-4F51-8CDF-2D767A39C301}.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 + {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 + {D49EF33F-919D-4DE5-B4B1-CF6697EF3806}.Release|Any CPU.Build.0 = Release|Any CPU {673B2D1D-A19E-4866-A95B-F9F458C07581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {673B2D1D-A19E-4866-A95B-F9F458C07581}.Debug|Any CPU.Build.0 = Debug|Any CPU {673B2D1D-A19E-4866-A95B-F9F458C07581}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -80,12 +82,12 @@ Global {DE282697-BDF2-4FC7-B34C-911F35AE47D6} = {1E261D15-54E1-424E-BE7F-400B01EFE870} {635F5794-A69E-489D-9D1F-1D20D3DDE740} = {FFB9A9A0-BCDB-42B1-9D58-E25AC8B95C4C} {EF2BA909-F545-45B6-A467-24CCB98E8370} = {FFB9A9A0-BCDB-42B1-9D58-E25AC8B95C4C} - {010F66ED-FE0D-49B2-A708-0C9ADF6D08F0} = {FFB9A9A0-BCDB-42B1-9D58-E25AC8B95C4C} {673B2D1D-A19E-4866-A95B-F9F458C07581} = {FFB9A9A0-BCDB-42B1-9D58-E25AC8B95C4C} {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} - {96BF2393-E065-4F51-8CDF-2D767A39C301} = {DBD1571C-0586-470C-83A4-84A174680603} + {189EB8E3-B28A-4D8C-80D2-E1BD21BF4F52} = {1096CED3-1AA7-4FA5-BF1A-EEFD977B6D3B} + {D49EF33F-919D-4DE5-B4B1-CF6697EF3806} = {1096CED3-1AA7-4FA5-BF1A-EEFD977B6D3B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3DB51F1D-40A4-4B5E-85BF-74CCDEE2FAA7} diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln b/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln index b1f7051e8e8..af87194be22 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln +++ b/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln @@ -9,10 +9,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E75BB739-AE88-4CAA-82CA-72224A39D8CE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2391C35B-E06E-4BD8-ABF0-C7EE981336D1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DC87501D-94B3-4867-985C-D53935C7843A}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{36141B8B-E6F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{888B9739-0B73-4F21-A3CC-4694AEFE55CA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AC3F6844-B70D-4DC3-A930-43073DA6F2D8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,14 +47,6 @@ 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 - {E75BB739-AE88-4CAA-82CA-72224A39D8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E75BB739-AE88-4CAA-82CA-72224A39D8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E75BB739-AE88-4CAA-82CA-72224A39D8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E75BB739-AE88-4CAA-82CA-72224A39D8CE}.Release|Any CPU.Build.0 = Release|Any CPU - {2391C35B-E06E-4BD8-ABF0-C7EE981336D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2391C35B-E06E-4BD8-ABF0-C7EE981336D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2391C35B-E06E-4BD8-ABF0-C7EE981336D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2391C35B-E06E-4BD8-ABF0-C7EE981336D1}.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 @@ -74,11 +64,9 @@ Global {0B3AFB8E-37F9-4FF7-A5A1-1DABD484231F} = {8042448A-EB54-4EBB-A1E0-BAA0B5A343D8} {2F5C48C2-CE74-49FD-BA41-25FCBCE53A49} = {8042448A-EB54-4EBB-A1E0-BAA0B5A343D8} {46E9AC6C-347E-4F94-80CB-E1857EC0C5C6} = {36141B8B-E6F5-4AAF-A053-BDD189531BAF} - {E75BB739-AE88-4CAA-82CA-72224A39D8CE} = {36141B8B-E6F5-4AAF-A053-BDD189531BAF} {922C96F5-9F92-4F0E-A83D-D1BCDDD187F2} = {888B9739-0B73-4F21-A3CC-4694AEFE55CA} - {2391C35B-E06E-4BD8-ABF0-C7EE981336D1} = {888B9739-0B73-4F21-A3CC-4694AEFE55CA} - {DC87501D-94B3-4867-985C-D53935C7843A} = {888B9739-0B73-4F21-A3CC-4694AEFE55CA} - {C07D96C2-F7BA-45D5-BAE2-C06B68FF9F05} = {888B9739-0B73-4F21-A3CC-4694AEFE55CA} + {DC87501D-94B3-4867-985C-D53935C7843A} = {AC3F6844-B70D-4DC3-A930-43073DA6F2D8} + {C07D96C2-F7BA-45D5-BAE2-C06B68FF9F05} = {AC3F6844-B70D-4DC3-A930-43073DA6F2D8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9FDF2FF3-5DFC-45E8-9959-B59FF906E689} diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln index 60c9696abe6..9b7c38535af 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln +++ b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln @@ -19,9 +19,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{765847B4-A28D-41F2-A45F-BC0098E3147E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4C1D1653-BCA3-4A1F-91E2-27B3EC58D2A9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}" EndProject @@ -41,6 +41,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BFF04E9C-277 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F2408438-D7E0-4D89-97B1-EDCC83EA8442}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{651A1BB1-501D-45DA-9284-77F8FC083889}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -87,14 +89,14 @@ 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 - {765847B4-A28D-41F2-A45F-BC0098E3147E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {765847B4-A28D-41F2-A45F-BC0098E3147E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {765847B4-A28D-41F2-A45F-BC0098E3147E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {765847B4-A28D-41F2-A45F-BC0098E3147E}.Release|Any CPU.Build.0 = Release|Any CPU - {E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6}.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 + {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 + {B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}.Release|Any CPU.Build.0 = Release|Any CPU {2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -130,7 +132,6 @@ Global {067570A0-D55A-4ECC-A478-B1CBC676E9F3} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872} {D0C681EE-D578-4CD6-AA62-33874FCE3E37} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872} {F237AE76-582E-45B8-AC46-B0CE8C65780B} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872} - {765847B4-A28D-41F2-A45F-BC0098E3147E} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872} {2C707BFF-6BA9-4EB8-BC75-5341391B5FC6} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872} {F8480484-A2CA-4215-AC4B-82F6149FEC02} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872} {97932D09-4DF9-4836-ADEF-C52DBC0661CD} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872} @@ -138,10 +139,11 @@ Global {96328529-3EB5-4BA4-9998-CB85E279E7F2} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442} {2B7C465F-44E2-4D0B-9A9F-30F20FA49A16} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442} {A6AC1A1B-F02F-4F0B-8C6B-1A004EE79893} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442} - {E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442} {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} + {B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3} = {651A1BB1-501D-45DA-9284-77F8FC083889} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {51062B21-546F-4B2A-A2B8-77ABF1079C06} diff --git a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln index e501877e4af..d6a64f7bec0 100644 --- a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln +++ b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln @@ -23,22 +23,14 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{2E775DDC-C58B-4EBA-BE62-9B08D7C48059}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DB8EA6C1-4C44-4CB1-8B4C-FB52563D4F63}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{A0DE3634-6C95-4AA2-AFD5-733D352B6756}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{97763BA2-BD91-480C-8173-65EA2A72EAA8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}" @@ -49,6 +41,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B27D0964-41D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8CB89ED5-7600-48B5-B7F4-72026EB9F533}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -103,14 +97,6 @@ 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 - {2E775DDC-C58B-4EBA-BE62-9B08D7C48059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E775DDC-C58B-4EBA-BE62-9B08D7C48059}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E775DDC-C58B-4EBA-BE62-9B08D7C48059}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E775DDC-C58B-4EBA-BE62-9B08D7C48059}.Release|Any CPU.Build.0 = Release|Any CPU - {3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F}.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 @@ -119,10 +105,6 @@ Global {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 {FD985738-3603-4C41-9FDE-1C96F7922725}.Release|Any CPU.Build.0 = Release|Any CPU - {A0DE3634-6C95-4AA2-AFD5-733D352B6756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0DE3634-6C95-4AA2-AFD5-733D352B6756}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0DE3634-6C95-4AA2-AFD5-733D352B6756}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0DE3634-6C95-4AA2-AFD5-733D352B6756}.Release|Any CPU.Build.0 = Release|Any CPU {97763BA2-BD91-480C-8173-65EA2A72EAA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {97763BA2-BD91-480C-8173-65EA2A72EAA8}.Debug|Any CPU.Build.0 = Debug|Any CPU {97763BA2-BD91-480C-8173-65EA2A72EAA8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -131,10 +113,6 @@ Global {B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Debug|Any CPU.Build.0 = Debug|Any CPU {B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Release|Any CPU.ActiveCfg = Release|Any CPU {B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Release|Any CPU.Build.0 = Release|Any CPU - {6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F}.Release|Any CPU.Build.0 = Release|Any CPU {546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Debug|Any CPU.Build.0 = Debug|Any CPU {546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -156,20 +134,16 @@ Global {314810DF-262E-490E-8F05-F31695C31F0C} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} {84075D59-9D5E-40F7-A914-911087419FE4} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} {65CC713C-0735-4043-A4F2-9E1A2057A21B} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {DB8EA6C1-4C44-4CB1-8B4C-FB52563D4F63} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {FD985738-3603-4C41-9FDE-1C96F7922725} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {A0DE3634-6C95-4AA2-AFD5-733D352B6756} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} {B8F3933C-7C0D-41B3-8B1F-D507EF92156B} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} {9C521ED1-5221-4C93-BBA0-86C13D4C23C7} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} {55EAF4E8-025C-4913-949C-B391D567D43F} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD} {4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD} {F485B36D-8DDB-44EE-A993-2FCAEC81BE3E} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD} {6155E80C-6CE0-4A93-8BDF-80494E489BB1} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD} - {2E775DDC-C58B-4EBA-BE62-9B08D7C48059} = {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} + {FD985738-3603-4C41-9FDE-1C96F7922725} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B723DDA5-3A21-4A9C-A344-548BE6D05B72} diff --git a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln index 6eec7119d58..9752ab5db0d 100644 --- a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln +++ b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln @@ -29,10 +29,6 @@ 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", "{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DDB26596-113C-471A-91B0-9609C743ACA1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}" -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}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{64554B4A-B6C5-4D22-A1D1-6757F510CAE0}" @@ -49,6 +45,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A376B9EB EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ED3F0225-44AC-415A-80C8-18D9CAD10A64}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CAB63FAF-D862-451E-84FF-115A7DABB4CA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -332,42 +330,6 @@ Global {E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Checked|x64.Build.0 = Debug|Any CPU {E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Checked|x86.ActiveCfg = Debug|Any CPU {E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Checked|x86.Build.0 = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|x64.ActiveCfg = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|x64.Build.0 = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|x86.ActiveCfg = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|x86.Build.0 = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Release|Any CPU.Build.0 = Release|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Release|x64.ActiveCfg = Release|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Release|x64.Build.0 = Release|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Release|x86.ActiveCfg = Release|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Release|x86.Build.0 = Release|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Checked|Any CPU.Build.0 = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Checked|x64.ActiveCfg = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Checked|x64.Build.0 = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Checked|x86.ActiveCfg = Debug|Any CPU - {DDB26596-113C-471A-91B0-9609C743ACA1}.Checked|x86.Build.0 = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x64.ActiveCfg = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x64.Build.0 = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x86.ActiveCfg = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x86.Build.0 = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|Any CPU.Build.0 = Release|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x64.ActiveCfg = Release|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x64.Build.0 = Release|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x86.ActiveCfg = Release|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x86.Build.0 = Release|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|Any CPU.Build.0 = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x64.ActiveCfg = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x64.Build.0 = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x86.ActiveCfg = Debug|Any CPU - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x86.Build.0 = Debug|Any CPU {449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|Any CPU.Build.0 = Debug|Any CPU {449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -469,13 +431,9 @@ Global {1A44729F-AFB5-4BB0-8348-58833378AE55} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} {B1632FA3-4F01-4B41-BB61-F7676A25EDA0} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} {96501106-36D0-4093-8FEE-AF90713D09ED} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {0269FFAF-E680-4BC8-A1B4-0333D77911BC} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} {E6DD9860-2824-43D3-BD9D-87ED396B4E46} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} {E5EB0B0B-FFAC-4C1B-AD59-292849F847FE} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {E5CCAE24-D76A-4409-BED8-A4E3F188A64A} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} {449DFAB8-C413-44E4-BEAE-C61595DBCBC2} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {64554B4A-B6C5-4D22-A1D1-6757F510CAE0} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {C0FDA629-485A-4795-80D1-BC228F610163} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} {623D46A5-8ED4-43CF-A01B-528F0A505090} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} {039BB256-1BCF-4398-B586-C05F7C5225C4} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} {65FFFD20-CE5D-4FC0-A525-1C308186A16F} = {A376B9EB-8223-464D-A8F5-0000B26254F4} @@ -484,7 +442,9 @@ Global {D8A82D01-BD1F-4437-8649-362A5270E533} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64} {A8BB1002-C4B3-4B77-9A99-908FC6C84811} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64} {1885EF4C-6A85-4170-8E5B-7C158C4BECDB} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64} - {DDB26596-113C-471A-91B0-9609C743ACA1} = {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} + {C0FDA629-485A-4795-80D1-BC228F610163} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1572B987-E4D6-45D5-82AB-9CC0BB306C2E} diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln b/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln index 47f5bfb7b1e..57290f41260 100644 --- a/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln +++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4F7567CA-4918-40F8-B914-0FAB2C7EBFF0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4EEC9BE6-88AC-4ABD-9CC5-0AE368425DA0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{203C894D-5FF8-4E4A-9812-2674847CC88D}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C2EA1B5C-E1FF-491B-B243-17B133914DAE}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{261ED6BF-386 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AA9494D5-6DB3-4A88-B219-13746C6BC2AD}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4F17E201-98A0-44A6-8B34-BF3A4B5B5EA8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {4F7567CA-4918-40F8-B914-0FAB2C7EBFF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F7567CA-4918-40F8-B914-0FAB2C7EBFF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F7567CA-4918-40F8-B914-0FAB2C7EBFF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F7567CA-4918-40F8-B914-0FAB2C7EBFF0}.Release|Any CPU.Build.0 = Release|Any CPU - {203C894D-5FF8-4E4A-9812-2674847CC88D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {203C894D-5FF8-4E4A-9812-2674847CC88D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {203C894D-5FF8-4E4A-9812-2674847CC88D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {203C894D-5FF8-4E4A-9812-2674847CC88D}.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 + {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 + {1E5E7A69-E4B6-44ED-BABB-327C2F32830B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {1FDACBD7-A395-4E8E-B5E1-15BBE70A6D5D} = {C2EA1B5C-E1FF-491B-B243-17B133914DAE} {A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4} = {C2EA1B5C-E1FF-491B-B243-17B133914DAE} {7B2B6693-9877-47BB-A2A1-C1E94596AAE7} = {261ED6BF-3867-4A06-B9A3-4973BCAB5621} - {4F7567CA-4918-40F8-B914-0FAB2C7EBFF0} = {261ED6BF-3867-4A06-B9A3-4973BCAB5621} {6D2D27DE-9BFF-4ABA-B520-D1C81AA9A847} = {AA9494D5-6DB3-4A88-B219-13746C6BC2AD} - {203C894D-5FF8-4E4A-9812-2674847CC88D} = {AA9494D5-6DB3-4A88-B219-13746C6BC2AD} + {4EEC9BE6-88AC-4ABD-9CC5-0AE368425DA0} = {4F17E201-98A0-44A6-8B34-BF3A4B5B5EA8} + {1E5E7A69-E4B6-44ED-BABB-327C2F32830B} = {4F17E201-98A0-44A6-8B34-BF3A4B5B5EA8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5551E9B9-3000-4C32-AE97-0C3D30561263} diff --git a/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln b/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln index f3b1e4c2920..649be403f22 100644 --- a/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln +++ b/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6AC1A337-2D08-4230-8D95-B52F324F291F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{0F3398E4-CD75-45E9-B8DB-0073BF8712B0}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0EFD8A36 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F8D19CA8-D65B-4C4B-9851-8E2836CFD72E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F5CD84BD-2A56-47BD-A14E-531D0391918A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -146,42 +144,6 @@ 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 - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|x64.ActiveCfg = Debug|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|x64.Build.0 = Debug|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|x86.ActiveCfg = Debug|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|x86.Build.0 = Debug|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|Any CPU.Build.0 = Release|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|x64.ActiveCfg = Release|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|x64.Build.0 = Release|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|x86.ActiveCfg = Release|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|x86.Build.0 = Release|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Checked|Any CPU.Build.0 = Debug|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Checked|x64.ActiveCfg = Debug|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Checked|x64.Build.0 = Debug|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Checked|x86.ActiveCfg = Debug|Any CPU - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Checked|x86.Build.0 = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|x64.ActiveCfg = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|x64.Build.0 = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|x86.ActiveCfg = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|x86.Build.0 = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|Any CPU.Build.0 = Release|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|x64.ActiveCfg = Release|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|x64.Build.0 = Release|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|x86.ActiveCfg = Release|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|x86.Build.0 = Release|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Checked|Any CPU.Build.0 = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Checked|x64.ActiveCfg = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Checked|x64.Build.0 = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.Checked|x86.ActiveCfg = Debug|Any CPU - {6AC1A337-2D08-4230-8D95-B52F324F291F}.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 @@ -225,14 +187,12 @@ Global GlobalSection(NestedProjects) = preSolution {4E534B56-D245-41B7-B4D0-F8AB7BCC8877} = {15569044-E5D8-40B5-B718-A51ECAA6B259} {566DC861-7C05-45AE-8F59-83D1A175A619} = {15569044-E5D8-40B5-B718-A51ECAA6B259} - {103898BF-8D8F-4A35-A943-027A47E4BD36} = {15569044-E5D8-40B5-B718-A51ECAA6B259} - {6AC1A337-2D08-4230-8D95-B52F324F291F} = {15569044-E5D8-40B5-B718-A51ECAA6B259} - {0F3398E4-CD75-45E9-B8DB-0073BF8712B0} = {15569044-E5D8-40B5-B718-A51ECAA6B259} - {78C30412-0737-4680-AC94-CBD44DBDFCB9} = {15569044-E5D8-40B5-B718-A51ECAA6B259} {6FF6D8F0-403D-40DF-9D75-895E2AF22B88} = {0EFD8A36-ACB0-4451-800E-DA867389324D} {A63F3AEA-F4ED-4047-A11F-490325530D92} = {0EFD8A36-ACB0-4451-800E-DA867389324D} {E5F5CCFF-4DBA-4323-82A6-8D472C488C0B} = {F8D19CA8-D65B-4C4B-9851-8E2836CFD72E} - {740703FE-F5E0-4BE0-93B2-63ADD4A3EB70} = {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} + {78C30412-0737-4680-AC94-CBD44DBDFCB9} = {F5CD84BD-2A56-47BD-A14E-531D0391918A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {74CBBF59-B32F-49B5-9402-F495E129FC3E} diff --git a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln index bca99beaf5d..fe1c7ef796d 100644 --- a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln +++ b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln @@ -21,10 +21,6 @@ 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", "{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BFDA7EE4-2407-4799-82B0-D977F3363A0D}" -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}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791}" @@ -41,6 +37,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6BA02609 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1826CD8D-A5E3-4C8E-A49A-E746D9682B87}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -252,42 +250,6 @@ Global {4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Checked|x64.Build.0 = Debug|Any CPU {4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Checked|x86.ActiveCfg = Debug|Any CPU {4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Checked|x86.Build.0 = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|x64.ActiveCfg = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|x64.Build.0 = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|x86.ActiveCfg = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|x86.Build.0 = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|Any CPU.Build.0 = Release|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|x64.ActiveCfg = Release|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|x64.Build.0 = Release|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|x86.ActiveCfg = Release|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|x86.Build.0 = Release|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Checked|Any CPU.Build.0 = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Checked|x64.ActiveCfg = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Checked|x64.Build.0 = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Checked|x86.ActiveCfg = Debug|Any CPU - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Checked|x86.Build.0 = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|x64.ActiveCfg = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|x64.Build.0 = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|x86.ActiveCfg = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|x86.Build.0 = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|Any CPU.Build.0 = Release|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|x64.ActiveCfg = Release|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|x64.Build.0 = Release|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|x86.ActiveCfg = Release|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|x86.Build.0 = Release|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Checked|Any CPU.Build.0 = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Checked|x64.ActiveCfg = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Checked|x64.Build.0 = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Checked|x86.ActiveCfg = Debug|Any CPU - {BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Checked|x86.Build.0 = Debug|Any CPU {0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Debug|Any CPU.Build.0 = Debug|Any CPU {0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -389,18 +351,16 @@ Global {95F843FE-38B4-4ED5-81FF-605DE38155F6} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {97D756D3-8ECA-45F5-A9F5-DBF659D87BC4} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF} = {315BC231-270B-456C-919A-3E9BB50CDD7A} - {8EAD8906-AF4E-42CA-983E-28CFE2224AEE} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C} = {315BC231-270B-456C-919A-3E9BB50CDD7A} - {BFDA7EE4-2407-4799-82B0-D977F3363A0D} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5} = {315BC231-270B-456C-919A-3E9BB50CDD7A} - {D2B10AFA-6393-48CC-8DFD-4A0BF4BC5791} = {315BC231-270B-456C-919A-3E9BB50CDD7A} - {A17B970B-41B2-4C78-BA05-2B954357E46A} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {637E7769-42D2-4541-9A63-32301113FA5A} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {7C0A6923-A9BC-4F10-81E0-C535EEF537BB} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {F6BCA6EF-777E-408B-B49B-B055B5A0BA19} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A} {0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A} {2F00396E-003A-4385-92DC-69FDBEF330D8} = {1826CD8D-A5E3-4C8E-A49A-E746D9682B87} - {7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF} = {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} + {A17B970B-41B2-4C78-BA05-2B954357E46A} = {BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {52B54BB6-271E-45BD-A7A4-D4CEDC973704} diff --git a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln index d35d0997183..717ab889c58 100644 --- a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln +++ b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{ADB5AA13-96F9-4A6C-B152-A8295554815E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{7ED6F742-A58B-4352-AD32-88F53E65B763}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2B753122-D85F-4D4D-8F4B-0C8BF4924275}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{21E11D21 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{61AC03AE-7090-458C-A3AB-5A4CCFF6AD08}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F2FD3769-35C6-481A-AF35-9BDDEE550B54}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -146,42 +144,6 @@ 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 - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|x64.ActiveCfg = Debug|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|x64.Build.0 = Debug|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|x86.ActiveCfg = Debug|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|x86.Build.0 = Debug|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|Any CPU.Build.0 = Release|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|x64.ActiveCfg = Release|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|x64.Build.0 = Release|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|x86.ActiveCfg = Release|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|x86.Build.0 = Release|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Checked|Any CPU.Build.0 = Debug|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Checked|x64.ActiveCfg = Debug|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Checked|x64.Build.0 = Debug|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Checked|x86.ActiveCfg = Debug|Any CPU - {ADB5AA13-96F9-4A6C-B152-A8295554815E}.Checked|x86.Build.0 = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|x64.ActiveCfg = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|x64.Build.0 = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|x86.ActiveCfg = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|x86.Build.0 = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|Any CPU.Build.0 = Release|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|x64.ActiveCfg = Release|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|x64.Build.0 = Release|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|x86.ActiveCfg = Release|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|x86.Build.0 = Release|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Checked|Any CPU.Build.0 = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Checked|x64.ActiveCfg = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Checked|x64.Build.0 = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.Checked|x86.ActiveCfg = Debug|Any CPU - {7ED6F742-A58B-4352-AD32-88F53E65B763}.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 @@ -225,14 +187,12 @@ Global GlobalSection(NestedProjects) = preSolution {370DCE61-CBDF-466E-91DB-5AE622BF2E52} = {269A342C-D693-495C-8A07-11E08C881F6B} {63783D6D-0848-4303-8E7A-BBB7F65DCE9E} = {269A342C-D693-495C-8A07-11E08C881F6B} - {3969DA9E-6C7D-421D-ABCC-BD02DFA36DA4} = {269A342C-D693-495C-8A07-11E08C881F6B} - {7ED6F742-A58B-4352-AD32-88F53E65B763} = {269A342C-D693-495C-8A07-11E08C881F6B} - {2B753122-D85F-4D4D-8F4B-0C8BF4924275} = {269A342C-D693-495C-8A07-11E08C881F6B} - {38416350-0E7B-4201-8B7E-3FA80FCFA81A} = {269A342C-D693-495C-8A07-11E08C881F6B} {6E159831-C97C-40FD-AD1A-E8B1EE3E7168} = {21E11D21-3706-49C7-ACA7-10BA9A021908} {24605C4D-2465-433D-A393-45CB950E0834} = {21E11D21-3706-49C7-ACA7-10BA9A021908} {D7C16DED-127A-4CBB-BBCF-DF133816413B} = {61AC03AE-7090-458C-A3AB-5A4CCFF6AD08} - {ADB5AA13-96F9-4A6C-B152-A8295554815E} = {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} + {38416350-0E7B-4201-8B7E-3FA80FCFA81A} = {F2FD3769-35C6-481A-AF35-9BDDEE550B54} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5AB76D2F-E758-4FA1-83E4-E5645849CC34} diff --git a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln index b1a8f363c9f..42c457e23f7 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln +++ b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln @@ -27,9 +27,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1D411219-F307-4B9D-937E-553171FDB3D3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F94DCCFF-85FF-4D3E-8D77-06C2BA4CA79A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{86B6EA46-F6CC-48D6-947D-77879D89658D}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}" EndProject @@ -49,6 +49,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{51C4F716-E3A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C2159C53-1E91-486D-A66C-E658FB73A87F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CBDB0A5C-FDD0-4B00-8840-D40E4D6B17DB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -111,14 +113,14 @@ 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 - {1D411219-F307-4B9D-937E-553171FDB3D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D411219-F307-4B9D-937E-553171FDB3D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D411219-F307-4B9D-937E-553171FDB3D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D411219-F307-4B9D-937E-553171FDB3D3}.Release|Any CPU.Build.0 = Release|Any CPU - {86B6EA46-F6CC-48D6-947D-77879D89658D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86B6EA46-F6CC-48D6-947D-77879D89658D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86B6EA46-F6CC-48D6-947D-77879D89658D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86B6EA46-F6CC-48D6-947D-77879D89658D}.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 + {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 + {052330E1-08F5-4AC3-987D-4C601D640414}.Release|Any CPU.Build.0 = Release|Any CPU {A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU {A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -156,7 +158,6 @@ Global {469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} {8D48B49B-398F-4536-B436-AAD50A7F54B1} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} {20D14386-C6D6-4B4D-B56B-0C8E645C704C} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} - {1D411219-F307-4B9D-937E-553171FDB3D3} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} {A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} {10F92CA0-8897-420A-9963-F46BC1274D28} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} {CDF9EADE-78CA-4775-8961-D52E066432C9} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} @@ -166,10 +167,11 @@ Global {DBE4B576-2E74-4A45-87E6-CCF652F6ADE1} = {C2159C53-1E91-486D-A66C-E658FB73A87F} {6F8B3E04-A81F-4AD1-B82A-3E58F030D52A} = {C2159C53-1E91-486D-A66C-E658FB73A87F} {28D6099B-F9A5-4E38-AC58-DC659D66A781} = {C2159C53-1E91-486D-A66C-E658FB73A87F} - {86B6EA46-F6CC-48D6-947D-77879D89658D} = {C2159C53-1E91-486D-A66C-E658FB73A87F} {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} + {052330E1-08F5-4AC3-987D-4C601D640414} = {CBDB0A5C-FDD0-4B00-8840-D40E4D6B17DB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {600939C3-C746-4C12-9FA6-82208BD6CD03} diff --git a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln index 4a339865820..694e40bf31a 100644 --- a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln +++ b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln @@ -19,9 +19,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F939D8A3-E1D3-4E42-A4B1-BAACE52FC130}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9AEF4834-69FA-4002-88DA-D7708E5FA8AA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{15B6E2E8-5FF8-4605-AF19-CE2C45E71811}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}" EndProject @@ -37,6 +37,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FF4142E3-375 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6BC70A1F-00D5-482D-9603-DD6C6E84AE4B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -83,14 +85,14 @@ 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 - {F939D8A3-E1D3-4E42-A4B1-BAACE52FC130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F939D8A3-E1D3-4E42-A4B1-BAACE52FC130}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F939D8A3-E1D3-4E42-A4B1-BAACE52FC130}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F939D8A3-E1D3-4E42-A4B1-BAACE52FC130}.Release|Any CPU.Build.0 = Release|Any CPU - {15B6E2E8-5FF8-4605-AF19-CE2C45E71811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15B6E2E8-5FF8-4605-AF19-CE2C45E71811}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15B6E2E8-5FF8-4605-AF19-CE2C45E71811}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15B6E2E8-5FF8-4605-AF19-CE2C45E71811}.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 + {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 + {8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5}.Release|Any CPU.Build.0 = Release|Any CPU {493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Debug|Any CPU.Build.0 = Debug|Any CPU {493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -118,16 +120,16 @@ Global {E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5} {B7E5B25A-0E3A-4FF8-958C-3FEB057DE330} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5} {B90CD66C-B99D-4297-BF0F-CD87EFE28C8E} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5} - {F939D8A3-E1D3-4E42-A4B1-BAACE52FC130} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5} {493BCA01-A5FC-4C5A-9E85-A0E23E3CD425} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5} {AC53B586-F702-4B0C-94A9-A6F066FDC4C1} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5} {CB2A40FA-9B59-4332-BF14-5BB173BE4B3A} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C} {71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C} {E1F18567-C282-456B-8CCC-677702609FAF} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C} {7D023C02-F4AB-456F-8106-88FD95798129} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C} - {15B6E2E8-5FF8-4605-AF19-CE2C45E71811} = {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} + {8AC2B9D8-7C86-4F20-9E4C-369ACE927BF5} = {6BC70A1F-00D5-482D-9603-DD6C6E84AE4B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FA8DCCFE-EDCD-4086-AD0B-5089B54BC658} diff --git a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln index b2a43159ef2..53fbfcbb94a 100644 --- a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln +++ b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln @@ -15,9 +15,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B2ED534B-CB42-4F20-9AD9-707CFF08D73F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{33CA6B93-4555-4DD5-BF1E-3963C5975A21}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{97F1F297-B6BC-4CD8-9E44-C682CA36A434}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}" EndProject @@ -33,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{902318E3-C88 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{87FDB279-F475-45C0-92EF-7893E25AA0A6}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C1A58B90-FE26-4840-9D69-60DFC77BF485}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -71,14 +73,14 @@ 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 - {B2ED534B-CB42-4F20-9AD9-707CFF08D73F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2ED534B-CB42-4F20-9AD9-707CFF08D73F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2ED534B-CB42-4F20-9AD9-707CFF08D73F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2ED534B-CB42-4F20-9AD9-707CFF08D73F}.Release|Any CPU.Build.0 = Release|Any CPU - {97F1F297-B6BC-4CD8-9E44-C682CA36A434}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97F1F297-B6BC-4CD8-9E44-C682CA36A434}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97F1F297-B6BC-4CD8-9E44-C682CA36A434}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97F1F297-B6BC-4CD8-9E44-C682CA36A434}.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 + {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 + {29CA2D73-E756-4A81-A0A3-733C771FB0AB}.Release|Any CPU.Build.0 = Release|Any CPU {C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Debug|Any CPU.Build.0 = Debug|Any CPU {C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -105,15 +107,15 @@ Global {FB811CED-3759-4199-B4D4-7A7D986C5984} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE} {DB7964E8-6761-47C7-B120-DAF13FDDE01B} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE} {09EAF02A-CD00-4440-A7CF-7355EC5DC85A} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE} - {B2ED534B-CB42-4F20-9AD9-707CFF08D73F} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE} {C40C15E4-8060-4295-9B8F-E04F94BFDA2B} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE} {169CCBAE-5490-4409-9CC7-48850ABA1BE8} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE} {E9C760AC-9A53-483E-8442-23EE041D768D} = {87FDB279-F475-45C0-92EF-7893E25AA0A6} {6870504E-8490-4A4C-938A-C68DA9A2F65D} = {87FDB279-F475-45C0-92EF-7893E25AA0A6} {6F0FF033-08A4-4DC3-8D86-46969C36972F} = {87FDB279-F475-45C0-92EF-7893E25AA0A6} - {97F1F297-B6BC-4CD8-9E44-C682CA36A434} = {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} + {29CA2D73-E756-4A81-A0A3-733C771FB0AB} = {C1A58B90-FE26-4840-9D69-60DFC77BF485} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9DE1DE68-219A-4A5E-83A8-C0F0637EE9DF} diff --git a/src/libraries/System.Drawing.Common/System.Drawing.Common.sln b/src/libraries/System.Drawing.Common/System.Drawing.Common.sln index 9515c8dc817..bbc920b00e3 100644 --- a/src/libraries/System.Drawing.Common/System.Drawing.Common.sln +++ b/src/libraries/System.Drawing.Common/System.Drawing.Common.sln @@ -11,9 +11,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D04E4F54-5141-48A6-B56B-38227CC937E0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{70DC9070-FD02-4288-90ED-C44FA3F74F11}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3C46E509-7690-4467-9399-23B213F8236A}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{92581ED8-E04A-4B49-8C25-A3A30942C819}" EndProject @@ -21,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7471DB83-C27 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4C4E5584-A0CC-441D-89EF-C0EA125E7120}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B09E2F78-85C8-4353-90B3-79DB869E83D5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,14 +53,14 @@ 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 - {D04E4F54-5141-48A6-B56B-38227CC937E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D04E4F54-5141-48A6-B56B-38227CC937E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D04E4F54-5141-48A6-B56B-38227CC937E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D04E4F54-5141-48A6-B56B-38227CC937E0}.Release|Any CPU.Build.0 = Release|Any CPU - {3C46E509-7690-4467-9399-23B213F8236A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C46E509-7690-4467-9399-23B213F8236A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C46E509-7690-4467-9399-23B213F8236A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C46E509-7690-4467-9399-23B213F8236A}.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 + {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 + {958E19D9-4216-49C4-B7D6-5DAEA9166D35}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -68,10 +70,10 @@ Global {F14479F4-611E-49DA-BB07-74C0AB096FB5} = {92581ED8-E04A-4B49-8C25-A3A30942C819} {83CA6F97-678B-40A7-A9DF-C94A46B8B18A} = {7471DB83-C273-481B-9AD8-51B468C1F75E} {790BF98D-7616-410C-BEF8-2CBA7E7601BB} = {7471DB83-C273-481B-9AD8-51B468C1F75E} - {D04E4F54-5141-48A6-B56B-38227CC937E0} = {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} - {3C46E509-7690-4467-9399-23B213F8236A} = {4C4E5584-A0CC-441D-89EF-C0EA125E7120} + {70DC9070-FD02-4288-90ED-C44FA3F74F11} = {B09E2F78-85C8-4353-90B3-79DB869E83D5} + {958E19D9-4216-49C4-B7D6-5DAEA9166D35} = {B09E2F78-85C8-4353-90B3-79DB869E83D5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FE976CDB-4464-48A7-86B9-04DB5E2258DA} diff --git a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln index c47114555a8..3ae1008541f 100644 --- a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln +++ b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln @@ -1,19 +1,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{39205290-06C5-468E-B5C9-D9C5737909EE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\ref\Microsoft.Win32.SystemEvents.csproj", "{D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\src\Microsoft.Win32.SystemEvents.csproj", "{CE77C53C-CB16-487B-9ABE-6A62BC4BAE67}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives", "ref\System.Drawing.Primitives.csproj", "{D2E753F4-34A3-4641-9C0F-53539147CCF2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives", "src\System.Drawing.Primitives.csproj", "{80A68643-0E37-4525-BF06-F50C3BF7B867}" 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{CE015CAB-D2C5-4525-B2E5-1020BADB211A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B4071D6F-5102-49A1-B28D-CB745A179371}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4698E870-A129-44D0-A890-98BAB02ECE0C}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B004DC3D-DA89-4C76-8D15-327CCDB6D7C0}" EndProject @@ -21,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F2D0660B-B4A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{722DCDC1-7510-4B50-93F4-51E5FF833B2A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8349AD04-5979-4347-A869-7F76B043453E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -31,14 +29,6 @@ Global {39205290-06C5-468E-B5C9-D9C5737909EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {39205290-06C5-468E-B5C9-D9C5737909EE}.Release|Any CPU.ActiveCfg = Release|Any CPU {39205290-06C5-468E-B5C9-D9C5737909EE}.Release|Any CPU.Build.0 = Release|Any CPU - {D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB}.Release|Any CPU.Build.0 = Release|Any CPU - {CE77C53C-CB16-487B-9ABE-6A62BC4BAE67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE77C53C-CB16-487B-9ABE-6A62BC4BAE67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE77C53C-CB16-487B-9ABE-6A62BC4BAE67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE77C53C-CB16-487B-9ABE-6A62BC4BAE67}.Release|Any CPU.Build.0 = Release|Any CPU {D2E753F4-34A3-4641-9C0F-53539147CCF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D2E753F4-34A3-4641-9C0F-53539147CCF2}.Debug|Any CPU.Build.0 = Debug|Any CPU {D2E753F4-34A3-4641-9C0F-53539147CCF2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -51,14 +41,14 @@ 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 - {CE015CAB-D2C5-4525-B2E5-1020BADB211A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE015CAB-D2C5-4525-B2E5-1020BADB211A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE015CAB-D2C5-4525-B2E5-1020BADB211A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE015CAB-D2C5-4525-B2E5-1020BADB211A}.Release|Any CPU.Build.0 = Release|Any CPU - {4698E870-A129-44D0-A890-98BAB02ECE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4698E870-A129-44D0-A890-98BAB02ECE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4698E870-A129-44D0-A890-98BAB02ECE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4698E870-A129-44D0-A890-98BAB02ECE0C}.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 + {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 + {9ECCC771-064F-403E-8E0E-7B049AAFAD36}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -66,12 +56,10 @@ Global GlobalSection(NestedProjects) = preSolution {39205290-06C5-468E-B5C9-D9C5737909EE} = {B004DC3D-DA89-4C76-8D15-327CCDB6D7C0} {515B6C1E-757F-497E-9707-37B5822FFC9A} = {B004DC3D-DA89-4C76-8D15-327CCDB6D7C0} - {D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB} = {F2D0660B-B4A3-4039-A47D-63F9D1CE19B6} {D2E753F4-34A3-4641-9C0F-53539147CCF2} = {F2D0660B-B4A3-4039-A47D-63F9D1CE19B6} - {CE015CAB-D2C5-4525-B2E5-1020BADB211A} = {F2D0660B-B4A3-4039-A47D-63F9D1CE19B6} - {CE77C53C-CB16-487B-9ABE-6A62BC4BAE67} = {722DCDC1-7510-4B50-93F4-51E5FF833B2A} {80A68643-0E37-4525-BF06-F50C3BF7B867} = {722DCDC1-7510-4B50-93F4-51E5FF833B2A} - {4698E870-A129-44D0-A890-98BAB02ECE0C} = {722DCDC1-7510-4B50-93F4-51E5FF833B2A} + {B4071D6F-5102-49A1-B28D-CB745A179371} = {8349AD04-5979-4347-A869-7F76B043453E} + {9ECCC771-064F-403E-8E0E-7B049AAFAD36} = {8349AD04-5979-4347-A869-7F76B043453E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E2DD25F1-FA29-41D5-AB37-65DDC6A49304} diff --git a/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln b/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln index afc35108e5c..3a7a31c000b 100644 --- a/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln +++ b/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{6AD793CF-2805-4101-975C-71CE64DB62A1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6428C5CC-7326-4614-BFD8-1288410CD1A4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3653D393-7F7B-4090-90FA-7028C29B5FFC}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B3F05E8C-539A-4D2E-BFEC-F4963970F5A0}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{09FD0366-190 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E7D88582-C912-4F52-BDD0-CADB896D95CF}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{77B35F51-2D3C-47F2-8BEF-CB8B741C70A5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {6AD793CF-2805-4101-975C-71CE64DB62A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AD793CF-2805-4101-975C-71CE64DB62A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AD793CF-2805-4101-975C-71CE64DB62A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AD793CF-2805-4101-975C-71CE64DB62A1}.Release|Any CPU.Build.0 = Release|Any CPU - {3653D393-7F7B-4090-90FA-7028C29B5FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3653D393-7F7B-4090-90FA-7028C29B5FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3653D393-7F7B-4090-90FA-7028C29B5FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3653D393-7F7B-4090-90FA-7028C29B5FFC}.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 + {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 + {14610D93-4B51-4853-A328-D5B7B2A6B6A1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {9A152C52-C5EE-41ED-AD29-8EEE5D41E372} = {B3F05E8C-539A-4D2E-BFEC-F4963970F5A0} {3695B814-610C-41D5-A3F5-B0B55EF10863} = {B3F05E8C-539A-4D2E-BFEC-F4963970F5A0} {1A6D5602-176D-4E7D-A7F5-F4D25044E171} = {09FD0366-1902-4E68-9EFE-20E78EA9E499} - {6AD793CF-2805-4101-975C-71CE64DB62A1} = {09FD0366-1902-4E68-9EFE-20E78EA9E499} {F4EF8420-0243-452F-879E-609F9AE7C05E} = {E7D88582-C912-4F52-BDD0-CADB896D95CF} - {3653D393-7F7B-4090-90FA-7028C29B5FFC} = {E7D88582-C912-4F52-BDD0-CADB896D95CF} + {6428C5CC-7326-4614-BFD8-1288410CD1A4} = {77B35F51-2D3C-47F2-8BEF-CB8B741C70A5} + {14610D93-4B51-4853-A328-D5B7B2A6B6A1} = {77B35F51-2D3C-47F2-8BEF-CB8B741C70A5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {48F54059-7B38-4CA3-A572-D20E5AD37696} diff --git a/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln b/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln index 10fca997c49..2ea756f6213 100644 --- a/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln +++ b/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln @@ -15,9 +15,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{5947E587-4DA8-4BA5-B368-9D172D2186F2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E5280823-9A9A-4314-B0C3-B983A7D50C85}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{61790DBD-EAF7-4855-99C4-64FD3FD9E5FE}" EndProject @@ -25,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5690A39F-8BC EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D4FCCCB-BD58-4ABE-A98D-140A5B303DF6}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{425CDAF9-11CA-4C58-B6D4-0CB644481EF9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -63,14 +65,14 @@ 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 - {696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Release|Any CPU.Build.0 = Release|Any CPU - {E5280823-9A9A-4314-B0C3-B983A7D50C85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5280823-9A9A-4314-B0C3-B983A7D50C85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5280823-9A9A-4314-B0C3-B983A7D50C85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5280823-9A9A-4314-B0C3-B983A7D50C85}.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 + {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 + {B64227A9-23C4-4B99-A5E0-7028CA40FF32}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -81,11 +83,11 @@ Global {1FD030A0-65F2-4DF7-83AE-FED291499F02} = {5690A39F-8BCB-4B98-B230-8734FABEF393} {1548AC5C-27FD-4B46-A930-C168D622FAB0} = {5690A39F-8BCB-4B98-B230-8734FABEF393} {A593EBF2-A345-4523-9E04-74C5E350541D} = {5690A39F-8BCB-4B98-B230-8734FABEF393} - {696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9} = {5690A39F-8BCB-4B98-B230-8734FABEF393} {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} - {E5280823-9A9A-4314-B0C3-B983A7D50C85} = {7D4FCCCB-BD58-4ABE-A98D-140A5B303DF6} + {5947E587-4DA8-4BA5-B368-9D172D2186F2} = {425CDAF9-11CA-4C58-B6D4-0CB644481EF9} + {B64227A9-23C4-4B99-A5E0-7028CA40FF32} = {425CDAF9-11CA-4C58-B6D4-0CB644481EF9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4DF081FC-DC0D-4317-AB2C-4294B9FE6257} diff --git a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj index 30d7e9a9cad..374360d9afb 100644 --- a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj @@ -65,8 +65,6 @@ System.Formats.Asn1.AsnWriter</PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Numerics" /> diff --git a/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln b/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln index ae5ba066314..9e40b5ba24b 100644 --- a/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln +++ b/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln @@ -9,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{778BE70A-9A4B-47A1-A394-08AE5644465B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D4AA9244-4CC5-4841-8E7A-63EA10E0135E}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{172C0706-C81F-4DDD-A4B8-52B28481FD67}" EndProject @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{46BA9FAE-920 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B9017269-3067-4CD3-B1E7-2EA25BCE9F79}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F186B21D-7138-458B-AEB8-1C1B9711D005}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,14 +47,14 @@ 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 - {1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4}.Release|Any CPU.Build.0 = Release|Any CPU - {D4AA9244-4CC5-4841-8E7A-63EA10E0135E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4AA9244-4CC5-4841-8E7A-63EA10E0135E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4AA9244-4CC5-4841-8E7A-63EA10E0135E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4AA9244-4CC5-4841-8E7A-63EA10E0135E}.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 + {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 + {B054CCD9-E0FD-4F93-B8BC-DD1631B99F69}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -62,9 +64,9 @@ Global {EBE45DA7-3D32-4F35-AB59-1A97FE0C2C7E} = {172C0706-C81F-4DDD-A4B8-52B28481FD67} {29879823-0A6F-44A0-B0A5-D90DEC23E4EF} = {172C0706-C81F-4DDD-A4B8-52B28481FD67} {259A1DB6-EF7E-4D45-96EF-035E0605BB55} = {46BA9FAE-9204-455A-BB2D-518E5B5C3E4C} - {1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4} = {46BA9FAE-9204-455A-BB2D-518E5B5C3E4C} {8D8A522D-D363-4594-81BF-0EB16C0B4713} = {B9017269-3067-4CD3-B1E7-2EA25BCE9F79} - {D4AA9244-4CC5-4841-8E7A-63EA10E0135E} = {B9017269-3067-4CD3-B1E7-2EA25BCE9F79} + {778BE70A-9A4B-47A1-A394-08AE5644465B} = {F186B21D-7138-458B-AEB8-1C1B9711D005} + {B054CCD9-E0FD-4F93-B8BC-DD1631B99F69} = {F186B21D-7138-458B-AEB8-1C1B9711D005} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5D247ED0-3E73-46A6-ACC7-523BA1493370} diff --git a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln index 2f08e763ec6..597977c4cfc 100644 --- a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln +++ b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln @@ -13,10 +13,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7AE40769-89B3-4881-96F4-0EC78CD5610E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{27524A99-0D20-463E-B11E-95BFB6BD59CD}" 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}" @@ -27,6 +23,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CDAC58B3 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4449A37B-FFED-470F-9F39-24611CB72D10}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{749527EE-F2D9-4169-A75A-B00BA30651A1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -166,42 +164,6 @@ 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 - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|x64.ActiveCfg = Debug|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|x64.Build.0 = Debug|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|x86.ActiveCfg = Debug|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|x86.Build.0 = Debug|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|Any CPU.Build.0 = Release|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|x64.ActiveCfg = Release|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|x64.Build.0 = Release|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|x86.ActiveCfg = Release|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|x86.Build.0 = Release|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Checked|Any CPU.Build.0 = Debug|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Checked|x64.ActiveCfg = Debug|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Checked|x64.Build.0 = Debug|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Checked|x86.ActiveCfg = Debug|Any CPU - {7AE40769-89B3-4881-96F4-0EC78CD5610E}.Checked|x86.Build.0 = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|x64.ActiveCfg = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|x64.Build.0 = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|x86.ActiveCfg = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|x86.Build.0 = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|Any CPU.Build.0 = Release|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|x64.ActiveCfg = Release|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|x64.Build.0 = Release|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|x86.ActiveCfg = Release|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|x86.Build.0 = Release|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Checked|Any CPU.Build.0 = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Checked|x64.ActiveCfg = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Checked|x64.Build.0 = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Checked|x86.ActiveCfg = Debug|Any CPU - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.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 @@ -245,15 +207,13 @@ Global GlobalSection(NestedProjects) = preSolution {E70B35E3-B6C3-4196-9FAB-1A0D45748E79} = {37875A74-8496-4B3B-828D-C397F5379B65} {705D0D71-8890-4893-824F-E302CDE5349F} = {37875A74-8496-4B3B-828D-C397F5379B65} - {617B4727-AA14-4840-8898-1947D7C6E437} = {37875A74-8496-4B3B-828D-C397F5379B65} - {DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4} = {37875A74-8496-4B3B-828D-C397F5379B65} - {27524A99-0D20-463E-B11E-95BFB6BD59CD} = {37875A74-8496-4B3B-828D-C397F5379B65} - {6AADBEF6-644B-4174-9AB4-EB6023E2404B} = {37875A74-8496-4B3B-828D-C397F5379B65} {32F01C47-D495-45CE-9567-E4C434F7D627} = {CDAC58B3-78D7-482F-B3EF-798DFAF7A1A4} {CD1CDCDD-64FA-4E75-A74F-16A978C56449} = {CDAC58B3-78D7-482F-B3EF-798DFAF7A1A4} {BFEF5B19-7D03-42BA-9CD1-D1B53F35D706} = {CDAC58B3-78D7-482F-B3EF-798DFAF7A1A4} {6553EF4A-C352-4034-835A-7679E589B5A6} = {4449A37B-FFED-470F-9F39-24611CB72D10} - {7AE40769-89B3-4881-96F4-0EC78CD5610E} = {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} + {6AADBEF6-644B-4174-9AB4-EB6023E2404B} = {749527EE-F2D9-4169-A75A-B00BA30651A1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {73A91A21-729E-4C60-BCD4-389B47ED823F} diff --git a/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln b/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln index deb6adef196..fa598ad6a0b 100644 --- a/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln +++ b/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln @@ -9,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{91D7C95D-53FD-400E-A2C3-2F47D6653A81}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2148E049-FDC9-4C8F-83B5-2FE2FD15B249}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6591A0B4-8C78-4508-996F-1EFF7F1E1323}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{67629EF1-20BE-495B-A130-2A8D2E4DE84C}" EndProject @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{05839DE3-A6D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7EE611F4-CA1C-4CCA-AE26-23F11F5A60AC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{87335DA1-4287-4642-BC7B-EEA4A4833407}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,14 +47,14 @@ 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 - {91D7C95D-53FD-400E-A2C3-2F47D6653A81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91D7C95D-53FD-400E-A2C3-2F47D6653A81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91D7C95D-53FD-400E-A2C3-2F47D6653A81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91D7C95D-53FD-400E-A2C3-2F47D6653A81}.Release|Any CPU.Build.0 = Release|Any CPU - {6591A0B4-8C78-4508-996F-1EFF7F1E1323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6591A0B4-8C78-4508-996F-1EFF7F1E1323}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6591A0B4-8C78-4508-996F-1EFF7F1E1323}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6591A0B4-8C78-4508-996F-1EFF7F1E1323}.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 + {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 + {C1DCC3F5-7615-4BC0-9F1E-10296CEAABAB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -62,9 +64,9 @@ Global {F95ACAD3-920D-404A-A355-38ACAEC958F8} = {67629EF1-20BE-495B-A130-2A8D2E4DE84C} {E2C4269C-0009-4811-9FC0-CDC97554FBEE} = {67629EF1-20BE-495B-A130-2A8D2E4DE84C} {03BF7E49-E28C-468E-8D90-E4022B608F00} = {05839DE3-A6DC-458D-908B-E227C8F90CCF} - {91D7C95D-53FD-400E-A2C3-2F47D6653A81} = {05839DE3-A6DC-458D-908B-E227C8F90CCF} {DCD0404E-234C-437B-A80A-EAFD567F7602} = {7EE611F4-CA1C-4CCA-AE26-23F11F5A60AC} - {6591A0B4-8C78-4508-996F-1EFF7F1E1323} = {7EE611F4-CA1C-4CCA-AE26-23F11F5A60AC} + {2148E049-FDC9-4C8F-83B5-2FE2FD15B249} = {87335DA1-4287-4642-BC7B-EEA4A4833407} + {C1DCC3F5-7615-4BC0-9F1E-10296CEAABAB} = {87335DA1-4287-4642-BC7B-EEA4A4833407} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {95832D00-16CE-46D5-8C6F-639E535B720A} diff --git a/src/libraries/System.Globalization/System.Globalization.sln b/src/libraries/System.Globalization/System.Globalization.sln index 3c692ba6302..53975996e97 100644 --- a/src/libraries/System.Globalization/System.Globalization.sln +++ b/src/libraries/System.Globalization/System.Globalization.sln @@ -17,10 +17,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{BF058293-0E5D-412C-A0B0-E55AF943278E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F17D674C-0B0A-47FB-8B81-5B8664564E23}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{0C4322F3-548D-4B72-91D1-A0CBEAB240A5}" 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}" @@ -31,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C223E72F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0378EF1C-9838-4AD0-867D-506FB02F8BBB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -206,42 +204,6 @@ 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 - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|x64.ActiveCfg = Debug|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|x64.Build.0 = Debug|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|x86.ActiveCfg = Debug|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|x86.Build.0 = Debug|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|Any CPU.Build.0 = Release|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|x64.ActiveCfg = Release|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|x64.Build.0 = Release|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|x86.ActiveCfg = Release|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|x86.Build.0 = Release|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Checked|Any CPU.Build.0 = Debug|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Checked|x64.ActiveCfg = Debug|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Checked|x64.Build.0 = Debug|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Checked|x86.ActiveCfg = Debug|Any CPU - {BF058293-0E5D-412C-A0B0-E55AF943278E}.Checked|x86.Build.0 = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|x64.ActiveCfg = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|x64.Build.0 = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|x86.ActiveCfg = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|x86.Build.0 = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|Any CPU.Build.0 = Release|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|x64.ActiveCfg = Release|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|x64.Build.0 = Release|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|x86.ActiveCfg = Release|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|x86.Build.0 = Release|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Checked|Any CPU.Build.0 = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Checked|x64.ActiveCfg = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Checked|x64.Build.0 = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.Checked|x86.ActiveCfg = Debug|Any CPU - {F17D674C-0B0A-47FB-8B81-5B8664564E23}.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 @@ -285,17 +247,15 @@ Global GlobalSection(NestedProjects) = preSolution {E269F8BB-F629-4C96-B9B2-03A00D8B1BFB} = {4B81A206-3C49-4224-A031-42583071751B} {4ABAB509-1210-43B4-B274-76B4FE02BD9B} = {4B81A206-3C49-4224-A031-42583071751B} - {74CAB3C9-1AE1-467E-B139-35E7113F4660} = {4B81A206-3C49-4224-A031-42583071751B} - {F17D674C-0B0A-47FB-8B81-5B8664564E23} = {4B81A206-3C49-4224-A031-42583071751B} - {0C4322F3-548D-4B72-91D1-A0CBEAB240A5} = {4B81A206-3C49-4224-A031-42583071751B} - {F4A35959-8F1B-4CA9-B672-3ACFBDD54174} = {4B81A206-3C49-4224-A031-42583071751B} {79613DED-481D-44EF-BB89-7AC6BD53026B} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} {40231BCB-E151-45E0-A1C4-4D559A434362} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} {DD7E56B4-65B7-4822-A4E1-ECDD51524927} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} {9B797657-6BBC-4240-9903-3FCE3E1FC713} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} {A66D589C-6FEE-41EE-A7D9-C5306BF5AE47} = {C223E72F-FD21-43C3-AC7A-62BCF4A5C379} {55249BC9-201A-4418-AF14-7AC743D9A867} = {A93AFF96-DB24-4FF5-ABAE-9EC08504D5FA} - {BF058293-0E5D-412C-A0B0-E55AF943278E} = {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} + {F4A35959-8F1B-4CA9-B672-3ACFBDD54174} = {0378EF1C-9838-4AD0-867D-506FB02F8BBB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {33E0B3D0-C6E1-4B75-A025-AE012AD424F7} 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 c0e727c01a0..c6369e0f0e2 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,10 +9,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A50E06CB-B581-46AB-B91F-4AAAA62A9F8C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E6692761-D4BE-4528-A1FE-609D6A86F014}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1BC1DCD5-DEC EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D7FE73BB-2F95-42D3-9392-FBAD87A73436}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4F867226-2107-455D-B378-2FC08BD3F064}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,14 +47,6 @@ 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 - {A50E06CB-B581-46AB-B91F-4AAAA62A9F8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A50E06CB-B581-46AB-B91F-4AAAA62A9F8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A50E06CB-B581-46AB-B91F-4AAAA62A9F8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A50E06CB-B581-46AB-B91F-4AAAA62A9F8C}.Release|Any CPU.Build.0 = Release|Any CPU - {8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1}.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 @@ -74,11 +64,9 @@ Global {5C5E6836-8622-4C60-921C-F7B7286CD894} = {864B86AD-4BC9-4997-8370-EC8B2055FE08} {E62974EA-7E36-4183-8371-4C8EA02037B5} = {864B86AD-4BC9-4997-8370-EC8B2055FE08} {7EC62394-2290-4075-AF5D-842C7A0F6325} = {1BC1DCD5-DECC-4712-8539-56E6D71A17FF} - {A50E06CB-B581-46AB-B91F-4AAAA62A9F8C} = {1BC1DCD5-DECC-4712-8539-56E6D71A17FF} {C2A30FF0-54C2-461B-BF16-5DC610F54B52} = {D7FE73BB-2F95-42D3-9392-FBAD87A73436} - {8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1} = {D7FE73BB-2F95-42D3-9392-FBAD87A73436} - {E6692761-D4BE-4528-A1FE-609D6A86F014} = {D7FE73BB-2F95-42D3-9392-FBAD87A73436} - {2AA8D3E7-D2E4-49E8-AE94-461CE261B1BF} = {D7FE73BB-2F95-42D3-9392-FBAD87A73436} + {E6692761-D4BE-4528-A1FE-609D6A86F014} = {4F867226-2107-455D-B378-2FC08BD3F064} + {2AA8D3E7-D2E4-49E8-AE94-461CE261B1BF} = {4F867226-2107-455D-B378-2FC08BD3F064} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {42B626C7-CDFD-459B-86D8-239917F86516} 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 538b92df1e8..9a1e321e3d7 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,10 +7,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9D260F5B-F8EC-41D2-8A30-60D6ADF0910A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DBD14497-E65E-45FC-99BA-DFE6641135BE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E7CAD543-D5BB-486F-85A4-9F914F973653}" 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}" @@ -21,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A8BAE96C-3EA EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5C592E59-B3F3-4743-BC80-F5C799B16B74}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{82C30050-0689-4C48-AA32-E7137F0417DC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,14 +41,6 @@ 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 - {9D260F5B-F8EC-41D2-8A30-60D6ADF0910A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D260F5B-F8EC-41D2-8A30-60D6ADF0910A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D260F5B-F8EC-41D2-8A30-60D6ADF0910A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D260F5B-F8EC-41D2-8A30-60D6ADF0910A}.Release|Any CPU.Build.0 = Release|Any CPU - {DBD14497-E65E-45FC-99BA-DFE6641135BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBD14497-E65E-45FC-99BA-DFE6641135BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBD14497-E65E-45FC-99BA-DFE6641135BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBD14497-E65E-45FC-99BA-DFE6641135BE}.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 @@ -67,11 +57,9 @@ Global {0869556F-E34F-4284-B985-CB6D3B6AD954} = {A46DB030-84B9-49C0-8F75-98FE1290EF88} {D5A89FC9-7913-4F80-BA16-6587EB6140E3} = {A46DB030-84B9-49C0-8F75-98FE1290EF88} {E91931AD-977E-4608-9F40-997163322D8B} = {A8BAE96C-3EAD-4E68-BBB0-A4854F386CC4} - {9D260F5B-F8EC-41D2-8A30-60D6ADF0910A} = {A8BAE96C-3EAD-4E68-BBB0-A4854F386CC4} {A3C36A2F-2586-43DF-B39C-A9D14DF8524E} = {5C592E59-B3F3-4743-BC80-F5C799B16B74} - {DBD14497-E65E-45FC-99BA-DFE6641135BE} = {5C592E59-B3F3-4743-BC80-F5C799B16B74} - {E7CAD543-D5BB-486F-85A4-9F914F973653} = {5C592E59-B3F3-4743-BC80-F5C799B16B74} - {5DC533A5-D0F0-488B-81C2-7AD7546528DD} = {5C592E59-B3F3-4743-BC80-F5C799B16B74} + {E7CAD543-D5BB-486F-85A4-9F914F973653} = {82C30050-0689-4C48-AA32-E7137F0417DC} + {5DC533A5-D0F0-488B-81C2-7AD7546528DD} = {82C30050-0689-4C48-AA32-E7137F0417DC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D2E26432-A647-4E61-9A30-DE6C62BBD632} diff --git a/src/libraries/System.IO.Compression/System.IO.Compression.sln b/src/libraries/System.IO.Compression/System.IO.Compression.sln index 35cd6057cdc..38886704351 100644 --- a/src/libraries/System.IO.Compression/System.IO.Compression.sln +++ b/src/libraries/System.IO.Compression/System.IO.Compression.sln @@ -9,10 +9,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{65C7FDC3-D18B-4888-88C1-EA22B9247831}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{168BB11E-EB88-4C0E-9CF6-46282DEB2EEE}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{350F6B1E-B00 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8541C42E-9FC4-4077-B828-720BD028F1F5}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BA616F42-6B1E-4333-9698-C39EA13AEEA2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,14 +47,6 @@ 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 - {BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7}.Release|Any CPU.Build.0 = Release|Any CPU - {65C7FDC3-D18B-4888-88C1-EA22B9247831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65C7FDC3-D18B-4888-88C1-EA22B9247831}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65C7FDC3-D18B-4888-88C1-EA22B9247831}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65C7FDC3-D18B-4888-88C1-EA22B9247831}.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 @@ -74,11 +64,9 @@ Global {6F1E1397-7610-4E99-BA7E-895ABC8E5ACB} = {BB657E6F-1D06-4E7A-B4C2-B40A071A2A44} {DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A} = {BB657E6F-1D06-4E7A-B4C2-B40A071A2A44} {9BFD204A-0DB1-466A-9704-0E869AC8940F} = {350F6B1E-B006-4EA5-BA9E-41F57FF84FF1} - {BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7} = {350F6B1E-B006-4EA5-BA9E-41F57FF84FF1} {ED776381-E13D-4A0B-ACB4-74C5A784BD25} = {8541C42E-9FC4-4077-B828-720BD028F1F5} - {65C7FDC3-D18B-4888-88C1-EA22B9247831} = {8541C42E-9FC4-4077-B828-720BD028F1F5} - {168BB11E-EB88-4C0E-9CF6-46282DEB2EEE} = {8541C42E-9FC4-4077-B828-720BD028F1F5} - {9A07A277-2896-48FC-8A20-5E290069B07D} = {8541C42E-9FC4-4077-B828-720BD028F1F5} + {168BB11E-EB88-4C0E-9CF6-46282DEB2EEE} = {BA616F42-6B1E-4333-9698-C39EA13AEEA2} + {9A07A277-2896-48FC-8A20-5E290069B07D} = {BA616F42-6B1E-4333-9698-C39EA13AEEA2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0F6F5B24-5CE5-45F2-9169-FEBEF2A3FE80} 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 458821546c6..0c9f46f3614 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,22 +19,14 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3709D2F4-5495-447A-81D1-D022B5A22DF9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{01009C12-AB2E-4A6C-A40F-760409351DD3}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{37F8ED93-FD45-4941-B83E-84D278B8EA83}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{F33F1171-273A-4BC3-B138-25E5E7118186}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}" @@ -45,6 +37,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{27A6AAE3-D2A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{7227D008-BBBE-48D0-979B-9BC483BA7E60}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -91,14 +85,6 @@ 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 - {3709D2F4-5495-447A-81D1-D022B5A22DF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3709D2F4-5495-447A-81D1-D022B5A22DF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3709D2F4-5495-447A-81D1-D022B5A22DF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3709D2F4-5495-447A-81D1-D022B5A22DF9}.Release|Any CPU.Build.0 = Release|Any CPU - {0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E}.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 @@ -107,10 +93,6 @@ Global {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 {E939A1C0-31C6-4EA6-9020-ADDE06272528}.Release|Any CPU.Build.0 = Release|Any CPU - {62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9}.Release|Any CPU.Build.0 = Release|Any CPU {37F8ED93-FD45-4941-B83E-84D278B8EA83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {37F8ED93-FD45-4941-B83E-84D278B8EA83}.Debug|Any CPU.Build.0 = Debug|Any CPU {37F8ED93-FD45-4941-B83E-84D278B8EA83}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -119,10 +101,6 @@ Global {87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Debug|Any CPU.Build.0 = Debug|Any CPU {87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Release|Any CPU.ActiveCfg = Release|Any CPU {87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Release|Any CPU.Build.0 = Release|Any CPU - {4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA}.Release|Any CPU.Build.0 = Release|Any CPU {F33F1171-273A-4BC3-B138-25E5E7118186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F33F1171-273A-4BC3-B138-25E5E7118186}.Debug|Any CPU.Build.0 = Debug|Any CPU {F33F1171-273A-4BC3-B138-25E5E7118186}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -142,20 +120,16 @@ Global {071FC282-9840-4920-B0FD-BE778449B5FF} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094} {C0B560B2-72A0-41B2-82D5-34EF31719AD7} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094} {D7E6A261-C80A-4E51-BCDD-85DD595866B9} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094} - {3709D2F4-5495-447A-81D1-D022B5A22DF9} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094} {37F8ED93-FD45-4941-B83E-84D278B8EA83} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094} {F33F1171-273A-4BC3-B138-25E5E7118186} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094} {F8881C57-30D9-4752-A622-6B3E771FDA49} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} {4EF591E4-175E-494D-8191-15C2D6C6E2E6} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} {B6ECCC94-3F5C-42A0-AB46-4FDF1981C96C} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} {35D57A83-8A9D-4531-BF0D-EA1BCA62D475} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} - {0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} - {01009C12-AB2E-4A6C-A40F-760409351DD3} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} - {E939A1C0-31C6-4EA6-9020-ADDE06272528} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} - {62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} {87E03C4D-FFE2-43AD-9CFE-BB67A2448186} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} - {4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA} = {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} + {E939A1C0-31C6-4EA6-9020-ADDE06272528} = {7227D008-BBBE-48D0-979B-9BC483BA7E60} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {246C2EDA-448E-4E76-B97A-BD93DC6883A7} 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 9bea72b7131..d6622991df3 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,10 +7,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A0FB000A-C607-4CBB-9223-A5FCA85DF23F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{355B2E23-3EA6-4C16-A153-3E9574220F6E}" 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}" @@ -21,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4626E870-1F7 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F20F7286-4DFA-42EE-947B-8ABC6B7E088F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{9BFF66A7-7077-4C69-BAB7-5FE6E2D9DBBC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,14 +41,6 @@ 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 - {A0FB000A-C607-4CBB-9223-A5FCA85DF23F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0FB000A-C607-4CBB-9223-A5FCA85DF23F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0FB000A-C607-4CBB-9223-A5FCA85DF23F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0FB000A-C607-4CBB-9223-A5FCA85DF23F}.Release|Any CPU.Build.0 = Release|Any CPU - {0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8}.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 @@ -67,11 +57,9 @@ Global {414D74F9-9783-4B1D-9F14-4B2F873D16F3} = {F74D982D-DFE5-48DA-87C0-245FC612F118} {F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41} = {F74D982D-DFE5-48DA-87C0-245FC612F118} {8AF52F6B-61C2-4D23-A69C-6FCF8D138C58} = {4626E870-1F74-4ED4-AF80-DDDD42DEF47E} - {A0FB000A-C607-4CBB-9223-A5FCA85DF23F} = {4626E870-1F74-4ED4-AF80-DDDD42DEF47E} {03A51C60-B41B-409B-97AA-4084042C78D7} = {F20F7286-4DFA-42EE-947B-8ABC6B7E088F} - {0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8} = {F20F7286-4DFA-42EE-947B-8ABC6B7E088F} - {355B2E23-3EA6-4C16-A153-3E9574220F6E} = {F20F7286-4DFA-42EE-947B-8ABC6B7E088F} - {B9E98144-5561-4CED-BC68-93021B390983} = {F20F7286-4DFA-42EE-947B-8ABC6B7E088F} + {355B2E23-3EA6-4C16-A153-3E9574220F6E} = {9BFF66A7-7077-4C69-BAB7-5FE6E2D9DBBC} + {B9E98144-5561-4CED-BC68-93021B390983} = {9BFF66A7-7077-4C69-BAB7-5FE6E2D9DBBC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AF704C7D-836B-41D4-919E-B0874D934A08} 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 a4b55825914..dd6298e3eb6 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,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3359691A-F781-449B-9DAA-5D45122859BB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BB213103-780E-4711-B8E8-4E85FB6DC047}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5AB142C5-28CB-4FF1-BDCA-602486B9E87C}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DB4B0A5D-51E4-44C4-9E0F-9E60ED3D5F7D}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A1C36837-2EE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D7A47DEE-DC4F-4BC0-9A9D-A7E14230B340}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BD73949B-3201-4737-8469-0E599744668C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {3359691A-F781-449B-9DAA-5D45122859BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3359691A-F781-449B-9DAA-5D45122859BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3359691A-F781-449B-9DAA-5D45122859BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3359691A-F781-449B-9DAA-5D45122859BB}.Release|Any CPU.Build.0 = Release|Any CPU - {5AB142C5-28CB-4FF1-BDCA-602486B9E87C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5AB142C5-28CB-4FF1-BDCA-602486B9E87C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5AB142C5-28CB-4FF1-BDCA-602486B9E87C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5AB142C5-28CB-4FF1-BDCA-602486B9E87C}.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 + {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 + {7B9309E5-1B27-4951-8F82-9E5DFC97BA72}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {0DF82830-45C1-453B-9436-C5A8FECE7110} = {DB4B0A5D-51E4-44C4-9E0F-9E60ED3D5F7D} {AA882A52-10CB-4272-BF22-A7964627E266} = {DB4B0A5D-51E4-44C4-9E0F-9E60ED3D5F7D} {08B0A52E-C11E-4F88-957E-561E8E3621EE} = {A1C36837-2EE8-40FF-A6B1-96D09D3F2EA8} - {3359691A-F781-449B-9DAA-5D45122859BB} = {A1C36837-2EE8-40FF-A6B1-96D09D3F2EA8} {F0212CB8-23E6-4D89-A90E-C6F820778F53} = {D7A47DEE-DC4F-4BC0-9A9D-A7E14230B340} - {5AB142C5-28CB-4FF1-BDCA-602486B9E87C} = {D7A47DEE-DC4F-4BC0-9A9D-A7E14230B340} + {BB213103-780E-4711-B8E8-4E85FB6DC047} = {BD73949B-3201-4737-8469-0E599744668C} + {7B9309E5-1B27-4951-8F82-9E5DFC97BA72} = {BD73949B-3201-4737-8469-0E599744668C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7C05E00F-F058-4C38-8E8B-3B00E8829E82} 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 8d3935a44bc..1d1ea38b424 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,10 +7,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1D98691D-E3BD-483A-B449-F8F875A0BC0B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BB57F4F3-0519-4846-8CEC-04D2D2CFE144}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{CC9141D5-87FD-4716-9333-66286EA725ED}" 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}" @@ -21,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FB3E732D-C87 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BCDF2178-959A-48C9-B26D-18E62C80199C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1C8EC715-29EB-40DF-A78F-35636153B267}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,14 +41,6 @@ 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 - {1D98691D-E3BD-483A-B449-F8F875A0BC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D98691D-E3BD-483A-B449-F8F875A0BC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D98691D-E3BD-483A-B449-F8F875A0BC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D98691D-E3BD-483A-B449-F8F875A0BC0B}.Release|Any CPU.Build.0 = Release|Any CPU - {BB57F4F3-0519-4846-8CEC-04D2D2CFE144}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB57F4F3-0519-4846-8CEC-04D2D2CFE144}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB57F4F3-0519-4846-8CEC-04D2D2CFE144}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB57F4F3-0519-4846-8CEC-04D2D2CFE144}.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 @@ -67,11 +57,9 @@ Global {3306C0C4-8CD3-4952-9DBC-E8A8FDECA446} = {A4E6A754-5006-4E2F-BC57-0A96E3A82A4D} {8928F2EE-437E-4AB8-9038-077179F37939} = {A4E6A754-5006-4E2F-BC57-0A96E3A82A4D} {318B6BCF-3AB6-40A7-B16A-E40EA4F3B202} = {FB3E732D-C87B-41E9-ADC2-C2D84B87D04F} - {1D98691D-E3BD-483A-B449-F8F875A0BC0B} = {FB3E732D-C87B-41E9-ADC2-C2D84B87D04F} {310BA7DB-1A9E-46E1-B414-606474FFFFFA} = {BCDF2178-959A-48C9-B26D-18E62C80199C} - {BB57F4F3-0519-4846-8CEC-04D2D2CFE144} = {BCDF2178-959A-48C9-B26D-18E62C80199C} - {CC9141D5-87FD-4716-9333-66286EA725ED} = {BCDF2178-959A-48C9-B26D-18E62C80199C} - {DB80E810-8B37-4116-9835-889E16FEC389} = {BCDF2178-959A-48C9-B26D-18E62C80199C} + {CC9141D5-87FD-4716-9333-66286EA725ED} = {1C8EC715-29EB-40DF-A78F-35636153B267} + {DB80E810-8B37-4116-9835-889E16FEC389} = {1C8EC715-29EB-40DF-A78F-35636153B267} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C3D76AA3-27C1-48BF-9474-42E0495BA814} diff --git a/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln b/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln index fdc6ab902db..38cd8f1ef5d 100644 --- a/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln +++ b/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln @@ -23,20 +23,12 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{79A74577-C550-4264-B352-51D304796B89}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D7DF8034-3AE5-4DEF-BCC4-6353239391BF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{555BFFEE-9189-41EC-AE9C-1D11449963D6}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{5E9D796C-426C-47E0-AA28-6CAE530855B7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{E004B4E4-0D54-4CAA-89C5-FCDB72C99846}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{2069A1E6-5A4A-43F2-ACDE-050B3DBB0A7D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController", "..\System.ServiceProcess.ServiceController\ref\System.ServiceProcess.ServiceController.csproj", "{08728EC4-7610-48A5-A697-E54166E5C33D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController", "..\System.ServiceProcess.ServiceController\src\System.ServiceProcess.ServiceController.csproj", "{3E06E543-2562-4AFB-B04F-520485B876A8}" @@ -49,6 +41,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E672ECE4-806 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A0499117-998E-494E-943B-86F428E5C59F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0C49C624-3156-4A0C-A383-3F82EE65C478}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -103,14 +97,6 @@ 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 - {79A74577-C550-4264-B352-51D304796B89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79A74577-C550-4264-B352-51D304796B89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79A74577-C550-4264-B352-51D304796B89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79A74577-C550-4264-B352-51D304796B89}.Release|Any CPU.Build.0 = Release|Any CPU - {D7DF8034-3AE5-4DEF-BCC4-6353239391BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7DF8034-3AE5-4DEF-BCC4-6353239391BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7DF8034-3AE5-4DEF-BCC4-6353239391BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7DF8034-3AE5-4DEF-BCC4-6353239391BF}.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 @@ -119,18 +105,10 @@ Global {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 {DFC5F78F-6A33-4AB5-BC18-F8BAD14C9CBB}.Release|Any CPU.Build.0 = Release|Any CPU - {5E9D796C-426C-47E0-AA28-6CAE530855B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E9D796C-426C-47E0-AA28-6CAE530855B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E9D796C-426C-47E0-AA28-6CAE530855B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E9D796C-426C-47E0-AA28-6CAE530855B7}.Release|Any CPU.Build.0 = Release|Any CPU {E004B4E4-0D54-4CAA-89C5-FCDB72C99846}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E004B4E4-0D54-4CAA-89C5-FCDB72C99846}.Debug|Any CPU.Build.0 = Debug|Any CPU {E004B4E4-0D54-4CAA-89C5-FCDB72C99846}.Release|Any CPU.ActiveCfg = Release|Any CPU {E004B4E4-0D54-4CAA-89C5-FCDB72C99846}.Release|Any CPU.Build.0 = Release|Any CPU - {2069A1E6-5A4A-43F2-ACDE-050B3DBB0A7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2069A1E6-5A4A-43F2-ACDE-050B3DBB0A7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2069A1E6-5A4A-43F2-ACDE-050B3DBB0A7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2069A1E6-5A4A-43F2-ACDE-050B3DBB0A7D}.Release|Any CPU.Build.0 = Release|Any CPU {08728EC4-7610-48A5-A697-E54166E5C33D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {08728EC4-7610-48A5-A697-E54166E5C33D}.Debug|Any CPU.Build.0 = Debug|Any CPU {08728EC4-7610-48A5-A697-E54166E5C33D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -156,7 +134,6 @@ Global {0DE98454-FC7C-4E4C-899A-F7255D467256} = {E672ECE4-806B-484B-B9FD-28B3E60DA84E} {6C7AB8A3-268D-45DB-B8A9-60832EA279B1} = {E672ECE4-806B-484B-B9FD-28B3E60DA84E} {E4865620-8109-42F9-B1FE-B38C6CA1A3A0} = {E672ECE4-806B-484B-B9FD-28B3E60DA84E} - {79A74577-C550-4264-B352-51D304796B89} = {E672ECE4-806B-484B-B9FD-28B3E60DA84E} {E004B4E4-0D54-4CAA-89C5-FCDB72C99846} = {E672ECE4-806B-484B-B9FD-28B3E60DA84E} {08728EC4-7610-48A5-A697-E54166E5C33D} = {E672ECE4-806B-484B-B9FD-28B3E60DA84E} {980BC531-7A72-4FEF-9C16-42B3745F72EB} = {E672ECE4-806B-484B-B9FD-28B3E60DA84E} @@ -164,12 +141,9 @@ Global {38559108-0340-4937-B1BA-8302464FF944} = {A0499117-998E-494E-943B-86F428E5C59F} {8A502375-D99B-4C43-92C9-F5DFB336AF38} = {A0499117-998E-494E-943B-86F428E5C59F} {877E39A8-51CB-463A-AF4C-6FAE4F438075} = {A0499117-998E-494E-943B-86F428E5C59F} - {D7DF8034-3AE5-4DEF-BCC4-6353239391BF} = {A0499117-998E-494E-943B-86F428E5C59F} - {555BFFEE-9189-41EC-AE9C-1D11449963D6} = {A0499117-998E-494E-943B-86F428E5C59F} - {DFC5F78F-6A33-4AB5-BC18-F8BAD14C9CBB} = {A0499117-998E-494E-943B-86F428E5C59F} - {5E9D796C-426C-47E0-AA28-6CAE530855B7} = {A0499117-998E-494E-943B-86F428E5C59F} - {2069A1E6-5A4A-43F2-ACDE-050B3DBB0A7D} = {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} + {DFC5F78F-6A33-4AB5-BC18-F8BAD14C9CBB} = {0C49C624-3156-4A0C-A383-3F82EE65C478} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {320D63B0-B2D5-467B-92EC-1E2240B90263} diff --git a/src/libraries/System.IO.Hashing/System.IO.Hashing.sln b/src/libraries/System.IO.Hashing/System.IO.Hashing.sln index cc4dabe7d92..35788cf682a 100644 --- a/src/libraries/System.IO.Hashing/System.IO.Hashing.sln +++ b/src/libraries/System.IO.Hashing/System.IO.Hashing.sln @@ -5,15 +5,15 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E937AD61-2A4B-4AD0-B9B2-D39213EE8FD1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E5280823-9A9A-4314-B0C3-B983A7D50C85}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1E78399D-326B-4C9F-B8A9-A7E684EEA349}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F2826BE8-9FA1-40C8-8FD4-E98A4644733E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FFC168BF-A2B4-4CB5-9405-66881B168C04}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{26D7BA38-5978-4423-814C-0C8D9F38C1A3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -33,14 +33,14 @@ 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 - {696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Release|Any CPU.Build.0 = Release|Any CPU - {E5280823-9A9A-4314-B0C3-B983A7D50C85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5280823-9A9A-4314-B0C3-B983A7D50C85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5280823-9A9A-4314-B0C3-B983A7D50C85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5280823-9A9A-4314-B0C3-B983A7D50C85}.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 + {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 + {A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -49,8 +49,8 @@ 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} - {E5280823-9A9A-4314-B0C3-B983A7D50C85} = {F2826BE8-9FA1-40C8-8FD4-E98A4644733E} - {696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9} = {FFC168BF-A2B4-4CB5-9405-66881B168C04} + {E937AD61-2A4B-4AD0-B9B2-D39213EE8FD1} = {26D7BA38-5978-4423-814C-0C8D9F38C1A3} + {A60C1BBE-8CD7-4B6A-AD3C-FF1209857C39} = {26D7BA38-5978-4423-814C-0C8D9F38C1A3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4DF081FC-DC0D-4317-AB2C-4294B9FE6257} diff --git a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln index a8e66c36e11..649a6741240 100644 --- a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln +++ b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln @@ -13,30 +13,20 @@ 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", "{99CB0FEA-8262-4BCA-8173-A6FF30EEDFEE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{CFEAF957-2926-44F8-8F50-A362BF4A38C7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.IsolatedStorage", "ref\System.IO.IsolatedStorage.csproj", "{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.IsolatedStorage", "src\System.IO.IsolatedStorage.csproj", "{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}" 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{580DE958-E1CD-4DF9-B225-671E5447DD09}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{0659E404-2029-41BA-8201-3C82FD5D7195}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{9A77FB40-0BE3-4A7B-B147-374D186226DB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{94E1FBF3-D07E-42CC-BDE9-195068C29632}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{2C9EFD7A-F153-47BF-B2E6-73094696DF45}" @@ -47,6 +37,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CBCF137A-F5A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D4881A9A-F082-40A1-ABC4-DE232ABB22BA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{3424E375-E1DA-46BA-91D2-E1EA86BAF98F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -81,10 +73,6 @@ Global {99CB0FEA-8262-4BCA-8173-A6FF30EEDFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU {99CB0FEA-8262-4BCA-8173-A6FF30EEDFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU {99CB0FEA-8262-4BCA-8173-A6FF30EEDFEE}.Release|Any CPU.Build.0 = Release|Any CPU - {CFEAF957-2926-44F8-8F50-A362BF4A38C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFEAF957-2926-44F8-8F50-A362BF4A38C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFEAF957-2926-44F8-8F50-A362BF4A38C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFEAF957-2926-44F8-8F50-A362BF4A38C7}.Release|Any CPU.Build.0 = Release|Any CPU {CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -97,14 +85,6 @@ 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 - {DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE}.Release|Any CPU.Build.0 = Release|Any CPU - {580DE958-E1CD-4DF9-B225-671E5447DD09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {580DE958-E1CD-4DF9-B225-671E5447DD09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {580DE958-E1CD-4DF9-B225-671E5447DD09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {580DE958-E1CD-4DF9-B225-671E5447DD09}.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 @@ -113,10 +93,6 @@ Global {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 {4DAA9EA7-245F-45D6-8061-010F7AA64752}.Release|Any CPU.Build.0 = Release|Any CPU - {9A77FB40-0BE3-4A7B-B147-374D186226DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A77FB40-0BE3-4A7B-B147-374D186226DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A77FB40-0BE3-4A7B-B147-374D186226DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A77FB40-0BE3-4A7B-B147-374D186226DB}.Release|Any CPU.Build.0 = Release|Any CPU {94E1FBF3-D07E-42CC-BDE9-195068C29632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94E1FBF3-D07E-42CC-BDE9-195068C29632}.Debug|Any CPU.Build.0 = Debug|Any CPU {94E1FBF3-D07E-42CC-BDE9-195068C29632}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -125,10 +101,6 @@ Global {05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU {05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Release|Any CPU.ActiveCfg = Release|Any CPU {05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Release|Any CPU.Build.0 = Release|Any CPU - {78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A}.Release|Any CPU.Build.0 = Release|Any CPU {57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Debug|Any CPU.Build.0 = Debug|Any CPU {57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -148,21 +120,16 @@ Global {CBD0D70E-1470-43BF-BE8D-59756A3A2364} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE} {5F6B682F-9901-475B-8E81-F3B19E0D3DA4} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE} {CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE} - {DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE} {94E1FBF3-D07E-42CC-BDE9-195068C29632} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE} {57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE} {41EB125C-1EE1-494A-9B39-A94838106B71} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} {3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} {99CB0FEA-8262-4BCA-8173-A6FF30EEDFEE} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} - {CFEAF957-2926-44F8-8F50-A362BF4A38C7} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} {D9ACE205-2927-4D66-8E6F-D2C1E6E6239D} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} - {580DE958-E1CD-4DF9-B225-671E5447DD09} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} - {0659E404-2029-41BA-8201-3C82FD5D7195} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} - {4DAA9EA7-245F-45D6-8061-010F7AA64752} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} - {9A77FB40-0BE3-4A7B-B147-374D186226DB} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} {05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} - {78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A} = {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} + {4DAA9EA7-245F-45D6-8061-010F7AA64752} = {3424E375-E1DA-46BA-91D2-E1EA86BAF98F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C61D5D56-FD5E-4BF4-89D0-E7A23AE83333} diff --git a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln index 245b4bc8732..81fabd3d077 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln +++ b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln @@ -9,10 +9,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8B9258B7-1C54-4FFE-9512-2B7323AEF92A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4B990529-DAA4-4AEC-A625-FDCA3EF64E25}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{06826F87-1E78-4F0B-9BC0-63E78F560700}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E91F427C-6CD EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7CDB9185-B436-4B6A-91A2-DD2C30BB49D9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AF9FF36B-5C67-40C3-9BC4-5C8FE09956E2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,14 +47,6 @@ 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 - {8B9258B7-1C54-4FFE-9512-2B7323AEF92A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B9258B7-1C54-4FFE-9512-2B7323AEF92A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B9258B7-1C54-4FFE-9512-2B7323AEF92A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B9258B7-1C54-4FFE-9512-2B7323AEF92A}.Release|Any CPU.Build.0 = Release|Any CPU - {4B990529-DAA4-4AEC-A625-FDCA3EF64E25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B990529-DAA4-4AEC-A625-FDCA3EF64E25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B990529-DAA4-4AEC-A625-FDCA3EF64E25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B990529-DAA4-4AEC-A625-FDCA3EF64E25}.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 @@ -74,11 +64,9 @@ Global {53746669-11C3-4DA9-B9C3-4CA0B79D4712} = {E9193727-72AB-4A35-BABF-A11D7C1A8B04} {AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860} = {E9193727-72AB-4A35-BABF-A11D7C1A8B04} {F4ACA509-281C-43DA-A57D-52D9913321AE} = {E91F427C-6CD7-496B-B4E8-D837CB8B96F8} - {8B9258B7-1C54-4FFE-9512-2B7323AEF92A} = {E91F427C-6CD7-496B-B4E8-D837CB8B96F8} {4A95E6CD-A466-46BC-A6C7-C65DA45B3388} = {7CDB9185-B436-4B6A-91A2-DD2C30BB49D9} - {4B990529-DAA4-4AEC-A625-FDCA3EF64E25} = {7CDB9185-B436-4B6A-91A2-DD2C30BB49D9} - {06826F87-1E78-4F0B-9BC0-63E78F560700} = {7CDB9185-B436-4B6A-91A2-DD2C30BB49D9} - {3D0ED921-30AE-4D7C-BFE7-CC4BD0CE9B40} = {7CDB9185-B436-4B6A-91A2-DD2C30BB49D9} + {06826F87-1E78-4F0B-9BC0-63E78F560700} = {AF9FF36B-5C67-40C3-9BC4-5C8FE09956E2} + {3D0ED921-30AE-4D7C-BFE7-CC4BD0CE9B40} = {AF9FF36B-5C67-40C3-9BC4-5C8FE09956E2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F8DDBB46-7ACE-4C13-91B4-FFB7E93363D9} diff --git a/src/libraries/System.IO.Packaging/System.IO.Packaging.sln b/src/libraries/System.IO.Packaging/System.IO.Packaging.sln index d581e89de73..89cd5abc3bc 100644 --- a/src/libraries/System.IO.Packaging/System.IO.Packaging.sln +++ b/src/libraries/System.IO.Packaging/System.IO.Packaging.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4E44D7F4-80D7-4F8A-9550-54773444F842}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D032DFE9-3CDF-43A6-AE11-367C2B505B19}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{78283948-D5F0-4F76-8B4A-F4D19EC206F6}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CDE13DDC-F9E2-4C5F-9379-26E3273B7270}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A31F533C-5EA EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A767928D-1A4C-4513-9FF6-CB395D45B6A8}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{89942E1D-4F98-4CEF-B275-8A30127462BE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {4E44D7F4-80D7-4F8A-9550-54773444F842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E44D7F4-80D7-4F8A-9550-54773444F842}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E44D7F4-80D7-4F8A-9550-54773444F842}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E44D7F4-80D7-4F8A-9550-54773444F842}.Release|Any CPU.Build.0 = Release|Any CPU - {78283948-D5F0-4F76-8B4A-F4D19EC206F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78283948-D5F0-4F76-8B4A-F4D19EC206F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78283948-D5F0-4F76-8B4A-F4D19EC206F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78283948-D5F0-4F76-8B4A-F4D19EC206F6}.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 + {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 + {5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {AAE436A2-C2F7-4D1F-8DD4-6E8B00A1338F} = {CDE13DDC-F9E2-4C5F-9379-26E3273B7270} {588B83D6-132B-4399-B31E-4B40CD9CCAE6} = {CDE13DDC-F9E2-4C5F-9379-26E3273B7270} {6EF662E4-9A1E-4DAC-A04B-A1461BB6CA28} = {A31F533C-5EA6-4E97-91B1-C298BE0060E0} - {4E44D7F4-80D7-4F8A-9550-54773444F842} = {A31F533C-5EA6-4E97-91B1-C298BE0060E0} {C553FA20-C4C0-48A2-B841-12F2F860E21F} = {A767928D-1A4C-4513-9FF6-CB395D45B6A8} - {78283948-D5F0-4F76-8B4A-F4D19EC206F6} = {A767928D-1A4C-4513-9FF6-CB395D45B6A8} + {D032DFE9-3CDF-43A6-AE11-367C2B505B19} = {89942E1D-4F98-4CEF-B275-8A30127462BE} + {5C4BD3D4-565A-4DB3-9AA7-13C0D52B1EE0} = {89942E1D-4F98-4CEF-B275-8A30127462BE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8F459277-2162-4A3B-BB19-29D4292EFC1F} diff --git a/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln b/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln index ef41efeb5e7..e954a3a7aeb 100644 --- a/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln +++ b/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln @@ -9,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C6EA39FC-B265-4B3E-B5BA-9D0D2C601691}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{8D129F0B-A3D3-4CF7-BE17-E70C954BD6F7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{FFDC73EC-53C9-4B6E-B468-C477039742D8}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6FCDC00D-202F-4BFE-B799-DFD3F2E8F44D}" EndProject @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BC2B926D-141 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0F960DB3-8D87-4D62-BF68-75299FED62F7}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{68B6BB77-1325-4BD7-95B1-67ECA89889E8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,14 +47,14 @@ 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 - {C6EA39FC-B265-4B3E-B5BA-9D0D2C601691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C6EA39FC-B265-4B3E-B5BA-9D0D2C601691}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C6EA39FC-B265-4B3E-B5BA-9D0D2C601691}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C6EA39FC-B265-4B3E-B5BA-9D0D2C601691}.Release|Any CPU.Build.0 = Release|Any CPU - {FFDC73EC-53C9-4B6E-B468-C477039742D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFDC73EC-53C9-4B6E-B468-C477039742D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFDC73EC-53C9-4B6E-B468-C477039742D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFDC73EC-53C9-4B6E-B468-C477039742D8}.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 + {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 + {1A609A5A-8D99-4849-AF21-BB7510070C49}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -62,9 +64,9 @@ Global {705D4D3B-CE99-4FAC-AB61-07AD8FD3FF3A} = {6FCDC00D-202F-4BFE-B799-DFD3F2E8F44D} {1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08} = {6FCDC00D-202F-4BFE-B799-DFD3F2E8F44D} {DC148B85-05DB-43B2-B2AF-958C305C2C0A} = {BC2B926D-1416-4330-A62B-EC48667E0E7B} - {C6EA39FC-B265-4B3E-B5BA-9D0D2C601691} = {BC2B926D-1416-4330-A62B-EC48667E0E7B} {1DD520A2-ED75-4889-848E-DBDC7BE41873} = {0F960DB3-8D87-4D62-BF68-75299FED62F7} - {FFDC73EC-53C9-4B6E-B468-C477039742D8} = {0F960DB3-8D87-4D62-BF68-75299FED62F7} + {8D129F0B-A3D3-4CF7-BE17-E70C954BD6F7} = {68B6BB77-1325-4BD7-95B1-67ECA89889E8} + {1A609A5A-8D99-4849-AF21-BB7510070C49} = {68B6BB77-1325-4BD7-95B1-67ECA89889E8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2034EAE9-84E4-42C3-8C1F-AB515D313D5E} diff --git a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj index 9e40c472ad8..88d19a588c7 100644 --- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -71,7 +71,5 @@ System.IO.Pipelines.PipeReader</PackageDescription> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> </Project> 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 db98034d2a8..11f5a008323 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,24 +9,18 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A6554F7C-F4FC-463D-9C0F-396B976FDB90}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{846D56B2-A309-41B2-8BF8-89CFB3AF5F1D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{914C72C6-0230-48F0-BF5C-D791D86C3F7E}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{D8BA6A7D-73FF-428D-9527-65B9BC36E7E0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{D9DEC09D-3DC0-428C-A7F0-116CDD43BC69}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E1F66F1E-923F-4B07-A1E9-3F1BB01F221A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ADDC6FEE-EDF2-4EAD-B802-1BCF686E0D71}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F8E1D6D4-F8BF-4B79-8E2B-49BFE4145670}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EB85C209-FC5D-455A-8BFE-E7B0D9CC48E8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -53,14 +47,6 @@ 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 - {A6554F7C-F4FC-463D-9C0F-396B976FDB90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6554F7C-F4FC-463D-9C0F-396B976FDB90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6554F7C-F4FC-463D-9C0F-396B976FDB90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6554F7C-F4FC-463D-9C0F-396B976FDB90}.Release|Any CPU.Build.0 = Release|Any CPU - {846D56B2-A309-41B2-8BF8-89CFB3AF5F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {846D56B2-A309-41B2-8BF8-89CFB3AF5F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {846D56B2-A309-41B2-8BF8-89CFB3AF5F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {846D56B2-A309-41B2-8BF8-89CFB3AF5F1D}.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 @@ -69,14 +55,6 @@ Global {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 {123AF6E1-60BF-4360-9010-885AB140205F}.Release|Any CPU.Build.0 = Release|Any CPU - {D8BA6A7D-73FF-428D-9527-65B9BC36E7E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8BA6A7D-73FF-428D-9527-65B9BC36E7E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8BA6A7D-73FF-428D-9527-65B9BC36E7E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8BA6A7D-73FF-428D-9527-65B9BC36E7E0}.Release|Any CPU.Build.0 = Release|Any CPU - {D9DEC09D-3DC0-428C-A7F0-116CDD43BC69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9DEC09D-3DC0-428C-A7F0-116CDD43BC69}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9DEC09D-3DC0-428C-A7F0-116CDD43BC69}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9DEC09D-3DC0-428C-A7F0-116CDD43BC69}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -85,14 +63,10 @@ Global {DF7DE1B3-C58E-4EBB-86C5-87EB59A177C6} = {E1F66F1E-923F-4B07-A1E9-3F1BB01F221A} {7E5965B1-EDF8-4FCC-AAC4-C91DFB043E38} = {E1F66F1E-923F-4B07-A1E9-3F1BB01F221A} {26E03980-4DB8-43B6-8737-1F7CAF7E5089} = {ADDC6FEE-EDF2-4EAD-B802-1BCF686E0D71} - {A6554F7C-F4FC-463D-9C0F-396B976FDB90} = {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} - {846D56B2-A309-41B2-8BF8-89CFB3AF5F1D} = {F8E1D6D4-F8BF-4B79-8E2B-49BFE4145670} - {914C72C6-0230-48F0-BF5C-D791D86C3F7E} = {F8E1D6D4-F8BF-4B79-8E2B-49BFE4145670} - {123AF6E1-60BF-4360-9010-885AB140205F} = {F8E1D6D4-F8BF-4B79-8E2B-49BFE4145670} - {D8BA6A7D-73FF-428D-9527-65B9BC36E7E0} = {F8E1D6D4-F8BF-4B79-8E2B-49BFE4145670} - {D9DEC09D-3DC0-428C-A7F0-116CDD43BC69} = {F8E1D6D4-F8BF-4B79-8E2B-49BFE4145670} + {914C72C6-0230-48F0-BF5C-D791D86C3F7E} = {EB85C209-FC5D-455A-8BFE-E7B0D9CC48E8} + {123AF6E1-60BF-4360-9010-885AB140205F} = {EB85C209-FC5D-455A-8BFE-E7B0D9CC48E8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A148100C-0767-46F2-99CB-3AF298DD788F} diff --git a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln index 999f82217fa..aafb43ee720 100644 --- a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln +++ b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln @@ -33,16 +33,10 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D374E357-D5DA-4958-9C8B-7EA512B19BEF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DD675156-B16E-44C8-854B-AEC717FF4DE0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F9392A09-41F0-4BAA-B80B-A0136542AFA8}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\src\System.Security.Cryptography.ProtectedData.csproj", "{E565DD4A-0749-4F5E-8476-EF44D742E377}" @@ -51,8 +45,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{15CB5F16-593B-460D-BDC3-134A56EF3B5F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{F1F93C9B-5169-40FB-A258-81EC914360EC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{724E9C4C-A140-4815-88A4-2934BD67574F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}" @@ -63,6 +55,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B64B7581-692 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B90127A0-E005-44FE-9D2B-3DE06444CE37}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{FE4693B5-3585-4555-BABA-A8BE2AA9C85E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -137,14 +131,6 @@ 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 - {D374E357-D5DA-4958-9C8B-7EA512B19BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D374E357-D5DA-4958-9C8B-7EA512B19BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D374E357-D5DA-4958-9C8B-7EA512B19BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D374E357-D5DA-4958-9C8B-7EA512B19BEF}.Release|Any CPU.Build.0 = Release|Any CPU - {DD675156-B16E-44C8-854B-AEC717FF4DE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD675156-B16E-44C8-854B-AEC717FF4DE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD675156-B16E-44C8-854B-AEC717FF4DE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD675156-B16E-44C8-854B-AEC717FF4DE0}.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 @@ -153,10 +139,6 @@ Global {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 {D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA}.Release|Any CPU.Build.0 = Release|Any CPU - {5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6}.Release|Any CPU.Build.0 = Release|Any CPU {25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -173,10 +155,6 @@ Global {15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU {15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU {15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Release|Any CPU.Build.0 = Release|Any CPU - {F1F93C9B-5169-40FB-A258-81EC914360EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1F93C9B-5169-40FB-A258-81EC914360EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1F93C9B-5169-40FB-A258-81EC914360EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1F93C9B-5169-40FB-A258-81EC914360EC}.Release|Any CPU.Build.0 = Release|Any CPU {724E9C4C-A140-4815-88A4-2934BD67574F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {724E9C4C-A140-4815-88A4-2934BD67574F}.Debug|Any CPU.Build.0 = Debug|Any CPU {724E9C4C-A140-4815-88A4-2934BD67574F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -200,7 +178,6 @@ Global {7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF} = {B64B7581-6925-4823-B7AF-97FBC53A4146} {D352661A-5F26-403B-9077-D536A57609E7} = {B64B7581-6925-4823-B7AF-97FBC53A4146} {53D35175-9799-4535-8322-88BF2FCDD56E} = {B64B7581-6925-4823-B7AF-97FBC53A4146} - {D374E357-D5DA-4958-9C8B-7EA512B19BEF} = {B64B7581-6925-4823-B7AF-97FBC53A4146} {25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF} = {B64B7581-6925-4823-B7AF-97FBC53A4146} {57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5} = {B64B7581-6925-4823-B7AF-97FBC53A4146} {724E9C4C-A140-4815-88A4-2934BD67574F} = {B64B7581-6925-4823-B7AF-97FBC53A4146} @@ -211,14 +188,11 @@ Global {A15EED32-12DF-40D3-AA8E-197F76D8A0C5} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} {A15B634C-E8F4-4822-BB45-66B95DC1C38F} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} {3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} - {DD675156-B16E-44C8-854B-AEC717FF4DE0} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} - {F9392A09-41F0-4BAA-B80B-A0136542AFA8} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} - {D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} - {5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} {E565DD4A-0749-4F5E-8476-EF44D742E377} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} {15CB5F16-593B-460D-BDC3-134A56EF3B5F} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} - {F1F93C9B-5169-40FB-A258-81EC914360EC} = {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} + {D5A2648A-7BA3-4157-9DBF-D7B7D9B937EA} = {FE4693B5-3585-4555-BABA-A8BE2AA9C85E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CD1065BC-8D4A-4559-BC8B-8FB6B73A6B15} diff --git a/src/libraries/System.IO.Ports/System.IO.Ports.sln b/src/libraries/System.IO.Ports/System.IO.Ports.sln index 17b27a49d27..7fdb7521ade 100644 --- a/src/libraries/System.IO.Ports/System.IO.Ports.sln +++ b/src/libraries/System.IO.Ports/System.IO.Ports.sln @@ -19,9 +19,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{78986AA5-18DB-4476-8E00-66EA8DDA8AF8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{073209AA-3CCC-4884-82B5-D895B2EAAF4C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{7E68AD2F-437D-47A3-A68C-1286B995B33D}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\ref\System.Text.Encoding.CodePages.csproj", "{08EC7EC2-BAE3-4E9D-AD50-14DBFFBC4154}" EndProject @@ -33,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3F3FD18-CF3 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{88B0C0E7-B79E-4DFD-9A65-C3F506507924}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B86A1AC4-AE98-45BB-8548-2C369188D58A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -79,14 +81,14 @@ 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 - {78986AA5-18DB-4476-8E00-66EA8DDA8AF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78986AA5-18DB-4476-8E00-66EA8DDA8AF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78986AA5-18DB-4476-8E00-66EA8DDA8AF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78986AA5-18DB-4476-8E00-66EA8DDA8AF8}.Release|Any CPU.Build.0 = Release|Any CPU - {7E68AD2F-437D-47A3-A68C-1286B995B33D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E68AD2F-437D-47A3-A68C-1286B995B33D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E68AD2F-437D-47A3-A68C-1286B995B33D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E68AD2F-437D-47A3-A68C-1286B995B33D}.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 + {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 + {094F1156-D8B8-420C-945C-B74E1454B6E5}.Release|Any CPU.Build.0 = Release|Any CPU {08EC7EC2-BAE3-4E9D-AD50-14DBFFBC4154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {08EC7EC2-BAE3-4E9D-AD50-14DBFFBC4154}.Debug|Any CPU.Build.0 = Debug|Any CPU {08EC7EC2-BAE3-4E9D-AD50-14DBFFBC4154}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -109,11 +111,11 @@ Global {FF47AA5F-D51E-46B8-A6A3-2A07353AA0A5} = {F3F3FD18-CF31-4E24-9BBD-5303D38CF86B} {E7544C8A-5262-4B51-9ACE-C4A7D3E9E06F} = {F3F3FD18-CF31-4E24-9BBD-5303D38CF86B} {DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E} = {F3F3FD18-CF31-4E24-9BBD-5303D38CF86B} - {7E68AD2F-437D-47A3-A68C-1286B995B33D} = {F3F3FD18-CF31-4E24-9BBD-5303D38CF86B} {50120440-409D-4B8A-B54C-F5FC637EF529} = {F3F3FD18-CF31-4E24-9BBD-5303D38CF86B} {5594242D-5209-4F6F-AA08-44489B5B733F} = {88B0C0E7-B79E-4DFD-9A65-C3F506507924} - {78986AA5-18DB-4476-8E00-66EA8DDA8AF8} = {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} + {094F1156-D8B8-420C-945C-B74E1454B6E5} = {B86A1AC4-AE98-45BB-8548-2C369188D58A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {54136FEA-7C5B-41E5-86EE-C5816F222DEE} diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj index 67e40c9fef6..c26275fe80a 100644 --- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj +++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);SERIAL_PORTS</DefineConstants> @@ -172,7 +172,5 @@ System.IO.Ports.SerialPort</PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> </Project> diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln b/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln index a275405508b..099f46b5b2d 100644 --- a/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln +++ b/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln @@ -13,10 +13,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D7A11210-8298-43E5-B414-3019CC7E1A79}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B890249B-B590-4323-B1F6-0C1AB8E02D68}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{87B6A1A5-72E6-4345-89CD-D591446D1698}" 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}" @@ -27,6 +23,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7BB3C727 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F0F69F17-CFD8-4C03-B86D-C95F0F8D78EC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8A43D0EF-B87B-4046-963C-3DFA9ADA62FB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -166,42 +164,6 @@ 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 - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|x64.ActiveCfg = Debug|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|x64.Build.0 = Debug|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|x86.ActiveCfg = Debug|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|x86.Build.0 = Debug|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|Any CPU.Build.0 = Release|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|x64.ActiveCfg = Release|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|x64.Build.0 = Release|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|x86.ActiveCfg = Release|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|x86.Build.0 = Release|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Checked|Any CPU.Build.0 = Debug|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Checked|x64.ActiveCfg = Debug|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Checked|x64.Build.0 = Debug|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Checked|x86.ActiveCfg = Debug|Any CPU - {D7A11210-8298-43E5-B414-3019CC7E1A79}.Checked|x86.Build.0 = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|x64.ActiveCfg = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|x64.Build.0 = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|x86.ActiveCfg = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|x86.Build.0 = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|Any CPU.Build.0 = Release|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|x64.ActiveCfg = Release|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|x64.Build.0 = Release|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|x86.ActiveCfg = Release|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|x86.Build.0 = Release|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Checked|Any CPU.Build.0 = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Checked|x64.ActiveCfg = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Checked|x64.Build.0 = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.Checked|x86.ActiveCfg = Debug|Any CPU - {B890249B-B590-4323-B1F6-0C1AB8E02D68}.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 @@ -245,15 +207,13 @@ Global GlobalSection(NestedProjects) = preSolution {074D8726-9CC3-43B5-9D28-1AD33A6100F7} = {A8D21009-1410-4367-8616-2075882003FF} {658B1534-3B9E-4108-9AFE-161562723E9D} = {A8D21009-1410-4367-8616-2075882003FF} - {5CB1579E-E830-4812-A7F5-0E33E1847BF6} = {A8D21009-1410-4367-8616-2075882003FF} - {B890249B-B590-4323-B1F6-0C1AB8E02D68} = {A8D21009-1410-4367-8616-2075882003FF} - {87B6A1A5-72E6-4345-89CD-D591446D1698} = {A8D21009-1410-4367-8616-2075882003FF} - {D6653CCB-7EF2-4B4F-86D5-0FC47FDFBC9E} = {A8D21009-1410-4367-8616-2075882003FF} {9963A1DA-8EBD-47EF-8BF2-7B6444BE6FCE} = {7BB3C727-EA87-416E-84DD-34ADD5540067} {7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E} = {7BB3C727-EA87-416E-84DD-34ADD5540067} {D14DC8D4-F45E-412D-AE98-CA07F900347B} = {7BB3C727-EA87-416E-84DD-34ADD5540067} {9ED000E5-2F8D-4B49-85BD-70E34AB2A26F} = {F0F69F17-CFD8-4C03-B86D-C95F0F8D78EC} - {D7A11210-8298-43E5-B414-3019CC7E1A79} = {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} + {D6653CCB-7EF2-4B4F-86D5-0FC47FDFBC9E} = {8A43D0EF-B87B-4046-963C-3DFA9ADA62FB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {819EC888-7F7A-4501-AC44-653366DC0DB8} diff --git a/src/libraries/System.IO/System.IO.sln b/src/libraries/System.IO/System.IO.sln index 057bb24d825..695770736d7 100644 --- a/src/libraries/System.IO/System.IO.sln +++ b/src/libraries/System.IO/System.IO.sln @@ -9,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{602525FF-EE47-4938-8979-32DC962109E4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{C6141F7B-C6ED-4538-B4D2-5017C19C7325}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{AA5E80B2-A0AA-46F1-B319-5B528BAC382B}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{19882357-F402-4021-AF76-536E6B22C630}" EndProject @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{82C2D974-533 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5F2EDEEC-46BD-4327-BC64-79B6D5A5FF3B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0CE1305C-FE49-448C-81D9-D6BFD32A3D03}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,14 +47,14 @@ 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 - {602525FF-EE47-4938-8979-32DC962109E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {602525FF-EE47-4938-8979-32DC962109E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {602525FF-EE47-4938-8979-32DC962109E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {602525FF-EE47-4938-8979-32DC962109E4}.Release|Any CPU.Build.0 = Release|Any CPU - {AA5E80B2-A0AA-46F1-B319-5B528BAC382B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA5E80B2-A0AA-46F1-B319-5B528BAC382B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA5E80B2-A0AA-46F1-B319-5B528BAC382B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA5E80B2-A0AA-46F1-B319-5B528BAC382B}.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 + {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 + {D0D58466-29D8-48CA-8FF4-257CC80A0AAD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -62,9 +64,9 @@ Global {D11D3624-1322-45D1-A604-7E68CDB85BE8} = {19882357-F402-4021-AF76-536E6B22C630} {72923407-7B7B-44A8-BCA6-2DB562835A8F} = {19882357-F402-4021-AF76-536E6B22C630} {CB000FA4-3F31-4695-B221-60D59BEC0A5E} = {82C2D974-5333-4D45-9C4C-A6BF5F35A6DD} - {602525FF-EE47-4938-8979-32DC962109E4} = {82C2D974-5333-4D45-9C4C-A6BF5F35A6DD} {0769544B-1A5D-4D74-94FD-899DF6C39D62} = {5F2EDEEC-46BD-4327-BC64-79B6D5A5FF3B} - {AA5E80B2-A0AA-46F1-B319-5B528BAC382B} = {5F2EDEEC-46BD-4327-BC64-79B6D5A5FF3B} + {C6141F7B-C6ED-4538-B4D2-5017C19C7325} = {0CE1305C-FE49-448C-81D9-D6BFD32A3D03} + {D0D58466-29D8-48CA-8FF4-257CC80A0AAD} = {0CE1305C-FE49-448C-81D9-D6BFD32A3D03} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C3EF571A-C18D-483F-9EFC-CDB71C73548E} diff --git a/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln b/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln index 57f582c1fbd..5d47fb24304 100644 --- a/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln +++ b/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7A587E5E-D061-419C-AB5C-EC15243D5AC1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{52653B38-5617-4D17-A6FC-A1F35A44840A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9F4AAFD2-64AD-4E84-821D-A3DAC415EB33}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CD3E533D-3658-46D9-90EE-4E8344A076FD}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2CFFD4E7-903 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EB3E1752-35A9-438C-8C14-0B56F9461589}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{7CAFBF55-2D7E-45C5-BEFD-47377A70237D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {7A587E5E-D061-419C-AB5C-EC15243D5AC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A587E5E-D061-419C-AB5C-EC15243D5AC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A587E5E-D061-419C-AB5C-EC15243D5AC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A587E5E-D061-419C-AB5C-EC15243D5AC1}.Release|Any CPU.Build.0 = Release|Any CPU - {9F4AAFD2-64AD-4E84-821D-A3DAC415EB33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F4AAFD2-64AD-4E84-821D-A3DAC415EB33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F4AAFD2-64AD-4E84-821D-A3DAC415EB33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F4AAFD2-64AD-4E84-821D-A3DAC415EB33}.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 + {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 + {06C7EEAC-167E-42C7-B678-621F7B6BE395}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {8E74EBBC-51CD-4D60-A560-B7A97CB3D388} = {CD3E533D-3658-46D9-90EE-4E8344A076FD} {CAFF697E-0A65-49BA-9902-79D7D3B00326} = {CD3E533D-3658-46D9-90EE-4E8344A076FD} {F3817B5F-98D8-4BE8-8C00-0C166EFBC2B7} = {2CFFD4E7-903A-4C6A-A580-5AE2285A7A26} - {7A587E5E-D061-419C-AB5C-EC15243D5AC1} = {2CFFD4E7-903A-4C6A-A580-5AE2285A7A26} {1312B533-04ED-4268-8DAF-A7C69BC870A4} = {EB3E1752-35A9-438C-8C14-0B56F9461589} - {9F4AAFD2-64AD-4E84-821D-A3DAC415EB33} = {EB3E1752-35A9-438C-8C14-0B56F9461589} + {52653B38-5617-4D17-A6FC-A1F35A44840A} = {7CAFBF55-2D7E-45C5-BEFD-47377A70237D} + {06C7EEAC-167E-42C7-B678-621F7B6BE395} = {7CAFBF55-2D7E-45C5-BEFD-47377A70237D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AF9218A4-1E73-408C-BEF5-0300BD9DDEB0} diff --git a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln index 562184187e9..bc7122271b6 100644 --- a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln +++ b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E5C01929-0B7E-46D0-9F93-8C61BD619601}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{57521546-4395-4287-8804-11E63754B204}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{1D74FA0C-9114-45B7-985C-E81B9A367931}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{75DB4DC3-5DD6-425B-BD36-19BF5B5E1180}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{20F9AEA0-7D1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4E48C076-587B-43F6-81C7-3362BDC8D1D8}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B2591C6D-F523-4C15-9E29-2E2E01ACB2C4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {E5C01929-0B7E-46D0-9F93-8C61BD619601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5C01929-0B7E-46D0-9F93-8C61BD619601}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5C01929-0B7E-46D0-9F93-8C61BD619601}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5C01929-0B7E-46D0-9F93-8C61BD619601}.Release|Any CPU.Build.0 = Release|Any CPU - {1D74FA0C-9114-45B7-985C-E81B9A367931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D74FA0C-9114-45B7-985C-E81B9A367931}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D74FA0C-9114-45B7-985C-E81B9A367931}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D74FA0C-9114-45B7-985C-E81B9A367931}.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 + {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 + {CE258E72-5765-46B4-8B93-59D11F91FAE1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {FEAB4813-8FCB-4B06-8CA1-7743EA517F97} = {75DB4DC3-5DD6-425B-BD36-19BF5B5E1180} {0B9B4D1C-998E-4323-84E9-02400EFFBC05} = {75DB4DC3-5DD6-425B-BD36-19BF5B5E1180} {6201BF54-B81C-456D-BF3E-46C3404E720E} = {20F9AEA0-7D11-4282-81E0-274CDF39D2DA} - {E5C01929-0B7E-46D0-9F93-8C61BD619601} = {20F9AEA0-7D11-4282-81E0-274CDF39D2DA} {CDF79D0D-248D-48A5-A698-00D34FBA64E1} = {4E48C076-587B-43F6-81C7-3362BDC8D1D8} - {1D74FA0C-9114-45B7-985C-E81B9A367931} = {4E48C076-587B-43F6-81C7-3362BDC8D1D8} + {57521546-4395-4287-8804-11E63754B204} = {B2591C6D-F523-4C15-9E29-2E2E01ACB2C4} + {CE258E72-5765-46B4-8B93-59D11F91FAE1} = {B2591C6D-F523-4C15-9E29-2E2E01ACB2C4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {872BA41A-3769-426E-AB70-515BC1724FC0} diff --git a/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln b/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln index 8842ab31389..8369209cbb0 100644 --- a/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln +++ b/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A8E67119-8D3A-4FD7-AE28-36CB29743011}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F8489E40-A57F-484B-AF45-BDEAC122E1D0}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{55EA11AE-0CFF-47C3-AF61-FE49C04F5C94}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4175E0A1-D5C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E6F704C7-2418-4ADC-90E6-9C6570EF57BB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D124A349-76C6-4FD9-AE3F-D0B674D03CB3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E}.Release|Any CPU.Build.0 = Release|Any CPU - {F8489E40-A57F-484B-AF45-BDEAC122E1D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8489E40-A57F-484B-AF45-BDEAC122E1D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8489E40-A57F-484B-AF45-BDEAC122E1D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8489E40-A57F-484B-AF45-BDEAC122E1D0}.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 + {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 + {ACFE06FC-0223-4F8F-88B9-AE977B9BEB30}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {51EBF7EB-BE6B-4141-89A6-7F069CFF7E46} = {55EA11AE-0CFF-47C3-AF61-FE49C04F5C94} {40A8D49D-B8A3-4780-84D0-C6DBF37BF91E} = {55EA11AE-0CFF-47C3-AF61-FE49C04F5C94} {3C8FC554-3184-46F3-9AFC-C11507020B5F} = {4175E0A1-D5C1-470E-8F0A-EB05DED9B1F4} - {975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E} = {4175E0A1-D5C1-470E-8F0A-EB05DED9B1F4} {EC9BDC43-2701-4942-AFAC-FED0555B60C9} = {E6F704C7-2418-4ADC-90E6-9C6570EF57BB} - {F8489E40-A57F-484B-AF45-BDEAC122E1D0} = {E6F704C7-2418-4ADC-90E6-9C6570EF57BB} + {A8E67119-8D3A-4FD7-AE28-36CB29743011} = {D124A349-76C6-4FD9-AE3F-D0B674D03CB3} + {ACFE06FC-0223-4F8F-88B9-AE977B9BEB30} = {D124A349-76C6-4FD9-AE3F-D0B674D03CB3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EF81B838-4913-4654-BE99-E88F7656DE81} diff --git a/src/libraries/System.Linq/System.Linq.sln b/src/libraries/System.Linq/System.Linq.sln index 39568c1bf5d..c556c0a7a53 100644 --- a/src/libraries/System.Linq/System.Linq.sln +++ b/src/libraries/System.Linq/System.Linq.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E8EDE508-3D46-47B8-8F54-D1529568D2B6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6EF5B962-4321-4D67-A560-E82B739AEAF4}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E291F4BF-7B8B-45AD-88F5-FB8B8380C126}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0BCB262A-FC1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E6102BFA-0803-4AB7-8E91-C4D3B42AFA20}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E61195C4-72B4-47A3-AC98-1F896A0C770F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53}.Release|Any CPU.Build.0 = Release|Any CPU - {6EF5B962-4321-4D67-A560-E82B739AEAF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EF5B962-4321-4D67-A560-E82B739AEAF4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EF5B962-4321-4D67-A560-E82B739AEAF4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EF5B962-4321-4D67-A560-E82B739AEAF4}.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 + {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 + {C8F0459C-15D5-4624-8CE4-E93ADF96A28C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {AF1B1B01-A4EC-45F4-AE51-CC1FA7892181} = {E291F4BF-7B8B-45AD-88F5-FB8B8380C126} {80A4051B-4A36-4A8B-BA43-A5AB8AA959F3} = {E291F4BF-7B8B-45AD-88F5-FB8B8380C126} {7E4C1F09-B4F2-470E-9E7B-2C386E93D657} = {0BCB262A-FC13-4A48-BB0B-9FA293594701} - {21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53} = {0BCB262A-FC13-4A48-BB0B-9FA293594701} {14B966BB-CE23-4432-ADBB-89974389AC1D} = {E6102BFA-0803-4AB7-8E91-C4D3B42AFA20} - {6EF5B962-4321-4D67-A560-E82B739AEAF4} = {E6102BFA-0803-4AB7-8E91-C4D3B42AFA20} + {E8EDE508-3D46-47B8-8F54-D1529568D2B6} = {E61195C4-72B4-47A3-AC98-1F896A0C770F} + {C8F0459C-15D5-4624-8CE4-E93ADF96A28C} = {E61195C4-72B4-47A3-AC98-1F896A0C770F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A4970D79-BF1C-4343-9070-B409DBB69F93} diff --git a/src/libraries/System.Management/System.Management.sln b/src/libraries/System.Management/System.Management.sln index 1cb276245f8..fc830377a51 100644 --- a/src/libraries/System.Management/System.Management.sln +++ b/src/libraries/System.Management/System.Management.sln @@ -13,9 +13,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D282EB2E-CEFC-4600-AC9D-20044F0644DF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{C76091F8-D9A4-4C43-8780-C41045F6FF2B}" EndProject @@ -27,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{441745A2-6E7 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6DC74D98-13B5-4230-87B4-ED3162AFC233}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{64360DAC-C8F2-4231-A678-CCEFD683949D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -61,14 +63,14 @@ 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 - {6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB}.Release|Any CPU.Build.0 = Release|Any CPU - {52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6}.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 + {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 + {AEECC1B0-80B3-4DD2-A309-76E4CF12310E}.Release|Any CPU.Build.0 = Release|Any CPU {C76091F8-D9A4-4C43-8780-C41045F6FF2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C76091F8-D9A4-4C43-8780-C41045F6FF2B}.Debug|Any CPU.Build.0 = Debug|Any CPU {C76091F8-D9A4-4C43-8780-C41045F6FF2B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -87,12 +89,12 @@ Global {EAEFAF2D-A83D-4813-BD23-56009A3691D9} = {441745A2-6E7F-48B9-8C9D-A48E0171B3A5} {86F0F693-CDB8-411C-94C8-0CA8990ED56B} = {441745A2-6E7F-48B9-8C9D-A48E0171B3A5} {12233594-0AC7-45C7-B4E7-8DAF161A299E} = {441745A2-6E7F-48B9-8C9D-A48E0171B3A5} - {6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB} = {441745A2-6E7F-48B9-8C9D-A48E0171B3A5} {C76091F8-D9A4-4C43-8780-C41045F6FF2B} = {441745A2-6E7F-48B9-8C9D-A48E0171B3A5} {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} - {52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6} = {6DC74D98-13B5-4230-87B4-ED3162AFC233} + {D282EB2E-CEFC-4600-AC9D-20044F0644DF} = {64360DAC-C8F2-4231-A678-CCEFD683949D} + {AEECC1B0-80B3-4DD2-A309-76E4CF12310E} = {64360DAC-C8F2-4231-A678-CCEFD683949D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9D09EF76-3A6B-4481-95BC-9E56C3DCD30A} diff --git a/src/libraries/System.Memory.Data/System.Memory.Data.sln b/src/libraries/System.Memory.Data/System.Memory.Data.sln index 6c3a27eeb99..1a1c4b3936a 100644 --- a/src/libraries/System.Memory.Data/System.Memory.Data.sln +++ b/src/libraries/System.Memory.Data/System.Memory.Data.sln @@ -11,9 +11,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B7504AAC-38DA-461A-BE19-1973DA8CBA5B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{876EF0B1-6172-4A38-B1F2-382CCCAC929C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E17B915A-81CA-44D8-818E-512B65609475}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{B137F36F-56CB-46B0-ABDD-B80C82494696}" EndProject @@ -33,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E6AF8CEE-655 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -63,14 +65,14 @@ 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 - {B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Release|Any CPU.Build.0 = Release|Any CPU - {E17B915A-81CA-44D8-818E-512B65609475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E17B915A-81CA-44D8-818E-512B65609475}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E17B915A-81CA-44D8-818E-512B65609475}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E17B915A-81CA-44D8-818E-512B65609475}.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 + {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 + {3B738A97-60C4-40EC-B38B-E41C38C18616}.Release|Any CPU.Build.0 = Release|Any CPU {B137F36F-56CB-46B0-ABDD-B80C82494696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B137F36F-56CB-46B0-ABDD-B80C82494696}.Debug|Any CPU.Build.0 = Debug|Any CPU {B137F36F-56CB-46B0-ABDD-B80C82494696}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -104,16 +106,16 @@ Global {804B5D44-05A3-491E-A6AB-35C592E6703E} = {2BD73108-47D7-40E6-BFCB-169E6AD42A81} {B9162F6C-4CD1-4D33-BA4A-42830A1B1C66} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} {ACB7E0BF-015F-43DC-A2F5-85506173B223} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} - {B7504AAC-38DA-461A-BE19-1973DA8CBA5B} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} {B137F36F-56CB-46B0-ABDD-B80C82494696} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} {1D93DCD8-BF67-4FB5-A25A-7837F230B173} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} {1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} {ACDB56AF-7B9F-4762-9764-D6FF09118D09} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} - {E17B915A-81CA-44D8-818E-512B65609475} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} {0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} - {898AC186-6BE8-4266-954D-DFFF3EE6C428} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} - {C7F95DF5-1832-4AEA-943B-86ED0226D98B} = {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {01DAF96B-AF8E-4576-A1BC-57D19BDB317E} diff --git a/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj b/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj index 7332b7fab96..c72a5aa3813 100644 --- a/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj +++ b/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj @@ -22,6 +22,5 @@ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj b/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj index 27ac5550795..a782b309cc9 100644 --- a/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj +++ b/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj @@ -31,7 +31,5 @@ System.BinaryData</PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Memory/System.Memory.sln b/src/libraries/System.Memory/System.Memory.sln index a7717e3aca2..a67fc7351af 100644 --- a/src/libraries/System.Memory/System.Memory.sln +++ b/src/libraries/System.Memory/System.Memory.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{880A76C5-DF94-4DAC-9E39-0E78C297C457}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FA259C32 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7212FBCF-E89D-4065-9DCE-D5F7E5D3EF1D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2BEB1A89-DD2D-42BD-95DD-89860A0C9663}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -146,42 +144,6 @@ 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 - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|x64.ActiveCfg = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|x64.Build.0 = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|x86.ActiveCfg = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|x86.Build.0 = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|Any CPU.Build.0 = Release|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x64.ActiveCfg = Release|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x64.Build.0 = Release|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x86.ActiveCfg = Release|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x86.Build.0 = Release|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|Any CPU.Build.0 = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x64.ActiveCfg = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x64.Build.0 = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x86.ActiveCfg = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x86.Build.0 = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x64.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x64.Build.0 = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x86.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x86.Build.0 = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|Any CPU.Build.0 = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x64.ActiveCfg = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x64.Build.0 = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x86.ActiveCfg = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x86.Build.0 = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|Any CPU.Build.0 = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|x64.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|x64.Build.0 = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|x86.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.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 @@ -225,14 +187,12 @@ Global GlobalSection(NestedProjects) = preSolution {7746BFD6-E6D6-4703-AA2D-43380B5DEA22} = {C352AC7D-959D-431F-AF83-2CA506B70D59} {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92} = {C352AC7D-959D-431F-AF83-2CA506B70D59} - {EFF00253-633C-4D2F-86EE-F40C721F6A68} = {C352AC7D-959D-431F-AF83-2CA506B70D59} - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314} = {C352AC7D-959D-431F-AF83-2CA506B70D59} - {880A76C5-DF94-4DAC-9E39-0E78C297C457} = {C352AC7D-959D-431F-AF83-2CA506B70D59} - {DA7CEED7-1A86-4221-B4AD-4307AB83A31F} = {C352AC7D-959D-431F-AF83-2CA506B70D59} {6A54FACA-933E-4C1D-92AB-1A5506CFC212} = {FA259C32-B79B-4DE2-9677-055D5D25FA33} {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297} = {FA259C32-B79B-4DE2-9677-055D5D25FA33} {9112BAE3-344D-4DD0-ADC9-478D82B84584} = {7212FBCF-E89D-4065-9DCE-D5F7E5D3EF1D} - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42} = {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} + {DA7CEED7-1A86-4221-B4AD-4307AB83A31F} = {2BEB1A89-DD2D-42BD-95DD-89860A0C9663} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {65DB6A6B-0AAC-4BC2-A61A-641679771DC7} diff --git a/src/libraries/System.Memory/src/System/Buffers/ArrayMemoryPool.cs b/src/libraries/System.Memory/src/System/Buffers/ArrayMemoryPool.cs index 2d043c0b35e..3ad346bddb1 100644 --- a/src/libraries/System.Memory/src/System/Buffers/ArrayMemoryPool.cs +++ b/src/libraries/System.Memory/src/System/Buffers/ArrayMemoryPool.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.Buffers { diff --git a/src/libraries/System.Memory/src/System/Buffers/ReadOnlySequence.Helpers.cs b/src/libraries/System.Memory/src/System/Buffers/ReadOnlySequence.Helpers.cs index 930f5b6e71b..e028d1a5387 100644 --- a/src/libraries/System.Memory/src/System/Buffers/ReadOnlySequence.Helpers.cs +++ b/src/libraries/System.Memory/src/System/Buffers/ReadOnlySequence.Helpers.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Buffers { diff --git a/src/libraries/System.Memory/src/System/Buffers/ReadOnlySequence.cs b/src/libraries/System.Memory/src/System/Buffers/ReadOnlySequence.cs index 46c124c75f1..549f8edd628 100644 --- a/src/libraries/System.Memory/src/System/Buffers/ReadOnlySequence.cs +++ b/src/libraries/System.Memory/src/System/Buffers/ReadOnlySequence.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Buffers { diff --git a/src/libraries/System.Memory/src/System/Buffers/SequenceReader.cs b/src/libraries/System.Memory/src/System/Buffers/SequenceReader.cs index d7f5f5aa4b6..abbe97c1960 100644 --- a/src/libraries/System.Memory/src/System/Buffers/SequenceReader.cs +++ b/src/libraries/System.Memory/src/System/Buffers/SequenceReader.cs @@ -3,7 +3,6 @@ using System.Diagnostics; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System.Buffers { diff --git a/src/libraries/System.Memory/src/System/Buffers/SequenceReaderExtensions.Binary.cs b/src/libraries/System.Memory/src/System/Buffers/SequenceReaderExtensions.Binary.cs index 99d3f4ed11b..843691515aa 100644 --- a/src/libraries/System.Memory/src/System/Buffers/SequenceReaderExtensions.Binary.cs +++ b/src/libraries/System.Memory/src/System/Buffers/SequenceReaderExtensions.Binary.cs @@ -5,7 +5,6 @@ using System.Buffers.Binary; using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Buffers { diff --git a/src/libraries/System.Memory/src/System/Buffers/Text/Base64.cs b/src/libraries/System.Memory/src/System/Buffers/Text/Base64.cs index 7506cbe1eb0..4b1f597e5e8 100644 --- a/src/libraries/System.Memory/src/System/Buffers/Text/Base64.cs +++ b/src/libraries/System.Memory/src/System/Buffers/Text/Base64.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.Buffers.Text { diff --git a/src/libraries/System.Memory/src/System/Buffers/Text/Base64Decoder.cs b/src/libraries/System.Memory/src/System/Buffers/Text/Base64Decoder.cs index e71b3b7f2d2..36a7afa5369 100644 --- a/src/libraries/System.Memory/src/System/Buffers/Text/Base64Decoder.cs +++ b/src/libraries/System.Memory/src/System/Buffers/Text/Base64Decoder.cs @@ -6,7 +6,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; namespace System.Buffers.Text { diff --git a/src/libraries/System.Memory/src/System/Buffers/Text/Base64Encoder.cs b/src/libraries/System.Memory/src/System/Buffers/Text/Base64Encoder.cs index 99add7b72e8..84748f9522b 100644 --- a/src/libraries/System.Memory/src/System/Buffers/Text/Base64Encoder.cs +++ b/src/libraries/System.Memory/src/System/Buffers/Text/Base64Encoder.cs @@ -5,7 +5,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; namespace System.Buffers.Text { 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 869273c1537..cbdc7834459 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,9 +17,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E9F77940-ADB7-4439-A070-2EA1BF6E5F62}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{1A9E7E5D-B340-4677-8745-2811F07148C6}" EndProject @@ -39,6 +39,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{945B0700-C72 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2A66925D-3658-46BE-A730-5BF70D8D5B90}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5A418E02-B18A-41F1-9D4F-1BD6CB51F63C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -81,14 +83,14 @@ 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 - {3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Release|Any CPU.Build.0 = Release|Any CPU - {3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1}.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 + {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 + {E1A1EC7C-3257-46EB-8DBC-DE8DAB3F4F4F}.Release|Any CPU.Build.0 = Release|Any CPU {1A9E7E5D-B340-4677-8745-2811F07148C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1A9E7E5D-B340-4677-8745-2811F07148C6}.Debug|Any CPU.Build.0 = Debug|Any CPU {1A9E7E5D-B340-4677-8745-2811F07148C6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -125,16 +127,16 @@ Global {FBA6F4E4-2585-4607-B6A9-0C1A8145205F} = {945B0700-C720-4775-B9E4-6A27DAA90190} {2F4E0ED7-19C4-4280-87EF-C32C155815F3} = {945B0700-C720-4775-B9E4-6A27DAA90190} {65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D} = {945B0700-C720-4775-B9E4-6A27DAA90190} - {3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22} = {945B0700-C720-4775-B9E4-6A27DAA90190} {1A9E7E5D-B340-4677-8745-2811F07148C6} = {945B0700-C720-4775-B9E4-6A27DAA90190} {EA992513-9CA4-4DEB-B0EE-A8FD0252B451} = {945B0700-C720-4775-B9E4-6A27DAA90190} {4FB629CD-5FFC-47AC-9670-A2A8AFEE8926} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} {7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} - {3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} {FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} - {E277B012-C6EE-4032-9E80-C1EE3BAD7F51} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} - {65F336C0-BFB7-4248-A56C-8F1AE8770590} = {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A121E5BA-D935-4572-8D67-2F15DF29922B} diff --git a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj index edabe93632e..f1853a192ac 100644 --- a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj @@ -54,8 +54,6 @@ System.Net.Http.Json.JsonContent</PackageDescription> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> 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 863d9812de3..a79ce93f761 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,9 +25,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E2311DD8-2E5E-4DD7-840F-237A8F77A311}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9D31B08F-4254-4A8C-A9F3-2F2C99F3740A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{28C24BF8-8E08-485F-8EEE-817EB847774C}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{2C7E9759-DB91-46DD-AE83-446973893D48}" EndProject @@ -47,6 +47,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2F9A243D-B06 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{49E09973-383D-4AD6-9D88-B93A02031607}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B8C52E24-376F-4E8D-AA8A-62E25C161863}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -105,14 +107,14 @@ 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 - {E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Release|Any CPU.Build.0 = Release|Any CPU - {28C24BF8-8E08-485F-8EEE-817EB847774C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28C24BF8-8E08-485F-8EEE-817EB847774C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28C24BF8-8E08-485F-8EEE-817EB847774C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28C24BF8-8E08-485F-8EEE-817EB847774C}.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 + {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 + {834ECDE7-4B5D-4DBD-8BCA-98343A99179F}.Release|Any CPU.Build.0 = Release|Any CPU {2C7E9759-DB91-46DD-AE83-446973893D48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2C7E9759-DB91-46DD-AE83-446973893D48}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C7E9759-DB91-46DD-AE83-446973893D48}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -151,18 +153,18 @@ Global {171F4CD4-BB25-462D-8330-FD96D2B40D03} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} {B3C3E9D6-EEB3-4DE1-9B35-C0984474E522} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} {F406CD45-4516-4DC3-AC4D-1B61835D3B71} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} - {E2311DD8-2E5E-4DD7-840F-237A8F77A311} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} {2C7E9759-DB91-46DD-AE83-446973893D48} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} {8ABBBDC5-48A1-43BA-A629-AE58C35318AA} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} {4BA25EC1-B76B-4410-AF2D-A54B90FAB404} = {49E09973-383D-4AD6-9D88-B93A02031607} {7EF13CC5-C714-4C0F-990F-C0884B92A9A1} = {49E09973-383D-4AD6-9D88-B93A02031607} {E6A8B90B-69CD-4B0D-8A33-F208A3169674} = {49E09973-383D-4AD6-9D88-B93A02031607} {DE2A69CC-4962-4BF6-A714-41A87A6C045B} = {49E09973-383D-4AD6-9D88-B93A02031607} - {28C24BF8-8E08-485F-8EEE-817EB847774C} = {49E09973-383D-4AD6-9D88-B93A02031607} {BACC5257-6CA8-45C7-970F-C8D501DA59AB} = {49E09973-383D-4AD6-9D88-B93A02031607} - {F37B0EB9-2882-42F9-88DE-BB55AD9DCA5D} = {49E09973-383D-4AD6-9D88-B93A02031607} - {310F6EE8-5F12-4663-A5B8-01344C5CC821} = {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F5BAF3DD-D05C-4DCC-BB36-16645CA1F151} diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj index e1aa13b7c86..bf8bdccd55b 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj @@ -138,8 +138,6 @@ System.Net.Http.WinHttpHandler</PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> diff --git a/src/libraries/System.Net.Http/System.Net.Http.sln b/src/libraries/System.Net.Http/System.Net.Http.sln index 2a2bb3199eb..8c58992d25e 100644 --- a/src/libraries/System.Net.Http/System.Net.Http.sln +++ b/src/libraries/System.Net.Http/System.Net.Http.sln @@ -9,10 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Pr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj", "{8D82C57C-D809-4E65-BDFF-E73C13DA37BC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{C08E7C6C-C710-446B-B897-0D89CA9F46CC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{0DB06F2E-2C33-4DBF-A572-76753EEA6B2C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http", "ref\System.Net.Http.csproj", "{CB685EA0-3A2C-4966-82EF-F04D0C02A419}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http", "src\System.Net.Http.csproj", "{11F31E64-4000-47F3-AE19-C83EB4EC0ED8}" @@ -29,24 +25,18 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{6573D8B3-6B20-43CE-ABE7-42D8659CBB35}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{ACDD8D8E-6945-41BC-87BD-1BD225653521}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BA43DFE7-A22D-4658-AE1E-2F8398BDA180}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "..\System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj", "{A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{145B4B2E-5EF8-46F2-A596-E1043BB22873}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{7841027C-6B57-4756-A757-8B19ECA0D9C7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,14 +63,6 @@ Global {8D82C57C-D809-4E65-BDFF-E73C13DA37BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D82C57C-D809-4E65-BDFF-E73C13DA37BC}.Release|Any CPU.ActiveCfg = Release|Any CPU {8D82C57C-D809-4E65-BDFF-E73C13DA37BC}.Release|Any CPU.Build.0 = Release|Any CPU - {C08E7C6C-C710-446B-B897-0D89CA9F46CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C08E7C6C-C710-446B-B897-0D89CA9F46CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C08E7C6C-C710-446B-B897-0D89CA9F46CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C08E7C6C-C710-446B-B897-0D89CA9F46CC}.Release|Any CPU.Build.0 = Release|Any CPU - {0DB06F2E-2C33-4DBF-A572-76753EEA6B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DB06F2E-2C33-4DBF-A572-76753EEA6B2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DB06F2E-2C33-4DBF-A572-76753EEA6B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DB06F2E-2C33-4DBF-A572-76753EEA6B2C}.Release|Any CPU.Build.0 = Release|Any CPU {CB685EA0-3A2C-4966-82EF-F04D0C02A419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB685EA0-3A2C-4966-82EF-F04D0C02A419}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB685EA0-3A2C-4966-82EF-F04D0C02A419}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,14 +95,6 @@ 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 - {6573D8B3-6B20-43CE-ABE7-42D8659CBB35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6573D8B3-6B20-43CE-ABE7-42D8659CBB35}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6573D8B3-6B20-43CE-ABE7-42D8659CBB35}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6573D8B3-6B20-43CE-ABE7-42D8659CBB35}.Release|Any CPU.Build.0 = Release|Any CPU - {ACDD8D8E-6945-41BC-87BD-1BD225653521}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ACDD8D8E-6945-41BC-87BD-1BD225653521}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACDD8D8E-6945-41BC-87BD-1BD225653521}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ACDD8D8E-6945-41BC-87BD-1BD225653521}.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 @@ -129,14 +103,6 @@ Global {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 {786ED1A9-1EFF-4BC4-A833-E680D9960F72}.Release|Any CPU.Build.0 = Release|Any CPU - {A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5}.Release|Any CPU.Build.0 = Release|Any CPU - {32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -149,20 +115,14 @@ Global {FC7EE3FF-B352-442D-AB17-E0055121B918} = {0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10} {3A2112A9-BD10-4423-AB19-2D3681D60E38} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD} {69B3AD9D-E5B7-4512-8097-5D14DC5C18F1} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD} - {C08E7C6C-C710-446B-B897-0D89CA9F46CC} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD} {CB685EA0-3A2C-4966-82EF-F04D0C02A419} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD} {84E90EDE-19CD-460D-A2E8-71D9D726C56C} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD} - {6573D8B3-6B20-43CE-ABE7-42D8659CBB35} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD} {8D82C57C-D809-4E65-BDFF-E73C13DA37BC} = {145B4B2E-5EF8-46F2-A596-E1043BB22873} - {0DB06F2E-2C33-4DBF-A572-76753EEA6B2C} = {145B4B2E-5EF8-46F2-A596-E1043BB22873} {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} - {ACDD8D8E-6945-41BC-87BD-1BD225653521} = {145B4B2E-5EF8-46F2-A596-E1043BB22873} - {BA43DFE7-A22D-4658-AE1E-2F8398BDA180} = {145B4B2E-5EF8-46F2-A596-E1043BB22873} - {786ED1A9-1EFF-4BC4-A833-E680D9960F72} = {145B4B2E-5EF8-46F2-A596-E1043BB22873} - {A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5} = {145B4B2E-5EF8-46F2-A596-E1043BB22873} - {32FE3BA2-6FC8-4537-BD04-47236BAFE9F0} = {145B4B2E-5EF8-46F2-A596-E1043BB22873} + {BA43DFE7-A22D-4658-AE1E-2F8398BDA180} = {7841027C-6B57-4756-A757-8B19ECA0D9C7} + {786ED1A9-1EFF-4BC4-A833-E680D9960F72} = {7841027C-6B57-4756-A757-8B19ECA0D9C7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F1EF65A2-61B3-45A3-9CDE-BD62218BE447} diff --git a/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln b/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln index 36fbf14af78..7648540b3c4 100644 --- a/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln +++ b/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln @@ -7,10 +7,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D48FCA59-B78B-4E81-8DB5-1B0B6596F71B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D878C9A2-651A-4D46-BF8A-E4394F3F3967}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1D4AE507-BC2C-47DC-85DF-523EDB6B3E78}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A3A29B10-F45 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{633A5486-7617-411C-B724-172F4B4E3A4F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D79781B1-8197-4641-9DE7-B9F22C71FBB9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,14 +43,6 @@ 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 - {D48FCA59-B78B-4E81-8DB5-1B0B6596F71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D48FCA59-B78B-4E81-8DB5-1B0B6596F71B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D48FCA59-B78B-4E81-8DB5-1B0B6596F71B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D48FCA59-B78B-4E81-8DB5-1B0B6596F71B}.Release|Any CPU.Build.0 = Release|Any CPU - {D878C9A2-651A-4D46-BF8A-E4394F3F3967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D878C9A2-651A-4D46-BF8A-E4394F3F3967}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D878C9A2-651A-4D46-BF8A-E4394F3F3967}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D878C9A2-651A-4D46-BF8A-E4394F3F3967}.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 @@ -73,12 +63,10 @@ Global {0CCA61A1-58CA-4D94-90FC-9D660B99E9F0} = {AE12BA12-7BDB-4361-922F-AAA100384926} {9D6743F7-7918-4B74-A2C2-ECC6CE2AC0BB} = {AE12BA12-7BDB-4361-922F-AAA100384926} {24DD2F6E-B010-4654-B0ED-91279034846E} = {A3A29B10-F45E-487B-A2A0-EA809B62AF9D} - {D48FCA59-B78B-4E81-8DB5-1B0B6596F71B} = {A3A29B10-F45E-487B-A2A0-EA809B62AF9D} {706D27A6-E66A-4FF5-9E6A-EA1B8BC52FB2} = {633A5486-7617-411C-B724-172F4B4E3A4F} - {D878C9A2-651A-4D46-BF8A-E4394F3F3967} = {633A5486-7617-411C-B724-172F4B4E3A4F} - {1D4AE507-BC2C-47DC-85DF-523EDB6B3E78} = {633A5486-7617-411C-B724-172F4B4E3A4F} - {154F91AC-8E70-49E6-9C97-0DDBD50AFB56} = {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} + {154F91AC-8E70-49E6-9C97-0DDBD50AFB56} = {D79781B1-8197-4641-9DE7-B9F22C71FBB9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {19365E8B-E996-4E55-B468-A126849865D8} diff --git a/src/libraries/System.Net.Mail/System.Net.Mail.sln b/src/libraries/System.Net.Mail/System.Net.Mail.sln index 4cf46291494..aa1b999e373 100644 --- a/src/libraries/System.Net.Mail/System.Net.Mail.sln +++ b/src/libraries/System.Net.Mail/System.Net.Mail.sln @@ -9,10 +9,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1BB79710-16BD-4ED4-8BF4-13D25CBF4208}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{5744A1F6-D858-4106-AB38-620B837A377C}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A08D08E8-610 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04FF7F43-59FD-4A9A-AFE4-12D16836981C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{461D78A2-743F-40F0-B301-274F2687D84F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,14 +49,6 @@ 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 - {1BB79710-16BD-4ED4-8BF4-13D25CBF4208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BB79710-16BD-4ED4-8BF4-13D25CBF4208}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BB79710-16BD-4ED4-8BF4-13D25CBF4208}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BB79710-16BD-4ED4-8BF4-13D25CBF4208}.Release|Any CPU.Build.0 = Release|Any CPU - {B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892}.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 @@ -80,12 +70,10 @@ Global {7AB412AE-E817-42C8-83A7-8FCE4F7C19D5} = {DFA479C6-DDF9-4AE0-91BB-08041FF1B7C8} {78D06A89-4961-4441-8898-17FDB8BC99CE} = {DFA479C6-DDF9-4AE0-91BB-08041FF1B7C8} {A743A5C2-5DE7-433B-A623-893B0BAE83D8} = {A08D08E8-610F-47A0-8747-01223F9430C5} - {1BB79710-16BD-4ED4-8BF4-13D25CBF4208} = {A08D08E8-610F-47A0-8747-01223F9430C5} {AF805BBD-C4A4-4D69-A911-D651E008C655} = {04FF7F43-59FD-4A9A-AFE4-12D16836981C} - {B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892} = {04FF7F43-59FD-4A9A-AFE4-12D16836981C} - {5744A1F6-D858-4106-AB38-620B837A377C} = {04FF7F43-59FD-4A9A-AFE4-12D16836981C} - {301EA337-1D9A-47EF-966B-0ED0568C569A} = {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} + {301EA337-1D9A-47EF-966B-0ED0568C569A} = {461D78A2-743F-40F0-B301-274F2687D84F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5A7D0500-9878-41E4-B10B-94A5E2CCE8B8} diff --git a/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln b/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln index 43e950d7eff..fd0197db266 100644 --- a/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln +++ b/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln @@ -9,22 +9,18 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A3FC70CE-3746-4E03-A92F-0102716FA97E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D62E59F2-BDF3-4060-85E0-20D1BB41B95E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{CAE1C084-4AED-447A-A194-820089161700}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{FB254BF6-9C7C-4A35-A8B1-FB8832382442}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6E7B2B93-21B0-457F-84C3-AE62DABC73E2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{47DBE178-9476-4595-9C71-424D54314C2E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3DDE175F-17B6-4F30-8AA6-04C0AEBF39D5}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{851CDB4C-B092-466E-93BA-D554120B182B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,14 +47,6 @@ 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 - {A3FC70CE-3746-4E03-A92F-0102716FA97E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3FC70CE-3746-4E03-A92F-0102716FA97E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3FC70CE-3746-4E03-A92F-0102716FA97E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3FC70CE-3746-4E03-A92F-0102716FA97E}.Release|Any CPU.Build.0 = Release|Any CPU - {D62E59F2-BDF3-4060-85E0-20D1BB41B95E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D62E59F2-BDF3-4060-85E0-20D1BB41B95E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D62E59F2-BDF3-4060-85E0-20D1BB41B95E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D62E59F2-BDF3-4060-85E0-20D1BB41B95E}.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 @@ -67,10 +55,6 @@ Global {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 {A8357213-6A4D-463F-8364-70ED86147098}.Release|Any CPU.Build.0 = Release|Any CPU - {FB254BF6-9C7C-4A35-A8B1-FB8832382442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB254BF6-9C7C-4A35-A8B1-FB8832382442}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB254BF6-9C7C-4A35-A8B1-FB8832382442}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB254BF6-9C7C-4A35-A8B1-FB8832382442}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -80,12 +64,9 @@ Global {BE2A4103-7CA0-4DAD-A4AD-F623CBFAD379} = {6E7B2B93-21B0-457F-84C3-AE62DABC73E2} {72B2CC3A-D66E-4F7E-BFA4-38EE373B5043} = {6E7B2B93-21B0-457F-84C3-AE62DABC73E2} {15B66DCE-70BF-43D6-854D-42A6C840B22C} = {47DBE178-9476-4595-9C71-424D54314C2E} - {A3FC70CE-3746-4E03-A92F-0102716FA97E} = {47DBE178-9476-4595-9C71-424D54314C2E} {CC5371F7-FCD9-4BDE-8639-6DD5F3B71175} = {3DDE175F-17B6-4F30-8AA6-04C0AEBF39D5} - {D62E59F2-BDF3-4060-85E0-20D1BB41B95E} = {3DDE175F-17B6-4F30-8AA6-04C0AEBF39D5} - {CAE1C084-4AED-447A-A194-820089161700} = {3DDE175F-17B6-4F30-8AA6-04C0AEBF39D5} - {A8357213-6A4D-463F-8364-70ED86147098} = {3DDE175F-17B6-4F30-8AA6-04C0AEBF39D5} - {FB254BF6-9C7C-4A35-A8B1-FB8832382442} = {3DDE175F-17B6-4F30-8AA6-04C0AEBF39D5} + {CAE1C084-4AED-447A-A194-820089161700} = {851CDB4C-B092-466E-93BA-D554120B182B} + {A8357213-6A4D-463F-8364-70ED86147098} = {851CDB4C-B092-466E-93BA-D554120B182B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9CA07406-6BA5-454C-8C65-3396A977F8A8} diff --git a/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln b/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln index a36945ecff6..5cd26cade51 100644 --- a/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln +++ b/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln @@ -7,10 +7,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{23FF09C1-F2BF-4834-96CE-59BE5AA7F46A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{1EBC1861-0CC0-45A6-9685-AF863383D81F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7D4FC57B-AF9B-4163-868B-1503818BAF0C}" 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}" @@ -21,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{01C6C981-C56 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A3CAA996-BF7C-48EE-A03A-2B2F78D88D86}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{575528E7-33D8-4375-8B5A-D88215FEE447}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,14 +41,6 @@ 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 - {23FF09C1-F2BF-4834-96CE-59BE5AA7F46A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23FF09C1-F2BF-4834-96CE-59BE5AA7F46A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23FF09C1-F2BF-4834-96CE-59BE5AA7F46A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23FF09C1-F2BF-4834-96CE-59BE5AA7F46A}.Release|Any CPU.Build.0 = Release|Any CPU - {1EBC1861-0CC0-45A6-9685-AF863383D81F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EBC1861-0CC0-45A6-9685-AF863383D81F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EBC1861-0CC0-45A6-9685-AF863383D81F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EBC1861-0CC0-45A6-9685-AF863383D81F}.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 @@ -67,11 +57,9 @@ Global {F8166147-93CA-4985-8E1F-E10A31C9713A} = {33058B90-33C6-4731-AF47-DC7678DC2739} {A0F37A17-0D79-4A84-84CC-AEE604206F06} = {33058B90-33C6-4731-AF47-DC7678DC2739} {EDF83CE6-22BB-45EA-B8CF-32AC2CFE5713} = {01C6C981-C56F-453F-B099-C8B9DF61CDEB} - {23FF09C1-F2BF-4834-96CE-59BE5AA7F46A} = {01C6C981-C56F-453F-B099-C8B9DF61CDEB} {062F1189-143C-456B-A439-D9C1BE2DD640} = {A3CAA996-BF7C-48EE-A03A-2B2F78D88D86} - {1EBC1861-0CC0-45A6-9685-AF863383D81F} = {A3CAA996-BF7C-48EE-A03A-2B2F78D88D86} - {7D4FC57B-AF9B-4163-868B-1503818BAF0C} = {A3CAA996-BF7C-48EE-A03A-2B2F78D88D86} - {1E0ED0DE-76B3-402F-8029-C432E638CE0C} = {A3CAA996-BF7C-48EE-A03A-2B2F78D88D86} + {7D4FC57B-AF9B-4163-868B-1503818BAF0C} = {575528E7-33D8-4375-8B5A-D88215FEE447} + {1E0ED0DE-76B3-402F-8029-C432E638CE0C} = {575528E7-33D8-4375-8B5A-D88215FEE447} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6749EC2E-042F-4132-9B0A-82ED7F56513C} diff --git a/src/libraries/System.Net.Ping/System.Net.Ping.sln b/src/libraries/System.Net.Ping/System.Net.Ping.sln index 12cb6031ea7..9c9a28c3b78 100644 --- a/src/libraries/System.Net.Ping/System.Net.Ping.sln +++ b/src/libraries/System.Net.Ping/System.Net.Ping.sln @@ -7,10 +7,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{948D0208-37D1-48B7-91AE-138D9A2C7751}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2A7F8D83-147A-4F8F-897A-4C5DB5E68698}" 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}" @@ -21,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AAB0D01D-C3A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A687595D-ACCE-4380-95B8-628F598C7229}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D26792B6-6D00-4CC0-B60B-7028F377BD4F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,14 +41,6 @@ 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 - {948D0208-37D1-48B7-91AE-138D9A2C7751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {948D0208-37D1-48B7-91AE-138D9A2C7751}.Debug|Any CPU.Build.0 = Debug|Any CPU - {948D0208-37D1-48B7-91AE-138D9A2C7751}.Release|Any CPU.ActiveCfg = Release|Any CPU - {948D0208-37D1-48B7-91AE-138D9A2C7751}.Release|Any CPU.Build.0 = Release|Any CPU - {D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4}.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 @@ -67,11 +57,9 @@ Global {37231AFF-11DE-41E7-85A7-F23D136D254E} = {FABDD2DA-5365-4FD2-8C67-4C643E618CE9} {E2A63467-3D66-448C-BF81-5DF684E02AD3} = {FABDD2DA-5365-4FD2-8C67-4C643E618CE9} {A16A6C85-DF86-44A1-9032-238C223A0AE0} = {AAB0D01D-C3A4-4E09-9BFD-CBC737A3CA73} - {948D0208-37D1-48B7-91AE-138D9A2C7751} = {AAB0D01D-C3A4-4E09-9BFD-CBC737A3CA73} {65B08958-069E-4F8B-A996-2A987ACCAA49} = {A687595D-ACCE-4380-95B8-628F598C7229} - {D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4} = {A687595D-ACCE-4380-95B8-628F598C7229} - {2A7F8D83-147A-4F8F-897A-4C5DB5E68698} = {A687595D-ACCE-4380-95B8-628F598C7229} - {B59DB44D-8E1E-4F62-A223-E3AC71BB0370} = {A687595D-ACCE-4380-95B8-628F598C7229} + {2A7F8D83-147A-4F8F-897A-4C5DB5E68698} = {D26792B6-6D00-4CC0-B60B-7028F377BD4F} + {B59DB44D-8E1E-4F62-A223-E3AC71BB0370} = {D26792B6-6D00-4CC0-B60B-7028F377BD4F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {23612E2C-7AC3-4D7B-812D-44BB88E94278} diff --git a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln index ab9a9e3afdb..a8d0bd9f976 100644 --- a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln +++ b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F1989258-F5D7-4056-9831-518BD04F5863}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{5EE22177-D871-464A-9824-727D4A60B0A6}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{212A5562-EFE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{97419593-C13A-4407-B489-1651C8D3E813}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6DD9FC21-AB33-4068-BC80-B4B89B7C99C9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -55,14 +53,6 @@ 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 - {F1989258-F5D7-4056-9831-518BD04F5863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1989258-F5D7-4056-9831-518BD04F5863}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1989258-F5D7-4056-9831-518BD04F5863}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1989258-F5D7-4056-9831-518BD04F5863}.Release|Any CPU.Build.0 = Release|Any CPU - {8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0}.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 @@ -81,11 +71,9 @@ Global {3D1D85E0-1680-4B9E-89BC-AB80CE222620} = {909A147A-476E-4E34-A931-C2C65FD656A6} {598326BD-BCA8-48EC-A897-602DF1F247A3} = {909A147A-476E-4E34-A931-C2C65FD656A6} {9CCAA49E-21F5-407B-807F-A26A5F01FCF1} = {212A5562-EFE7-4220-94EC-6B49C0A6DCEF} - {F1989258-F5D7-4056-9831-518BD04F5863} = {212A5562-EFE7-4220-94EC-6B49C0A6DCEF} {08C53516-56AB-4D3B-B22F-7DC1B27EA7CE} = {97419593-C13A-4407-B489-1651C8D3E813} - {8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0} = {97419593-C13A-4407-B489-1651C8D3E813} - {5EE22177-D871-464A-9824-727D4A60B0A6} = {97419593-C13A-4407-B489-1651C8D3E813} - {160E40E8-0148-4D87-86D2-1F1918BD36F0} = {97419593-C13A-4407-B489-1651C8D3E813} + {5EE22177-D871-464A-9824-727D4A60B0A6} = {6DD9FC21-AB33-4068-BC80-B4B89B7C99C9} + {160E40E8-0148-4D87-86D2-1F1918BD36F0} = {6DD9FC21-AB33-4068-BC80-B4B89B7C99C9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E0D36CFB-AD15-487D-A647-F12B577FC5DF} diff --git a/src/libraries/System.Net.Quic/System.Net.Quic.sln b/src/libraries/System.Net.Quic/System.Net.Quic.sln index a0f88781bfc..ae1bdaac000 100644 --- a/src/libraries/System.Net.Quic/System.Net.Quic.sln +++ b/src/libraries/System.Net.Quic/System.Net.Quic.sln @@ -3,32 +3,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{55C933AA-2735-4B38-A1DD-01A27467AB18}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{D8A0B997-7F6A-48D5-BBA0-17130461BAB9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic", "ref\System.Net.Quic.csproj", "{D7A52855-C6DE-4FD0-9CAF-E55F292C69E5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic", "src\System.Net.Quic.csproj", "{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7}" 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7BB8C50D-4770-42CB-BE15-76AD623A5AE8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{33F96B02-0102-4949-A874-E31E4B2212D8}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "..\System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj", "{23C03FB6-C11D-4F42-AD6C-66CAE2A8175A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{12C4206E-D19B-44BF-8002-6236D65AAE1B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{538F3900-95BF-423D-9912-F94B0ECE463C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8EF7F530-1F45-48CE-AA30-30FFD83147B9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AA7C6283-6473-4B71-8877-CAB8D75F9469}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,14 +35,6 @@ Global {55C933AA-2735-4B38-A1DD-01A27467AB18}.Debug|Any CPU.Build.0 = Debug|Any CPU {55C933AA-2735-4B38-A1DD-01A27467AB18}.Release|Any CPU.ActiveCfg = Release|Any CPU {55C933AA-2735-4B38-A1DD-01A27467AB18}.Release|Any CPU.Build.0 = Release|Any CPU - {D8A0B997-7F6A-48D5-BBA0-17130461BAB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8A0B997-7F6A-48D5-BBA0-17130461BAB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8A0B997-7F6A-48D5-BBA0-17130461BAB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8A0B997-7F6A-48D5-BBA0-17130461BAB9}.Release|Any CPU.Build.0 = Release|Any CPU - {BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241}.Release|Any CPU.Build.0 = Release|Any CPU {D7A52855-C6DE-4FD0-9CAF-E55F292C69E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D7A52855-C6DE-4FD0-9CAF-E55F292C69E5}.Debug|Any CPU.Build.0 = Debug|Any CPU {D7A52855-C6DE-4FD0-9CAF-E55F292C69E5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -63,14 +47,6 @@ 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 - {7BB8C50D-4770-42CB-BE15-76AD623A5AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BB8C50D-4770-42CB-BE15-76AD623A5AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BB8C50D-4770-42CB-BE15-76AD623A5AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BB8C50D-4770-42CB-BE15-76AD623A5AE8}.Release|Any CPU.Build.0 = Release|Any CPU - {9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.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 @@ -79,10 +55,6 @@ Global {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 {E1D4C4F2-B830-4E87-B10D-ADC667213957}.Release|Any CPU.Build.0 = Release|Any CPU - {23C03FB6-C11D-4F42-AD6C-66CAE2A8175A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23C03FB6-C11D-4F42-AD6C-66CAE2A8175A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23C03FB6-C11D-4F42-AD6C-66CAE2A8175A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23C03FB6-C11D-4F42-AD6C-66CAE2A8175A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -91,15 +63,10 @@ Global {D5EDF0C3-7574-4A08-B78F-AEAA2DEE0BD6} = {12C4206E-D19B-44BF-8002-6236D65AAE1B} {55C933AA-2735-4B38-A1DD-01A27467AB18} = {12C4206E-D19B-44BF-8002-6236D65AAE1B} {E8E7DD3A-EC3F-4472-9F70-B515A3D11038} = {12C4206E-D19B-44BF-8002-6236D65AAE1B} - {D8A0B997-7F6A-48D5-BBA0-17130461BAB9} = {538F3900-95BF-423D-9912-F94B0ECE463C} {D7A52855-C6DE-4FD0-9CAF-E55F292C69E5} = {538F3900-95BF-423D-9912-F94B0ECE463C} - {7BB8C50D-4770-42CB-BE15-76AD623A5AE8} = {538F3900-95BF-423D-9912-F94B0ECE463C} - {BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241} = {8EF7F530-1F45-48CE-AA30-30FFD83147B9} {4F87758B-D1AF-4DE3-A9A2-68B1558C02B7} = {8EF7F530-1F45-48CE-AA30-30FFD83147B9} - {9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0} = {8EF7F530-1F45-48CE-AA30-30FFD83147B9} - {33F96B02-0102-4949-A874-E31E4B2212D8} = {8EF7F530-1F45-48CE-AA30-30FFD83147B9} - {E1D4C4F2-B830-4E87-B10D-ADC667213957} = {8EF7F530-1F45-48CE-AA30-30FFD83147B9} - {23C03FB6-C11D-4F42-AD6C-66CAE2A8175A} = {8EF7F530-1F45-48CE-AA30-30FFD83147B9} + {33F96B02-0102-4949-A874-E31E4B2212D8} = {AA7C6283-6473-4B71-8877-CAB8D75F9469} + {E1D4C4F2-B830-4E87-B10D-ADC667213957} = {AA7C6283-6473-4B71-8877-CAB8D75F9469} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4B59ACCA-7F0C-4062-AA79-B3D75EFACCCD} diff --git a/src/libraries/System.Net.Requests/System.Net.Requests.sln b/src/libraries/System.Net.Requests/System.Net.Requests.sln index 3a5d7a46838..3877893ed67 100644 --- a/src/libraries/System.Net.Requests/System.Net.Requests.sln +++ b/src/libraries/System.Net.Requests/System.Net.Requests.sln @@ -7,10 +7,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4EC53679-7072-4827-A166-0222A076C358}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BADB548A-7A51-4B52-8498-69B6C0A1FD77}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{56DB4376-4181-4814-9056-F9DC55EAC026}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DB20495E-C9F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BE29C1CE-D2BC-43F8-9412-50F870CE5538}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BCB9D4DE-1EC1-4826-A80F-E4D2E960D98D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,14 +43,6 @@ 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 - {4EC53679-7072-4827-A166-0222A076C358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4EC53679-7072-4827-A166-0222A076C358}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4EC53679-7072-4827-A166-0222A076C358}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4EC53679-7072-4827-A166-0222A076C358}.Release|Any CPU.Build.0 = Release|Any CPU - {BADB548A-7A51-4B52-8498-69B6C0A1FD77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BADB548A-7A51-4B52-8498-69B6C0A1FD77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BADB548A-7A51-4B52-8498-69B6C0A1FD77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BADB548A-7A51-4B52-8498-69B6C0A1FD77}.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 @@ -73,12 +63,10 @@ Global {050A566C-C468-4AFB-84E4-FFC421983961} = {2E80965D-0AB1-451E-AFE5-E4CAF49EE8E3} {45338E1A-5586-40E6-97AF-709DBBB85AEC} = {2E80965D-0AB1-451E-AFE5-E4CAF49EE8E3} {60B3EE55-D545-4817-A57D-99F38CBCD1A8} = {DB20495E-C9F0-4640-85A6-ACEF17C21670} - {4EC53679-7072-4827-A166-0222A076C358} = {DB20495E-C9F0-4640-85A6-ACEF17C21670} {CCD28DAE-FEF6-4732-A985-B814A95B3408} = {BE29C1CE-D2BC-43F8-9412-50F870CE5538} - {BADB548A-7A51-4B52-8498-69B6C0A1FD77} = {BE29C1CE-D2BC-43F8-9412-50F870CE5538} - {56DB4376-4181-4814-9056-F9DC55EAC026} = {BE29C1CE-D2BC-43F8-9412-50F870CE5538} - {CE27441A-4D2F-4A63-8D02-148A0C51CA47} = {BE29C1CE-D2BC-43F8-9412-50F870CE5538} {6D8841E2-0FE2-4476-BE4B-5BC29D85AAE4} = {BE29C1CE-D2BC-43F8-9412-50F870CE5538} + {56DB4376-4181-4814-9056-F9DC55EAC026} = {BCB9D4DE-1EC1-4826-A80F-E4D2E960D98D} + {CE27441A-4D2F-4A63-8D02-148A0C51CA47} = {BCB9D4DE-1EC1-4826-A80F-E4D2E960D98D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D33CD477-CBDE-47CC-BDAB-7E9469CE3549} diff --git a/src/libraries/System.Net.Security/System.Net.Security.sln b/src/libraries/System.Net.Security/System.Net.Security.sln index 15628521cee..08f2ef102e0 100644 --- a/src/libraries/System.Net.Security/System.Net.Security.sln +++ b/src/libraries/System.Net.Security/System.Net.Security.sln @@ -3,10 +3,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{16B2F746-485C-4A15-883E-ABF2C885DD2A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{FBBF2C5E-3872-41F4-9F2B-1E73C8214A5C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{441D4079-55B4-4C47-A0E5-1330DC9A31CB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security", "ref\System.Net.Security.csproj", "{97493212-ADF3-46AF-8669-F038964CDA22}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security", "src\System.Net.Security.csproj", "{20F20695-DB18-47EB-A005-AA432ADCF865}" @@ -17,16 +13,10 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4379D1FD-1473-4F17-9AC6-85B02EA83250}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{754403CE-ECFC-4EBA-8540-BEB67476FF9F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B9A7E8DB-EA3F-41EB-910C-DEDC1BA48CAA}" 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 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "..\System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj", "{E0D760D1-21BC-468F-B599-858ECFF4AB1D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3F0D8988-4AFB-4AE2-9BA2-07E08765CCD1}" @@ -35,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{19C079E3-367 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{70E29C1C-AC9B-4E71-AB74-9906EF973EBF}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{29A8D8F5-27EF-44B7-8C71-FC4E2D10EBBA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,14 +41,6 @@ Global {16B2F746-485C-4A15-883E-ABF2C885DD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU {16B2F746-485C-4A15-883E-ABF2C885DD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU {16B2F746-485C-4A15-883E-ABF2C885DD2A}.Release|Any CPU.Build.0 = Release|Any CPU - {FBBF2C5E-3872-41F4-9F2B-1E73C8214A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBBF2C5E-3872-41F4-9F2B-1E73C8214A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBBF2C5E-3872-41F4-9F2B-1E73C8214A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBBF2C5E-3872-41F4-9F2B-1E73C8214A5C}.Release|Any CPU.Build.0 = Release|Any CPU - {441D4079-55B4-4C47-A0E5-1330DC9A31CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {441D4079-55B4-4C47-A0E5-1330DC9A31CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {441D4079-55B4-4C47-A0E5-1330DC9A31CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {441D4079-55B4-4C47-A0E5-1330DC9A31CB}.Release|Any CPU.Build.0 = Release|Any CPU {97493212-ADF3-46AF-8669-F038964CDA22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {97493212-ADF3-46AF-8669-F038964CDA22}.Debug|Any CPU.Build.0 = Debug|Any CPU {97493212-ADF3-46AF-8669-F038964CDA22}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -77,14 +61,6 @@ 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 - {4379D1FD-1473-4F17-9AC6-85B02EA83250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4379D1FD-1473-4F17-9AC6-85B02EA83250}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4379D1FD-1473-4F17-9AC6-85B02EA83250}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4379D1FD-1473-4F17-9AC6-85B02EA83250}.Release|Any CPU.Build.0 = Release|Any CPU - {754403CE-ECFC-4EBA-8540-BEB67476FF9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {754403CE-ECFC-4EBA-8540-BEB67476FF9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {754403CE-ECFC-4EBA-8540-BEB67476FF9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {754403CE-ECFC-4EBA-8540-BEB67476FF9F}.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 @@ -93,10 +69,6 @@ Global {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 {BBF8C38F-E4A7-42E3-AEEB-8A2D08E9FF7E}.Release|Any CPU.Build.0 = Release|Any CPU - {E0D760D1-21BC-468F-B599-858ECFF4AB1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0D760D1-21BC-468F-B599-858ECFF4AB1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0D760D1-21BC-468F-B599-858ECFF4AB1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0D760D1-21BC-468F-B599-858ECFF4AB1D}.Release|Any CPU.Build.0 = Release|Any CPU {80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}.Debug|Any CPU.Build.0 = Debug|Any CPU {80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -111,16 +83,11 @@ Global {3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D} = {3F0D8988-4AFB-4AE2-9BA2-07E08765CCD1} {39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28} = {3F0D8988-4AFB-4AE2-9BA2-07E08765CCD1} {E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA} = {3F0D8988-4AFB-4AE2-9BA2-07E08765CCD1} - {FBBF2C5E-3872-41F4-9F2B-1E73C8214A5C} = {19C079E3-367B-480E-A46E-8D56D47F94EA} {97493212-ADF3-46AF-8669-F038964CDA22} = {19C079E3-367B-480E-A46E-8D56D47F94EA} - {4379D1FD-1473-4F17-9AC6-85B02EA83250} = {19C079E3-367B-480E-A46E-8D56D47F94EA} - {441D4079-55B4-4C47-A0E5-1330DC9A31CB} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF} {20F20695-DB18-47EB-A005-AA432ADCF865} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF} - {754403CE-ECFC-4EBA-8540-BEB67476FF9F} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF} - {B9A7E8DB-EA3F-41EB-910C-DEDC1BA48CAA} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF} - {BBF8C38F-E4A7-42E3-AEEB-8A2D08E9FF7E} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF} - {E0D760D1-21BC-468F-B599-858ECFF4AB1D} = {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} + {BBF8C38F-E4A7-42E3-AEEB-8A2D08E9FF7E} = {29A8D8F5-27EF-44B7-8C71-FC4E2D10EBBA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4803416B-CE32-4730-905F-645A9B766D2B} diff --git a/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln b/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln index 7a7548b9fb6..5bfd230735b 100644 --- a/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln +++ b/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C542898D-30FA-4F30-B440-84116642DC97}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7AC1C95E-02B1-4825-88AD-017028DF3952}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{911D1E25-6359-452E-B1B3-900A8BF68532}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{25E4C3E2-CEE1-4725-BB91-2AEB290C0953}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2A282996-B09 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D37D576-0E85-4EEA-9852-B80E14E1053C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{47FBD2B8-E991-449C-A4D7-33A636AD5C7F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {C542898D-30FA-4F30-B440-84116642DC97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C542898D-30FA-4F30-B440-84116642DC97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C542898D-30FA-4F30-B440-84116642DC97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C542898D-30FA-4F30-B440-84116642DC97}.Release|Any CPU.Build.0 = Release|Any CPU - {911D1E25-6359-452E-B1B3-900A8BF68532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {911D1E25-6359-452E-B1B3-900A8BF68532}.Debug|Any CPU.Build.0 = Debug|Any CPU - {911D1E25-6359-452E-B1B3-900A8BF68532}.Release|Any CPU.ActiveCfg = Release|Any CPU - {911D1E25-6359-452E-B1B3-900A8BF68532}.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 + {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 + {A16FDE31-C850-412B-9541-3210D5D48AE1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {1A05E494-230E-439C-9912-33B1A01D0A31} = {25E4C3E2-CEE1-4725-BB91-2AEB290C0953} {550C82C8-F7C2-4EB6-B2C0-87523C2E6640} = {25E4C3E2-CEE1-4725-BB91-2AEB290C0953} {024702F2-6C9B-483E-A229-22F8FB97517C} = {2A282996-B091-4BE8-BBD5-2F25A9C87A74} - {C542898D-30FA-4F30-B440-84116642DC97} = {2A282996-B091-4BE8-BBD5-2F25A9C87A74} {3AE6973A-7E59-4F78-8B3F-FFBFEF38D89A} = {7D37D576-0E85-4EEA-9852-B80E14E1053C} - {911D1E25-6359-452E-B1B3-900A8BF68532} = {7D37D576-0E85-4EEA-9852-B80E14E1053C} + {7AC1C95E-02B1-4825-88AD-017028DF3952} = {47FBD2B8-E991-449C-A4D7-33A636AD5C7F} + {A16FDE31-C850-412B-9541-3210D5D48AE1} = {47FBD2B8-E991-449C-A4D7-33A636AD5C7F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2DB03DED-414C-43AC-A6FD-748FEB8492EB} diff --git a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln index 3f98fd49d7a..924bf040bd6 100644 --- a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln +++ b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln @@ -9,10 +9,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C746C235-7771-46F2-80B3-A67E0C62E436}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3234071E-7F94-4471-8D29-F376DACD8130}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A15BD0D3-0F06-4CB3-B0B3-4233985AC837}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FC5FEA3E-33B EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2C7108F0-035E-44A5-8451-FE9535F53D43}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{51E336C9-CFE7-4459-B407-FD5D9E760D85}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,14 +47,6 @@ 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 - {C746C235-7771-46F2-80B3-A67E0C62E436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C746C235-7771-46F2-80B3-A67E0C62E436}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C746C235-7771-46F2-80B3-A67E0C62E436}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C746C235-7771-46F2-80B3-A67E0C62E436}.Release|Any CPU.Build.0 = Release|Any CPU - {3234071E-7F94-4471-8D29-F376DACD8130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3234071E-7F94-4471-8D29-F376DACD8130}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3234071E-7F94-4471-8D29-F376DACD8130}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3234071E-7F94-4471-8D29-F376DACD8130}.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 @@ -74,11 +64,9 @@ Global {AEDCC778-C0D1-4155-9DD2-45EBF160CDA0} = {FAD51322-998C-42D4-8FAA-EA479A3A0E82} {69A7DCCE-B05B-44F3-B7BC-17A90759D1A2} = {FAD51322-998C-42D4-8FAA-EA479A3A0E82} {FDFDE647-E25F-4B21-B002-4EEEFC42EFA1} = {FC5FEA3E-33B9-4AEE-8E41-367BB73182EF} - {C746C235-7771-46F2-80B3-A67E0C62E436} = {FC5FEA3E-33B9-4AEE-8E41-367BB73182EF} {FD313302-FE04-414E-8A62-3BC8894115C1} = {2C7108F0-035E-44A5-8451-FE9535F53D43} - {3234071E-7F94-4471-8D29-F376DACD8130} = {2C7108F0-035E-44A5-8451-FE9535F53D43} - {A15BD0D3-0F06-4CB3-B0B3-4233985AC837} = {2C7108F0-035E-44A5-8451-FE9535F53D43} - {3DD27643-568B-4BA1-82F2-FACFC8365836} = {2C7108F0-035E-44A5-8451-FE9535F53D43} + {A15BD0D3-0F06-4CB3-B0B3-4233985AC837} = {51E336C9-CFE7-4459-B407-FD5D9E760D85} + {3DD27643-568B-4BA1-82F2-FACFC8365836} = {51E336C9-CFE7-4459-B407-FD5D9E760D85} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BA222465-FBD4-4377-8A8A-783BF85E01F7} diff --git a/src/libraries/System.Net.WebClient/System.Net.WebClient.sln b/src/libraries/System.Net.WebClient/System.Net.WebClient.sln index f0427df2175..7a37f2a5126 100644 --- a/src/libraries/System.Net.WebClient/System.Net.WebClient.sln +++ b/src/libraries/System.Net.WebClient/System.Net.WebClient.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8DBDE7C2-5866-409F-B3BB-9C8B506F1003}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AB52A6C4-216F-4D74-9197-E4A5CA242811}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{39B64124-E091-48D6-B3CB-B358AE7788EE}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B8630BF1-D7F2-4E01-B030-A4E981428E42}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{33D25EB4-FCA EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ECCD7E4F-3B41-4CEA-AF93-152825598039}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EBEFBFED-2B7D-4133-8D79-0F61D6E8A085}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {8DBDE7C2-5866-409F-B3BB-9C8B506F1003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DBDE7C2-5866-409F-B3BB-9C8B506F1003}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DBDE7C2-5866-409F-B3BB-9C8B506F1003}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DBDE7C2-5866-409F-B3BB-9C8B506F1003}.Release|Any CPU.Build.0 = Release|Any CPU - {39B64124-E091-48D6-B3CB-B358AE7788EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39B64124-E091-48D6-B3CB-B358AE7788EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39B64124-E091-48D6-B3CB-B358AE7788EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39B64124-E091-48D6-B3CB-B358AE7788EE}.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 + {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 + {B1389C0F-EAEB-4E1A-AA8F-8A3CED861A2D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {C2828D1D-8EBC-4971-91F9-3FF259066D01} = {B8630BF1-D7F2-4E01-B030-A4E981428E42} {F9889BAD-7D20-4581-9F91-7490EBF5F9CA} = {B8630BF1-D7F2-4E01-B030-A4E981428E42} {F1689AFC-F672-4407-B5C9-3515C301CF31} = {33D25EB4-FCAA-41F3-B411-5946DEF7CEFE} - {8DBDE7C2-5866-409F-B3BB-9C8B506F1003} = {33D25EB4-FCAA-41F3-B411-5946DEF7CEFE} {18F1E6CD-3568-4042-9EC3-6430FD60EC3A} = {ECCD7E4F-3B41-4CEA-AF93-152825598039} - {39B64124-E091-48D6-B3CB-B358AE7788EE} = {ECCD7E4F-3B41-4CEA-AF93-152825598039} + {AB52A6C4-216F-4D74-9197-E4A5CA242811} = {EBEFBFED-2B7D-4133-8D79-0F61D6E8A085} + {B1389C0F-EAEB-4E1A-AA8F-8A3CED861A2D} = {EBEFBFED-2B7D-4133-8D79-0F61D6E8A085} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {22B7F474-635F-4C3B-A730-3BBE6C176F12} diff --git a/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln b/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln index 543044bbb16..c161467b737 100644 --- a/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln +++ b/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7B2FD545-81F8-4604-825A-070AAB9A01CA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B6E17432-73DE-4372-84D4-8397C67847E6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CFCD94CF-6369-4A15-A5BA-F93168B17E84}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{28B0EDC8-886 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0F494C94-E4F3-4171-B171-BBB07EF645BE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{7A189071-7ABF-4420-B91C-8ED1DF536EA3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {7B2FD545-81F8-4604-825A-070AAB9A01CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B2FD545-81F8-4604-825A-070AAB9A01CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B2FD545-81F8-4604-825A-070AAB9A01CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B2FD545-81F8-4604-825A-070AAB9A01CA}.Release|Any CPU.Build.0 = Release|Any CPU - {ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE}.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 + {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 + {7987D82C-3F1E-4B4B-B405-08AFD062C7EE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {90C9B7BA-9AA1-49DA-8DB1-5E7CC8A304D3} = {CFCD94CF-6369-4A15-A5BA-F93168B17E84} {D9180DE2-C834-47A6-B5E9-B95A5EE7FA76} = {CFCD94CF-6369-4A15-A5BA-F93168B17E84} {2050FA72-2FB5-4057-B33A-7716064BE254} = {28B0EDC8-886B-4811-BC62-6FEC32A9E80A} - {7B2FD545-81F8-4604-825A-070AAB9A01CA} = {28B0EDC8-886B-4811-BC62-6FEC32A9E80A} {0C54036A-68E7-4D87-AE77-72279D8DC116} = {0F494C94-E4F3-4171-B171-BBB07EF645BE} - {ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE} = {0F494C94-E4F3-4171-B171-BBB07EF645BE} + {B6E17432-73DE-4372-84D4-8397C67847E6} = {7A189071-7ABF-4420-B91C-8ED1DF536EA3} + {7987D82C-3F1E-4B4B-B405-08AFD062C7EE} = {7A189071-7ABF-4420-B91C-8ED1DF536EA3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EFEE317E-9BE9-4733-A847-E0DBA00099CF} diff --git a/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln b/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln index 58759e16123..6053605824d 100644 --- a/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln +++ b/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7C5F423B-BC8E-4E59-A583-8DABB439A1FB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{68828319-F66B-48F5-BF64-06DC0C333476}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F5ADFF8C-383D-4528-A04A-1B3957BCCB84}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{76353E1C-A06B-4730-99EB-1C231937FF7B}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5A286671-85E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B5211952-F905-4BE8-A3CF-25F393F5E506}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5EE792D4-BBEA-43B7-B822-ED01F9F39343}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {7C5F423B-BC8E-4E59-A583-8DABB439A1FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C5F423B-BC8E-4E59-A583-8DABB439A1FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C5F423B-BC8E-4E59-A583-8DABB439A1FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C5F423B-BC8E-4E59-A583-8DABB439A1FB}.Release|Any CPU.Build.0 = Release|Any CPU - {F5ADFF8C-383D-4528-A04A-1B3957BCCB84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5ADFF8C-383D-4528-A04A-1B3957BCCB84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5ADFF8C-383D-4528-A04A-1B3957BCCB84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5ADFF8C-383D-4528-A04A-1B3957BCCB84}.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 + {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 + {5B219FB9-034D-4A72-976D-B9ED8412DAD3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {4F05FFEE-F76C-440A-8A56-CFDCE04DABAE} = {76353E1C-A06B-4730-99EB-1C231937FF7B} {80A28FFF-68C8-431B-83BE-F04E3155F16A} = {76353E1C-A06B-4730-99EB-1C231937FF7B} {D9D40485-7AAE-474C-833A-C21021A823BF} = {5A286671-85EC-4D44-9777-9ED685F78B6C} - {7C5F423B-BC8E-4E59-A583-8DABB439A1FB} = {5A286671-85EC-4D44-9777-9ED685F78B6C} {C841B625-5802-40BE-850C-FA935E3D6E9A} = {B5211952-F905-4BE8-A3CF-25F393F5E506} - {F5ADFF8C-383D-4528-A04A-1B3957BCCB84} = {B5211952-F905-4BE8-A3CF-25F393F5E506} + {68828319-F66B-48F5-BF64-06DC0C333476} = {5EE792D4-BBEA-43B7-B822-ED01F9F39343} + {5B219FB9-034D-4A72-976D-B9ED8412DAD3} = {5EE792D4-BBEA-43B7-B822-ED01F9F39343} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {91AA499B-9713-4B53-A6A7-7035C7C72935} 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 803ef13a275..49b41632e17 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,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{6B9721B2-00D0-41EC-96B9-6428CF1830CF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{59A23CAB-D098-495F-A467-74C7553FF5BB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7A7356FB-DD87-4A5D-ABA5-44607B6488A0}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A0314AC5-E49 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6F9A42A0-A04B-4CD0-B8C9-9A728274C851}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{58925E96-1A39-4E29-ACB4-4C4DAB81F60A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -55,14 +53,6 @@ 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 - {6B9721B2-00D0-41EC-96B9-6428CF1830CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B9721B2-00D0-41EC-96B9-6428CF1830CF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B9721B2-00D0-41EC-96B9-6428CF1830CF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B9721B2-00D0-41EC-96B9-6428CF1830CF}.Release|Any CPU.Build.0 = Release|Any CPU - {59A23CAB-D098-495F-A467-74C7553FF5BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59A23CAB-D098-495F-A467-74C7553FF5BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59A23CAB-D098-495F-A467-74C7553FF5BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59A23CAB-D098-495F-A467-74C7553FF5BB}.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 @@ -80,12 +70,10 @@ Global {90E8DA45-66F3-491E-B408-82AB85EEAB76} = {BEE2F256-0489-4809-AB20-27ADB2D0E10C} {CA20532A-33B3-4DC0-92D2-EA6D7987D59F} = {BEE2F256-0489-4809-AB20-27ADB2D0E10C} {BEA5BC2C-12D1-4D01-8D2C-5029578BD066} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05} - {6B9721B2-00D0-41EC-96B9-6428CF1830CF} = {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} - {59A23CAB-D098-495F-A467-74C7553FF5BB} = {6F9A42A0-A04B-4CD0-B8C9-9A728274C851} - {7A7356FB-DD87-4A5D-ABA5-44607B6488A0} = {6F9A42A0-A04B-4CD0-B8C9-9A728274C851} - {6659E37B-9C84-4815-9CAB-19F367D3D66D} = {6F9A42A0-A04B-4CD0-B8C9-9A728274C851} + {7A7356FB-DD87-4A5D-ABA5-44607B6488A0} = {58925E96-1A39-4E29-ACB4-4C4DAB81F60A} + {6659E37B-9C84-4815-9CAB-19F367D3D66D} = {58925E96-1A39-4E29-ACB4-4C4DAB81F60A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D91D7DC5-24CC-4716-A357-8170C4EB1C32} diff --git a/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln b/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln index aad7415314f..7a6b52263f8 100644 --- a/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln +++ b/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{15277055-A68B-4BA4-8195-8360EF13906D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{99AAA80A-1368-421B-A750-DB5E04971764}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{FFB1986E-EE56-45B7-8948-07580991D7CC}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9099A547-2E14-439D-8A52-0AB72FF53DBB}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B31191C3-543 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4518E3A1-BCE4-49EE-99C3-DD68D0420E36}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CA82EA7A-B4F6-4A96-A7B1-A6646E51586E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {15277055-A68B-4BA4-8195-8360EF13906D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15277055-A68B-4BA4-8195-8360EF13906D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15277055-A68B-4BA4-8195-8360EF13906D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15277055-A68B-4BA4-8195-8360EF13906D}.Release|Any CPU.Build.0 = Release|Any CPU - {FFB1986E-EE56-45B7-8948-07580991D7CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFB1986E-EE56-45B7-8948-07580991D7CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFB1986E-EE56-45B7-8948-07580991D7CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFB1986E-EE56-45B7-8948-07580991D7CC}.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 + {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 + {41157B1B-46DE-4775-8490-2FF9D9E8E4CA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {069D7B60-D002-4FEC-BE53-62C75EBF823B} = {9099A547-2E14-439D-8A52-0AB72FF53DBB} {5886B73F-4547-4C88-AD69-8D29668CB05B} = {9099A547-2E14-439D-8A52-0AB72FF53DBB} {0C3B9B1F-0C70-4ECE-83A7-21FD93E328CD} = {B31191C3-543F-486D-8273-506BD0717B38} - {15277055-A68B-4BA4-8195-8360EF13906D} = {B31191C3-543F-486D-8273-506BD0717B38} {D701D3C7-0CCD-4245-97C4-A90F3972DFDC} = {4518E3A1-BCE4-49EE-99C3-DD68D0420E36} - {FFB1986E-EE56-45B7-8948-07580991D7CC} = {4518E3A1-BCE4-49EE-99C3-DD68D0420E36} + {99AAA80A-1368-421B-A750-DB5E04971764} = {CA82EA7A-B4F6-4A96-A7B1-A6646E51586E} + {41157B1B-46DE-4775-8490-2FF9D9E8E4CA} = {CA82EA7A-B4F6-4A96-A7B1-A6646E51586E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {78E8A71E-2CB4-4C05-8DBB-C926F44A9393} diff --git a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln index 447aa8ac582..0caae4205eb 100644 --- a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln +++ b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{31FB5731-0E99-4747-9CB2-1B440A9ED74F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B95060C1-814D-464A-84AE-20BF996BA413}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DE94CA7D-BB10-4865-85A6-6B694631247F}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6BC42E6D-848 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AB415F5A-75E5-4E03-8A92-15CEDEC4CD3A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{083161E5-6049-4D84-9739-9D7797D7117D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C}.Release|Any CPU.Build.0 = Release|Any CPU - {B95060C1-814D-464A-84AE-20BF996BA413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B95060C1-814D-464A-84AE-20BF996BA413}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B95060C1-814D-464A-84AE-20BF996BA413}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B95060C1-814D-464A-84AE-20BF996BA413}.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 + {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 + {DB954E01-898A-4FE2-A3AA-180D041AB08F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {9F20CEA1-2216-4432-BBBD-F01E05D17F23} = {DE94CA7D-BB10-4865-85A6-6B694631247F} {4AF6A02D-82C8-4898-9EDF-01F107C25061} = {DE94CA7D-BB10-4865-85A6-6B694631247F} {21CB448A-3882-4337-B416-D1A3E0BCFFC5} = {6BC42E6D-848C-4533-B715-F116E7DB3610} - {AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C} = {6BC42E6D-848C-4533-B715-F116E7DB3610} {848DD000-3D22-4A25-A9D9-05AFF857A116} = {AB415F5A-75E5-4E03-8A92-15CEDEC4CD3A} - {B95060C1-814D-464A-84AE-20BF996BA413} = {AB415F5A-75E5-4E03-8A92-15CEDEC4CD3A} + {31FB5731-0E99-4747-9CB2-1B440A9ED74F} = {083161E5-6049-4D84-9739-9D7797D7117D} + {DB954E01-898A-4FE2-A3AA-180D041AB08F} = {083161E5-6049-4D84-9739-9D7797D7117D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {10A5F2C3-5230-4916-9D4D-BBDB94851037} diff --git a/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj b/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj index 947c439ee8e..78be9a59067 100644 --- a/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj +++ b/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj @@ -34,7 +34,5 @@ System.Numerics.Tensors.SparseTensor<T></PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln index e05d844d416..3d7f0e39712 100644 --- a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln +++ b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{C6EDFA8A-956E-4398-B31F-FA87312BDF9B}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2C4425BA EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{38837FDE-8CFE-4676-B3CE-48165E0FD6CF}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems*{634a3b2b-09f5-4810-b630-ade4d36c47df}*SharedItemsImports = 5 @@ -149,12 +147,12 @@ Global {88F4A78E-4EF9-4EB6-995E-CD24152C4704}.Release|x64.Build.0 = Release|Any CPU {88F4A78E-4EF9-4EB6-995E-CD24152C4704}.Release|x86.ActiveCfg = Release|Any CPU {88F4A78E-4EF9-4EB6-995E-CD24152C4704}.Release|x86.Build.0 = Release|Any CPU - {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|Any CPU.Build.0 = Debug|Any CPU - {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|x64.ActiveCfg = Debug|Any CPU - {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|x64.Build.0 = Debug|Any CPU - {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|x86.ActiveCfg = Debug|Any CPU - {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|x86.Build.0 = Debug|Any CPU + {88F4A78E-4EF9-4EB6-995E-CD24152C4704}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {88F4A78E-4EF9-4EB6-995E-CD24152C4704}.Checked|Any CPU.Build.0 = Debug|Any CPU + {88F4A78E-4EF9-4EB6-995E-CD24152C4704}.Checked|x64.ActiveCfg = Debug|Any CPU + {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 {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Debug|Any CPU.Build.0 = Debug|Any CPU {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -167,12 +165,12 @@ Global {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Release|x64.Build.0 = Release|Any CPU {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Release|x86.ActiveCfg = Release|Any CPU {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Release|x86.Build.0 = Release|Any CPU - {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|Any CPU.Build.0 = Debug|Any CPU - {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|x64.ActiveCfg = Debug|Any CPU - {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|x64.Build.0 = Debug|Any CPU - {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|x86.ActiveCfg = Debug|Any CPU - {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|x86.Build.0 = Debug|Any CPU + {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|Any CPU.Build.0 = Debug|Any CPU + {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|x64.ActiveCfg = Debug|Any CPU + {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|x64.Build.0 = Debug|Any CPU + {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|x86.ActiveCfg = Debug|Any CPU + {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|x86.Build.0 = Debug|Any CPU {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Debug|Any CPU.Build.0 = Debug|Any CPU {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -185,12 +183,12 @@ Global {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Release|x64.Build.0 = Release|Any CPU {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Release|x86.ActiveCfg = Release|Any CPU {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.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 + {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|Any CPU.Build.0 = Debug|Any CPU + {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|x64.ActiveCfg = Debug|Any CPU + {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|x64.Build.0 = Debug|Any CPU + {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|x86.ActiveCfg = Debug|Any CPU + {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.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 @@ -230,12 +228,12 @@ Global {9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F} = {2C4425BA-8478-4BCB-B616-E6FC28ADEAB9} {5B2027FA-F43A-4E80-880F-B3A7A2720AA7} = {ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC} {ED450846-85A0-4CED-B4D9-9EB769CF794B} = {FC10C682-DF71-4EEA-A3A5-E716C1C88AC0} + {9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F} = {2C4425BA-8478-4BCB-B616-E6FC28ADEAB9} {B38797B1-BB45-4B30-9D4F-79D9F4B3735B} = {2C4425BA-8478-4BCB-B616-E6FC28ADEAB9} - {88F4A78E-4EF9-4EB6-995E-CD24152C4704} = {FC10C682-DF71-4EEA-A3A5-E716C1C88AC0} - {DFC21F4E-EC4F-4310-A4DA-B7094AA4D237} = {ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC} - {7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598} = {FC10C682-DF71-4EEA-A3A5-E716C1C88AC0} - {C6EDFA8A-956E-4398-B31F-FA87312BDF9B} = {FC10C682-DF71-4EEA-A3A5-E716C1C88AC0} - {F99EAF58-533E-4941-A0C5-5101309D8AB9} = {FC10C682-DF71-4EEA-A3A5-E716C1C88AC0} + {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} + {F99EAF58-533E-4941-A0C5-5101309D8AB9} = {38837FDE-8CFE-4676-B3CE-48165E0FD6CF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F9EDC1DC-52BE-4C40-90D2-41EE6FB7FA5C} diff --git a/src/libraries/System.ObjectModel/System.ObjectModel.sln b/src/libraries/System.ObjectModel/System.ObjectModel.sln index 09f697eb000..a7088c1c98b 100644 --- a/src/libraries/System.ObjectModel/System.ObjectModel.sln +++ b/src/libraries/System.ObjectModel/System.ObjectModel.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{EE920D2F-7823-4FD2-9313-024E2DF14C10}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{35855258-C164-48D6-B7FE-DC585C39999C}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7D905913-8F74-4711-80B7-CFAD20A5B57B}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E5C2B29-721 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{35DDEBAA-829C-43C1-BB49-29A11589D22D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0534B176-48FC-4F4D-9D44-ADD06237B038}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D}.Release|Any CPU.Build.0 = Release|Any CPU - {35855258-C164-48D6-B7FE-DC585C39999C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35855258-C164-48D6-B7FE-DC585C39999C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35855258-C164-48D6-B7FE-DC585C39999C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35855258-C164-48D6-B7FE-DC585C39999C}.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 + {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 + {A62E47A3-C3A7-421A-B3E6-2DD578A50781}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {D225A590-69FD-4C99-B9D0-2DEF5AEA6C2B} = {7D905913-8F74-4711-80B7-CFAD20A5B57B} {9DB5C0B8-959E-4B0A-99A6-88452FD3C10C} = {7D905913-8F74-4711-80B7-CFAD20A5B57B} {E13B9A3B-BA99-4FA3-9959-B95E14DCB9BC} = {2E5C2B29-721D-4DDF-985F-81CA593E4F42} - {D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D} = {2E5C2B29-721D-4DDF-985F-81CA593E4F42} {583024EB-8FC7-45E3-9C37-85BE43FBD28A} = {35DDEBAA-829C-43C1-BB49-29A11589D22D} - {35855258-C164-48D6-B7FE-DC585C39999C} = {35DDEBAA-829C-43C1-BB49-29A11589D22D} + {EE920D2F-7823-4FD2-9313-024E2DF14C10} = {0534B176-48FC-4F4D-9D44-ADD06237B038} + {A62E47A3-C3A7-421A-B3E6-2DD578A50781} = {0534B176-48FC-4F4D-9D44-ADD06237B038} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {485C729C-EB7F-4DE2-AE84-428EB1D65902} diff --git a/src/libraries/System.Private.CoreLib/src/Internal/Runtime/CompilerServices/Unsafe.cs b/src/libraries/System.Private.CoreLib/src/Internal/Runtime/CompilerServices/Unsafe.cs deleted file mode 100644 index c85a4bb4f71..00000000000 --- a/src/libraries/System.Private.CoreLib/src/Internal/Runtime/CompilerServices/Unsafe.cs +++ /dev/null @@ -1,424 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -#pragma warning disable IDE0060 // implementations provided by the JIT -using System; -using System.Diagnostics.CodeAnalysis; -using System.Runtime.CompilerServices; -using System.Runtime.Versioning; - -// -// The implementations of most the methods in this file are provided as intrinsics. -// In CoreCLR, the body of the functions are replaced by the EE with unsafe code. See see getILIntrinsicImplementationForUnsafe for details. -// In CoreRT, see Internal.IL.Stubs.UnsafeIntrinsics for details. -// - -namespace Internal.Runtime.CompilerServices -{ - // - // Subsetted clone of System.Runtime.CompilerServices.Unsafe for internal runtime use. - // Keep in sync with https://github.com/dotnet/runtime/tree/main/src/libraries/System.Runtime.CompilerServices.Unsafe. - // - - /// <summary> - /// For internal use only. Contains generic, low-level functionality for manipulating pointers. - /// </summary> - [CLSCompliant(false)] - public static unsafe partial class Unsafe - { - /// <summary> - /// Returns a pointer to the given by-ref parameter. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void* AsPointer<T>(ref T value) - { - throw new PlatformNotSupportedException(); - - // ldarg.0 - // conv.u - // ret - } - - /// <summary> - /// Returns the size of an object of the given type parameter. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static int SizeOf<T>() - { -#if CORECLR - typeof(T).ToString(); // Type token used by the actual method body -#endif - throw new PlatformNotSupportedException(); - - // sizeof !!0 - // ret - } - - /// <summary> - /// Casts the given object to the specified type, performs no dynamic type checking. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - [return: NotNullIfNotNull("value")] - public static T As<T>(object? value) where T : class? - { - throw new PlatformNotSupportedException(); - - // ldarg.0 - // ret - } - - /// <summary> - /// Reinterprets the given reference as a reference to a value of type <typeparamref name="TTo"/>. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ref TTo As<TFrom, TTo>(ref TFrom source) - { - throw new PlatformNotSupportedException(); - - // ldarg.0 - // ret - } - - /// <summary> - /// Adds an element offset to the given reference. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ref T Add<T>(ref T source, int elementOffset) - { -#if CORECLR - typeof(T).ToString(); // Type token used by the actual method body - throw new PlatformNotSupportedException(); -#else - return ref AddByteOffset(ref source, (IntPtr)(elementOffset * (nint)SizeOf<T>())); -#endif - } - - /// <summary> - /// Adds an element offset to the given reference. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ref T Add<T>(ref T source, IntPtr elementOffset) - { -#if CORECLR - typeof(T).ToString(); // Type token used by the actual method body - throw new PlatformNotSupportedException(); -#else - return ref AddByteOffset(ref source, (IntPtr)((nint)elementOffset * (nint)SizeOf<T>())); -#endif - } - - /// <summary> - /// Adds an element offset to the given pointer. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void* Add<T>(void* source, int elementOffset) - { -#if CORECLR - typeof(T).ToString(); // Type token used by the actual method body - throw new PlatformNotSupportedException(); -#else - return (byte*)source + (elementOffset * (nint)SizeOf<T>()); -#endif - } - - /// <summary> - /// Adds an byte offset to the given reference. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal static ref T AddByteOffset<T>(ref T source, nuint byteOffset) - { - return ref AddByteOffset(ref source, (IntPtr)(void*)byteOffset); - } - - /// <summary> - /// Determines whether the specified references point to the same location. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool AreSame<T>([AllowNull] ref T left, [AllowNull] ref T right) - { - throw new PlatformNotSupportedException(); - - // ldarg.0 - // ldarg.1 - // ceq - // ret - } - - /// <summary> - /// Determines whether the memory address referenced by <paramref name="left"/> is greater than - /// the memory address referenced by <paramref name="right"/>. - /// </summary> - /// <remarks> - /// This check is conceptually similar to "(void*)(&left) > (void*)(&right)". - /// </remarks> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool IsAddressGreaterThan<T>([AllowNull] ref T left, [AllowNull] ref T right) - { - throw new PlatformNotSupportedException(); - - // ldarg.0 - // ldarg.1 - // cgt.un - // ret - } - - /// <summary> - /// Determines whether the memory address referenced by <paramref name="left"/> is less than - /// the memory address referenced by <paramref name="right"/>. - /// </summary> - /// <remarks> - /// This check is conceptually similar to "(void*)(&left) < (void*)(&right)". - /// </remarks> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool IsAddressLessThan<T>([AllowNull] ref T left, [AllowNull] ref T right) - { - throw new PlatformNotSupportedException(); - - // ldarg.0 - // ldarg.1 - // clt.un - // ret - } - - /// <summary> - /// Initializes a block of memory at the given location with a given initial value - /// without assuming architecture dependent alignment of the address. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void InitBlockUnaligned(ref byte startAddress, byte value, uint byteCount) - { - for (uint i = 0; i < byteCount; i++) - AddByteOffset(ref startAddress, i) = value; - } - - /// <summary> - /// Reads a value of type <typeparamref name="T"/> from the given location. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static T ReadUnaligned<T>(void* source) - { -#if CORECLR - typeof(T).ToString(); // Type token used by the actual method body - throw new PlatformNotSupportedException(); -#else - return Unsafe.As<byte, T>(ref *(byte*)source); -#endif - } - - /// <summary> - /// Reads a value of type <typeparamref name="T"/> from the given location. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static T ReadUnaligned<T>(ref byte source) - { -#if CORECLR - typeof(T).ToString(); // Type token used by the actual method body - throw new PlatformNotSupportedException(); -#else - return Unsafe.As<byte, T>(ref source); -#endif - } - - /// <summary> - /// Writes a value of type <typeparamref name="T"/> to the given location. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteUnaligned<T>(void* destination, T value) - { -#if CORECLR - typeof(T).ToString(); // Type token used by the actual method body - throw new PlatformNotSupportedException(); -#else - Unsafe.As<byte, T>(ref *(byte*)destination) = value; -#endif - } - - /// <summary> - /// Writes a value of type <typeparamref name="T"/> to the given location. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void WriteUnaligned<T>(ref byte destination, T value) - { -#if CORECLR - typeof(T).ToString(); // Type token used by the actual method body - throw new PlatformNotSupportedException(); -#else - Unsafe.As<byte, T>(ref destination) = value; -#endif - } - - /// <summary> - /// Adds an byte offset to the given reference. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ref T AddByteOffset<T>(ref T source, IntPtr byteOffset) - { - // This method is implemented by the toolchain - throw new PlatformNotSupportedException(); - - // ldarg.0 - // ldarg.1 - // add - // ret - } - - /// <summary> - /// Reads a value of type <typeparamref name="T"/> from the given location. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static T Read<T>(void* source) - { - return Unsafe.As<byte, T>(ref *(byte*)source); - } - - /// <summary> - /// Reads a value of type <typeparamref name="T"/> from the given location. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static T Read<T>(ref byte source) - { - return Unsafe.As<byte, T>(ref source); - } - - /// <summary> - /// Writes a value of type <typeparamref name="T"/> to the given location. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void Write<T>(void* destination, T value) - { - Unsafe.As<byte, T>(ref *(byte*)destination) = value; - } - - /// <summary> - /// Writes a value of type <typeparamref name="T"/> to the given location. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void Write<T>(ref byte destination, T value) - { - Unsafe.As<byte, T>(ref destination) = value; - } - - /// <summary> - /// Reinterprets the given location as a reference to a value of type <typeparamref name="T"/>. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ref T AsRef<T>(void* source) - { - return ref Unsafe.As<byte, T>(ref *(byte*)source); - } - - /// <summary> - /// Reinterprets the given location as a reference to a value of type <typeparamref name="T"/>. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ref T AsRef<T>(in T source) - { - throw new PlatformNotSupportedException(); - } - - /// <summary> - /// Determines the byte offset from origin to target from the given references. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static IntPtr ByteOffset<T>([AllowNull] ref T origin, [AllowNull] ref T target) - { - throw new PlatformNotSupportedException(); - } - - /// <summary> - /// Returns a by-ref to type <typeparamref name="T"/> that is a null reference. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ref T NullRef<T>() - { - return ref Unsafe.AsRef<T>(null); - - // ldc.i4.0 - // conv.u - // ret - } - - /// <summary> - /// Returns if a given by-ref to type <typeparamref name="T"/> is a null reference. - /// </summary> - /// <remarks> - /// This check is conceptually similar to "(void*)(&source) == nullptr". - /// </remarks> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static bool IsNullRef<T>(ref T source) - { - return Unsafe.AsPointer(ref source) == null; - - // ldarg.0 - // ldc.i4.0 - // conv.u - // ceq - // ret - } - - /// <summary> - /// Bypasses definite assignment rules by taking advantage of <c>out</c> semantics. - /// </summary> - [Intrinsic] - [NonVersionable] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void SkipInit<T>(out T value) - { - throw new PlatformNotSupportedException(); - - // ret - } - } -} diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems index 857caebab61..f59400b6a0b 100644 --- a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems +++ b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems @@ -56,7 +56,6 @@ <Compile Include="$(MSBuildThisFileDirectory)Internal\AssemblyAttributes.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Internal\Console.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Internal\Padding.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Internal\Runtime\CompilerServices\Unsafe.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Internal\Runtime\InteropServices\ComponentActivator.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Internal\Runtime\InteropServices\IsolatedComponentLoadContext.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Microsoft\Win32\SafeHandles\CriticalHandleMinusOneIsInvalid.cs" /> @@ -765,6 +764,7 @@ <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\CompilerServices\TupleElementNamesAttribute.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\CompilerServices\TypeForwardedFromAttribute.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\CompilerServices\TypeForwardedToAttribute.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\CompilerServices\Unsafe.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\CompilerServices\UnsafeValueTypeAttribute.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\CompilerServices\ValueTaskAwaiter.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\CompilerServices\YieldAwaitable.cs" /> diff --git a/src/libraries/System.Private.CoreLib/src/System/Array.cs b/src/libraries/System.Private.CoreLib/src/System/Array.cs index ae32ed0e29b..1c4c876d46a 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Array.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Array.cs @@ -10,7 +10,6 @@ using System.Numerics; using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/BitConverter.cs b/src/libraries/System.Private.CoreLib/src/System/BitConverter.cs index 5945c6252dc..daedb49aaf6 100644 --- a/src/libraries/System.Private.CoreLib/src/System/BitConverter.cs +++ b/src/libraries/System.Private.CoreLib/src/System/BitConverter.cs @@ -6,8 +6,6 @@ using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; - namespace System { /// <summary> diff --git a/src/libraries/System.Private.CoreLib/src/System/Buffer.cs b/src/libraries/System.Private.CoreLib/src/System/Buffer.cs index 4aa0a9f6e99..c6fc3a5fc06 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Buffer.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Buffer.cs @@ -9,8 +9,6 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; - namespace System { public static partial class Buffer diff --git a/src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Parser/ParserHelpers.cs b/src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Parser/ParserHelpers.cs index 7a25cbc6078..f95cbae3ee2 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Parser/ParserHelpers.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Parser/ParserHelpers.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System.Buffers.Text { diff --git a/src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.cs b/src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.cs index 364be86dcb1..d63a4c592ea 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Utf8Parser/Utf8Parser.Integer.Signed.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.Buffers.Text { diff --git a/src/libraries/System.Private.CoreLib/src/System/Buffers/TlsOverPerCoreLockedStacksArrayPool.cs b/src/libraries/System.Private.CoreLib/src/System/Buffers/TlsOverPerCoreLockedStacksArrayPool.cs index 108cee7b4a6..9206dde5e5f 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Buffers/TlsOverPerCoreLockedStacksArrayPool.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Buffers/TlsOverPerCoreLockedStacksArrayPool.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Runtime.CompilerServices; using System.Threading; -using Internal.Runtime.CompilerServices; namespace System.Buffers { diff --git a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/ArraySortHelper.cs b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/ArraySortHelper.cs index 0f50840b6fa..360b851d662 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/ArraySortHelper.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/ArraySortHelper.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Collections.Generic { diff --git a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs index bc6eb587e80..9107c4f375d 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs @@ -6,8 +6,6 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.Serialization; -using Internal.Runtime.CompilerServices; - namespace System.Collections.Generic { [DebuggerTypeProxy(typeof(IDictionaryDebugView<,>))] diff --git a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSet.cs b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSet.cs index d06b27ea6f7..47b72f57dea 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSet.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/HashSet.cs @@ -6,8 +6,6 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.Serialization; -using Internal.Runtime.CompilerServices; - namespace System.Collections.Generic { [DebuggerTypeProxy(typeof(ICollectionDebugView<>))] diff --git a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/RandomizedStringEqualityComparer.cs b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/RandomizedStringEqualityComparer.cs index 30db6049d22..45fd297e5af 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/RandomizedStringEqualityComparer.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Collections/Generic/RandomizedStringEqualityComparer.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.Collections.Generic { diff --git a/src/libraries/System.Private.CoreLib/src/System/Convert.Base64.cs b/src/libraries/System.Private.CoreLib/src/System/Convert.Base64.cs index 10326669dc3..0f55cd18e13 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Convert.Base64.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Convert.Base64.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/Decimal.DecCalc.cs b/src/libraries/System.Private.CoreLib/src/System/Decimal.DecCalc.cs index a966b35b83c..57754d360db 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Decimal.DecCalc.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Decimal.DecCalc.cs @@ -5,7 +5,7 @@ using System.Diagnostics; using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; + using X86 = System.Runtime.Intrinsics.X86; namespace System diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/FrameworkEventSource.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/FrameworkEventSource.cs index 700955e8cad..49026d20327 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/FrameworkEventSource.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/FrameworkEventSource.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; using System.Diagnostics.CodeAnalysis; namespace System.Diagnostics.Tracing diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventSource.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventSource.cs index 52ee741b94c..8b9fef256dc 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventSource.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventSource.cs @@ -25,7 +25,7 @@ using System.Text; using System.Runtime.CompilerServices; namespace Microsoft.Diagnostics.Tracing #else -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.Diagnostics.Tracing #endif { diff --git a/src/libraries/System.Private.CoreLib/src/System/Double.cs b/src/libraries/System.Private.CoreLib/src/System/Double.cs index 95aa53a263b..91467811d30 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Double.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Double.cs @@ -17,8 +17,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; - namespace System { [Serializable] diff --git a/src/libraries/System.Private.CoreLib/src/System/Enum.cs b/src/libraries/System.Private.CoreLib/src/System/Enum.cs index 86a4e5f545b..5503011fd32 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Enum.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Enum.cs @@ -8,7 +8,6 @@ using System.Globalization; using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; // The code below includes partial support for float/double and // pointer sized enums. diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Icu.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Icu.cs index ee2c509a0e4..77ceddee966 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Icu.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Icu.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Diagnostics; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; -using Internal.Runtime.CompilerServices; namespace System.Globalization { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs index 4f47cd26854..3c1cc9d4d29 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Nls.cs @@ -3,8 +3,8 @@ using System.Diagnostics; using System.Collections.Generic; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Globalization { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs index 7e538c89446..969f0a40529 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.Globalization { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CharUnicodeInfo.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CharUnicodeInfo.cs index 8f4e8cb6b19..2ea405507f8 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CharUnicodeInfo.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CharUnicodeInfo.cs @@ -7,7 +7,6 @@ using System.Runtime.InteropServices; using System.Text; using System.Text.Unicode; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System.Globalization { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.cs index 1bf3346472d..cfda28a9ed2 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.cs @@ -8,8 +8,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Serialization; using System.Text; -using System.Text.Unicode; -using Internal.Runtime.CompilerServices; namespace System.Globalization { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Nls.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Nls.cs index ab765f3494c..f4fe86a2ae9 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Nls.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Nls.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Text; -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; namespace System.Globalization diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/InvariantModeCasing.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/InvariantModeCasing.cs index 61564e0558b..0c10cd2a03f 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/InvariantModeCasing.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/InvariantModeCasing.cs @@ -5,7 +5,6 @@ using System.Text; using System.Diagnostics; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System.Globalization { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs index 7c09e692534..60e6f3647c2 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs @@ -4,8 +4,6 @@ using System.Diagnostics; using System.Text.Unicode; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; -using System.Runtime.InteropServices; namespace System.Globalization { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/OrdinalCasing.Icu.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/OrdinalCasing.Icu.cs index 3e104cba044..7900bab1ea8 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/OrdinalCasing.Icu.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/OrdinalCasing.Icu.cs @@ -6,7 +6,6 @@ using System.Diagnostics; using System.Threading; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System.Globalization { diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs index a0b71e7c618..05890c1c572 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs @@ -8,7 +8,6 @@ using System.Runtime.InteropServices; using System.Runtime.Serialization; using System.Text; using System.Text.Unicode; -using Internal.Runtime.CompilerServices; namespace System.Globalization { diff --git a/src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs b/src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs index e60d3646411..9455ff312b3 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/Guid.cs b/src/libraries/System.Private.CoreLib/src/System/Guid.cs index de5a89ef5bc..99f2628f11c 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Guid.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Guid.cs @@ -9,7 +9,6 @@ using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/HashCode.cs b/src/libraries/System.Private.CoreLib/src/System/HashCode.cs index f40830e416d..8aeece9a102 100644 --- a/src/libraries/System.Private.CoreLib/src/System/HashCode.cs +++ b/src/libraries/System.Private.CoreLib/src/System/HashCode.cs @@ -45,7 +45,6 @@ using System.ComponentModel; using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; #pragma warning disable CA1066 // Implement IEquatable when overriding Object.Equals diff --git a/src/libraries/System.Private.CoreLib/src/System/IO/UnmanagedMemoryAccessor.cs b/src/libraries/System.Private.CoreLib/src/System/IO/UnmanagedMemoryAccessor.cs index 110abad9316..a77d0f53a8e 100644 --- a/src/libraries/System.Private.CoreLib/src/System/IO/UnmanagedMemoryAccessor.cs +++ b/src/libraries/System.Private.CoreLib/src/System/IO/UnmanagedMemoryAccessor.cs @@ -14,7 +14,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.IO { diff --git a/src/libraries/System.Private.CoreLib/src/System/IntPtr.cs b/src/libraries/System.Private.CoreLib/src/System/IntPtr.cs index 843c17ea6c3..b5bfbb345dd 100644 --- a/src/libraries/System.Private.CoreLib/src/System/IntPtr.cs +++ b/src/libraries/System.Private.CoreLib/src/System/IntPtr.cs @@ -8,7 +8,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Serialization; using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; #pragma warning disable SA1121 // explicitly using type aliases instead of built-in types #pragma warning disable CA1066 // Implement IEquatable when overriding Object.Equals diff --git a/src/libraries/System.Private.CoreLib/src/System/Marvin.OrdinalIgnoreCase.cs b/src/libraries/System.Private.CoreLib/src/System/Marvin.OrdinalIgnoreCase.cs index 3b0c9fad76f..1888a5f0c61 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Marvin.OrdinalIgnoreCase.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Marvin.OrdinalIgnoreCase.cs @@ -3,9 +3,9 @@ using System.Buffers; using System.Diagnostics; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text.Unicode; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/Marvin.cs b/src/libraries/System.Private.CoreLib/src/System/Marvin.cs index 322b7888c34..098ebb5260d 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Marvin.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Marvin.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/Memory.cs b/src/libraries/System.Private.CoreLib/src/System/Memory.cs index 55d636fe57b..7ccd228c666 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Memory.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Memory.cs @@ -6,12 +6,10 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Text; + using EditorBrowsableAttribute = System.ComponentModel.EditorBrowsableAttribute; using EditorBrowsableState = System.ComponentModel.EditorBrowsableState; -using Internal.Runtime.CompilerServices; - namespace System { /// <summary> diff --git a/src/libraries/System.Private.CoreLib/src/System/MemoryExtensions.Globalization.cs b/src/libraries/System.Private.CoreLib/src/System/MemoryExtensions.Globalization.cs index 46c19e06b38..b879174b7fb 100644 --- a/src/libraries/System.Private.CoreLib/src/System/MemoryExtensions.Globalization.cs +++ b/src/libraries/System.Private.CoreLib/src/System/MemoryExtensions.Globalization.cs @@ -6,7 +6,6 @@ using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/MemoryExtensions.cs b/src/libraries/System.Private.CoreLib/src/System/MemoryExtensions.cs index 3c7c13fa645..b87c35199a7 100644 --- a/src/libraries/System.Private.CoreLib/src/System/MemoryExtensions.cs +++ b/src/libraries/System.Private.CoreLib/src/System/MemoryExtensions.cs @@ -7,8 +7,6 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; - namespace System { /// <summary> diff --git a/src/libraries/System.Private.CoreLib/src/System/Number.BigInteger.cs b/src/libraries/System.Private.CoreLib/src/System/Number.BigInteger.cs index 48305c4aaa2..f70f98a0a5b 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Number.BigInteger.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Number.BigInteger.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Numerics; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/Number.NumberBuffer.cs b/src/libraries/System.Private.CoreLib/src/System/Number.NumberBuffer.cs index c99f20f85ae..2323f030194 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Number.NumberBuffer.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Number.NumberBuffer.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Text; -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/Number.NumberToFloatingPointBits.cs b/src/libraries/System.Private.CoreLib/src/System/Number.NumberToFloatingPointBits.cs index b4701ab96ac..e88014c3a95 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Number.NumberToFloatingPointBits.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Number.NumberToFloatingPointBits.cs @@ -5,7 +5,6 @@ using System.Buffers.Binary; using System.Diagnostics; using System.Numerics; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs b/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs index 40e2fa9a76e..d9c0662e81d 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Number.Parsing.cs @@ -6,7 +6,6 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/Numerics/BitOperations.cs b/src/libraries/System.Private.CoreLib/src/System/Numerics/BitOperations.cs index 419a1c9f5f1..57f9b763d04 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Numerics/BitOperations.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Numerics/BitOperations.cs @@ -1,15 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.Arm; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; - // Some routines inspired by the Stanford Bit Twiddling Hacks by Sean Eron Anderson: // http://graphics.stanford.edu/~seander/bithacks.html diff --git a/src/libraries/System.Private.CoreLib/src/System/Numerics/Matrix3x2.cs b/src/libraries/System.Private.CoreLib/src/System/Numerics/Matrix3x2.cs index 7c9120de9d1..156fc55c5b4 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Numerics/Matrix3x2.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Numerics/Matrix3x2.cs @@ -1,11 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.Globalization; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System.Numerics { diff --git a/src/libraries/System.Private.CoreLib/src/System/Numerics/Matrix4x4.cs b/src/libraries/System.Private.CoreLib/src/System/Numerics/Matrix4x4.cs index 30b2e4e013f..5d57e13d3d1 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Numerics/Matrix4x4.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Numerics/Matrix4x4.cs @@ -1,9 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Internal.Runtime.CompilerServices; using System.Diagnostics.CodeAnalysis; -using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.Arm; diff --git a/src/libraries/System.Private.CoreLib/src/System/Numerics/Quaternion.cs b/src/libraries/System.Private.CoreLib/src/System/Numerics/Quaternion.cs index 125de94f177..2dc01e10e02 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Numerics/Quaternion.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Numerics/Quaternion.cs @@ -3,9 +3,7 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.Globalization; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System.Numerics { diff --git a/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector.cs b/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector.cs index 667ec0740b2..b9eb29598bb 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector.cs @@ -6,8 +6,6 @@ using System.Runtime.CompilerServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; - namespace System.Numerics { /// <summary>Provides a collection of static convenience methods for creating, manipulating, combining, and converting generic vectors.</summary> diff --git a/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector2.cs b/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector2.cs index ea463e9c09d..575e10f0dd7 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector2.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector2.cs @@ -7,7 +7,6 @@ using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; -using Internal.Runtime.CompilerServices; namespace System.Numerics { diff --git a/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector3.cs b/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector3.cs index 6bee6d783e0..6868adefbd0 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector3.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector3.cs @@ -7,7 +7,6 @@ using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; -using Internal.Runtime.CompilerServices; namespace System.Numerics { diff --git a/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector4.cs b/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector4.cs index 246a3abe601..711cd56d722 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector4.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector4.cs @@ -7,7 +7,6 @@ using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; -using Internal.Runtime.CompilerServices; namespace System.Numerics { diff --git a/src/libraries/System.Private.CoreLib/src/System/Numerics/VectorDebugView_1.cs b/src/libraries/System.Private.CoreLib/src/System/Numerics/VectorDebugView_1.cs index 8558db0a983..dc01af4c68b 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Numerics/VectorDebugView_1.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Numerics/VectorDebugView_1.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.Numerics { diff --git a/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector_1.cs b/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector_1.cs index 756e6314bcd..8f599bc887e 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector_1.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Numerics/Vector_1.cs @@ -9,8 +9,6 @@ using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Text; -using Internal.Runtime.CompilerServices; - namespace System.Numerics { /* Note: The following patterns are used throughout the code here and are described here diff --git a/src/libraries/System.Private.CoreLib/src/System/Random.Xoshiro128StarStarImpl.cs b/src/libraries/System.Private.CoreLib/src/System/Random.Xoshiro128StarStarImpl.cs index de1fe0fee72..cfd33be8ce2 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Random.Xoshiro128StarStarImpl.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Random.Xoshiro128StarStarImpl.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/Random.Xoshiro256StarStarImpl.cs b/src/libraries/System.Private.CoreLib/src/System/Random.Xoshiro256StarStarImpl.cs index 8b4e14ebbc2..bb364172d84 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Random.Xoshiro256StarStarImpl.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Random.Xoshiro256StarStarImpl.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/ReadOnlyMemory.cs b/src/libraries/System.Private.CoreLib/src/System/ReadOnlyMemory.cs index fef6862586e..3f1cb538e4e 100644 --- a/src/libraries/System.Private.CoreLib/src/System/ReadOnlyMemory.cs +++ b/src/libraries/System.Private.CoreLib/src/System/ReadOnlyMemory.cs @@ -6,12 +6,10 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Text; + using EditorBrowsableAttribute = System.ComponentModel.EditorBrowsableAttribute; using EditorBrowsableState = System.ComponentModel.EditorBrowsableState; -using Internal.Runtime.CompilerServices; - namespace System { /// <summary> diff --git a/src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs b/src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs index 1dc3e052652..a7feb7b1366 100644 --- a/src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs +++ b/src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs @@ -5,10 +5,9 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Versioning; -using System.Text; + using EditorBrowsableAttribute = System.ComponentModel.EditorBrowsableAttribute; using EditorBrowsableState = System.ComponentModel.EditorBrowsableState; -using Internal.Runtime.CompilerServices; #pragma warning disable 0809 //warning CS0809: Obsolete member 'Span<T>.Equals(object)' overrides non-obsolete member 'object.Equals(object)' diff --git a/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBase.cs b/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBase.cs index a9d065ffbc3..f1267bb7781 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBase.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBase.cs @@ -7,7 +7,6 @@ using System.Globalization; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; -using Internal.Runtime.CompilerServices; namespace System.Reflection { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncTaskMethodBuilderT.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncTaskMethodBuilderT.cs index fdf9943aeb8..5b1c5459182 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncTaskMethodBuilderT.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncTaskMethodBuilderT.cs @@ -3,9 +3,9 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using Internal.Runtime.CompilerServices; namespace System.Runtime.CompilerServices { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ConditionalWeakTable.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ConditionalWeakTable.cs index 2dc7c898b9e..bc7b441ecef 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ConditionalWeakTable.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ConditionalWeakTable.cs @@ -5,8 +5,8 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.Runtime.CompilerServices; using System.Threading; -using Internal.Runtime.CompilerServices; namespace System.Runtime.CompilerServices { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs index d95a1edcf76..1700fb0cca8 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ConfiguredValueTaskAwaitable.cs @@ -7,8 +7,6 @@ using System.Threading; using System.Threading.Tasks; using System.Threading.Tasks.Sources; -using Internal.Runtime.CompilerServices; - namespace System.Runtime.CompilerServices { /// <summary>Provides an awaitable type that enables configured awaits on a <see cref="ValueTask"/>.</summary> diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/DefaultInterpolatedStringHandler.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/DefaultInterpolatedStringHandler.cs index 2d528f9b1bd..8e441b68856 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/DefaultInterpolatedStringHandler.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/DefaultInterpolatedStringHandler.cs @@ -5,7 +5,6 @@ using System.Buffers; using System.Diagnostics; using System.Globalization; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Runtime.CompilerServices { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/PoolingAsyncValueTaskMethodBuilderT.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/PoolingAsyncValueTaskMethodBuilderT.cs index 5b89453b2e1..0297fd9a1e5 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/PoolingAsyncValueTaskMethodBuilderT.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/PoolingAsyncValueTaskMethodBuilderT.cs @@ -8,7 +8,6 @@ using System.Threading; using System.Threading.Tasks; using System.Threading.Tasks.Sources; using Internal; -using Internal.Runtime.CompilerServices; namespace System.Runtime.CompilerServices { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/QCallHandles.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/QCallHandles.cs index e12808600c4..e3020176fa2 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/QCallHandles.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/QCallHandles.cs @@ -4,8 +4,6 @@ // Wrappers used to pass objects to and from QCalls. using System.Threading; -using Internal.Runtime.CompilerServices; -using System.Diagnostics.CodeAnalysis; namespace System.Runtime.CompilerServices { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.cs index ecd0991d2a7..4215db4af11 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.cs @@ -1,10 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Reflection; -using Internal.Runtime.CompilerServices; namespace System.Runtime.CompilerServices { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/Unsafe.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/Unsafe.cs new file mode 100644 index 00000000000..4d9169389d5 --- /dev/null +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/Unsafe.cs @@ -0,0 +1,913 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#pragma warning disable IDE0060 // implementations provided by the JIT +using System; +using System.Diagnostics.CodeAnalysis; +using System.Runtime.Versioning; + +// +// The implementations of most the methods in this file are provided as intrinsics. +// In CoreCLR, the body of the functions are replaced by the EE with unsafe code. See see getILIntrinsicImplementationForUnsafe for details. +// In CoreRT, see Internal.IL.Stubs.UnsafeIntrinsics for details. +// + +namespace System.Runtime.CompilerServices +{ + /// <summary> + /// Contains generic, low-level functionality for manipulating pointers. + /// </summary> + public static unsafe partial class Unsafe + { + /// <summary> + /// Returns a pointer to the given by-ref parameter. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__AS_POINTER + // CG2:AsPointer + // Mono:AsPointer + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void* AsPointer<T>(ref T value) + { + throw new PlatformNotSupportedException(); + + // ldarg.0 + // conv.u + // ret + } + + /// <summary> + /// Returns the size of an object of the given type parameter. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__SIZEOF + // CG2:SizeOf + // Mono:SizeOf + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static int SizeOf<T>() + { +#if CORECLR + typeof(T).ToString(); // Type token used by the actual method body +#endif + throw new PlatformNotSupportedException(); + + // sizeof !!T + // ret + } + + /// <summary> + /// Casts the given object to the specified type, performs no dynamic type checking. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__OBJECT_AS + // CG2:As + // Mono:As + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + [return: NotNullIfNotNull("value")] + public static T As<T>(object? o) where T : class? + { + throw new PlatformNotSupportedException(); + + // ldarg.0 + // ret + } + + /// <summary> + /// Reinterprets the given reference as a reference to a value of type <typeparamref name="TTo"/>. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_AS + // CG2:As + // Mono:As + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref TTo As<TFrom, TTo>(ref TFrom source) + { + throw new PlatformNotSupportedException(); + + // ldarg.0 + // ret + } + + /// <summary> + /// Adds an element offset to the given reference. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_ADD + // CG2:Add + // Mono:Add + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T Add<T>(ref T source, int elementOffset) + { +#if CORECLR + typeof(T).ToString(); // Type token used by the actual method body + throw new PlatformNotSupportedException(); +#else + return ref AddByteOffset(ref source, (IntPtr)(elementOffset * (nint)SizeOf<T>())); +#endif + // ldarg .0 + // ldarg .1 + // sizeof !!T + // conv.i + // mul + // add + // ret + } + + /// <summary> + /// Adds an element offset to the given reference. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_INTPTR_ADD + // CG2:Add + // Mono:Add + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T Add<T>(ref T source, IntPtr elementOffset) + { +#if CORECLR + typeof(T).ToString(); // Type token used by the actual method body + throw new PlatformNotSupportedException(); +#else + return ref AddByteOffset(ref source, (IntPtr)((nint)elementOffset * (nint)SizeOf<T>())); +#endif + + // ldarg .0 + // ldarg .1 + // sizeof !!T + // mul + // add + // ret + } + + /// <summary> + /// Adds an element offset to the given pointer. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__PTR_ADD + // CG2:Add + // Mono:Add + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void* Add<T>(void* source, int elementOffset) + { +#if CORECLR + typeof(T).ToString(); // Type token used by the actual method body + throw new PlatformNotSupportedException(); +#else + return (byte*)source + (elementOffset * (nint)SizeOf<T>()); +#endif + + // ldarg .0 + // ldarg .1 + // sizeof !!T + // conv.i + // mul + // add + // ret + } + + /// <summary> + /// Adds an element offset to the given reference. + /// </summary> + [Intrinsic] + // CoreCLR: + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T Add<T>(ref T source, nuint elementOffset) + { +#if CORECLR + typeof(T).ToString(); + throw new PlatformNotSupportedException(); +#else + return ref AddByteOffset(ref source, (nuint)(elementOffset * (nuint)SizeOf<T>())); +#endif + + // ldarg .0 + // ldarg .1 + // sizeof !!T + // mul + // add + // ret + } + + /// <summary> + /// Adds an byte offset to the given reference. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_ADD_BYTE_OFFSET_UINTPTR + // CG2:AddByteOffset + // Mono:AddByteOffset + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T AddByteOffset<T>(ref T source, nuint byteOffset) + { +#if CORECLR + typeof(T).ToString(); + throw new PlatformNotSupportedException(); +#else + return ref AddByteOffset(ref source, (IntPtr)(void*)byteOffset); +#endif + + // ldarg .0 + // ldarg .1 + // add + // ret + } + + /// <summary> + /// Determines whether the specified references point to the same location. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_ARE_SAME + // CG2:AreSame + // Mono:AreSame + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool AreSame<T>([AllowNull] ref T left, [AllowNull] ref T right) + { + throw new PlatformNotSupportedException(); + + // ldarg.0 + // ldarg.1 + // ceq + // ret + } + + /// <summary> + /// Copies a value of type T to the given location. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__PTR_BYREF_COPY + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void Copy<T>(void* destination, ref T source) + { + throw new PlatformNotSupportedException(); + + // ldarg .0 + // ldarg .1 + // ldobj !!T + // stobj !!T + // ret + } + + /// <summary> + /// Copies a value of type T to the given location. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_PTR_COPY + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void Copy<T>(ref T destination, void* source) + { + throw new PlatformNotSupportedException(); + + // ldarg .0 + // ldarg .1 + // ldobj !!T + // stobj !!T + // ret + } + + /// <summary> + /// Copies bytes from the source address to the destination address. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__PTR_COPY_BLOCK + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void CopyBlock(void* destination, void* source, uint byteCount) + { + throw new PlatformNotSupportedException(); + + // ldarg .0 + // ldarg .1 + // ldarg .2 + // cpblk + // ret + } + + /// <summary> + /// Copies bytes from the source address to the destination address. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_COPY_BLOCK + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void CopyBlock(ref byte destination, ref byte source, uint byteCount) + { + throw new PlatformNotSupportedException(); + + // ldarg .0 + // ldarg .1 + // ldarg .2 + // cpblk + // ret + } + + /// <summary> + /// Copies bytes from the source address to the destination address without assuming architecture dependent alignment of the addresses. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__PTR_COPY_BLOCK_UNALIGNED + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void CopyBlockUnaligned(void* destination, void* source, uint byteCount) + { + throw new PlatformNotSupportedException(); + + // ldarg .0 + // ldarg .1 + // ldarg .2 + // unaligned. 0x1 + // cpblk + // ret + } + + /// <summary> + /// Copies bytes from the source address to the destination address without assuming architecture dependent alignment of the addresses. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_COPY_BLOCK_UNALIGNED + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void CopyBlockUnaligned(ref byte destination, ref byte source, uint byteCount) + { + throw new PlatformNotSupportedException(); + + // ldarg .0 + // ldarg .1 + // ldarg .2 + // unaligned. 0x1 + // cpblk + // ret + } + + /// <summary> + /// Determines whether the memory address referenced by <paramref name="left"/> is greater than + /// the memory address referenced by <paramref name="right"/>. + /// </summary> + /// <remarks> + /// This check is conceptually similar to "(void*)(&left) > (void*)(&right)". + /// </remarks> + [Intrinsic] + // CoreCLR:CoreCLR:METHOD__UNSAFE__BYREF_IS_ADDRESS_GREATER_THAN + // CG2:IsAddressGreaterThan + // Mono:IsAddressGreaterThan + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool IsAddressGreaterThan<T>([AllowNull] ref T left, [AllowNull] ref T right) + { + throw new PlatformNotSupportedException(); + + // ldarg.0 + // ldarg.1 + // cgt.un + // ret + } + + /// <summary> + /// Determines whether the memory address referenced by <paramref name="left"/> is less than + /// the memory address referenced by <paramref name="right"/>. + /// </summary> + /// <remarks> + /// This check is conceptually similar to "(void*)(&left) < (void*)(&right)". + /// </remarks> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_IS_ADDRESS_LESS_THAN + // CG2:IsAddressLessThan + // Mono:IsAddressLessThan + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool IsAddressLessThan<T>([AllowNull] ref T left, [AllowNull] ref T right) + { + throw new PlatformNotSupportedException(); + + // ldarg.0 + // ldarg.1 + // clt.un + // ret + } + + /// <summary> + /// Initializes a block of memory at the given location with a given initial value. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__PTR_INIT_BLOCK + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void InitBlock(void* startAddress, byte value, uint byteCount) + { + throw new PlatformNotSupportedException(); + + // ldarg .0 + // ldarg .1 + // ldarg .2 + // initblk + // ret + } + + /// <summary> + /// Initializes a block of memory at the given location with a given initial value. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_INIT_BLOCK + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void InitBlock(ref byte startAddress, byte value, uint byteCount) + { + throw new PlatformNotSupportedException(); + + // ldarg .0 + // ldarg .1 + // ldarg .2 + // initblk + // ret + } + + /// <summary> + /// Initializes a block of memory at the given location with a given initial value + /// without assuming architecture dependent alignment of the address. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__PTR_INIT_BLOCK_UNALIGNED + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void InitBlockUnaligned(void* startAddress, byte value, uint byteCount) + { + throw new PlatformNotSupportedException(); + + // ldarg .0 + // ldarg .1 + // ldarg .2 + // unaligned. 0x1 + // initblk + // ret + } + + /// <summary> + /// Initializes a block of memory at the given location with a given initial value + /// without assuming architecture dependent alignment of the address. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_INIT_BLOCK_UNALIGNED + // CG2:InitBlockUnaligned + // Mono:InitBlockUnaligned + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void InitBlockUnaligned(ref byte startAddress, byte value, uint byteCount) + { + for (uint i = 0; i < byteCount; i++) + { + AddByteOffset(ref startAddress, i) = value; + } + + // ldarg .0 + // ldarg .1 + // ldarg .2 + // unaligned. 0x1 + // initblk + // ret + } + + /// <summary> + /// Reads a value of type <typeparamref name="T"/> from the given location. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__PTR_READ_UNALIGNED + // CG2:ReadUnaligned + // Mono:ReadUnaligned + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static T ReadUnaligned<T>(void* source) + { +#if CORECLR + typeof(T).ToString(); // Type token used by the actual method body + throw new PlatformNotSupportedException(); +#else + return Unsafe.As<byte, T>(ref *(byte*)source); +#endif + + // ldarg.0 + // unaligned. 0x1 + // ldobj !!T + // ret + } + + /// <summary> + /// Reads a value of type <typeparamref name="T"/> from the given location. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_READ_UNALIGNED + // CG2:ReadUnaligned + // Mono:ReadUnaligned + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static T ReadUnaligned<T>(ref byte source) + { +#if CORECLR + typeof(T).ToString(); // Type token used by the actual method body + throw new PlatformNotSupportedException(); +#else + return Unsafe.As<byte, T>(ref source); +#endif + + // ldarg.0 + // unaligned. 0x1 + // ldobj !!T + // ret + } + + /// <summary> + /// Writes a value of type <typeparamref name="T"/> to the given location. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__PTR_WRITE_UNALIGNED + // CG2:WriteUnaligned + // Mono:WriteUnaligned + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void WriteUnaligned<T>(void* destination, T value) + { +#if CORECLR + typeof(T).ToString(); // Type token used by the actual method body + throw new PlatformNotSupportedException(); +#else + Unsafe.As<byte, T>(ref *(byte*)destination) = value; +#endif + + // ldarg .0 + // ldarg .1 + // unaligned. 0x01 + // stobj !!T + // ret + } + + /// <summary> + /// Writes a value of type <typeparamref name="T"/> to the given location. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_WRITE_UNALIGNED + // CG2:WriteUnaligned + // Mono:WriteUnaligned + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void WriteUnaligned<T>(ref byte destination, T value) + { +#if CORECLR + typeof(T).ToString(); // Type token used by the actual method body + throw new PlatformNotSupportedException(); +#else + Unsafe.As<byte, T>(ref destination) = value; +#endif + + // ldarg .0 + // ldarg .1 + // unaligned. 0x01 + // stobj !!T + // ret + } + + /// <summary> + /// Adds an byte offset to the given reference. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_ADD_BYTE_OFFSET_INTPTR + // CG2:AddByteOffset + // Mono:AddByteOffset + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T AddByteOffset<T>(ref T source, IntPtr byteOffset) + { + // This method is implemented by the toolchain + throw new PlatformNotSupportedException(); + + // ldarg.0 + // ldarg.1 + // add + // ret + } + + /// <summary> + /// Reads a value of type <typeparamref name="T"/> from the given location. + /// </summary> + //[Intrinsic] + // CG2:Read + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static T Read<T>(void* source) + { + return Unsafe.As<byte, T>(ref *(byte*)source); + + // ldarg.0 + // ldobj !!T + // ret + } + + /// <summary> + /// Writes a value of type <typeparamref name="T"/> to the given location. + /// </summary> + //[Intrinsic] + // CG2:Write + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void Write<T>(void* destination, T value) + { + Unsafe.As<byte, T>(ref *(byte*)destination) = value; + + // ldarg .0 + // ldarg .1 + // stobj !!T + // ret + } + + /// <summary> + /// Reinterprets the given location as a reference to a value of type <typeparamref name="T"/>. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__AS_REF_POINTER + // CG2:AsRef + // Mono:AsRef + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T AsRef<T>(void* source) + { + return ref Unsafe.As<byte, T>(ref *(byte*)source); + + // ldarg .0 + // ret + } + + /// <summary> + /// Reinterprets the given location as a reference to a value of type <typeparamref name="T"/>. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__AS_REF_IN + // CG2:AsRef + // Mono:AsRef + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T AsRef<T>(in T source) + { + throw new PlatformNotSupportedException(); + + //ldarg .0 + //ret + } + + /// <summary> + /// Determines the byte offset from origin to target from the given references. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_BYTE_OFFSET + // CG2:ByteOffset + // Mono:ByteOffset + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static IntPtr ByteOffset<T>([AllowNull] ref T origin, [AllowNull] ref T target) + { + throw new PlatformNotSupportedException(); + + // ldarg .1 + // ldarg .0 + // sub + // ret + } + + /// <summary> + /// Returns a by-ref to type <typeparamref name="T"/> that is a null reference. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_NULLREF + // CG2:NullRef + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T NullRef<T>() + { + return ref Unsafe.AsRef<T>(null); + + // ldc.i4.0 + // conv.u + // ret + } + + /// <summary> + /// Returns if a given by-ref to type <typeparamref name="T"/> is a null reference. + /// </summary> + /// <remarks> + /// This check is conceptually similar to "(void*)(&source) == nullptr". + /// </remarks> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_IS_NULL + // CG2: IsNullRef + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool IsNullRef<T>(ref T source) + { + return Unsafe.AsPointer(ref source) == null; + + // ldarg.0 + // ldc.i4.0 + // conv.u + // ceq + // ret + } + + /// <summary> + /// Bypasses definite assignment rules by taking advantage of <c>out</c> semantics. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__SKIPINIT + // CG2:SkipInit + // Mono:SkipInit + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void SkipInit<T>(out T value) + { + throw new PlatformNotSupportedException(); + + // ret + } + + /// <summary> + /// Subtracts an element offset from the given reference. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_INT_SUBTRACT + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T Subtract<T>(ref T source, int elementOffset) + { +#if CORECLR + typeof(T).ToString(); + throw new PlatformNotSupportedException(); +#else + return ref SubtractByteOffset(ref source, (IntPtr)(elementOffset * (nint)SizeOf<T>())); +#endif + + // ldarg .0 + // ldarg .1 + // sizeof !!T + // conv.i + // mul + // sub + // ret + } + + /// <summary> + /// Subtracts an element offset from the given void pointer. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__PTR_INT_SUBTRACT + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static void* Subtract<T>(void* source, int elementOffset) + { +#if CORECLR + typeof(T).ToString(); + throw new PlatformNotSupportedException(); +#else + return (byte*)source - (elementOffset * (nint)Unsafe.SizeOf<T>()); +#endif + + // ldarg .0 + // ldarg .1 + // sizeof !!T + // conv.i + // mul + // sub + // ret + } + + /// <summary> + /// Subtracts an element offset from the given reference. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_INTPTR_SUBTRACT + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T Subtract<T>(ref T source, IntPtr elementOffset) + { +#if CORECLR + typeof(T).ToString(); + throw new PlatformNotSupportedException(); +#else + return ref SubtractByteOffset(ref source, (IntPtr)((nint)elementOffset * (nint)SizeOf<T>())); +#endif + + // ldarg .0 + // ldarg .1 + // sizeof !!T + // mul + // sub + // ret + } + + /// <summary> + /// Subtracts an element offset from the given reference. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_UINTPTR_SUBTRACT + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T Subtract<T>(ref T source, nuint elementOffset) + { +#if CORECLR + typeof(T).ToString(); + throw new PlatformNotSupportedException(); +#else + return ref SubtractByteOffset(ref source, (nuint)(elementOffset * (nuint)Unsafe.SizeOf<T>())); +#endif + + // ldarg .0 + // ldarg .1 + // sizeof !!T + // mul + // sub + // ret + } + + /// <summary> + /// Subtracts a byte offset from the given reference. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_INTPTR_SUBTRACT_BYTE_OFFSET + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T SubtractByteOffset<T>(ref T source, IntPtr byteOffset) + { + throw new PlatformNotSupportedException(); + + // ldarg .0 + // ldarg .1 + // sub + // ret + } + + /// <summary> + /// Subtracts a byte offset from the given reference. + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__BYREF_UINTPTR_SUBTRACT_BYTE_OFFSET + [NonVersionable] + [CLSCompliant(false)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T SubtractByteOffset<T>(ref T source, nuint byteOffset) + { +#if CORECLR + typeof(T).ToString(); + throw new PlatformNotSupportedException(); +#else + return ref SubtractByteOffset(ref source, (IntPtr)(void*)byteOffset); +#endif + + // ldarg .0 + // ldarg .1 + // sub + // ret + } + + /// <summary> + /// Returns a mutable ref to a boxed value + /// </summary> + [Intrinsic] + // CoreCLR:METHOD__UNSAFE__UNBOX + [NonVersionable] + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ref T Unbox<T>(object box) + where T : struct + { + throw new PlatformNotSupportedException(); + + // ldarg .0 + // unbox !!T + // ret + } + } +} diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ValueTaskAwaiter.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ValueTaskAwaiter.cs index 68675a82f0a..1c7008340ae 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ValueTaskAwaiter.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/ValueTaskAwaiter.cs @@ -6,8 +6,6 @@ using System.Threading; using System.Threading.Tasks; using System.Threading.Tasks.Sources; -using Internal.Runtime.CompilerServices; - namespace System.Runtime.CompilerServices { /// <summary>Provides an awaiter for a <see cref="ValueTask"/>.</summary> diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/GCHandle.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/GCHandle.cs index a1c849b48c7..1a79a82741e 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/GCHandle.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/GCHandle.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Threading; -using Internal.Runtime.CompilerServices; namespace System.Runtime.InteropServices { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.cs index 9dd7d748370..c6dea8edb62 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.cs @@ -8,8 +8,6 @@ using System.Runtime.Versioning; using System.Security; using System.Text; -using Internal.Runtime.CompilerServices; - namespace System.Runtime.InteropServices { /// <summary> diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.cs index 51d79d5785a..f024762bba3 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System.Runtime.InteropServices { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/NFloat.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/NFloat.cs index 62d9a8d30e1..00c187aeba5 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/NFloat.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/NFloat.cs @@ -4,9 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; #pragma warning disable SA1121 // We use our own aliases since they differ per platform #if TARGET_32BIT diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/SafeBuffer.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/SafeBuffer.cs index bad9b6d9d0b..2a0ea5c95bc 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/SafeBuffer.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/SafeBuffer.cs @@ -65,7 +65,6 @@ // assignments in a static class constructor are under a lock implicitly. using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; using Microsoft.Win32.SafeHandles; namespace System.Runtime.InteropServices diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128.cs index 4483e3bc0c8..05704b791a9 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128.cs @@ -8,8 +8,6 @@ using System.Runtime.InteropServices; using System.Runtime.Intrinsics.Arm; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; - namespace System.Runtime.Intrinsics { // We mark certain methods with AggressiveInlining to ensure that the JIT will diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128DebugView_1.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128DebugView_1.cs index 2f1669d707c..1fd277ea68d 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128DebugView_1.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128DebugView_1.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.Runtime.Intrinsics { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128_1.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128_1.cs index d98a05f9635..58708fb15ff 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128_1.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector128_1.cs @@ -4,14 +4,11 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; -using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Intrinsics.X86; using System.Text; -using Internal.Runtime.CompilerServices; - namespace System.Runtime.Intrinsics { // We mark certain methods with AggressiveInlining to ensure that the JIT will diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256.cs index 9dba4bcf29c..393fbfc84ed 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256.cs @@ -7,8 +7,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; - namespace System.Runtime.Intrinsics { // We mark certain methods with AggressiveInlining to ensure that the JIT will diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256DebugView_1.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256DebugView_1.cs index 78d4f5f9d51..431225d11e2 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256DebugView_1.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256DebugView_1.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.Runtime.Intrinsics { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256_1.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256_1.cs index 4a3e0833778..93ff4f851d9 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256_1.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector256_1.cs @@ -10,8 +10,6 @@ using System.Runtime.InteropServices; using System.Runtime.Intrinsics.X86; using System.Text; -using Internal.Runtime.CompilerServices; - namespace System.Runtime.Intrinsics { // We mark certain methods with AggressiveInlining to ensure that the JIT will diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64.cs index c6e458325cd..a7bc16aeac6 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64.cs @@ -7,8 +7,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Intrinsics.Arm; -using Internal.Runtime.CompilerServices; - namespace System.Runtime.Intrinsics { public static class Vector64 diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64DebugView_1.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64DebugView_1.cs index 144aaae15f9..ea88da3e768 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64DebugView_1.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64DebugView_1.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.Runtime.Intrinsics { diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64_1.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64_1.cs index e8332e0813b..dff148377e0 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64_1.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/Intrinsics/Vector64_1.cs @@ -4,13 +4,10 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; -using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; -using Internal.Runtime.CompilerServices; - namespace System.Runtime.Intrinsics { [Intrinsic] diff --git a/src/libraries/System.Private.CoreLib/src/System/Single.cs b/src/libraries/System.Private.CoreLib/src/System/Single.cs index 35c6a1d8e7b..7ca80ba8340 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Single.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Single.cs @@ -16,8 +16,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; - namespace System { [Serializable] diff --git a/src/libraries/System.Private.CoreLib/src/System/Span.cs b/src/libraries/System.Private.CoreLib/src/System/Span.cs index b512a53a632..540b4ce2c88 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Span.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Span.cs @@ -7,7 +7,6 @@ using System.Runtime.InteropServices; using System.Runtime.Versioning; using EditorBrowsableAttribute = System.ComponentModel.EditorBrowsableAttribute; using EditorBrowsableState = System.ComponentModel.EditorBrowsableState; -using Internal.Runtime.CompilerServices; #pragma warning disable 0809 //warning CS0809: Obsolete member 'Span<T>.Equals(object)' overrides non-obsolete member 'object.Equals(object)' diff --git a/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.BinarySearch.cs b/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.BinarySearch.cs index 4b8c9127cd2..03fb662a68b 100644 --- a/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.BinarySearch.cs +++ b/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.BinarySearch.cs @@ -2,12 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; - namespace System { internal static partial class SpanHelpers diff --git a/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.Byte.cs b/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.Byte.cs index 42490e36271..ba4a450432e 100644 --- a/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.Byte.cs +++ b/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.Byte.cs @@ -8,8 +8,6 @@ using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.Arm; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; - namespace System { internal static partial class SpanHelpers // .Byte diff --git a/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.Char.cs b/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.Char.cs index 580e719d1b1..b6eae1f286c 100644 --- a/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.Char.cs +++ b/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.Char.cs @@ -8,8 +8,6 @@ using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.Arm; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; - namespace System { internal static partial class SpanHelpers // .Char diff --git a/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.T.cs b/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.T.cs index 27944aff487..5fd3f5f9bac 100644 --- a/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.T.cs +++ b/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.T.cs @@ -4,9 +4,7 @@ using System.Diagnostics; using System.Numerics; using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; using System.Runtime.Intrinsics; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.cs b/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.cs index 9cc75163f09..fba4f5cdbeb 100644 --- a/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.cs +++ b/src/libraries/System.Private.CoreLib/src/System/SpanHelpers.cs @@ -2,8 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; - -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/String.Comparison.cs b/src/libraries/System.Private.CoreLib/src/System/String.Comparison.cs index 8860c7a660b..bcc5060e068 100644 --- a/src/libraries/System.Private.CoreLib/src/System/String.Comparison.cs +++ b/src/libraries/System.Private.CoreLib/src/System/String.Comparison.cs @@ -10,8 +10,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text.Unicode; -using Internal.Runtime.CompilerServices; - namespace System { public partial class String diff --git a/src/libraries/System.Private.CoreLib/src/System/String.Manipulation.cs b/src/libraries/System.Private.CoreLib/src/System/String.Manipulation.cs index 764f79f4d4e..d18d4c729a8 100644 --- a/src/libraries/System.Private.CoreLib/src/System/String.Manipulation.cs +++ b/src/libraries/System.Private.CoreLib/src/System/String.Manipulation.cs @@ -5,11 +5,11 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.Numerics; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; using System.Text; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/String.Searching.cs b/src/libraries/System.Private.CoreLib/src/System/String.Searching.cs index 5c1d4c3426d..6b2d5514717 100644 --- a/src/libraries/System.Private.CoreLib/src/System/String.Searching.cs +++ b/src/libraries/System.Private.CoreLib/src/System/String.Searching.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Globalization; -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/String.cs b/src/libraries/System.Private.CoreLib/src/System/String.cs index e3d96683650..624600bf398 100644 --- a/src/libraries/System.Private.CoreLib/src/System/String.cs +++ b/src/libraries/System.Private.CoreLib/src/System/String.cs @@ -11,7 +11,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Versioning; using System.Text; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/ASCIIUtility.cs b/src/libraries/System.Private.CoreLib/src/System/Text/ASCIIUtility.cs index d4663f05292..8fd4df503b0 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/ASCIIUtility.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/ASCIIUtility.cs @@ -8,10 +8,6 @@ using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.Arm; using System.Runtime.Intrinsics.X86; -#if SYSTEM_PRIVATE_CORELIB -using Internal.Runtime.CompilerServices; -#endif - namespace System.Text { internal static partial class ASCIIUtility diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Encoding.Internal.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Encoding.Internal.cs index 6d55ee8ad0f..e4db618e547 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Encoding.Internal.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Encoding.Internal.cs @@ -5,7 +5,6 @@ using System.Buffers; using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Text { diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Latin1Utility.Helpers.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Latin1Utility.Helpers.cs index 16d1afb034a..c9ba5c25f74 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Latin1Utility.Helpers.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Latin1Utility.Helpers.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; namespace System.Text { diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Latin1Utility.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Latin1Utility.cs index 81936ca9673..8482d318f97 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Latin1Utility.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Latin1Utility.cs @@ -6,7 +6,6 @@ using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; -using Internal.Runtime.CompilerServices; namespace System.Text { diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/StringBuilder.cs b/src/libraries/System.Private.CoreLib/src/System/Text/StringBuilder.cs index 3a79d8c8f0e..6b7a085b1bc 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/StringBuilder.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/StringBuilder.cs @@ -8,7 +8,6 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Serialization; -using Internal.Runtime.CompilerServices; namespace System.Text { diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf16Utility.Validation.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf16Utility.Validation.cs index c5b27ed8e88..313cc74a87a 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf16Utility.Validation.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf16Utility.Validation.cs @@ -8,10 +8,6 @@ using System.Runtime.Intrinsics.Arm; using System.Runtime.Intrinsics.X86; using System.Numerics; -#if SYSTEM_PRIVATE_CORELIB -using Internal.Runtime.CompilerServices; -#endif - namespace System.Text.Unicode { internal static unsafe partial class Utf16Utility diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8.cs index 18a65596d07..94c1d57a4f1 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8.cs @@ -6,10 +6,6 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -#if SYSTEM_PRIVATE_CORELIB -using Internal.Runtime.CompilerServices; -#endif - namespace System.Text.Unicode { #if SYSTEM_PRIVATE_CORELIB diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Helpers.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Helpers.cs index 628c8a976a5..01808058a89 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Helpers.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Helpers.cs @@ -6,10 +6,6 @@ using System.Diagnostics; using System.Numerics; using System.Runtime.CompilerServices; -#if SYSTEM_PRIVATE_CORELIB -using Internal.Runtime.CompilerServices; -#endif - namespace System.Text.Unicode { internal static partial class Utf8Utility diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Transcoding.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Transcoding.cs index b13c66c565a..77866f028ea 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Transcoding.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Transcoding.cs @@ -9,10 +9,6 @@ using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.Arm; using System.Runtime.Intrinsics.X86; -#if SYSTEM_PRIVATE_CORELIB -using Internal.Runtime.CompilerServices; -#endif - namespace System.Text.Unicode { internal static unsafe partial class Utf8Utility diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Validation.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Validation.cs index 93c404d3245..5784cfa1364 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Validation.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.Validation.cs @@ -8,10 +8,6 @@ using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.Arm; using System.Runtime.Intrinsics.X86; -#if SYSTEM_PRIVATE_CORELIB -using Internal.Runtime.CompilerServices; -#endif - namespace System.Text.Unicode { internal static unsafe partial class Utf8Utility diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.cs b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.cs index 91db035d8ef..d553441c77c 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/Unicode/Utf8Utility.cs @@ -1,16 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Buffers; -using System.Diagnostics; -using System.IO; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -#if SYSTEM_PRIVATE_CORELIB -using Internal.Runtime.CompilerServices; -#endif - namespace System.Text.Unicode { internal static partial class Utf8Utility diff --git a/src/libraries/System.Private.CoreLib/src/System/Text/UnicodeEncoding.cs b/src/libraries/System.Private.CoreLib/src/System/Text/UnicodeEncoding.cs index c33944c3358..fc699cb342d 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Text/UnicodeEncoding.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Text/UnicodeEncoding.cs @@ -11,10 +11,9 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; - namespace System.Text { public class UnicodeEncoding : Encoding diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Interlocked.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Interlocked.cs index e2dceefb632..f81b0933cb8 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Interlocked.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Interlocked.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System.Threading { diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.cs index c5113ec6365..3b202732596 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.cs @@ -2,10 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Threading; -using System.Diagnostics.Tracing; using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Diagnostics.Tracing { diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.cs index 785000089bd..d22844dcc4b 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/NativeRuntimeEventSource.PortableThreadPool.cs @@ -4,7 +4,6 @@ using System.Threading; using System.Diagnostics.Tracing; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System.Diagnostics.Tracing { diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs index 91ccb46db95..421af0e5034 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/Task.cs @@ -10,13 +10,11 @@ // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Diagnostics; using System.Diagnostics.Tracing; using System.Runtime.CompilerServices; using System.Runtime.ExceptionServices; using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; namespace System.Threading.Tasks { diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/TplEventSource.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/TplEventSource.cs index eea410711a3..d6242062b8d 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/TplEventSource.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/TplEventSource.cs @@ -1,10 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Runtime.CompilerServices; using System.Diagnostics.Tracing; using System.Diagnostics.CodeAnalysis; -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System.Threading.Tasks { diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/ValueTask.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/ValueTask.cs index 3118072c757..108abf5c029 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/ValueTask.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Tasks/ValueTask.cs @@ -7,7 +7,6 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading.Tasks.Sources; -using Internal.Runtime.CompilerServices; namespace System.Threading.Tasks { diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadInt64PersistentCounter.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadInt64PersistentCounter.cs index c152087b9b6..b56276d22f3 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadInt64PersistentCounter.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadInt64PersistentCounter.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System.Threading { diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPoolWorkQueue.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPoolWorkQueue.cs index 45a665b8830..4a7a1665622 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPoolWorkQueue.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPoolWorkQueue.cs @@ -18,7 +18,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Versioning; using System.Threading.Tasks; -using Internal.Runtime.CompilerServices; using Microsoft.Win32.SafeHandles; namespace System.Threading diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/Volatile.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/Volatile.cs index be5b7d0e87d..c2b7af65ce0 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Threading/Volatile.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Threading/Volatile.cs @@ -4,7 +4,6 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; namespace System.Threading { diff --git a/src/libraries/System.Private.CoreLib/src/System/TypedReference.cs b/src/libraries/System.Private.CoreLib/src/System/TypedReference.cs index 8087c6024e6..c1bc0549827 100644 --- a/src/libraries/System.Private.CoreLib/src/System/TypedReference.cs +++ b/src/libraries/System.Private.CoreLib/src/System/TypedReference.cs @@ -6,7 +6,6 @@ using System.Reflection; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.CoreLib/src/System/UIntPtr.cs b/src/libraries/System.Private.CoreLib/src/System/UIntPtr.cs index fe47b811905..f9180fa4410 100644 --- a/src/libraries/System.Private.CoreLib/src/System/UIntPtr.cs +++ b/src/libraries/System.Private.CoreLib/src/System/UIntPtr.cs @@ -8,7 +8,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Serialization; using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; #pragma warning disable SA1121 // explicitly using type aliases instead of built-in types #pragma warning disable CA1066 // Implement IEquatable when overriding Object.Equals 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 6069df8ce3a..9806f283a39 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,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9B76030A-9DBD-401E-90B7-18111831B0D9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F1642F23-C510-423E-8598-4B3A09DA28DB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{133C6563-CA56-456A-9B63-CA5F3EA7E5CA}" 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}" @@ -17,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0866D4B1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F323228E-200C-4069-98A1-E2400F3061B3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B7387D02-A1E8-4ED1-833D-65D6112F00A0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{53D4886A-6035-458C-834C-D7EDC02A0E26}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -37,14 +33,6 @@ 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 - {9B76030A-9DBD-401E-90B7-18111831B0D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B76030A-9DBD-401E-90B7-18111831B0D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B76030A-9DBD-401E-90B7-18111831B0D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B76030A-9DBD-401E-90B7-18111831B0D9}.Release|Any CPU.Build.0 = Release|Any CPU - {F1642F23-C510-423E-8598-4B3A09DA28DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1642F23-C510-423E-8598-4B3A09DA28DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1642F23-C510-423E-8598-4B3A09DA28DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1642F23-C510-423E-8598-4B3A09DA28DB}.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 @@ -61,10 +49,8 @@ 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} - {F1642F23-C510-423E-8598-4B3A09DA28DB} = {F323228E-200C-4069-98A1-E2400F3061B3} - {133C6563-CA56-456A-9B63-CA5F3EA7E5CA} = {F323228E-200C-4069-98A1-E2400F3061B3} - {8061897F-550F-4932-8D35-126BE3CA894C} = {F323228E-200C-4069-98A1-E2400F3061B3} - {9B76030A-9DBD-401E-90B7-18111831B0D9} = {B7387D02-A1E8-4ED1-833D-65D6112F00A0} + {133C6563-CA56-456A-9B63-CA5F3EA7E5CA} = {53D4886A-6035-458C-834C-D7EDC02A0E26} + {8061897F-550F-4932-8D35-126BE3CA894C} = {53D4886A-6035-458C-834C-D7EDC02A0E26} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {339DAF44-AC08-4D3B-BB34-6DA417E800E7} diff --git a/src/libraries/System.Private.Uri/System.Private.Uri.sln b/src/libraries/System.Private.Uri/System.Private.Uri.sln index f4a11693f0f..3beab54ef23 100644 --- a/src/libraries/System.Private.Uri/System.Private.Uri.sln +++ b/src/libraries/System.Private.Uri/System.Private.Uri.sln @@ -13,10 +13,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F6024229-9D81-4C97-9655-398A1414A6DC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{01EDF06D-BBBB-42D7-9414-A332292235D3}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9094F5BF-3AED-4473-A136-B91874528734}" 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}" @@ -25,7 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A30957A2-C72 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0B746374-3940-443C-8F32-05060CD9D066}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E3179181-D7ED-459C-B0ED-40DF10FC1959}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -166,42 +162,6 @@ 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 - {F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|x64.ActiveCfg = Debug|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|x64.Build.0 = Debug|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|x86.ActiveCfg = Debug|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|x86.Build.0 = Debug|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Release|Any CPU.Build.0 = Release|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Release|x64.ActiveCfg = Release|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Release|x64.Build.0 = Release|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Release|x86.ActiveCfg = Release|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Release|x86.Build.0 = Release|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Checked|Any CPU.Build.0 = Debug|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Checked|x64.ActiveCfg = Debug|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Checked|x64.Build.0 = Debug|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Checked|x86.ActiveCfg = Debug|Any CPU - {F6024229-9D81-4C97-9655-398A1414A6DC}.Checked|x86.Build.0 = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|x64.ActiveCfg = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|x64.Build.0 = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|x86.ActiveCfg = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|x86.Build.0 = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|Any CPU.Build.0 = Release|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|x64.ActiveCfg = Release|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|x64.Build.0 = Release|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|x86.ActiveCfg = Release|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|x86.Build.0 = Release|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Checked|Any CPU.Build.0 = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Checked|x64.ActiveCfg = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Checked|x64.Build.0 = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.Checked|x86.ActiveCfg = Debug|Any CPU - {01EDF06D-BBBB-42D7-9414-A332292235D3}.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 @@ -244,16 +204,14 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {C150B694-015F-48BD-8CB0-EFF1F7A84DCE} = {A30957A2-C729-49F1-8C75-C42D5BCB8309} - {D9F21DA7-0FE6-419E-9CE3-DFFBC3F0067F} = {A30957A2-C729-49F1-8C75-C42D5BCB8309} {98AC821B-892E-4F58-AF3D-503747FD6A8F} = {A30957A2-C729-49F1-8C75-C42D5BCB8309} - {01EDF06D-BBBB-42D7-9414-A332292235D3} = {A30957A2-C729-49F1-8C75-C42D5BCB8309} - {9094F5BF-3AED-4473-A136-B91874528734} = {A30957A2-C729-49F1-8C75-C42D5BCB8309} - {B532288A-97AF-473C-B334-E5F6F572907C} = {A30957A2-C729-49F1-8C75-C42D5BCB8309} {ADD88187-83E2-4EAF-BFB4-BC6249E76457} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05} {37859855-7E5C-4772-B5D2-7029211EAB92} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05} {BDD0866A-D856-40EE-A9D5-1DAC11095E42} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05} {650441DF-021A-45C3-9560-F9FDB3037A64} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05} - {F6024229-9D81-4C97-9655-398A1414A6DC} = {0B746374-3940-443C-8F32-05060CD9D066} + {D9F21DA7-0FE6-419E-9CE3-DFFBC3F0067F} = {E3179181-D7ED-459C-B0ED-40DF10FC1959} + {9094F5BF-3AED-4473-A136-B91874528734} = {E3179181-D7ED-459C-B0ED-40DF10FC1959} + {B532288A-97AF-473C-B334-E5F6F572907C} = {E3179181-D7ED-459C-B0ED-40DF10FC1959} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EB54DAE5-7032-48C6-8714-21ED3B5B2D1E} diff --git a/src/libraries/System.Private.Uri/src/System/Uri.cs b/src/libraries/System.Private.Uri/src/System/Uri.cs index 647636e7efd..abbd4e5ace6 100644 --- a/src/libraries/System.Private.Uri/src/System/Uri.cs +++ b/src/libraries/System.Private.Uri/src/System/Uri.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Internal.Runtime.CompilerServices; using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Serialization; using System.Text; diff --git a/src/libraries/System.Private.Uri/src/System/UriScheme.cs b/src/libraries/System.Private.Uri/src/System/UriScheme.cs index d23e6f1f677..ce2d1015140 100644 --- a/src/libraries/System.Private.Uri/src/System/UriScheme.cs +++ b/src/libraries/System.Private.Uri/src/System/UriScheme.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Threading; -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System { diff --git a/src/libraries/System.Private.Uri/src/System/UriSyntax.cs b/src/libraries/System.Private.Uri/src/System/UriSyntax.cs index a1533657bc0..eca45209664 100644 --- a/src/libraries/System.Private.Uri/src/System/UriSyntax.cs +++ b/src/libraries/System.Private.Uri/src/System/UriSyntax.cs @@ -7,7 +7,7 @@ using System.Collections; using System.Diagnostics; using System.Threading; -using Internal.Runtime.CompilerServices; +using System.Runtime.CompilerServices; namespace System { 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 6392bb2d1a3..a5abfd2e5b0 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,10 +37,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{28B0CB77-2187-4CCD-8190-283FCA9800B1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F442C967-0D66-4EFF-8875-1D165AA80621}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{C3DDCB78-D522-4A6E-838C-B2E9034F2A74}" 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}" @@ -49,7 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4CB964C2 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1C4146F1-CF77-449B-865C-5E67ECF0362B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D82CEFE7-0F7E-4A18-80FE-6562E12E1283}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E9DEC5AA-D875-466B-9E3C-26CFD3C806D3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -133,14 +129,6 @@ 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 - {28B0CB77-2187-4CCD-8190-283FCA9800B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28B0CB77-2187-4CCD-8190-283FCA9800B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28B0CB77-2187-4CCD-8190-283FCA9800B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28B0CB77-2187-4CCD-8190-283FCA9800B1}.Release|Any CPU.Build.0 = Release|Any CPU - {F442C967-0D66-4EFF-8875-1D165AA80621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F442C967-0D66-4EFF-8875-1D165AA80621}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F442C967-0D66-4EFF-8875-1D165AA80621}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F442C967-0D66-4EFF-8875-1D165AA80621}.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 @@ -173,10 +161,8 @@ 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} - {F442C967-0D66-4EFF-8875-1D165AA80621} = {1C4146F1-CF77-449B-865C-5E67ECF0362B} - {C3DDCB78-D522-4A6E-838C-B2E9034F2A74} = {1C4146F1-CF77-449B-865C-5E67ECF0362B} - {D85F6247-9473-4AA3-80C8-06D65B035C98} = {1C4146F1-CF77-449B-865C-5E67ECF0362B} - {28B0CB77-2187-4CCD-8190-283FCA9800B1} = {D82CEFE7-0F7E-4A18-80FE-6562E12E1283} + {C3DDCB78-D522-4A6E-838C-B2E9034F2A74} = {E9DEC5AA-D875-466B-9E3C-26CFD3C806D3} + {D85F6247-9473-4AA3-80C8-06D65B035C98} = {E9DEC5AA-D875-466B-9E3C-26CFD3C806D3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {466CF638-AFDA-4A38-97EF-C87ED7B93443} diff --git a/src/libraries/System.Private.Xml/System.Private.Xml.sln b/src/libraries/System.Private.Xml/System.Private.Xml.sln index 40cdc4fdfd5..b4168707507 100644 --- a/src/libraries/System.Private.Xml/System.Private.Xml.sln +++ b/src/libraries/System.Private.Xml/System.Private.Xml.sln @@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDiff", "..\Common\tests\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6222F04D-AF3C-4CA3-A564-F4FED0A60F64}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SerializableAssembly", "..\Microsoft.XmlSerializer.Generator\tests\SerializableAssembly.csproj", "{8FC1BB5E-395F-469B-80D8-4EE782C04AD9}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "src\System.Private.Xml.csproj", "{B49AD269-3938-4F33-AEF8-029D3A94138F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Misc.Tests", "tests\Misc\System.Xml.Misc.Tests.csproj", "{A1DBA542-0E3C-4767-9BDB-58238C195856}" @@ -67,10 +69,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D85F5D9C-A068-4F04-B081-0A3E20CB5D49}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6D5DCBE4-A8BF-4AA6-BC9B-F3A3DBE8A999}" 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}" @@ -79,7 +77,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E96EBB95 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{41E18B29-2DB1-495A-8460-E7A257F8EA07}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{148C103A-1CDD-4CBF-AC5F-5BADBC14B6DA}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{75FE1E48-B986-46E6-874F-336D74FF6C94}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -107,6 +105,10 @@ Global {6222F04D-AF3C-4CA3-A564-F4FED0A60F64}.Debug|Any CPU.Build.0 = Debug|Any CPU {6222F04D-AF3C-4CA3-A564-F4FED0A60F64}.Release|Any CPU.ActiveCfg = Release|Any CPU {6222F04D-AF3C-4CA3-A564-F4FED0A60F64}.Release|Any CPU.Build.0 = Release|Any CPU + {8FC1BB5E-395F-469B-80D8-4EE782C04AD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8FC1BB5E-395F-469B-80D8-4EE782C04AD9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8FC1BB5E-395F-469B-80D8-4EE782C04AD9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8FC1BB5E-395F-469B-80D8-4EE782C04AD9}.Release|Any CPU.Build.0 = Release|Any CPU {B49AD269-3938-4F33-AEF8-029D3A94138F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B49AD269-3938-4F33-AEF8-029D3A94138F}.Debug|Any CPU.Build.0 = Debug|Any CPU {B49AD269-3938-4F33-AEF8-029D3A94138F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -223,14 +225,6 @@ 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 - {D85F5D9C-A068-4F04-B081-0A3E20CB5D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D85F5D9C-A068-4F04-B081-0A3E20CB5D49}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D85F5D9C-A068-4F04-B081-0A3E20CB5D49}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D85F5D9C-A068-4F04-B081-0A3E20CB5D49}.Release|Any CPU.Build.0 = Release|Any CPU - {742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7}.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 @@ -249,6 +243,7 @@ Global {E9C8AF65-4553-42C7-8E8A-6EBC12B473B5} = {E96EBB95-6AC7-4ECD-AD77-30F089F2C1F9} {ADD6F934-4933-47A1-A700-AA63D6474097} = {E96EBB95-6AC7-4ECD-AD77-30F089F2C1F9} {6222F04D-AF3C-4CA3-A564-F4FED0A60F64} = {E96EBB95-6AC7-4ECD-AD77-30F089F2C1F9} + {8FC1BB5E-395F-469B-80D8-4EE782C04AD9} = {E96EBB95-6AC7-4ECD-AD77-30F089F2C1F9} {A1DBA542-0E3C-4767-9BDB-58238C195856} = {E96EBB95-6AC7-4ECD-AD77-30F089F2C1F9} {EF288754-66B1-4E80-8044-2D69EBB0F121} = {E96EBB95-6AC7-4ECD-AD77-30F089F2C1F9} {AE2A48D5-AA4E-4B0D-875B-2624B23D79E1} = {E96EBB95-6AC7-4ECD-AD77-30F089F2C1F9} @@ -278,10 +273,8 @@ 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} - {742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7} = {41E18B29-2DB1-495A-8460-E7A257F8EA07} - {6D5DCBE4-A8BF-4AA6-BC9B-F3A3DBE8A999} = {41E18B29-2DB1-495A-8460-E7A257F8EA07} - {9CDA14FB-7312-45E7-BF4C-1E446C2242BC} = {41E18B29-2DB1-495A-8460-E7A257F8EA07} - {D85F5D9C-A068-4F04-B081-0A3E20CB5D49} = {148C103A-1CDD-4CBF-AC5F-5BADBC14B6DA} + {6D5DCBE4-A8BF-4AA6-BC9B-F3A3DBE8A999} = {75FE1E48-B986-46E6-874F-336D74FF6C94} + {9CDA14FB-7312-45E7-BF4C-1E446C2242BC} = {75FE1E48-B986-46E6-874F-336D74FF6C94} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {80121011-1A73-45DC-80FC-B3727F3DF58C} diff --git a/src/libraries/System.Reflection.Context/System.Reflection.Context.sln b/src/libraries/System.Reflection.Context/System.Reflection.Context.sln index 248ce3dba57..e79b76f0f62 100644 --- a/src/libraries/System.Reflection.Context/System.Reflection.Context.sln +++ b/src/libraries/System.Reflection.Context/System.Reflection.Context.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{2648D7B5-003A-467A-826A-CDE03B943FB1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F4C16B80-9B9A-418B-9FCE-F288AD49F498}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E2C4A406-41A9-433F-B90E-37692D466B14}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C676A2DE-6F6F-44AF-B869-53C834A272AF}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{31D51BA2-EB4 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E460C3AC-CC68-44E7-9256-75062C1CF587}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AC2F6758-1191-4142-B369-6C2E27A4BEBC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {2648D7B5-003A-467A-826A-CDE03B943FB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2648D7B5-003A-467A-826A-CDE03B943FB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2648D7B5-003A-467A-826A-CDE03B943FB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2648D7B5-003A-467A-826A-CDE03B943FB1}.Release|Any CPU.Build.0 = Release|Any CPU - {E2C4A406-41A9-433F-B90E-37692D466B14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2C4A406-41A9-433F-B90E-37692D466B14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2C4A406-41A9-433F-B90E-37692D466B14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2C4A406-41A9-433F-B90E-37692D466B14}.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 + {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 + {7EEF6CAC-49D4-4D06-9414-2C9175898D13}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {22839FD5-6046-4E0F-9065-A3E5F2A7FEC1} = {C676A2DE-6F6F-44AF-B869-53C834A272AF} {34EA59F6-6177-4957-9894-563A73B02D63} = {C676A2DE-6F6F-44AF-B869-53C834A272AF} {B2EBCE83-FA49-4ECD-9E8E-AF231AADFF67} = {31D51BA2-EB4E-4EC1-908D-EC23CB91C89D} - {2648D7B5-003A-467A-826A-CDE03B943FB1} = {31D51BA2-EB4E-4EC1-908D-EC23CB91C89D} {794EAE71-36BA-436D-841A-A8C72AADF485} = {E460C3AC-CC68-44E7-9256-75062C1CF587} - {E2C4A406-41A9-433F-B90E-37692D466B14} = {E460C3AC-CC68-44E7-9256-75062C1CF587} + {F4C16B80-9B9A-418B-9FCE-F288AD49F498} = {AC2F6758-1191-4142-B369-6C2E27A4BEBC} + {7EEF6CAC-49D4-4D06-9414-2C9175898D13} = {AC2F6758-1191-4142-B369-6C2E27A4BEBC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BD91D429-58C1-4CA3-A800-E308C697485B} diff --git a/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln b/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln index 6580b729e82..f85afc62503 100644 --- a/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln +++ b/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln @@ -9,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{627447CE-9FE8-4A29-BC06-D6BBBEC34A8B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B1AB64B4-F907-4221-A93B-3D4B630E7AF7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CEDCB991-EBD8-4617-B81B-94E73DC50712}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A93B0848-1831-47F3-AE2E-196950D1BBF0}" EndProject @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F1A0875B-026 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{95661E1D-F86D-4EDC-AF44-E0F782BB7E4B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{03BEF49E-85A2-49A8-9A48-EF93FA21B743}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,14 +47,14 @@ 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 - {627447CE-9FE8-4A29-BC06-D6BBBEC34A8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {627447CE-9FE8-4A29-BC06-D6BBBEC34A8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {627447CE-9FE8-4A29-BC06-D6BBBEC34A8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {627447CE-9FE8-4A29-BC06-D6BBBEC34A8B}.Release|Any CPU.Build.0 = Release|Any CPU - {CEDCB991-EBD8-4617-B81B-94E73DC50712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CEDCB991-EBD8-4617-B81B-94E73DC50712}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CEDCB991-EBD8-4617-B81B-94E73DC50712}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CEDCB991-EBD8-4617-B81B-94E73DC50712}.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 + {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 + {318BE680-88DD-478B-ABA8-B19C1BBB93E9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -62,9 +64,9 @@ Global {64DC5B04-1B00-4E98-A0B2-B30FAF43F8A6} = {A93B0848-1831-47F3-AE2E-196950D1BBF0} {86C30AC7-2B89-4757-A580-0FB318D9E784} = {A93B0848-1831-47F3-AE2E-196950D1BBF0} {DE8CF6FB-C4B6-42B4-ADEE-9CE6066DB6D8} = {F1A0875B-0263-4071-8847-F0A2C479F6F9} - {627447CE-9FE8-4A29-BC06-D6BBBEC34A8B} = {F1A0875B-0263-4071-8847-F0A2C479F6F9} {F5A284B5-10D3-43D4-BB3F-F0FB55033504} = {95661E1D-F86D-4EDC-AF44-E0F782BB7E4B} - {CEDCB991-EBD8-4617-B81B-94E73DC50712} = {95661E1D-F86D-4EDC-AF44-E0F782BB7E4B} + {B1AB64B4-F907-4221-A93B-3D4B630E7AF7} = {03BEF49E-85A2-49A8-9A48-EF93FA21B743} + {318BE680-88DD-478B-ABA8-B19C1BBB93E9} = {03BEF49E-85A2-49A8-9A48-EF93FA21B743} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {32381969-33E3-4DA1-A3DD-82AC1EA2FF9E} 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 2ba9f755e9b..fdef2dc07e3 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,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1CD00FA1-9919-45C2-B4E0-ED96C3E98C57}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C723F596-B18 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{61C529DF-66C4-42E9-AE70-3427838FAFE3}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{155A2103-05C1-4020-8922-4F6275F6AE7E}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A20A0878-5647-4145-B224-C390446B7676}" EndProject Global @@ -146,42 +144,6 @@ 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 - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|x64.ActiveCfg = Debug|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|x64.Build.0 = Debug|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|x86.ActiveCfg = Debug|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|x86.Build.0 = Debug|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|Any CPU.Build.0 = Release|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|x64.ActiveCfg = Release|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|x64.Build.0 = Release|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|x86.ActiveCfg = Release|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|x86.Build.0 = Release|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Checked|Any CPU.Build.0 = Debug|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Checked|x64.ActiveCfg = Debug|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Checked|x64.Build.0 = Debug|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Checked|x86.ActiveCfg = Debug|Any CPU - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Checked|x86.Build.0 = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|x64.ActiveCfg = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|x64.Build.0 = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|x86.ActiveCfg = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|x86.Build.0 = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|Any CPU.Build.0 = Release|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|x64.ActiveCfg = Release|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|x64.Build.0 = Release|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|x86.ActiveCfg = Release|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|x86.Build.0 = Release|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Checked|Any CPU.Build.0 = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Checked|x64.ActiveCfg = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Checked|x64.Build.0 = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Checked|x86.ActiveCfg = Debug|Any CPU - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.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 @@ -224,15 +186,13 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {B1053D24-237E-4E55-9413-20B34ED79F23} = {C723F596-B189-428C-A090-F4965F87A73D} - {8843EA69-AD8F-4C73-8436-1641470199DC} = {C723F596-B189-428C-A090-F4965F87A73D} {A18E814C-13D6-4859-B6FA-3CAB8673B31F} = {C723F596-B189-428C-A090-F4965F87A73D} - {2F96336D-6AB0-4463-9A9F-5ED91E737DEA} = {C723F596-B189-428C-A090-F4965F87A73D} - {1CD00FA1-9919-45C2-B4E0-ED96C3E98C57} = {C723F596-B189-428C-A090-F4965F87A73D} - {3461E542-7F19-4B98-B206-BDF932529A5B} = {C723F596-B189-428C-A090-F4965F87A73D} {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} + {3461E542-7F19-4B98-B206-BDF932529A5B} = {155A2103-05C1-4020-8922-4F6275F6AE7E} {64BBA40A-8DB5-4829-815A-3D612A12222D} = {A20A0878-5647-4145-B224-C390446B7676} - {FA5B6CDF-982C-47F5-95E0-5C1DE3391188} = {A20A0878-5647-4145-B224-C390446B7676} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {248E0825-3C88-4854-B192-C50C9FDDBBC3} 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 9e3961834d7..a05a350cbf1 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,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B21E0098-7443-4475-997B-E6AB3B42E4D6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0285779D-C970-4E27-820E-C204E556DD19}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DCA81145-5491-4A3A-9362-642435B33230}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C3D946CF-3A3 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FF41EFDD-DD1F-428F-B25E-DD9B85D5A992}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{09AE6FA7-7363-4994-BC62-3685AE151227}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2AB40A0A-24D5-40B9-AA94-5BF17878879A}" EndProject Global @@ -146,42 +144,6 @@ 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 - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|x64.ActiveCfg = Debug|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|x64.Build.0 = Debug|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|x86.ActiveCfg = Debug|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|x86.Build.0 = Debug|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|Any CPU.Build.0 = Release|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|x64.ActiveCfg = Release|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|x64.Build.0 = Release|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|x86.ActiveCfg = Release|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|x86.Build.0 = Release|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Checked|Any CPU.Build.0 = Debug|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Checked|x64.ActiveCfg = Debug|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Checked|x64.Build.0 = Debug|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Checked|x86.ActiveCfg = Debug|Any CPU - {B21E0098-7443-4475-997B-E6AB3B42E4D6}.Checked|x86.Build.0 = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Debug|x64.ActiveCfg = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Debug|x64.Build.0 = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Debug|x86.ActiveCfg = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Debug|x86.Build.0 = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Release|Any CPU.Build.0 = Release|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Release|x64.ActiveCfg = Release|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Release|x64.Build.0 = Release|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Release|x86.ActiveCfg = Release|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Release|x86.Build.0 = Release|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Checked|Any CPU.Build.0 = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Checked|x64.ActiveCfg = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Checked|x64.Build.0 = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.Checked|x86.ActiveCfg = Debug|Any CPU - {0285779D-C970-4E27-820E-C204E556DD19}.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 @@ -224,15 +186,13 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {209EDA22-1D20-4180-BE4C-53DEE1758B5D} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1} - {165A3077-1F79-46E7-8BFA-88AACEB6D026} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1} {BC6947B4-C61B-4066-B75F-937992548E54} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1} - {0285779D-C970-4E27-820E-C204E556DD19} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1} - {DCA81145-5491-4A3A-9362-642435B33230} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1} - {913E983B-B16C-4B1E-BD37-906CFF93CAB4} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1} {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} + {913E983B-B16C-4B1E-BD37-906CFF93CAB4} = {09AE6FA7-7363-4994-BC62-3685AE151227} {EE535D8F-D21B-4C18-A915-60E94CE19CA2} = {2AB40A0A-24D5-40B9-AA94-5BF17878879A} - {B21E0098-7443-4475-997B-E6AB3B42E4D6} = {2AB40A0A-24D5-40B9-AA94-5BF17878879A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DC34C129-6D43-4A78-966A-9152BFF226C0} diff --git a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln index 8de9514ee80..0fc5a0b02a3 100644 --- a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln +++ b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F4AEC0D3-A456-48CE-A103-175E302187D8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C8601778-612D-4274-9F36-17F938E65603}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1801A03A-C09B-4641-B2CD-D986A7D36BF8}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{74F4AB97-3DB EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2FC35C2F-76DB-4D84-B421-9700BEA4D161}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C36D185D-9B3D-42E5-985F-E21B3BAF3B6D}" EndProject Global @@ -146,42 +144,6 @@ 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 - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|x64.ActiveCfg = Debug|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|x64.Build.0 = Debug|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|x86.ActiveCfg = Debug|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|x86.Build.0 = Debug|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|Any CPU.Build.0 = Release|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|x64.ActiveCfg = Release|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|x64.Build.0 = Release|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|x86.ActiveCfg = Release|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|x86.Build.0 = Release|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Checked|Any CPU.Build.0 = Debug|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Checked|x64.ActiveCfg = Debug|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Checked|x64.Build.0 = Debug|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Checked|x86.ActiveCfg = Debug|Any CPU - {F4AEC0D3-A456-48CE-A103-175E302187D8}.Checked|x86.Build.0 = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Debug|x64.ActiveCfg = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Debug|x64.Build.0 = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Debug|x86.ActiveCfg = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Debug|x86.Build.0 = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Release|Any CPU.Build.0 = Release|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Release|x64.ActiveCfg = Release|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Release|x64.Build.0 = Release|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Release|x86.ActiveCfg = Release|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Release|x86.Build.0 = Release|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Checked|Any CPU.Build.0 = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Checked|x64.ActiveCfg = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Checked|x64.Build.0 = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.Checked|x86.ActiveCfg = Debug|Any CPU - {C8601778-612D-4274-9F36-17F938E65603}.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 @@ -224,15 +186,13 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {772C93D4-FC45-46AA-B09F-26F01B672EDC} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} - {848EFB55-86B5-4259-BAA2-A49C6E3421A9} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} {B479A4BF-A3A5-4255-A3EF-135015BD877F} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} - {C8601778-612D-4274-9F36-17F938E65603} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} - {1801A03A-C09B-4641-B2CD-D986A7D36BF8} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} - {506EBBFA-FF57-4141-A725-882110C17598} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} {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} + {506EBBFA-FF57-4141-A725-882110C17598} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B} {6A176C5B-206D-4550-AC36-0530218E29F5} = {C36D185D-9B3D-42E5-985F-E21B3BAF3B6D} - {F4AEC0D3-A456-48CE-A103-175E302187D8} = {C36D185D-9B3D-42E5-985F-E21B3BAF3B6D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {739AA767-154B-4C69-8C9B-C3D332833D92} diff --git a/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln b/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln index 914cabda399..1a01e47c8e2 100644 --- a/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln +++ b/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{08A031FF-0E53-4A67-9798-C9E5D48B4A74}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2B67DB08-C9F1-4F21-B98F-117C5ACCBC69}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{432DCBE4-C371-452C-8310-60D84E962154}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5843C437-47E1-4D29-880B-ECF7D5404620}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0EDCC16B-76C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{83D8FA0E-C4ED-4C99-BEA5-7390AF616789}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{7AE28A5D-C27D-4EB6-8E45-91C62F4DAE19}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {08A031FF-0E53-4A67-9798-C9E5D48B4A74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08A031FF-0E53-4A67-9798-C9E5D48B4A74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08A031FF-0E53-4A67-9798-C9E5D48B4A74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08A031FF-0E53-4A67-9798-C9E5D48B4A74}.Release|Any CPU.Build.0 = Release|Any CPU - {432DCBE4-C371-452C-8310-60D84E962154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {432DCBE4-C371-452C-8310-60D84E962154}.Debug|Any CPU.Build.0 = Debug|Any CPU - {432DCBE4-C371-452C-8310-60D84E962154}.Release|Any CPU.ActiveCfg = Release|Any CPU - {432DCBE4-C371-452C-8310-60D84E962154}.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 + {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 + {EB7DB8A7-06C5-4235-8E89-D918FAA5F279}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {51DFF0B9-72DB-4432-8DBA-551019047723} = {5843C437-47E1-4D29-880B-ECF7D5404620} {1519BE4C-D14A-4741-B9BE-1516CDAE91D9} = {5843C437-47E1-4D29-880B-ECF7D5404620} {C5FFC3AB-A8EC-430D-B8C7-35A583D0215B} = {0EDCC16B-76C1-404F-92FB-D7983226387F} - {08A031FF-0E53-4A67-9798-C9E5D48B4A74} = {0EDCC16B-76C1-404F-92FB-D7983226387F} {2A71A275-D88D-48FA-B35A-CF27ADCF4EA7} = {83D8FA0E-C4ED-4C99-BEA5-7390AF616789} - {432DCBE4-C371-452C-8310-60D84E962154} = {83D8FA0E-C4ED-4C99-BEA5-7390AF616789} + {2B67DB08-C9F1-4F21-B98F-117C5ACCBC69} = {7AE28A5D-C27D-4EB6-8E45-91C62F4DAE19} + {EB7DB8A7-06C5-4235-8E89-D918FAA5F279} = {7AE28A5D-C27D-4EB6-8E45-91C62F4DAE19} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DCEC891D-045E-42C6-B041-3CDA580638ED} diff --git a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln index 0fe153a72b0..0e6eec3413f 100644 --- a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln +++ b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln @@ -11,9 +11,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{00147002-F430-4E24-95F8-5E79A4D24AE2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{80DB130A-55D8-47EB-9726-14AC069D28B3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5E36AB65-74DD-47F5-8F2E-9050561BBFEE}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{57E0E2C2-76DD-4219-B164-E513C4F8BE01}" EndProject @@ -21,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0829DF11-600 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5E8418DF-67A1-4FA6-9241-215415C4D50A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{3FDA41E5-7DFA-48DC-856B-09E5747E3C9C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,14 +53,14 @@ 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 - {00147002-F430-4E24-95F8-5E79A4D24AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00147002-F430-4E24-95F8-5E79A4D24AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00147002-F430-4E24-95F8-5E79A4D24AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00147002-F430-4E24-95F8-5E79A4D24AE2}.Release|Any CPU.Build.0 = Release|Any CPU - {5E36AB65-74DD-47F5-8F2E-9050561BBFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E36AB65-74DD-47F5-8F2E-9050561BBFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E36AB65-74DD-47F5-8F2E-9050561BBFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E36AB65-74DD-47F5-8F2E-9050561BBFEE}.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 + {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 + {930B1167-83BE-42CC-BFED-096CB2BA19F1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -68,10 +70,10 @@ Global {7EE935DD-2F8B-4C72-BACF-5DB95DE080BE} = {57E0E2C2-76DD-4219-B164-E513C4F8BE01} {282C76D4-54C5-44BF-9F15-1A4302234DBB} = {0829DF11-6008-4678-B608-D754E87EBC70} {587255BE-DC22-4B85-9E3F-02325E7B4FF7} = {0829DF11-6008-4678-B608-D754E87EBC70} - {00147002-F430-4E24-95F8-5E79A4D24AE2} = {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} - {5E36AB65-74DD-47F5-8F2E-9050561BBFEE} = {5E8418DF-67A1-4FA6-9241-215415C4D50A} + {80DB130A-55D8-47EB-9726-14AC069D28B3} = {3FDA41E5-7DFA-48DC-856B-09E5747E3C9C} + {930B1167-83BE-42CC-BFED-096CB2BA19F1} = {3FDA41E5-7DFA-48DC-856B-09E5747E3C9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {64BB97AB-FD23-40BA-B638-FE4756AE6452} diff --git a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln index 89305ad65d4..2009ce37d32 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln +++ b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln @@ -15,9 +15,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{89A190B3-9568-4057-A032-7D28262D51F5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{DD83F8D4-2C22-4489-BB06-4468C5DADA00}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B5FC4A9B-CBD2-4102-A1E8-60B822AAD619}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F45DECCA-03D3-4087-AB01-F099C027DC33}" EndProject @@ -25,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B3731232-B2F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C9409DA5-0A3B-4194-AEB8-3CA7A6D5387E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E86A915C-E800-4558-AFDC-F41C4095B2DF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -63,14 +65,14 @@ 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 - {89A190B3-9568-4057-A032-7D28262D51F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89A190B3-9568-4057-A032-7D28262D51F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89A190B3-9568-4057-A032-7D28262D51F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89A190B3-9568-4057-A032-7D28262D51F5}.Release|Any CPU.Build.0 = Release|Any CPU - {B5FC4A9B-CBD2-4102-A1E8-60B822AAD619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5FC4A9B-CBD2-4102-A1E8-60B822AAD619}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5FC4A9B-CBD2-4102-A1E8-60B822AAD619}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5FC4A9B-CBD2-4102-A1E8-60B822AAD619}.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 + {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 + {7393C7CD-4C31-4B1C-96DC-1D46D240538A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -81,11 +83,11 @@ Global {22BDB23C-24DE-4C3C-9A18-A048C445EDC1} = {B3731232-B2FE-401B-A9F1-5DFB1A90D687} {7AE8D7FD-6CEE-4F70-8675-0896AA6487BD} = {B3731232-B2FE-401B-A9F1-5DFB1A90D687} {45C9DD05-BD43-49EB-84C3-668200358062} = {B3731232-B2FE-401B-A9F1-5DFB1A90D687} - {89A190B3-9568-4057-A032-7D28262D51F5} = {B3731232-B2FE-401B-A9F1-5DFB1A90D687} {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} - {B5FC4A9B-CBD2-4102-A1E8-60B822AAD619} = {C9409DA5-0A3B-4194-AEB8-3CA7A6D5387E} + {DD83F8D4-2C22-4489-BB06-4468C5DADA00} = {E86A915C-E800-4558-AFDC-F41C4095B2DF} + {7393C7CD-4C31-4B1C-96DC-1D46D240538A} = {E86A915C-E800-4558-AFDC-F41C4095B2DF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CA7F05F8-4589-46FA-9AC5-4F96F2AE890C} diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj index c440191179e..204d148b856 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -170,7 +170,5 @@ System.Reflection.MetadataAssemblyResolver</PackageDescription> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln index ba25a1eed41..f199acbb8cf 100644 --- a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln +++ b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGen EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{654344FB-C5C8-4364-B43B-C2C9530B96F8}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4599348B-0480-47D4-9763-F3C6716D3CCC}" EndProject Global @@ -142,10 +144,10 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {661E0A3D-E151-45B2-AA38-B30F8227A741} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50} - {869B6F76-2329-474A-854E-5AD5541A1CA0} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50} {5D40069E-7CC2-4B40-A41D-6B003CCB4075} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50} - {AA8D698E-B854-4D0E-83A2-0EAD0BA62122} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50} - {6DF455E8-D2C8-40EC-AEF2-AE05A66405F7} = {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} + {6DF455E8-D2C8-40EC-AEF2-AE05A66405F7} = {654344FB-C5C8-4364-B43B-C2C9530B96F8} {9D308994-9721-4883-B32D-531FA8D9025B} = {4599348B-0480-47D4-9763-F3C6716D3CCC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln index 0da0851f8cd..7ea4ab57fc7 100644 --- a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln +++ b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C12B737F-2265-4F48-9BEA-B9023063AC91}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{F7D2A806-877A-4FCB-843E-920F86B226CE}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3A79F8E8-9E6 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9BB99B5C-97D7-4247-B682-27CBBFCF1BB4}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{89B14D9D-2BBE-446A-8ED8-020F7BBA6CFC}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B05E90C8-0282-4D7D-955E-3BE8A400D3A6}" EndProject Global @@ -146,42 +144,6 @@ 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 - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|x64.ActiveCfg = Debug|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|x64.Build.0 = Debug|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|x86.ActiveCfg = Debug|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|x86.Build.0 = Debug|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|Any CPU.Build.0 = Release|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|x64.ActiveCfg = Release|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|x64.Build.0 = Release|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|x86.ActiveCfg = Release|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|x86.Build.0 = Release|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Checked|Any CPU.Build.0 = Debug|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Checked|x64.ActiveCfg = Debug|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Checked|x64.Build.0 = Debug|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Checked|x86.ActiveCfg = Debug|Any CPU - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Checked|x86.Build.0 = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|x64.ActiveCfg = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|x64.Build.0 = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|x86.ActiveCfg = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|x86.Build.0 = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|Any CPU.Build.0 = Release|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|x64.ActiveCfg = Release|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|x64.Build.0 = Release|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|x86.ActiveCfg = Release|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|x86.Build.0 = Release|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Checked|Any CPU.Build.0 = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Checked|x64.ActiveCfg = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Checked|x64.Build.0 = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.Checked|x86.ActiveCfg = Debug|Any CPU - {C12B737F-2265-4F48-9BEA-B9023063AC91}.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 @@ -224,15 +186,13 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {F3F9D019-086A-4093-BD49-11B6B204D94A} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59} - {EAE41D82-CFFA-4934-89B2-399D12530E84} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59} {B958EACD-B145-4B48-A11B-C5E5B565E311} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59} - {C12B737F-2265-4F48-9BEA-B9023063AC91} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59} - {F7D2A806-877A-4FCB-843E-920F86B226CE} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59} - {8A6C5539-2206-4A07-8EBE-1C7260B29F31} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59} {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} + {8A6C5539-2206-4A07-8EBE-1C7260B29F31} = {89B14D9D-2BBE-446A-8ED8-020F7BBA6CFC} {03C0F6B8-A04B-4822-8089-3918F02AD281} = {B05E90C8-0282-4D7D-955E-3BE8A400D3A6} - {DAC9F70E-E22D-45EE-83DD-1AAEAA234954} = {B05E90C8-0282-4D7D-955E-3BE8A400D3A6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4A98215D-6F1A-4A70-B579-89B7EF7FC92A} diff --git a/src/libraries/System.Reflection/System.Reflection.sln b/src/libraries/System.Reflection/System.Reflection.sln index 3468ce901b0..8de32fb0971 100644 --- a/src/libraries/System.Reflection/System.Reflection.sln +++ b/src/libraries/System.Reflection/System.Reflection.sln @@ -43,10 +43,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1030E6C5-CEEF-40BA-AC89-81FB199C0276}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B197B18A-A758-4501-A215-D5C909F39B42}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{FEEE282F-1085-49AC-B501-0349BCC9A0BF}" 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}" @@ -55,6 +51,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1BD23B5E-994 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{64590D3A-D464-4764-ABE3-EF62722D8FA7}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5BEA3DA5-3D9A-4642-B049-C04392B78D4B}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{548F3513-E3A5-4741-A8C5-00D0CF99B2D3}" EndProject Global @@ -466,42 +464,6 @@ 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 - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|x64.ActiveCfg = Debug|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|x64.Build.0 = Debug|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|x86.ActiveCfg = Debug|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|x86.Build.0 = Debug|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|Any CPU.Build.0 = Release|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|x64.ActiveCfg = Release|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|x64.Build.0 = Release|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|x86.ActiveCfg = Release|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|x86.Build.0 = Release|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Checked|Any CPU.Build.0 = Debug|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Checked|x64.ActiveCfg = Debug|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Checked|x64.Build.0 = Debug|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Checked|x86.ActiveCfg = Debug|Any CPU - {1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Checked|x86.Build.0 = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Debug|x64.ActiveCfg = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Debug|x64.Build.0 = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Debug|x86.ActiveCfg = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Debug|x86.Build.0 = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Release|Any CPU.Build.0 = Release|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Release|x64.ActiveCfg = Release|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Release|x64.Build.0 = Release|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Release|x86.ActiveCfg = Release|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Release|x86.Build.0 = Release|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Checked|Any CPU.Build.0 = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Checked|x64.ActiveCfg = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Checked|x64.Build.0 = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.Checked|x86.ActiveCfg = Debug|Any CPU - {B197B18A-A758-4501-A215-D5C909F39B42}.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 @@ -544,11 +506,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {27A1A006-6882-4C70-AB81-775D3D2C95A2} = {1BD23B5E-9944-4133-A162-94D4697616DD} - {1F5C28EE-FA69-4A3A-934C-88FEBBDE2489} = {1BD23B5E-9944-4133-A162-94D4697616DD} {2A4650E3-E199-41E4-AD2B-32818E57D1C7} = {1BD23B5E-9944-4133-A162-94D4697616DD} - {B197B18A-A758-4501-A215-D5C909F39B42} = {1BD23B5E-9944-4133-A162-94D4697616DD} - {FEEE282F-1085-49AC-B501-0349BCC9A0BF} = {1BD23B5E-9944-4133-A162-94D4697616DD} - {7625A3EB-C76C-41FE-85DC-C8B792062F9C} = {1BD23B5E-9944-4133-A162-94D4697616DD} {C5A7E7E7-E43B-4C87-9A92-13C3C817E714} = {64590D3A-D464-4764-ABE3-EF62722D8FA7} {F5998D9E-69A3-4F43-9AA5-B1BB33B54C64} = {64590D3A-D464-4764-ABE3-EF62722D8FA7} {7873C6BF-74FA-4DCF-ADCD-15C75B20132D} = {64590D3A-D464-4764-ABE3-EF62722D8FA7} @@ -567,8 +525,10 @@ Global {E6F16442-FB0F-4666-8309-F8B1EBA5B860} = {64590D3A-D464-4764-ABE3-EF62722D8FA7} {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} + {7625A3EB-C76C-41FE-85DC-C8B792062F9C} = {5BEA3DA5-3D9A-4642-B049-C04392B78D4B} {319997BC-5DF6-4E23-A768-ED9905690EF4} = {548F3513-E3A5-4741-A8C5-00D0CF99B2D3} - {1030E6C5-CEEF-40BA-AC89-81FB199C0276} = {548F3513-E3A5-4741-A8C5-00D0CF99B2D3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8439AF1D-1B47-4BB3-A6C5-3B34D114C9F3} diff --git a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln index 7a624b42868..5700a3e951d 100644 --- a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln +++ b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln @@ -15,9 +15,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A9D883BE-71BF-4D71-9E46-F40930A6AA27}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CF497346-A933-4E56-B57F-88067FB122CC}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{51182FA9-71D8-48D4-8461-63A04EDFDF77}" EndProject @@ -29,6 +29,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F5B0A1AE-8B9 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CF5D1CDD-1A13-475D-BD12-13202A620D8A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -67,14 +69,14 @@ 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 - {FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA}.Release|Any CPU.Build.0 = Release|Any CPU - {CF497346-A933-4E56-B57F-88067FB122CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF497346-A933-4E56-B57F-88067FB122CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF497346-A933-4E56-B57F-88067FB122CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF497346-A933-4E56-B57F-88067FB122CC}.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 + {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 + {E6F1606F-5731-44BA-B9F9-8FE32E2A4D84}.Release|Any CPU.Build.0 = Release|Any CPU {51182FA9-71D8-48D4-8461-63A04EDFDF77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {51182FA9-71D8-48D4-8461-63A04EDFDF77}.Debug|Any CPU.Build.0 = Debug|Any CPU {51182FA9-71D8-48D4-8461-63A04EDFDF77}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -93,13 +95,13 @@ Global {FA674D4C-E1D0-45F0-A5AF-D696AA4B1298} = {F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3} {2F07367F-C8D2-4E48-A59E-D4CAF6B40E0F} = {F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3} {464BD919-594A-4662-B061-D028CB8F3556} = {F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3} - {FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA} = {F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3} {51182FA9-71D8-48D4-8461-63A04EDFDF77} = {F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3} {29B47E47-914A-499D-A5A4-ED8C2BE44834} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A} {2B34DE46-1915-46F7-BD5C-2C8A3B8D1113} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A} {F826EEA7-C53C-4C46-8715-D3E9FACB9ED5} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A} - {CF497346-A933-4E56-B57F-88067FB122CC} = {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} + {E6F1606F-5731-44BA-B9F9-8FE32E2A4D84} = {6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E201426B-999F-48A5-BCFD-3E757AA0E182} diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj index 0636108ade7..222f4aa890e 100644 --- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj @@ -56,8 +56,6 @@ System.Resources.Extensions.PreserializedResourceWriter</PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> <PropertyGroup> diff --git a/src/libraries/System.Resources.Reader/System.Resources.Reader.sln b/src/libraries/System.Resources.Reader/System.Resources.Reader.sln index c77d1e2bd04..af661bac3c5 100644 --- a/src/libraries/System.Resources.Reader/System.Resources.Reader.sln +++ b/src/libraries/System.Resources.Reader/System.Resources.Reader.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{214B6B33-5AAE-4CBC-8066-1360B0137915}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3BA8AE7D-DB9E-4D3D-B786-69E5F9696EA4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C65C0220-BF19-4418-B26E-8FCD8895A0C2}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{206A2884-33E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B9A76A9D-FF84-42A3-854E-B35445DC9611}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D62D11DF-4AA8-4647-A6A0-0F223B78D929}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {214B6B33-5AAE-4CBC-8066-1360B0137915}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {214B6B33-5AAE-4CBC-8066-1360B0137915}.Debug|Any CPU.Build.0 = Debug|Any CPU - {214B6B33-5AAE-4CBC-8066-1360B0137915}.Release|Any CPU.ActiveCfg = Release|Any CPU - {214B6B33-5AAE-4CBC-8066-1360B0137915}.Release|Any CPU.Build.0 = Release|Any CPU - {1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5}.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 + {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 + {742BFCA6-93BA-4AD2-A507-A28E3F34B69A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {8116E964-9FFB-4D28-A9C4-33E1A1A74747} = {C65C0220-BF19-4418-B26E-8FCD8895A0C2} {AF1E79F5-F489-4370-85DA-A7FBB173B2E4} = {C65C0220-BF19-4418-B26E-8FCD8895A0C2} {07F0592A-7158-43AA-9196-135EBF555394} = {206A2884-33E0-41B5-A251-31731B96668D} - {214B6B33-5AAE-4CBC-8066-1360B0137915} = {206A2884-33E0-41B5-A251-31731B96668D} {037437D0-39B7-4086-8549-B3DFE0F37576} = {B9A76A9D-FF84-42A3-854E-B35445DC9611} - {1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5} = {B9A76A9D-FF84-42A3-854E-B35445DC9611} + {3BA8AE7D-DB9E-4D3D-B786-69E5F9696EA4} = {D62D11DF-4AA8-4647-A6A0-0F223B78D929} + {742BFCA6-93BA-4AD2-A507-A28E3F34B69A} = {D62D11DF-4AA8-4647-A6A0-0F223B78D929} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5B8632D5-A756-4119-A8BF-B3F69CB7A260} diff --git a/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln b/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln index 3e94c904884..c9ab0a82aa6 100644 --- a/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln +++ b/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln @@ -23,10 +23,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FD2E1F63-7B03-4220-8A94-262A11878B54}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C411D7D4-7F9C-437E-A36D-022D30389B65}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{496100D2-3229-4903-9753-E14FFACB5B2B}" 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}" @@ -37,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8FA5B4E7 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5F76ABD3-6169-46FF-A7B7-CB6CF5FBBFCD}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{FF625A7E-4428-4823-B6F0-601BDC907564}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -266,42 +264,6 @@ 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 - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|x64.ActiveCfg = Debug|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|x64.Build.0 = Debug|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|x86.ActiveCfg = Debug|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|x86.Build.0 = Debug|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|Any CPU.Build.0 = Release|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|x64.ActiveCfg = Release|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|x64.Build.0 = Release|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|x86.ActiveCfg = Release|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|x86.Build.0 = Release|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Checked|Any CPU.Build.0 = Debug|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Checked|x64.ActiveCfg = Debug|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Checked|x64.Build.0 = Debug|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Checked|x86.ActiveCfg = Debug|Any CPU - {FD2E1F63-7B03-4220-8A94-262A11878B54}.Checked|x86.Build.0 = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|x64.ActiveCfg = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|x64.Build.0 = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|x86.ActiveCfg = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|x86.Build.0 = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|Any CPU.Build.0 = Release|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|x64.ActiveCfg = Release|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|x64.Build.0 = Release|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|x86.ActiveCfg = Release|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|x86.Build.0 = Release|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Checked|Any CPU.Build.0 = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Checked|x64.ActiveCfg = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Checked|x64.Build.0 = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.Checked|x86.ActiveCfg = Debug|Any CPU - {C411D7D4-7F9C-437E-A36D-022D30389B65}.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 @@ -346,19 +308,17 @@ Global {152966B3-6D3D-4318-B62D-224940A6B746} = {0F0E4254-2575-4B8B-982A-A3D98D6E11DB} {7A7EB655-E233-4824-BE13-34693F452D1E} = {0F0E4254-2575-4B8B-982A-A3D98D6E11DB} {00F48AD2-CCF6-4F52-A63E-AC2D00574375} = {0F0E4254-2575-4B8B-982A-A3D98D6E11DB} - {497FC2E7-EFA3-4F6F-A883-527900B60D4F} = {0F0E4254-2575-4B8B-982A-A3D98D6E11DB} {DE2EC027-CD6F-4C5B-8B49-66B5FE795472} = {0F0E4254-2575-4B8B-982A-A3D98D6E11DB} {5C0A720D-EF35-4403-B246-89AFBFC6C7AF} = {0F0E4254-2575-4B8B-982A-A3D98D6E11DB} - {C411D7D4-7F9C-437E-A36D-022D30389B65} = {0F0E4254-2575-4B8B-982A-A3D98D6E11DB} - {496100D2-3229-4903-9753-E14FFACB5B2B} = {0F0E4254-2575-4B8B-982A-A3D98D6E11DB} - {0DDB3EFF-A01D-463D-AEC1-4C472147A471} = {0F0E4254-2575-4B8B-982A-A3D98D6E11DB} {B93B5C05-FB28-4173-8786-57B42CFE38F3} = {8FA5B4E7-5580-4E8A-909E-F1D0B4E60195} {DE363A06-8C3D-4DDA-AD67-3B6C253E0424} = {8FA5B4E7-5580-4E8A-909E-F1D0B4E60195} {AFC17385-4DE6-40FF-AEF9-F117B0F1C00B} = {5F76ABD3-6169-46FF-A7B7-CB6CF5FBBFCD} {B44796C1-71A0-4E3A-B369-5B0A9D2E7FB6} = {5F76ABD3-6169-46FF-A7B7-CB6CF5FBBFCD} {F98F08E3-520B-49CA-B038-FF20857CEAA7} = {5F76ABD3-6169-46FF-A7B7-CB6CF5FBBFCD} {16C50BBF-58E6-46B0-99EC-89927A65557B} = {5F76ABD3-6169-46FF-A7B7-CB6CF5FBBFCD} - {FD2E1F63-7B03-4220-8A94-262A11878B54} = {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} + {0DDB3EFF-A01D-463D-AEC1-4C472147A471} = {FF625A7E-4428-4823-B6F0-601BDC907564} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {76F63057-5429-4500-BF4F-16E66362192D} diff --git a/src/libraries/System.Resources.Writer/System.Resources.Writer.sln b/src/libraries/System.Resources.Writer/System.Resources.Writer.sln index 79faeca94b2..d9c02d9d14b 100644 --- a/src/libraries/System.Resources.Writer/System.Resources.Writer.sln +++ b/src/libraries/System.Resources.Writer/System.Resources.Writer.sln @@ -7,9 +7,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D33748D9-5F99-4D8A-81C8-B530F264500B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2D19976E-00EB-4BE6-9078-3BB9EEAC0586}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{003D6220-3094-4915-BE2D-A4C1671CB64D}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{112C54A1-881D-4EE7-A279-DC719E667CFF}" EndProject @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{36F1D0ED-096 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E6EE9961-9C9A-4935-8AE2-18316677F47F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AB6CB51B-36BD-4444-BB33-86DADD78045C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,14 +41,14 @@ 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 - {D33748D9-5F99-4D8A-81C8-B530F264500B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D33748D9-5F99-4D8A-81C8-B530F264500B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D33748D9-5F99-4D8A-81C8-B530F264500B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D33748D9-5F99-4D8A-81C8-B530F264500B}.Release|Any CPU.Build.0 = Release|Any CPU - {003D6220-3094-4915-BE2D-A4C1671CB64D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {003D6220-3094-4915-BE2D-A4C1671CB64D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {003D6220-3094-4915-BE2D-A4C1671CB64D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {003D6220-3094-4915-BE2D-A4C1671CB64D}.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 + {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 + {4EA24626-EACB-49F0-92EC-89502E566053}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -55,9 +57,9 @@ Global {A665E615-45ED-42F9-877A-80353A636779} = {112C54A1-881D-4EE7-A279-DC719E667CFF} {2E27487F-36D6-42E9-BA91-F511686122E7} = {112C54A1-881D-4EE7-A279-DC719E667CFF} {DF70E82A-3986-4E74-BF85-7CB4B0A6DED9} = {36F1D0ED-0960-4B7E-832F-F2A304803FC3} - {D33748D9-5F99-4D8A-81C8-B530F264500B} = {36F1D0ED-0960-4B7E-832F-F2A304803FC3} {1C001837-6F9D-4C5A-94B4-4388225C34B5} = {E6EE9961-9C9A-4935-8AE2-18316677F47F} - {003D6220-3094-4915-BE2D-A4C1671CB64D} = {E6EE9961-9C9A-4935-8AE2-18316677F47F} + {2D19976E-00EB-4BE6-9078-3BB9EEAC0586} = {AB6CB51B-36BD-4444-BB33-86DADD78045C} + {4EA24626-EACB-49F0-92EC-89502E566053} = {AB6CB51B-36BD-4444-BB33-86DADD78045C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1D84753-65B5-4B60-A555-3507CD4FDAB2} diff --git a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln index a98ece24ab5..ac8f997c031 100644 --- a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln +++ b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln @@ -19,9 +19,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1C015082-C690-46C1-B9BF-6FB4EA25ACFC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{ADDFECC7-59EA-4339-9B98-5CB8B91105BF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{986272FB-E5C6-4881-9867-DC3427D883AE}" EndProject @@ -41,6 +41,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C315269F-EEA EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5E28270B-1EEB-4D0E-9A3C-6959BEA9647E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -87,14 +89,14 @@ 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 - {1C015082-C690-46C1-B9BF-6FB4EA25ACFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C015082-C690-46C1-B9BF-6FB4EA25ACFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C015082-C690-46C1-B9BF-6FB4EA25ACFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C015082-C690-46C1-B9BF-6FB4EA25ACFC}.Release|Any CPU.Build.0 = Release|Any CPU - {B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6}.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 + {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 + {447797DB-DF70-4568-A323-F88A45A91026}.Release|Any CPU.Build.0 = Release|Any CPU {986272FB-E5C6-4881-9867-DC3427D883AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {986272FB-E5C6-4881-9867-DC3427D883AE}.Debug|Any CPU.Build.0 = Debug|Any CPU {986272FB-E5C6-4881-9867-DC3427D883AE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -130,7 +132,6 @@ Global {D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8} {4607440C-7237-4077-ACAB-E0910673B162} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8} {B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8} - {1C015082-C690-46C1-B9BF-6FB4EA25ACFC} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8} {986272FB-E5C6-4881-9867-DC3427D883AE} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8} {45E0A981-A131-4147-94E7-49AAC45F5D14} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8} {A154C9F1-845A-4596-9061-92C462E971A6} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8} @@ -138,10 +139,11 @@ Global {2AC9B23C-C788-4607-86EB-E7F66F14AFDB} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC} {460D6560-3CD4-4D2D-A961-407564D42D62} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC} {6311C025-F6D3-43A0-A9DA-A58AA6602568} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC} - {B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC} {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} + {447797DB-DF70-4568-A323-F88A45A91026} = {5E28270B-1EEB-4D0E-9A3C-6959BEA9647E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7B9B7D16-2C48-486A-B84B-6FF6D28509F6} 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 12c40f926c1..a959e52aa7f 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 @@ -1,49 +1,198 @@ Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D1D35FBB-464B-4403-A933-9A96861999D1}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib.Generators", "..\System.Private.CoreLib\gen\System.Private.CoreLib.Generators.csproj", "{6B5FD502-FE51-4E0E-B153-568515646BBF}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F858493F-8DFC-43AD-B4AA-10419588E026}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "src\System.Runtime.CompilerServices.Unsafe.csproj", "{2337CD5D-12B3-43B9-8D38-461EF83A1473}" 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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F0795B33-3338-447C-A071-913F404DA6F2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3FF7E57E-FE55-4ECF-B535-B896FD53FD5E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{723971AB-AD5C-4E5D-B6F1-215004ED533F}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BB7B426A-42D8-463A-9274-142ACA06F377}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F0795B33-3338-447C-A071-913F404DA6F2}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2C2CC48C-282A-4841-9893-485DDF29E13B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{723971AB-AD5C-4E5D-B6F1-215004ED533F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + Checked|Any CPU = Checked|Any CPU + Checked|x64 = Checked|x64 + Checked|x86 = Checked|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Debug|Any CPU.ActiveCfg = Debug|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Debug|Any CPU.Build.0 = Debug|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Debug|x64.ActiveCfg = Debug|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Debug|x64.Build.0 = Debug|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Debug|x86.ActiveCfg = Debug|x86 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Debug|x86.Build.0 = Debug|x86 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Release|Any CPU.ActiveCfg = Release|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Release|Any CPU.Build.0 = Release|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Release|x64.ActiveCfg = Release|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Release|x64.Build.0 = Release|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Release|x86.ActiveCfg = Release|x86 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Release|x86.Build.0 = Release|x86 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Checked|Any CPU.ActiveCfg = Checked|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Checked|Any CPU.Build.0 = Checked|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Checked|x64.ActiveCfg = Checked|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Checked|x64.Build.0 = Checked|x64 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Checked|x86.ActiveCfg = Checked|x86 + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF}.Checked|x86.Build.0 = Checked|x86 {D1D35FBB-464B-4403-A933-9A96861999D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1D35FBB-464B-4403-A933-9A96861999D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Debug|x64.ActiveCfg = Debug|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Debug|x64.Build.0 = Debug|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Debug|x86.ActiveCfg = Debug|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Debug|x86.Build.0 = Debug|Any CPU {D1D35FBB-464B-4403-A933-9A96861999D1}.Release|Any CPU.ActiveCfg = Release|Any CPU {D1D35FBB-464B-4403-A933-9A96861999D1}.Release|Any CPU.Build.0 = Release|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Release|x64.ActiveCfg = Release|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Release|x64.Build.0 = Release|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Release|x86.ActiveCfg = Release|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Release|x86.Build.0 = Release|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Checked|Any CPU.Build.0 = Debug|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Checked|x64.ActiveCfg = Debug|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Checked|x64.Build.0 = Debug|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Checked|x86.ActiveCfg = Debug|Any CPU + {D1D35FBB-464B-4403-A933-9A96861999D1}.Checked|x86.Build.0 = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Debug|x64.ActiveCfg = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Debug|x64.Build.0 = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Debug|x86.ActiveCfg = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Debug|x86.Build.0 = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Release|Any CPU.Build.0 = Release|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Release|x64.ActiveCfg = Release|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Release|x64.Build.0 = Release|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Release|x86.ActiveCfg = Release|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Release|x86.Build.0 = Release|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Checked|Any CPU.Build.0 = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Checked|x64.ActiveCfg = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Checked|x64.Build.0 = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Checked|x86.ActiveCfg = Debug|Any CPU + {6B5FD502-FE51-4E0E-B153-568515646BBF}.Checked|x86.Build.0 = Debug|Any CPU {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Debug|x64.ActiveCfg = Debug|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Debug|x64.Build.0 = Debug|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Debug|x86.ActiveCfg = Debug|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Debug|x86.Build.0 = Debug|Any CPU {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Release|Any CPU.ActiveCfg = Release|Any CPU {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Release|Any CPU.Build.0 = Release|Any CPU - {F858493F-8DFC-43AD-B4AA-10419588E026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F858493F-8DFC-43AD-B4AA-10419588E026}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F858493F-8DFC-43AD-B4AA-10419588E026}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F858493F-8DFC-43AD-B4AA-10419588E026}.Release|Any CPU.Build.0 = Release|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Release|x64.ActiveCfg = Release|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Release|x64.Build.0 = Release|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Release|x86.ActiveCfg = Release|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Release|x86.Build.0 = Release|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Checked|Any CPU.Build.0 = Debug|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Checked|x64.ActiveCfg = Debug|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Checked|x64.Build.0 = Debug|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Checked|x86.ActiveCfg = Debug|Any CPU + {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Checked|x86.Build.0 = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Debug|x64.ActiveCfg = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Debug|x64.Build.0 = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Debug|x86.ActiveCfg = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Debug|x86.Build.0 = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Release|Any CPU.Build.0 = Release|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Release|x64.ActiveCfg = Release|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Release|x64.Build.0 = Release|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Release|x86.ActiveCfg = Release|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Release|x86.Build.0 = Release|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Checked|Any CPU.Build.0 = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Checked|x64.ActiveCfg = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Checked|x64.Build.0 = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Checked|x86.ActiveCfg = Debug|Any CPU + {2337CD5D-12B3-43B9-8D38-461EF83A1473}.Checked|x86.Build.0 = Debug|Any CPU {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Debug|x64.ActiveCfg = Debug|Any CPU + {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Debug|x64.Build.0 = Debug|Any CPU + {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Debug|x86.ActiveCfg = Debug|Any CPU + {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Debug|x86.Build.0 = Debug|Any CPU {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Release|Any CPU.ActiveCfg = Release|Any CPU {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Release|Any CPU.Build.0 = Release|Any CPU + {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Release|x64.ActiveCfg = Release|Any CPU + {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Release|x64.Build.0 = Release|Any CPU + {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Release|x86.ActiveCfg = Release|Any CPU + {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Release|x86.Build.0 = Release|Any CPU + {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Checked|Any CPU.Build.0 = Debug|Any CPU + {03B3163A-B7D7-4BEC-90BC-12E04072969E}.Checked|x64.ActiveCfg = Debug|Any CPU + {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 + {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 + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Debug|x64.Build.0 = Debug|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Debug|x86.ActiveCfg = Debug|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Debug|x86.Build.0 = Debug|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Release|Any CPU.Build.0 = Release|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Release|x64.ActiveCfg = Release|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Release|x64.Build.0 = Release|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Release|x86.ActiveCfg = Release|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Release|x86.Build.0 = Release|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Checked|Any CPU.Build.0 = Debug|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Checked|x64.ActiveCfg = Debug|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Checked|x64.Build.0 = Debug|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Checked|x86.ActiveCfg = Debug|Any CPU + {7D9E653A-38DF-4862-9C01-6CEA92098F8C}.Checked|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {60B4FD55-E534-41A6-A5DD-2BDDAAB5FEBF} = {BB7B426A-42D8-463A-9274-142ACA06F377} + {2337CD5D-12B3-43B9-8D38-461EF83A1473} = {BB7B426A-42D8-463A-9274-142ACA06F377} {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} + {7D9E653A-38DF-4862-9C01-6CEA92098F8C} = {2C2CC48C-282A-4841-9893-485DDF29E13B} {C75CDE9E-42CE-41E6-81BC-BD44FBC113E8} = {723971AB-AD5C-4E5D-B6F1-215004ED533F} - {F858493F-8DFC-43AD-B4AA-10419588E026} = {BB7B426A-42D8-463A-9274-142ACA06F377} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7C6BD655-03F9-4AFB-B429-05A363FA6DA0} diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.Forwards.cs b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.Forwards.cs new file mode 100644 index 00000000000..0b385c02d1e --- /dev/null +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.Forwards.cs @@ -0,0 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ + +[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.Unsafe))]
\ No newline at end of file diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.cs b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.cs deleted file mode 100644 index caaa42ec869..00000000000 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.cs +++ /dev/null @@ -1,55 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the https://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - -namespace System.Runtime.CompilerServices -{ - public static partial class Unsafe - { - public static ref T AddByteOffset<T>(ref T source, System.IntPtr byteOffset) { throw null; } - public static ref T AddByteOffset<T>(ref T source, nuint byteOffset) { throw null; } - public unsafe static void* Add<T>(void* source, int elementOffset) { throw null; } - public static ref T Add<T>(ref T source, int elementOffset) { throw null; } - public static ref T Add<T>(ref T source, System.IntPtr elementOffset) { throw null; } - public static ref T Add<T>(ref T source, nuint elementOffset) { throw null; } - public static bool AreSame<T>([System.Diagnostics.CodeAnalysis.AllowNull] ref T left, [System.Diagnostics.CodeAnalysis.AllowNull] ref T right) { throw null; } - public unsafe static void* AsPointer<T>(ref T value) { throw null; } - public unsafe static ref T AsRef<T>(void* source) { throw null; } - public static ref T AsRef<T>(in T source) { throw null; } - [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("o")] - public static T? As<T>(object? o) where T : class? { throw null; } - public static ref TTo As<TFrom, TTo>(ref TFrom source) { throw null; } - public static System.IntPtr ByteOffset<T>([System.Diagnostics.CodeAnalysis.AllowNull] ref T origin, [System.Diagnostics.CodeAnalysis.AllowNull] ref T target) { throw null; } - public static void CopyBlock(ref byte destination, ref byte source, uint byteCount) { } - public unsafe static void CopyBlock(void* destination, void* source, uint byteCount) { } - public static void CopyBlockUnaligned(ref byte destination, ref byte source, uint byteCount) { } - public unsafe static void CopyBlockUnaligned(void* destination, void* source, uint byteCount) { } - public unsafe static void Copy<T>(void* destination, ref T source) { } - public unsafe static void Copy<T>(ref T destination, void* source) { } - public static void InitBlock(ref byte startAddress, byte value, uint byteCount) { } - public unsafe static void InitBlock(void* startAddress, byte value, uint byteCount) { } - public static void InitBlockUnaligned(ref byte startAddress, byte value, uint byteCount) { } - public unsafe static void InitBlockUnaligned(void* startAddress, byte value, uint byteCount) { } - public static bool IsAddressGreaterThan<T>([System.Diagnostics.CodeAnalysis.AllowNull] ref T left, [System.Diagnostics.CodeAnalysis.AllowNull] ref T right) { throw null; } - public static bool IsAddressLessThan<T>([System.Diagnostics.CodeAnalysis.AllowNull] ref T left, [System.Diagnostics.CodeAnalysis.AllowNull] ref T right) { throw null; } - public static bool IsNullRef<T>(ref T source) { throw null; } - public static ref T NullRef<T>() { throw null; } - public static T ReadUnaligned<T>(ref byte source) { throw null; } - public unsafe static T ReadUnaligned<T>(void* source) { throw null; } - public unsafe static T Read<T>(void* source) { throw null; } - public static void SkipInit<T>(out T value) { throw null; } - public static int SizeOf<T>() { throw null; } - public static ref T SubtractByteOffset<T>(ref T source, System.IntPtr byteOffset) { throw null; } - public static ref T SubtractByteOffset<T>(ref T source, nuint byteOffset) { throw null; } - public unsafe static void* Subtract<T>(void* source, int elementOffset) { throw null; } - public static ref T Subtract<T>(ref T source, int elementOffset) { throw null; } - public static ref T Subtract<T>(ref T source, System.IntPtr elementOffset) { throw null; } - public static ref T Subtract<T>(ref T source, nuint elementOffset) { throw null; } - public static ref T Unbox<T>(object box) where T : struct { throw null; } - public static void WriteUnaligned<T>(ref byte destination, T value) { } - public unsafe static void WriteUnaligned<T>(void* destination, T value) { } - public unsafe static void Write<T>(void* destination, T value) { } - } -} diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj index 47bd10acddb..7153e43f523 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj @@ -1,17 +1,10 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <CLSCompliant>false</CLSCompliant> + <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> <ItemGroup> - <Compile Include="System.Runtime.CompilerServices.Unsafe.cs" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> + <Compile Include="System.Runtime.CompilerServices.Unsafe.Forwards.cs" /> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/ApiCompatBaseline.txt b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/ApiCompatBaseline.txt deleted file mode 100644 index c895342411f..00000000000 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/ApiCompatBaseline.txt +++ /dev/null @@ -1,9 +0,0 @@ -CannotRemoveAttribute : Attribute 'System.Diagnostics.CodeAnalysis.AllowNullAttribute' exists on parameter 'left' on member 'System.Runtime.CompilerServices.Unsafe.AreSame<T>(T, T)' in the contract but not the implementation. -CannotRemoveAttribute : Attribute 'System.Diagnostics.CodeAnalysis.AllowNullAttribute' exists on parameter 'right' on member 'System.Runtime.CompilerServices.Unsafe.AreSame<T>(T, T)' in the contract but not the implementation. -CannotRemoveAttribute : Attribute 'System.Diagnostics.CodeAnalysis.AllowNullAttribute' exists on parameter 'origin' on member 'System.Runtime.CompilerServices.Unsafe.ByteOffset<T>(T, T)' in the contract but not the implementation. -CannotRemoveAttribute : Attribute 'System.Diagnostics.CodeAnalysis.AllowNullAttribute' exists on parameter 'target' on member 'System.Runtime.CompilerServices.Unsafe.ByteOffset<T>(T, T)' in the contract but not the implementation. -CannotRemoveAttribute : Attribute 'System.Diagnostics.CodeAnalysis.AllowNullAttribute' exists on parameter 'left' on member 'System.Runtime.CompilerServices.Unsafe.IsAddressGreaterThan<T>(T, T)' in the contract but not the implementation. -CannotRemoveAttribute : Attribute 'System.Diagnostics.CodeAnalysis.AllowNullAttribute' exists on parameter 'right' on member 'System.Runtime.CompilerServices.Unsafe.IsAddressGreaterThan<T>(T, T)' in the contract but not the implementation. -CannotRemoveAttribute : Attribute 'System.Diagnostics.CodeAnalysis.AllowNullAttribute' exists on parameter 'left' on member 'System.Runtime.CompilerServices.Unsafe.IsAddressLessThan<T>(T, T)' in the contract but not the implementation. -CannotRemoveAttribute : Attribute 'System.Diagnostics.CodeAnalysis.AllowNullAttribute' exists on parameter 'right' on member 'System.Runtime.CompilerServices.Unsafe.IsAddressLessThan<T>(T, T)' in the contract but not the implementation. -Total Issues: 8 diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.csproj new file mode 100644 index 00000000000..7e9aff4eedd --- /dev/null +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.csproj @@ -0,0 +1,12 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> + <ExcludeResourcesImport>true</ExcludeResourcesImport> + <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> + <Nullable>enable</Nullable> + </PropertyGroup> + <ItemGroup> + <ProjectReference Include="$(CoreLibProject)" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il deleted file mode 100644 index 084e7f2647c..00000000000 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il +++ /dev/null @@ -1,648 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -#include "version.h" - -.assembly System.Runtime.CompilerServices.Unsafe -{ - .custom instance void [CORE_ASSEMBLY]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) - .custom instance void [CORE_ASSEMBLY]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx - 63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows. - - // --- The following custom attribute is added automatically, do not uncomment ------- - // .custom instance void [CORE_ASSEMBLY]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [CORE_ASSEMBLY]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 02 00 00 00 00 00 ) - - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = FILE_VERSION - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyInformationalVersionAttribute::.ctor(string) = INFORMATIONAL_VERSION - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyTitleAttribute::.ctor(string) = ( 01 00 26 53 79 73 74 65 6D 2E 52 75 6E 74 69 6D // ..&System.Runtim - 65 2E 43 6F 6D 70 69 6C 65 72 53 65 72 76 69 63 // e.CompilerServic - 65 73 2E 55 6E 73 61 66 65 00 00 ) // es.Unsafe.. - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyDescriptionAttribute::.ctor(string) = ( 01 00 26 53 79 73 74 65 6D 2E 52 75 6E 74 69 6D // ..&System.Runtim - 65 2E 43 6F 6D 70 69 6C 65 72 53 65 72 76 69 63 // e.CompilerServic - 65 73 2E 55 6E 73 61 66 65 00 00 ) // es.Unsafe.. - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyMetadataAttribute::.ctor(string, string) = ( - 01 00 15 2e 4e 45 54 46 72 61 6d 65 77 6f 72 6b - 41 73 73 65 6d 62 6c 79 00 00 00 - ) // ".NETFrameworkAssembly", "" - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyMetadataAttribute::.ctor(string, string) = ( - 01 00 0b 53 65 72 76 69 63 65 61 62 6c 65 04 54 - 72 75 65 00 00 - ) // "Serviceable", "True" - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyMetadataAttribute::.ctor(string, string) = ( - 01 00 0b 49 73 54 72 69 6d 6d 61 62 6c 65 04 54 - 72 75 65 00 00 - ) // "IsTrimmable", "True" - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyCopyrightAttribute::.ctor(string) = ( 01 00 2F C2 A9 20 4D 69 63 72 6F 73 6F 66 74 20 // ../.. Microsoft - 43 6F 72 70 6F 72 61 74 69 6F 6E 2E 20 20 41 6C // Corporation. Al - 6C 20 72 69 67 68 74 73 20 72 65 73 65 72 76 65 // l rights reserve - 64 2E 00 00 ) // d... - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyCompanyAttribute::.ctor(string) = ( 01 00 15 4D 69 63 72 6F 73 6F 66 74 20 43 6F 72 // ...Microsoft Cor - 70 6F 72 61 74 69 6F 6E 00 00 ) // poration.. - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyProductAttribute::.ctor(string) = ( 01 00 1A 4D 69 63 72 6F 73 6F 66 74 C2 AE 20 2E // ...Microsoft.. . - 4E 45 54 20 46 72 61 6D 65 77 6F 72 6B 00 00 ) // NET Framework.. - .custom instance void [CORE_ASSEMBLY]System.CLSCompliantAttribute::.ctor(bool) = ( - 01 00 00 00 00 - ) // false - .hash algorithm 0x00008004 - .ver ASSEMBLY_VERSION -} -.module System.Runtime.CompilerServices.Unsafe.dll -// MVID: {1E97D84A-565B-49C5-B60A-F31A1A4ACE13} -.imagebase 0x00400000 -.file alignment 0x00000200 -.stackreserve 0x00100000 -.subsystem 0x0003 // WINDOWS_CUI -.corflags 0x00000001 // ILONLY -// Image base: 0x02ED0000 - - -// =============== CLASS MEMBERS DECLARATION =================== - -.class public abstract auto ansi sealed beforefieldinit System.Runtime.CompilerServices.Unsafe - extends [CORE_ASSEMBLY]System.Object -{ - .method public hidebysig static !!T Read<T>(void* source) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldobj !!T - ret - } // end of method Unsafe::Read - - .method public hidebysig static !!T ReadUnaligned<T>(void* source) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - unaligned. 0x1 - ldobj !!T - ret - } // end of method Unsafe::ReadUnaligned - - .method public hidebysig static !!T ReadUnaligned<T>(uint8& source) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - unaligned. 0x1 - ldobj !!T - ret - } // end of method Unsafe::ReadUnaligned - - .method public hidebysig static void Write<T>(void* destination, - !!T 'value') cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - stobj !!T - ret - } // end of method Unsafe::Write - - .method public hidebysig static void WriteUnaligned<T>(void* destination, - !!T 'value') cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - unaligned. 0x01 - stobj !!T - ret - } // end of method Unsafe::WriteUnaligned - - .method public hidebysig static void WriteUnaligned<T>(uint8& destination, - !!T 'value') cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - unaligned. 0x01 - stobj !!T - ret - } // end of method Unsafe::WriteUnaligned - - .method public hidebysig static void Copy<T>(void* destination, - !!T& source) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - ldobj !!T - stobj !!T - ret - } // end of method Unsafe::Copy - - .method public hidebysig static void Copy<T>(!!T& destination, - void* source) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - ldobj !!T - stobj !!T - ret - } // end of method Unsafe::Copy - - .method public hidebysig static void* AsPointer<T>(!!T& 'value') cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - conv.u - ret - } // end of method Unsafe::AsPointer - - .method public hidebysig static void SkipInit<T> ([out] !!T& 'value') cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ret - } // end of method Unsafe::SkipInit - - .method public hidebysig static int32 SizeOf<T>() cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - sizeof !!T - ret - } // end of method Unsafe::SizeOf - - .method public hidebysig static void CopyBlock(void* destination, void* source, uint32 byteCount) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - ldarg.2 - cpblk - ret - } // end of method Unsafe::CopyBlock - - .method public hidebysig static void CopyBlock(uint8& destination, uint8& source, uint32 byteCount) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - ldarg.2 - cpblk - ret - } // end of method Unsafe::CopyBlock - - .method public hidebysig static void CopyBlockUnaligned(void* destination, void* source, uint32 byteCount) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - ldarg.2 - unaligned. 0x1 - cpblk - ret - } // end of method Unsafe::CopyBlockUnaligned - - .method public hidebysig static void CopyBlockUnaligned(uint8& destination, uint8& source, uint32 byteCount) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - ldarg.2 - unaligned. 0x1 - cpblk - ret - } // end of method Unsafe::CopyBlockUnaligned - - .method public hidebysig static void InitBlock(void* startAddress, uint8 'value', uint32 byteCount) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - ldarg.2 - initblk - ret - } // end of method Unsafe::InitBlock - - .method public hidebysig static void InitBlock(uint8& startAddress, uint8 'value', uint32 byteCount) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - ldarg.2 - initblk - ret - } // end of method Unsafe::InitBlock - - .method public hidebysig static void InitBlockUnaligned(void* startAddress, uint8 'value', uint32 byteCount) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - ldarg.2 - unaligned. 0x1 - initblk - ret - } // end of method Unsafe::InitBlockUnaligned - - .method public hidebysig static void InitBlockUnaligned(uint8& startAddress, uint8 'value', uint32 byteCount) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - ldarg.2 - unaligned. 0x1 - initblk - ret - } // end of method Unsafe::InitBlockUnaligned - - .method public hidebysig static !!T As<class T>(object o) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ret - } // end of method Unsafe::As - - .method public hidebysig static !!T& AsRef<T>(void* source) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) -// For .NET Core the roundtrip via a local is no longer needed see: -// https://github.com/dotnet/runtime/issues/8730 -// and -// https://github.com/dotnet/coreclr/pull/11218 -#ifdef netcoreapp - .maxstack 8 - ldarg.0 - ret -#else - .locals (int32&) - .maxstack 8 - ldarg.0 - // Roundtrip via a local to avoid type mismatch on return that the JIT inliner chokes on. - stloc.0 - ldloc.0 - ret -#endif - } // end of method Unsafe::AsRef - - .method public hidebysig static !!T& AsRef<T>(!!T& source) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .param [1] -#ifdef netcoreapp - .custom instance void [CORE_ASSEMBLY]System.Runtime.CompilerServices.IsReadOnlyAttribute::.ctor() = ( 01 00 00 00 ) -#else - .custom instance void System.Runtime.CompilerServices.IsReadOnlyAttribute::.ctor() = ( 01 00 00 00 ) -#endif - .maxstack 8 - ldarg.0 - ret - } // end of method Unsafe::AsRef - - .method public hidebysig static !!TTo& As<TFrom, TTo>(!!TFrom& source) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ret - } // end of method Unsafe::As - - .method public hidebysig static !!T& Unbox<valuetype .ctor ([CORE_ASSEMBLY]System.ValueType) T> (object 'box') cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - unbox !!T - ret - } // end of method Unsafe::Unbox - - .method public hidebysig static !!T& Add<T>(!!T& source, int32 elementOffset) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - sizeof !!T - conv.i - mul - add - ret - } // end of method Unsafe::Add - - .method public hidebysig static void* Add<T>(void* source, int32 elementOffset) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - sizeof !!T - conv.i - mul - add - ret - } // end of method Unsafe::Add - - .method public hidebysig static !!T& Add<T>(!!T& source, native int elementOffset) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - sizeof !!T - mul - add - ret - } // end of method Unsafe::Add - - .method public hidebysig static !!T& Add<T>(!!T& source, native uint elementOffset) cil managed aggressiveinlining - { - .param [2] - .custom instance void System.Runtime.CompilerServices.NativeIntegerAttribute::.ctor() = ( - 01 00 00 00 - ) - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - sizeof !!T - mul - add - ret - } // end of method Unsafe::Add - - .method public hidebysig static !!T& AddByteOffset<T>(!!T& source, native int byteOffset) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - add - ret - } // end of method Unsafe::AddByteOffset - - .method public hidebysig static !!T& AddByteOffset<T>(!!T& source, native uint byteOffset) cil managed aggressiveinlining - { - .param [2] - .custom instance void System.Runtime.CompilerServices.NativeIntegerAttribute::.ctor() = ( - 01 00 00 00 - ) - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - add - ret - } // end of method Unsafe::AddByteOffset - - .method public hidebysig static !!T& Subtract<T>(!!T& source, int32 elementOffset) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - sizeof !!T - conv.i - mul - sub - ret - } // end of method Unsafe::Subtract - - .method public hidebysig static void* Subtract<T>(void* source, int32 elementOffset) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - sizeof !!T - conv.i - mul - sub - ret - } // end of method Unsafe::Subtract - - .method public hidebysig static !!T& Subtract<T>(!!T& source, native int elementOffset) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - sizeof !!T - mul - sub - ret - } // end of method Unsafe::Subtract - - .method public hidebysig static !!T& Subtract<T>(!!T& source, native uint elementOffset) cil managed aggressiveinlining - { - .param [2] - .custom instance void System.Runtime.CompilerServices.NativeIntegerAttribute::.ctor() = ( - 01 00 00 00 - ) - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - sizeof !!T - mul - sub - ret - } // end of method Unsafe::Subtract - - .method public hidebysig static !!T& SubtractByteOffset<T>(!!T& source, native int byteOffset) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - sub - ret - } // end of method Unsafe::SubtractByteOffset - - .method public hidebysig static !!T& SubtractByteOffset<T>(!!T& source, native uint byteOffset) cil managed aggressiveinlining - { - .param [2] - .custom instance void System.Runtime.CompilerServices.NativeIntegerAttribute::.ctor() = ( - 01 00 00 00 - ) - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - sub - ret - } // end of method Unsafe::SubtractByteOffset - - .method public hidebysig static native int ByteOffset<T>(!!T& origin, !!T& target) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.1 - ldarg.0 - sub - ret - } // end of method Unsafe::ByteOffset - - .method public hidebysig static bool AreSame<T>(!!T& left, !!T& right) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - ceq - ret - } // end of method Unsafe::AreSame - - .method public hidebysig static bool IsAddressGreaterThan<T>(!!T& left, !!T& right) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - cgt.un - ret - } // end of method Unsafe::IsAddressGreaterThan - - .method public hidebysig static bool IsAddressLessThan<T>(!!T& left, !!T& right) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldarg.1 - clt.un - ret - } // end of method Unsafe::IsAddressLessThan - - .method public hidebysig static bool IsNullRef<T>(!!T& source) cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldarg.0 - ldc.i4.0 - conv.u - ceq - ret - } // end of method Unsafe::IsNullRef - - .method public hidebysig static !!T& NullRef<T>() cil managed aggressiveinlining - { - .custom instance void System.Runtime.Versioning.NonVersionableAttribute::.ctor() = ( 01 00 00 00 ) - .maxstack 8 - ldc.i4.0 - conv.u - ret - } // end of method Unsafe::NullRef - -} // end of class System.Runtime.CompilerServices.Unsafe - -.class private auto ansi sealed beforefieldinit System.Runtime.Versioning.NonVersionableAttribute - extends [CORE_ASSEMBLY]System.Attribute -{ - .custom instance void [CORE_ASSEMBLY]System.AttributeUsageAttribute::.ctor(valuetype [CORE_ASSEMBLY]System.AttributeTargets) = ( 01 00 6C 00 00 00 02 00 54 02 0D 41 6C 6C 6F 77 // ..l.....T..Allow - 4D 75 6C 74 69 70 6C 65 00 54 02 09 49 6E 68 65 // Multiple.T..Inhe - 72 69 74 65 64 00 ) // rited. - .method public hidebysig specialname rtspecialname - instance void .ctor() cil managed - { - .maxstack 8 - ldarg.0 - call instance void [CORE_ASSEMBLY]System.Attribute::.ctor() - ret - } // end of method NonVersionableAttribute::.ctor - -} // end of class System.Runtime.Versioning.NonVersionableAttribute - -#ifdef netcoreapp -#else -.class private auto ansi sealed beforefieldinit System.Runtime.CompilerServices.IsReadOnlyAttribute - extends [CORE_ASSEMBLY]System.Attribute -{ - .method public hidebysig specialname rtspecialname - instance void .ctor () cil managed - { - .maxstack 8 - ldarg.0 - call instance void [CORE_ASSEMBLY]System.Attribute::.ctor() - ret - } // end of method IsReadOnlyAttribute::.ctor - -} // end of class System.Runtime.CompilerServices.IsReadOnlyAttribute -#endif - -.class private auto ansi sealed beforefieldinit Microsoft.CodeAnalysis.EmbeddedAttribute - extends [CORE_ASSEMBLY]System.Attribute -{ - .custom instance void [CORE_ASSEMBLY]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( - 01 00 00 00 - ) - .custom instance void Microsoft.CodeAnalysis.EmbeddedAttribute::.ctor() = ( - 01 00 00 00 - ) - .method public hidebysig specialname rtspecialname - instance void .ctor () cil managed - { - .maxstack 8 - IL_0000: ldarg.0 - IL_0001: call instance void [CORE_ASSEMBLY]System.Attribute::.ctor() - IL_0006: ret - } // end of method EmbeddedAttribute::.ctor - -} // end of class Microsoft.CodeAnalysis.EmbeddedAttribute - -.class private auto ansi sealed beforefieldinit System.Runtime.CompilerServices.NativeIntegerAttribute - extends [CORE_ASSEMBLY]System.Attribute -{ - .custom instance void [CORE_ASSEMBLY]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( - 01 00 00 00 - ) - .custom instance void Microsoft.CodeAnalysis.EmbeddedAttribute::.ctor() = ( - 01 00 00 00 - ) - .custom instance void [CORE_ASSEMBLY]System.AttributeUsageAttribute::.ctor(valuetype [CORE_ASSEMBLY]System.AttributeTargets) = ( - 01 00 84 6b 00 00 02 00 54 02 0d 41 6c 6c 6f 77 - 4d 75 6c 74 69 70 6c 65 00 54 02 09 49 6e 68 65 - 72 69 74 65 64 00 - ) - .field public initonly bool[] TransformFlags - - .method public hidebysig specialname rtspecialname - instance void .ctor () cil managed - { - .maxstack 8 - IL_0000: ldarg.0 - IL_0001: call instance void [CORE_ASSEMBLY]System.Attribute::.ctor() - IL_0006: ldarg.0 - IL_0007: ldc.i4.1 - IL_0008: newarr [CORE_ASSEMBLY]System.Boolean - IL_000d: dup - IL_000e: ldc.i4.0 - IL_000f: ldc.i4.1 - IL_0010: stelem.i1 - IL_0011: stfld bool[] System.Runtime.CompilerServices.NativeIntegerAttribute::TransformFlags - IL_0016: ret - } // end of method NativeIntegerAttribute::.ctor - - .method public hidebysig specialname rtspecialname - instance void .ctor ( - bool[] '' - ) cil managed - { - .maxstack 8 - IL_0000: ldarg.0 - IL_0001: call instance void [CORE_ASSEMBLY]System.Attribute::.ctor() - IL_0006: ldarg.0 - IL_0007: ldarg.1 - IL_0008: stfld bool[] System.Runtime.CompilerServices.NativeIntegerAttribute::TransformFlags - IL_000d: ret - } // end of method NativeIntegerAttribute::.ctor - -} // end of class System.Runtime.CompilerServices.NativeIntegerAttribute diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj deleted file mode 100644 index 4b552a0a38e..00000000000 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +++ /dev/null @@ -1,92 +0,0 @@ -<Project Sdk="Microsoft.NET.Sdk.IL"> - <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> - <!-- Make sure that the DebuggableAttribute is set properly. --> - <DebugOptimization>IMPL</DebugOptimization> - <DebugOptimization Condition="'$(Configuration)' == 'Release'">OPT</DebugOptimization> - <CoreCompileDependsOn>$(CoreCompileDependsOn);GenerateVersionFile</CoreCompileDependsOn> - <DocumentationFile>$(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe.xml</DocumentationFile> - <IlasmFlags>$(IlasmFlags) -DEBUG=$(DebugOptimization)</IlasmFlags> - <IsPackable>true</IsPackable> - <PackageDescription>Provides the System.Runtime.CompilerServices.Unsafe class, which provides generic, low-level functionality for manipulating pointers. - -Commonly Used Types: -System.Runtime.CompilerServices.Unsafe</PackageDescription> - </PropertyGroup> - <PropertyGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp'"> - <ExtraMacros>#define netcoreapp</ExtraMacros> - <CoreAssembly>System.Runtime</CoreAssembly> - </PropertyGroup> - <PropertyGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETStandard'"> - <CoreAssembly>netstandard</CoreAssembly> - </PropertyGroup> - <PropertyGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'"> - <CoreAssembly>mscorlib</CoreAssembly> - </PropertyGroup> - <ItemGroup> - <Compile Include="System.Runtime.CompilerServices.Unsafe.il" /> - </ItemGroup> - <ItemGroup> - <!-- mscorlib is passed in as an explicit reference from C# targets but not via the IL SDK. --> - <Reference Include="$(CoreAssembly)" - Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard'" /> - </ItemGroup> - - <Target Name="GenerateVersionFile" - DependsOnTargets="GetAssemblyVersion;ResolveReferences" - Inputs="$(MSBuildAllProjects)" - Outputs="'$(VersionFilePath)"> - <PropertyGroup> - <IncludePath>$([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)', 'version'))</IncludePath> - <IncludePathTrimmed>$(IncludePath.TrimEnd('\'))</IncludePathTrimmed> - <IlasmFlags>$(IlasmFlags) -INCLUDE="$(IncludePathTrimmed)"</IlasmFlags> - <VersionFilePath Condition="'$(VersionFilePath)' == ''">$([MSBuild]::NormalizePath('$(IncludePath)', 'version.h'))</VersionFilePath> - <_AssemblyVersion>$(AssemblyVersion.Replace('.', ':'))</_AssemblyVersion> - <_coreAssemblyName Condition="'%(ReferencePath.FileName)' == '$(CoreAssembly)'">%(ReferencePath.FusionName)</_coreAssemblyName> - <_assemblyNamePattern><![CDATA[[^,]+, Version=(?<v1>[0-9]+)\.(?<v2>[0-9]+)\.(?<v3>[0-9]+)\.(?<v4>[0-9]+), .*PublicKeyToken=(?<p1>[0-9a-f]{2})(?<p2>[0-9a-f]{2})(?<p3>[0-9a-f]{2})(?<p4>[0-9a-f]{2})(?<p5>[0-9a-f]{2})(?<p6>[0-9a-f]{2})(?<p7>[0-9a-f]{2})(?<p8>[0-9a-f]{2})]]></_assemblyNamePattern> - <_coreAssemblyVersion>$([System.Text.RegularExpressions.Regex]::Replace( - $(_coreAssemblyName), - $(_assemblyNamePattern), - '${v1}:${v2}:${v3}:${v4}'))</_coreAssemblyVersion> - <_coreAssemblyPublicKeyToken>$([System.Text.RegularExpressions.Regex]::Replace( - $(_coreAssemblyName), - $(_assemblyNamePattern), - '${p1} ${p2} ${p3} ${p4} ${p5} ${p6} ${p7} ${p8}').ToUpperInvariant())</_coreAssemblyPublicKeyToken> - <_VersionFileContents> -<![CDATA[ -#define CORE_ASSEMBLY "$(CoreAssembly)" -#define ASSEMBLY_VERSION "$(_AssemblyVersion)" -#define CORE_ASSEMBLY_VERSION "$(_CoreAssemblyVersion)" -#define FILE_VERSION "{string('$(FileVersion)')}" -#define INFORMATIONAL_VERSION "{string('$(InformationalVersion)')}" -$(ExtraMacros) -// Metadata version: v4.0.30319 -.assembly extern CORE_ASSEMBLY -{ - .publickeytoken = ($(_coreAssemblyPublicKeyToken) ) - .ver CORE_ASSEMBLY_VERSION -} - ]]> - </_VersionFileContents> - </PropertyGroup> - - <WriteLinesToFile - File="$(VersionFilePath)" - Lines="$(_VersionFileContents)" - Overwrite="true" - WriteOnlyWhenDifferent="true" /> - - <ItemGroup> - <FileWrites Include="$(VersionFilePath)" /> - </ItemGroup> - </Target> - - <!-- Decompile the ILResourceReference to get native resources. --> - <Target Name="SetILResourceReference" - BeforeTargets="DisassembleIlasmResourceFile" - Condition="'@(ResolvedMatchingContract)' != ''"> - <ItemGroup> - <ILResourceReference Include="@(ResolvedMatchingContract)" /> - </ItemGroup> - </Target> -</Project> diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.xml b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.xml deleted file mode 100644 index 7acab80f66f..00000000000 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.xml +++ /dev/null @@ -1,353 +0,0 @@ -<?xml version="1.0"?> -<doc> - <assembly> - <name>System.Runtime.CompilerServices.Unsafe</name> - </assembly> - <members> - <member name="T:System.Runtime.CompilerServices.Unsafe"> - <summary> - Contains generic, low-level functionality for manipulating pointers. - </summary> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Read``1(System.Void*)"> - <summary> - Reads a value of type <typeparamref name="T"/> from the given location. - </summary> - <typeparam name="T">The type to read.</typeparam> - <param name="source">The location to read from.</param> - <returns>An object of type <typeparamref name="T"/> read from the given location.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.ReadUnaligned``1(System.Void*)"> - <summary> - Reads a value of type <typeparamref name="T"/> from the given location. - </summary> - <typeparam name="T">The type to read.</typeparam> - <param name="source">The location to read from.</param> - <returns>An object of type <typeparamref name="T"/> read from the given location.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.ReadUnaligned``1(System.Byte@)"> - <summary> - Reads a value of type <typeparamref name="T"/> from the given location. - </summary> - <typeparam name="T">The type to read.</typeparam> - <param name="source">The location to read from.</param> - <returns>An object of type <typeparamref name="T"/> read from the given location.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Write``1(System.Void*,``0)"> - <summary> - Writes a value of type <typeparamref name="T"/> to the given location. - </summary> - <typeparam name="T">The type of value to write.</typeparam> - <param name="destination">The location to write to.</param> - <param name="value">The value to write.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.WriteUnaligned``1(System.Void*,``0)"> - <summary> - Writes a value of type <typeparamref name="T"/> to the given location. - </summary> - <typeparam name="T">The type of value to write.</typeparam> - <param name="destination">The location to write to.</param> - <param name="value">The value to write.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.WriteUnaligned``1(System.Byte@,``0)"> - <summary> - Writes a value of type <typeparamref name="T"/> to the given location. - </summary> - <typeparam name="T">The type of value to write.</typeparam> - <param name="destination">The location to write to.</param> - <param name="value">The value to write.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Copy``1(System.Void*,``0@)"> - <summary> - Copies a value of type <typeparamref name="T"/> to the given location. - </summary> - <typeparam name="T">The type of value to copy.</typeparam> - <param name="destination">The location to copy to.</param> - <param name="source">A reference to the value to copy.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Copy``1(``0@,System.Void*)"> - <summary> - Copies a value of type <typeparamref name="T"/> to the given location. - </summary> - <typeparam name="T">The type of value to copy.</typeparam> - <param name="destination">The location to copy to.</param> - <param name="source">A pointer to the value to copy.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.AsPointer``1(``0@)"> - <summary> - Returns a pointer to the given by-ref parameter. - </summary> - <typeparam name="T">The type of object.</typeparam> - <param name="value">The object whose pointer is obtained.</param> - <returns>A pointer to the given value.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.SizeOf``1"> - <summary> - Returns the size of an object of the given type parameter. - </summary> - <typeparam name="T">The type of object whose size is retrieved.</typeparam> - <returns>The size of an object of type <typeparamref name="T"/>.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.As``1(System.Object)"> - <summary> - Casts the given object to the specified type, performs no dynamic type checking. - </summary> - <typeparam name="T">The type which the object will be cast to.</typeparam> - <param name="o">The object to cast.</param> - <returns>The original object, casted to the given type.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.AsRef``1(System.Void*)"> - <summary> - Reinterprets the given location as a reference to a value of type <typeparamref name="T"/>. - </summary> - <typeparam name="T">The type of the interpreted location.</typeparam> - <param name="source">The location of the value to reference.</param> - <returns>A reference to a value of type <typeparamref name="T"/>.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.AsRef``1(``0@)"> - <summary> - Reinterprets the given read-only reference as a reference. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The read-only reference to reinterpret.</param> - <returns>A reference to a value of type <typeparamref name="T"/>.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.As``2(``0@)"> - <summary> - Reinterprets the given reference as a reference to a value of type <typeparamref name="TTo"/>. - </summary> - <typeparam name="TFrom">The type of reference to reinterpret.</typeparam> - <typeparam name="TTo">The desired type of the reference.</typeparam> - <param name="source">The reference to reinterpret.</param> - <returns>A reference to a value of type <typeparamref name="TTo"/>.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Unbox``1(System.Object)"> - <summary> - Returns a reference to the value type contained with the specified box object. - </summary> - <typeparam name="T">The type of the value type contained within the box.</typeparam> - <param name="box">The boxed value type.</param> - <returns>A reference to a value of type <typeparamref name="T"/> in the box object.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Add``1(``0@,System.Int32)"> - <summary> - Adds an element offset to the given reference. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The reference to add the offset to.</param> - <param name="elementOffset">The offset to add.</param> - <returns>A new reference that reflects the addition of offset to pointer.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Add``1(System.Void*,System.Int32)"> - <summary> - Adds an element offset to the given pointer. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The pointer to add the offset to.</param> - <param name="elementOffset">The offset to add.</param> - <returns>A new pointer that reflects the addition of offset to pointer.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Add``1(``0@,System.IntPtr)"> - <summary> - Adds an element offset to the given reference. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The reference to add the offset to.</param> - <param name="elementOffset">The offset to add.</param> - <returns>A new reference that reflects the addition of offset to pointer.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Add``1(``0@,System.UIntPtr)"> - <summary> - Adds an element offset to the given reference. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The reference to add the offset to.</param> - <param name="elementOffset">The offset to add.</param> - <returns>A new reference that reflects the addition of offset to pointer.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.AddByteOffset``1(``0@,System.IntPtr)"> - <summary> - Adds a byte offset to the given reference. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The reference to add the offset to.</param> - <param name="byteOffset">The offset to add.</param> - <returns>A new reference that reflects the addition of byte offset to pointer.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.AddByteOffset``1(``0@,System.UIntPtr)"> - <summary> - Adds a byte offset to the given reference. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The reference to add the offset to.</param> - <param name="byteOffset">The offset to add.</param> - <returns>A new reference that reflects the addition of byte offset to pointer.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Subtract``1(``0@,System.Int32)"> - <summary> - Subtracts an element offset from the given reference. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The reference to subtract the offset from.</param> - <param name="elementOffset">The offset to subtract.</param> - <returns>A new reference that reflects the subraction of offset from pointer.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Subtract``1(``0@,System.IntPtr)"> - <summary> - Subtracts an element offset from the given reference. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The reference to subtract the offset from.</param> - <param name="elementOffset">The offset to subtract.</param> - <returns>A new reference that reflects the subraction of offset from pointer.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.Subtract``1(``0@,System.UIntPtr)"> - <summary> - Subtracts an element offset from the given reference. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The reference to subtract the offset from.</param> - <param name="elementOffset">The offset to subtract.</param> - <returns>A new reference that reflects the subraction of offset from pointer.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.SubtractByteOffset``1(``0@,System.IntPtr)"> - <summary> - Subtracts a byte offset from the given reference. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The reference to subtract the offset from.</param> - <param name="byteOffset">The offset to subtract.</param> - <returns>A new reference that reflects the subraction of byte offset from pointer.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.SubtractByteOffset``1(``0@,System.UIntPtr)"> - <summary> - Subtracts a byte offset from the given reference. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="source">The reference to subtract the offset from.</param> - <param name="byteOffset">The offset to subtract.</param> - <returns>A new reference that reflects the subraction of byte offset from pointer.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.ByteOffset``1(``0@,``0@)"> - <summary> - Determines the byte offset from origin to target from the given references. - </summary> - <typeparam name="T">The type of reference.</typeparam> - <param name="origin">The reference to origin.</param> - <param name="target">The reference to target.</param> - <returns>Byte offset from origin to target i.e. <paramref name="target"/> - <paramref name="origin"/>.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.AreSame``1(``0@,``0@)"> - <summary> - Determines whether the specified references point to the same location. - </summary> - <param name="left">The first reference to compare.</param> - <param name="right">The second reference to compare.</param> - <returns><c>true</c> if <paramref name="left"/> and <paramref name="right"/> point to the same location; otherwise <c>false</c>.</returns> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.IsAddressGreaterThan``1(``0@,``0@)"> - <summary> - Determines whether the memory address referenced by <paramref name="left"/> is greater than the memory address referenced by <paramref name="right"/>. - </summary> - <param name="left">The first reference to compare.</param> - <param name="right">The second reference to compare.</param> - <returns><c>true</c> if the memory address referenced by <paramref name="left"/> is greater than the memory address referenced by <paramref name="right"/>; otherwise <c>false</c>.</returns> - <remarks> - This check is conceptually similar to "(void*)(&left) > (void*)(&right)". Both parameters must reference the same object, array, or span; - or the objects being referenced must both be pinned; or both references must represent unmanaged pointers; otherwise the result is undefined. - </remarks> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.IsAddressLessThan``1(``0@,``0@)"> - <summary> - Determines whether the memory address referenced by <paramref name="left"/> is less than the memory address referenced by <paramref name="right"/>. - </summary> - <param name="left">The first reference to compare.</param> - <param name="right">The second reference to compare.</param> - <returns><c>true</c> if the memory address referenced by <paramref name="left"/> is less than the memory address referenced by <paramref name="right"/>; otherwise <c>false</c>.</returns> - <remarks> - This check is conceptually similar to "(void*)(&left) < (void*)(&right)". Both parameters must reference the same object, array, or span; - or the objects being referenced must both be pinned; or both references must represent unmanaged pointers; otherwise the result is undefined. - </remarks> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.IsNullRef``1(``0@)"> - <summary> - Returns if a given reference to a value of type <typeparamref name="T"/> is a null reference. - </summary> - <param name="source">The reference to check.</param> - <remarks>This check is conceptually similar to "(void*)(&source) == nullptr".</remarks> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.NullRef``1"> - <summary> - Returns a reference to a value of type <typeparamref name="T"/> that is a null reference. - </summary> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.CopyBlock(System.Void*,System.Void*,System.UInt32)"> - <summary> - Copies bytes from the source address to the destination address. - </summary> - <param name="destination">The destination address to copy to.</param> - <param name="source">The source address to copy from.</param> - <param name="byteCount">The number of bytes to copy.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.CopyBlock(System.Byte@,System.Byte@,System.UInt32)"> - <summary> - Copies bytes from the source address to the destination address. - </summary> - <param name="destination">The destination address to copy to.</param> - <param name="source">The source address to copy from.</param> - <param name="byteCount">The number of bytes to copy.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.CopyBlockUnaligned(System.Void*,System.Void*,System.UInt32)"> - <summary> - Copies bytes from the source address to the destination address - without assuming architecture dependent alignment of the addresses. - </summary> - <param name="destination">The destination address to copy to.</param> - <param name="source">The source address to copy from.</param> - <param name="byteCount">The number of bytes to copy.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.CopyBlockUnaligned(System.Byte@,System.Byte@,System.UInt32)"> - <summary> - Copies bytes from the source address to the destination address - without assuming architecture dependent alignment of the addresses. - </summary> - <param name="destination">The destination address to copy to.</param> - <param name="source">The source address to copy from.</param> - <param name="byteCount">The number of bytes to copy.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.InitBlock(System.Void*,System.Byte,System.UInt32)"> - <summary> - Initializes a block of memory at the given location with a given initial value. - </summary> - <param name="startAddress">The address of the start of the memory block to initialize.</param> - <param name="value">The value to initialize the block to.</param> - <param name="byteCount">The number of bytes to initialize.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.InitBlock(System.Byte@,System.Byte,System.UInt32)"> - <summary> - Initializes a block of memory at the given location with a given initial value. - </summary> - <param name="startAddress">The address of the start of the memory block to initialize.</param> - <param name="value">The value to initialize the block to.</param> - <param name="byteCount">The number of bytes to initialize.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.InitBlockUnaligned(System.Void*,System.Byte,System.UInt32)"> - <summary> - Initializes a block of memory at the given location with a given initial value - without assuming architecture dependent alignment of the address. - </summary> - <param name="startAddress">The address of the start of the memory block to initialize.</param> - <param name="value">The value to initialize the block to.</param> - <param name="byteCount">The number of bytes to initialize.</param> - </member> - <member name="M:System.Runtime.CompilerServices.Unsafe.InitBlockUnaligned(System.Byte@,System.Byte,System.UInt32)"> - <summary> - Initializes a block of memory at the given location with a given initial value - without assuming architecture dependent alignment of the address. - </summary> - <param name="startAddress">The address of the start of the memory block to initialize.</param> - <param name="value">The value to initialize the block to.</param> - <param name="byteCount">The number of bytes to initialize.</param> - </member> - </members> -</doc> diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj index 8852455f782..19210baa8b1 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj @@ -1,12 +1,9 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="UnsafeTests.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> - <ProjectReference Include="..\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> - </ItemGroup> -</Project>
\ No newline at end of file +</Project> 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 61d525d146b..b06eea74787 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 @@ -1,22 +1,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1415080F-E571-4350-97F8-36D1871AA17D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E57BD2F0-8235-49FF-B3CD-76A40804E472}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{72E42933-6469-41D3-97B6-B522FB20FF62}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.VisualC", "ref\System.Runtime.CompilerServices.VisualC.csproj", "{6157FC12-0BEC-4A23-80F0-FBC8A8C71E22}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.VisualC", "src\System.Runtime.CompilerServices.VisualC.csproj", "{941D72C5-CA37-4745-B89D-2257517C5761}" 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}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A0EC25E3-2BB1-416A-B31F-50FCEA32730C}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED06DBA3-D182-438E-A1EC-059194F3959D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{65453C51-F488-4026-9596-05F765899247}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27ADCE48-E139-48C1-A838-A0B8FBDECF95}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{07A6E36B-25A7-47FD-A399-7A722EABF7DF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,14 +29,6 @@ Global {1415080F-E571-4350-97F8-36D1871AA17D}.Debug|Any CPU.Build.0 = Debug|Any CPU {1415080F-E571-4350-97F8-36D1871AA17D}.Release|Any CPU.ActiveCfg = Release|Any CPU {1415080F-E571-4350-97F8-36D1871AA17D}.Release|Any CPU.Build.0 = Release|Any CPU - {E57BD2F0-8235-49FF-B3CD-76A40804E472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E57BD2F0-8235-49FF-B3CD-76A40804E472}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E57BD2F0-8235-49FF-B3CD-76A40804E472}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E57BD2F0-8235-49FF-B3CD-76A40804E472}.Release|Any CPU.Build.0 = Release|Any CPU - {72E42933-6469-41D3-97B6-B522FB20FF62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72E42933-6469-41D3-97B6-B522FB20FF62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72E42933-6469-41D3-97B6-B522FB20FF62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72E42933-6469-41D3-97B6-B522FB20FF62}.Release|Any CPU.Build.0 = Release|Any CPU {6157FC12-0BEC-4A23-80F0-FBC8A8C71E22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6157FC12-0BEC-4A23-80F0-FBC8A8C71E22}.Debug|Any CPU.Build.0 = Debug|Any CPU {6157FC12-0BEC-4A23-80F0-FBC8A8C71E22}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -47,6 +41,14 @@ 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 + {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 + {61212F97-E2E3-4602-BDBC-B0BB4C3C7AFD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -54,10 +56,10 @@ Global GlobalSection(NestedProjects) = preSolution {1415080F-E571-4350-97F8-36D1871AA17D} = {ED06DBA3-D182-438E-A1EC-059194F3959D} {11D31B6C-3ECF-472B-8AD5-3D799BA3F052} = {ED06DBA3-D182-438E-A1EC-059194F3959D} - {E57BD2F0-8235-49FF-B3CD-76A40804E472} = {65453C51-F488-4026-9596-05F765899247} {6157FC12-0BEC-4A23-80F0-FBC8A8C71E22} = {65453C51-F488-4026-9596-05F765899247} - {72E42933-6469-41D3-97B6-B522FB20FF62} = {27ADCE48-E139-48C1-A838-A0B8FBDECF95} {941D72C5-CA37-4745-B89D-2257517C5761} = {27ADCE48-E139-48C1-A838-A0B8FBDECF95} + {A0EC25E3-2BB1-416A-B31F-50FCEA32730C} = {07A6E36B-25A7-47FD-A399-7A722EABF7DF} + {61212F97-E2E3-4602-BDBC-B0BB4C3C7AFD} = {07A6E36B-25A7-47FD-A399-7A722EABF7DF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {568C6D8F-F5AD-4703-A695-EA54585C33D0} diff --git a/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln b/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln index 104ed3cf801..a6fe160fb50 100644 --- a/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln +++ b/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln @@ -3,22 +3,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities.Unicode", ".. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D75C4FA5-B1F6-4D01-BFA3-AB505232EAAB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{97D15205-BED4-4E59-95B7-325FE4C246ED}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E0D5AA0C-B0C7-43F9-9AEA-5E0A263BB5F6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "ref\System.Runtime.Experimental.csproj", "{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Experimental", "src\System.Runtime.Experimental.proj", "{A7FFBF8A-9987-44D5-83A7-90CF134CBF7E}" 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}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{2D21BCB3-C0B4-4549-8E06-95848955ECB5}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{76C68769-6068-48CE-9E73-4E43880DECFE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D00764F9-F736-4072-A7DD-B4BF05CF4786}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EEFDC0A9-B4CB-4061-BBC4-E0183805DCD9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A7C4D11F-9D4F-4C8C-9EBE-81CA2E0EC71E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,14 +35,6 @@ Global {D75C4FA5-B1F6-4D01-BFA3-AB505232EAAB}.Debug|Any CPU.Build.0 = Debug|Any CPU {D75C4FA5-B1F6-4D01-BFA3-AB505232EAAB}.Release|Any CPU.ActiveCfg = Release|Any CPU {D75C4FA5-B1F6-4D01-BFA3-AB505232EAAB}.Release|Any CPU.Build.0 = Release|Any CPU - {97D15205-BED4-4E59-95B7-325FE4C246ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97D15205-BED4-4E59-95B7-325FE4C246ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97D15205-BED4-4E59-95B7-325FE4C246ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97D15205-BED4-4E59-95B7-325FE4C246ED}.Release|Any CPU.Build.0 = Release|Any CPU - {E0D5AA0C-B0C7-43F9-9AEA-5E0A263BB5F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0D5AA0C-B0C7-43F9-9AEA-5E0A263BB5F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0D5AA0C-B0C7-43F9-9AEA-5E0A263BB5F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0D5AA0C-B0C7-43F9-9AEA-5E0A263BB5F6}.Release|Any CPU.Build.0 = Release|Any CPU {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -53,6 +47,14 @@ 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 + {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 + {816C1785-F12B-44C6-9AB7-427E764E2B0A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -61,10 +63,10 @@ Global {DE10D921-4EF6-459C-843A-A59D24D738CB} = {76C68769-6068-48CE-9E73-4E43880DECFE} {D75C4FA5-B1F6-4D01-BFA3-AB505232EAAB} = {76C68769-6068-48CE-9E73-4E43880DECFE} {4EE36055-AD7C-4779-B3F6-08687960DCC3} = {76C68769-6068-48CE-9E73-4E43880DECFE} - {97D15205-BED4-4E59-95B7-325FE4C246ED} = {D00764F9-F736-4072-A7DD-B4BF05CF4786} {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C} = {D00764F9-F736-4072-A7DD-B4BF05CF4786} - {E0D5AA0C-B0C7-43F9-9AEA-5E0A263BB5F6} = {EEFDC0A9-B4CB-4061-BBC4-E0183805DCD9} {A7FFBF8A-9987-44D5-83A7-90CF134CBF7E} = {EEFDC0A9-B4CB-4061-BBC4-E0183805DCD9} + {2D21BCB3-C0B4-4549-8E06-95848955ECB5} = {A7C4D11F-9D4F-4C8C-9EBE-81CA2E0EC71E} + {816C1785-F12B-44C6-9AB7-427E764E2B0A} = {A7C4D11F-9D4F-4C8C-9EBE-81CA2E0EC71E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {19706846-1F47-42ED-B649-B0982EE96E6B} diff --git a/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln b/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln index 6ad1a98fa33..55ee0d628d1 100644 --- a/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln +++ b/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln @@ -7,10 +7,6 @@ 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", "{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{04BA3E3C-6979-4792-B19E-C797AD607F42}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "ref\System.Runtime.Extensions.csproj", "{959EAFBC-9394-4E25-9A84-0B85152A7FCD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "src\System.Runtime.Extensions.csproj", "{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}" @@ -37,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2642DD1A-F4C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F4E65A6B-CBA4-40E2-A0B5-6C50C8AAB25C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{4B73FA84-77B3-4A74-94ED-4232D0A80196}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E603EA66-B62A-4B5E-93D1-30F8CC0AC497}" EndProject Global @@ -124,42 +122,6 @@ Global {1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Checked|x64.Build.0 = Debug|Any CPU {1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Checked|x86.ActiveCfg = Debug|Any CPU {1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Checked|x86.Build.0 = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|x64.ActiveCfg = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|x64.Build.0 = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|x86.ActiveCfg = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|x86.Build.0 = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|Any CPU.Build.0 = Release|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|x64.ActiveCfg = Release|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|x64.Build.0 = Release|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|x86.ActiveCfg = Release|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|x86.Build.0 = Release|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Checked|Any CPU.Build.0 = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Checked|x64.ActiveCfg = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Checked|x64.Build.0 = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Checked|x86.ActiveCfg = Debug|Any CPU - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Checked|x86.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x64.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x64.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x86.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x86.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x64.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x64.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x86.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x86.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|Any CPU.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x64.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x64.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x86.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x86.Build.0 = Debug|Any CPU {959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Debug|Any CPU.Build.0 = Debug|Any CPU {959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -364,12 +326,8 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7} = {2642DD1A-F4C5-4B39-8170-7BC51A75F5D1} - {C7112A41-1DC9-421E-88A0-8830D081A7B1} = {2642DD1A-F4C5-4B39-8170-7BC51A75F5D1} {1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2} = {2642DD1A-F4C5-4B39-8170-7BC51A75F5D1} - {04BA3E3C-6979-4792-B19E-C797AD607F42} = {2642DD1A-F4C5-4B39-8170-7BC51A75F5D1} {FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A} = {2642DD1A-F4C5-4B39-8170-7BC51A75F5D1} - {43D09D13-38C0-4504-AB84-D5F6B76170DF} = {2642DD1A-F4C5-4B39-8170-7BC51A75F5D1} - {A2438CFE-792C-4217-B060-E85A38B37B07} = {2642DD1A-F4C5-4B39-8170-7BC51A75F5D1} {2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8} = {2642DD1A-F4C5-4B39-8170-7BC51A75F5D1} {D7A1E176-1515-41FE-86D0-A46C82B87B05} = {F4E65A6B-CBA4-40E2-A0B5-6C50C8AAB25C} {01EC2059-605F-472C-A255-ED76197F62CD} = {F4E65A6B-CBA4-40E2-A0B5-6C50C8AAB25C} @@ -378,7 +336,9 @@ Global {1FDA0C56-0687-4F08-B147-E997C026A12D} = {F4E65A6B-CBA4-40E2-A0B5-6C50C8AAB25C} {397D1AB1-0A29-462A-9F05-14015B8B5796} = {F4E65A6B-CBA4-40E2-A0B5-6C50C8AAB25C} {F55614A7-859C-4171-844B-46F37EDDD351} = {F4E65A6B-CBA4-40E2-A0B5-6C50C8AAB25C} - {8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9} = {E603EA66-B62A-4B5E-93D1-30F8CC0AC497} + {C7112A41-1DC9-421E-88A0-8830D081A7B1} = {4B73FA84-77B3-4A74-94ED-4232D0A80196} + {43D09D13-38C0-4504-AB84-D5F6B76170DF} = {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 GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln b/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln index 98d3b725b1e..a6d87e98271 100644 --- a/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln +++ b/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln @@ -1,22 +1,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C2EBFF8C-0395-44E4-807C-B1BE41B339E3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{122D80EB-D5F2-4228-8657-2BF93DBFB22C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B3083B91-237A-4646-97E8-F59B8A3C1E5F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Handles", "ref\System.Runtime.Handles.csproj", "{26C50637-E915-450B-93DB-B11A2678CFAF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Handles", "src\System.Runtime.Handles.csproj", "{8FB6B1B7-FA5C-4E13-BA3E-2FD95018237F}" 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}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4A5E88CA-6A6D-4261-AFA6-112C0ED452E3}" +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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D3247F93-F1D3-4F4E-BBB0-C75AC9E60C98}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AEF7F826-AF56-49E3-B89C-5DC5D17814DE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6049E50D-EE67-476B-9BE2-654AB188D628}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CBDAE503-B99C-44D3-A6E6-529651F65B1E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,14 +29,6 @@ Global {C2EBFF8C-0395-44E4-807C-B1BE41B339E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2EBFF8C-0395-44E4-807C-B1BE41B339E3}.Release|Any CPU.ActiveCfg = Release|Any CPU {C2EBFF8C-0395-44E4-807C-B1BE41B339E3}.Release|Any CPU.Build.0 = Release|Any CPU - {122D80EB-D5F2-4228-8657-2BF93DBFB22C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {122D80EB-D5F2-4228-8657-2BF93DBFB22C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {122D80EB-D5F2-4228-8657-2BF93DBFB22C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {122D80EB-D5F2-4228-8657-2BF93DBFB22C}.Release|Any CPU.Build.0 = Release|Any CPU - {B3083B91-237A-4646-97E8-F59B8A3C1E5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3083B91-237A-4646-97E8-F59B8A3C1E5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3083B91-237A-4646-97E8-F59B8A3C1E5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3083B91-237A-4646-97E8-F59B8A3C1E5F}.Release|Any CPU.Build.0 = Release|Any CPU {26C50637-E915-450B-93DB-B11A2678CFAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {26C50637-E915-450B-93DB-B11A2678CFAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {26C50637-E915-450B-93DB-B11A2678CFAF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -47,6 +41,14 @@ 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 + {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 + {1D0EC779-8B5E-42F2-87D1-0A34C4C8B63D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -54,10 +56,10 @@ Global GlobalSection(NestedProjects) = preSolution {C2EBFF8C-0395-44E4-807C-B1BE41B339E3} = {D3247F93-F1D3-4F4E-BBB0-C75AC9E60C98} {2C0117E7-BC37-4C3F-A291-9C45AEA68F02} = {D3247F93-F1D3-4F4E-BBB0-C75AC9E60C98} - {122D80EB-D5F2-4228-8657-2BF93DBFB22C} = {AEF7F826-AF56-49E3-B89C-5DC5D17814DE} {26C50637-E915-450B-93DB-B11A2678CFAF} = {AEF7F826-AF56-49E3-B89C-5DC5D17814DE} - {B3083B91-237A-4646-97E8-F59B8A3C1E5F} = {6049E50D-EE67-476B-9BE2-654AB188D628} {8FB6B1B7-FA5C-4E13-BA3E-2FD95018237F} = {6049E50D-EE67-476B-9BE2-654AB188D628} + {4A5E88CA-6A6D-4261-AFA6-112C0ED452E3} = {CBDAE503-B99C-44D3-A6E6-529651F65B1E} + {1D0EC779-8B5E-42F2-87D1-0A34C4C8B63D} = {CBDAE503-B99C-44D3-A6E6-529651F65B1E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {08352DB8-2D6F-4ABA-939D-9080EFA16409} 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 407b961851d..42758c26e73 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 @@ -1,10 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{330C46C6-15A6-4713-A227-3BFA379D4479}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{BB55A91F-822B-4D5C-B3A2-02372BB356FA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0A1860C3-7207-49CE-B921-A9A76EA4A9DB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.RuntimeInformation", "ref\System.Runtime.InteropServices.RuntimeInformation.csproj", "{B2937043-2666-41F2-A72B-FA9CDBBC012A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.RuntimeInformation", "src\System.Runtime.InteropServices.RuntimeInformation.csproj", "{375DB818-0E7E-4361-9C56-07658B666B8B}" @@ -21,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D380D111-FFF EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{504FF0B7-B77B-4D63-9A18-C5614C9F4F0C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CA3C3D43-A781-40A4-BE23-3A273908FC86}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -31,14 +29,6 @@ Global {330C46C6-15A6-4713-A227-3BFA379D4479}.Debug|Any CPU.Build.0 = Debug|Any CPU {330C46C6-15A6-4713-A227-3BFA379D4479}.Release|Any CPU.ActiveCfg = Release|Any CPU {330C46C6-15A6-4713-A227-3BFA379D4479}.Release|Any CPU.Build.0 = Release|Any CPU - {BB55A91F-822B-4D5C-B3A2-02372BB356FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB55A91F-822B-4D5C-B3A2-02372BB356FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB55A91F-822B-4D5C-B3A2-02372BB356FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB55A91F-822B-4D5C-B3A2-02372BB356FA}.Release|Any CPU.Build.0 = Release|Any CPU - {0A1860C3-7207-49CE-B921-A9A76EA4A9DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A1860C3-7207-49CE-B921-A9A76EA4A9DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A1860C3-7207-49CE-B921-A9A76EA4A9DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A1860C3-7207-49CE-B921-A9A76EA4A9DB}.Release|Any CPU.Build.0 = Release|Any CPU {B2937043-2666-41F2-A72B-FA9CDBBC012A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2937043-2666-41F2-A72B-FA9CDBBC012A}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2937043-2666-41F2-A72B-FA9CDBBC012A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -66,12 +56,10 @@ Global GlobalSection(NestedProjects) = preSolution {330C46C6-15A6-4713-A227-3BFA379D4479} = {ADA9FAB8-9FD5-4035-86D4-4BE1BB564791} {4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8} = {ADA9FAB8-9FD5-4035-86D4-4BE1BB564791} - {BB55A91F-822B-4D5C-B3A2-02372BB356FA} = {D380D111-FFFE-4520-A0AE-3EA3E59F7820} {B2937043-2666-41F2-A72B-FA9CDBBC012A} = {D380D111-FFFE-4520-A0AE-3EA3E59F7820} - {0A1860C3-7207-49CE-B921-A9A76EA4A9DB} = {504FF0B7-B77B-4D63-9A18-C5614C9F4F0C} {375DB818-0E7E-4361-9C56-07658B666B8B} = {504FF0B7-B77B-4D63-9A18-C5614C9F4F0C} - {E9AE8E44-B09F-4331-8DF7-405D9B0588AE} = {504FF0B7-B77B-4D63-9A18-C5614C9F4F0C} - {4C4A68FE-D71A-4EDE-957C-4D90B61FDCD1} = {504FF0B7-B77B-4D63-9A18-C5614C9F4F0C} + {E9AE8E44-B09F-4331-8DF7-405D9B0588AE} = {CA3C3D43-A781-40A4-BE23-3A273908FC86} + {4C4A68FE-D71A-4EDE-957C-4D90B61FDCD1} = {CA3C3D43-A781-40A4-BE23-3A273908FC86} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8C10FECD-1847-429D-9777-81F246B05D48} diff --git a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln index 9886a7bf529..4cbc8d3f7d0 100644 --- a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln +++ b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln @@ -1,19 +1,11 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31808.319 -MinimumVisualStudioVersion = 10.0.40219.1 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{94B59BA0-491F-4B59-ADFF-A057EC3EC835}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}" 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{5BB5F99F-1052-4EB4-B12E-7863805661F3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{04BA3E3C-6979-4792-B19E-C797AD607F42}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllImportGenerator", "gen\DllImportGenerator\DllImportGenerator.csproj", "{07F19F91-D438-428D-99F0-61DAD87E78BA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "gen\DllImportGenerator\DllImportGenerator.csproj", "{07F19F91-D438-428D-99F0-61DAD87E78BA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{768B77B0-EA45-469D-B39E-545EB72F5A43}" EndProject @@ -21,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices", "src\System.Runtime.InteropServices.csproj", "{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ancillary.Interop", "tests\Ancillary.Interop\Ancillary.Interop.csproj", "{79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.Ancillary", "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}" EndProject @@ -31,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.Tests", "tests\System.Runtime.InteropServices.UnitTests\System.Runtime.InteropServices.Tests.csproj", "{049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeExports", "tests\TestAssets\NativeExports\NativeExports.csproj", "{866D295E-424A-4747-9417-CD7746936138}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.Tests.NativeExports", "tests\TestAssets\NativeExports\NativeExports.csproj", "{866D295E-424A-4747-9417-CD7746936138}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedTypes", "tests\TestAssets\SharedTypes\SharedTypes.csproj", "{D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}" EndProject @@ -39,30 +31,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B1678CCD-95C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FB99AC59-1744-4F12-A4B0-0D54FCA048BF}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D893B9AA-57C5-49E3-97B1-12CC62D84307}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems*{94b59ba0-491f-4b59-adff-a057ec3ec835}*SharedItemsImports = 5 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Checked|Any CPU = Checked|Any CPU - Checked|x64 = Checked|x64 - Checked|x86 = Checked|x86 Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 + Checked|Any CPU = Checked|Any CPU + Checked|x64 = Checked|x64 + Checked|x86 = Checked|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|Any CPU.ActiveCfg = Checked|x64 - {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|Any CPU.Build.0 = Checked|x64 - {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x64.ActiveCfg = Checked|x64 - {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x64.Build.0 = Checked|x64 - {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x86.ActiveCfg = Checked|x86 - {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x86.Build.0 = Checked|x86 {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Debug|Any CPU.ActiveCfg = Debug|x64 {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Debug|Any CPU.Build.0 = Debug|x64 {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Debug|x64.ActiveCfg = Debug|x64 @@ -75,12 +60,12 @@ Global {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Release|x64.Build.0 = Release|x64 {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Release|x86.ActiveCfg = Release|x86 {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Release|x86.Build.0 = Release|x86 - {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|Any CPU.Build.0 = Debug|Any CPU - {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|x64.ActiveCfg = Debug|Any CPU - {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|x64.Build.0 = Debug|Any CPU - {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|x86.ActiveCfg = Debug|Any CPU - {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|x86.Build.0 = Debug|Any CPU + {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|Any CPU.ActiveCfg = Checked|x64 + {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|Any CPU.Build.0 = Checked|x64 + {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x64.ActiveCfg = Checked|x64 + {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x64.Build.0 = Checked|x64 + {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x86.ActiveCfg = Checked|x86 + {94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x86.Build.0 = Checked|x86 {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Debug|Any CPU.Build.0 = Debug|Any CPU {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -93,12 +78,12 @@ Global {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Release|x64.Build.0 = Release|Any CPU {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Release|x86.ActiveCfg = Release|Any CPU {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Release|x86.Build.0 = Release|Any CPU - {1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|Any CPU.Build.0 = Debug|Any CPU - {1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|x64.ActiveCfg = Debug|Any CPU - {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 + {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|Any CPU.Build.0 = Debug|Any CPU + {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|x64.ActiveCfg = Debug|Any CPU + {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|x64.Build.0 = Debug|Any CPU + {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|x86.ActiveCfg = Debug|Any CPU + {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|x86.Build.0 = Debug|Any CPU {1B248B4C-7584-4C04-850A-A50EB592052C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B248B4C-7584-4C04-850A-A50EB592052C}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B248B4C-7584-4C04-850A-A50EB592052C}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -111,48 +96,12 @@ Global {1B248B4C-7584-4C04-850A-A50EB592052C}.Release|x64.Build.0 = Release|Any CPU {1B248B4C-7584-4C04-850A-A50EB592052C}.Release|x86.ActiveCfg = Release|Any CPU {1B248B4C-7584-4C04-850A-A50EB592052C}.Release|x86.Build.0 = Release|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Checked|Any CPU.Build.0 = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Checked|x64.ActiveCfg = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Checked|x64.Build.0 = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Checked|x86.ActiveCfg = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Checked|x86.Build.0 = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|x64.ActiveCfg = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|x64.Build.0 = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|x86.ActiveCfg = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|x86.Build.0 = Debug|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|Any CPU.Build.0 = Release|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|x64.ActiveCfg = Release|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|x64.Build.0 = Release|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|x86.ActiveCfg = Release|Any CPU - {5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|x86.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|Any CPU.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x64.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x64.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x86.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x86.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x64.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x64.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x86.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x86.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x64.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x64.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x86.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.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 + {1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|Any CPU.Build.0 = Debug|Any CPU + {1B248B4C-7584-4C04-850A-A50EB592052C}.Checked|x64.ActiveCfg = Debug|Any CPU + {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 @@ -165,12 +114,12 @@ Global {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 - {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|Any CPU.Build.0 = Debug|Any CPU - {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|x64.ActiveCfg = Debug|Any CPU - {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|x64.Build.0 = Debug|Any CPU - {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|x86.ActiveCfg = Debug|Any CPU - {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|x86.Build.0 = Debug|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 {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 @@ -183,12 +132,12 @@ Global {768B77B0-EA45-469D-B39E-545EB72F5A43}.Release|x64.Build.0 = Release|Any CPU {768B77B0-EA45-469D-B39E-545EB72F5A43}.Release|x86.ActiveCfg = Release|Any CPU {768B77B0-EA45-469D-B39E-545EB72F5A43}.Release|x86.Build.0 = Release|Any CPU - {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|Any CPU.Build.0 = Debug|Any CPU - {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|x64.ActiveCfg = Debug|Any CPU - {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|x64.Build.0 = Debug|Any CPU - {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|x86.ActiveCfg = Debug|Any CPU - {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|x86.Build.0 = Debug|Any CPU + {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|Any CPU.Build.0 = Debug|Any CPU + {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|x64.ActiveCfg = Debug|Any CPU + {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|x64.Build.0 = Debug|Any CPU + {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|x86.ActiveCfg = Debug|Any CPU + {768B77B0-EA45-469D-B39E-545EB72F5A43}.Checked|x86.Build.0 = Debug|Any CPU {8671F164-F78C-44FA-93B7-A310F67890FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8671F164-F78C-44FA-93B7-A310F67890FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {8671F164-F78C-44FA-93B7-A310F67890FE}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -201,12 +150,12 @@ Global {8671F164-F78C-44FA-93B7-A310F67890FE}.Release|x64.Build.0 = Release|Any CPU {8671F164-F78C-44FA-93B7-A310F67890FE}.Release|x86.ActiveCfg = Release|Any CPU {8671F164-F78C-44FA-93B7-A310F67890FE}.Release|x86.Build.0 = Release|Any CPU - {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|Any CPU.Build.0 = Debug|Any CPU - {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|x64.ActiveCfg = Debug|Any CPU - {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|x64.Build.0 = Debug|Any CPU - {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|x86.ActiveCfg = Debug|Any CPU - {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|x86.Build.0 = Debug|Any CPU + {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|Any CPU.Build.0 = Debug|Any CPU + {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|x64.ActiveCfg = Debug|Any CPU + {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|x64.Build.0 = Debug|Any CPU + {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|x86.ActiveCfg = Debug|Any CPU + {8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|x86.Build.0 = Debug|Any CPU {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Debug|Any CPU.Build.0 = Debug|Any CPU {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -219,12 +168,12 @@ Global {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Release|x64.Build.0 = Release|Any CPU {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Release|x86.ActiveCfg = Release|Any CPU {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Release|x86.Build.0 = Release|Any CPU - {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|Any CPU.Build.0 = Debug|Any CPU - {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|x64.ActiveCfg = Debug|Any CPU - {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 + {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|Any CPU.Build.0 = Debug|Any CPU + {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|x64.ActiveCfg = Debug|Any CPU + {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|x64.Build.0 = Debug|Any CPU + {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|x86.ActiveCfg = Debug|Any CPU + {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|x86.Build.0 = Debug|Any CPU {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Debug|Any CPU.Build.0 = Debug|Any CPU {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -237,12 +186,12 @@ Global {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Release|x64.Build.0 = Release|Any CPU {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Release|x86.ActiveCfg = Release|Any CPU {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.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 + {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|Any CPU.Build.0 = Debug|Any CPU + {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E}.Checked|x64.ActiveCfg = Debug|Any CPU + {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 @@ -255,12 +204,12 @@ Global {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 - {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 + {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 @@ -273,12 +222,12 @@ Global {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 - {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|Any CPU.Build.0 = Debug|Any CPU - {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x64.ActiveCfg = Debug|Any CPU - {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x64.Build.0 = Debug|Any CPU - {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x86.ActiveCfg = Debug|Any CPU - {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x86.Build.0 = Debug|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 {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 @@ -291,12 +240,12 @@ Global {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Release|x64.Build.0 = Release|Any CPU {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Release|x86.ActiveCfg = Release|Any CPU {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Release|x86.Build.0 = Release|Any CPU - {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|Any CPU.Build.0 = Debug|Any CPU - {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x64.ActiveCfg = Debug|Any CPU - {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x64.Build.0 = Debug|Any CPU - {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x86.ActiveCfg = Debug|Any CPU - {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x86.Build.0 = Debug|Any CPU + {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|Any CPU.Build.0 = Debug|Any CPU + {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x64.ActiveCfg = Debug|Any CPU + {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x64.Build.0 = Debug|Any CPU + {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x86.ActiveCfg = Debug|Any CPU + {25D66424-2EAF-464D-8460-10C04EDEF3C3}.Checked|x86.Build.0 = Debug|Any CPU {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Debug|Any CPU.Build.0 = Debug|Any CPU {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -309,12 +258,12 @@ Global {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Release|x64.Build.0 = Release|Any CPU {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Release|x86.ActiveCfg = Release|Any CPU {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Release|x86.Build.0 = Release|Any CPU - {866D295E-424A-4747-9417-CD7746936138}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {866D295E-424A-4747-9417-CD7746936138}.Checked|Any CPU.Build.0 = Debug|Any CPU - {866D295E-424A-4747-9417-CD7746936138}.Checked|x64.ActiveCfg = Debug|Any CPU - {866D295E-424A-4747-9417-CD7746936138}.Checked|x64.Build.0 = Debug|Any CPU - {866D295E-424A-4747-9417-CD7746936138}.Checked|x86.ActiveCfg = Debug|Any CPU - {866D295E-424A-4747-9417-CD7746936138}.Checked|x86.Build.0 = Debug|Any CPU + {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|Any CPU.Build.0 = Debug|Any CPU + {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x64.ActiveCfg = Debug|Any CPU + {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x64.Build.0 = Debug|Any CPU + {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x86.ActiveCfg = Debug|Any CPU + {049B7FD4-ACEF-4BCD-A7A7-75C9BBEC4EBF}.Checked|x86.Build.0 = Debug|Any CPU {866D295E-424A-4747-9417-CD7746936138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {866D295E-424A-4747-9417-CD7746936138}.Debug|Any CPU.Build.0 = Debug|Any CPU {866D295E-424A-4747-9417-CD7746936138}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -327,12 +276,12 @@ Global {866D295E-424A-4747-9417-CD7746936138}.Release|x64.Build.0 = Release|Any CPU {866D295E-424A-4747-9417-CD7746936138}.Release|x86.ActiveCfg = Release|Any CPU {866D295E-424A-4747-9417-CD7746936138}.Release|x86.Build.0 = Release|Any CPU - {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|Any CPU.Build.0 = Debug|Any CPU - {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x64.ActiveCfg = Debug|Any CPU - {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x64.Build.0 = Debug|Any CPU - {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x86.ActiveCfg = Debug|Any CPU - {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x86.Build.0 = Debug|Any CPU + {866D295E-424A-4747-9417-CD7746936138}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {866D295E-424A-4747-9417-CD7746936138}.Checked|Any CPU.Build.0 = Debug|Any CPU + {866D295E-424A-4747-9417-CD7746936138}.Checked|x64.ActiveCfg = Debug|Any CPU + {866D295E-424A-4747-9417-CD7746936138}.Checked|x64.Build.0 = Debug|Any CPU + {866D295E-424A-4747-9417-CD7746936138}.Checked|x86.ActiveCfg = Debug|Any CPU + {866D295E-424A-4747-9417-CD7746936138}.Checked|x86.Build.0 = Debug|Any CPU {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -345,20 +294,20 @@ Global {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Release|x64.Build.0 = Release|Any CPU {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Release|x86.ActiveCfg = Release|Any CPU {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Release|x86.Build.0 = Release|Any CPU + {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|Any CPU.Build.0 = Debug|Any CPU + {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x64.ActiveCfg = Debug|Any CPU + {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x64.Build.0 = Debug|Any CPU + {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x86.ActiveCfg = Debug|Any CPU + {D3A329E3-0FEB-4136-9CB6-B38319B0FFA5}.Checked|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {94B59BA0-491F-4B59-ADFF-A057EC3EC835} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B} - {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF} - {1B248B4C-7584-4C04-850A-A50EB592052C} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B} - {5BB5F99F-1052-4EB4-B12E-7863805661F3} = {D893B9AA-57C5-49E3-97B1-12CC62D84307} - {04BA3E3C-6979-4792-B19E-C797AD607F42} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B} - {07F19F91-D438-428D-99F0-61DAD87E78BA} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B} - {768B77B0-EA45-469D-B39E-545EB72F5A43} = {B1678CCD-95C8-4419-B9F9-14A03061BE4B} - {8671F164-F78C-44FA-93B7-A310F67890FE} = {D893B9AA-57C5-49E3-97B1-12CC62D84307} {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} @@ -366,6 +315,10 @@ Global {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} + {768B77B0-EA45-469D-B39E-545EB72F5A43} = {E1AEBD5D-AE4E-4F61-B9ED-AEF950B0CC33} + {8671F164-F78C-44FA-93B7-A310F67890FE} = {D893B9AA-57C5-49E3-97B1-12CC62D84307} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D4031401-FEB5-4CCF-91C1-38F5646B2BFD} diff --git a/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/TypeNames.cs b/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/TypeNames.cs index c2cda25c889..d8b816e1a85 100644 --- a/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/TypeNames.cs +++ b/src/libraries/System.Runtime.InteropServices/gen/Microsoft.Interop.SourceGeneration/TypeNames.cs @@ -67,11 +67,10 @@ namespace Microsoft.Interop private const string System_Runtime_CompilerServices_Unsafe = "System.Runtime.CompilerServices.Unsafe"; - private const string Internal_Runtime_CompilerServices_Unsafe = "Internal.Runtime.CompilerServices.Unsafe"; public static string Unsafe(InteropGenerationOptions options) { - return options.UseInternalUnsafeType ? Internal_Runtime_CompilerServices_Unsafe : System_Runtime_CompilerServices_Unsafe; + return System_Runtime_CompilerServices_Unsafe; } public const string System_Runtime_CompilerServices_DisableRuntimeMarshallingAttribute = "System.Runtime.CompilerServices.DisableRuntimeMarshallingAttribute"; diff --git a/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln b/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln index d9947df29f2..fda6c484af7 100644 --- a/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln +++ b/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln @@ -7,10 +7,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1CE54DEE-4025-41A8-B8FE-D8380EA988B1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D8CC35A0-D091-48B0-919C-06F221C11E4A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4B15412F-913A-48B5-8968-7B9BC494324A}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F110DBFA-22D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C5014AA7-5C35-45D5-B7C6-48A5E93A758E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A499E9EC-3C82-4B0A-AC49-111C706B1835}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E7A9B89D-A9F5-40FD-93CA-CAF4522A80E0}" EndProject Global @@ -112,42 +110,6 @@ 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 - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Debug|x64.ActiveCfg = Debug|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Debug|x64.Build.0 = Debug|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Debug|x86.ActiveCfg = Debug|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Debug|x86.Build.0 = Debug|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Release|Any CPU.Build.0 = Release|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Release|x64.ActiveCfg = Release|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Release|x64.Build.0 = Release|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Release|x86.ActiveCfg = Release|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Release|x86.Build.0 = Release|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Checked|Any CPU.Build.0 = Debug|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Checked|x64.ActiveCfg = Debug|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Checked|x64.Build.0 = Debug|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Checked|x86.ActiveCfg = Debug|Any CPU - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1}.Checked|x86.Build.0 = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Debug|x64.ActiveCfg = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Debug|x64.Build.0 = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Debug|x86.ActiveCfg = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Debug|x86.Build.0 = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Release|Any CPU.Build.0 = Release|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Release|x64.ActiveCfg = Release|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Release|x64.Build.0 = Release|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Release|x86.ActiveCfg = Release|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Release|x86.Build.0 = Release|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Checked|Any CPU.Build.0 = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Checked|x64.ActiveCfg = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Checked|x64.Build.0 = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.Checked|x86.ActiveCfg = Debug|Any CPU - {D8CC35A0-D091-48B0-919C-06F221C11E4A}.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 @@ -244,15 +206,13 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {5965CFFE-886A-418C-854F-5967D91DE914} = {F110DBFA-22D7-486A-993D-5461A57A1D50} - {A4058388-97C1-492A-86A4-5240C4166BFF} = {F110DBFA-22D7-486A-993D-5461A57A1D50} - {D8CC35A0-D091-48B0-919C-06F221C11E4A} = {F110DBFA-22D7-486A-993D-5461A57A1D50} - {4B15412F-913A-48B5-8968-7B9BC494324A} = {F110DBFA-22D7-486A-993D-5461A57A1D50} - {9A0BF7EC-AD07-44C8-9B70-9DACB2C894C7} = {F110DBFA-22D7-486A-993D-5461A57A1D50} {5AD79501-BEA5-48C7-B466-021A9DCB9D5C} = {F110DBFA-22D7-486A-993D-5461A57A1D50} {2644B828-C37C-45C1-933D-27E82DA0A098} = {C5014AA7-5C35-45D5-B7C6-48A5E93A758E} {EFF55B56-D92B-4573-94EA-AF5B3B001C34} = {C5014AA7-5C35-45D5-B7C6-48A5E93A758E} {80AFB6EB-AB23-48A1-951C-76E6FEA29D19} = {C5014AA7-5C35-45D5-B7C6-48A5E93A758E} - {1CE54DEE-4025-41A8-B8FE-D8380EA988B1} = {E7A9B89D-A9F5-40FD-93CA-CAF4522A80E0} + {A4058388-97C1-492A-86A4-5240C4166BFF} = {A499E9EC-3C82-4B0A-AC49-111C706B1835} + {4B15412F-913A-48B5-8968-7B9BC494324A} = {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 GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln index a208e44f3ce..afa4c6b3292 100644 --- a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln +++ b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln @@ -5,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8D19CD03-08EE-4574-B798-C658502C0A42}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{04BA3E3C-6979-4792-B19E-C797AD607F42}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B}" 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}" @@ -17,6 +13,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader", "re EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader", "src\System.Runtime.Loader.csproj", "{B8F22D73-B183-4F17-9D5E-04B80699E56A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis\System.Reflection.Metadata.ApplyUpdate.Test.AddLambdaCapturingThis.csproj", "{C0B73BCE-3D60-4737-B958-C4AA39C7056A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.AddNestedClass", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.AddNestedClass\System.Reflection.Metadata.ApplyUpdate.Test.AddNestedClass.csproj", "{E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.AddStaticField", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.AddStaticField\System.Reflection.Metadata.ApplyUpdate.Test.AddStaticField.csproj", "{9DD53549-08F1-48C9-B8AE-95103AEC793B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.AddStaticLambda", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.AddStaticLambda\System.Reflection.Metadata.ApplyUpdate.Test.AddStaticLambda.csproj", "{2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.AsyncMethodChange", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.AsyncMethodChange\System.Reflection.Metadata.ApplyUpdate.Test.AsyncMethodChange.csproj", "{582AA5E5-051B-4774-B02D-747E197A5C56}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributes", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributes\System.Reflection.Metadata.ApplyUpdate.Test.ClassWithCustomAttributes.csproj", "{BCE10255-8B2B-4F66-914D-7B685BC98198}" @@ -61,6 +65,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6963C709-FD2 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{153EEF5A-58CF-4A61-B712-B14F270BD32E}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C75ECE17-3CF5-409D-B26F-E2F5053DD5B9}" EndProject Global @@ -130,42 +136,6 @@ 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 - {8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|x64.ActiveCfg = Debug|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|x64.Build.0 = Debug|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|x86.ActiveCfg = Debug|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|x86.Build.0 = Debug|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Release|Any CPU.Build.0 = Release|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Release|x64.ActiveCfg = Release|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Release|x64.Build.0 = Release|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Release|x86.ActiveCfg = Release|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Release|x86.Build.0 = Release|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Checked|Any CPU.Build.0 = Debug|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Checked|x64.ActiveCfg = Debug|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Checked|x64.Build.0 = Debug|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Checked|x86.ActiveCfg = Debug|Any CPU - {8D19CD03-08EE-4574-B798-C658502C0A42}.Checked|x86.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x64.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x64.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x86.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x86.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x64.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x64.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x86.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x86.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|Any CPU.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x64.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x64.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x86.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.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 @@ -238,6 +208,78 @@ Global {B8F22D73-B183-4F17-9D5E-04B80699E56A}.Checked|x64.Build.0 = Debug|Any CPU {B8F22D73-B183-4F17-9D5E-04B80699E56A}.Checked|x86.ActiveCfg = Debug|Any CPU {B8F22D73-B183-4F17-9D5E-04B80699E56A}.Checked|x86.Build.0 = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Debug|x64.ActiveCfg = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Debug|x64.Build.0 = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Debug|x86.ActiveCfg = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Debug|x86.Build.0 = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Release|Any CPU.Build.0 = Release|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Release|x64.ActiveCfg = Release|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Release|x64.Build.0 = Release|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Release|x86.ActiveCfg = Release|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Release|x86.Build.0 = Release|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Checked|Any CPU.Build.0 = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Checked|x64.ActiveCfg = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Checked|x64.Build.0 = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Checked|x86.ActiveCfg = Debug|Any CPU + {C0B73BCE-3D60-4737-B958-C4AA39C7056A}.Checked|x86.Build.0 = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Debug|x64.ActiveCfg = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Debug|x64.Build.0 = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Debug|x86.ActiveCfg = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Debug|x86.Build.0 = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Release|Any CPU.Build.0 = Release|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Release|x64.ActiveCfg = Release|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Release|x64.Build.0 = Release|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Release|x86.ActiveCfg = Release|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Release|x86.Build.0 = Release|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Checked|Any CPU.Build.0 = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Checked|x64.ActiveCfg = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Checked|x64.Build.0 = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Checked|x86.ActiveCfg = Debug|Any CPU + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602}.Checked|x86.Build.0 = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Debug|x64.ActiveCfg = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Debug|x64.Build.0 = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Debug|x86.ActiveCfg = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Debug|x86.Build.0 = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Release|Any CPU.Build.0 = Release|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Release|x64.ActiveCfg = Release|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Release|x64.Build.0 = Release|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Release|x86.ActiveCfg = Release|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Release|x86.Build.0 = Release|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Checked|Any CPU.Build.0 = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Checked|x64.ActiveCfg = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Checked|x64.Build.0 = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Checked|x86.ActiveCfg = Debug|Any CPU + {9DD53549-08F1-48C9-B8AE-95103AEC793B}.Checked|x86.Build.0 = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Debug|x64.ActiveCfg = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Debug|x64.Build.0 = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Debug|x86.ActiveCfg = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Debug|x86.Build.0 = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Release|Any CPU.Build.0 = Release|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Release|x64.ActiveCfg = Release|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Release|x64.Build.0 = Release|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Release|x86.ActiveCfg = Release|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Release|x86.Build.0 = Release|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Checked|Any CPU.Build.0 = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Checked|x64.ActiveCfg = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Checked|x64.Build.0 = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Checked|x86.ActiveCfg = Debug|Any CPU + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8}.Checked|x86.Build.0 = Debug|Any CPU {582AA5E5-051B-4774-B02D-747E197A5C56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {582AA5E5-051B-4774-B02D-747E197A5C56}.Debug|Any CPU.Build.0 = Debug|Any CPU {582AA5E5-051B-4774-B02D-747E197A5C56}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -604,12 +646,12 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {64DDD2AF-BF90-4DD8-AC24-D2084DB8D558} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796} - {BFED65C3-5AF6-4C81-8AE8-7CAC7E4867AE} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796} - {04BA3E3C-6979-4792-B19E-C797AD607F42} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796} - {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796} - {1FC1A751-C2A7-4CA8-B939-6F01B8AECBA8} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796} {B8F22D73-B183-4F17-9D5E-04B80699E56A} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796} {D6D16FFD-FD76-4700-B456-1DC4D093D1B5} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} + {C0B73BCE-3D60-4737-B958-C4AA39C7056A} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} + {E08DA42E-4DF5-45C1-ABE7-6CFCCE425602} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} + {9DD53549-08F1-48C9-B8AE-95103AEC793B} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} + {2A8066E3-D9CC-472F-BFDC-D98C4A4D4CD8} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {582AA5E5-051B-4774-B02D-747E197A5C56} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {BCE10255-8B2B-4F66-914D-7B685BC98198} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {EEAE2A15-E2AE-4421-8D30-AAB17AC805F8} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} @@ -630,7 +672,9 @@ Global {E60DD367-D1D7-4F6C-919B-DC68E8445E97} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {9AD657ED-396B-4BE7-BCB6-BCA130825418} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {29E02AA9-E3D5-400C-B2C5-970B6E6D8562} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} - {8D19CD03-08EE-4574-B798-C658502C0A42} = {C75ECE17-3CF5-409D-B26F-E2F5053DD5B9} + {BFED65C3-5AF6-4C81-8AE8-7CAC7E4867AE} = {153EEF5A-58CF-4A61-B712-B14F270BD32E} + {D5D3EF2B-AB85-4F7F-8A08-E4979E6B1E8B} = {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 GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln index 7db91096347..afd932970e0 100644 --- a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln +++ b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln @@ -1,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7C51DC48-EB7D-4AF5-BC4B-279CCD8BF3BE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B6DD0576-19F7-4217-8C41-0D113942CC38}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics", "ref\System.Runtime.Numerics.csproj", "{C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics.Tes EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A80D3604-A8C8-4B23-B0D3-316E46CFE60A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{94F2DDDF-A2DA-4F69-9613-A92D50D84A1C}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{18C5FB7C-2DE7-4BED-BA2B-53776E78E1E5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F6066198-D324-499F-BEB7-55DF39460AB4}" @@ -27,14 +29,14 @@ 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 - {54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2}.Release|Any CPU.Build.0 = Release|Any CPU - {B6DD0576-19F7-4217-8C41-0D113942CC38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6DD0576-19F7-4217-8C41-0D113942CC38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6DD0576-19F7-4217-8C41-0D113942CC38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6DD0576-19F7-4217-8C41-0D113942CC38}.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 + {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 + {57EC916C-15B4-46BB-AE68-B4CD8BC7076C}.Release|Any CPU.Build.0 = Release|Any CPU {C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU {C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {A22876CA-76C0-4ABD-8658-C2B3DFDFE537} = {A80D3604-A8C8-4B23-B0D3-316E46CFE60A} {2C4CBA2D-4C9D-4B83-85A4-2DF75C91B0FC} = {A80D3604-A8C8-4B23-B0D3-316E46CFE60A} - {54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2} = {18C5FB7C-2DE7-4BED-BA2B-53776E78E1E5} + {7C51DC48-EB7D-4AF5-BC4B-279CCD8BF3BE} = {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} - {B6DD0576-19F7-4217-8C41-0D113942CC38} = {F6066198-D324-499F-BEB7-55DF39460AB4} {91F8FBEF-C085-4542-BEE4-22449D80734A} = {F6066198-D324-499F-BEB7-55DF39460AB4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution 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 0418b253124..a022deb190f 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,10 +71,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A5755672-1361-48D8-8055-616A123519D0}" 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}" @@ -119,6 +115,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F8CB1B1F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{56502718-F82A-46E2-9AD0-532C437EC51E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A8ED4215-E7B8-4F14-B61D-F737E24C856A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -780,42 +778,6 @@ 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 - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|x64.ActiveCfg = Debug|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|x64.Build.0 = Debug|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|x86.ActiveCfg = Debug|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|x86.Build.0 = Debug|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|Any CPU.Build.0 = Release|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|x64.ActiveCfg = Release|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|x64.Build.0 = Release|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|x86.ActiveCfg = Release|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|x86.Build.0 = Release|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|Any CPU.Build.0 = Debug|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|x64.ActiveCfg = Debug|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|x64.Build.0 = Debug|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|x86.ActiveCfg = Debug|Any CPU - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|x86.Build.0 = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x64.ActiveCfg = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x64.Build.0 = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x86.ActiveCfg = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x86.Build.0 = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|Any CPU.Build.0 = Release|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x64.ActiveCfg = Release|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x64.Build.0 = Release|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x86.ActiveCfg = Release|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x86.Build.0 = Release|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|Any CPU.Build.0 = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x64.ActiveCfg = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x64.Build.0 = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x86.ActiveCfg = Debug|Any CPU - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.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 @@ -1181,12 +1143,8 @@ Global {9E471AE8-A165-4B32-8603-2BABD02A0664} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {D3535D48-5700-4DB1-AEED-494650BAB175} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} - {30C04925-08A1-4AFC-AE30-D7FA39945A5B} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {1E395137-871B-4D6F-A7DB-C92850FAB0D3} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {79F35586-A12D-4831-9D9D-5134FF07CC41} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} - {4BFED8CA-1221-48EE-8229-BDB8951DB1C7} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} - {A5755672-1361-48D8-8055-616A123519D0} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} - {B6796238-B6F5-488E-97A9-50EC2966B633} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {5944056C-E7A1-4A10-BAC4-E3AF91C12C5C} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {711CBCE0-C21C-45DA-B0D2-D2298941058E} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {DF679A1A-1797-40EB-A8AA-E3AEA66C80E5} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} @@ -1211,7 +1169,6 @@ Global {4E423476-3653-402A-AD55-0E5111A96ACC} = {56502718-F82A-46E2-9AD0-532C437EC51E} {6F5E7FFC-8709-4072-B0B3-404BEB517394} = {56502718-F82A-46E2-9AD0-532C437EC51E} {F6D6DAC8-9F74-4A68-9B74-FCC655492B4F} = {56502718-F82A-46E2-9AD0-532C437EC51E} - {E5511CF3-A800-4B9E-B25F-919D6F86B2D9} = {56502718-F82A-46E2-9AD0-532C437EC51E} {C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC} = {56502718-F82A-46E2-9AD0-532C437EC51E} {CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7} = {56502718-F82A-46E2-9AD0-532C437EC51E} {143DCF72-7DD7-4365-8B47-D67010F662A1} = {56502718-F82A-46E2-9AD0-532C437EC51E} @@ -1220,6 +1177,9 @@ Global {F9DA0114-ADB2-4428-8482-4045DBD0E324} = {56502718-F82A-46E2-9AD0-532C437EC51E} {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} + {B6796238-B6F5-488E-97A9-50EC2966B633} = {A8ED4215-E7B8-4F14-B61D-F737E24C856A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {158060A0-BFF9-48E6-90A9-93F52FEB5D3B} diff --git a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj index 45a23280109..bea8001a1e9 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj +++ b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj @@ -81,7 +81,6 @@ </ItemGroup> <ItemGroup> <ProjectReference Include="$(CoreLibProject)" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\src\System.Runtime.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\src\System.Collections.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Concurrent\src\System.Collections.Concurrent.csproj" /> 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 d547561c889..895407e1b45 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,9 +3,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DD90904E-16A2-41A4-A7A1-1AFDEE7E829D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{93F25E9D-7E11-4E31-A90A-B4AEC5AC7EEB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Json", "ref\System.Runtime.Serialization.Json.csproj", "{A0C8500C-06E8-4016-9A05-C6FC0D51BC01}" EndProject @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{23D70080 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A408DA52-13DD-4288-A88F-858DA05D936B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BD161CEF-9B1C-45C0-B541-E4BA194BFCEC}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A5940D03-8A5D-494C-B87F-4B9AAB6B21AE}" EndProject Global @@ -35,14 +37,14 @@ 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 - {DD90904E-16A2-41A4-A7A1-1AFDEE7E829D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD90904E-16A2-41A4-A7A1-1AFDEE7E829D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD90904E-16A2-41A4-A7A1-1AFDEE7E829D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD90904E-16A2-41A4-A7A1-1AFDEE7E829D}.Release|Any CPU.Build.0 = Release|Any CPU - {099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB}.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 + {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 + {2D7FD180-D8EE-48B5-B71D-1AE8DEAB1F37}.Release|Any CPU.Build.0 = Release|Any CPU {A0C8500C-06E8-4016-9A05-C6FC0D51BC01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A0C8500C-06E8-4016-9A05-C6FC0D51BC01}.Debug|Any CPU.Build.0 = Debug|Any CPU {A0C8500C-06E8-4016-9A05-C6FC0D51BC01}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -68,9 +70,9 @@ Global {AA73F333-D597-45F9-BC6E-75008C319C83} = {23D70080-2668-4963-A7A0-4E5FC4CE7464} {3898FE7A-F5E1-48BD-AD67-F8680B944631} = {23D70080-2668-4963-A7A0-4E5FC4CE7464} {6045DECE-8425-4EE2-8685-7F2F21A3F691} = {A408DA52-13DD-4288-A88F-858DA05D936B} - {099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB} = {A408DA52-13DD-4288-A88F-858DA05D936B} {209F90AA-5CA1-4DFA-8641-05A0AA4FDC8E} = {A408DA52-13DD-4288-A88F-858DA05D936B} - {DD90904E-16A2-41A4-A7A1-1AFDEE7E829D} = {A5940D03-8A5D-494C-B87F-4B9AAB6B21AE} + {93F25E9D-7E11-4E31-A90A-B4AEC5AC7EEB} = {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 GlobalSection(ExtensibilityGlobals) = postSolution 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 d107408f5ec..22695d7edd8 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,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{74FB3690-555A-46DD-8A78-5DD6E0017B15}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{E4148908-C334-48AD-871F-A0A3A64DC58D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B1B28C08-A7D3-4FF1-9AF1-07486E871EC0}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Primitives", "ref\System.Runtime.Serialization.Primitives.csproj", "{9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serializatio EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8197F6DC-718C-4F71-9F13-771B1C1058E1}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A1607D7B-AA96-4EAD-99F7-9CA09E472C56}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E8F4D65F-BB03-4954-AB19-C85DEC5E286C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{39E6C76D-0897-4933-81F5-107D9947D90D}" @@ -27,14 +29,14 @@ 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 - {74FB3690-555A-46DD-8A78-5DD6E0017B15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74FB3690-555A-46DD-8A78-5DD6E0017B15}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74FB3690-555A-46DD-8A78-5DD6E0017B15}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74FB3690-555A-46DD-8A78-5DD6E0017B15}.Release|Any CPU.Build.0 = Release|Any CPU - {B1B28C08-A7D3-4FF1-9AF1-07486E871EC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1B28C08-A7D3-4FF1-9AF1-07486E871EC0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1B28C08-A7D3-4FF1-9AF1-07486E871EC0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1B28C08-A7D3-4FF1-9AF1-07486E871EC0}.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 + {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 + {1DD06D77-CFC0-478B-A415-54A45ED3E9B9}.Release|Any CPU.Build.0 = Release|Any CPU {9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {5E9F435A-B4F6-4B3F-988B-80653A10F54D} = {8197F6DC-718C-4F71-9F13-771B1C1058E1} {AB51C1E2-6308-4989-B037-5712B6503C77} = {8197F6DC-718C-4F71-9F13-771B1C1058E1} - {74FB3690-555A-46DD-8A78-5DD6E0017B15} = {E8F4D65F-BB03-4954-AB19-C85DEC5E286C} + {E4148908-C334-48AD-871F-A0A3A64DC58D} = {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} - {B1B28C08-A7D3-4FF1-9AF1-07486E871EC0} = {39E6C76D-0897-4933-81F5-107D9947D90D} {70F6A111-C73E-4989-BCE4-ED790E1E2882} = {39E6C76D-0897-4933-81F5-107D9947D90D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution 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 cc4a076d5fd..d89484c47df 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,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A91D124D-A7BB-4C10-879E-792F7D9F656D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7F991911-EFB4-42E3-9AA2-A6DC8A121659}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A06A6D01-E1D2-42A0-A28C-5EEFC1445012}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml", "ref\System.Runtime.Serialization.Xml.csproj", "{19F785D2-F7A4-41AB-9301-A6AD7E40B238}" EndProject @@ -31,6 +31,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{18E62E91-73A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DB29DBEF-FA4E-4334-AFB8-BFB2DA82D1DE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DE71D38E-4154-477C-9C27-3FA4ADB4098F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -57,14 +59,14 @@ 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 - {A91D124D-A7BB-4C10-879E-792F7D9F656D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A91D124D-A7BB-4C10-879E-792F7D9F656D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A91D124D-A7BB-4C10-879E-792F7D9F656D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A91D124D-A7BB-4C10-879E-792F7D9F656D}.Release|Any CPU.Build.0 = Release|Any CPU - {A06A6D01-E1D2-42A0-A28C-5EEFC1445012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A06A6D01-E1D2-42A0-A28C-5EEFC1445012}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A06A6D01-E1D2-42A0-A28C-5EEFC1445012}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A06A6D01-E1D2-42A0-A28C-5EEFC1445012}.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 + {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 + {D5FF2DBA-F304-4ACB-8F82-B8F9321E22A9}.Release|Any CPU.Build.0 = Release|Any CPU {19F785D2-F7A4-41AB-9301-A6AD7E40B238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19F785D2-F7A4-41AB-9301-A6AD7E40B238}.Debug|Any CPU.Build.0 = Debug|Any CPU {19F785D2-F7A4-41AB-9301-A6AD7E40B238}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -99,14 +101,14 @@ Global {8FF5E841-29F6-4DB7-A4F8-9281FBDA0B9C} = {41101B02-36C9-476B-98D5-1A6E105BBF4A} {7DF41C40-FE5D-41DF-B106-3DD77BE4D4B5} = {18E62E91-73A2-48AE-BEFF-CE7C64DF759D} {D33B2CF1-2654-40DA-8EA6-DA5A2A453BAD} = {18E62E91-73A2-48AE-BEFF-CE7C64DF759D} - {A91D124D-A7BB-4C10-879E-792F7D9F656D} = {18E62E91-73A2-48AE-BEFF-CE7C64DF759D} {19F785D2-F7A4-41AB-9301-A6AD7E40B238} = {18E62E91-73A2-48AE-BEFF-CE7C64DF759D} {1B698FC7-0121-4092-AEAB-5BC7D354B05C} = {18E62E91-73A2-48AE-BEFF-CE7C64DF759D} {1B88B500-FDCB-455C-8307-E534B8EB0C84} = {18E62E91-73A2-48AE-BEFF-CE7C64DF759D} {1392041A-E2CA-4553-BEAF-363974651B81} = {DB29DBEF-FA4E-4334-AFB8-BFB2DA82D1DE} {76AC3DDD-2B38-489F-A8B0-8E43054595DB} = {DB29DBEF-FA4E-4334-AFB8-BFB2DA82D1DE} - {A06A6D01-E1D2-42A0-A28C-5EEFC1445012} = {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} + {D5FF2DBA-F304-4ACB-8F82-B8F9321E22A9} = {DE71D38E-4154-477C-9C27-3FA4ADB4098F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EE9FB522-4B73-4E3E-B63D-C21826BB7B5D} diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln index 4da60dec69e..eb395c43e84 100644 --- a/src/libraries/System.Runtime/System.Runtime.sln +++ b/src/libraries/System.Runtime/System.Runtime.sln @@ -17,10 +17,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{26541647-B653-4480-9448-BA275D53C81D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7301E27F-F136-4649-947D-17F7E8DBCA08}" 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}" @@ -59,6 +55,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FD72C125 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5B2B5E7E-A2FB-4095-9E79-404BF53E0133}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F362E63A-2B1A-445B-B198-3071D7DDE8CF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -234,42 +232,6 @@ 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 - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|x64.ActiveCfg = Debug|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|x64.Build.0 = Debug|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|x86.ActiveCfg = Debug|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|x86.Build.0 = Debug|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|Any CPU.Build.0 = Release|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|x64.ActiveCfg = Release|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|x64.Build.0 = Release|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|x86.ActiveCfg = Release|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|x86.Build.0 = Release|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Checked|Any CPU.Build.0 = Debug|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Checked|x64.ActiveCfg = Debug|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Checked|x64.Build.0 = Debug|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Checked|x86.ActiveCfg = Debug|Any CPU - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Checked|x86.Build.0 = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Debug|x64.ActiveCfg = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Debug|x64.Build.0 = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Debug|x86.ActiveCfg = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Debug|x86.Build.0 = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Release|Any CPU.Build.0 = Release|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Release|x64.ActiveCfg = Release|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Release|x64.Build.0 = Release|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Release|x86.ActiveCfg = Release|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Release|x86.Build.0 = Release|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Checked|Any CPU.Build.0 = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Checked|x64.ActiveCfg = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Checked|x64.Build.0 = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.Checked|x86.ActiveCfg = Debug|Any CPU - {26541647-B653-4480-9448-BA275D53C81D}.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 @@ -566,11 +528,7 @@ Global {71AB8240-F179-4B21-A8BE-8BE6CD774ED9} = {28140562-A65A-48E9-ABAB-53BA939084F0} {B41CB4AB-CDF6-4BB0-B826-D4BAE41411BD} = {28140562-A65A-48E9-ABAB-53BA939084F0} {F27DC16B-64F4-4BD7-AF9C-1C76F7ACC88B} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {CF79B5AE-38CB-4B80-BF92-CF634C0B7EC3} = {28140562-A65A-48E9-ABAB-53BA939084F0} {E7A05515-DABE-4C09-83CB-CE84EFDCD4CC} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {26541647-B653-4480-9448-BA275D53C81D} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {7301E27F-F136-4649-947D-17F7E8DBCA08} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37} = {28140562-A65A-48E9-ABAB-53BA939084F0} {A83A8520-F5E2-49B4-83BC-0F82A412951D} = {28140562-A65A-48E9-ABAB-53BA939084F0} {F6A8185B-07C6-401D-9B40-3C560239E05F} = {28140562-A65A-48E9-ABAB-53BA939084F0} {9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13} = {28140562-A65A-48E9-ABAB-53BA939084F0} @@ -585,11 +543,13 @@ Global {833C1D45-9BBB-4A92-93B7-4EFFD9E945AD} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A} {62C2AC8A-7410-4E06-B94E-43BF2DCFBDE9} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133} {9C41B325-1225-43CA-9436-549AFF6D90A1} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133} - {C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133} {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133} {1B4552A4-91FD-4C6F-9EB4-3454C4BE428F} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133} {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} + {A7B7DE04-7261-4D4C-AA78-9F2D9B5A1C37} = {F362E63A-2B1A-445B-B198-3071D7DDE8CF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {19706846-1F47-42ED-B649-B0982EE96E6B} diff --git a/src/libraries/System.Runtime/ref/System.Runtime.cs b/src/libraries/System.Runtime/ref/System.Runtime.cs index fd65e536278..6be551c0df9 100644 --- a/src/libraries/System.Runtime/ref/System.Runtime.cs +++ b/src/libraries/System.Runtime/ref/System.Runtime.cs @@ -13369,6 +13369,74 @@ namespace System.Runtime.CompilerServices public TypeForwardedToAttribute(System.Type destination) { } public System.Type Destination { get { throw null; } } } + public static partial class Unsafe + { + public static ref T AddByteOffset<T>(ref T source, System.IntPtr byteOffset) { throw null; } + [System.CLSCompliantAttribute(false)] + public static ref T AddByteOffset<T>(ref T source, nuint byteOffset) { throw null; } + [System.CLSCompliantAttribute(false)] + public unsafe static void* Add<T>(void* source, int elementOffset) { throw null; } + public static ref T Add<T>(ref T source, int elementOffset) { throw null; } + public static ref T Add<T>(ref T source, System.IntPtr elementOffset) { throw null; } + [System.CLSCompliantAttribute(false)] + public static ref T Add<T>(ref T source, nuint elementOffset) { throw null; } + public static bool AreSame<T>([System.Diagnostics.CodeAnalysis.AllowNull] ref T left, [System.Diagnostics.CodeAnalysis.AllowNull] ref T right) { throw null; } + [System.CLSCompliantAttribute(false)] + public unsafe static void* AsPointer<T>(ref T value) { throw null; } + [System.CLSCompliantAttribute(false)] + public unsafe static ref T AsRef<T>(void* source) { throw null; } + public static ref T AsRef<T>(in T source) { throw null; } + [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("o")] + public static T? As<T>(object? o) where T : class? { throw null; } + public static ref TTo As<TFrom, TTo>(ref TFrom source) { throw null; } + public static System.IntPtr ByteOffset<T>([System.Diagnostics.CodeAnalysis.AllowNull] ref T origin, [System.Diagnostics.CodeAnalysis.AllowNull] ref T target) { throw null; } + [System.CLSCompliantAttribute(false)] + public static void CopyBlock(ref byte destination, ref byte source, uint byteCount) { } + [System.CLSCompliantAttribute(false)] + public unsafe static void CopyBlock(void* destination, void* source, uint byteCount) { } + [System.CLSCompliantAttribute(false)] + public static void CopyBlockUnaligned(ref byte destination, ref byte source, uint byteCount) { } + [System.CLSCompliantAttribute(false)] + public unsafe static void CopyBlockUnaligned(void* destination, void* source, uint byteCount) { } + [System.CLSCompliantAttribute(false)] + public unsafe static void Copy<T>(void* destination, ref T source) { } + [System.CLSCompliantAttribute(false)] + public unsafe static void Copy<T>(ref T destination, void* source) { } + [System.CLSCompliantAttribute(false)] + public static void InitBlock(ref byte startAddress, byte value, uint byteCount) { } + [System.CLSCompliantAttribute(false)] + public unsafe static void InitBlock(void* startAddress, byte value, uint byteCount) { } + [System.CLSCompliantAttribute(false)] + public static void InitBlockUnaligned(ref byte startAddress, byte value, uint byteCount) { } + [System.CLSCompliantAttribute(false)] + public unsafe static void InitBlockUnaligned(void* startAddress, byte value, uint byteCount) { } + public static bool IsAddressGreaterThan<T>([System.Diagnostics.CodeAnalysis.AllowNull] ref T left, [System.Diagnostics.CodeAnalysis.AllowNull] ref T right) { throw null; } + public static bool IsAddressLessThan<T>([System.Diagnostics.CodeAnalysis.AllowNull] ref T left, [System.Diagnostics.CodeAnalysis.AllowNull] ref T right) { throw null; } + public static bool IsNullRef<T>(ref T source) { throw null; } + public static ref T NullRef<T>() { throw null; } + public static T ReadUnaligned<T>(ref byte source) { throw null; } + [System.CLSCompliantAttribute(false)] + public unsafe static T ReadUnaligned<T>(void* source) { throw null; } + [System.CLSCompliantAttribute(false)] + public unsafe static T Read<T>(void* source) { throw null; } + public static void SkipInit<T>(out T value) { throw null; } + public static int SizeOf<T>() { throw null; } + public static ref T SubtractByteOffset<T>(ref T source, System.IntPtr byteOffset) { throw null; } + [System.CLSCompliantAttribute(false)] + public static ref T SubtractByteOffset<T>(ref T source, nuint byteOffset) { throw null; } + [System.CLSCompliantAttribute(false)] + public unsafe static void* Subtract<T>(void* source, int elementOffset) { throw null; } + public static ref T Subtract<T>(ref T source, int elementOffset) { throw null; } + public static ref T Subtract<T>(ref T source, System.IntPtr elementOffset) { throw null; } + [System.CLSCompliantAttribute(false)] + public static ref T Subtract<T>(ref T source, nuint elementOffset) { throw null; } + public static ref T Unbox<T>(object box) where T : struct { throw null; } + public static void WriteUnaligned<T>(ref byte destination, T value) { } + [System.CLSCompliantAttribute(false)] + public unsafe static void WriteUnaligned<T>(void* destination, T value) { } + [System.CLSCompliantAttribute(false)] + public unsafe static void Write<T>(void* destination, T value) { } + } [System.AttributeUsageAttribute(System.AttributeTargets.Struct)] public sealed partial class UnsafeValueTypeAttribute : System.Attribute { diff --git a/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln b/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln index a557b224357..1b884bbe1fa 100644 --- a/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln +++ b/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln @@ -3,10 +3,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{BF6925D4-3E90-4530-995F-7879D5F303EB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{29593DA3-C071-4001-82C1-B473203AD08C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3F65599A-84CA-4742-85BE-6C9E1EDCBEA0}" 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}" @@ -17,12 +13,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessContr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl.Tests", "tests\System.Security.AccessControl.Tests.csproj", "{0B9499DE-C86E-4F3F-8F92-73DCC244A13B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{CE278690-2333-49FC-8760-0BD967125E41}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4ED5729F-DB06-4332-9876-354C28894824}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5A0B73BB-E1B6-4034-AA56-A82762FD405F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{82996086-0F1B-4E0F-9121-07C396EF0EC7}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BF0DEEC5-58A6-4156-B44B-E3C248A01523}" EndProject Global @@ -39,14 +35,6 @@ 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 - {BF6925D4-3E90-4530-995F-7879D5F303EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF6925D4-3E90-4530-995F-7879D5F303EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF6925D4-3E90-4530-995F-7879D5F303EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF6925D4-3E90-4530-995F-7879D5F303EB}.Release|Any CPU.Build.0 = Release|Any CPU - {29593DA3-C071-4001-82C1-B473203AD08C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29593DA3-C071-4001-82C1-B473203AD08C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29593DA3-C071-4001-82C1-B473203AD08C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29593DA3-C071-4001-82C1-B473203AD08C}.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 @@ -67,10 +55,6 @@ Global {0B9499DE-C86E-4F3F-8F92-73DCC244A13B}.Debug|Any CPU.Build.0 = Debug|Any CPU {0B9499DE-C86E-4F3F-8F92-73DCC244A13B}.Release|Any CPU.ActiveCfg = Release|Any CPU {0B9499DE-C86E-4F3F-8F92-73DCC244A13B}.Release|Any CPU.Build.0 = Release|Any CPU - {CE278690-2333-49FC-8760-0BD967125E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE278690-2333-49FC-8760-0BD967125E41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE278690-2333-49FC-8760-0BD967125E41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE278690-2333-49FC-8760-0BD967125E41}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -79,12 +63,9 @@ Global {FE3865D4-48C5-4F67-A5EB-C041A1895100} = {4ED5729F-DB06-4332-9876-354C28894824} {0B9499DE-C86E-4F3F-8F92-73DCC244A13B} = {4ED5729F-DB06-4332-9876-354C28894824} {28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340} = {5A0B73BB-E1B6-4034-AA56-A82762FD405F} - {29593DA3-C071-4001-82C1-B473203AD08C} = {5A0B73BB-E1B6-4034-AA56-A82762FD405F} - {3F65599A-84CA-4742-85BE-6C9E1EDCBEA0} = {5A0B73BB-E1B6-4034-AA56-A82762FD405F} - {CDB32066-5BD2-46EB-AFF1-07554FBF6942} = {5A0B73BB-E1B6-4034-AA56-A82762FD405F} {E1E671BC-A82F-400A-9C93-ACB199A43BDA} = {5A0B73BB-E1B6-4034-AA56-A82762FD405F} - {CE278690-2333-49FC-8760-0BD967125E41} = {5A0B73BB-E1B6-4034-AA56-A82762FD405F} - {BF6925D4-3E90-4530-995F-7879D5F303EB} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523} + {3F65599A-84CA-4742-85BE-6C9E1EDCBEA0} = {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 GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Security.Claims/System.Security.Claims.sln b/src/libraries/System.Security.Claims/System.Security.Claims.sln index 075d482a29c..63a18a7ae3c 100644 --- a/src/libraries/System.Security.Claims/System.Security.Claims.sln +++ b/src/libraries/System.Security.Claims/System.Security.Claims.sln @@ -1,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F46E0AB4-C56D-4E59-838C-B36E79F47B2D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BEEDE76F-F71E-4B1F-AD9C-B3118DC1DD22}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E594FAC1-435A-4E29-9BF3-334DC2E3628D}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", "ref\System.Security.Claims.csproj", "{DBBE28DA-7239-4C32-8308-2A65C10410DE}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims.Test EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{58661765-A62B-4A5F-9950-A56DEFC0CDB0}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{66B48EC0-590C-40BD-A4E3-DB7DBA977B47}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3B6EF051-7EB4-454F-ACA8-AEF258B645E4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3D2906A4-D990-48BA-B038-3465E82F36A4}" @@ -27,14 +29,14 @@ 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 - {F46E0AB4-C56D-4E59-838C-B36E79F47B2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F46E0AB4-C56D-4E59-838C-B36E79F47B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F46E0AB4-C56D-4E59-838C-B36E79F47B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F46E0AB4-C56D-4E59-838C-B36E79F47B2D}.Release|Any CPU.Build.0 = Release|Any CPU - {E594FAC1-435A-4E29-9BF3-334DC2E3628D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E594FAC1-435A-4E29-9BF3-334DC2E3628D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E594FAC1-435A-4E29-9BF3-334DC2E3628D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E594FAC1-435A-4E29-9BF3-334DC2E3628D}.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 + {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 + {C2E2876D-4DE3-45D2-A8B5-09D01CD080A4}.Release|Any CPU.Build.0 = Release|Any CPU {DBBE28DA-7239-4C32-8308-2A65C10410DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DBBE28DA-7239-4C32-8308-2A65C10410DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {DBBE28DA-7239-4C32-8308-2A65C10410DE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {74402B68-53BF-4B2F-BDEA-91F665E130D2} = {58661765-A62B-4A5F-9950-A56DEFC0CDB0} {12F9C4AA-F238-42A1-9324-2C3CB643595B} = {58661765-A62B-4A5F-9950-A56DEFC0CDB0} - {F46E0AB4-C56D-4E59-838C-B36E79F47B2D} = {3B6EF051-7EB4-454F-ACA8-AEF258B645E4} + {BEEDE76F-F71E-4B1F-AD9C-B3118DC1DD22} = {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} - {E594FAC1-435A-4E29-9BF3-334DC2E3628D} = {3D2906A4-D990-48BA-B038-3465E82F36A4} {85FAD30C-2D0C-406D-9F3B-DB7236016CC5} = {3D2906A4-D990-48BA-B038-3465E82F36A4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln b/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln index e95398a75ad..ddda681cb59 100644 --- a/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln +++ b/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln @@ -1,32 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{0AD39CA7-BEA7-4603-B786-F50F4F40520C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{AA21E963-CF6B-4474-81A6-D13279854954}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{11EF92B5-6C9B-4272-8360-F34A1109F831}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{41557401-FC6D-4A84-9410-57132CA08E24}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{DCB89A7D-F1F3-4B10-8CDD-DE73093291BE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Algorithms", "ref\System.Security.Cryptography.Algorithms.csproj", "{64C0BC45-368B-44E6-9E04-2F7787CDF153}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Algorithms", "src\System.Security.Cryptography.Algorithms.csproj", "{4146BAB4-BA7C-405E-BEBC-9BE9826514BA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Algorithms.Tests", "tests\System.Security.Cryptography.Algorithms.Tests.csproj", "{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj", "{3928EE57-D7D0-45B8-AACD-57DF67D7089A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\ref\System.Security.Cryptography.Pkcs.csproj", "{5BD4A2ED-6203-41E2-9892-002BCC40B0C8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\src\System.Security.Cryptography.Pkcs.csproj", "{E5E427F0-D149-4992-AF31-F8616600E188}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A579EE19-5B68-4E9D-BAC6-8B75536FFB98}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FC920C3F-3A16-4258-9DF1-3B1BB3408C69}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1}" @@ -37,34 +13,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0}.Release|Any CPU.Build.0 = Release|Any CPU - {0AD39CA7-BEA7-4603-B786-F50F4F40520C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AD39CA7-BEA7-4603-B786-F50F4F40520C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AD39CA7-BEA7-4603-B786-F50F4F40520C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AD39CA7-BEA7-4603-B786-F50F4F40520C}.Release|Any CPU.Build.0 = Release|Any CPU - {AA21E963-CF6B-4474-81A6-D13279854954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA21E963-CF6B-4474-81A6-D13279854954}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA21E963-CF6B-4474-81A6-D13279854954}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA21E963-CF6B-4474-81A6-D13279854954}.Release|Any CPU.Build.0 = Release|Any CPU - {4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40}.Release|Any CPU.Build.0 = Release|Any CPU - {11EF92B5-6C9B-4272-8360-F34A1109F831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11EF92B5-6C9B-4272-8360-F34A1109F831}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11EF92B5-6C9B-4272-8360-F34A1109F831}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11EF92B5-6C9B-4272-8360-F34A1109F831}.Release|Any CPU.Build.0 = Release|Any CPU - {41557401-FC6D-4A84-9410-57132CA08E24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41557401-FC6D-4A84-9410-57132CA08E24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41557401-FC6D-4A84-9410-57132CA08E24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41557401-FC6D-4A84-9410-57132CA08E24}.Release|Any CPU.Build.0 = Release|Any CPU - {DCB89A7D-F1F3-4B10-8CDD-DE73093291BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCB89A7D-F1F3-4B10-8CDD-DE73093291BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCB89A7D-F1F3-4B10-8CDD-DE73093291BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCB89A7D-F1F3-4B10-8CDD-DE73093291BE}.Release|Any CPU.Build.0 = Release|Any CPU {64C0BC45-368B-44E6-9E04-2F7787CDF153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {64C0BC45-368B-44E6-9E04-2F7787CDF153}.Debug|Any CPU.Build.0 = Debug|Any CPU {64C0BC45-368B-44E6-9E04-2F7787CDF153}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -73,40 +21,13 @@ Global {4146BAB4-BA7C-405E-BEBC-9BE9826514BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {4146BAB4-BA7C-405E-BEBC-9BE9826514BA}.Release|Any CPU.ActiveCfg = Release|Any CPU {4146BAB4-BA7C-405E-BEBC-9BE9826514BA}.Release|Any CPU.Build.0 = Release|Any CPU - {DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Release|Any CPU.Build.0 = Release|Any CPU - {3928EE57-D7D0-45B8-AACD-57DF67D7089A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3928EE57-D7D0-45B8-AACD-57DF67D7089A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3928EE57-D7D0-45B8-AACD-57DF67D7089A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3928EE57-D7D0-45B8-AACD-57DF67D7089A}.Release|Any CPU.Build.0 = Release|Any CPU - {5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Release|Any CPU.Build.0 = Release|Any CPU - {E5E427F0-D149-4992-AF31-F8616600E188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5E427F0-D149-4992-AF31-F8616600E188}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5E427F0-D149-4992-AF31-F8616600E188}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5E427F0-D149-4992-AF31-F8616600E188}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0} = {A579EE19-5B68-4E9D-BAC6-8B75536FFB98} - {DD7260B7-A224-46EB-8CE6-94A4B22CB7CD} = {A579EE19-5B68-4E9D-BAC6-8B75536FFB98} - {0AD39CA7-BEA7-4603-B786-F50F4F40520C} = {FC920C3F-3A16-4258-9DF1-3B1BB3408C69} - {4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40} = {FC920C3F-3A16-4258-9DF1-3B1BB3408C69} {64C0BC45-368B-44E6-9E04-2F7787CDF153} = {FC920C3F-3A16-4258-9DF1-3B1BB3408C69} - {5BD4A2ED-6203-41E2-9892-002BCC40B0C8} = {FC920C3F-3A16-4258-9DF1-3B1BB3408C69} - {AA21E963-CF6B-4474-81A6-D13279854954} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1} - {11EF92B5-6C9B-4272-8360-F34A1109F831} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1} - {41557401-FC6D-4A84-9410-57132CA08E24} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1} - {DCB89A7D-F1F3-4B10-8CDD-DE73093291BE} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1} {4146BAB4-BA7C-405E-BEBC-9BE9826514BA} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1} - {3928EE57-D7D0-45B8-AACD-57DF67D7089A} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1} - {E5E427F0-D149-4992-AF31-F8616600E188} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBAD4B5E-6059-47BF-A909-9D20CE67E4E0} 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 f26f2be17cc..5a0cba0c4a5 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,14 +1,6 @@ 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}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{9C343BA4-06CD-45D9-B9D1-07C8C01BA769}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{28FC516D-19C2-43C6-BCBE-10273185673D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{866AEC4B-C3DE-4F2C-B6E9-7628856FA078}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{39FEA352-F1A3-48AC-89FE-79E976218AC1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A275AAB4-EEA6-4891-A4A6-29A9AE477B76}" 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}" @@ -23,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.W EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1D9900D4-8DD5-4936-BE7A-4D4126E16459}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5FBF9A4A-3818-4FA0-8759-67340FCF889F}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3B5CC70E-D006-426A-BC91-6A7DEE2F7181}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EC42BE1B-70E9-4248-9E0F-288C6677A579}" @@ -37,22 +31,6 @@ 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 - {9C343BA4-06CD-45D9-B9D1-07C8C01BA769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C343BA4-06CD-45D9-B9D1-07C8C01BA769}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C343BA4-06CD-45D9-B9D1-07C8C01BA769}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C343BA4-06CD-45D9-B9D1-07C8C01BA769}.Release|Any CPU.Build.0 = Release|Any CPU - {28FC516D-19C2-43C6-BCBE-10273185673D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28FC516D-19C2-43C6-BCBE-10273185673D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28FC516D-19C2-43C6-BCBE-10273185673D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28FC516D-19C2-43C6-BCBE-10273185673D}.Release|Any CPU.Build.0 = Release|Any CPU - {866AEC4B-C3DE-4F2C-B6E9-7628856FA078}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {866AEC4B-C3DE-4F2C-B6E9-7628856FA078}.Debug|Any CPU.Build.0 = Debug|Any CPU - {866AEC4B-C3DE-4F2C-B6E9-7628856FA078}.Release|Any CPU.ActiveCfg = Release|Any CPU - {866AEC4B-C3DE-4F2C-B6E9-7628856FA078}.Release|Any CPU.Build.0 = Release|Any CPU - {39FEA352-F1A3-48AC-89FE-79E976218AC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39FEA352-F1A3-48AC-89FE-79E976218AC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39FEA352-F1A3-48AC-89FE-79E976218AC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39FEA352-F1A3-48AC-89FE-79E976218AC1}.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 @@ -84,13 +62,9 @@ Global GlobalSection(NestedProjects) = preSolution {7FAF92EB-F974-4279-8ED4-431ADAF3584C} = {1D9900D4-8DD5-4936-BE7A-4D4126E16459} {4DCE069F-1F04-45F7-AA64-CE095F9DA385} = {1D9900D4-8DD5-4936-BE7A-4D4126E16459} - {9C343BA4-06CD-45D9-B9D1-07C8C01BA769} = {3B5CC70E-D006-426A-BC91-6A7DEE2F7181} - {866AEC4B-C3DE-4F2C-B6E9-7628856FA078} = {3B5CC70E-D006-426A-BC91-6A7DEE2F7181} + {A275AAB4-EEA6-4891-A4A6-29A9AE477B76} = {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} - {28FC516D-19C2-43C6-BCBE-10273185673D} = {EC42BE1B-70E9-4248-9E0F-288C6677A579} - {39FEA352-F1A3-48AC-89FE-79E976218AC1} = {EC42BE1B-70E9-4248-9E0F-288C6677A579} - {A275AAB4-EEA6-4891-A4A6-29A9AE477B76} = {EC42BE1B-70E9-4248-9E0F-288C6677A579} - {DD5E2B5F-C74F-4B2A-B8AA-E01CE20741D5} = {EC42BE1B-70E9-4248-9E0F-288C6677A579} {4BAA22AA-6F42-4C31-8CCF-256F30A26228} = {EC42BE1B-70E9-4248-9E0F-288C6677A579} {929388A9-0224-4FF8-867A-267E47A03311} = {EC42BE1B-70E9-4248-9E0F-288C6677A579} EndGlobalSection 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 d237a90323a..609282f5215 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 @@ -1,19 +1,27 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.31914.37 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cose", "src\System.Security.Cryptography.Cose.csproj", "{CD19385A-1EDD-45DD-B4E4-BD1F2047BB2B}" +Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2E11F877-1649-4146-BA2E-FC285613FCC3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{29B55087-85A2-4FCE-8303-8EE6B43B0094}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor", "..\System.Formats.Cbor\ref\System.Formats.Cbor.csproj", "{215F0269-2D73-4210-B1B3-2C1AE73D2538}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9535F590-0F95-4174-BB1E-1A80193CAF55}" +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}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{91C4D9D2-7EE1-4306-BBEA-68210EC1DEE7}" +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 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cose", "ref\System.Security.Cryptography.Cose.csproj", "{823EE247-FC47-444F-B9A0-32AF146D1789}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cose", "src\System.Security.Cryptography.Cose.csproj", "{CD19385A-1EDD-45DD-B4E4-BD1F2047BB2B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cose.Tests", "tests\System.Security.Cryptography.Cose.Tests.csproj", "{FFA43FB1-ED48-4105-A518-4D02CE72DB3F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9535F590-0F95-4174-BB1E-1A80193CAF55}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5F962CC3-0DD0-4428-9CF4-99035553DB85}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cose", "ref\System.Security.Cryptography.Cose.csproj", "{823EE247-FC47-444F-B9A0-32AF146D1789}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{29B55087-85A2-4FCE-8303-8EE6B43B0094}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A1DDBD83-25B1-44F6-93A9-AB27A9710FD6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,6 +29,30 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2E11F877-1649-4146-BA2E-FC285613FCC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2E11F877-1649-4146-BA2E-FC285613FCC3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2E11F877-1649-4146-BA2E-FC285613FCC3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2E11F877-1649-4146-BA2E-FC285613FCC3}.Release|Any CPU.Build.0 = Release|Any CPU + {215F0269-2D73-4210-B1B3-2C1AE73D2538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {215F0269-2D73-4210-B1B3-2C1AE73D2538}.Debug|Any CPU.Build.0 = Debug|Any CPU + {215F0269-2D73-4210-B1B3-2C1AE73D2538}.Release|Any CPU.ActiveCfg = Release|Any CPU + {215F0269-2D73-4210-B1B3-2C1AE73D2538}.Release|Any CPU.Build.0 = Release|Any CPU + {0CB3F6B0-353E-47E4-8A62-AFA6115EF789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {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 + {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 + {64D2E763-9717-4CE9-8500-6E6B0CF358F2}.Release|Any CPU.Build.0 = Release|Any CPU + {823EE247-FC47-444F-B9A0-32AF146D1789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {823EE247-FC47-444F-B9A0-32AF146D1789}.Debug|Any CPU.Build.0 = Debug|Any CPU + {823EE247-FC47-444F-B9A0-32AF146D1789}.Release|Any CPU.ActiveCfg = Release|Any CPU + {823EE247-FC47-444F-B9A0-32AF146D1789}.Release|Any CPU.Build.0 = Release|Any CPU {CD19385A-1EDD-45DD-B4E4-BD1F2047BB2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD19385A-1EDD-45DD-B4E4-BD1F2047BB2B}.Debug|Any CPU.Build.0 = Debug|Any CPU {CD19385A-1EDD-45DD-B4E4-BD1F2047BB2B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -29,18 +61,19 @@ Global {FFA43FB1-ED48-4105-A518-4D02CE72DB3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFA43FB1-ED48-4105-A518-4D02CE72DB3F}.Release|Any CPU.ActiveCfg = Release|Any CPU {FFA43FB1-ED48-4105-A518-4D02CE72DB3F}.Release|Any CPU.Build.0 = Release|Any CPU - {823EE247-FC47-444F-B9A0-32AF146D1789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {823EE247-FC47-444F-B9A0-32AF146D1789}.Debug|Any CPU.Build.0 = Debug|Any CPU - {823EE247-FC47-444F-B9A0-32AF146D1789}.Release|Any CPU.ActiveCfg = Release|Any CPU - {823EE247-FC47-444F-B9A0-32AF146D1789}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {CD19385A-1EDD-45DD-B4E4-BD1F2047BB2B} = {29B55087-85A2-4FCE-8303-8EE6B43B0094} + {2E11F877-1649-4146-BA2E-FC285613FCC3} = {9535F590-0F95-4174-BB1E-1A80193CAF55} {FFA43FB1-ED48-4105-A518-4D02CE72DB3F} = {9535F590-0F95-4174-BB1E-1A80193CAF55} + {215F0269-2D73-4210-B1B3-2C1AE73D2538} = {5F962CC3-0DD0-4428-9CF4-99035553DB85} {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} + {64D2E763-9717-4CE9-8500-6E6B0CF358F2} = {A1DDBD83-25B1-44F6-93A9-AB27A9710FD6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {446B8AB2-9ED5-4475-A812-DE12AB4DE665} 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 85b9b072fea..c82e904e5cc 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,14 +1,6 @@ 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}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{6B4146AA-74D0-411A-A782-13E86DF654CE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{DA82AA17-5946-4454-B22E-11B3FC3F8D5C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{441BBB8B-D6D7-4518-83B6-687AFC2C6202}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{43B3E90B-034B-444F-80CF-1A3D5F0501F0}" 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}" @@ -23,10 +15,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{383B91A8-7022-4B83-82F5-0CF055472A0D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1F3677F4-9173-4B3A-BE7B-9616A7A5FDA9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C15BDF97-695A-4F94-97EE-060F20E63B2E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{004448ED-CE3D-4EEE-B176-458440B11AEB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1F3677F4-9173-4B3A-BE7B-9616A7A5FDA9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,22 +31,6 @@ 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 - {6B4146AA-74D0-411A-A782-13E86DF654CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B4146AA-74D0-411A-A782-13E86DF654CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B4146AA-74D0-411A-A782-13E86DF654CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B4146AA-74D0-411A-A782-13E86DF654CE}.Release|Any CPU.Build.0 = Release|Any CPU - {DA82AA17-5946-4454-B22E-11B3FC3F8D5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA82AA17-5946-4454-B22E-11B3FC3F8D5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA82AA17-5946-4454-B22E-11B3FC3F8D5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA82AA17-5946-4454-B22E-11B3FC3F8D5C}.Release|Any CPU.Build.0 = Release|Any CPU - {3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF}.Release|Any CPU.Build.0 = Release|Any CPU - {441BBB8B-D6D7-4518-83B6-687AFC2C6202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {441BBB8B-D6D7-4518-83B6-687AFC2C6202}.Debug|Any CPU.Build.0 = Debug|Any CPU - {441BBB8B-D6D7-4518-83B6-687AFC2C6202}.Release|Any CPU.ActiveCfg = Release|Any CPU - {441BBB8B-D6D7-4518-83B6-687AFC2C6202}.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 @@ -84,15 +62,11 @@ Global GlobalSection(NestedProjects) = preSolution {CC4119F0-EEF6-4443-A3BD-D21063991D8B} = {383B91A8-7022-4B83-82F5-0CF055472A0D} {9136AFBB-5173-4AD7-AD77-641E1EB8506C} = {383B91A8-7022-4B83-82F5-0CF055472A0D} - {6B4146AA-74D0-411A-A782-13E86DF654CE} = {1F3677F4-9173-4B3A-BE7B-9616A7A5FDA9} - {3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF} = {1F3677F4-9173-4B3A-BE7B-9616A7A5FDA9} - {D960CDE1-79C4-46A5-A0E3-3F49AB63DEF9} = {1F3677F4-9173-4B3A-BE7B-9616A7A5FDA9} - {DA82AA17-5946-4454-B22E-11B3FC3F8D5C} = {004448ED-CE3D-4EEE-B176-458440B11AEB} - {441BBB8B-D6D7-4518-83B6-687AFC2C6202} = {004448ED-CE3D-4EEE-B176-458440B11AEB} - {43B3E90B-034B-444F-80CF-1A3D5F0501F0} = {004448ED-CE3D-4EEE-B176-458440B11AEB} - {446043A6-6B64-462F-AEE2-05567BE5EFF5} = {004448ED-CE3D-4EEE-B176-458440B11AEB} + {43B3E90B-034B-444F-80CF-1A3D5F0501F0} = {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} + {D960CDE1-79C4-46A5-A0E3-3F49AB63DEF9} = {1F3677F4-9173-4B3A-BE7B-9616A7A5FDA9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1FD6721-0F7E-4ACC-8409-4E518EA1C98A} diff --git a/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln b/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln index 632b356b286..4596b610ee7 100644 --- a/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln +++ b/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln @@ -1,14 +1,4 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{201E9083-CCA0-4AA8-A2B2-B37AC13481E3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A428E072-E4DD-4F64-AFE3-DC9FC8D5563D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{43B33B0D-4009-4838-B9F4-E5308C1827F7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A370B1E4-D978-4FBC-8C10-78BBEE999FAE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{ADF5A9FC-DF00-4B7E-944C-8F3F2D2D2287}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Encoding", "ref\System.Security.Cryptography.Encoding.csproj", "{465CB04B-D2D8-4E64-BA6D-571BE95391B4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Encoding", "src\System.Security.Cryptography.Encoding.csproj", "{4B1D276E-6576-4F42-9F38-C91C95437F20}" @@ -23,26 +13,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {201E9083-CCA0-4AA8-A2B2-B37AC13481E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {201E9083-CCA0-4AA8-A2B2-B37AC13481E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {201E9083-CCA0-4AA8-A2B2-B37AC13481E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {201E9083-CCA0-4AA8-A2B2-B37AC13481E3}.Release|Any CPU.Build.0 = Release|Any CPU - {A428E072-E4DD-4F64-AFE3-DC9FC8D5563D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A428E072-E4DD-4F64-AFE3-DC9FC8D5563D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A428E072-E4DD-4F64-AFE3-DC9FC8D5563D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A428E072-E4DD-4F64-AFE3-DC9FC8D5563D}.Release|Any CPU.Build.0 = Release|Any CPU - {43B33B0D-4009-4838-B9F4-E5308C1827F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43B33B0D-4009-4838-B9F4-E5308C1827F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43B33B0D-4009-4838-B9F4-E5308C1827F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43B33B0D-4009-4838-B9F4-E5308C1827F7}.Release|Any CPU.Build.0 = Release|Any CPU - {A370B1E4-D978-4FBC-8C10-78BBEE999FAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A370B1E4-D978-4FBC-8C10-78BBEE999FAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A370B1E4-D978-4FBC-8C10-78BBEE999FAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A370B1E4-D978-4FBC-8C10-78BBEE999FAE}.Release|Any CPU.Build.0 = Release|Any CPU - {ADF5A9FC-DF00-4B7E-944C-8F3F2D2D2287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADF5A9FC-DF00-4B7E-944C-8F3F2D2D2287}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADF5A9FC-DF00-4B7E-944C-8F3F2D2D2287}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADF5A9FC-DF00-4B7E-944C-8F3F2D2D2287}.Release|Any CPU.Build.0 = Release|Any CPU {465CB04B-D2D8-4E64-BA6D-571BE95391B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {465CB04B-D2D8-4E64-BA6D-571BE95391B4}.Debug|Any CPU.Build.0 = Debug|Any CPU {465CB04B-D2D8-4E64-BA6D-571BE95391B4}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -56,11 +26,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {A428E072-E4DD-4F64-AFE3-DC9FC8D5563D} = {34B969D7-6BED-4597-8C25-502A29CF0518} {465CB04B-D2D8-4E64-BA6D-571BE95391B4} = {34B969D7-6BED-4597-8C25-502A29CF0518} - {43B33B0D-4009-4838-B9F4-E5308C1827F7} = {0806AC6F-4837-437A-A32F-EED211934481} - {A370B1E4-D978-4FBC-8C10-78BBEE999FAE} = {0806AC6F-4837-437A-A32F-EED211934481} - {ADF5A9FC-DF00-4B7E-944C-8F3F2D2D2287} = {0806AC6F-4837-437A-A32F-EED211934481} {4B1D276E-6576-4F42-9F38-C91C95437F20} = {0806AC6F-4837-437A-A32F-EED211934481} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution 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 ddca6b77b88..1882633674a 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,14 +1,6 @@ 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}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{83192560-8AFE-458F-916B-3AB572000065}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{A84FF2B2-5272-4F02-AA2B-C0FA61586AA4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6C660B52-0FE3-43B9-838E-2F92B34E97D9}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{C56036DA-810D-45AF-98AE-A982418CE234}" 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}" @@ -23,10 +15,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A253B72C-7AA0-416A-92E6-09D5DCF906E7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8B6D53E6-8F7B-47D1-B6D7-890A783A9959}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{56992064-4BA0-4CDD-95BD-9ED43B42CC59}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4562CA8C-1A07-4AFB-B5BC-977FD19605CB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8B6D53E6-8F7B-47D1-B6D7-890A783A9959}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,22 +31,6 @@ 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 - {83192560-8AFE-458F-916B-3AB572000065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83192560-8AFE-458F-916B-3AB572000065}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83192560-8AFE-458F-916B-3AB572000065}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83192560-8AFE-458F-916B-3AB572000065}.Release|Any CPU.Build.0 = Release|Any CPU - {A84FF2B2-5272-4F02-AA2B-C0FA61586AA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A84FF2B2-5272-4F02-AA2B-C0FA61586AA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A84FF2B2-5272-4F02-AA2B-C0FA61586AA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A84FF2B2-5272-4F02-AA2B-C0FA61586AA4}.Release|Any CPU.Build.0 = Release|Any CPU - {A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1}.Release|Any CPU.Build.0 = Release|Any CPU - {6C660B52-0FE3-43B9-838E-2F92B34E97D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C660B52-0FE3-43B9-838E-2F92B34E97D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C660B52-0FE3-43B9-838E-2F92B34E97D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C660B52-0FE3-43B9-838E-2F92B34E97D9}.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 @@ -84,15 +62,11 @@ Global GlobalSection(NestedProjects) = preSolution {29991657-E677-42A4-894C-6BE781C51DD7} = {A253B72C-7AA0-416A-92E6-09D5DCF906E7} {DE8A9283-1375-4651-B1B0-4E5C6D1D07AD} = {A253B72C-7AA0-416A-92E6-09D5DCF906E7} - {83192560-8AFE-458F-916B-3AB572000065} = {8B6D53E6-8F7B-47D1-B6D7-890A783A9959} - {A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1} = {8B6D53E6-8F7B-47D1-B6D7-890A783A9959} - {5AC30FC5-0E64-4C71-AD80-FE758709E22B} = {8B6D53E6-8F7B-47D1-B6D7-890A783A9959} - {A84FF2B2-5272-4F02-AA2B-C0FA61586AA4} = {4562CA8C-1A07-4AFB-B5BC-977FD19605CB} - {6C660B52-0FE3-43B9-838E-2F92B34E97D9} = {4562CA8C-1A07-4AFB-B5BC-977FD19605CB} - {C56036DA-810D-45AF-98AE-A982418CE234} = {4562CA8C-1A07-4AFB-B5BC-977FD19605CB} - {C76222C7-F56E-44EA-9187-6A3A2DC72C44} = {4562CA8C-1A07-4AFB-B5BC-977FD19605CB} + {C56036DA-810D-45AF-98AE-A982418CE234} = {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} + {5AC30FC5-0E64-4C71-AD80-FE758709E22B} = {8B6D53E6-8F7B-47D1-B6D7-890A783A9959} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {46980D07-0EA0-4C0F-BCB8-C9557CE69B51} 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 84a94cee5cc..860b11b7ad2 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,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3DAFB198-0B50-4F31-A3A9-3826042431F5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DA204355-86E3-431D-B08E-483A49BEB3DB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6B40D2AA-3405-4AC5-A4B2-CAD11D0B4301}" 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}" @@ -27,6 +23,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FD768C8B-9BF EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5B768A4-9BA9-4E78-B735-60052C68035C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{94B59232-B99C-4224-B3E3-0F3385F06B64}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,14 +43,6 @@ 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 - {3DAFB198-0B50-4F31-A3A9-3826042431F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DAFB198-0B50-4F31-A3A9-3826042431F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DAFB198-0B50-4F31-A3A9-3826042431F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DAFB198-0B50-4F31-A3A9-3826042431F5}.Release|Any CPU.Build.0 = Release|Any CPU - {DA204355-86E3-431D-B08E-483A49BEB3DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA204355-86E3-431D-B08E-483A49BEB3DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA204355-86E3-431D-B08E-483A49BEB3DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA204355-86E3-431D-B08E-483A49BEB3DB}.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 @@ -85,14 +75,12 @@ Global {6F930741-A5ED-401E-ABEE-77BEA461D9A5} = {893263F9-1E6A-4C9A-808D-539C399848CF} {2C8C1360-AC50-4493-BC0B-950149A875A3} = {893263F9-1E6A-4C9A-808D-539C399848CF} {9DE9A470-64CF-426A-8D72-3CF871C4F73A} = {FD768C8B-9BF1-4F02-A2C4-335B22615763} - {3DAFB198-0B50-4F31-A3A9-3826042431F5} = {FD768C8B-9BF1-4F02-A2C4-335B22615763} {1AFD2D0A-B962-449B-AC3B-12ED1F439E91} = {FD768C8B-9BF1-4F02-A2C4-335B22615763} {A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD} = {D5B768A4-9BA9-4E78-B735-60052C68035C} - {DA204355-86E3-431D-B08E-483A49BEB3DB} = {D5B768A4-9BA9-4E78-B735-60052C68035C} - {6B40D2AA-3405-4AC5-A4B2-CAD11D0B4301} = {D5B768A4-9BA9-4E78-B735-60052C68035C} - {E44D1E0E-5F76-41B8-AF5F-6112BCC6A39B} = {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} + {E44D1E0E-5F76-41B8-AF5F-6112BCC6A39B} = {94B59232-B99C-4224-B3E3-0F3385F06B64} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CF4AD1E7-1B60-4FDF-894F-7F0EF613012B} diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index 57ed54ee88f..5fcb64b37ef 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> @@ -678,8 +678,6 @@ System.Security.Cryptography.Pkcs.EnvelopedCms</PackageDescription> <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Security" /> diff --git a/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln b/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln index 81745e82211..f87d67ae80c 100644 --- a/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln +++ b/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln @@ -1,20 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", "..\Common\tests\StreamConformanceTests\StreamConformanceTests.csproj", "{66FE8701-0F3C-4524-ACB6-404E13221733}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0C78AEB2-80BD-4B1B-B5CD-F038522D065D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B6CAEAD5-36A0-4F32-A80D-D6B152028945}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{483D067C-49EF-4501-B56A-02F540D96BE5}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Primitives", "ref\System.Security.Cryptography.Primitives.csproj", "{E9BF1F4D-7D5C-4539-B426-2FCCB2585138}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Primitives", "src\System.Security.Cryptography.Primitives.csproj", "{AF227727-11A6-4E5F-98DE-C362FC829633}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Primitives.Tests", "tests\System.Security.Cryptography.Primitives.Tests.csproj", "{A242B3AB-EE45-4C95-9550-DB970BA23CD5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B3BB2DA0-53B8-4B49-999F-CD650EB61040}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F591FB6D-6957-46DB-BF9B-C00772BC11E3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A16B11D7-6732-45E2-894B-D5AFA879B68A}" @@ -25,22 +13,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {66FE8701-0F3C-4524-ACB6-404E13221733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66FE8701-0F3C-4524-ACB6-404E13221733}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66FE8701-0F3C-4524-ACB6-404E13221733}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66FE8701-0F3C-4524-ACB6-404E13221733}.Release|Any CPU.Build.0 = Release|Any CPU - {0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Release|Any CPU.Build.0 = Release|Any CPU - {B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Release|Any CPU.Build.0 = Release|Any CPU - {483D067C-49EF-4501-B56A-02F540D96BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {483D067C-49EF-4501-B56A-02F540D96BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {483D067C-49EF-4501-B56A-02F540D96BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {483D067C-49EF-4501-B56A-02F540D96BE5}.Release|Any CPU.Build.0 = Release|Any CPU {E9BF1F4D-7D5C-4539-B426-2FCCB2585138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E9BF1F4D-7D5C-4539-B426-2FCCB2585138}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9BF1F4D-7D5C-4539-B426-2FCCB2585138}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -49,21 +21,12 @@ Global {AF227727-11A6-4E5F-98DE-C362FC829633}.Debug|Any CPU.Build.0 = Debug|Any CPU {AF227727-11A6-4E5F-98DE-C362FC829633}.Release|Any CPU.ActiveCfg = Release|Any CPU {AF227727-11A6-4E5F-98DE-C362FC829633}.Release|Any CPU.Build.0 = Release|Any CPU - {A242B3AB-EE45-4C95-9550-DB970BA23CD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A242B3AB-EE45-4C95-9550-DB970BA23CD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A242B3AB-EE45-4C95-9550-DB970BA23CD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A242B3AB-EE45-4C95-9550-DB970BA23CD5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {66FE8701-0F3C-4524-ACB6-404E13221733} = {B3BB2DA0-53B8-4B49-999F-CD650EB61040} - {0C78AEB2-80BD-4B1B-B5CD-F038522D065D} = {B3BB2DA0-53B8-4B49-999F-CD650EB61040} - {A242B3AB-EE45-4C95-9550-DB970BA23CD5} = {B3BB2DA0-53B8-4B49-999F-CD650EB61040} - {B6CAEAD5-36A0-4F32-A80D-D6B152028945} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} {E9BF1F4D-7D5C-4539-B426-2FCCB2585138} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} - {483D067C-49EF-4501-B56A-02F540D96BE5} = {A16B11D7-6732-45E2-894B-D5AFA879B68A} {AF227727-11A6-4E5F-98DE-C362FC829633} = {A16B11D7-6732-45E2-894B-D5AFA879B68A} 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 05f83ffb5fb..e5cafb35197 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,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{179902DA-28E6-42F5-BA2D-905BEC68A32C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{85BEB7BC-C0AD-4B00-B328-8483067BE301}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "ref\System.Security.Cryptography.ProtectedData.csproj", "{E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E3C3C868-FBDB-4F07-A72E-F734016C0B3B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6F1E3122-547E-4134-BB45-6E33B880DC34}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AE1B6C0D-2991-4048-9B81-5683599B0CA4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{87D86F17-7CEB-48DB-99FB-55922ED2A7D1}" @@ -27,14 +29,14 @@ 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 - {179902DA-28E6-42F5-BA2D-905BEC68A32C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {179902DA-28E6-42F5-BA2D-905BEC68A32C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {179902DA-28E6-42F5-BA2D-905BEC68A32C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {179902DA-28E6-42F5-BA2D-905BEC68A32C}.Release|Any CPU.Build.0 = Release|Any CPU - {90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7}.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 + {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 + {D3B40403-2973-45CE-A0A4-97C38CBE86FE}.Release|Any CPU.Build.0 = Release|Any CPU {E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {21CC9F35-ACAA-4452-BE92-BBAE2E927B20} = {E3C3C868-FBDB-4F07-A72E-F734016C0B3B} {3A6C62D5-EFCA-4119-BC60-C917533848A8} = {E3C3C868-FBDB-4F07-A72E-F734016C0B3B} - {179902DA-28E6-42F5-BA2D-905BEC68A32C} = {AE1B6C0D-2991-4048-9B81-5683599B0CA4} + {85BEB7BC-C0AD-4B00-B328-8483067BE301} = {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} - {90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7} = {87D86F17-7CEB-48DB-99FB-55922ED2A7D1} {7773DB7A-494F-4508-9471-F737FDC7661E} = {87D86F17-7CEB-48DB-99FB-55922ED2A7D1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj index 9d505846d2f..6a6b0b4e7e0 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj @@ -51,8 +51,6 @@ System.Security.Cryptography.ProtectedData</PackageDescription> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Security" /> 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 c875d06a7e6..51f17c2b4e5 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,18 +5,12 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{201E349A-1CC7-4591-8332-29BEBF3DAA49}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{52FC346D-2936-43FD-93A6-02F019A5F5EC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{C5C394FF-FBE7-4A00-82B0-075A8F8587FE}" 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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj", "{EEFBEDAF-C620-4C4E-867E-80A1EFEC4357}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "..\System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj", "{97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\ref\System.Security.Cryptography.Pkcs.csproj", "{9E04AD65-21BC-4FF4-B38C-9B17488AACA5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\src\System.Security.Cryptography.Pkcs.csproj", "{76812DB0-A6A2-4F0C-B560-18FC7A97E419}" @@ -33,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C79093E1-DEC EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D171D0CF-B04B-4D8A-A678-7BB41E4A96FD}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A00A0A16-D202-49A0-B2C0-C3BB53FA858D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,14 +47,6 @@ 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 - {201E349A-1CC7-4591-8332-29BEBF3DAA49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {201E349A-1CC7-4591-8332-29BEBF3DAA49}.Debug|Any CPU.Build.0 = Debug|Any CPU - {201E349A-1CC7-4591-8332-29BEBF3DAA49}.Release|Any CPU.ActiveCfg = Release|Any CPU - {201E349A-1CC7-4591-8332-29BEBF3DAA49}.Release|Any CPU.Build.0 = Release|Any CPU - {52FC346D-2936-43FD-93A6-02F019A5F5EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52FC346D-2936-43FD-93A6-02F019A5F5EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52FC346D-2936-43FD-93A6-02F019A5F5EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52FC346D-2936-43FD-93A6-02F019A5F5EC}.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 @@ -71,10 +59,6 @@ Global {EEFBEDAF-C620-4C4E-867E-80A1EFEC4357}.Debug|Any CPU.Build.0 = Debug|Any CPU {EEFBEDAF-C620-4C4E-867E-80A1EFEC4357}.Release|Any CPU.ActiveCfg = Release|Any CPU {EEFBEDAF-C620-4C4E-867E-80A1EFEC4357}.Release|Any CPU.Build.0 = Release|Any CPU - {97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD}.Release|Any CPU.Build.0 = Release|Any CPU {9E04AD65-21BC-4FF4-B38C-9B17488AACA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9E04AD65-21BC-4FF4-B38C-9B17488AACA5}.Debug|Any CPU.Build.0 = Debug|Any CPU {9E04AD65-21BC-4FF4-B38C-9B17488AACA5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -103,17 +87,14 @@ Global {FC10D700-60DF-4D00-9433-47DFC3E3DC26} = {E5625DC8-6D89-4C9C-9AF6-35D0FAE7E4A5} {53F1E058-B5A4-4348-9BE6-8B006A6861AF} = {E5625DC8-6D89-4C9C-9AF6-35D0FAE7E4A5} {C3DE7458-876F-498F-8731-0458F0E34B9D} = {C79093E1-DEC3-4A35-93CB-216D1E87ACDD} - {201E349A-1CC7-4591-8332-29BEBF3DAA49} = {C79093E1-DEC3-4A35-93CB-216D1E87ACDD} {9E04AD65-21BC-4FF4-B38C-9B17488AACA5} = {C79093E1-DEC3-4A35-93CB-216D1E87ACDD} {4EC57148-D181-49B9-BDAF-1735D4687C79} = {C79093E1-DEC3-4A35-93CB-216D1E87ACDD} {C2D74126-653E-41C9-9CF8-E58F1FD110B8} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD} - {52FC346D-2936-43FD-93A6-02F019A5F5EC} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD} - {C5C394FF-FBE7-4A00-82B0-075A8F8587FE} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD} - {8A203663-E5D7-494B-93F9-F1205E9164BD} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD} {EEFBEDAF-C620-4C4E-867E-80A1EFEC4357} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD} - {97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD} = {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} + {8A203663-E5D7-494B-93F9-F1205E9164BD} = {A00A0A16-D202-49A0-B2C0-C3BB53FA858D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5ED3739E-C629-4900-BC1B-DF714AB4BB45} 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 cf1b748e1ea..01300e4376f 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,9 +5,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FB3C7609-962F-4414-8702-B3D4121AC51B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{65F8361F-13F3-4548-838F-53D6289EE77A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{158DDF64-D678-492E-A38A-0EE12E096F84}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\ref\System.Security.Cryptography.Pkcs.csproj", "{18882345-4F75-42DB-8DC9-A38AD5C4785E}" EndProject @@ -25,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B8C68464-1D2 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BA579BFF-D4D9-455A-A8AC-589361391420}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{39704A56-DFD6-4CC6-A7E4-229E639D9611}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,14 +45,14 @@ 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 - {FB3C7609-962F-4414-8702-B3D4121AC51B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB3C7609-962F-4414-8702-B3D4121AC51B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB3C7609-962F-4414-8702-B3D4121AC51B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB3C7609-962F-4414-8702-B3D4121AC51B}.Release|Any CPU.Build.0 = Release|Any CPU - {158DDF64-D678-492E-A38A-0EE12E096F84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {158DDF64-D678-492E-A38A-0EE12E096F84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {158DDF64-D678-492E-A38A-0EE12E096F84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {158DDF64-D678-492E-A38A-0EE12E096F84}.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 + {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 + {B15E7AF8-B446-425F-B22A-619A01DEDA16}.Release|Any CPU.Build.0 = Release|Any CPU {18882345-4F75-42DB-8DC9-A38AD5C4785E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {18882345-4F75-42DB-8DC9-A38AD5C4785E}.Debug|Any CPU.Build.0 = Debug|Any CPU {18882345-4F75-42DB-8DC9-A38AD5C4785E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -79,13 +81,13 @@ Global {B3180E55-B9B3-4B71-8A52-DDDCB3E39F77} = {F25E8B4D-D7E9-4086-A263-CB9D3B41074B} {675D4EE3-1F0E-4445-A9CD-635ED3351751} = {F25E8B4D-D7E9-4086-A263-CB9D3B41074B} {69CF4D3A-5F10-4BCA-B975-0D6239447EDE} = {B8C68464-1D28-4889-90BC-BC80B036B90B} - {FB3C7609-962F-4414-8702-B3D4121AC51B} = {B8C68464-1D28-4889-90BC-BC80B036B90B} {18882345-4F75-42DB-8DC9-A38AD5C4785E} = {B8C68464-1D28-4889-90BC-BC80B036B90B} {2BB35F95-AD1A-45D3-B8E2-84CC690073A8} = {B8C68464-1D28-4889-90BC-BC80B036B90B} {4412A97C-77C7-4C89-8F78-E26AEEDE8CA8} = {BA579BFF-D4D9-455A-A8AC-589361391420} - {158DDF64-D678-492E-A38A-0EE12E096F84} = {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} + {B15E7AF8-B446-425F-B22A-619A01DEDA16} = {39704A56-DFD6-4CC6-A7E4-229E639D9611} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E0287BE2-B499-4885-8EE8-0B35585CA885} diff --git a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj index 5c8934d82cd..b61c2ba35a5 100644 --- a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj +++ b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj @@ -159,8 +159,6 @@ System.Security.Cryptography.Xml.XmlLicenseTransform</PackageDescription> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 --> <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" PrivateAssets="all" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> <Reference Include="System.Security" /> diff --git a/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln b/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln index 040884d81ec..41cba6c8a46 100644 --- a/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln +++ b/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln @@ -3,9 +3,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0C78AEB2-80BD-4B1B-B5CD-F038522D065D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B6CAEAD5-36A0-4F32-A80D-D6B152028945}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{D5032AC3-A2A7-4B6A-93CB-2448DEB0B492}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{483D067C-49EF-4501-B56A-02F540D96BE5}" +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}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B8B8FF39-1961-441D-9295-9F8B0B59575C}" +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 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\ref\System.Security.Cryptography.Pkcs.csproj", "{258B22AA-ECA6-412E-9F29-6BB6063CD036}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\src\System.Security.Cryptography.Pkcs.csproj", "{E72C02D0-CC28-4FE2-8A2F-D91ABD990065}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography", "ref\System.Security.Cryptography.csproj", "{E9BF1F4D-7D5C-4539-B426-2FCCB2585138}" EndProject @@ -19,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F591FB6D-695 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A16B11D7-6732-45E2-894B-D5AFA879B68A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2B165D96-356D-409E-88BE-0CA0F407303E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,14 +43,30 @@ Global {0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Release|Any CPU.Build.0 = Release|Any CPU - {B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Release|Any CPU.Build.0 = Release|Any CPU - {483D067C-49EF-4501-B56A-02F540D96BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {483D067C-49EF-4501-B56A-02F540D96BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {483D067C-49EF-4501-B56A-02F540D96BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {483D067C-49EF-4501-B56A-02F540D96BE5}.Release|Any CPU.Build.0 = Release|Any CPU + {D5032AC3-A2A7-4B6A-93CB-2448DEB0B492}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5032AC3-A2A7-4B6A-93CB-2448DEB0B492}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5032AC3-A2A7-4B6A-93CB-2448DEB0B492}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5032AC3-A2A7-4B6A-93CB-2448DEB0B492}.Release|Any CPU.Build.0 = Release|Any CPU + {3B1486E4-DCDE-4629-AACC-D1A6FF8A1993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {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 + {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 + {1B999BF7-657A-4342-A97E-B5CC5916AFB4}.Release|Any CPU.Build.0 = Release|Any CPU + {258B22AA-ECA6-412E-9F29-6BB6063CD036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {258B22AA-ECA6-412E-9F29-6BB6063CD036}.Debug|Any CPU.Build.0 = Debug|Any CPU + {258B22AA-ECA6-412E-9F29-6BB6063CD036}.Release|Any CPU.ActiveCfg = Release|Any CPU + {258B22AA-ECA6-412E-9F29-6BB6063CD036}.Release|Any CPU.Build.0 = Release|Any CPU + {E72C02D0-CC28-4FE2-8A2F-D91ABD990065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E72C02D0-CC28-4FE2-8A2F-D91ABD990065}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E72C02D0-CC28-4FE2-8A2F-D91ABD990065}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E72C02D0-CC28-4FE2-8A2F-D91ABD990065}.Release|Any CPU.Build.0 = Release|Any CPU {E9BF1F4D-7D5C-4539-B426-2FCCB2585138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E9BF1F4D-7D5C-4539-B426-2FCCB2585138}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9BF1F4D-7D5C-4539-B426-2FCCB2585138}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -61,10 +87,14 @@ Global {66FE8701-0F3C-4524-ACB6-404E13221733} = {B3BB2DA0-53B8-4B49-999F-CD650EB61040} {0C78AEB2-80BD-4B1B-B5CD-F038522D065D} = {B3BB2DA0-53B8-4B49-999F-CD650EB61040} {A242B3AB-EE45-4C95-9550-DB970BA23CD5} = {B3BB2DA0-53B8-4B49-999F-CD650EB61040} - {B6CAEAD5-36A0-4F32-A80D-D6B152028945} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} + {D5032AC3-A2A7-4B6A-93CB-2448DEB0B492} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} + {258B22AA-ECA6-412E-9F29-6BB6063CD036} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} {E9BF1F4D-7D5C-4539-B426-2FCCB2585138} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} - {483D067C-49EF-4501-B56A-02F540D96BE5} = {A16B11D7-6732-45E2-894B-D5AFA879B68A} + {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} + {1B999BF7-657A-4342-A97E-B5CC5916AFB4} = {2B165D96-356D-409E-88BE-0CA0F407303E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F5615383-F387-45EA-A05A-CB65D8A6FE88} diff --git a/src/libraries/System.Security.Permissions/System.Security.Permissions.sln b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln index 6ec91cdf8f1..5aa7afe8411 100644 --- a/src/libraries/System.Security.Permissions/System.Security.Permissions.sln +++ b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln @@ -13,9 +13,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{85FEB4C5-8566-4FEB-925B-C49B8EB10B66}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{81BC7EDB-94CC-4497-9D3F-FE60BAC03FAC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A4AC5507-621D-4651-89D9-DB2444697CFF}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "ref\System.Security.Permissions.csproj", "{F238F227-522D-4886-A6B5-474948B3C660}" EndProject @@ -33,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{97C6E424-BBB EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9C0E3C0E-FFF8-4241-8942-A77093C003F1}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EA13AEBA-B53D-4A6C-8BA1-FB1748B87675}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -67,14 +69,14 @@ 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 - {85FEB4C5-8566-4FEB-925B-C49B8EB10B66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85FEB4C5-8566-4FEB-925B-C49B8EB10B66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85FEB4C5-8566-4FEB-925B-C49B8EB10B66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85FEB4C5-8566-4FEB-925B-C49B8EB10B66}.Release|Any CPU.Build.0 = Release|Any CPU - {A4AC5507-621D-4651-89D9-DB2444697CFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4AC5507-621D-4651-89D9-DB2444697CFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4AC5507-621D-4651-89D9-DB2444697CFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4AC5507-621D-4651-89D9-DB2444697CFF}.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 + {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 + {E2926598-EE1D-4DA3-AD75-11D54F1EF318}.Release|Any CPU.Build.0 = Release|Any CPU {F238F227-522D-4886-A6B5-474948B3C660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F238F227-522D-4886-A6B5-474948B3C660}.Debug|Any CPU.Build.0 = Debug|Any CPU {F238F227-522D-4886-A6B5-474948B3C660}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -105,15 +107,15 @@ Global {13782F8D-27BB-48EE-B176-859C11173158} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29} {A629F9A5-1EA5-475F-9A49-29C81198CF34} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29} {E71E8D52-CF85-4713-9634-EB04CAE7F21A} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29} - {85FEB4C5-8566-4FEB-925B-C49B8EB10B66} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29} {F238F227-522D-4886-A6B5-474948B3C660} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29} {19AB8565-1ADA-4E64-B5C8-FD2DA7525358} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29} {B5ADF0C4-33EF-4836-AF94-0F4551AE26B8} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1} {7E64D2D1-7ED9-490A-B658-5E2162F571D6} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1} {53FBF7A5-CF86-435A-B20C-47BD78847CF5} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1} - {A4AC5507-621D-4651-89D9-DB2444697CFF} = {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} + {E2926598-EE1D-4DA3-AD75-11D54F1EF318} = {EA13AEBA-B53D-4A6C-8BA1-FB1748B87675} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3A482AFF-93CE-43E0-9C2A-64424A25D364} 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 3e4cdd14819..cc222fdd349 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,10 +1,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{61C7DD7C-76A8-4103-89B6-13A819871E20}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C4E3304E-6916-4352-BD79-AE4274B75A1E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{8B258AE4-045E-431A-844B-CAC5C94C5B45}" 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}" @@ -17,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.W EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0CC51645-FA2D-44E8-9A91-562DF28F2236}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5D05713D-8A07-4460-846C-4FAAE60211D3}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4D97C07E-8EAF-45ED-A729-AC7680C2F58F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8AA6E2BC-BA18-48AE-93DA-6F694A7FA8B1}" @@ -31,14 +29,6 @@ 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 - {61C7DD7C-76A8-4103-89B6-13A819871E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61C7DD7C-76A8-4103-89B6-13A819871E20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61C7DD7C-76A8-4103-89B6-13A819871E20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61C7DD7C-76A8-4103-89B6-13A819871E20}.Release|Any CPU.Build.0 = Release|Any CPU - {C4E3304E-6916-4352-BD79-AE4274B75A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4E3304E-6916-4352-BD79-AE4274B75A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4E3304E-6916-4352-BD79-AE4274B75A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4E3304E-6916-4352-BD79-AE4274B75A1E}.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 @@ -66,11 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {1F05702D-1F77-4EA3-AFB2-94893104F248} = {0CC51645-FA2D-44E8-9A91-562DF28F2236} {9310D24A-AB63-4CB0-9718-A8C2D57C20FE} = {0CC51645-FA2D-44E8-9A91-562DF28F2236} - {61C7DD7C-76A8-4103-89B6-13A819871E20} = {4D97C07E-8EAF-45ED-A729-AC7680C2F58F} + {8B258AE4-045E-431A-844B-CAC5C94C5B45} = {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} - {C4E3304E-6916-4352-BD79-AE4274B75A1E} = {8AA6E2BC-BA18-48AE-93DA-6F694A7FA8B1} - {8B258AE4-045E-431A-844B-CAC5C94C5B45} = {8AA6E2BC-BA18-48AE-93DA-6F694A7FA8B1} - {589D8BE1-E01B-48B0-859D-FC19DE266CAF} = {8AA6E2BC-BA18-48AE-93DA-6F694A7FA8B1} {AA2C3AEB-53FA-4F69-8769-89DCE8221299} = {8AA6E2BC-BA18-48AE-93DA-6F694A7FA8B1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Security.Principal/System.Security.Principal.sln b/src/libraries/System.Security.Principal/System.Security.Principal.sln index 6dc3723dade..2f887673578 100644 --- a/src/libraries/System.Security.Principal/System.Security.Principal.sln +++ b/src/libraries/System.Security.Principal/System.Security.Principal.sln @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CB111901-48ED-4097-AAC2-7E8E9A41796D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{3D3EBB3C-5E3D-41A9-8634-434FC0E7E4FD}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DC35DE57-330D-4DE1-822D-12AEA72B1015}" EndProject Global @@ -142,10 +144,10 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {45602EBE-1508-43A8-A398-1B92BD243557} = {CB111901-48ED-4097-AAC2-7E8E9A41796D} - {9C81AA4B-B9FB-42CC-9BEF-D3B3768BC0C3} = {CB111901-48ED-4097-AAC2-7E8E9A41796D} - {858D214B-C022-4CD7-B3DC-0DF7BF4C01D0} = {CB111901-48ED-4097-AAC2-7E8E9A41796D} - {9CC911BC-E81D-477F-9545-564CEE69A909} = {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} + {9CC911BC-E81D-477F-9545-564CEE69A909} = {3D3EBB3C-5E3D-41A9-8634-434FC0E7E4FD} {23171947-F933-47A6-9D1A-D43A186E7C43} = {DC35DE57-330D-4DE1-822D-12AEA72B1015} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Security.SecureString/System.Security.SecureString.sln b/src/libraries/System.Security.SecureString/System.Security.SecureString.sln index cf6b8144295..8e2f5f9bbac 100644 --- a/src/libraries/System.Security.SecureString/System.Security.SecureString.sln +++ b/src/libraries/System.Security.SecureString/System.Security.SecureString.sln @@ -1,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{9F69FA79-4228-4369-A8BA-A42C07016FB6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{20B35F7C-A37D-468D-BD60-0DDEB1DBF16A}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.SecureString", "ref\System.Security.SecureString.csproj", "{CE7DA336-6577-4960-892A-1313060055BE}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.SecureStrin EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{419AD2E2-6933-4D5C-8B7E-D3E743615259}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{89279530-0643-4020-90A2-17864E3BDD2E}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{00F45A02-3D9C-4842-BDA0-DEC763F67E0C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F9303BF1-2B99-4F02-8700-02E820B75DAD}" @@ -27,14 +29,14 @@ 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 - {DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6}.Release|Any CPU.Build.0 = Release|Any CPU - {20B35F7C-A37D-468D-BD60-0DDEB1DBF16A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20B35F7C-A37D-468D-BD60-0DDEB1DBF16A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20B35F7C-A37D-468D-BD60-0DDEB1DBF16A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20B35F7C-A37D-468D-BD60-0DDEB1DBF16A}.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 + {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 + {E1544F80-3184-4CFB-B6E4-4A12CCDD2DFE}.Release|Any CPU.Build.0 = Release|Any CPU {CE7DA336-6577-4960-892A-1313060055BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CE7DA336-6577-4960-892A-1313060055BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {CE7DA336-6577-4960-892A-1313060055BE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {04D77C80-10A2-4773-A7E5-12D89010CC1A} = {419AD2E2-6933-4D5C-8B7E-D3E743615259} {FB504757-0A3F-49DD-B869-CE20502D23BF} = {419AD2E2-6933-4D5C-8B7E-D3E743615259} - {DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6} = {00F45A02-3D9C-4842-BDA0-DEC763F67E0C} + {9F69FA79-4228-4369-A8BA-A42C07016FB6} = {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} - {20B35F7C-A37D-468D-BD60-0DDEB1DBF16A} = {F9303BF1-2B99-4F02-8700-02E820B75DAD} {32CFD1C6-A8C4-45C1-BBD8-94D07B33674C} = {F9303BF1-2B99-4F02-8700-02E820B75DAD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln b/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln index d062109e7e2..119432c8a75 100644 --- a/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln +++ b/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln @@ -1,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{32372D95-0479-478C-9D88-F2E9EFE8799B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{169768BD-C04F-452A-BD81-4701DF9F31DE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D1D66A3C-C615-443E-8F57-9C0F4443FD0C}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Syndication", "ref\System.ServiceModel.Syndication.csproj", "{2A7BBE91-0165-45E9-8A10-D7346C5179B6}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Syndica EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{38797FCA-196F-4A36-B6E6-1861269F84A8}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{9727DC59-CDC4-465C-BDCF-01C3CEEC18F5}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{93DCE9EB-54B4-45FE-BA5D-046CBAD043FA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5C16F923-3CC4-41E8-A22C-ED99BEB8A497}" @@ -27,14 +29,14 @@ 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 - {32372D95-0479-478C-9D88-F2E9EFE8799B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32372D95-0479-478C-9D88-F2E9EFE8799B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32372D95-0479-478C-9D88-F2E9EFE8799B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32372D95-0479-478C-9D88-F2E9EFE8799B}.Release|Any CPU.Build.0 = Release|Any CPU - {D1D66A3C-C615-443E-8F57-9C0F4443FD0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1D66A3C-C615-443E-8F57-9C0F4443FD0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1D66A3C-C615-443E-8F57-9C0F4443FD0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1D66A3C-C615-443E-8F57-9C0F4443FD0C}.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 + {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 + {6FB3EC19-1083-4AFD-8F7D-FB1224C965A0}.Release|Any CPU.Build.0 = Release|Any CPU {2A7BBE91-0165-45E9-8A10-D7346C5179B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2A7BBE91-0165-45E9-8A10-D7346C5179B6}.Debug|Any CPU.Build.0 = Debug|Any CPU {2A7BBE91-0165-45E9-8A10-D7346C5179B6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {66CD0AD6-EBEE-468B-9732-A4C49EF492F4} = {38797FCA-196F-4A36-B6E6-1861269F84A8} {0269CAF5-9979-49A1-AC7B-61139BBBA182} = {38797FCA-196F-4A36-B6E6-1861269F84A8} - {32372D95-0479-478C-9D88-F2E9EFE8799B} = {93DCE9EB-54B4-45FE-BA5D-046CBAD043FA} + {169768BD-C04F-452A-BD81-4701DF9F31DE} = {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} - {D1D66A3C-C615-443E-8F57-9C0F4443FD0C} = {5C16F923-3CC4-41E8-A22C-ED99BEB8A497} {02AF5461-4FB0-48B1-AD93-9D5F1022B1E9} = {5C16F923-3CC4-41E8-A22C-ED99BEB8A497} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln b/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln index 32650f01df0..a9e581be52d 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln +++ b/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln @@ -9,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{EB1E236C-9103-4A6E-B892-2184703045AB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3EFFCBC1-32A1-405D-A90B-4142863CFAB0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{262F64E2-9166-4F98-8221-9E602221DC3A}" EndProject @@ -31,6 +31,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9F6956E6-D92 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CCD3324D-2948-43FE-B2F2-B386F7EBEC09}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B5D3C592-0D89-4E68-AAE9-F0411AD9C72C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -57,14 +59,14 @@ 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 - {EB1E236C-9103-4A6E-B892-2184703045AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB1E236C-9103-4A6E-B892-2184703045AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB1E236C-9103-4A6E-B892-2184703045AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB1E236C-9103-4A6E-B892-2184703045AB}.Release|Any CPU.Build.0 = Release|Any CPU - {DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2}.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 + {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 + {C386F669-744B-4DC7-9A8C-C89B5B6C1B00}.Release|Any CPU.Build.0 = Release|Any CPU {262F64E2-9166-4F98-8221-9E602221DC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {262F64E2-9166-4F98-8221-9E602221DC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU {262F64E2-9166-4F98-8221-9E602221DC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -99,14 +101,14 @@ Global {B0E21FE7-22CE-4473-A281-082E0451B597} = {60A3623C-9BB6-45B8-B1FB-2DB246723CF7} {BC4E45A0-6024-454A-AA4F-8414BEC5FE8B} = {9F6956E6-D922-48F6-B565-4A5679A9C856} {9E6A5D88-E929-40DB-B2E0-A2A3F83E9117} = {9F6956E6-D922-48F6-B565-4A5679A9C856} - {EB1E236C-9103-4A6E-B892-2184703045AB} = {9F6956E6-D922-48F6-B565-4A5679A9C856} {262F64E2-9166-4F98-8221-9E602221DC3A} = {9F6956E6-D922-48F6-B565-4A5679A9C856} {E3DD170A-B91F-4615-984A-0A5268B077D0} = {9F6956E6-D922-48F6-B565-4A5679A9C856} {BFC4850D-FA36-42DD-ACEB-AB51BB273D19} = {9F6956E6-D922-48F6-B565-4A5679A9C856} {BCA9AEAA-30EF-4B5F-B773-219F200CDB25} = {CCD3324D-2948-43FE-B2F2-B386F7EBEC09} {FC3FBFFE-B1BC-4C1B-AC1A-8714767A940E} = {CCD3324D-2948-43FE-B2F2-B386F7EBEC09} - {DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2} = {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} + {C386F669-744B-4DC7-9A8C-C89B5B6C1B00} = {B5D3C592-0D89-4E68-AAE9-F0411AD9C72C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {A60086D8-4665-4FB4-ABA7-A74F0CC9983D} diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 44fc5893c98..ecbd0bbe779 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -105,8 +105,6 @@ System.ServiceProcess.ServiceType</PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.ServiceProcess" /> diff --git a/src/libraries/System.Speech/System.Speech.sln b/src/libraries/System.Speech/System.Speech.sln index f6cbc45bbd1..431ea393931 100644 --- a/src/libraries/System.Speech/System.Speech.sln +++ b/src/libraries/System.Speech/System.Speech.sln @@ -1,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{81FD4FF6-6D7B-494D-92CC-0236C1B934BC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6E3BD4A4-0976-48A9-BDD7-71278F9B9533}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2C183A48-9F70-4F5C-B48D-3187634C41C9}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Speech", "ref\System.Speech.csproj", "{2D839561-1430-4CA5-9695-6FC9325FF876}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Speech.Tests", "test EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C516711E-47BF-4337-A52D-DF1E2B29EDCB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{59770FE6-B1BD-4817-8664-DC33233399F5}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6DC14447-3322-4AAA-8FDA-3B48D4AB3A17}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3C2EFE00-44E6-4803-BC19-A7DB02BE7747}" @@ -27,14 +29,14 @@ 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 - {81FD4FF6-6D7B-494D-92CC-0236C1B934BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81FD4FF6-6D7B-494D-92CC-0236C1B934BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81FD4FF6-6D7B-494D-92CC-0236C1B934BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81FD4FF6-6D7B-494D-92CC-0236C1B934BC}.Release|Any CPU.Build.0 = Release|Any CPU - {2C183A48-9F70-4F5C-B48D-3187634C41C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C183A48-9F70-4F5C-B48D-3187634C41C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C183A48-9F70-4F5C-B48D-3187634C41C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C183A48-9F70-4F5C-B48D-3187634C41C9}.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 + {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 + {B6DC3B86-B125-412A-81C6-0AFECFE4A08A}.Release|Any CPU.Build.0 = Release|Any CPU {2D839561-1430-4CA5-9695-6FC9325FF876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2D839561-1430-4CA5-9695-6FC9325FF876}.Debug|Any CPU.Build.0 = Debug|Any CPU {2D839561-1430-4CA5-9695-6FC9325FF876}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {0C0DD088-AF6A-4508-9501-399B92F815A5} = {C516711E-47BF-4337-A52D-DF1E2B29EDCB} {E26B6065-4016-4385-9AB2-EEBE2C97CEE7} = {C516711E-47BF-4337-A52D-DF1E2B29EDCB} - {81FD4FF6-6D7B-494D-92CC-0236C1B934BC} = {6DC14447-3322-4AAA-8FDA-3B48D4AB3A17} + {6E3BD4A4-0976-48A9-BDD7-71278F9B9533} = {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} - {2C183A48-9F70-4F5C-B48D-3187634C41C9} = {3C2EFE00-44E6-4803-BC19-A7DB02BE7747} {D6377882-BD90-46D6-AC60-83498E4BA2B3} = {3C2EFE00-44E6-4803-BC19-A7DB02BE7747} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution 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 178e9180f23..6b228a89692 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,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{49A2E208-6572-4D08-8392-A534EAF93353}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{308267C4-548F-4DED-8DF1-A5BF60BDAEDF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{32840819-87F6-4CAA-A0F6-BB2BD23545FC}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "ref\System.Text.Encoding.CodePages.csproj", "{C6B27183-6436-4343-A722-17AAB6A11573}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePa EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8CB6F00C-76CE-4F7F-9748-64DD94323A65}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{74B63852-3633-4913-8CA4-54713240919C}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D39B4CF8-10D4-4167-BF2D-FE1BAF33D98D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BBC725DC-56DD-4D84-B24C-93B879FCCA94}" @@ -27,14 +29,14 @@ 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 - {49A2E208-6572-4D08-8392-A534EAF93353}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49A2E208-6572-4D08-8392-A534EAF93353}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49A2E208-6572-4D08-8392-A534EAF93353}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49A2E208-6572-4D08-8392-A534EAF93353}.Release|Any CPU.Build.0 = Release|Any CPU - {32840819-87F6-4CAA-A0F6-BB2BD23545FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32840819-87F6-4CAA-A0F6-BB2BD23545FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32840819-87F6-4CAA-A0F6-BB2BD23545FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32840819-87F6-4CAA-A0F6-BB2BD23545FC}.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 + {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 + {AF9B7A62-8184-4D20-A237-7403EE03CB2E}.Release|Any CPU.Build.0 = Release|Any CPU {C6B27183-6436-4343-A722-17AAB6A11573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6B27183-6436-4343-A722-17AAB6A11573}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6B27183-6436-4343-A722-17AAB6A11573}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {E9DABA44-B5F3-4E9B-B9FC-54E558831847} = {8CB6F00C-76CE-4F7F-9748-64DD94323A65} {41C87552-FF98-4814-AD4E-B8E63840C8D5} = {8CB6F00C-76CE-4F7F-9748-64DD94323A65} - {49A2E208-6572-4D08-8392-A534EAF93353} = {D39B4CF8-10D4-4167-BF2D-FE1BAF33D98D} + {308267C4-548F-4DED-8DF1-A5BF60BDAEDF} = {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} - {32840819-87F6-4CAA-A0F6-BB2BD23545FC} = {BBC725DC-56DD-4D84-B24C-93B879FCCA94} {4F894506-769C-4219-BDE7-E1DDE6F1A35D} = {BBC725DC-56DD-4D84-B24C-93B879FCCA94} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index 2dc3052b760..fefe720b1b1 100644 --- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -71,9 +71,6 @@ System.Text.CodePagesEncodingProvider</PackageDescription> <None Include="Data\CodePageNameMappings.csv" /> <None Include="Data\PreferredCodePageNames.csv" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> - </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Debug" /> @@ -88,4 +85,7 @@ System.Text.CodePagesEncodingProvider</PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFrameworkVersion)' == 'v6.0'"> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> + </ItemGroup> </Project> 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 b9b1172d81c..d2289db0f65 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,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7101801F-0F2D-4D30-BD45-99F0A824EBEC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A2A728AD-8A0C-40F5-87AE-B6F57175B008}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B98CEFA4-10F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6A521BB6-5A53-4871-8EF7-15C4FCF0B416}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6906BA55-F0A0-4E71-942D-E24C6C85A353}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F4F19285-4785-496C-8F6C-579249EAA5BB}" EndProject Global @@ -92,42 +90,6 @@ 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 - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|x64.ActiveCfg = Debug|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|x64.Build.0 = Debug|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|x86.ActiveCfg = Debug|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|x86.Build.0 = Debug|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|Any CPU.Build.0 = Release|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|x64.ActiveCfg = Release|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|x64.Build.0 = Release|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|x86.ActiveCfg = Release|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|x86.Build.0 = Release|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Checked|Any CPU.Build.0 = Debug|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Checked|x64.ActiveCfg = Debug|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Checked|x64.Build.0 = Debug|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Checked|x86.ActiveCfg = Debug|Any CPU - {7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Checked|x86.Build.0 = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|x64.ActiveCfg = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|x64.Build.0 = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|x86.ActiveCfg = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|x86.Build.0 = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|Any CPU.Build.0 = Release|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|x64.ActiveCfg = Release|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|x64.Build.0 = Release|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|x86.ActiveCfg = Release|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|x86.Build.0 = Release|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Checked|Any CPU.Build.0 = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Checked|x64.ActiveCfg = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Checked|x64.Build.0 = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Checked|x86.ActiveCfg = Debug|Any CPU - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.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 @@ -224,14 +186,12 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {E70D3A84-3053-4E44-82FC-A56A574BF6F8} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599} - {0FB90CF0-6B17-4FAB-A737-0532B5BCAADB} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599} - {E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599} - {A2A728AD-8A0C-40F5-87AE-B6F57175B008} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599} - {2A579CCA-3FAC-46A0-A49F-F63F1DC693BB} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599} {EF713897-15F9-42E4-979F-271FA1EF6ECA} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599} {CC6D3524-D6C8-468B-B908-CE746C1DB175} = {6A521BB6-5A53-4871-8EF7-15C4FCF0B416} {777B4928-6EE5-42D2-8F95-E43EB027D14E} = {6A521BB6-5A53-4871-8EF7-15C4FCF0B416} - {7101801F-0F2D-4D30-BD45-99F0A824EBEC} = {F4F19285-4785-496C-8F6C-579249EAA5BB} + {0FB90CF0-6B17-4FAB-A737-0532B5BCAADB} = {6906BA55-F0A0-4E71-942D-E24C6C85A353} + {A2A728AD-8A0C-40F5-87AE-B6F57175B008} = {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 GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Text.Encoding/System.Text.Encoding.sln b/src/libraries/System.Text.Encoding/System.Text.Encoding.sln index f2e0348d71d..29d89af4c33 100644 --- a/src/libraries/System.Text.Encoding/System.Text.Encoding.sln +++ b/src/libraries/System.Text.Encoding/System.Text.Encoding.sln @@ -11,10 +11,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E8313B01-55A4-48E6-964A-298512B0FB7B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{AD6E4919-0D0C-4D59-8789-25FB5F666288}" 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}" @@ -31,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A4D340E7 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F3E9EF8A-43E5-433A-84EA-EA5409091019}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{81CF2B5E-4EF1-404B-9CA7-80197E1A7523}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -152,42 +150,6 @@ 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 - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|x64.ActiveCfg = Debug|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|x64.Build.0 = Debug|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|x86.ActiveCfg = Debug|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|x86.Build.0 = Debug|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|Any CPU.Build.0 = Release|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|x64.ActiveCfg = Release|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|x64.Build.0 = Release|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|x86.ActiveCfg = Release|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|x86.Build.0 = Release|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Checked|Any CPU.Build.0 = Debug|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Checked|x64.ActiveCfg = Debug|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Checked|x64.Build.0 = Debug|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Checked|x86.ActiveCfg = Debug|Any CPU - {E8313B01-55A4-48E6-964A-298512B0FB7B}.Checked|x86.Build.0 = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|x64.ActiveCfg = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|x64.Build.0 = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|x86.ActiveCfg = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|x86.Build.0 = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|Any CPU.Build.0 = Release|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|x64.ActiveCfg = Release|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|x64.Build.0 = Release|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|x86.ActiveCfg = Release|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|x86.Build.0 = Release|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Checked|Any CPU.Build.0 = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Checked|x64.ActiveCfg = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Checked|x64.Build.0 = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Checked|x86.ActiveCfg = Debug|Any CPU - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.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 @@ -285,17 +247,15 @@ Global GlobalSection(NestedProjects) = preSolution {8E868804-E3B3-4933-BFA9-E69F7704B3A5} = {CC986F0C-EA00-485E-B6F9-6D8823D9CF84} {530C65D8-0440-4AF2-8975-F03EFF573195} = {CC986F0C-EA00-485E-B6F9-6D8823D9CF84} - {604213DB-0DCD-41AC-A244-502BDBA57CB5} = {CC986F0C-EA00-485E-B6F9-6D8823D9CF84} - {2E6A015C-B78A-4ABB-A623-73956CA3E5FC} = {CC986F0C-EA00-485E-B6F9-6D8823D9CF84} - {AD6E4919-0D0C-4D59-8789-25FB5F666288} = {CC986F0C-EA00-485E-B6F9-6D8823D9CF84} - {084FE3C6-4130-4F8E-AB6A-EB0560550664} = {CC986F0C-EA00-485E-B6F9-6D8823D9CF84} {57B651DB-5817-4AB7-BF66-C440109F16F9} = {CC986F0C-EA00-485E-B6F9-6D8823D9CF84} {9E01529D-6C36-4F34-84CB-68304E93E1F5} = {A4D340E7-AF75-4FA7-AB84-B743E8BB163E} {2B15EE47-1C5F-444F-A9CD-EABBE370718E} = {A4D340E7-AF75-4FA7-AB84-B743E8BB163E} {EE236E3F-7A5C-4493-A477-560C59B28602} = {A4D340E7-AF75-4FA7-AB84-B743E8BB163E} {657AE296-9F0B-4D8C-B11B-BF454EF90E7C} = {F3E9EF8A-43E5-433A-84EA-EA5409091019} - {E8313B01-55A4-48E6-964A-298512B0FB7B} = {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} + {084FE3C6-4130-4F8E-AB6A-EB0560550664} = {81CF2B5E-4EF1-404B-9CA7-80197E1A7523} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {36DCD8A4-C857-4C7F-B7A6-CB6945EA1709} 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 099d853884b..a0f136a6bad 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,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{99954F04-4EFB-424F-AD4B-CD5CA5298C60}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{3EDC0167-FF3A-494A-8D5C-DAC18B9F2F52}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DB7B918F-EB7F-456C-ADA5-78D82C5E5027}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "ref\System.Text.Encodings.Web.csproj", "{635D1626-6D21-4DAB-BFEF-F5F13261967B}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web.T EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9DE01EE3-CDAF-4B6E-B778-B5B5D83A9214}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BAAA946F-C5D8-483D-9610-F229125AFEFC}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E59B32B-BED2-4E24-9055-491C8DF351FB}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C88B420B-1505-4CB6-AA13-263AD2D66D93}" @@ -27,14 +29,14 @@ 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 - {99954F04-4EFB-424F-AD4B-CD5CA5298C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99954F04-4EFB-424F-AD4B-CD5CA5298C60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99954F04-4EFB-424F-AD4B-CD5CA5298C60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99954F04-4EFB-424F-AD4B-CD5CA5298C60}.Release|Any CPU.Build.0 = Release|Any CPU - {DB7B918F-EB7F-456C-ADA5-78D82C5E5027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB7B918F-EB7F-456C-ADA5-78D82C5E5027}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB7B918F-EB7F-456C-ADA5-78D82C5E5027}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB7B918F-EB7F-456C-ADA5-78D82C5E5027}.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 + {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 + {1C02A4C6-2AEB-46E3-B1D3-84EE2153671A}.Release|Any CPU.Build.0 = Release|Any CPU {635D1626-6D21-4DAB-BFEF-F5F13261967B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {635D1626-6D21-4DAB-BFEF-F5F13261967B}.Debug|Any CPU.Build.0 = Debug|Any CPU {635D1626-6D21-4DAB-BFEF-F5F13261967B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {43450381-504E-4603-BF5D-99CCAC2B8A26} = {9DE01EE3-CDAF-4B6E-B778-B5B5D83A9214} {A15B95D2-1DDF-47C9-A92F-03FD5DB720C9} = {9DE01EE3-CDAF-4B6E-B778-B5B5D83A9214} - {99954F04-4EFB-424F-AD4B-CD5CA5298C60} = {2E59B32B-BED2-4E24-9055-491C8DF351FB} + {3EDC0167-FF3A-494A-8D5C-DAC18B9F2F52} = {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} - {DB7B918F-EB7F-456C-ADA5-78D82C5E5027} = {C88B420B-1505-4CB6-AA13-263AD2D66D93} {9A8107A2-1AC1-44D5-A4D4-D8EB52C3CB18} = {C88B420B-1505-4CB6-AA13-263AD2D66D93} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj index 75702453c1f..5dd38965eae 100644 --- a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj +++ b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj @@ -56,9 +56,6 @@ System.Text.Encodings.Web.JavaScriptEncoder</PackageDescription> <Compile Include="Polyfills\System.Numerics.BitOperations.netstandard20.cs" /> <Compile Include="Polyfills\System.Text.Rune.netstandard20.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> - </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Reference Include="System.Memory" /> <Reference Include="System.Numerics.Vectors" /> @@ -69,5 +66,9 @@ System.Text.Encodings.Web.JavaScriptEncoder</PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFrameworkVersion)' == 'v6.0'"> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Text.Json/System.Text.Json.sln b/src/libraries/System.Text.Json/System.Text.Json.sln index d26ec6ccd9d..9e8520156a7 100644 --- a/src/libraries/System.Text.Json/System.Text.Json.sln +++ b/src/libraries/System.Text.Json/System.Text.Json.sln @@ -13,17 +13,17 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E2077991-EB83-471C-B17F-72F569FFCE6D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{06F41FE5-B7FC-424B-A721-8CFDA35B95B5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{7909EB27-0D6E-46E6-B9F9-8A1EFD557018}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{C56337BB-8CBC-4EE5-AB4D-8BB0A922813E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{9BCCDA15-8907-4AE3-8871-2F17775DDE4C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration.Roslyn3.11", "gen\System.Text.Json.SourceGeneration.Roslyn3.11.csproj", "{04AEB008-EE4F-44DE-A361-2DBD2D0FD6A4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "gen\System.Text.Json.SourceGeneration.Roslyn3.11.csproj", "{04AEB008-EE4F-44DE-A361-2DBD2D0FD6A4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration.Roslyn4.0", "gen\System.Text.Json.SourceGeneration.Roslyn4.0.csproj", "{6485EED4-C313-4551-9865-8ADCED603629}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "gen\System.Text.Json.SourceGeneration.Roslyn4.0.csproj", "{6485EED4-C313-4551-9865-8ADCED603629}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "ref\System.Text.Json.csproj", "{7015E94D-D20D-48C8-86D7-6A996BE99E0E}" EndProject @@ -31,6 +31,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "src\Sys EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "System.Text.Json.FSharp.Tests", "tests\System.Text.Json.FSharp.Tests\System.Text.Json.FSharp.Tests.fsproj", "{5720BF06-2031-4AD8-B9B4-31A01E27ABB8}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.TestLibrary.Roslyn3.11", "tests\System.Text.Json.SourceGeneration.TestLibrary\System.Text.Json.TestLibrary.Roslyn3.11.csproj", "{5C0CE30B-DD4A-4F7A-87C0-5243F0C86885}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.TestLibrary.Roslyn4.0", "tests\System.Text.Json.SourceGeneration.TestLibrary\System.Text.Json.TestLibrary.Roslyn4.0.csproj", "{FCA21178-0411-45D6-B597-B7BE145CEE33}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration.Roslyn3.11.Tests", "tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj", "{66AD4B7E-CF15-4A8F-8BF8-7E1BC6176D07}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration.Roslyn4.0.Tests", "tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn4.0.Tests.csproj", "{33599A6C-F340-4E1B-9B4D-CB8946C22140}" @@ -47,6 +51,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0371C5D8-D5F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E49881A9-09F6-442F-9E1D-6D87F5F837F1}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F254F143-4704-4432-9995-20D87FA8BF8D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -81,14 +87,14 @@ 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 - {E2077991-EB83-471C-B17F-72F569FFCE6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2077991-EB83-471C-B17F-72F569FFCE6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2077991-EB83-471C-B17F-72F569FFCE6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2077991-EB83-471C-B17F-72F569FFCE6D}.Release|Any CPU.Build.0 = Release|Any CPU - {7909EB27-0D6E-46E6-B9F9-8A1EFD557018}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7909EB27-0D6E-46E6-B9F9-8A1EFD557018}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7909EB27-0D6E-46E6-B9F9-8A1EFD557018}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7909EB27-0D6E-46E6-B9F9-8A1EFD557018}.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 + {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 + {E4B72517-C694-486A-950E-6AB03C651FDC}.Release|Any CPU.Build.0 = Release|Any CPU {C56337BB-8CBC-4EE5-AB4D-8BB0A922813E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C56337BB-8CBC-4EE5-AB4D-8BB0A922813E}.Debug|Any CPU.Build.0 = Debug|Any CPU {C56337BB-8CBC-4EE5-AB4D-8BB0A922813E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -117,6 +123,14 @@ Global {5720BF06-2031-4AD8-B9B4-31A01E27ABB8}.Debug|Any CPU.Build.0 = Debug|Any CPU {5720BF06-2031-4AD8-B9B4-31A01E27ABB8}.Release|Any CPU.ActiveCfg = Release|Any CPU {5720BF06-2031-4AD8-B9B4-31A01E27ABB8}.Release|Any CPU.Build.0 = Release|Any CPU + {5C0CE30B-DD4A-4F7A-87C0-5243F0C86885}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5C0CE30B-DD4A-4F7A-87C0-5243F0C86885}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5C0CE30B-DD4A-4F7A-87C0-5243F0C86885}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5C0CE30B-DD4A-4F7A-87C0-5243F0C86885}.Release|Any CPU.Build.0 = Release|Any CPU + {FCA21178-0411-45D6-B597-B7BE145CEE33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FCA21178-0411-45D6-B597-B7BE145CEE33}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FCA21178-0411-45D6-B597-B7BE145CEE33}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FCA21178-0411-45D6-B597-B7BE145CEE33}.Release|Any CPU.Build.0 = Release|Any CPU {66AD4B7E-CF15-4A8F-8BF8-7E1BC6176D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {66AD4B7E-CF15-4A8F-8BF8-7E1BC6176D07}.Debug|Any CPU.Build.0 = Debug|Any CPU {66AD4B7E-CF15-4A8F-8BF8-7E1BC6176D07}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -144,6 +158,8 @@ Global GlobalSection(NestedProjects) = preSolution {102945CA-3736-4B2C-8E68-242A0B247F2B} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1} {5720BF06-2031-4AD8-B9B4-31A01E27ABB8} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1} + {5C0CE30B-DD4A-4F7A-87C0-5243F0C86885} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1} + {FCA21178-0411-45D6-B597-B7BE145CEE33} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1} {66AD4B7E-CF15-4A8F-8BF8-7E1BC6176D07} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1} {33599A6C-F340-4E1B-9B4D-CB8946C22140} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1} {256A4653-4287-44B3-BDEF-67FC1522ED2F} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1} @@ -152,17 +168,17 @@ Global {73D5739C-E382-4E22-A7D3-B82705C58C74} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} {BE27618A-2916-4269-9AD5-6BC5EDC32B30} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} {4774F56D-16A8-4ABB-8C73-5F57609F1773} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} - {E2077991-EB83-471C-B17F-72F569FFCE6D} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} {C56337BB-8CBC-4EE5-AB4D-8BB0A922813E} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} {7015E94D-D20D-48C8-86D7-6A996BE99E0E} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} {E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} {1C8262DB-7355-40A8-A2EC-4EED7363134A} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} {D05FD93A-BC51-466E-BD56-3F3D6BBE6B06} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} - {7909EB27-0D6E-46E6-B9F9-8A1EFD557018} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} {9BCCDA15-8907-4AE3-8871-2F17775DDE4C} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} - {04AEB008-EE4F-44DE-A361-2DBD2D0FD6A4} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} - {6485EED4-C313-4551-9865-8ADCED603629} = {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} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5868B757-D821-41FC-952E-2113A0519506} diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj index be653156bb2..0373251d6fd 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -330,7 +330,6 @@ System.Text.Json.Nodes.JsonValue</PackageDescription> </ItemGroup> <!-- Application tfms (.NETCoreApp, .NETFramework) need to use the same or higher version of .NETStandard's dependencies. --> <ItemGroup> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> diff --git a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln index 9a276b350dc..a712de2503c 100644 --- a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln +++ b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln @@ -1,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{84AABEC1-5CDA-4AB8-819E-9CA508DB6F39}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{08F0E5F4-BBD5-45CC-BB12-BA37A83AD7B6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B7E3B087-583F-49B0-8820-787CD98E54C7}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Generator", "gen\System.Text.RegularExpressions.Generator.csproj", "{3699C8E2-C354-4AED-81DC-ECBAC3EFEB4B}" EndProject @@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressi EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2ACCCAAB-F0CE-4839-82BD-F174861DEA78}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0D20E771-24BD-4F9E-BBD0-60156E8C44FC}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{15319A22-BC91-407B-A795-334DD05C82A0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D8FD137E-6961-4629-A71A-53394897FE6B}" @@ -31,14 +33,14 @@ 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 - {84AABEC1-5CDA-4AB8-819E-9CA508DB6F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84AABEC1-5CDA-4AB8-819E-9CA508DB6F39}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84AABEC1-5CDA-4AB8-819E-9CA508DB6F39}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84AABEC1-5CDA-4AB8-819E-9CA508DB6F39}.Release|Any CPU.Build.0 = Release|Any CPU - {B7E3B087-583F-49B0-8820-787CD98E54C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7E3B087-583F-49B0-8820-787CD98E54C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7E3B087-583F-49B0-8820-787CD98E54C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7E3B087-583F-49B0-8820-787CD98E54C7}.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 + {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 + {77CDA838-6489-4816-8847-DE2C7F5E1DCE}.Release|Any CPU.Build.0 = Release|Any CPU {3699C8E2-C354-4AED-81DC-ECBAC3EFEB4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3699C8E2-C354-4AED-81DC-ECBAC3EFEB4B}.Debug|Any CPU.Build.0 = Debug|Any CPU {3699C8E2-C354-4AED-81DC-ECBAC3EFEB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -67,10 +69,10 @@ Global {63551298-BFD4-43FC-8465-AC454228B83C} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78} {32ABFCDA-10FD-4A98-A429-145C28021EBE} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78} {8EE1A7C4-3630-4900-8976-9B3ADAFF10DC} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78} - {84AABEC1-5CDA-4AB8-819E-9CA508DB6F39} = {15319A22-BC91-407B-A795-334DD05C82A0} + {08F0E5F4-BBD5-45CC-BB12-BA37A83AD7B6} = {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} - {B7E3B087-583F-49B0-8820-787CD98E54C7} = {D8FD137E-6961-4629-A71A-53394897FE6B} - {3699C8E2-C354-4AED-81DC-ECBAC3EFEB4B} = {D8FD137E-6961-4629-A71A-53394897FE6B} {0409C086-D7CC-43F8-9762-C94FB1E47F5B} = {D8FD137E-6961-4629-A71A-53394897FE6B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln b/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln index cb6554bc880..33950a7caa7 100644 --- a/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln +++ b/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln @@ -1,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F7C8C6AA-EC54-4662-B6D4-8607F3343C0B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{75A28A51-74DA-451C-BF9B-D0167E2CC3DE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{637C634B-A63F-42BD-A223-E257D4389F34}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "ref\System.Threading.AccessControl.csproj", "{6EA32BE1-8B5E-4807-B641-E7556C1E2C9D}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessCont EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5ED4F157-B780-4295-9D2F-1DE86DBCDA24}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C7B6A687-7D71-47EC-AC21-8B8DEA7EF016}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D7D1A40A-E3E6-45DF-82CF-5BEE62109C70}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8F3D0B8C-8814-4A4C-9663-837D46DA0AC6}" @@ -27,14 +29,14 @@ 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 - {F7C8C6AA-EC54-4662-B6D4-8607F3343C0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7C8C6AA-EC54-4662-B6D4-8607F3343C0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7C8C6AA-EC54-4662-B6D4-8607F3343C0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7C8C6AA-EC54-4662-B6D4-8607F3343C0B}.Release|Any CPU.Build.0 = Release|Any CPU - {637C634B-A63F-42BD-A223-E257D4389F34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {637C634B-A63F-42BD-A223-E257D4389F34}.Debug|Any CPU.Build.0 = Debug|Any CPU - {637C634B-A63F-42BD-A223-E257D4389F34}.Release|Any CPU.ActiveCfg = Release|Any CPU - {637C634B-A63F-42BD-A223-E257D4389F34}.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 + {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 + {96AF90CB-B031-4F19-A6F2-957715703954}.Release|Any CPU.Build.0 = Release|Any CPU {6EA32BE1-8B5E-4807-B641-E7556C1E2C9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6EA32BE1-8B5E-4807-B641-E7556C1E2C9D}.Debug|Any CPU.Build.0 = Debug|Any CPU {6EA32BE1-8B5E-4807-B641-E7556C1E2C9D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {7A3FDF55-70D1-42F5-9231-8F7CAB1B7097} = {5ED4F157-B780-4295-9D2F-1DE86DBCDA24} {66D93328-0A8C-44AD-923B-AD3EB69A9518} = {5ED4F157-B780-4295-9D2F-1DE86DBCDA24} - {F7C8C6AA-EC54-4662-B6D4-8607F3343C0B} = {D7D1A40A-E3E6-45DF-82CF-5BEE62109C70} + {75A28A51-74DA-451C-BF9B-D0167E2CC3DE} = {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} - {637C634B-A63F-42BD-A223-E257D4389F34} = {8F3D0B8C-8814-4A4C-9663-837D46DA0AC6} {6A444824-8479-4DB5-8DCA-9F50353ADE29} = {8F3D0B8C-8814-4A4C-9663-837D46DA0AC6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index 7c73b994648..9ead5ade31b 100644 --- a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -76,7 +76,5 @@ System.Security.AccessControl.SemaphoreSecurity</PackageDescription> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln index df39da8489f..fd0fee5e145 100644 --- a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln +++ b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln @@ -1,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D29F8C8C-DC1D-46CD-B584-372AEF5BAECD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{BE5DFFDD-D344-42F8-AE01-EBD893FB3B2F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4569516A-531A-4F61-B887-0429B913CC2D}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels", "ref\System.Threading.Channels.csproj", "{E427C88B-655E-43F9-A0C0-AA54D01BDBDF}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels.T EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{07CE01C8-BDC8-4CED-AA33-6F3B35935CB6}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{42E20B4D-6489-4096-8DC3-A0C20D19B1D6}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F69B62DE-61AD-4978-81C4-C095B62B5B04}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D3FF5D0E-208E-408F-97AD-C81EB31BB115}" @@ -27,14 +29,14 @@ 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 - {D29F8C8C-DC1D-46CD-B584-372AEF5BAECD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D29F8C8C-DC1D-46CD-B584-372AEF5BAECD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D29F8C8C-DC1D-46CD-B584-372AEF5BAECD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D29F8C8C-DC1D-46CD-B584-372AEF5BAECD}.Release|Any CPU.Build.0 = Release|Any CPU - {4569516A-531A-4F61-B887-0429B913CC2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4569516A-531A-4F61-B887-0429B913CC2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4569516A-531A-4F61-B887-0429B913CC2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4569516A-531A-4F61-B887-0429B913CC2D}.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 + {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 + {9158C7E3-284E-4D6F-BA23-B7534683E265}.Release|Any CPU.Build.0 = Release|Any CPU {E427C88B-655E-43F9-A0C0-AA54D01BDBDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E427C88B-655E-43F9-A0C0-AA54D01BDBDF}.Debug|Any CPU.Build.0 = Debug|Any CPU {E427C88B-655E-43F9-A0C0-AA54D01BDBDF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {C1F10802-5F76-472B-B164-C1D181DB5EBC} = {07CE01C8-BDC8-4CED-AA33-6F3B35935CB6} {845BFFC3-14F2-402E-81E5-B487D41B7CD9} = {07CE01C8-BDC8-4CED-AA33-6F3B35935CB6} - {D29F8C8C-DC1D-46CD-B584-372AEF5BAECD} = {F69B62DE-61AD-4978-81C4-C095B62B5B04} + {BE5DFFDD-D344-42F8-AE01-EBD893FB3B2F} = {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} - {4569516A-531A-4F61-B887-0429B913CC2D} = {D3FF5D0E-208E-408F-97AD-C81EB31BB115} {4CFA1610-00D7-4651-82C8-A7504C475837} = {D3FF5D0E-208E-408F-97AD-C81EB31BB115} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj index 16b643f1b52..1b70b7efb71 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -56,7 +56,5 @@ System.Threading.Channel<T></PackageDescription> </ItemGroup> <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> - <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. --> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln index c90bcba9a13..41d9ad1f279 100644 --- a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln +++ b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln @@ -5,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{217A3A01-70DC-4A0D-87C0-04D581B49183}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B3314A3F-0044-4266-8A1D-62759FE403DE}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4741C000-E70 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8B1F1ACE-FD0A-4083-8DE6-8148C541A2CA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D07DC3DB-723F-41C6-99A0-56F395D4D055}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1CC21763-DACE-400F-808F-7B9DCF90DCBA}" EndProject Global @@ -92,42 +90,6 @@ 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 - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|x64.ActiveCfg = Debug|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|x64.Build.0 = Debug|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|x86.ActiveCfg = Debug|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|x86.Build.0 = Debug|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|Any CPU.Build.0 = Release|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|x64.ActiveCfg = Release|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|x64.Build.0 = Release|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|x86.ActiveCfg = Release|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|x86.Build.0 = Release|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Checked|Any CPU.Build.0 = Debug|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Checked|x64.ActiveCfg = Debug|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Checked|x64.Build.0 = Debug|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Checked|x86.ActiveCfg = Debug|Any CPU - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Checked|x86.Build.0 = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|Any CPU.Build.0 = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|x64.ActiveCfg = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|x64.Build.0 = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|x86.ActiveCfg = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|x86.Build.0 = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|Any CPU.ActiveCfg = Release|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|Any CPU.Build.0 = Release|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|x64.ActiveCfg = Release|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|x64.Build.0 = Release|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|x86.ActiveCfg = Release|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|x86.Build.0 = Release|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Checked|Any CPU.Build.0 = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Checked|x64.ActiveCfg = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Checked|x64.Build.0 = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.Checked|x86.ActiveCfg = Debug|Any CPU - {217A3A01-70DC-4A0D-87C0-04D581B49183}.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 @@ -224,14 +186,12 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {2F704A4A-944B-487C-BB11-D66CA63F3B05} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C} - {8BAAF37B-C3C1-4DED-A89A-5513AE866360} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C} - {217A3A01-70DC-4A0D-87C0-04D581B49183} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C} - {B3314A3F-0044-4266-8A1D-62759FE403DE} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C} - {8B4BE458-0DE2-42A8-B7A2-3C82F21BAB23} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C} {A3D9C10B-53A3-483C-8D90-BE7C078B82DF} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C} {A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F} = {8B1F1ACE-FD0A-4083-8DE6-8148C541A2CA} {3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1} = {8B1F1ACE-FD0A-4083-8DE6-8148C541A2CA} - {CE4C0C71-A94E-42B0-B6EA-46710F09B04E} = {1CC21763-DACE-400F-808F-7B9DCF90DCBA} + {8BAAF37B-C3C1-4DED-A89A-5513AE866360} = {D07DC3DB-723F-41C6-99A0-56F395D4D055} + {B3314A3F-0044-4266-8A1D-62759FE403DE} = {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 GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln b/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln index 61a334428d6..e8bb6d50897 100644 --- a/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln +++ b/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln @@ -5,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0D1C7DCB-970D-4099-AC9F-A01E75923EC6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1E52F495-578C-4FDB-86DD-87EAAE0A0BE7}" 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}" @@ -25,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{111B1B5B-A00 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{399BE36D-F2D9-420A-AA09-455D4BF52057}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -43,14 +41,6 @@ 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 - {0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Release|Any CPU.Build.0 = Release|Any CPU - {AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.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 @@ -79,13 +69,11 @@ Global {CAEE0409-CCC3-4EA6-AB54-177FD305D42D} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C} {AE81EE9F-1240-4AF1-BF21-7F451B7859E5} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C} {39DA5B84-ECA2-42A2-BEBD-C056BDB8AD53} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB} - {0D1C7DCB-970D-4099-AC9F-A01E75923EC6} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB} {FD274A80-0D68-48A0-9AC7-279C9E69BC63} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB} {F59F4FD7-EA00-47EA-A09A-6F76CB079F9B} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D} - {AF838F1D-5C1C-472B-B31C-9A3B7507BB4B} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D} - {1E52F495-578C-4FDB-86DD-87EAAE0A0BE7} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D} - {25495BDC-0614-4FAC-B6EA-DF3F0E35A871} = {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} + {25495BDC-0614-4FAC-B6EA-DF3F0E35A871} = {399BE36D-F2D9-420A-AA09-455D4BF52057} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {25036AEF-71B3-4C8A-891F-0350414F9A23} 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 60367aa198f..afd147de504 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,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{620A0DEE-9FA3-4DA2-A174-473249A71978}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{4EFCE35C-DCDF-457D-AAAA-A3768F274405}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{10CE6AF8-EB7B-4735-BCA8-531EEC47D33A}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Dataflow", "ref\System.Threading.Tasks.Dataflow.csproj", "{BD042162-B4E2-45AC-8225-699F25478852}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Data EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D7C6E667-E868-423C-883D-CBDE73BFF66E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{AA3208A1-2A91-46D3-B09C-1A9CCF90235E}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E6ED6A93-5971-4E87-972C-23E80F6E0CFC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D4D4FFCB-0DAF-4CDC-8945-7B31D2197D66}" @@ -27,14 +29,14 @@ 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 - {620A0DEE-9FA3-4DA2-A174-473249A71978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {620A0DEE-9FA3-4DA2-A174-473249A71978}.Debug|Any CPU.Build.0 = Debug|Any CPU - {620A0DEE-9FA3-4DA2-A174-473249A71978}.Release|Any CPU.ActiveCfg = Release|Any CPU - {620A0DEE-9FA3-4DA2-A174-473249A71978}.Release|Any CPU.Build.0 = Release|Any CPU - {10CE6AF8-EB7B-4735-BCA8-531EEC47D33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {10CE6AF8-EB7B-4735-BCA8-531EEC47D33A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {10CE6AF8-EB7B-4735-BCA8-531EEC47D33A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {10CE6AF8-EB7B-4735-BCA8-531EEC47D33A}.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 + {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 + {C4865002-095A-4B99-A737-216DC112ACA4}.Release|Any CPU.Build.0 = Release|Any CPU {BD042162-B4E2-45AC-8225-699F25478852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BD042162-B4E2-45AC-8225-699F25478852}.Debug|Any CPU.Build.0 = Debug|Any CPU {BD042162-B4E2-45AC-8225-699F25478852}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {48428161-C841-43D4-8BD3-195A3D5C36C5} = {D7C6E667-E868-423C-883D-CBDE73BFF66E} {51B191E6-C503-4949-8AD0-CF338FE13ADB} = {D7C6E667-E868-423C-883D-CBDE73BFF66E} - {620A0DEE-9FA3-4DA2-A174-473249A71978} = {E6ED6A93-5971-4E87-972C-23E80F6E0CFC} + {4EFCE35C-DCDF-457D-AAAA-A3768F274405} = {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} - {10CE6AF8-EB7B-4735-BCA8-531EEC47D33A} = {D4D4FFCB-0DAF-4CDC-8945-7B31D2197D66} {EA4AFF05-8124-4D15-A7A3-C731C21728BB} = {D4D4FFCB-0DAF-4CDC-8945-7B31D2197D66} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution 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 701516daced..ac2dab79cb1 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,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{18B4A117-5F89-4AF3-836F-A2D13B31D61E}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{17308AE0-604 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{30ACA65A-DBD9-46CD-9DA4-D7894118EBF8}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{158053CD-684A-4AF7-9DC4-5ADEFC3E79AC}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{EC5157A4-9B43-4FDC-8FEF-8546A6423844}" EndProject Global @@ -92,42 +90,6 @@ 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 - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|x64.ActiveCfg = Debug|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|x64.Build.0 = Debug|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|x86.ActiveCfg = Debug|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|x86.Build.0 = Debug|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|Any CPU.Build.0 = Release|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|x64.ActiveCfg = Release|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|x64.Build.0 = Release|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|x86.ActiveCfg = Release|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|x86.Build.0 = Release|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Checked|Any CPU.Build.0 = Debug|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Checked|x64.ActiveCfg = Debug|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Checked|x64.Build.0 = Debug|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Checked|x86.ActiveCfg = Debug|Any CPU - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Checked|x86.Build.0 = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|x64.ActiveCfg = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|x64.Build.0 = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|x86.ActiveCfg = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|x86.Build.0 = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|Any CPU.Build.0 = Release|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|x64.ActiveCfg = Release|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|x64.Build.0 = Release|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|x86.ActiveCfg = Release|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|x86.Build.0 = Release|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Checked|Any CPU.Build.0 = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Checked|x64.ActiveCfg = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Checked|x64.Build.0 = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Checked|x86.ActiveCfg = Debug|Any CPU - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.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 @@ -224,14 +186,12 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {CB976362-9258-4E98-B8C3-FAE11BDF3AA0} = {17308AE0-6049-4A2A-831C-5EAB57005A53} - {5650548E-4175-4BD3-B23C-11FCB86AD2EF} = {17308AE0-6049-4A2A-831C-5EAB57005A53} - {DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A} = {17308AE0-6049-4A2A-831C-5EAB57005A53} - {18B4A117-5F89-4AF3-836F-A2D13B31D61E} = {17308AE0-6049-4A2A-831C-5EAB57005A53} - {8D2E0DCC-477B-44A4-A64B-775E6D024CD6} = {17308AE0-6049-4A2A-831C-5EAB57005A53} {F67BB87D-2927-4BD4-B21B-5A403B6A2209} = {17308AE0-6049-4A2A-831C-5EAB57005A53} {FFB40D04-17A5-4F9B-BD47-994E5616ABD9} = {30ACA65A-DBD9-46CD-9DA4-D7894118EBF8} {AE779AC7-EC2C-42BE-8E59-A2716799E098} = {30ACA65A-DBD9-46CD-9DA4-D7894118EBF8} - {ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA} = {EC5157A4-9B43-4FDC-8FEF-8546A6423844} + {5650548E-4175-4BD3-B23C-11FCB86AD2EF} = {158053CD-684A-4AF7-9DC4-5ADEFC3E79AC} + {18B4A117-5F89-4AF3-836F-A2D13B31D61E} = {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 GlobalSection(ExtensibilityGlobals) = postSolution 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 bbe7079fbb2..c227c6989ee 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,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{89DF2FDC-F1A0-4A0D-8AED-622862BC35FE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{42742991-84A8-4468-ABE1-BE9523876F5C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A010EA79-A323-460F-B7D9-B0F839179698}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Parallel", "ref\System.Threading.Tasks.Parallel.csproj", "{C757F14B-E6F5-4B89-81A7-4D8D4F3A7F60}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Para EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1BA41F95-8D9C-4C12-8A3A-9D31B27566E8}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6D758B5C-C40A-4179-898E-B459165BF692}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FBC5E558-FC17-4C58-B7F7-798E7CD58448}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A17071C3-99D6-40FF-947C-A15A9695FA91}" @@ -27,14 +29,14 @@ 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 - {89DF2FDC-F1A0-4A0D-8AED-622862BC35FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89DF2FDC-F1A0-4A0D-8AED-622862BC35FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89DF2FDC-F1A0-4A0D-8AED-622862BC35FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89DF2FDC-F1A0-4A0D-8AED-622862BC35FE}.Release|Any CPU.Build.0 = Release|Any CPU - {A010EA79-A323-460F-B7D9-B0F839179698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A010EA79-A323-460F-B7D9-B0F839179698}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A010EA79-A323-460F-B7D9-B0F839179698}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A010EA79-A323-460F-B7D9-B0F839179698}.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 + {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 + {D0267433-C793-4450-94A0-1750388CE9CB}.Release|Any CPU.Build.0 = Release|Any CPU {C757F14B-E6F5-4B89-81A7-4D8D4F3A7F60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C757F14B-E6F5-4B89-81A7-4D8D4F3A7F60}.Debug|Any CPU.Build.0 = Debug|Any CPU {C757F14B-E6F5-4B89-81A7-4D8D4F3A7F60}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {B3656D79-6414-4037-BBF7-B112DE133703} = {1BA41F95-8D9C-4C12-8A3A-9D31B27566E8} {87B76C5B-3A28-455A-AFCC-921FC3615135} = {1BA41F95-8D9C-4C12-8A3A-9D31B27566E8} - {89DF2FDC-F1A0-4A0D-8AED-622862BC35FE} = {FBC5E558-FC17-4C58-B7F7-798E7CD58448} + {42742991-84A8-4468-ABE1-BE9523876F5C} = {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} - {A010EA79-A323-460F-B7D9-B0F839179698} = {A17071C3-99D6-40FF-947C-A15A9695FA91} {8F1FE81C-C15D-459A-8758-8B0853078EA7} = {A17071C3-99D6-40FF-947C-A15A9695FA91} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln b/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln index 255f670ab54..473c3684f41 100644 --- a/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln +++ b/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln @@ -5,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{EAF13385-99A5-463C-9343-CE14241DD5A1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{261E65AA-FCED-4702-8FDE-694E2B029C23}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9BDEA799-400 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6C2B5085-E5A0-4732-90D5-BA35E9702990}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BC4D3352-CF0C-44FA-8829-2845DEA0CC75}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AF511BE2-5550-4D73-921E-500E98B26AA0}" EndProject Global @@ -92,42 +90,6 @@ 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 - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|x64.ActiveCfg = Debug|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|x64.Build.0 = Debug|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|x86.ActiveCfg = Debug|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|x86.Build.0 = Debug|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|Any CPU.Build.0 = Release|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|x64.ActiveCfg = Release|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|x64.Build.0 = Release|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|x86.ActiveCfg = Release|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|x86.Build.0 = Release|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Checked|Any CPU.Build.0 = Debug|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Checked|x64.ActiveCfg = Debug|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Checked|x64.Build.0 = Debug|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Checked|x86.ActiveCfg = Debug|Any CPU - {EAF13385-99A5-463C-9343-CE14241DD5A1}.Checked|x86.Build.0 = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|x64.ActiveCfg = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|x64.Build.0 = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|x86.ActiveCfg = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|x86.Build.0 = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|Any CPU.Build.0 = Release|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|x64.ActiveCfg = Release|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|x64.Build.0 = Release|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|x86.ActiveCfg = Release|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|x86.Build.0 = Release|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Checked|Any CPU.Build.0 = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Checked|x64.ActiveCfg = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Checked|x64.Build.0 = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Checked|x86.ActiveCfg = Debug|Any CPU - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.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 @@ -224,14 +186,12 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {2738C2DB-E488-4EA2-B981-ADB8C520DCA6} = {9BDEA799-400E-4D1B-B34A-5E910B50FA69} - {A0477DE6-08C7-4793-A8B6-9974F2675AC7} = {9BDEA799-400E-4D1B-B34A-5E910B50FA69} - {6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB} = {9BDEA799-400E-4D1B-B34A-5E910B50FA69} - {261E65AA-FCED-4702-8FDE-694E2B029C23} = {9BDEA799-400E-4D1B-B34A-5E910B50FA69} - {25E8CA91-84A5-4917-90A2-5E077734B0B7} = {9BDEA799-400E-4D1B-B34A-5E910B50FA69} {53FBD913-F587-441B-951A-195F65041CF7} = {9BDEA799-400E-4D1B-B34A-5E910B50FA69} {695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7} = {6C2B5085-E5A0-4732-90D5-BA35E9702990} {A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8} = {6C2B5085-E5A0-4732-90D5-BA35E9702990} - {EAF13385-99A5-463C-9343-CE14241DD5A1} = {AF511BE2-5550-4D73-921E-500E98B26AA0} + {A0477DE6-08C7-4793-A8B6-9974F2675AC7} = {BC4D3352-CF0C-44FA-8829-2845DEA0CC75} + {261E65AA-FCED-4702-8FDE-694E2B029C23} = {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 GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln index 683603243ab..88a99214b6c 100644 --- a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln +++ b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln @@ -5,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{EFE01BA2-5A04-4E14-BB16-9C84285C364F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C}" 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}" @@ -29,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{576969A4-D9E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{73AA6FCA-8FDC-41AA-8539-91562296190B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5B2563E3-FF5B-4DAD-A3B0-5E99B5054508}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CC8272C5-AC82-4A51-B88C-018FF4284B25}" EndProject Global @@ -98,42 +96,6 @@ 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 - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|x64.ActiveCfg = Debug|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|x64.Build.0 = Debug|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|x86.ActiveCfg = Debug|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|x86.Build.0 = Debug|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|Any CPU.Build.0 = Release|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|x64.ActiveCfg = Release|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|x64.Build.0 = Release|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|x86.ActiveCfg = Release|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|x86.Build.0 = Release|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Checked|Any CPU.Build.0 = Debug|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Checked|x64.ActiveCfg = Debug|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Checked|x64.Build.0 = Debug|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Checked|x86.ActiveCfg = Debug|Any CPU - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Checked|x86.Build.0 = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|x64.ActiveCfg = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|x64.Build.0 = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|x86.ActiveCfg = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|x86.Build.0 = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|Any CPU.Build.0 = Release|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|x64.ActiveCfg = Release|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|x64.Build.0 = Release|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|x86.ActiveCfg = Release|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|x86.Build.0 = Release|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Checked|Any CPU.Build.0 = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Checked|x64.ActiveCfg = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Checked|x64.Build.0 = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Checked|x86.ActiveCfg = Debug|Any CPU - {EFE01BA2-5A04-4E14-BB16-9C84285C364F}.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 @@ -284,17 +246,15 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {B811926D-CFBB-4C22-80D2-0CCD566D980C} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF} - {566DB44F-5EF1-4421-B09A-F202E76935A9} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF} - {EFE01BA2-5A04-4E14-BB16-9C84285C364F} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF} - {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF} - {678A6F6C-BFF2-46BC-B512-745F32C229F6} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF} {A73DCB15-F3DF-48CB-A4CA-62102E94122C} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF} {BF6A7CA7-DDF9-44D4-AD00-D807765663F9} = {73AA6FCA-8FDC-41AA-8539-91562296190B} {12A6F314-B08D-417D-82EC-0D8799D7C1A2} = {73AA6FCA-8FDC-41AA-8539-91562296190B} {F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE} = {73AA6FCA-8FDC-41AA-8539-91562296190B} {33684F81-6E4B-4E90-A3B5-7C1BC02FF573} = {73AA6FCA-8FDC-41AA-8539-91562296190B} {5093FB10-520B-45A1-942B-82AC0BC4FB3F} = {73AA6FCA-8FDC-41AA-8539-91562296190B} - {891D5917-09B5-4DEF-B9E0-7CB8866B74C9} = {CC8272C5-AC82-4A51-B88C-018FF4284B25} + {566DB44F-5EF1-4421-B09A-F202E76935A9} = {5B2563E3-FF5B-4DAD-A3B0-5E99B5054508} + {A0A9F6A4-E5D7-45E4-B696-73F5DBDE0F0C} = {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 GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln index 8617f00f752..b8f44c2bc5d 100644 --- a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln +++ b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln @@ -5,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{969E8154-9D99-49CB-B435-F5E4936DDE58}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3440C79D-9158-4D66-9018-5194272AAD4B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{1122A1B3-231D-4897-A86A-89433AAC93DF}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3358539E-11F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DB513386-C3B1-4891-92E1-1BE5D38562DC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1445280F-1F07-45C3-93BC-D4025720B5FE}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6A32653B-8FAC-4B01-A0E0-E6379DE90A1A}" EndProject Global @@ -92,42 +90,6 @@ 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 - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|x64.ActiveCfg = Debug|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|x64.Build.0 = Debug|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|x86.ActiveCfg = Debug|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|x86.Build.0 = Debug|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|Any CPU.Build.0 = Release|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|x64.ActiveCfg = Release|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|x64.Build.0 = Release|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|x86.ActiveCfg = Release|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|x86.Build.0 = Release|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Checked|Any CPU.Build.0 = Debug|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Checked|x64.ActiveCfg = Debug|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Checked|x64.Build.0 = Debug|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Checked|x86.ActiveCfg = Debug|Any CPU - {969E8154-9D99-49CB-B435-F5E4936DDE58}.Checked|x86.Build.0 = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|x64.ActiveCfg = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|x64.Build.0 = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|x86.ActiveCfg = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|x86.Build.0 = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Release|Any CPU.Build.0 = Release|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Release|x64.ActiveCfg = Release|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Release|x64.Build.0 = Release|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Release|x86.ActiveCfg = Release|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Release|x86.Build.0 = Release|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Checked|Any CPU.Build.0 = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Checked|x64.ActiveCfg = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Checked|x64.Build.0 = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.Checked|x86.ActiveCfg = Debug|Any CPU - {3440C79D-9158-4D66-9018-5194272AAD4B}.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 @@ -224,14 +186,12 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {BEACD8A1-3C09-450E-931F-561D44986BFB} = {3358539E-11F4-4294-8D94-A9A31E9F47F5} - {54E0AB0F-EB35-49AB-9A38-7C09FD7EC373} = {3358539E-11F4-4294-8D94-A9A31E9F47F5} - {3440C79D-9158-4D66-9018-5194272AAD4B} = {3358539E-11F4-4294-8D94-A9A31E9F47F5} - {1122A1B3-231D-4897-A86A-89433AAC93DF} = {3358539E-11F4-4294-8D94-A9A31E9F47F5} - {3A5BA59D-C1B6-492F-BF2C-FDE2C274E9B3} = {3358539E-11F4-4294-8D94-A9A31E9F47F5} {53A0D29E-8633-4FF8-AB0E-86EF331DD379} = {3358539E-11F4-4294-8D94-A9A31E9F47F5} {CD477FC8-AF27-46A2-A451-4A2D4C11600D} = {DB513386-C3B1-4891-92E1-1BE5D38562DC} {71ACA28C-A4F1-4A07-A1B3-39DB86C11A75} = {DB513386-C3B1-4891-92E1-1BE5D38562DC} - {969E8154-9D99-49CB-B435-F5E4936DDE58} = {6A32653B-8FAC-4B01-A0E0-E6379DE90A1A} + {54E0AB0F-EB35-49AB-9A38-7C09FD7EC373} = {1445280F-1F07-45C3-93BC-D4025720B5FE} + {1122A1B3-231D-4897-A86A-89433AAC93DF} = {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 GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Threading.Timer/System.Threading.Timer.sln b/src/libraries/System.Threading.Timer/System.Threading.Timer.sln index 930ddaeeefc..c5cccc4cb7e 100644 --- a/src/libraries/System.Threading.Timer/System.Threading.Timer.sln +++ b/src/libraries/System.Threading.Timer/System.Threading.Timer.sln @@ -5,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{98FBF74D-9544-4B64-B126-49FA876D62EC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{814B2F8C-0070-4625-B998-9F92EA14F57F}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DE255038-9D6 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0149D5FD-7BFC-4421-8B5E-74FD45D9B3D7}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F0CC3A5B-3AF1-4351-982F-0EAB2D705A55}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CDBD0CE5-05CC-42B7-B111-FA46C0EEB657}" EndProject Global @@ -92,42 +90,6 @@ 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 - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|x64.ActiveCfg = Debug|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|x64.Build.0 = Debug|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|x86.ActiveCfg = Debug|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|x86.Build.0 = Debug|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|Any CPU.Build.0 = Release|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|x64.ActiveCfg = Release|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|x64.Build.0 = Release|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|x86.ActiveCfg = Release|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|x86.Build.0 = Release|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Checked|Any CPU.Build.0 = Debug|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Checked|x64.ActiveCfg = Debug|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Checked|x64.Build.0 = Debug|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Checked|x86.ActiveCfg = Debug|Any CPU - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Checked|x86.Build.0 = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|x64.ActiveCfg = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|x64.Build.0 = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|x86.ActiveCfg = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|x86.Build.0 = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|Any CPU.Build.0 = Release|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|x64.ActiveCfg = Release|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|x64.Build.0 = Release|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|x86.ActiveCfg = Release|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|x86.Build.0 = Release|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Checked|Any CPU.Build.0 = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Checked|x64.ActiveCfg = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Checked|x64.Build.0 = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.Checked|x86.ActiveCfg = Debug|Any CPU - {98FBF74D-9544-4B64-B126-49FA876D62EC}.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 @@ -224,14 +186,12 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {74D4C464-F319-4A9D-8F09-C50FDBA1547A} = {DE255038-9D63-46EB-8AD0-A508EB5B76C7} - {629ACB77-0503-4501-8AD5-E574E3F498E6} = {DE255038-9D63-46EB-8AD0-A508EB5B76C7} - {98FBF74D-9544-4B64-B126-49FA876D62EC} = {DE255038-9D63-46EB-8AD0-A508EB5B76C7} - {814B2F8C-0070-4625-B998-9F92EA14F57F} = {DE255038-9D63-46EB-8AD0-A508EB5B76C7} - {1B33BE1F-D914-465A-9E4D-460F22E3CB81} = {DE255038-9D63-46EB-8AD0-A508EB5B76C7} {2B942D1B-20DE-427E-9D46-F1C513C7FFF5} = {DE255038-9D63-46EB-8AD0-A508EB5B76C7} {567E9CC8-5751-4786-BCC6-C2A6C38044DF} = {0149D5FD-7BFC-4421-8B5E-74FD45D9B3D7} {DAB761D6-EDD5-4F57-9BDE-E26589057403} = {0149D5FD-7BFC-4421-8B5E-74FD45D9B3D7} - {DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C} = {CDBD0CE5-05CC-42B7-B111-FA46C0EEB657} + {629ACB77-0503-4501-8AD5-E574E3F498E6} = {F0CC3A5B-3AF1-4351-982F-0EAB2D705A55} + {814B2F8C-0070-4625-B998-9F92EA14F57F} = {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 GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Threading/System.Threading.sln b/src/libraries/System.Threading/System.Threading.sln index fcd6d550663..67c7260d0fc 100644 --- a/src/libraries/System.Threading/System.Threading.sln +++ b/src/libraries/System.Threading/System.Threading.sln @@ -5,10 +5,6 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{120AAA2F-6798-4C03-BFEB-656466A78B04}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B2FDC017-1B69-472E-855A-87F519D5AB9C}" 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}" @@ -23,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C50DDA85-E39 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CCC80DF2-8B4E-497C-84A9-4E6344294566}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A928B9C7-28EC-4D20-9A63-87221C52EC87}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BEFD8C2C-3355-40A5-8C06-3CE0BFB66C36}" EndProject Global @@ -92,42 +90,6 @@ 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 - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|x64.ActiveCfg = Debug|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|x64.Build.0 = Debug|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|x86.ActiveCfg = Debug|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|x86.Build.0 = Debug|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|Any CPU.Build.0 = Release|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|x64.ActiveCfg = Release|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|x64.Build.0 = Release|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|x86.ActiveCfg = Release|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|x86.Build.0 = Release|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Checked|Any CPU.Build.0 = Debug|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Checked|x64.ActiveCfg = Debug|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Checked|x64.Build.0 = Debug|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Checked|x86.ActiveCfg = Debug|Any CPU - {120AAA2F-6798-4C03-BFEB-656466A78B04}.Checked|x86.Build.0 = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|x64.ActiveCfg = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|x64.Build.0 = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|x86.ActiveCfg = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|x86.Build.0 = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|Any CPU.Build.0 = Release|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|x64.ActiveCfg = Release|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|x64.Build.0 = Release|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|x86.ActiveCfg = Release|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|x86.Build.0 = Release|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Checked|Any CPU.Build.0 = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Checked|x64.ActiveCfg = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Checked|x64.Build.0 = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Checked|x86.ActiveCfg = Debug|Any CPU - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.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 @@ -224,14 +186,12 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {1F14F4DD-AE65-407B-9E10-F5786A847AD6} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3} - {AB7F1F45-5C20-40C7-B6DA-192B37012DD8} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3} - {2CE21C30-5734-42DA-BB23-E72AD4F15F3F} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3} - {B2FDC017-1B69-472E-855A-87F519D5AB9C} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3} - {155B2ACA-D7B6-472E-90F9-5F68E62F7432} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3} {F4D0710C-6A53-44F9-A28B-63F008FEF808} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3} {387778C0-0405-4FE2-9D85-034254EAAD46} = {CCC80DF2-8B4E-497C-84A9-4E6344294566} {3DD929D8-346F-4CF3-B157-22E052F73A91} = {CCC80DF2-8B4E-497C-84A9-4E6344294566} - {120AAA2F-6798-4C03-BFEB-656466A78B04} = {BEFD8C2C-3355-40A5-8C06-3CE0BFB66C36} + {AB7F1F45-5C20-40C7-B6DA-192B37012DD8} = {A928B9C7-28EC-4D20-9A63-87221C52EC87} + {B2FDC017-1B69-472E-855A-87F519D5AB9C} = {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 GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Transactions.Local/System.Transactions.Local.sln b/src/libraries/System.Transactions.Local/System.Transactions.Local.sln index 85dcf471aba..4884c38e533 100644 --- a/src/libraries/System.Transactions.Local/System.Transactions.Local.sln +++ b/src/libraries/System.Transactions.Local/System.Transactions.Local.sln @@ -1,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{EA11DEEB-119C-418F-A954-4A0067504025}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{B847CF9D-AEB7-4BD8-A2E3-F482CF9B0110}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Transactions.Local", "ref\System.Transactions.Local.csproj", "{0C886713-72D7-43C7-A1BB-72CD0F8430D2}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Transactions.Local.T EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E66BBFB5-F07D-4986-89C0-F0E395DD5BA1}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2ECC9D1A-2EF1-4411-98D1-AFFCDAAF9D05}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B4E1F144-E017-4E02-8320-DB7467E42BF8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9D6D84CE-3891-482B-B7C0-0089CF93CF45}" @@ -27,14 +29,14 @@ 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 - {EA11DEEB-119C-418F-A954-4A0067504025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA11DEEB-119C-418F-A954-4A0067504025}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA11DEEB-119C-418F-A954-4A0067504025}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA11DEEB-119C-418F-A954-4A0067504025}.Release|Any CPU.Build.0 = Release|Any CPU - {B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5}.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 + {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 + {193FBAA0-BAE2-484A-BB0E-1ADDDC810FC9}.Release|Any CPU.Build.0 = Release|Any CPU {0C886713-72D7-43C7-A1BB-72CD0F8430D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0C886713-72D7-43C7-A1BB-72CD0F8430D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C886713-72D7-43C7-A1BB-72CD0F8430D2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {B67D04B7-C5ED-44ED-8DB3-8AD788232A5C} = {E66BBFB5-F07D-4986-89C0-F0E395DD5BA1} {C5519C4C-69AF-4437-8594-D2A019119988} = {E66BBFB5-F07D-4986-89C0-F0E395DD5BA1} - {EA11DEEB-119C-418F-A954-4A0067504025} = {B4E1F144-E017-4E02-8320-DB7467E42BF8} + {B847CF9D-AEB7-4BD8-A2E3-F482CF9B0110} = {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} - {B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5} = {9D6D84CE-3891-482B-B7C0-0089CF93CF45} {6BFF19CB-C412-4D12-AA55-68D61F69C4F7} = {9D6D84CE-3891-482B-B7C0-0089CF93CF45} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.ValueTuple/System.ValueTuple.sln b/src/libraries/System.ValueTuple/System.ValueTuple.sln index c23679f0449..7da32965a4f 100644 --- a/src/libraries/System.ValueTuple/System.ValueTuple.sln +++ b/src/libraries/System.ValueTuple/System.ValueTuple.sln @@ -1,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0405F77B-A8AE-47A9-9880-68B7A238DB21}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{A217321E-22DB-49B3-BDCC-50194251E0DB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{63D5BFEA-99F5-4DAF-8793-5B0C0615B210}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ValueTuple", "ref\System.ValueTuple.csproj", "{F48CCB0E-7FA3-490A-BCF0-9918C496D3B1}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ValueTuple.Tests", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{39C86725-ED47-4B56-A20D-E6F21D1B1392}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{84579360-4D1F-4415-B8D0-EA1B17DA46E8}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{EEFB1DA3-0394-4185-B071-D2B98DE083B7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{14C7742D-E5CB-4FB0-ABB6-C5F57AF130D5}" @@ -27,14 +29,14 @@ 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 - {0405F77B-A8AE-47A9-9880-68B7A238DB21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0405F77B-A8AE-47A9-9880-68B7A238DB21}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0405F77B-A8AE-47A9-9880-68B7A238DB21}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0405F77B-A8AE-47A9-9880-68B7A238DB21}.Release|Any CPU.Build.0 = Release|Any CPU - {63D5BFEA-99F5-4DAF-8793-5B0C0615B210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63D5BFEA-99F5-4DAF-8793-5B0C0615B210}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63D5BFEA-99F5-4DAF-8793-5B0C0615B210}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63D5BFEA-99F5-4DAF-8793-5B0C0615B210}.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 + {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 + {4600DD8A-9304-471B-96E7-D5AD346AE33A}.Release|Any CPU.Build.0 = Release|Any CPU {F48CCB0E-7FA3-490A-BCF0-9918C496D3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F48CCB0E-7FA3-490A-BCF0-9918C496D3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {F48CCB0E-7FA3-490A-BCF0-9918C496D3B1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {E7F22DF6-4869-4B34-BCFA-D007FE89616C} = {39C86725-ED47-4B56-A20D-E6F21D1B1392} {3070EAA5-CBA9-4359-844B-2EFCDDC37020} = {39C86725-ED47-4B56-A20D-E6F21D1B1392} - {0405F77B-A8AE-47A9-9880-68B7A238DB21} = {EEFB1DA3-0394-4185-B071-D2B98DE083B7} + {A217321E-22DB-49B3-BDCC-50194251E0DB} = {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} - {63D5BFEA-99F5-4DAF-8793-5B0C0615B210} = {14C7742D-E5CB-4FB0-ABB6-C5F57AF130D5} {F4EDEAED-F616-41EE-9FBA-76986DCDB528} = {14C7742D-E5CB-4FB0-ABB6-C5F57AF130D5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln b/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln index b7ce8dbb4bb..f678dd8d715 100644 --- a/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln +++ b/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln @@ -1,9 +1,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{2529A763-7FF2-470F-8B61-B687B739B756}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{6D37EFFB-117B-42D9-A961-17AF9EACE98D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{FA4BA62E-70F4-4280-A756-0E4046A5B365}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Web.HttpUtility", "ref\System.Web.HttpUtility.csproj", "{063B8BE1-1713-40FE-BD22-A258FD50108E}" EndProject @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Web.HttpUtility.Test EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5A13596E-F762-470F-9B2C-92227CC6FF3F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DB94D23F-DB79-455A-9C55-37403C9BE9F6}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E29510E3-01F1-4F13-885C-95690B2D2FDC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{36DE8D3F-5AAF-4464-A544-AF32A37307F5}" @@ -27,14 +29,14 @@ 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 - {2529A763-7FF2-470F-8B61-B687B739B756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2529A763-7FF2-470F-8B61-B687B739B756}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2529A763-7FF2-470F-8B61-B687B739B756}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2529A763-7FF2-470F-8B61-B687B739B756}.Release|Any CPU.Build.0 = Release|Any CPU - {FA4BA62E-70F4-4280-A756-0E4046A5B365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA4BA62E-70F4-4280-A756-0E4046A5B365}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA4BA62E-70F4-4280-A756-0E4046A5B365}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA4BA62E-70F4-4280-A756-0E4046A5B365}.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 + {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 + {02855E32-AB9B-4893-A9E3-50620FCA1287}.Release|Any CPU.Build.0 = Release|Any CPU {063B8BE1-1713-40FE-BD22-A258FD50108E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {063B8BE1-1713-40FE-BD22-A258FD50108E}.Debug|Any CPU.Build.0 = Debug|Any CPU {063B8BE1-1713-40FE-BD22-A258FD50108E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,9 +56,9 @@ Global GlobalSection(NestedProjects) = preSolution {DE086FBB-952B-491A-A59C-733C33682562} = {5A13596E-F762-470F-9B2C-92227CC6FF3F} {BA3C5AE7-937C-47E1-B861-1F149499889F} = {5A13596E-F762-470F-9B2C-92227CC6FF3F} - {2529A763-7FF2-470F-8B61-B687B739B756} = {E29510E3-01F1-4F13-885C-95690B2D2FDC} + {6D37EFFB-117B-42D9-A961-17AF9EACE98D} = {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} - {FA4BA62E-70F4-4280-A756-0E4046A5B365} = {36DE8D3F-5AAF-4464-A544-AF32A37307F5} {C294097C-8171-4FA2-9C58-11A7FE3BEBDA} = {36DE8D3F-5AAF-4464-A544-AF32A37307F5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln index 7db2b54a15b..e59fa75336b 100644 --- a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln +++ b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln @@ -9,9 +9,9 @@ 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}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FD006B85-C406-4F32-8349-038B1CDA1FBA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{7686BAB8-AF68-4E0B-83D9-5090D4BB520A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DEC4B7DB-8F6C-4228-AD22-16BEBC125C91}" +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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "ref\System.Windows.Extensions.csproj", "{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}" EndProject @@ -25,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C881B8F0-59D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{099F43C3-B397-4871-AA29-0B32869E7B48}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{45BD3F1C-C44C-484B-8759-41BFCA7CEFF8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,14 +53,14 @@ 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 - {FD006B85-C406-4F32-8349-038B1CDA1FBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD006B85-C406-4F32-8349-038B1CDA1FBA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD006B85-C406-4F32-8349-038B1CDA1FBA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD006B85-C406-4F32-8349-038B1CDA1FBA}.Release|Any CPU.Build.0 = Release|Any CPU - {DEC4B7DB-8F6C-4228-AD22-16BEBC125C91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DEC4B7DB-8F6C-4228-AD22-16BEBC125C91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEC4B7DB-8F6C-4228-AD22-16BEBC125C91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DEC4B7DB-8F6C-4228-AD22-16BEBC125C91}.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 + {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 + {B5485369-6E0E-4F8E-AF41-FA9583C7B1CA}.Release|Any CPU.Build.0 = Release|Any CPU {AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU {AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -80,12 +82,12 @@ Global {5CE6447B-ECCE-461C-918D-A37A7ACDF2AC} = {2B702044-D081-480E-877C-6CD7A7BDC726} {2518617E-3EFC-4CD1-AF86-D7115B5065B0} = {C881B8F0-59DE-411B-AA11-2729C3273BE2} {DDAEB258-71D9-4D26-A6A4-67F5CC8D77DE} = {C881B8F0-59DE-411B-AA11-2729C3273BE2} - {FD006B85-C406-4F32-8349-038B1CDA1FBA} = {C881B8F0-59DE-411B-AA11-2729C3273BE2} {AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B} = {C881B8F0-59DE-411B-AA11-2729C3273BE2} {63747E82-DCD9-445E-A20E-753B1A6D603B} = {099F43C3-B397-4871-AA29-0B32869E7B48} {532CAA5E-15F7-4E76-9EBC-B08C56390172} = {099F43C3-B397-4871-AA29-0B32869E7B48} - {DEC4B7DB-8F6C-4228-AD22-16BEBC125C91} = {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} + {B5485369-6E0E-4F8E-AF41-FA9583C7B1CA} = {45BD3F1C-C44C-484B-8759-41BFCA7CEFF8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {26319C28-068C-4C45-9692-D516A03AA6F0} diff --git a/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln b/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln index 3bb7f568dcb..3ea385d0eee 100644 --- a/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln +++ b/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.ReaderWriter", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{311C66CC-47AC-4965-B704-3C62E57FE29D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DD1FA45A-B14C-49B5-87C8-1760B478FE91}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6AA53AA1-786A-4B35-B1C5-9D3B2EC10CF1}" EndProject Global @@ -45,9 +47,9 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {4886A8C5-3546-459A-8800-ED0DA91C6B15} = {311C66CC-47AC-4965-B704-3C62E57FE29D} - {C7345EB2-E950-4A80-B6E6-C72C0845CDC1} = {311C66CC-47AC-4965-B704-3C62E57FE29D} - {640CCB13-BBC5-4B1A-90ED-87DA28BCA4AC} = {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} + {640CCB13-BBC5-4B1A-90ED-87DA28BCA4AC} = {DD1FA45A-B14C-49B5-87C8-1760B478FE91} {2FE5F437-4CE1-4A27-8547-B950F8043D89} = {6AA53AA1-786A-4B35-B1C5-9D3B2EC10CF1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln b/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln index 418a450d04a..f7c8741054a 100644 --- a/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln +++ b/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XDocument", "src EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AFC9144B-DAD7-470E-B068-C17C24862D23}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{74D73470-4D01-4B7F-A809-D406E7474807}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8F3CD562-EA5E-4DD1-8B30-E6BA65887115}" EndProject Global @@ -52,9 +54,9 @@ Global GlobalSection(NestedProjects) = preSolution {09DBC219-3DE1-40E1-ABD2-CD972410F03E} = {AFC9144B-DAD7-470E-B068-C17C24862D23} {CE19D781-5542-4024-9829-FE589BA93146} = {AFC9144B-DAD7-470E-B068-C17C24862D23} - {1F4C5C15-188B-478F-81C6-73A503F9AD16} = {AFC9144B-DAD7-470E-B068-C17C24862D23} - {AC583FDE-8E90-4EDC-A35E-1E39704E465D} = {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} + {AC583FDE-8E90-4EDC-A35E-1E39704E465D} = {74D73470-4D01-4B7F-A809-D406E7474807} {1516AD95-61E7-40F6-A9A8-59A6E8A0467A} = {8F3CD562-EA5E-4DD1-8B30-E6BA65887115} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution 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 b0c16f5d166..f53cb25ff32 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 @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.XDocument" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7C3C9BDE-3FF9-4B26-BACB-59EB827A5C0C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{21CFCBC2-EE04-43D0-8432-6B4B4DA770F1}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{47B3DDCB-3A95-4315-9D49-A2653C6F3A17}" EndProject Global @@ -52,9 +54,9 @@ Global GlobalSection(NestedProjects) = preSolution {A03326C2-C437-44C6-91C5-07AA8F24D51C} = {7C3C9BDE-3FF9-4B26-BACB-59EB827A5C0C} {C1BE1D97-D078-4882-A772-C3CA11FD1F73} = {7C3C9BDE-3FF9-4B26-BACB-59EB827A5C0C} - {AAE777AF-5C13-4C6E-BB28-95A846442BD9} = {7C3C9BDE-3FF9-4B26-BACB-59EB827A5C0C} - {0E9E4E11-BBF5-42B0-AAAF-2C5C2197A4B6} = {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} + {0E9E4E11-BBF5-42B0-AAAF-2C5C2197A4B6} = {21CFCBC2-EE04-43D0-8432-6B4B4DA770F1} {E0E5B798-30CC-4D39-B164-C009141E2ABC} = {47B3DDCB-3A95-4315-9D49-A2653C6F3A17} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Xml.XPath/System.Xml.XPath.sln b/src/libraries/System.Xml.XPath/System.Xml.XPath.sln index 0a77a87666b..6bba5da9884 100644 --- a/src/libraries/System.Xml.XPath/System.Xml.XPath.sln +++ b/src/libraries/System.Xml.XPath/System.Xml.XPath.sln @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath", "src\Sys EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{73688A49-11B7-47C8-BF09-A6C1C11EA0BD}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{543F6A8C-B245-464C-A7F5-50D5A1369909}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1EF0B525-2611-41AB-AA69-28A1B9689C3A}" EndProject Global @@ -45,9 +47,9 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {B7D48F78-4580-4398-A93F-FD02A15AD0BD} = {73688A49-11B7-47C8-BF09-A6C1C11EA0BD} - {667113D9-989B-44F7-81B2-F0326066B50F} = {73688A49-11B7-47C8-BF09-A6C1C11EA0BD} - {F02C927A-92DA-4212-A228-EE4E82317723} = {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} + {F02C927A-92DA-4212-A228-EE4E82317723} = {543F6A8C-B245-464C-A7F5-50D5A1369909} {38040AE0-59E4-46CE-861D-A33A383BB0FC} = {1EF0B525-2611-41AB-AA69-28A1B9689C3A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln b/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln index b4ee46ba08c..e2a4d0f2031 100644 --- a/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln +++ b/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlDocument", "s EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9EB72201-88D9-48A5-858D-82F01B2382B6}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{47CB5391-D9FA-4645-B2B3-805468A86893}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A6E661CC-CFD6-4866-BE5B-59ECB823DC70}" EndProject Global @@ -45,9 +47,9 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {733E5502-5F1A-4ECC-8C44-0E057B11437D} = {9EB72201-88D9-48A5-858D-82F01B2382B6} - {4651410A-D857-456F-9ECC-5E195A3AC101} = {9EB72201-88D9-48A5-858D-82F01B2382B6} - {AE65C993-5ED0-4267-A2E8-95FDBE42088A} = {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} + {AE65C993-5ED0-4267-A2E8-95FDBE42088A} = {47CB5391-D9FA-4645-B2B3-805468A86893} {9FA44EA8-BEDA-412E-A366-9334FDBA77A9} = {A6E661CC-CFD6-4866-BE5B-59ECB823DC70} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln b/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln index b7d38c0d836..ac8031d5d0f 100644 --- a/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln +++ b/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F0B2F254-B3E6-4BAA-8C92-2373990CF48B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8B996FD2-F7BF-4196-9468-998117E8C7C1}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E0C34B2E-D8CC-4A13-9635-3FD9AF37EC9B}" EndProject Global @@ -45,9 +47,9 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {EF514C0C-ECA7-419A-BDED-A6735FEA16F9} = {F0B2F254-B3E6-4BAA-8C92-2373990CF48B} - {EAD93EEB-8431-45C4-B147-EAC2BA0576B2} = {F0B2F254-B3E6-4BAA-8C92-2373990CF48B} - {91E43C52-718D-46CE-B832-230A3730A32F} = {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} + {91E43C52-718D-46CE-B832-230A3730A32F} = {8B996FD2-F7BF-4196-9468-998117E8C7C1} {A463D0F1-1814-4276-B7A9-59780C755D0A} = {E0C34B2E-D8CC-4A13-9635-3FD9AF37EC9B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/libraries/src.proj b/src/libraries/src.proj index 35479848aae..5929fa37ff0 100644 --- a/src/libraries/src.proj +++ b/src/libraries/src.proj @@ -28,8 +28,7 @@ <NonNetCoreAppProject Include="@(_allSrc)" Exclude="@(NetCoreAppLibrary->'%(Identity)\src\%(Identity).csproj'); - $(MSBuildThisFileDirectory)Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj; - $(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> + $(MSBuildThisFileDirectory)Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj" /> <!-- During an official build, build the identity package only in the allconfigurations build, otherwise always. --> <NonNetCoreAppProject Include="$(MSBuildThisFileDirectory)*\pkg\runtime.native.*.proj" Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' or '$(BuildAllConfigurations)' == 'true'" /> <!-- During an official Build, build the rid specific package matching the OutputRid only outside of an allconfigurations build and only when targeting the CoreCLR runtime. diff --git a/src/mono/System.Private.CoreLib/src/System/Array.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Array.Mono.cs index d7fc8ed5aa2..81d381fe2bf 100644 --- a/src/mono/System.Private.CoreLib/src/System/Array.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Array.Mono.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Internal.Runtime.CompilerServices; using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; diff --git a/src/mono/System.Private.CoreLib/src/System/Buffer.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Buffer.Mono.cs index 2326959c261..8ab237f1809 100644 --- a/src/mono/System.Private.CoreLib/src/System/Buffer.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Buffer.Mono.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/mono/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.Mono.cs index dcb11c34701..bf9564fc11a 100644 --- a/src/mono/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.PortableThreadPool.NativeSinks.Mono.cs @@ -5,7 +5,6 @@ using System.Threading; using System.Diagnostics.Tracing; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Internal.Runtime.CompilerServices; namespace System.Diagnostics.Tracing { diff --git a/src/mono/System.Private.CoreLib/src/System/GC.Mono.cs b/src/mono/System.Private.CoreLib/src/System/GC.Mono.cs index a92ebab4992..0ca9fc56fa5 100644 --- a/src/mono/System.Private.CoreLib/src/System/GC.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/GC.Mono.cs @@ -3,7 +3,6 @@ using System.Runtime; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; using System.Diagnostics.Tracing; namespace System diff --git a/src/mono/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.Mono.cs index bbb27fb36a1..0ee6d34682e 100644 --- a/src/mono/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.Mono.cs @@ -1,9 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics.CodeAnalysis; -using System.Runtime.Serialization; -using Internal.Runtime.CompilerServices; using System.Diagnostics.Tracing; +using System.Runtime.Serialization; namespace System.Runtime.CompilerServices { diff --git a/src/mono/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.Mono.cs index 7d7e14c3393..6470142b213 100644 --- a/src/mono/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Runtime/InteropServices/MemoryMarshal.Mono.cs @@ -3,7 +3,6 @@ using System.Runtime.CompilerServices; using System.Runtime.Versioning; -using Internal.Runtime.CompilerServices; namespace System.Runtime.InteropServices { diff --git a/src/mono/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.Mono.cs index 32924c5486d..643c296d71e 100644 --- a/src/mono/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.Mono.cs @@ -7,7 +7,6 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; -using Internal.Runtime.CompilerServices; using Mono; namespace System.Runtime.Loader diff --git a/src/mono/System.Private.CoreLib/src/System/Threading/Interlocked.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Threading/Interlocked.Mono.cs index 47692e79a7d..46a56fa06ff 100644 --- a/src/mono/System.Private.CoreLib/src/System/Threading/Interlocked.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Threading/Interlocked.Mono.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; using System.Diagnostics.CodeAnalysis; namespace System.Threading diff --git a/src/mono/System.Private.CoreLib/src/System/TypedReference.Mono.cs b/src/mono/System.Private.CoreLib/src/System/TypedReference.Mono.cs index 29d3cfcadcd..5dffd483d6b 100644 --- a/src/mono/System.Private.CoreLib/src/System/TypedReference.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/TypedReference.Mono.cs @@ -3,7 +3,6 @@ using System.Reflection; using System.Runtime.CompilerServices; -using Internal.Runtime.CompilerServices; namespace System { diff --git a/src/mono/mono/mini/interp/transform.c b/src/mono/mono/mini/interp/transform.c index ba5075abd81..f1f6286b358 100644 --- a/src/mono/mono/mini/interp/transform.c +++ b/src/mono/mono/mini/interp/transform.c @@ -2285,17 +2285,14 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas td->ip += 5; return TRUE; } - } else if (((in_corlib && !strcmp (klass_name_space, "Internal.Runtime.CompilerServices")) - || !strcmp (klass_name_space, "System.Runtime.CompilerServices")) - && !strcmp (klass_name, "Unsafe")) { + } else if (in_corlib && !strcmp (klass_name_space, "System.Runtime.CompilerServices") && !strcmp (klass_name, "Unsafe")) { if (!strcmp (tm, "AddByteOffset")) #if SIZEOF_VOID_P == 4 *op = MINT_ADD_I4; #else *op = MINT_ADD_I8; #endif - else if (!strcmp (tm, "ByteOffset")) - *op = MINT_INTRINS_UNSAFE_BYTE_OFFSET; + else if (!strcmp (tm, "As") || !strcmp (tm, "AsRef")) *op = MINT_MOV_P; else if (!strcmp (tm, "AsPointer")) { @@ -2303,6 +2300,44 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas SET_SIMPLE_TYPE (td->sp - 1, STACK_TYPE_MP); td->ip += 5; return TRUE; + } else if (!strcmp (tm, "AreSame")) { + *op = MINT_CEQ_P; + } else if (!strcmp (tm, "ByteOffset")) { + *op = MINT_INTRINS_UNSAFE_BYTE_OFFSET; + } else if (!strcmp (tm, "Unbox")) { + MonoGenericContext *ctx = mono_method_get_context (target_method); + g_assert (ctx); + g_assert (ctx->method_inst); + g_assert (ctx->method_inst->type_argc == 1); + + MonoType *type = ctx->method_inst->type_argv [0]; + MonoClass *klass = mono_class_from_mono_type_internal (type); + + interp_add_ins (td, MINT_UNBOX); + td->sp--; + interp_ins_set_sreg (td->last_ins, td->sp [0].local); + push_simple_type (td, STACK_TYPE_MP); + interp_ins_set_dreg (td->last_ins, td->sp [-1].local); + td->last_ins->data [0] = get_data_item_index (td, klass); + + td->ip += 5; + return TRUE; + } else if (!strcmp (tm, "Copy")) { + MonoGenericContext *ctx = mono_method_get_context (target_method); + g_assert (ctx); + g_assert (ctx->method_inst); + g_assert (ctx->method_inst->type_argc == 1); + + MonoType *type = ctx->method_inst->type_argv [0]; + MonoClass *klass = mono_class_from_mono_type_internal (type); + + interp_emit_ldobj (td, klass); + interp_emit_stobj (td, klass); + + td->ip += 5; + return TRUE; + } else if (!strcmp (tm, "CopyBlockUnaligned") || !strcmp (tm, "CopyBlock")) { + *op = MINT_CPBLK; } else if (!strcmp (tm, "IsAddressLessThan")) { MonoGenericContext *ctx = mono_method_get_context (target_method); g_assert (ctx); @@ -2317,6 +2352,19 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas interp_ins_set_dreg (td->last_ins, td->sp [-1].local); td->ip += 5; return TRUE; + } else if (!strcmp (tm, "IsAddressGreaterThan")) { + MonoGenericContext *ctx = mono_method_get_context (target_method); + g_assert (ctx); + g_assert (ctx->method_inst); + g_assert (ctx->method_inst->type_argc == 1); + + interp_add_ins (td, MINT_CGT_UN_P); + td->sp -= 2; + interp_ins_set_sregs2 (td->last_ins, td->sp [0].local, td->sp [1].local); + push_simple_type (td, STACK_TYPE_I4); + interp_ins_set_dreg (td->last_ins, td->sp [-1].local); + td->ip += 5; + return TRUE; } else if (!strcmp (tm, "SizeOf")) { MonoGenericContext *ctx = mono_method_get_context (target_method); g_assert (ctx); @@ -2331,11 +2379,15 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas interp_ins_set_dreg (td->last_ins, td->sp [-1].local); td->ip += 5; return TRUE; - } else if (!strcmp (tm, "AreSame")) { - *op = MINT_CEQ_P; } else if (!strcmp (tm, "SkipInit")) { *op = MINT_NOP; - } else if (!strcmp (tm, "InitBlockUnaligned")) { + } else if (!strcmp (tm, "SubtractByteOffset")) { +#if SIZEOF_VOID_P == 4 + *op = MINT_SUB_I4; +#else + *op = MINT_SUB_I8; +#endif + } else if (!strcmp (tm, "InitBlockUnaligned") || !strcmp (tm, "InitBlock")) { *op = MINT_INITBLK; } } else if (in_corlib && !strcmp (klass_name_space, "System.Runtime.CompilerServices") && !strcmp (klass_name, "RuntimeHelpers")) { diff --git a/src/mono/mono/mini/intrinsics.c b/src/mono/mono/mini/intrinsics.c index 4f6a63b0480..fa2da0d8766 100644 --- a/src/mono/mono/mini/intrinsics.c +++ b/src/mono/mono/mini/intrinsics.c @@ -571,18 +571,63 @@ emit_unsafe_intrinsics (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignatu EMIT_NEW_BIALU (cfg, ins, OP_PSUB, dreg, args [1]->dreg, args [0]->dreg); ins->type = STACK_PTR; return ins; + } else if (!strcmp (cmethod->name, "Unbox")) { + g_assert (ctx); + g_assert (ctx->method_inst); + g_assert (ctx->method_inst->type_argc == 1); + + t = ctx->method_inst->type_argv [0]; + t = mini_get_underlying_type (t); + + MonoClass *klass = mono_class_from_mono_type_internal (t); + int context_used = mini_class_check_context_used (cfg, klass); + return mini_handle_unbox (cfg, klass, args [0], context_used); + } else if (!strcmp (cmethod->name, "Copy")) { + g_assert (ctx); + g_assert (ctx->method_inst); + g_assert (ctx->method_inst->type_argc == 1); + + t = ctx->method_inst->type_argv [0]; + t = mini_get_underlying_type (t); + + MonoClass *klass = mono_class_from_mono_type_internal (t); + mini_emit_memory_copy (cfg, args [0], args [1], klass, FALSE, 0); + return cfg->cbb->last_ins; + } else if (!strcmp (cmethod->name, "CopyBlock")) { + g_assert (fsig->param_count == 3); + + mini_emit_memory_copy_bytes (cfg, args [0], args [1], args [2], 0); + return cfg->cbb->last_ins; + } else if (!strcmp (cmethod->name, "CopyBlockUnaligned")) { + g_assert (fsig->param_count == 3); + + mini_emit_memory_copy_bytes (cfg, args [0], args [1], args [2], MONO_INST_UNALIGNED); + return cfg->cbb->last_ins; + } else if (!strcmp (cmethod->name, "InitBlock")) { + g_assert (fsig->param_count == 3); + + mini_emit_memory_init_bytes (cfg, args [0], args [1], args [2], 0); + return cfg->cbb->last_ins; } else if (!strcmp (cmethod->name, "InitBlockUnaligned")) { g_assert (fsig->param_count == 3); mini_emit_memory_init_bytes (cfg, args [0], args [1], args [2], MONO_INST_UNALIGNED); - MONO_INST_NEW (cfg, ins, OP_NOP); - MONO_ADD_INS (cfg->cbb, ins); - return ins; + return cfg->cbb->last_ins; } else if (!strcmp (cmethod->name, "SkipInit")) { MONO_INST_NEW (cfg, ins, OP_NOP); MONO_ADD_INS (cfg->cbb, ins); return ins; + } else if (!strcmp (cmethod->name, "SubtractByteOffset")) { + g_assert (ctx); + g_assert (ctx->method_inst); + g_assert (ctx->method_inst->type_argc == 1); + g_assert (fsig->param_count == 2); + + int dreg = alloc_preg (cfg); + EMIT_NEW_BIALU (cfg, ins, OP_PSUB, dreg, args [0]->dreg, args [1]->dreg); + ins->type = STACK_PTR; + return ins; } else if (!strcmp (cmethod->name, "IsNullRef")) { g_assert (fsig->param_count == 1); @@ -2004,13 +2049,9 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign (!strcmp (cmethod_klass_name, "Span`1") || !strcmp (cmethod_klass_name, "ReadOnlySpan`1"))) { return emit_span_intrinsics (cfg, cmethod, fsig, args); } else if (in_corlib && - !strcmp (cmethod_klass_name_space, "Internal.Runtime.CompilerServices") && + !strcmp (cmethod_klass_name_space, "System.Runtime.CompilerServices") && !strcmp (cmethod_klass_name, "Unsafe")) { return emit_unsafe_intrinsics (cfg, cmethod, fsig, args); - } else if (!strcmp (cmethod_klass_name_space, "System.Runtime.CompilerServices") && - !strcmp (cmethod_klass_name, "Unsafe") && - (in_corlib || !strcmp (cmethod_klass_image->assembly->aname.name, "System.Runtime.CompilerServices.Unsafe"))) { - return emit_unsafe_intrinsics (cfg, cmethod, fsig, args); } else if (in_corlib && !strcmp (cmethod_klass_name_space, "System.Runtime.CompilerServices") && !strcmp (cmethod_klass_name, "JitHelpers")) { diff --git a/src/mono/mono/mini/method-to-ir.c b/src/mono/mono/mini/method-to-ir.c index 64d3792fd5f..3349d1ae339 100644 --- a/src/mono/mono/mini/method-to-ir.c +++ b/src/mono/mono/mini/method-to-ir.c @@ -3109,8 +3109,8 @@ handle_unbox_nullable (MonoCompile* cfg, MonoInst* val, MonoClass* klass, int co } } -static MonoInst* -handle_unbox (MonoCompile *cfg, MonoClass *klass, MonoInst **sp, int context_used) +MonoInst* +mini_handle_unbox (MonoCompile *cfg, MonoClass *klass, MonoInst *val, int context_used) { MonoInst *add; int obj_reg; @@ -3119,7 +3119,7 @@ handle_unbox (MonoCompile *cfg, MonoClass *klass, MonoInst **sp, int context_use int eclass_reg = alloc_dreg (cfg ,STACK_PTR); int rank_reg = alloc_dreg (cfg ,STACK_I4); - obj_reg = sp [0]->dreg; + obj_reg = val->dreg; MONO_EMIT_NEW_LOAD_MEMBASE_FAULT (cfg, vtable_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable)); MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU1_MEMBASE, rank_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, rank)); @@ -9194,7 +9194,7 @@ calli_end: } else if (mono_class_is_nullable (klass)) { res = handle_unbox_nullable (cfg, *sp, klass, context_used); } else { - addr = handle_unbox (cfg, klass, sp, context_used); + addr = mini_handle_unbox (cfg, klass, *sp, context_used); /* LDOBJ */ EMIT_NEW_LOAD_MEMBASE_TYPE (cfg, ins, m_class_get_byval_arg (klass), addr->dreg, 0); res = ins; @@ -9548,7 +9548,7 @@ calli_end: *sp++= ins; } else { - ins = handle_unbox (cfg, klass, sp, context_used); + ins = mini_handle_unbox (cfg, klass, *sp, context_used); *sp++ = ins; } inline_costs += 2; diff --git a/src/mono/mono/mini/mini.h b/src/mono/mono/mini/mini.h index eb714f95d9b..436a1aaf33a 100644 --- a/src/mono/mono/mini/mini.h +++ b/src/mono/mono/mini/mini.h @@ -2329,6 +2329,7 @@ MonoInst* mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmeth MonoInst* mini_emit_inst_for_ctor (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **args); MonoInst* mini_emit_inst_for_field_load (MonoCompile *cfg, MonoClassField *field); MonoInst* mini_handle_enum_has_flag (MonoCompile *cfg, MonoClass *klass, MonoInst *enum_this, int enum_val_reg, MonoInst *enum_flag); +MonoInst* mini_handle_unbox (MonoCompile *cfg, MonoClass *klass, MonoInst *val, int context_used); MonoMethod* mini_get_memcpy_method (void); MonoMethod* mini_get_memset_method (void); |