diff --git a/src/libraries/Common/tests/Common.Tests.csproj b/src/libraries/Common/tests/Common.Tests.csproj index 18a311eb4c6d9..e43194af1f8dd 100644 --- a/src/libraries/Common/tests/Common.Tests.csproj +++ b/src/libraries/Common/tests/Common.Tests.csproj @@ -7,213 +7,144 @@ annotations - - Common\System\Collections\DictionaryExtensions.cs - - - Common\System\Security\Cryptography\ByteUtils.cs - - - Common\Interop\Linux\cgroups\Interop.cgroups.cs - - - Common\Interop\Linux\procfs\Interop.ProcFsStat.cs - - - Common\System\CharArrayHelpers.cs - - - Common\System\Marvin.cs - - - Common\System\StringExtensions.cs - - - Common\System\Collections\Generic\ArrayBuilder.cs - - - Common\System\Collections\Generic\LargeArrayBuilder.cs - - - Common\System\Collections\Generic\LargeArrayBuilder.SpeedOpt.cs - - - Common\System\IO\PathInternal.CaseSensitivity.cs - - - Common\System\IO\RowConfigReader.cs - - - Common\System\IO\StringParser.cs - - - Common\System\Net\HttpDateParser.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - - - Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs - - - Common\System\Net\Http\aspnetcore\IHttpHeadersHandler.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs - - - Common\System\Net\Http\aspnetcore\Quic\NetEventSource.Quic.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicConnection.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicListener.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicStream.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicException.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs - - - Common\System\Text\ReusableTextReader.cs - - - Common\System\Text\SimpleRegex.cs - - - Common\System\Text\ValueStringBuilder.cs - - - Common\System\Security\IdentityHelper.cs - - - System\PasteArguments.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -234,75 +165,57 @@ - - System\Net\Sockets\Fletcher32.cs - - - System\Net\VirtualNetwork\VirtualNetwork.cs - - - System\Net\VirtualNetwork\VirtualNetworkStream.cs - + + + - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - - - System\IO\PathInternal.cs - + + + - - System\IO\PathInternal.Windows.cs - - - Common\Interop\Windows\Interop.Libraries.cs - + + - - Common\Interop\Windows\kernel32\Interop.FormatMessage.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\System\IO\Win32Marshal.cs - + + + - - System\PasteArguments.Windows.cs - + - - System\IO\PathInternal.Unix.cs - - - Common\Interop\Unix\Interop.PathConf.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - System\PasteArguments.Unix.cs - + + + + - - Common\Interop\Linux\Interop.Libraries.cs - + - - Common\Interop\OSX\Interop.Libraries.cs - + diff --git a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj index 559cca7f20346..c57fef2f2c406 100644 --- a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj +++ b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj @@ -32,42 +32,31 @@ - - Common\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs - - - Common\Interop\Windows\NtDll\Interop.RtlGetVersion.cs - - - Common\Interop\Windows\Advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs - - - Common\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs - - - Common\Interop\Windows\Advapi32\Interop.GetTokenInformation_void.cs - - - Common\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs - - - Common\Interop\Windows\Interop.BOOL.cs - + + + + + + + + + - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs - - - Common\Interop\Unix\Interop.GetEUid.cs - + + diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj index 1e0036d0e92c7..2346157b3c9be 100644 --- a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj +++ b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj @@ -160,23 +160,18 @@ - - Common\System\Collections\HashHelpers.cs - + - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\OleAut32\Interop.VariantClear.cs - - - Common\System\Runtime\InteropServices\ComEventsSink.cs - - - Common\System\Runtime\InteropServices\ComEventsMethod.cs - + + + + Common\System\Runtime\InteropServices\IDispatch.cs diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj index 723c7244522e1..5cff85d11fe39 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj @@ -6,12 +6,10 @@ - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs - - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs - + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj index df49f6059b501..8331085c63d6c 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj @@ -6,12 +6,10 @@ - - Common\ConfigurationProviderExtensions.cs - - - Common\TestStreamHelpers.cs - + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj index 4b9c4ed4aa1a4..f1cee4b9b40cd 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj @@ -6,15 +6,12 @@ - - Common\ConfigurationProviderTestBase.cs - - - Common\ConfigurationProviderExtensions.cs - - - Common\TestStreamHelpers.cs - + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj index 74357f4d7bec5..90c560ccf6a48 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj @@ -6,15 +6,12 @@ - - Common\ConfigurationProviderTestBase.cs - - - Common\ConfigurationProviderExtensions.cs - - - Common\TestStreamHelpers.cs - + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj index c7ae00f4a0549..e51dc704cf5d9 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj @@ -6,9 +6,8 @@ - - Microsoft.Extensions.Configuration\tests\ConfigurationRootTest.cs - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj index 52c2140100327..ea3ba9cfb7754 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj @@ -6,15 +6,12 @@ - - Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs - - - Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs - - - Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs - + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj index ebc496c00800d..abbed47b39874 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj @@ -6,15 +6,12 @@ - - Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs - - - Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs - - - Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs - + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj index b65127b632667..d71b0ef74fa71 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj @@ -6,33 +6,25 @@ - - Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs - - - Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs - - - Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs - - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ReplaceCulture.cs - - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\FrameworkSkipConditionAttribute.cs - - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs - - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\RuntimeFrameworks.cs - + + + + + + + - + - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TestPlatformHelper.cs - + diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj index 38c800ff807a5..6f54b69d0433e 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj @@ -6,9 +6,8 @@ - - Common\ConfigurationProviderExtensions.cs - + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj index a88b34d985e02..d8898e4cffffa 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -7,18 +7,14 @@ - - Common\src\Extensions\ParameterDefaultValue\ParameterDefaultValue.cs - - - Common\src\Extensions\ActivatorUtilities\ActivatorUtilities.cs - - - Common\src\Extensions\ActivatorUtilities\ActivatorUtilitiesConstructorAttribute.cs - - - Common\src\Extensions\ActivatorUtilities\ObjectFactory.cs - + + + + 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 80589409dba6b..695ccf2711822 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj @@ -48,12 +48,10 @@ - - Common\src\Extensions\ParameterDefaultValue\ParameterDefaultValue.cs - - - Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs - + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj index 2ce3453a2d2ff..4cde2a2d352f7 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj @@ -6,12 +6,10 @@ - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs - - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs - + + 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 dadbc7e0a0d02..b0c477c63f83a 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj @@ -6,9 +6,8 @@ - - System\Numerics\Hashing\HashHelpers.cs - + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj index 6f7344c8ff8cf..83bc260df3630 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -7,9 +7,8 @@ - - Common\src\Extensions\EmptyDisposable.cs - + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj index 5f23ebcc600ad..d56e96896633d 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj @@ -8,12 +8,10 @@ - - Common\src\Extensions\EmptyDisposable.cs - - - Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs - + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj index 8cb5229c139d3..16fc264872249 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj @@ -7,12 +7,10 @@ - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs - - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TaskExtensions.cs - + + diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj index 00d510d0cede5..c63d9ce69e27e 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj @@ -7,9 +7,8 @@ - - Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs - + diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj index 0738e4ca3bbfe..fe116dda28fd3 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj @@ -8,21 +8,16 @@ - - TestingUtils\Microsoft.AspNetCore.Testing\src\TaskExtensions.cs - - - tests\DI.Common\Common\src\LogLevelAttribute.cs - - - tests\DI.Common\Common\src\LogValuesAssert.cs - - - tests\DI.Common\Common\src\XunitLoggerFactoryExtensions.cs - - - tests\DI.Common\Common\src\XunitLoggerProvider.cs - + + + + + diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj index c8a0848f51066..eb3b519aaaa00 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj @@ -7,15 +7,12 @@ - - Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs - - - Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs - - - Common\src\Extensions\ValueStopwatch\ValueStopwatch.cs - + + + diff --git a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj index 345634c008664..81926a709d7b3 100644 --- a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj @@ -6,25 +6,20 @@ - - tests\DI.Common\Common\src\TestSink.cs - - - tests\DI.Common\Common\src\WriteContext.cs - - - tests\DI.Common\Common\src\BeginScopeContext.cs - - - tests\DI.Common\Common\src\ITestSink.cs - - - tests\DI.Common\Common\src\TestLogger.cs - - - tests\DI.Common\Common\src\TestLoggerFactory.cs - - + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index 247ee6768e7a8..b50b22598e561 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -7,15 +7,12 @@ - - Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs - - - Common\src\Extensions\Logging\NullExternalScopeProvider.cs - - - Common\src\Extensions\Logging\NullScope.cs - + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index a3bb2b570f8ae..2eeeef2feb5d7 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -6,9 +6,8 @@ - - Common\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs - + 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 9bf8ca6491ae0..4beb34a853a71 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 @@ -15,12 +15,10 @@ - - Common\src\Extensions\Logging\NullExternalScopeProvider.cs - - - Common\src\Extensions\Logging\NullScope.cs - + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj index 936305667687c..d6d5e1ee81121 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj @@ -11,12 +11,10 @@ - - Common\src\Extensions\Logging\NullExternalScopeProvider.cs - - - Common\src\Extensions\Logging\NullScope.cs - + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj index 930e42aeef452..5a726ae5edda0 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -18,16 +18,14 @@ - + - - Common\src\Extensions\Logging\NullExternalScopeProvider.cs - - - Common\src\Extensions\Logging\NullScope.cs - + + 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 9458321aabdfb..ede4848a5df09 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 @@ -8,12 +8,10 @@ - - Common\src\Extensions\Logging\NullExternalScopeProvider.cs - - - Common\src\Extensions\Logging\NullScope.cs - + + diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj index b97b83142698c..0c1bbbc717cba 100644 --- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj @@ -7,15 +7,12 @@ - - Common\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs - - - Common\src\Extensions\Logging\NullExternalScopeProvider.cs - - - Common\src\Extensions\Logging\NullScope.cs - + + + diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj index 0e7e9d287a120..cec257df2ecaa 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj @@ -6,24 +6,18 @@ - - tests\DI.Common\Common\src\TestSink.cs - - - tests\DI.Common\Common\src\WriteContext.cs - - - tests\DI.Common\Common\src\BeginScopeContext.cs - - - tests\DI.Common\Common\src\ITestSink.cs - - - tests\DI.Common\Common\src\TestLogger.cs - - - tests\DI.Common\Common\src\TestLoggerFactory.cs - + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj index 905b9a874c12d..93d7d64dd1145 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj @@ -5,23 +5,17 @@ - - Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ShortClassNameAttribute.cs - - - tests\DI.Common\Common\src\LogLevelAttribute.cs - - - tests\DI.Common\Common\src\LogValuesAssert.cs - - - tests\Common\TestLoggerBuilder.cs - - - tests\DI.Common\Common\src\XunitLoggerFactoryExtensions.cs - - - tests\DI.Common\Common\src\XunitLoggerProvider.cs - + + + + + + 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 407d76de016d8..7ae899dab1497 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -5,9 +5,8 @@ true - - Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs - + @@ -35,4 +34,4 @@ - \ No newline at end of file + diff --git a/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj b/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj index ca9b170609880..84e7c08c8965d 100644 --- a/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj +++ b/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj @@ -9,97 +9,188 @@ annotations - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -117,4 +208,4 @@ - \ No newline at end of file + diff --git a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj index 1114cc984bd05..e949b5bddd0d8 100644 --- a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj +++ b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj @@ -8,25 +8,21 @@ - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.FormatMessage.cs - + + - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.Errors.cs - + + - \ No newline at end of file + diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index c477714db0b9f..786a122cea607 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -12,12 +12,10 @@ enable - - Common\Interop\Windows\Advapi32\Interop.RegistryConstants.cs - - - Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs - + + @@ -30,61 +28,43 @@ - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\Interop\Windows\Interop.FormatMessage.cs - - - Common\Interop\Windows\Interop.RegCloseKey.cs - - - Common\Interop\Windows\Interop.RegConnectRegistry.cs - - - Common\Interop\Windows\Interop.RegCreateKeyEx.cs - - - Common\Interop\Windows\Interop.RegDeleteKeyEx.cs - - - Common\Interop\Windows\Interop.RegDeleteValue.cs - - - Common\Interop\Windows\Interop.RegEnumKeyEx.cs - - - Common\Interop\Windows\Interop.RegEnumValue.cs - - - Common\Interop\Windows\Interop.RegFlushKey.cs - - - Common\Interop\Windows\Interop.RegOpenKeyEx.cs - - - Common\Interop\Windows\Interop.RegQueryInfoKey.cs - - - Common\Interop\Windows\Interop.RegQueryValueEx.cs - - - Common\Interop\Windows\Interop.RegSetValueEx.cs - - - Common\Interop\Windows\Interop.BOOL.cs - - - Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs - + + + + + + + + + + + + + + + + + - - Microsoft\Win32\SafeHandles\SafeRegistryHandle.Windows.cs - + diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj index 0f007343e8522..1323c12607588 100644 --- a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj +++ b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj @@ -4,12 +4,10 @@ $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.RegSetValueEx.cs - + + diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj index 9305567a07479..c5db7eae7e2fc 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -9,126 +9,86 @@ true - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\Interop\Windows\User32\Interop.Constants.cs - - - Common\Interop\Windows\User32\Interop.CreateWindowEx.cs - - - Common\Interop\Windows\User32\Interop.DefWindowProc.cs - - - Common\Interop\Windows\User32\Interop.DestroyWindow.cs - - - Common\Interop\Windows\User32\Interop.DispatchMessage.cs - - - Common\Interop\Windows\User32\Interop.GetClassInfo.cs - - - Common\Interop\Windows\User32\Interop.GetProcessWindowStation.cs - - - Common\Interop\Windows\User32\Interop.GetUserObjectInformation.cs - - - Common\Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs - - - Common\Interop\Windows\User32\Interop.IsWindow.cs - - - Common\Interop\Windows\User32\Interop.KillTimer.cs - - - Common\Interop\Windows\User32\Interop.MSG.cs - - - Common\Interop\Windows\User32\Interop.MsgWaitForMultipleObjectsEx.cs - - - Common\Interop\Windows\User32\Interop.PeekMessage.cs - - - Common\Interop\Windows\User32\Interop.PostMessage.cs - - - Common\Interop\Windows\User32\Interop.RegisterClass.cs - - - Common\Interop\Windows\User32\Interop.RegisterWindowMessage.cs - - - Common\Interop\Windows\User32\Interop.SendMessage.cs - - - Common\Interop\Windows\User32\Interop.SetClassLong.cs - - - Common\Interop\Windows\User32\Interop.SetClassLongPtr.cs - - - Common\Interop\Windows\User32\Interop.SetTimer.cs - - - Common\Interop\Windows\User32\Interop.SetWindowLong.cs - - - Common\Interop\Windows\User32\Interop.SetWindowLongPtr.cs - - - Common\Interop\Windows\User32\Interop.TranslateMessage.cs - - - Common\Interop\Windows\User32\Interop.UnregisterClass.cs - - - Common\Interop\Windows\User32\Interop.USEROBJECTFLAGS.cs - - - Common\Interop\Windows\User32\Interop.WNDCLASS.cs - - - Common\Interop\Windows\User32\Interop.WndProc.cs - - - Common\Interop\Windows\Kernel32\Interop.GetCurrentThreadId.cs - - - Common\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs - - - Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs - - - Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs - - - Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs - - - Common\Interop\Windows\Kernel32\Interop.SetConsoleCtrlHandler.cs - - - Common\Interop\Windows\WtsApi32\Interop.Constants.cs - - - Common\Interop\Windows\WtsApi32\Interop.WTSRegisterSessionNotification.cs - - - Common\Interop\Windows\WtsApi32\Interop.WTSUnRegisterSessionNotification.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -150,9 +110,8 @@ - - Common\System\Runtime\InteropServices\SuppressGCTransitionAttribute.internal.cs - + @@ -174,4 +133,4 @@ - \ No newline at end of file + diff --git a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj index c536995d9bf27..3faa8abcdbe7d 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj @@ -3,18 +3,14 @@ $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\User32\Interop.Constants.cs - - - Common\Interop\Windows\User32\Interop.FindWindow.cs - - - Common\Interop\Windows\User32\Interop.SendMessage.cs - + + + + @@ -33,4 +29,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj index e30f1847fded3..9e92688da3e9d 100644 --- a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj +++ b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj @@ -97,23 +97,17 @@ - - Common\System\Collections\IList.NonGeneric.Tests.cs - - - Common\System\Collections\ICollection.NonGeneric.Tests.cs - - - Common\System\Collections\IEnumerable.NonGeneric.Tests.cs - - - Common\System\Collections\TestBase.NonGeneric.cs - - - Common\System\IO\TempFile.cs - - - Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs - + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj b/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj index 208ab764456ee..c049418e129ad 100644 --- a/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj +++ b/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj @@ -15,9 +15,8 @@ - - System\Collections\Concurrent\IProducerConsumerCollectionDebugView.cs - + diff --git a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj index 08891beb71dbc..1ef1827987185 100644 --- a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj +++ b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj @@ -5,64 +5,45 @@ $(NetCoreAppCurrent) - - System\Collections\Concurrent\IProducerConsumerCollectionDebugView.cs - + - - Common\System\Collections\CollectionAsserts.cs - - - Common\System\Collections\ICollection.NonGeneric.Tests.cs - - - Common\System\Collections\ICollection.Generic.Tests.cs - - - Common\System\Collections\IDictionary.NonGeneric.Tests.cs - - - Common\System\Collections\IDictionary.Generic.Tests.cs - - - Common\System\Collections\IEnumerable.NonGeneric.Tests.cs - - - Common\System\Collections\IEnumerable.Generic.Tests.cs - - - Common\System\Collections\IList.NonGeneric.Tests.cs - - - Common\System\Collections\IList.Generic.Tests.cs - - - Common\System\Collections\IGenericSharedAPI.Tests.cs - - - Common\System\Collections\ISet.Generic.Tests.cs - - - Common\System\Collections\TestBase.NonGeneric.Tests.cs - - - Common\System\Collections\TestBase.Generic.Tests.cs - - - Common\System\Collections\DebugView.Tests.cs - - - Common\System\Collections\TestingTypes.cs - - - Common\System\Diagnostics\Tracing\TestEventListener.cs - - - Common\System\EnumTypes.cs - - - Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs - + + + + + + + + + + + + + + + + + + @@ -80,16 +61,13 @@ - - Common\System\Diagnostics\DebuggerAttributes.cs - + - - Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs - - - Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs - + + \ No newline at end of file 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 ed5c6b9cd674c..e5c031c9b9c6d 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -83,14 +83,12 @@ - - Common\System\Runtime\Versioning\NonVersionableAttribute.cs - + - - System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs - + diff --git a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj index e1b74ff9bd515..3a84741634429 100644 --- a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj +++ b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj @@ -4,9 +4,8 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) - - Common\System\Collections\DictionaryExtensions.cs - + @@ -32,64 +31,45 @@ - - Common\System\Diagnostics\DebuggerAttributes.cs - - - Common\System\ShouldNotBeInvokedException.cs - + + - - Common\System\Collections\CollectionAsserts.cs - - - Common\System\Collections\DelegateEqualityComparer.cs - - - Common\System\Collections\ICollection.NonGeneric.Tests.cs - - - Common\System\Collections\ICollection.Generic.Tests.cs - - - Common\System\Collections\IDictionary.NonGeneric.Tests.cs - - - Common\System\Collections\IDictionary.Generic.Tests.cs - - - Common\System\Collections\IEnumerable.NonGeneric.Tests.cs - - - Common\System\Collections\IEnumerable.Generic.Tests.cs - - - Common\System\Collections\IList.NonGeneric.Tests.cs - - - Common\System\Collections\IList.Generic.Tests.cs - - - Common\System\Collections\IGenericSharedAPI.Tests.cs - - - Common\System\Collections\ISet.Generic.Tests.cs - - - Common\System\Collections\TestBase.NonGeneric.Tests.cs - - - Common\System\Collections\TestBase.Generic.Tests.cs - - - Common\System\Collections\DebugView.Tests.cs - - - Common\System\Collections\TestingTypes.cs - - - Common\System\SerializableAttribute.cs - + + + + + + + + + + + + + + + + + @@ -116,4 +96,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj index 2e6adcbba08cf..9ec5c3a1eb93a 100644 --- a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj +++ b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj @@ -16,9 +16,8 @@ - - Common\System\Collections\KeyValuePairs.cs - + diff --git a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj index f5e98bb527524..a7c767971ce90 100644 --- a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj +++ b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj @@ -5,27 +5,20 @@ - - Common\System\Collections\ICollection.NonGeneric.Tests.cs - - - Common\System\Collections\IDictionary.NonGeneric.Tests.cs - - - Common\System\Collections\IEnumerable.NonGeneric.Tests.cs - - - Common\System\Collections\IList.NonGeneric.Tests.cs - - - Common\System\Collections\TestBase.NonGeneric.cs - - - Common\System\Collections\TestingTypes.cs - - - Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs - + + + + + + + @@ -42,12 +35,10 @@ - - Common\System\Diagnostics\DebuggerAttributes.cs - + - - Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj index f024aa1179130..6139444928b2c 100644 --- a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj +++ b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj @@ -15,9 +15,8 @@ - - Common\System\Collections\CompatibleComparer.cs - + diff --git a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj index 1027ec603631a..9fe63e5d7a9b5 100644 --- a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj +++ b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj @@ -4,30 +4,22 @@ - - Common\System\Collections\CollectionAsserts.cs - - - Common\System\Collections\ICollection.NonGeneric.Tests.cs - - - Common\System\Collections\IDictionary.NonGeneric.Tests.cs - - - Common\System\Collections\IEnumerable.NonGeneric.Tests.cs - - - Common\System\Collections\TestBase.NonGeneric.Tests.cs - - - Common\System\Collections\TestingTypes.cs - - - Common\System\Diagnostics\DebuggerAttributes.cs - - - Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs - + + + + + + + + @@ -81,9 +73,8 @@ - - Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Collections/src/System.Collections.csproj b/src/libraries/System.Collections/src/System.Collections.csproj index ca99c1d7aed64..50eb24ec766ec 100644 --- a/src/libraries/System.Collections/src/System.Collections.csproj +++ b/src/libraries/System.Collections/src/System.Collections.csproj @@ -13,12 +13,10 @@ - - Common\System\Collections\Generic\ICollectionDebugView.cs - - - Common\System\Collections\Generic\IDictionaryDebugView.cs - + + @@ -33,12 +31,10 @@ - - Common\System\Collections\HashHelpers.cs - - - Common\System\Collections\Generic\EnumerableHelpers.cs - + + diff --git a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj index 0614402205bbe..412f68fc8425f 100644 --- a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj +++ b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj @@ -5,63 +5,44 @@ - - Common\System\Collections\CollectionAsserts.cs - - - Common\System\Collections\ICollection.NonGeneric.Tests.cs - - - Common\System\Collections\ICollection.Generic.Tests.cs - - - Common\System\Collections\IDictionary.NonGeneric.Tests.cs - - - Common\System\Collections\IDictionary.Generic.Tests.cs - - - Common\System\Collections\IEnumerable.NonGeneric.Tests.cs - - - Common\System\Collections\IEnumerable.Generic.Tests.cs - - - Common\System\Collections\IList.NonGeneric.Tests.cs - - - Common\System\Collections\IList.Generic.Tests.cs - - - Common\System\Collections\IGenericSharedAPI.Tests.cs - - - Common\System\Collections\ISet.Generic.Tests.cs - - - Common\System\Collections\TestBase.NonGeneric.Tests.cs - - - Common\System\Collections\TestBase.Generic.Tests.cs - - - Common\System\Collections\DebugView.Tests.cs - - - Common\System\Collections\TestingTypes.cs - - - Common\System\EnumTypes.cs - - - Common\System\ObjectCloner.cs - - - Common\System\RandomExtensions.cs - - - Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs - + + + + + + + + + + + + + + + + + + + @@ -133,21 +114,16 @@ - - Common\System\Diagnostics\DebuggerAttributes.cs - + - - Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs - - - Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs - - - Common\System\Collections\IDictionary.Generic.Tests.netcoreapp.cs - - - Common\System\Collections\IDictionary.NonGeneric.Tests.netcoreapp.cs - + + + + - \ No newline at end of file + diff --git a/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj b/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj index e3898f5ee0da3..e871a28c7c0e6 100644 --- a/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj +++ b/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj @@ -50,8 +50,7 @@ - - Common\System\NotImplemented.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj index a8442b7eedf76..bca38d6e8f46c 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj @@ -13,24 +13,19 @@ - - Common\System\Composition\Diagnostics\CompositionTrace.cs - - - Common\System\Composition\Diagnostics\CompositionTraceId.cs - - - Common\System\Composition\Diagnostics\CompositionTraceSource.cs - - - Common\System\Composition\Diagnostics\DebuggerTraceWriter.cs - - - Common\System\Composition\Diagnostics\TraceWriter.cs - + + + + + - \ No newline at end of file + diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj index bcd943cbd0b02..9a3e92cb15ecd 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj @@ -176,18 +176,14 @@ - - Common\System\Composition\Diagnostics\CompositionTraceId.cs - - - Common\System\Composition\Diagnostics\CompositionTraceSource.cs - - - Common\System\Composition\Diagnostics\DebuggerTraceWriter.cs - - - Common\System\Composition\Diagnostics\TraceWriter.cs - + + + + diff --git a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj index 52d0ec7cfa644..fc7811e645ef9 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj +++ b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj @@ -10,12 +10,10 @@ - - Common\System\IO\TempDirectory.cs - - - Common\System\IO\TempFile.cs - + + diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj index 5285055594c6e..9b57a22eee4b2 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj +++ b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj @@ -81,12 +81,10 @@ - - System\Drawing\ColorConverterCommon.cs - - - System\Drawing\ColorTable.cs - + + @@ -239,9 +237,8 @@ - - Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs - + @@ -266,4 +263,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj index e83917a8d6803..635f6a2b2fcb3 100644 --- a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj +++ b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj @@ -13,21 +13,16 @@ - - Common\System\Composition\Diagnostics\CompositionTrace.cs - - - Common\System\Composition\Diagnostics\CompositionTraceId.cs - - - Common\System\Composition\Diagnostics\CompositionTraceSource.cs - - - Common\System\Composition\Diagnostics\DebuggerTraceWriter.cs - - - Common\System\Composition\Diagnostics\TraceWriter.cs - + + + + + diff --git a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj index 8fc187238cd06..0171ea482a7c2 100644 --- a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj +++ b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj @@ -26,9 +26,8 @@ - - Common\System\Numerics\Hashing\HashHelpers.cs - + diff --git a/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj b/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj index d394da4cf09e9..b2a05265bb1e1 100644 --- a/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj +++ b/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj @@ -4,9 +4,8 @@ - - Common\System\Diagnostics\DebuggerAttributes.cs - + \ No newline at end of file diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj index 6de345cee0625..9397e8a05c98a 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj @@ -237,17 +237,15 @@ - - Common\System\Security\IdentityHelper.cs - + - - Common\System\IO\TempFileCollection.cs - + @@ -261,4 +259,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj index ae774993387ff..77b8fba4c8c27 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj @@ -7,30 +7,22 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) - - Common\System\IO\TempDirectory.cs - - - Common\System\IO\TempFile.cs - - - Source\ConfigPathUtility.cs - - - Source\ExceptionUtil.cs - - - Source\StringUtil.cs - - - Source\TypeUtil.cs - - - Source\UrlPath.cs - - - Source\ValidatorUtils.cs - + + + + + + + + @@ -112,4 +104,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Console/src/System.Console.csproj b/src/libraries/System.Console/src/System.Console.csproj index 1415fce320a6a..a180a20542229 100644 --- a/src/libraries/System.Console/src/System.Console.csproj +++ b/src/libraries/System.Console/src/System.Console.csproj @@ -17,161 +17,112 @@ - - Common\System\Text\ConsoleEncoding.cs - + - - Common\Interop\OSX\Interop.Log.cs - - - Common\Interop\Unix\Interop.Libraries.cs - + + - - Common\System\Text\OSEncoding.Windows.cs - - - Common\System\Text\OSEncoder.cs - - - Common\System\Text\DBCSDecoder.cs - - - Common\Interop\Windows\Interop.GetCPInfoEx.cs - - - Common\Interop\Windows\Interop.MAX_PATH.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.BOOL.cs - - - Common\Interop\Windows\Interop.Beep.cs - - - Common\Interop\Windows\Interop.FormatMessage.cs - - - Common\Interop\Windows\Interop.ConsoleCursorInfo.cs - - - Common\Interop\Windows\Interop.ConsoleScreenBufferInfo.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\Interop\Windows\Interop.FillConsoleOutputAttribute.cs - - - Common\Interop\Windows\Interop.FillConsoleOutputCharacter.cs - - - Common\Interop\Windows\Interop.FileTypes.cs - - - Common\Interop\Windows\Interop.GetConsoleScreenBufferInfo.cs - - - Common\Interop\Windows\Interop.GetConsoleCP.cs - - - Common\Interop\Windows\Interop.GetConsoleTitle.cs - - - Common\Interop\Windows\Interop.GetConsoleMode.cs - - - Common\Interop\Windows\Interop.GetConsoleOutputCP.cs - - - Common\Interop\Windows\Interop.GetLargestConsoleWindowSize.cs - - - Common\Interop\Windows\Interop.GetFileType.cs - - - Common\Interop\Windows\Interop.GetKeyState.cs - - - Common\Interop\Windows\Interop.GetStdHandle.cs - - - Common\Interop\Windows\Interop.HandleTypes.cs - - - Common\Interop\Windows\Interop.MultiByteToWideChar.cs - - - Common\Interop\Windows\Interop.PeekConsoleInput.cs - - - Common\Interop\Windows\Interop.ReadFile.cs - - - Common\Interop\Windows\Interop.ReadConsole.cs - - - Common\Interop\Windows\Interop.ReadConsoleInput.cs - - - Common\Interop\Windows\Interop.ReadConsoleOutput.cs - - - Common\Interop\Windows\Interop.SetConsoleCP.cs - - - Common\Interop\Windows\Interop.SetConsoleCtrlHandler.cs - - - Common\Interop\Windows\Interop.SetConsoleCursorPosition.cs - - - Common\Interop\Windows\Interop.SetConsoleOutputCP.cs - - - Common\Interop\Windows\Interop.SetConsoleScreenBufferSize.cs - - - Common\Interop\Windows\Interop.SetConsoleTextAttribute.cs - - - Common\Interop\Windows\Interop.SetConsoleTitle.cs - - - Common\Interop\Windows\Interop.SetConsoleWindowInfo.cs - - - Common\Interop\Windows\Interop.WideCharToMultiByte.cs - - - Common\Interop\Windows\Interop.WriteFile.cs - - - Common\Interop\Windows\Interop.WriteConsole.cs - - - Common\Interop\Windows\Interop.WriteConsoleOutput.cs - - - Common\System\IO\EncodingHelper.Windows.cs - - - Common\System\IO\Win32Marshal.cs - - - Common\System\Text\ValueStringBuilder.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -179,105 +130,72 @@ - - Common\Microsoft\Win32\SafeHandles\SafeFileHandleHelper.Unix.cs - - - Common\System\IO\PersistedFiles.Unix.cs - - - Common\System\IO\PersistedFiles.Names.Unix.cs - - - Common\System\Text\StringBuilderCache.cs - - - Common\System\Text\EncodingHelper.Unix.cs - - - Common\System\Text\StringOrCharArray.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.IOErrors.cs - - - Common\Interop\Unix\Interop.Close.cs - - - Common\Interop\Unix\Interop.Dup.cs - - - Common\Interop\Unix\Interop.FileDescriptors.cs - - - Common\Interop\Unix\Interop.FLock.cs - - - Common\Interop\Unix\Interop.GetControlCharacters.cs - - - Common\Interop\Unix\Interop.IsATty.cs - - - Common\Interop\Unix\Interop.LSeek.cs - - - Common\Interop\Unix\Interop.Open.cs - - - Common\Interop\Unix\Interop.OpenFlags.cs - - - Common\Interop\Unix\Interop.Poll.cs - - - Common\Interop\Unix\Interop.GetEUid.cs - - - Common\Interop\Unix\Interop.GetPwUid.cs - - - Common\Interop\Unix\Interop.RegisterForCtrlC.cs - - - Common\Interop\Unix\Interop.RestoreAndHandleCtrl.cs - - - Common\Interop\Unix\Interop.SetTerminalInvalidationHandler.cs - - - Common\Interop\Unix\Interop.SetSignalForBreak.cs - - - Common\Interop\Unix\Interop.SNPrintF.cs - - - Common\Interop\Unix\Interop.Stat.cs - - - Common\Interop\Unix\Interop.Read.cs - - - Common\Interop\Unix\Interop.Write.cs - - - Common\Interop\Unix\Interop.GetWindowWidth.cs - - - Common\Interop\Unix\Interop.InitializeTerminalAndSignalHandling.cs - - - Common\Interop\Unix\Interop.ReadStdinUnbuffered.cs - - - Common\Interop\Unix\Interop.StdinReady.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj index c16e3af1f24d3..47bbf84fcd94d 100644 --- a/src/libraries/System.Console/tests/System.Console.Tests.csproj +++ b/src/libraries/System.Console/tests/System.Console.Tests.csproj @@ -23,12 +23,10 @@ - - Common\System\IO\InterceptStreamWriter.cs - - - Common\System\ShouldNotBeInvokedException.cs - + + @@ -42,11 +40,9 @@ - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Unix\System.Native\Interop.Fcntl.cs - + + - \ No newline at end of file + diff --git a/src/libraries/System.Data.Common/src/System.Data.Common.csproj b/src/libraries/System.Data.Common/src/System.Data.Common.csproj index 561674c584e34..a9583ce2d1914 100644 --- a/src/libraries/System.Data.Common/src/System.Data.Common.csproj +++ b/src/libraries/System.Data.Common/src/System.Data.Common.csproj @@ -161,9 +161,8 @@ - - System\Data\Common\AdapterUtil.cs - + @@ -191,12 +190,10 @@ Component - - System\Data\Common\DbConnectionOptions.Common.cs - - - System\Data\Common\DbConnectionPoolKey.cs - + + @@ -228,12 +225,10 @@ - - System\Data\Common\MultipartIdentifier.cs - - - System\Data\Common\NameValuePair.cs - + + @@ -286,9 +281,8 @@ - - System\Data\SQLTypes\SQLResource.cs - + @@ -300,9 +294,8 @@ - - Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs - + diff --git a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj index f82cb624c9c7d..2543849f56b13 100644 --- a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj +++ b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj @@ -113,11 +113,9 @@ - - Common\System\Diagnostics\Tracing\TestEventListener.cs - - - Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs - + + 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 0712bcb677115..42f214ea6084c 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -9,56 +9,42 @@ true - - Common\System\Data\Common\AdapterUtil.cs - - - System\Data\Common\AdapterUtil.Drivers.cs - + + - - Common\System\Data\Common\DbConnectionOptions.Common.cs - - - System\Data\Common\DbConnectionPoolKey.cs - + + - - Common\System\Data\Common\NameValuePair.cs - + - - Common\System\Data\ProviderBase\FieldNameLookup.cs - - - Common\System\Data\ProviderBase\BasicFieldNameLookup.cs - - - System\Data\ProviderBase\DbConnectionInternal.cs - - - System\Data\ProviderBase\DbConnectionFactory.cs - - - System\Data\ProviderBase\DbConnectionPoolGroup.cs - - - System\Data\ProviderBase\TimeoutTimer.cs - - - System\Data\ProviderBase\DbReferenceCollection.cs - - - System\Data\ProviderBase\DbMetaDataFactory.cs - - - System\Data\ProviderBase\DbConnectionClosed.cs - + + + + + + + + + @@ -112,31 +98,25 @@ - - Common\System\NotImplemented.cs - + - - Common\System\Data\Common\MultipartIdentifier.cs - - - Common\Interop\Interop.Odbc.cs - + + - - Common\Interop\Linux\Interop.Libraries.cs - + - - Common\Interop\OSX\Interop.Libraries.cs - + - - Common\Interop\Windows\Interop.Libraries.cs - + diff --git a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj index 7136986e7836c..95c97d667a0ae 100644 --- a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj +++ b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj @@ -16,29 +16,24 @@ - - Common\Interop\Unix\Interop.Libraries.cs - + - - Common\Interop\Linux\Interop.Libraries.cs - + - - Common\Interop\OSX\Interop.Libraries.cs - + - - Common\Interop\FreeBSD\Interop.Libraries.cs - + - - Common\Interop\Windows\Interop.Libraries.cs - + 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 9c2b886ca0671..e7ffa6f2df52b 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -10,12 +10,10 @@ true - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\System\Data\Common\MultipartIdentifier.cs - + + @@ -107,4 +105,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj b/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj index 8da4908a1c08f..4dbef1eb1e0b7 100644 --- a/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj +++ b/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj @@ -11,8 +11,7 @@ - - Common\System\ShouldNotBeInvokedException.cs - + - \ No newline at end of file + 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 803e147792dd6..7ef0b1f1db8f8 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -22,15 +22,13 @@ - - Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs - + - - Common\System\HexConverter.cs - + diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj index 3d34832a280f1..3f0cc561685fa 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj @@ -14,11 +14,9 @@ - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.Http.cs - + + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj index 7bf58b00f2954..530e018163d50 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -53,69 +53,48 @@ - - Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs - - - Common\Interop\Windows\Advapi32\Interop.ClearEventLog.cs - - - Common\Interop\Windows\Advapi32\Interop.CloseEventLog.cs - - - Common\Interop\Windows\Advapi32\Interop.DeregisterEventSource.cs - - - Common\Interop\Windows\Advapi32\Interop.GetNumberOfEventLogRecords.cs - - - Common\Interop\Windows\Advapi32\Interop.GetOldestEventLogRecord.cs - - - Common\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs - - - Common\Interop\Windows\Advapi32\Interop.NotifyChangeEventLog.cs - - - Common\Interop\Windows\Advapi32\Interop.OpenEventLog.cs - - - Common\Interop\Windows\Advapi32\Interop.ReadEventLog.cs - - - Common\Interop\Windows\Advapi32\Interop.RegisterEventSource.cs - - - Common\Interop\Windows\Advapi32\Interop.ReportEvent.cs - - - Common\Interop\Windows\Kernel32\Interop.Constants.cs - - - Common\Interop\Windows\Kernel32\Interop.FormatMessage_SafeLibraryHandle.cs - - - Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs - - - Common\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs - - - Common\Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\System\Diagnostics\NetFrameworkUtils.cs - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj index e2a81f05dd671..956061590cb80 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj +++ b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj @@ -11,42 +11,31 @@ - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.FileVersionInfo.cs - - - Common\Interop\Windows\Interop.FileVersionInfoType.cs - - - Common\Interop\Windows\Interop.GetFileVersionInfoEx.cs - - - Common\Interop\Windows\Interop.GetFileVersionInfoSizeEx.cs - - - Common\Interop\Windows\Interop.VerLanguageName.cs - - - Common\Interop\Windows\Interop.VerQueryValue.cs - - - Common\Interop\Windows\Interop.VSFixedFileInfo.cs - + + + + + + + + - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.Stat.cs - + + + @@ -59,4 +48,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj index ca49d982ae802..2ea787c2fa904 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj +++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj @@ -24,12 +24,10 @@ - - ProductionCode\Common\Interop\Windows\Interop.Libraries.cs - - - ProductionCode\Common\Interop\Windows\Kernel32\Interop.VerLanguageName.cs - + + diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index 2e1be8425bad8..c485d42d1e403 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -39,126 +39,86 @@ - - Common\Interop\Windows\Interop.BOOL.cs - - - Common\Interop\Windows\Interop.FormatMessage.cs - - - Common\Interop\Windows\Interop.RegCloseKey.cs - - - Common\Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs - - - Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs - - - Microsoft\Win32\SafeHandles\SafeRegistryHandle.Windows.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Advapi32\Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs - - - Common\Interop\Windows\Advapi32\Interop.GetTokenInformation.cs - - - Common\Interop\Windows\Advapi32\Interop.PERF_INFO.cs - - - Common\Interop\Windows\Advapi32\Interop.ProcessOptions.cs - - - Common\Interop\Windows\Advapi32\Interop.RegConnectRegistry.cs - - - Common\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs - - - Common\Interop\Windows\Kernel32\Interop.Constants.cs - - - Common\Interop\Windows\Kernel32\Interop.CreateFileMapping.cs - - - Common\Interop\Windows\kernel32\Interop.DuplicateHandle.cs - - - Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs - - - Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs - - - Common\Interop\Windows\kernel32\Interop.GetCurrentProcess.cs - - - Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs - - - Common\Interop\Windows\Kernel32\Interop.GetProcessTimes.cs - - - Common\Interop\Windows\Kernel32\Interop.HandleOptions.cs - - - Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs - - - Common\Interop\Windows\Kernel32\Interop.MapViewOfFile.cs - - - Common\Interop\Windows\Kernel32\Interop.MemOptions.cs - - - Common\Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFO.cs - - - Common\Interop\Windows\Kernel32\Interop.OpenFileMapping.cs - - - Common\Interop\Windows\Kernel32\Interop.OpenProcess.cs - - - Common\Interop\Windows\Kernel32\Interop.PerformanceCounterOptions.cs - - - Common\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs - - - Common\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs - - - Common\Interop\Windows\Kernel32\Interop.UnmapViewOfFile.cs - - - Common\Interop\Windows\Kernel32\Interop.VirtualQuery.cs - - - Common\Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs - - - Common\Interop\Windows\PerfCounter\Interop.FormatFromRawValue.cs - - - Common\Interop\Windows\PerfCounter\Interop.PerformanceData.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafePerfProviderHandle.cs - - - Common\System\Diagnostics\NetFrameworkUtils.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj index a301f85bfc55a..2e5d90aaaab9c 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj @@ -13,9 +13,8 @@ - - Common\System\ShouldNotBeInvokedException.cs - + diff --git a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index 99e96c4d872d6..6e3ff47ece651 100644 --- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -33,262 +33,178 @@ - - Common\System\Runtime\Serialization\SerializationGuard.cs - - - System\PasteArguments.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\System\Threading\Tasks\TaskCompletionSourceWithCancellation.cs - + + + + - - Common\Interop\Windows\Kernel32\Interop.EnumProcessModules.cs - - - Common\Interop\Windows\NtDll\Interop.NtQueryInformationProcess.cs - - - Common\Interop\Windows\NtDll\Interop.NtQuerySystemInformation.cs - - - Common\Interop\Windows\NtDll\Interop.PROCESS_BASIC_INFORMATION.cs - - - Common\Interop\Windows\NtDll\Interop.SYSTEM_PROCESS_INFORMATION.cs - - - Common\Interop\Windows\User32\Interop.EnumWindows.cs - - - Common\Interop\Windows\User32\Interop.GetWindow.cs - - - Common\Interop\Windows\User32\Interop.GetWindowLong.cs - - - Common\Interop\Windows\User32\Interop.GetWindowTextLengthW.cs - - - Common\Interop\Windows\User32\Interop.GetWindowTextW.cs - - - Common\Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs - - - Common\Interop\Windows\User32\Interop.PostMessage.cs - - - Common\Interop\Windows\User32\Interop.IsWindowVisible.cs - - - Common\Interop\Windows\User32\Interop.SendMessageTimeout.cs - - - Common\Interop\Windows\User32\Interop.WaitForInputIdle.cs - + + + + + + + + + + + + + + + - - Microsoft\Win32\SafeHandles\SafeTokenHandle.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs - - - Common\Interop\Windows\Advapi32\Interop.PERF_INFO.cs - - - Common\Interop\Windows\Kernel32\Interop.IsWow64Process_SafeProcessHandle.cs - - - Common\Interop\Windows\Kernel32\Interop.GetExitCodeProcess.cs - - - Common\Interop\Windows\Kernel32\Interop.GetProcessTimes.cs - - - Common\Interop\Windows\Kernel32\Interop.GetThreadTimes.cs - - - Common\Interop\Windows\Kernel32\Interop.GetStdHandle.cs - - - Common\Interop\Windows\Kernel32\Interop.CreateProcess.cs - - - Common\Interop\Windows\Kernel32\Interop.TerminateProcess.cs - - - Common\Interop\Windows\kernel32\Interop.GetCurrentProcess.cs - - - Common\Interop\Windows\Kernel32\Interop.OpenProcess.cs - - - Common\Interop\Windows\Kernel32\Interop.EnumProcesses.cs - - - Common\Interop\Windows\Kernel32\Interop.GetModuleInformation.cs - - - Common\Interop\Windows\Kernel32\Interop.GetModuleBaseName.cs - - - Common\Interop\Windows\Kernel32\Interop.GetModuleFileNameEx.cs - - - Common\Interop\Windows\Kernel32\Interop.SetProcessWorkingSetSizeEx.cs - - - Common\Interop\Windows\Kernel32\Interop.GetProcessWorkingSetSizeEx.cs - - - Common\Interop\Windows\Kernel32\Interop.SetProcessAffinityMask.cs - - - Common\Interop\Windows\Kernel32\Interop.GetProcessAffinityMask.cs - - - Common\Interop\Windows\Kernel32\Interop.GetProcessId.cs - - - Common\Interop\Windows\Kernel32\Interop.GetThreadPriorityBoost.cs - - - Common\Interop\Windows\Kernel32\Interop.SetThreadPriorityBoost.cs - - - Common\Interop\Windows\Kernel32\Interop.GetProcessPriorityBoost.cs - - - Common\Interop\Windows\Kernel32\Interop.SetProcessPriorityBoost.cs - - - Common\Interop\Windows\Kernel32\Interop.OpenThread.cs - - - Common\Interop\Windows\Kernel32\Interop.SetThreadPriority.cs - - - Common\Interop\Windows\Kernel32\Interop.GetThreadPriority.cs - - - Common\Interop\Windows\Kernel32\Interop.SetThreadAffinityMask.cs - - - Common\Interop\Windows\Kernel32\Interop.SetThreadIdealProcessor.cs - - - Common\Interop\Windows\Kernel32\Interop.GetPriorityClass.cs - - - Common\Interop\Windows\Kernel32\Interop.SetPriorityClass.cs - - - Common\Interop\Windows\kernel32\Interop.DuplicateHandle.cs - - - Common\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs - - - Common\Interop\Windows\Advapi32\Interop.OpenProcessToken.cs - - - Common\Interop\Windows\Advapi32\Interop.LookupPrivilegeValue.cs - - - Common\Interop\Windows\Advapi32\Interop.AdjustTokenPrivileges.cs - - - Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs - - - Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs - - - Common\Interop\Windows\Kernel32\Interop.GetConsoleCP.cs - - - Common\Interop\Windows\Kernel32\Interop.GetConsoleOutputCP.cs - - - Common\Interop\Windows\Advapi32\Interop.CreateProcessWithLogon.cs - - - Common\Interop\Windows\Interop.BOOL.cs - - - Common\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs - - - Common\Interop\Windows\Advapi32\Interop.LUID.cs - - - Common\Interop\Windows\Advapi32\Interop.LUID_AND_ATTRIBUTES.cs - - - Common\Interop\Windows\Advapi32\Interop.TOKEN_PRIVILEGE.cs - - - Common\Interop\Windows\Kernel32\Interop.Constants.cs - - - Common\Interop\Windows\kernel32\Interop.CreatePipe.cs - - - Common\Interop\Windows\Kernel32\Interop.ThreadOptions.cs - - - Common\Interop\Windows\Kernel32\Interop.HandleTypes.cs - - - Common\Interop\Windows\Advapi32\Interop.ProcessOptions.cs - - - Common\Interop\Windows\kernel32\Interop.ProcessOptions.cs - - - Common\Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs - - - Common\Interop\Interop.UNICODE_STRING.cs - - - Common\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs - - - Common\System\Text\ConsoleEncoding.cs - - - Common\System\Text\EncodingHelper.Windows.cs - - - Common\System\Text\OSEncoding.Windows.cs - - - Common\System\Text\OSEncoder.cs - - - Common\System\Text\DBCSDecoder.cs - - - Common\Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs - - - Common\Interop\Windows\Interop.MAX_PATH.cs - - - Common\System\HResults.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -306,101 +222,71 @@ - - Common\System\Text\ValueStringBuilder.cs - - - Common\System\IO\StringParser.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.Close.cs - - - Common\Interop\Unix\Interop.GetHostName.cs - - - Common\Interop\Unix\Interop.SysConf.cs - - - Common\Interop\Unix\Interop.ConfigureTerminalForChildProcess.cs - - - Common\Interop\Unix\Interop.ForkAndExecProcess.cs - - - Common\Interop\Unix\Interop.GetGroupList.cs - - - Common\Interop\Unix\Interop.GetLine.cs - - - Common\Interop\Unix\Interop.GetPid.cs - - - Common\Interop\Unix\Interop.GetPwUid.cs - - - Common\Interop\Unix\Interop.GetSetPriority.cs - - - Common\Interop\Unix\Interop.GetSid.cs - - - Common\Interop\Unix\Interop.GetUid.cs - - - Common\Interop\Unix\Interop.InitializeTerminalAndSignalHandling.cs - - - Common\Interop\Unix\Interop.Kill.cs - - - Common\Interop\Unix\Interop.ReadLink.cs - - - Common\Interop\Unix\Interop.RegisterForRegisterForSigChld.cs - - - Common\Interop\Unix\Interop.ResourceLimits.cs - - - Common\Interop\Unix\Interop.PathConf.cs - - - Common\Interop\Unix\Interop.POpen.cs - - - Common\Interop\Unix\Interop.WaitId.cs - - - Common\Interop\Unix\Interop.WaitPid.cs - - - Common\Interop\Unix\System.Native\Interop.Access.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\Interop\Linux\Interop.cgroups.cs - - - Common\Interop\Linux\Interop.ProcFsStat.cs - - - Common\Interop\Linux\Interop.SchedGetSetAffinity.cs - - - Common\System\Text\ReusableTextReader.cs - + + + + @@ -408,17 +294,14 @@ - - Common\Interop\OSX\Interop.libproc.cs - - - Common\Interop\OSX\Interop.Libraries.cs - + + - - Common\Interop\Windows\Shell32\Interop.ShellExecuteExW.cs - + @@ -432,15 +315,12 @@ - - Common\Interop\BSD\System.Native\Interop.Sysctl.cs - - - Common\Interop\FreeBSD\Interop.Process.cs - - - Common\Unix\System.Native\Interop.Stat.cs - + + + diff --git a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj index e2f3f7ad84f9f..4abf44898ce80 100644 --- a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj +++ b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj @@ -6,18 +6,14 @@ $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix - - System\PasteArguments.cs - - - Common\System\IO\StringParser.cs - - - Common\System\ShouldNotBeInvokedException.cs - - - Common\Microsoft\Win32\TempRegistryKey.cs - + + + + @@ -37,15 +33,13 @@ - - System\PasteArguments.Windows.cs - + - - System\PasteArguments.Unix.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj index f326d86901240..4369501017e46 100644 --- a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj +++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj @@ -9,31 +9,24 @@ - - Common\System\Diagnostics\TraceListenerHelpers.cs - + - - Common\System\Diagnostics\TraceListenerHelpers.Windows.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.GetCurrentProcessId.cs - + + + - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.GetPid.cs - - - Common\System\Diagnostics\TraceListenerHelpers.Unix.cs - + + + diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj index ce6fa0f43970a..9db54bcc7a0ff 100644 --- a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj +++ b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj @@ -29,31 +29,24 @@ - - Common\System\Diagnostics\TraceListenerHelpers.cs - + - - Common\System\Diagnostics\TraceListenerHelpers.Windows.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.GetCurrentProcessId.cs - + + + - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.GetPid.cs - - - Common\System\Diagnostics\TraceListenerHelpers.Unix.cs - + + + diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj index daf24a4408f6e..f711eca26bdb5 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -83,12 +83,10 @@ - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs - + + diff --git a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj index f40b0251aabdb..52962b9e03d1c 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj @@ -10,9 +10,8 @@ - - Common\DirectoryServices\LdapConfiguration.cs - + diff --git a/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj b/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj index 45ee75557ac22..7cf3cdc3988f9 100644 --- a/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj @@ -47,9 +47,8 @@ - - Common\DirectoryServices\LdapConfiguration.cs - + diff --git a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj index c4df6bbeb60f5..0788f30fb8f65 100644 --- a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj +++ b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj @@ -18,9 +18,8 @@ - - Common\DirectoryServices\LdapConfiguration.cs - + @@ -31,4 +30,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj index 7a6ca380042f9..367f451225dac 100644 --- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -151,12 +151,10 @@ - - Common\Interop\Windows\User32\Interop.LOGFONT.cs - - - Common\Interop\Windows\Gdi32\Interop.RasterOp.cs - + + System.Drawing.DefaultComponent.bmp @@ -221,117 +219,80 @@ - - System\LocalAppContextSwitches.Common.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Gdi32\Interop.CombineRgn.cs - - - Common\Interop\Windows\Gdi32\Interop.CreateCompatibleDC.cs - - - Common\Interop\Windows\Gdi32\Interop.CreateDC.cs - - - Common\Interop\Windows\Gdi32\Interop.CreateIC.cs - - - Common\Interop\Windows\Gdi32\Interop.CreateFontIndirect.cs - - - Common\Interop\Windows\Gdi32\Interop.CreateRectRgn.cs - - - Common\Interop\Windows\Gdi32\Interop.DeleteDC.cs - - - Common\Interop\Windows\Gdi32\Interop.DeleteObject.cs - - - Common\Interop\Windows\Gdi32\Interop.GetClipRgn.cs - - - Common\Interop\Windows\Gdi32\Interop.GetCurrentObject.cs - - - Common\Interop\Windows\Gdi32\Interop.GetDeviceCaps.cs - - - Common\Interop\Windows\Gdi32\Interop.GetObjectType.cs - - - Common\Interop\Windows\Gdi32\Interop.GetRgnBox.cs - - - Common\Interop\Windows\Gdi32\Interop.GetStockObject.cs - - - Common\Interop\Windows\Gdi32\Interop.ObjectType.cs - - - Common\Interop\Windows\Gdi32\Interop.OffsetViewportOrgEx.cs - - - Common\Interop\Windows\Gdi32\Interop.RECT.cs - - - Common\Interop\Windows\Gdi32\Interop.RegionType.cs - - - Common\Interop\Windows\Gdi32\Interop.RestoreDC.cs - - - Common\Interop\Windows\Gdi32\Interop.SaveDC.cs - - - Common\Interop\Windows\Gdi32\Interop.SelectClipRgn.cs - - - Common\Interop\Windows\Kernel32\Interop.GlobalFree.cs - - - Common\Interop\Windows\Kernel32\Interop.GlobalLock.cs - - - Common\Interop\Windows\Gdi32\Interop.BitBlt.cs - - - Common\Interop\Windows\Ole32\Interop.IStream.cs - - - Common\Interop\Windows\Ole32\Interop.STATSTG.cs - - - Common\Interop\Windows\Ole32\Interop.STGTY.cs - - - Common\Interop\Windows\Ole32\Interop.STATFLAG.cs - - - Common\Interop\Windows\Ole32\Interop.STGM.cs - - - Common\Interop\Windows\User32\Interop.GetDC.cs - - - Common\Interop\Windows\User32\Interop.ReleaseDC.cs - - - Common\Interop\Windows\User32\Interop.SystemParametersInfo.cs - - - Common\Interop\Windows\User32\Interop.NONCLIENTMETRICS.cs - - - Common\Interop\Windows\User32\Interop.WindowFromDC.cs - - - Common\Interop\Windows\Interop.HRESULT.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -377,9 +338,8 @@ - - Common\Interop\Unix\Interop.Libraries.cs - + placeholder.ico diff --git a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj index 610e7ec4b3962..873e1e6dada7f 100644 --- a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj +++ b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj @@ -79,15 +79,12 @@ - - Common\System\Diagnostics\DebuggerAttributes.cs - - - Common\System\Drawing\Helpers.cs - - - Common\System\IO\TempFile.cs - + + + diff --git a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj index 5a9c2609314a8..bb25694503ed2 100644 --- a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj +++ b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj @@ -25,34 +25,25 @@ - - System\Drawing\ColorConverterCommon.cs - - - System\Drawing\ColorTable.cs - - - System\Drawing\ColorTranslator.cs - - - System\Drawing\KnownColor.cs - - - System\Drawing\KnownColorTable.cs - - - System\Drawing\SystemColors.cs - + + + + + + - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\User32\Interop.GetSysColor.cs - - - Common\Interop\Windows\User32\Interop.Win32SystemColors.cs - + + + - \ No newline at end of file + diff --git a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj index 1601346a37a00..b3a3a3ea5e3d6 100644 --- a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj +++ b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj @@ -12,14 +12,11 @@ - - Common\System\Diagnostics\DebuggerAttributes.cs - - - Common\System\Runtime\Serialization\DataContractSerializerHelper.cs - - - Common\System\Runtime\Serialization\Utils.cs - + + + - \ No newline at end of file + diff --git a/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj b/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj index 87bbcd42ac7c5..671b64eaea1da 100644 --- a/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj +++ b/src/libraries/System.Globalization.Extensions/tests/NlsTests/System.Globalization.Extensions.Nls.Tests.csproj @@ -4,51 +4,36 @@ true - - GetStringComparerTests.cs - - - IdnMapping\Data\ConformanceIdnaUnicodeTestResult.cs - - - IdnMapping\Data\Unicode_9_0\Unicode_9_0_IdnaTest.cs - - - IdnMapping\Data\Unicode_11_0\Unicode_11_0_IdnaTest.cs - - - IdnMapping\IdnMappingIdnaConformanceTests.cs - - - IdnMapping\Data\Factory.cs - - - IdnMapping\Data\ConformanceIdnaTestResult.cs - - - IdnMapping\Data\Unicode_6_0\Unicode_6_0_IdnaTest.cs - - - IdnMapping\Data\Unicode_Win7\Unicode_Win7_IdnaTest.cs - - - IdnMapping\Data\IConformanceIdnaTest.cs - - - IdnMapping\IdnMappingGetAsciiTests.cs - - - IdnMapping\IdnMappingGetUnicodeTests.cs - - - IdnMapping\IdnMappingUseStd3AsciiRulesTests.cs - - - Normalization\StringNormalizationTests.cs - - - Normalization\NormalizationAll.cs - + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj b/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj index 3266b52e575a2..e1c20d97ca766 100644 --- a/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj +++ b/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj @@ -10,322 +10,217 @@ - - CompareInfo\CompareInfoTests.cs - - - CompareInfo\CompareInfoTests.IndexOf.cs - - - CompareInfo\CompareInfoTests.IsPrefix.cs - - - CompareInfo\CompareInfoTests.Compare.cs - - - CompareInfo\CompareInfoTests.IsSuffix.cs - - - CompareInfo\CompareInfoTests.LastIndexOf.cs - - - NumberFormatInfo\NumberFormatInfoCurrentInfo.cs - - - NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs - - - NumberFormatInfo\NumberFormatInfoData.cs - - - NumberFormatInfo\NumberFormatInfoCurrencySymbol.cs - - - NumberFormatInfo\NumberFormatInfoNaNSymbol.cs - - - NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs - - - NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs - - - NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs - - - NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs - - - NumberFormatInfo\NumberFormatInfoPercentSymbol.cs - - - NumberFormatInfo\NumberFormatInfoPositiveSign.cs - - - NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs - - - NumberFormatInfo\NumberFormatInfoNegativeSign.cs - - - NumberFormatInfo\NumberFormatInfoNegativeInfinitySymbol.cs - - - NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs - - - NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs - - - NumberFormatInfo\NumberFormatInfoNumberDecimalDigits.cs - - - NumberFormatInfo\NumberFormatInfoNumberGroupSizes.cs - - - NumberFormatInfo\NumberFormatInfoNumberNegativePattern.cs - - - NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs - - - NumberFormatInfo\NumberFormatInfoPercentGroupSizes.cs - - - NumberFormatInfo\NumberFormatInfoPercentPositivePattern.cs - - - CultureInfo\CultureInfoAll.cs - - - CultureInfo\CultureInfoAsync.cs - - - CultureInfo\CultureInfoCalendar.cs - - - CultureInfo\CultureInfoClone.cs - - - CultureInfo\CultureInfoCompareInfo.cs - - - CultureInfo\CultureInfoCtor.cs - - - CultureInfo\CultureInfoDateTimeFormat.cs - - - CultureInfo\CultureInfoEnglishName.cs - - - CultureInfo\CultureInfoEquals.cs - - - CultureInfo\CultureInfoGetFormat.cs - - - CultureInfo\CultureInfoGetHashCode.cs - - - CultureInfo\CultureInfoIsNeutralCulture.cs - - - CultureInfo\CultureInfoNativeName.cs - - - CultureInfo\CultureInfoNumberFormat.cs - - - CultureInfo\CultureInfoParent.cs - - - CultureInfo\CultureInfoReadOnly.cs - - - CultureInfo\CultureInfoTwoLetterISOLanguageName.cs - - - CultureInfo\CultureInfoCurrentCulture.cs - - - CultureInfo\GetCultureInfo.cs - - - DateTimeFormatInfo\DateTimeFormatInfoAbbreviatedDayNames.cs - - - DateTimeFormatInfo\DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs - - - DateTimeFormatInfo\DateTimeFormatInfoAbbreviatedMonthNames.cs - - - DateTimeFormatInfo\DateTimeFormatInfoAMDesignator.cs - - - DateTimeFormatInfo\DateTimeFormatInfoCalendar.cs - - - DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs - - - DateTimeFormatInfo\DateTimeFormatInfoClone.cs - - - DateTimeFormatInfo\DateTimeFormatInfoData.cs - - - DateTimeFormatInfo\DateTimeFormatInfoDayNames.cs - - - DateTimeFormatInfo\DateTimeFormatInfoFirstDayOfWeek.cs - - - DateTimeFormatInfo\DateTimeFormatInfoFullDateTimePattern.cs - - - DateTimeFormatInfo\DateTimeFormatInfoGetAbbreviatedDayName.cs - - - DateTimeFormatInfo\DateTimeFormatInfoGetAbbreviatedEraName.cs - - - DateTimeFormatInfo\DateTimeFormatInfoGetAbbreviatedMonthName.cs - - - DateTimeFormatInfo\DateTimeFormatInfoGetDayName.cs - - - DateTimeFormatInfo\DateTimeFormatInfoGetEra.cs - - - DateTimeFormatInfo\DateTimeFormatInfoGetEraName.cs - - - DateTimeFormatInfo\DateTimeFormatInfoGetFormat.cs - - - DateTimeFormatInfo\DateTimeFormatInfoGetInstance.cs - - - DateTimeFormatInfo\DateTimeFormatInfoGetMonthName.cs - - - DateTimeFormatInfo\DateTimeFormatInfoLongDatePattern.cs - - - DateTimeFormatInfo\DateTimeFormatInfoLongTimePattern.cs - - - DateTimeFormatInfo\DateTimeFormatInfoMonthDayPattern.cs - - - DateTimeFormatInfo\DateTimeFormatInfoMonthGenitiveNames.cs - - - DateTimeFormatInfo\DateTimeFormatInfoMonthNames.cs - - - DateTimeFormatInfo\DateTimeFormatInfoPMDesignator.cs - - - DateTimeFormatInfo\DateTimeFormatInfoReadOnly.cs - - - DateTimeFormatInfo\DateTimeFormatInfoRFC1123Pattern.cs - - - DateTimeFormatInfo\DateTimeFormatInfoShortDatePattern.cs - - - DateTimeFormatInfo\DateTimeFormatInfoShortestDayNames.cs - - - DateTimeFormatInfo\DateTimeFormatInfoShortTimePattern.cs - - - DateTimeFormatInfo\DateTimeFormatInfoSortableDateTimePattern.cs - - - DateTimeFormatInfo\DateTimeFormatInfoTests.cs - - - DateTimeFormatInfo\DateTimeFormatInfoUniversalSortableDateTimePattern.cs - - - DateTimeFormatInfo\DateTimeFormatInfoYearMonthPattern.cs - - - NumberFormatInfo\NumberFormatInfoClone.cs - - - NumberFormatInfo\NumberFormatInfoCurrencyDecimalDigits.cs - - - NumberFormatInfo\NumberFormatInfoCurrencyDecimalSeparator.cs - - - NumberFormatInfo\NumberFormatInfoCurrencyGroupSeparator.cs - - - NumberFormatInfo\NumberFormatInfoCurrencyGroupSizes.cs - - - NumberFormatInfo\NumberFormatInfoCurrencyNegativePattern.cs - - - NumberFormatInfo\NumberFormatInfoCurrencyPositivePattern.cs - - - NumberFormatInfo\NumberFormatInfoGetFormat.cs - - - NumberFormatInfo\NumberFormatInfoGetInstance.cs - - - NumberFormatInfo\NumberFormatInfoReadOnly.cs - - - NumberFormatInfo\NumberFormatInfoTests.cs - - - System\Globalization\CharUnicodeInfoTestData.cs - - - System\Globalization\CharUnicodeInfoTests.cs - - - System\Globalization\CharUnicodeInfoTests.Generated.cs - - - System\Globalization\CultureNotFoundExceptionTests.cs - - - System\Globalization\GraphemeBreakTest.cs - - - System\Globalization\RegionInfoTests.cs - - - System\Globalization\StringInfoTests.cs - - - System\Globalization\SortVersionTests.cs - - - System\Globalization\TextInfoTests.cs - - - System\Globalization\TextElementEnumeratorTests.cs - - - System\Globalization\UnicodeCategoryTests.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\System\RandomDataGenerator.cs - + diff --git a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj index a0a3271278c24..b7010108541a5 100644 --- a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj +++ b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj @@ -113,9 +113,8 @@ - - Common\System\RandomDataGenerator.cs - + diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj index 626ab0f48a792..418184e291d58 100644 --- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj +++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj @@ -17,24 +17,20 @@ - - Common\System\Threading\Tasks\TaskToApm.cs - - - Common\Microsoft\Win32\SafeHandles\SafeBrotliHandle.cs - + + - - Common\Interop\Windows\Interop.Libraries.cs - + - - Common\Interop\Unix\Interop.Libraries.cs - + diff --git a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj index 6cd5df420f23f..e4ca77f85bda7 100644 --- a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj +++ b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj @@ -6,24 +6,18 @@ - - Common\System\IO\Compression\CompressionStreamTestBase.cs - - - Common\System\IO\Compression\CompressionStreamUnitTestBase.cs - - - Common\System\IO\Compression\LocalMemoryStream.cs - - - Common\System\IO\Compression\StreamHelpers.cs - - - Common\System\IO\TempFile.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - + + + + + + - - Common\System\IO\PathInternal.Windows.cs - - - Common\Interop\Windows\Interop.Libraries.cs - + + - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\System\IO\PathInternal.Unix.cs - - - Common\Interop\Unix\System.Native\Interop.PathConf.cs - + + + diff --git a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj index 20bb882a1b962..b2c7ef176fd6e 100644 --- a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj +++ b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj @@ -14,36 +14,26 @@ - - Common\System\IO\PathFeatures.cs - - - Common\System\IO\Compression\CRC.cs - - - Common\System\IO\Compression\CompressionStreamTestBase.cs - - - Common\System\IO\Compression\CompressionStreamUnitTestBase.cs - - - Common\System\IO\Compression\FileData.cs - - - Common\System\IO\Compression\LocalMemoryStream.cs - - - Common\System\IO\Compression\StreamHelpers.cs - - - Common\System\IO\TempFile.cs - - - Common\System\IO\Compression\ZipTestHelper.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - + + + + + + + + + + - - + + @@ -23,39 +25,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -83,4 +118,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj index 6041ad80240c7..2130178404f34 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj @@ -6,14 +6,12 @@ - - Common\System\IO\TempFile.cs - - - Common\System\IO\TempDirectory.cs - + + - \ No newline at end of file + diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj index 716da85edb803..50792a3e761b6 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj +++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj @@ -10,88 +10,63 @@ - - Common\System\HResults.cs - - - Common\System\IO\PathInternal.CaseSensitivity.cs - + + - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.GetDriveType.cs - - - Common\Interop\Windows\Interop.GetVolumeInformation.cs - - - Common\Interop\Windows\Interop.GetLogicalDrives.cs - - - Common\Interop\Windows\Interop.GetDiskFreeSpaceEx.cs - - - Common\Interop\Windows\Interop.MAX_PATH.cs - - - Common\Interop\Windows\Interop.SetVolumeLabel.cs - - - Common\Interop\Windows\Interop.SetThreadErrorMode.cs - - - Common\Interop\Windows\Interop.SecurityOptions.cs - - - Common\Interop\Windows\Interop.FileOperations.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\Interop\Windows\Interop.FormatMessage.cs - - - Common\System\IO\DisableMediaInsertionPrompt.cs - - - Common\System\IO\Win32Marshal.cs - - - Common\System\IO\DriveInfoInternal.Windows.cs - - - Common\System\IO\PathInternal.Windows.cs - + + + + + + + + + + + + + + + + - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.IOErrors.cs - - - Common\System\IO\PathInternal.Unix.cs - - - Common\Interop\Unix\Interop.PathConf.cs - - - Common\Interop\Unix\Interop.MountPoints.cs - - - Common\Interop\Unix\Interop.MountPoints.FormatInfo.cs - + + + + + + + @@ -100,4 +75,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj index 6476f8cff3335..300a25ad55691 100644 --- a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj +++ b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj @@ -19,112 +19,82 @@ - - Common\System\IO\PathInternal.CaseSensitivity.cs - + - - Common\System\IO\PathInternal.Windows.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.BOOL.cs - - - Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs - - - Common\Interop\Windows\Kernel32\Interop.FileOperations.cs - - - Common\Interop\Windows\Kernel32\Interop.ReadDirectoryChangesW.cs - + + + + + + Component - - Common\Interop\Windows\Interop.CloseHandle.cs - + - - Common\Interop\Windows\Interop.CreateFile.cs - + - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\libc\Interop.Read.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.IOErrors.cs - - - Common\System\IO\PathInternal.Unix.cs - - - Common\Interop\Unix\Interop.PathConf.cs - + + + + + + - - Common\Interop\Linux\Interop.inotify.cs - - - Common\Interop\Unix\Interop.Poll.cs - - - Common\Interop\Unix\Interop.Stat.cs - + + + - - System.IO.FileSystem\src\System\IO\FileSystem.Exists.Unix.cs - - - Common\Interop\OSX\Interop.EventStream.cs - - - Common\Interop\OSX\Interop.CoreFoundation.cs - - - Common\Interop\OSX\Interop.Libraries.cs - - - Common\Interop\OSX\Interop.RunLoop.cs - - - Common\Interop\Unix\Interop.RealPath.cs - - - Common\Interop\Unix\Interop.Stat.Span.cs - - - Common\Interop\Unix\Interop.Stat.cs - - - Common\Interop\Unix\Interop.Sync.cs - - - Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs - - - Common\Microsoft\Win32\SafeHandles\SafeEventStreamHandle.OSX.cs - - - Common\System\Text\ValueUtf8Converter.cs - + + + + + + + + + + + + diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj index 589fb29ae2101..235f4860c757e 100644 --- a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj +++ b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj @@ -26,20 +26,16 @@ - - Common\System\IO\TempFile.cs - - - Common\System\IO\TempDirectory.cs - + + - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Native\Interop.ResourceLimits.cs - + + diff --git a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj index 3dfbc1ba58146..0e7728f070818 100644 --- a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj +++ b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj @@ -16,10 +16,14 @@ - - - - + + + + @@ -53,62 +57,118 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -118,29 +178,52 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -152,4 +235,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj index c36d099b980f2..ccec9a8185b6c 100644 --- a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj +++ b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj @@ -14,7 +14,7 @@ - + @@ -161,15 +161,13 @@ - - - Common\System\Buffers\NativeMemoryManager.cs - - - Common\System\IO\TempFile.cs - - - Common\System\IO\PathFeatures.cs - + + + + - \ No newline at end of file + diff --git a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj index 710b00e4b4c83..20b7ebd0b43e7 100644 --- a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj +++ b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj @@ -12,9 +12,8 @@ - - Common\System\Security\IdentityHelper.cs - + diff --git a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj index 0aaf3693233c2..64bbfd8e02889 100644 --- a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj +++ b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj @@ -8,34 +8,27 @@ - - Internals\Helper.Win32Unix.cs - + - - Internals\Helper.Win32.cs - + - - Internals\Helper.Unix.cs - + - - Common\System\IO\TempDirectory.cs - - - Common\System\IO\TempFile.cs - - - Internals\Helper.cs - - - Common\System\Security\IdentityHelper.cs - + + + + @@ -59,4 +52,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj index c2dc86df1632e..058554ec058b8 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj +++ b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj @@ -18,139 +18,98 @@ - - Common\Interop\Windows\Interop.CreateFileMapping.cs - - - Common\Interop\Windows\Interop.MapViewOfFile.cs - - - Common\Interop\Windows\Interop.OpenFileMapping.cs - - - Common\Interop\Windows\Interop.VirtualAlloc.cs - - - Common\Interop\Windows\Interop.GlobalMemoryStatusEx.cs - - - Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.CloseHandle.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\Interop\Windows\Interop.FormatMessage.cs - - - Common\Interop\Windows\Interop.FileAttributes.cs - - - Common\Interop\Windows\Interop.FileOperations.cs - - - Common\Interop\Windows\Interop.FlushViewOfFile.cs - - - Common\Interop\Windows\Interop.GenericOperations.cs - - - Common\Interop\Windows\Interop.GetSystemInfo.cs - - - Common\Interop\Windows\Interop.SYSTEM_INFO.cs - - - Common\Interop\Windows\Interop.HandleOptions.cs - - - Common\Interop\Windows\Interop.MEMORY_BASIC_INFO.cs - - - Common\Interop\Windows\Interop.MEMORYSTATUSEX.cs - - - Common\Interop\Windows\Interop.MemOptions.cs - - - Common\Interop\Windows\Interop.PipeOptions.cs - - - Common\Interop\Windows\Interop.BOOL.cs - - - Common\Interop\Windows\Interop.SecurityOptions.cs - - - Common\Interop\Windows\Interop.UnmapViewOfFile.cs - - - Common\Interop\Windows\Interop.VirtualQuery.cs - - - Common\System\IO\Win32Marshal.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.Fcntl.cs - - - Common\Interop\Unix\Interop.IOErrors.cs - - - Common\Interop\Unix\Interop.MMap.cs - - - Common\Interop\Unix\Interop.MUnmap.cs - - - Common\Interop\Unix\Interop.MSync.cs - - - Common\Interop\Unix\Interop.Open.cs - - - Common\Interop\Unix\Interop.OpenFlags.cs - - - Common\Interop\Unix\Interop.Permissions.cs - - - Common\Interop\Unix\Interop.SysConf.cs - + + + + + + + + + + + - - Common\Interop\Unix\Interop.FTruncate.cs - - - Common\Interop\Unix\Interop.MAdvise.cs - - - Common\Interop\Unix\Interop.ShmOpen.cs - - - Common\Interop\Unix\Interop.Unlink.cs - + + + + diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj index 830a1c5f73d84..c23e14c34f83c 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj +++ b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj @@ -15,9 +15,8 @@ - - Common\System\IO\TempFile.cs - + \ No newline at end of file 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 c15a68ff5a26c..f9b7de24969f8 100644 --- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -5,9 +5,8 @@ enable - - Common\System\Threading\Tasks\TaskToApm.cs - + @@ -59,4 +58,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj index 8599e10012ec3..ee5dd288580e6 100644 --- a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj +++ b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj @@ -19,43 +19,78 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -74,8 +109,10 @@ - - + + @@ -84,31 +121,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -132,4 +194,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj index c49e5d41a7b03..13d93c5a066e4 100644 --- a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj +++ b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj @@ -27,29 +27,22 @@ - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - + - - Common\Interop\Windows\Interop.CancelIoEx.cs - - - Common\Interop\Windows\Interop.LoadLibraryEx_IntPtr.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.GetNamedPipeHandleState.cs - - - Common\Interop\Windows\Interop.MaxLengths.cs - + + + + + + @@ -63,4 +56,4 @@ - \ No newline at end of file + 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 8b261f91ada34..aaee0ffb6ec41 100644 --- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj +++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj @@ -29,118 +29,82 @@ - - Common\Interop\Windows\Kernel32\Interop.DCB.cs - - - Common\Interop\Windows\Kernel32\Interop.COMMPROP.cs - - - Common\Interop\Windows\Kernel32\Interop.COMMTIMEOUTS.cs - - - Common\Interop\Windows\Kernel32\Interop.COMSTAT.cs - - - Common\Interop\Windows\Kernel32\Interop.SetCommState.cs - - - Common\Interop\Windows\Kernel32\Interop.SetCommBreak.cs - - - Common\Interop\Windows\Kernel32\Interop.ClearCommBreak.cs - - - Common\Interop\Windows\Kernel32\Interop.EscapeCommFunction.cs - - - Common\Interop\Windows\Kernel32\Interop.SetCommTimeouts.cs - - - Common\Interop\Windows\Kernel32\Interop.GetCommModemStatus.cs - - - Common\Interop\Windows\Kernel32\Interop.ClearCommError.cs - - - Common\Interop\Windows\Kernel32\Interop.GetCommProperties.cs - - - Common\Interop\Windows\Kernel32\Interop.SetCommMask.cs - - - Common\Interop\Windows\Kernel32\Interop.PurgeComm.cs - - - Common\Interop\Windows\Kernel32\Interop.SetupComm.cs - - - Common\Interop\Windows\Kernel32\Interop.GetCommState.cs - - - Common\Interop\Windows\Kernel32\Interop.WaitCommEvent.cs - - - Common\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs - - - Common\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_NativeOverlapped.cs - - - Common\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_IntPtr.cs - - - Common\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs - - - Common\Interop\Windows\Kernel32\Interop.GetOverlappedResult.cs - - - Common\Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs - - - Common\Interop\Windows\Kernel32\Interop.GenericOperations.cs - - - Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs - - - Common\Interop\Windows\Interop.FileTypes.cs - - - Common\System\IO\PathInternal.Windows.cs - - - Common\Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\Interop\Windows\Interop.BOOL.cs - - - Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs - - - Common\System\IO\Win32Marshal.cs - - - Common\Interop\Windows\Interop.FormatMessage.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\Interop\Windows\Kernel32\Interop.CreateFile.cs - - - Common\Interop\Windows\Kernel32\Interop.FileOperations.cs - + + @@ -156,30 +120,22 @@ - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.IOErrors.cs - - - Common\Interop\Unix\System.Native\Interop.Read.cs - - - Common\Interop\Unix\System.Native\Interop.Write.cs - - - Common\Interop\Unix\System.Native\Interop.Poll.cs - - - Common\Interop\Unix\System.Native\Interop.Shutdown.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - + + + + + + + + @@ -205,4 +161,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.IO/tests/System.IO.Tests.csproj b/src/libraries/System.IO/tests/System.IO.Tests.csproj index 3262bfa8bb501..44cd574154b95 100644 --- a/src/libraries/System.IO/tests/System.IO.Tests.csproj +++ b/src/libraries/System.IO/tests/System.IO.Tests.csproj @@ -46,22 +46,18 @@ - - Common\System\Buffers\NativeMemoryManager.cs - - - Common\System\IO\CallTrackingStream.cs - - - Common\System\IO\DelegateStream.cs - - - Common\System\IO\WrappedMemoryStream.cs - + + + + - \ No newline at end of file + diff --git a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj index a88e5ca3b5e6a..c9c9624cc3c94 100644 --- a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj +++ b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj @@ -13,12 +13,10 @@ $(DefineConstants);FEATURE_INTERPRET - - Common\System\Collections\Generic\ArrayBuilder.cs - - - Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs - + + diff --git a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj index 6ac48c2e3dca5..35d8c92b8d1f4 100644 --- a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -224,9 +224,8 @@ - - Common\System\Collections\DictionaryExtensions.cs - + @@ -248,4 +247,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj index e7a85f6cc62c4..8b327c062a3e8 100644 --- a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj +++ b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj @@ -4,15 +4,12 @@ $(NetCoreAppCurrent) - - Common\System\Diagnostics\Tracing\TestEventListener.cs - - - Common\System\ShouldNotBeInvokedException.cs - - - CommonTest\System\Threading\ThreadPoolHelpers.cs - + + + diff --git a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj index ad309e2f7319b..55af483dac059 100644 --- a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj +++ b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj @@ -53,8 +53,7 @@ - - Common\System\Linq\SkipTakeData.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Linq/src/System.Linq.csproj b/src/libraries/System.Linq/src/System.Linq.csproj index 3b6ec801b5a49..a9caa2e36d3ea 100644 --- a/src/libraries/System.Linq/src/System.Linq.csproj +++ b/src/libraries/System.Linq/src/System.Linq.csproj @@ -29,26 +29,20 @@ - - System\Collections\Generic\LargeArrayBuilder.SpeedOpt.cs - + - - System\Collections\Generic\ArrayBuilder.cs - - - System\Collections\Generic\EnumerableHelpers.cs - - - System\Collections\Generic\EnumerableHelpers.Linq.cs - - - System\Collections\Generic\LargeArrayBuilder.cs - - - System\Collections\Generic\SparseArrayBuilder.cs - + + + + + diff --git a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj index fe5b68dc5b1eb..595a687a07f5d 100644 --- a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj +++ b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj @@ -66,12 +66,10 @@ - - Common\System\Linq\SkipTakeData.cs - - - Common\System\Diagnostics\DebuggerAttributes.cs - + + diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index e3a79752a63d8..e8b2eae72889e 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -8,39 +8,28 @@ true - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs - - - Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs - - - Common\Interop\Windows\Kernel32\Interop.GlobalLock.cs - - - Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs - - - Common\Interop\Windows\Ole32\Interop.CoGetObjectContext.cs - - - Common\Interop\Windows\Ole32\Interop.CoMarshalInterface.cs - - - Common\Interop\Windows\Ole32\Interop.CoUnmarshalInterface.cs - - - Common\Interop\Windows\Ole32\Interop.CreateStreamOnHGlobal.cs - - - Common\Interop\Windows\Ole32\Interop.GetHGlobalFromStream.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs - + + + + + + + + + + + @@ -87,4 +76,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Memory/src/System.Memory.csproj b/src/libraries/System.Memory/src/System.Memory.csproj index bada3e64b157c..a17e97c571376 100644 --- a/src/libraries/System.Memory/src/System.Memory.csproj +++ b/src/libraries/System.Memory/src/System.Memory.csproj @@ -34,11 +34,10 @@ - - Common\System\Buffers\ArrayBufferWriter.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj index ce1cdff0d5c2b..d9b36dc5649f8 100644 --- a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj +++ b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj @@ -15,9 +15,11 @@ - + - + @@ -169,9 +171,8 @@ - - ReadOnlySpan\StringTests.cs - + @@ -260,11 +261,9 @@ - - Common\System\Buffers\NativeMemoryManager.cs - - - Common\System\MutableDecimal.cs - + + - \ No newline at end of file + diff --git a/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj b/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj index 278e36d4e102c..31339ec9ea86c 100644 --- a/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj @@ -10,32 +10,23 @@ - - Common\System\Net\Capability.Security.cs - - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.Certificates.cs - - - Common\System\Net\Configuration.Http.cs - - - Common\System\Net\Configuration.Security.cs - - - Common\System\Net\Http\LoopbackServer.cs - - - Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs - - - Common\System\Net\Http\GenericLoopbackServer.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - + + + + + + + + + diff --git a/src/libraries/System.Net.Http.Json/tests/UnitTests/System.Net.Http.Json.Unit.Tests.csproj b/src/libraries/System.Net.Http.Json/tests/UnitTests/System.Net.Http.Json.Unit.Tests.csproj index 4b7b36a6be21f..259c326f7bba2 100644 --- a/src/libraries/System.Net.Http.Json/tests/UnitTests/System.Net.Http.Json.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http.Json/tests/UnitTests/System.Net.Http.Json.Unit.Tests.csproj @@ -7,16 +7,13 @@ - - ProductionCode\System\ArraySegmentExtensions.netstandard.cs - + - - ProductionCode\System\Net\Http\Json\TranscodingReadStream.cs - - - ProductionCode\System\Net\Http\Json\TranscodingWriteStream.cs - + + 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 c402b8d09db8a..6346f2e09bb24 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 @@ -10,84 +10,58 @@ annotations - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates_types.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates.cs - - - Common\Interop\Windows\Kernel32\Interop.FormatMessage.cs - - - Common\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs - - - Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs - - - Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs - - - Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs - - - Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs - - - Common\Interop\Windows\WinHttp\Interop.winhttp.cs - - - Common\System\CharArrayHelpers.cs - - - Common\System\StringExtensions.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - - - Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs - - - Common\System\Net\Http\HttpStatusDescription.cs - - - Common\System\Net\SecurityProtocol.cs - - - Common\System\Net\UriScheme.cs - - - Common\System\Net\Http\HttpHandlerDefaults.cs - - - Common\System\Net\Http\NoWriteNoSeekStreamContent.cs - - - Common\System\Net\Http\WinInetProxyHelper.cs - - - Common\System\Net\Security\CertificateHelper.cs - - - Common\System\Net\Security\CertificateHelper.Windows.cs - - - Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs - - - Common\System\Threading\Tasks\RendezvousAwaitable.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103,12 +77,10 @@ - - Common\System\IO\StreamHelpers.CopyValidation.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - + + diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj index 66515bbd3e1bf..24d4bac34b115 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj @@ -6,194 +6,133 @@ 8.0 - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.Http.cs - + + - - Common\System\Net\Http\HttpHandlerDefaults.cs - - - Common\System\IO\DelegateStream.cs - - - Common\System\Net\Configuration.Certificates.cs - - - Common\System\Net\Configuration.Security.cs - - - Common\System\Net\Configuration.Sockets.cs - - - Common\System\Net\Capability.Security.cs - - - Common\System\Net\Capability.Security.Windows.cs - - - Common\System\Net\EventSourceTestLogging.cs - - - Common\System\Net\HttpsTestServer.cs - - - Common\System\Net\RemoteServerQuery.cs - - - Common\System\Net\VerboseTestLogging.cs - - - Common\System\Net\TestWebProxies.cs - - - Common\System\Net\StreamArrayExtensions.cs - - - Common\System\Net\Http\ByteAtATimeContent.cs - - - Common\System\Net\Http\ChannelBindingAwareContent.cs - - - Common\System\Net\Http\CustomContent.cs - - - Common\System\Net\Http\DefaultCredentialsTest.cs - - - Common\System\Net\Http\DribbleStream.cs - - - Common\System\Net\Http\GenericLoopbackServer.cs - - - Common\System\Net\Http\HttpClientHandlerTestBase.cs - - - Common\System\Net\Http\Http2Frames.cs - - - Common\System\Net\Http\HPackEncoder.cs - - - Common\System\Net\Http\Http2LoopbackServer.cs - - - Common\System\Net\Http\Http2LoopbackConnection.cs - - - Common\System\Net\Http\QPackTestDecoder.cs - - - Common\System\Net\Http\QPackTestEncoder.cs - - - Common\System\Net\Http\HuffmanDecoder.cs - - - Common\System\Net\Http\HuffmanEncoder.cs - - - Common\System\Net\Http\HttpClientHandlerTest.cs - - - Common\System\Net\Http\HttpClientHandlerTest.AcceptAllCerts.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Asynchrony.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Authentication.cs - - - Common\System\Net\Http\HttpClientHandlerTest.AutoRedirect.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Cancellation.cs - - - Common\System\Net\Http\HttpClientHandlerTest.ClientCertificates.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Cookies.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Decompression.cs - - - Common\System\Net\Http\HttpClientHandlerTest.DefaultProxyCredentials.cs - - - Common\System\Net\Http\HttpClientHandlerTest.MaxConnectionsPerServer.cs - - - Common\System\Net\Http\HttpClientHandlerTest.MaxResponseHeadersLength.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Proxy.cs - - - Common\System\Net\Http\HttpClientHandlerTest.ServerCertificates.cs - - - Common\System\Net\Http\HttpClientHandlerTest.SslProtocols.cs - - - Common\System\Net\Http\HttpProtocolTests.cs - - - Common\System\Net\Http\HttpClient.SelectedSitesTest.cs - - - Common\System\Net\Http\HttpClientEKUTest.cs - - - Common\System\Net\Http\HttpRetryProtocolTests.cs - - - Common\System\Net\Http\IdnaProtocolTests.cs - - - Common\System\Net\Http\LoopbackProxyServer.cs - - - Common\System\Net\Http\LoopbackServer.cs - - - Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs - - - Common\System\Net\Http\TestHelper.cs - - - Common\System\Net\Http\PostScenarioTest.cs - - - Common\System\Net\Http\RepeatedFlushContent.cs - - - Common\System\Net\Http\ResponseStreamTest.cs - - - Common\System\Net\Http\SchSendAuxRecordHttpTest.cs - - - Common\System\Net\Http\SyncBlockingContent.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - - - Common\System\Threading\TrackingSynchronizationContext.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj index 9d1e3ba1e79cf..d63e2bbff8d60 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj @@ -11,138 +11,94 @@ - - CommonTest\System\Net\SslProtocolSupport.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates_types.cs - - - Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs - - - Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs - - - Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs - - - Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs - - - Common\System\CharArrayHelpers.cs - - - Common\System\StringExtensions.cs - - - Common\System\IO\StreamHelpers.CopyValidation.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - - - Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs - - - Common\System\Net\HttpStatusDescription.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\UriScheme.cs - - - Common\System\Net\SecurityProtocol.cs - - - Common\System\Net\Http\HttpHandlerDefaults.cs - - - Common\System\Net\Http\NoWriteNoSeekStreamContent.cs - - - Common\System\Net\Http\WinInetProxyHelper.cs - - - Common\System\Net\Security\CertificateHelper.cs - - - Common\System\Net\Security\CertificateHelper.Windows.cs - - - Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs - - - Common\System\Text\SimpleRegex.cs - - - Common\System\Threading\Tasks\RendezvousAwaitable.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - - - ProductionCode\WinHttpAuthHelper.cs - - - ProductionCode\WinHttpCertificateHelper.cs - - - ProductionCode\WinHttpChannelBinding.cs - - - ProductionCode\WinHttpCookieContainerAdapter.cs - - - ProductionCode\WinHttpException.cs - - - ProductionCode\WinHttpHandler.cs - - - ProductionCode\WinHttpRequestCallback.cs - - - ProductionCode\WinHttpRequestState.cs - - - ProductionCode\WinHttpRequestStream.cs - - - ProductionCode\WinHttpResponseHeaderReader.cs - - - ProductionCode\WinHttpResponseParser.cs - - - ProductionCode\WinHttpResponseStream.cs - - - ProductionCode\WinHttpTraceHelper.cs - - - ProductionCode\WinHttpTransportContext.cs - - - ProductionCode\HttpWindowsProxy.cs - - - ProductionCode\FailedProxyCache.cs - - - ProductionCode\IMultiWebProxy.cs - - - ProductionCode\MultiProxy.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj index cebece24f4e13..fc7063289b6ee 100644 --- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj +++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj @@ -89,33 +89,24 @@ - - Common\System\IO\StreamHelpers.CopyValidation.cs - - - Common\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs - - - Common\System\IO\DelegatingStream.cs - - - Common\System\IO\ReadOnlyMemoryStream.cs - - - Common\System\Text\StringBuilderCache.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\HttpDateParser.cs - - - Common\System\Text\SimpleRegex.cs - - - Common\System\HexConverter.cs - + + + + + + + + + Common\System\Net\ArrayBuffer.cs @@ -169,276 +160,189 @@ - - Common\System\Net\NTAuthentication.Common.cs - - - Common\System\Net\ContextFlagsPal.cs - - - Common\System\Net\Http\aspnetcore\IHttpHeadersHandler.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs - - - Common\System\Net\Http\aspnetcore\Http3\Http3SettingType.cs - - - Common\System\Net\Http\aspnetcore\Http3\Http3StreamType.cs - - - Common\System\Net\Http\aspnetcore\Http3\Helpers\VariableLengthIntegerHelper.cs - - - Common\System\Net\Http\aspnetcore\Http3\Frames\Http3ErrorCode.cs - - - Common\System\Net\Http\aspnetcore\Http3\Frames\Http3Frame.cs - - - Common\System\Net\Http\aspnetcore\Http3\Frames\Http3FrameType.cs - - - Common\System\Net\Http\aspnetcore\Http3\QPack\HeaderField.cs - - - Common\System\Net\Http\aspnetcore\Http3\QPack\QPackDecoder.cs - - - Common\System\Net\Http\aspnetcore\Http3\QPack\QPackDecodingException.cs - - - Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncoder.cs - - - Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncodingException.cs - - - Common\System\Net\Http\aspnetcore\Http3\QPack\H3StaticTable.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicConnection.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicListener.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicStream.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicException.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs - - - Common\System\Net\SecurityStatusPal.cs - - - Common\System\Net\Security\SSPIHandleCache.cs - - - Common\System\Net\Security\NetEventSource.Security.cs - - - Common\System\Net\ExceptionCheck.cs - - - Common\System\Collections\Generic\BidirectionalDictionary.cs - - - Common\System\NotImplemented.cs - - - Common\System\Net\NegotiationInfoClass.cs - - - Common\System\Net\InternalException.cs - - - Common\System\Net\Logging\DebugThreadTracking.cs - - - Common\System\Net\DebugSafeHandle.cs - - - Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs - - - Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs - - - Common\System\Text\ValueStringBuilder.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\Interop\Linux\Interop.Libraries.cs - + - - Common\System\Net\ContextFlagsAdapterPal.Unix.cs - - - Common\System\Net\Security\Unix\SafeFreeCredentials.cs - - - Common\System\Net\Security\Unix\SafeDeleteContext.cs - - - Common\System\Net\Security\NegotiateStreamPal.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs - - - Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs - - - Common\System\Net\Security\Unix\SecChannelBindings.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs - - - Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs - + + + + + + + + + + + + @@ -447,383 +351,263 @@ - - Common\Interop\OSX\Interop.CoreFoundation.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFData.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFDictionary.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFProxy.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFUrl.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFString.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFString.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFError.cs - - - Common\Interop\OSX\Interop.RunLoop.cs - - - Common\Interop\OSX\Interop.Libraries.cs - - - Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs - + + + + + + + + + + + + - - Common\System\Net\HttpStatusDescription.cs - + - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates_types.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates.cs - - - Common\Interop\Windows\Kernel32\Interop.FormatMessage.cs - - - Common\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs - - - Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs - - - Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs - - - Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs - - - Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs - - - Common\Interop\Windows\WinHttp\Interop.winhttp.cs - - - Common\System\CharArrayHelpers.cs - - - Common\System\StringExtensions.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - - - Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs - - - Common\System\Net\SecurityProtocol.cs - - - Common\System\Net\UriScheme.cs - - - Common\System\Net\Http\HttpHandlerDefaults.cs - - - Common\System\Net\Http\NoWriteNoSeekStreamContent.cs - - - Common\System\Net\Http\WinInetProxyHelper.cs - - - Common\System\Net\Security\CertificateHelper.cs - - - Common\System\Net\Security\CertificateHelper.Windows.cs - - - Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs - - - Common\System\Threading\Tasks\RendezvousAwaitable.cs - - - System\System\Threading\Tasks\TaskToApm.cs - - - Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs - - - Common\System\Net\Security\SecurityBuffer.Windows.cs - - - Common\System\Net\Security\SecurityBufferType.Windows.cs - - - Common\System\Net\Security\SecurityContextTokenHandle.cs - - - Common\System\Net\SecurityStatusAdapterPal.Windows.cs - - - Common\System\Net\ContextFlagsAdapterPal.Windows.cs - - - Common\System\Net\Security\NegotiateStreamPal.Windows.cs - - - Common\System\Net\Security\NetEventSource.Security.Windows.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs - - - Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs - - - Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs - - - Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs - - - Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs - - - Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs - - - Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs - - - Common\Interop\Windows\SspiCli\ISSPIInterface.cs - - - Common\Interop\Windows\SspiCli\SSPIAuthType.cs - - - Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs - - - Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs - - - Common\Interop\Windows\SspiCli\SafeDeleteContext.cs - - - Common\Interop\Windows\SspiCli\GlobalSSPI.cs - - - Common\Interop\Windows\SspiCli\Interop.SSPI.cs - - - Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs - - - Common\Interop\Windows\SspiCli\SSPIWrapper.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\System\Net\Mail\DomainLiteralReader.cs - - - Common\System\Net\Mail\DotAtomReader.cs - - - Common\System\Net\Mail\MailAddress.cs - - - Common\System\Net\Mail\MailAddressParser.cs - - - Common\System\Net\Mail\MailBnfHelper.cs - - - Common\System\Net\Mail\QuotedPairReader.cs - - - Common\System\Net\Mail\QuotedStringFormatReader.cs - - - Common\System\Net\Mail\WhitespaceReader.cs - - - Common\System\Threading\Tasks\TaskCompletionSourceWithCancellation.cs - + + + + + + + + + - - Common\Interop\Unix\StrongToWeakReference.cs - - - Common\System\Net\SecurityProtocol.cs - - - Common\System\Net\UriScheme.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.IOErrors.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Native\Interop.Close.cs - - - Common\Interop\Unix\System.Native\Interop.Open.cs - - - Common\Interop\Unix\System.Native\Interop.OpenFlags.cs - - - Common\Interop\Unix\System.Native\Interop.Pipe.cs - - - Common\Interop\Unix\libc\Interop.Poll.cs - - - Common\Interop\Unix\libc\Interop.Read.cs - - - Common\Interop\Unix\libc\Interop.Write.cs - - - Common\System\CharArrayHelpers.cs - - - Common\System\StringExtensions.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - - - Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs - - - Common\System\Net\HttpStatusDescription.cs - - - Common\System\Net\Http\HttpHandlerDefaults.cs - - - Common\System\Net\Http\NoWriteNoSeekStreamContent.cs - - - Common\System\Net\Http\TlsCertificateExtensions - - - Common\System\Net\Security\CertificateHelper.cs - - - Common\System\Net\Security\CertificateHelper.Unix.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - + + + + + + + + + + + + + + + + + + + + + + + + - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Ssl.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtx.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SetProtocolOptions.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.Initialization.cs - - - Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs - - - Common\System\Net\Security\CertificateValidation.Unix.cs - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj b/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj index 38385b5d780a7..f741b1160caf8 100644 --- a/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj @@ -5,8 +5,7 @@ - - Common\System\Net\EnterpriseTests\EnterpriseTestConfiguration.cs - + \ No newline at end of file diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index 6aa7ae56441b3..5bfcca1c8879e 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -8,285 +8,198 @@ $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\System\Net\Http\aspnetcore\NetEventSource.Common.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs - - - Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs - - - Common\System\Net\Http\aspnetcore\Quic\NetEventSource.Quic.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicConnection.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicListener.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicStream.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicException.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs - - - Common\System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs - - - Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs - - - System\System\Threading\Tasks\TaskToApm.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs - - - Common\System\Buffers\NativeMemoryManager.cs - - - Common\System\Diagnostics\Tracing\TestEventListener.cs - - - Common\System\Diagnostics\Tracing\ConsoleEventListener.cs - - - Common\System\IO\DelegateStream.cs - - - Common\System\Net\RemoteServerQuery.cs - - - Common\System\Net\Configuration.Certificates.cs - - - Common\System\Net\EventSourceTestLogging.cs - - - Common\System\Net\HttpsTestServer.cs - - - Common\System\Net\Capability.Security.cs - - - Common\System\Net\Capability.Security.Windows.cs - - - Common\System\Net\Capability.Security.Unix.cs - - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.Http.cs - - - Common\System\Net\Configuration.Security.cs - - - Common\System\Net\Configuration.Sockets.cs - - - Common\System\Net\TestWebProxies.cs - - - Common\System\Net\VerboseTestLogging.cs - - - Common\System\Net\Http\LoopbackProxyServer.cs - - - Common\System\Net\Http\LoopbackServer.cs - - - Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs - - - Common\System\Net\Http\GenericLoopbackServer.cs - - - Common\System\Net\Http\HttpClientHandlerTestBase.cs - - - Common\System\Net\Http\TestHelper.cs - - - Common\System\Threading\TrackingSynchronizationContext.cs - - - Common\System\Threading\Tasks\GetStateMachineData.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\System\Net\Http\ChannelBindingAwareContent.cs - - - Common\System\Net\Http\DribbleStream.cs - - - Common\System\Net\Http\CustomContent.cs - + + + - - Common\System\Net\Http\ByteAtATimeContent.cs - - - Common\System\Net\Http\HttpClientHandlerTest.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Asynchrony.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Authentication.cs - - - Common\System\Net\Http\HttpClientHandlerTest.AutoRedirect.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Cancellation.cs - - - Common\System\Net\Http\HttpClientHandlerTest.ClientCertificates.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Cookies.cs - - - Common\System\Net\Http\HttpClientHandlerTest.DefaultProxyCredentials.cs - + + + + + + + + + - - Common\System\Net\Http\HttpClientHandlerTest.MaxConnectionsPerServer.cs - - - Common\System\Net\Http\HttpClientHandlerTest.MaxResponseHeadersLength.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Proxy.cs - + + + - - Common\System\Net\Http\HttpClientHandlerTest.ServerCertificates.cs - - - Common\System\Net\Http\HttpClientHandlerTest.SslProtocols.cs - + + - - Common\System\Net\Http\HttpClientEKUTest.cs - - - Common\System\Net\Http\HttpClient.SelectedSitesTest.cs - + + - - Common\System\Net\Http\HttpRetryProtocolTests.cs - - - Common\System\Net\Http\IdnaProtocolTests.cs - - - Common\System\Net\Http\HttpProtocolTests.cs - + + + @@ -294,98 +207,76 @@ - - Common\System\Net\Http\PostScenarioTest.cs - + - - Common\System\Net\Http\RepeatedFlushContent.cs - - - Common\System\Net\Http\ResponseStreamTest.cs - - - Common\System\Net\Http\SchSendAuxRecordHttpTest.cs - + + + - - Common\System\Net\Http\SyncBlockingContent.cs - - - Common\System\Net\Http\DefaultCredentialsTest.cs - + + - - Common\Interop\Windows\Interop.Libraries.cs - + - - Common\Interop\Linux\Interop.Libraries.cs - + - - Common\Interop\OSX\Interop.Libraries.cs - + - - Common\System\Net\Http\HttpClientHandlerTest.AcceptAllCerts.cs - - - Common\System\Net\Http\HttpClientHandlerTest.Decompression.cs - + + - - Common\System\Net\Http\Http2Frames.cs - - - Common\System\Net\Http\HPackEncoder.cs - - - Common\System\Net\Http\QPackTestDecoder.cs - - - Common\System\Net\Http\QPackTestEncoder.cs - - - Common\System\Net\Http\Http2LoopbackServer.cs - - - Common\System\Net\Http\Http2LoopbackConnection.cs - - - Common\System\Net\Http\Http3LoopbackServer.cs - - - Common\System\Net\Http\Http3LoopbackConnection.cs - - - Common\System\Net\Http\Http3LoopbackStream.cs - - - Common\System\Net\Http\HuffmanDecoder.cs - - - Common\System\Net\Http\HuffmanEncoder.cs - + + + + + + + + + + + diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj index f8dc22a02beda..c14ef4c1dd220 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj @@ -12,336 +12,226 @@ - - Common\System\HexConverter.cs - - - ProductionCode\Common\System\NotImplemented.cs - - - ProductionCode\Common\System\CharArrayHelpers.cs - - - ProductionCode\Common\System\StringExtensions.cs - - - ProductionCode\Common\System\Text\StringBuilderCache.cs - - - ProductionCode\Common\System\IO\StreamHelpers.CopyValidation.cs - - - Common\System\Net\ArrayBuffer.cs - - - ProductionCode\Common\System\Net\InternalException.cs - - - ProductionCode\Common\System\Net\HttpDateParser.cs - - - ProductionCode\Common\System\Net\HttpKnownHeaderNames.cs - - - ProductionCode\Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs - - - ProductionCode\Common\System\Net\HttpStatusDescription.cs - - - ProductionCode\Common\System\Net\Logging\NetEventSource.Common.cs - - - ProductionCode\Common\System\Net\SecurityProtocol.cs - - - ProductionCode\Common\System\Net\UriScheme.cs - - - Common\System\Text\SimpleRegex.cs - - - Common\System\ShouldNotBeInvokedException.cs - - - Common\System\Net\Http\HPackEncoder.cs - - - Common\System\Net\Http\HuffmanEncoder.cs - - - ProductionCode\Common\src\System\Net\Mail\MailAddress.cs - - - ProductionCode\Common\src\System\Net\Mail\DomainLiteralReader.cs - - - ProductionCode\Common\src\System\Net\Mail\DotAtomReader.cs - - - ProductionCode\Common\src\System\Net\Mail\MailAddressParser.cs - - - ProductionCode\Common\src\System\Net\Mail\MailBnfHelper.cs - - - ProductionCode\Common\src\System\Net\Mail\QuotedPairReader.cs - - - ProductionCode\Common\src\System\Net\Mail\QuotedStringFormatReader.cs - - - ProductionCode\Common\src\System\Net\Mail\WhitespaceReader.cs - - - ProductionCode\Common\System\Threading\Tasks\TaskToApm.cs - - - ProductionCode\System\Net\Http\SocketsHttpHandler\AuthenticationHelper.Digest.cs - - - ProductionCode\System\Net\Http\ByteArrayContent.cs - - - ProductionCode\System\Net\Http\ClientCertificateOption.cs - - - ProductionCode\System\Net\Http\DelegatingHandler.cs - - - ProductionCode\System\IO\DelegatingStream.cs - - - ProductionCode\System\Net\Http\ByteArrayHelpers.cs - - - ProductionCode\System\Net\Http\FormUrlEncodedContent.cs - - - ProductionCode\System\Net\Http\Headers\AltSvcHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\AltSvcHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\AuthenticationHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\BaseHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\ByteArrayHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\CacheControlHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\CacheControlHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\ContentDispositionHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\ContentRangeHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\DateHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\EntityTagHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\GenericHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\HeaderDescriptor.cs - - - ProductionCode\System\Net\Http\Headers\HeaderUtilities.cs - - - ProductionCode\System\Net\Http\Headers\HttpContentHeaders.cs - - - ProductionCode\System\Net\Http\Headers\HttpGeneralHeaders.cs - - - ProductionCode\System\Net\Http\Headers\HttpHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\HttpHeaders.cs - - - ProductionCode\System\Net\Http\Headers\HttpHeaderType.cs - - - ProductionCode\System\Net\Http\Headers\HttpHeaderValueCollection.cs - - - ProductionCode\System\Net\Http\Headers\HttpRequestHeaders.cs - - - ProductionCode\System\Net\Http\Headers\HttpResponseHeaders.cs - - - ProductionCode\System\Net\Http\Headers\Int32NumberHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\Int64NumberHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\KnownHeaders.cs - - - ProductionCode\System\Net\Http\Headers\KnownHeader.cs - - - ProductionCode\System\Net\Http\Headers\MediaTypeHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\MediaTypeHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\MediaTypeWithQualityHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\NameValueHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\.cs - - - ProductionCode\System\Net\Http\Headers\ObjectCollection.cs - - - ProductionCode\System\Net\Http\Headers\ProductHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\ProductInfoHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\ProductInfoHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\RangeConditionHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\RangeHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\RangeItemHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\RetryConditionHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\StringWithQualityHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\TimeSpanHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\TransferCodingHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\TransferCodingHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\TransferCodingWithQualityHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\UriHeaderParser.cs - - - ProductionCode\System\Net\Http\Headers\ViaHeaderValue.cs - - - ProductionCode\System\Net\Http\Headers\WarningHeaderValue.cs - - - ProductionCode\System\Net\Http\HttpClient.cs - - - ProductionCode\System\Net\Http\HttpCompletionOption.cs - - - ProductionCode\System\Net\Http\HttpContent.cs - - - ProductionCode\System\Net\Http\HttpMessageHandler.cs - - - ProductionCode\System\Net\Http\HttpMessageInvoker.cs - - - ProductionCode\System\Net\Http\HttpMethod.cs - - - ProductionCode\System\Net\Http\HttpParseResult.cs - - - ProductionCode\System\Net\Http\HttpRequestException.cs - - - ProductionCode\System\Net\Http\RequestRetryType.cs - - - ProductionCode\System\Net\Http\HttpRequestMessage.cs - - - ProductionCode\System\Net\Http\HttpResponseMessage.cs - - - ProductionCode\System\Net\Http\HttpRuleParser.cs - - - ProductionCode\System\Net\Http\HttpUtilities.cs - - - ProductionCode\System\Net\Http\MessageProcessingHandler.cs - - - ProductionCode\System\Net\Http\MultipartContent.cs - - - ProductionCode\System\Net\Http\MultipartFormDataContent.cs - - - ProductionCode\System\Net\Http\NetEventSource.Http.cs - - - ProductionCode\System\Net\Http\StreamContent.cs - - - ProductionCode\System\Net\Http\StreamToStreamCopy.cs - - - ProductionCode\System\Net\Http\StringContent.cs - - - ProductionCode\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.cs - - - ProductionCode\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.Unix.cs - - - ProductionCode\System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.Windows.cs - - - ProductionCode\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.cs - - - ProductionCode\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.OSX.cs - - - ProductionCode\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Unix.cs - - - ProductionCode\System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Windows.cs - - - ProductionCode\System\Net\Http\HttpHandlerDefaults.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -400,18 +290,14 @@ - - HPack\DynamicTableTest.cs - - - HPack\HPackDecoderTest.cs - - - HPack\HPackIntegerTest.cs - - - HPack\HuffmanDecodingTests.cs - + + + + @@ -420,122 +306,83 @@ - - ProductionCode\System\Net\Http\HttpNoProxy.cs - - - ProductionCode\System\Net\Http\HttpWindowsProxy.cs - - - ProductionCode\System\Net\Http\IMultiWebProxy.cs - - - ProductionCode\System\Net\Http\MultiProxy.cs - - - ProductionCode\System\Net\Http\FailedProxyCache.cs - - - ProductionCode\System\Net\Http\WinHttpException.cs - - - ProductionCode\System\Net\Http\WinHttpTraceHelper.cs - - - ProductionCode\Common\Interop\Windows\Interop.Libraries.cs - - - ProductionCode\Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs - - - ProductionCode\Common\Interop\Windows\Crypt32\Interop.certificates_types.cs - - - ProductionCode\Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs - - - ProductionCode\Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs - - - ProductionCode\Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs - - - ProductionCode\Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs - - - Common\System\Net\Http\WinInetProxyHelper.cs - - - Common\System\Net\Http\aspnetcore\IHttpHeadersHandler.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs - - - Common\System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs - - - Common\System\Net\Http\aspnetcore\Http3\QPack\H3StaticTable.cs - - - Common\System\Net\Http\aspnetcore\Http3\QPack\HeaderField.cs - - - Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncoder.cs - - - Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncodingException.cs - - - Common\System\Text\ValueStringBuilder.cs - - - WinHttpHandler\UnitTests\FakeInterop.cs - - - WinHttpHandler\UnitTests\FakeRegistry.cs - - - WinHttpHandler\UnitTests\FakeSafeWinHttpHandle.cs - - - WinHttpHandler\UnitTests\TestControl.cs - - - WinHttpHandler\UnitTests\APICallHistory.cs - - - WinHttpHandler\UnitTests\TestServer.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj index d88ccb13f9678..c92d42838a74f 100644 --- a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj +++ b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj @@ -56,49 +56,35 @@ - - Common\System\StringExtensions.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\CookieComparer.cs - - - Common\System\Net\CookieFields.cs - - - Common\System\Net\CookieParser.cs - - - Common\System\Net\CaseInsensitiveAscii.cs - - - Common\System\Net\ExceptionCheck.cs - - - Common\System\Net\HttpStatusDescription.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - - - Common\System\Net\LazyAsyncResult.cs - - - Common\System\Net\UriScheme.cs - - - Common\System\Net\WebHeaderEncoding.cs - - - Common\System\Net\WebSockets\WebSocketValidate.cs - + + + + + + + + + + + + + - - Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs - + @@ -114,12 +100,10 @@ - - Common\System\Net\DebugSafeHandle.cs - - - Common\System\Net\InternalException.cs - + + @@ -130,191 +114,130 @@ - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs - - - Common\Interop\Windows\Interop.BOOL.cs - - - Common\Interop\Windows\WebSocket\Interop.Structs.cs - - - Common\Interop\Windows\WebSocket\Interop.WebSocketAbortHandle.cs - - - Common\Interop\Windows\WebSocket\Interop.WebSocketBeginClientHandshake.cs - - - Common\Interop\Windows\WebSocket\Interop.WebSocketBeginServerHandshake.cs - - - Common\Interop\Windows\WebSocket\Interop.WebSocketCompleteAction.cs - - - Common\Interop\Windows\WebSocket\Interop.WebSocketCreateClientHandle.cs - - - Common\Interop\Windows\WebSocket\Interop.WebSocketCreateServerHandle.cs - - - Common\Interop\Windows\WebSocket\Interop.WebSocketDeleteHandle.cs - - - Common\Interop\Windows\WebSocket\Interop.WebSocketEndServerHandshake.cs - - - Common\Interop\Windows\WebSocket\Interop.WebSocketGetAction.cs - - - Common\Interop\Windows\WebSocket\Interop.WebSocketReceive.cs - - - Common\Interop\Windows\WebSocket\Interop.WebSocketSend.cs - - - Common\Interop\Windows\HttpApi\Interop.ErrorCodes.cs - - - Common\Interop\Windows\HttpApi\Interop.HttpApi.cs - - - Common\Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs - - - Common\Interop\Windows\Kernel32\Interop.CancelIoEx.cs - - - Common\Interop\Windows\Kernel32\Interop.LoadLibraryEx_IntPtr.cs - - - Common\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs - + + + + + + + + + + + + + + + + + + + + + + - - Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs - - - Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs - - - Common\System\Collections\Generic\BidirectionalDictionary.cs - - - Common\System\NotImplemented.cs - - - Common\System\Net\Logging\DebugThreadTracking.cs - - - Common\System\Net\ContextFlagsPal.cs - - - Common\System\Net\NegotiationInfoClass.cs - - - Common\System\Net\NTAuthentication.Common.cs - - - Common\System\Net\SecurityStatusPal.cs - - - Common\System\Net\Security\SecurityBuffer.Windows.cs - - - Common\System\Net\Security\SecurityBufferType.Windows.cs - - - Common\System\Net\Security\SSPIHandleCache.cs - - - Common\System\Net\Security\NetEventSource.Security.cs - + + + + + + + + + + + + + - - Common\System\Net\Security\SecurityContextTokenHandle.cs - - - Common\System\Net\SecurityStatusAdapterPal.Windows.cs - - - Common\System\Net\ContextFlagsAdapterPal.Windows.cs - - - Common\System\Net\Security\NegotiateStreamPal.Windows.cs - - - Common\System\Net\Security\NetEventSource.Security.Windows.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates_types.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs - - - Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs - - - Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs - - - Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs - - - Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs - - - Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs - - - Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs - - - Common\Interop\Windows\SspiCli\ISSPIInterface.cs - - - Common\Interop\Windows\SspiCli\SSPIAuthType.cs - - - Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs - - - Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs - - - Common\Interop\Windows\SspiCli\SafeDeleteContext.cs - - - Common\Interop\Windows\SspiCli\GlobalSSPI.cs - - - Common\Interop\Windows\SspiCli\Interop.SSPI.cs - - - Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs - - - Common\Interop\Windows\SspiCli\SSPIWrapper.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -335,11 +258,10 @@ - - Common\System\Threading\Tasks\TaskToApm.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj index fb2211a525809..b9a1377745054 100644 --- a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj +++ b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj @@ -23,11 +23,10 @@ - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj index babcb1dc6f115..adc2595232090 100644 --- a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj +++ b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj @@ -63,231 +63,158 @@ - - Common\System\Net\TlsStream.cs - - - Common\System\Net\InternalException.cs - - - Common\System\Net\LazyAsyncResult.cs - - - Common\System\Net\ContextAwareResult.cs - - - Common\System\Net\Mail\MailBnfHelper.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\Mail\DotAtomReader.cs - - - Common\System\Net\Mail\MailAddressParser.cs - - - Common\System\Net\Mail\QuotedStringFormatReader.cs - - - Common\System\Net\Mail\WhitespaceReader.cs - - - Common\System\Net\Mail\QuotedPairReader.cs - - - Common\System\Net\Mail\DomainLiteralReader.cs - - - Common\System\Net\SecurityProtocol.cs - - - Common\System\StringExtensions.cs - - - Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs - - - Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs - - - Common\System\Net\DebugSafeHandle.cs - - - Common\System\Net\ExceptionCheck.cs - - - Common\System\Collections\Generic\BidirectionalDictionary.cs - - - Common\System\NotImplemented.cs - - - Common\System\Net\Logging\DebugThreadTracking.cs - - - Common\System\Net\ContextFlagsPal.cs - - - Common\System\Net\NegotiationInfoClass.cs - - - Common\System\Net\NTAuthentication.Common.cs - - - Common\System\Net\SecurityStatusPal.cs - - - Common\System\Net\Security\SSPIHandleCache.cs - - - Common\System\Net\Security\NetEventSource.Security.cs - - - Common\System\HexConverter.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\System\Net\ContextAwareResult.Unix.cs - - - Common\System\Net\ContextFlagsAdapterPal.Unix.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs - - - Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs - - - Common\System\Net\Security\Unix\SafeFreeCredentials.cs - - - Common\System\Net\Security\Unix\SafeDeleteContext.cs - - - Common\System\Net\Security\NegotiateStreamPal.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs - - - Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs - - - Common\System\Net\Security\Unix\SecChannelBindings.cs - + + + + + + + + + + + + + + - - Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs - - - Common\System\Net\Security\SecurityBuffer.Windows.cs - - - Common\System\Net\Security\SecurityBufferType.Windows.cs - - - Common\System\Net\Security\SecurityContextTokenHandle.cs - - - Common\System\Net\ContextAwareResult.Windows.cs - - - Common\System\Net\SecurityStatusAdapterPal.Windows.cs - - - Common\System\Net\ContextFlagsAdapterPal.Windows.cs - - - Common\System\Net\Security\NegotiateStreamPal.Windows.cs - - - Common\System\Net\Security\NetEventSource.Security.Windows.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates_types.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs - - - Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs - - - Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs - - - Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs - - - Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs - - - Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs - - - Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs - - - Common\Interop\Windows\SspiCli\ISSPIInterface.cs - - - Common\Interop\Windows\SspiCli\SSPIAuthType.cs - - - Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs - - - Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs - - - Common\Interop\Windows\SspiCli\SafeDeleteContext.cs - - - Common\Interop\Windows\SspiCli\GlobalSSPI.cs - - - Common\Interop\Windows\SspiCli\Interop.SSPI.cs - - - Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs - - - Common\Interop\Windows\SspiCli\SSPIWrapper.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj index a11dcc181d3e5..b68e44c598cf6 100644 --- a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj +++ b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj @@ -22,15 +22,12 @@ - - Common\System\Diagnostics\Tracing\TestEventListener.cs - - - Common\System\IO\TempFile.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - + + + diff --git a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj index 6750ab32a4ec4..5a721973b144b 100644 --- a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj +++ b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj @@ -27,342 +27,232 @@ - - ProductionCode\Base64Stream.cs - - - ProductionCode\SmtpException.cs - - - ProductionCode\SmtpStatusCode.cs - - - ProductionCode\DelegatedStream.cs - - - ProductionCode\MailAddress.cs - - - ProductionCode\NetEventSource.Mail.cs - - - ProductionCode\SmtpConnection.Auth.cs - - - ProductionCode\ISmtpAuthenticationModule.cs - - - ProductionCode\SmtpLoginAuthenticationModule.cs - - - ProductionCode\SmtpNegotiateAuthenticationModule.cs - - - ProductionCode\SmtpNtlmAuthenticationModule.cs - - - ProductionCode\MailAddressCollection.cs - - - ProductionCode\MailPriority.cs - - - ProductionCode\MimePart.cs - - - ProductionCode\Base64WriteStateInfo.cs - - - ProductionCode\QuotedPrintableStream.cs - - - ProductionCode\CloseableStream.cs - - - ProductionCode\EightBitStream.cs - - - ProductionCode\EncodedStreamFactory.cs - - - ProductionCode\IEncodableStream.cs - - - ProductionCode\QEncodedStream.cs - - - ProductionCode\WriteStateInfoBase.cs - - - ProductionCode\BaseWriter.cs - - - ProductionCode\TransferEncoding.cs - - - ProductionCode\ContentDisposition.cs - - - ProductionCode\ContentType.cs - - - ProductionCode\DispositionTypeNames.cs - - - ProductionCode\HeaderCollection.cs - - - ProductionCode\MediaTypeNames.cs - - - ProductionCode\MimeBasePart.cs - - - ProductionCode\SmtpDateTime.cs - - - ProductionCode\MultiAsyncResult.cs - - - ProductionCode\TrackingStringDictionary.cs - - - ProductionCode\TrackingValidationObjectDictionary.cs - - - ProductionCode\MailHeaderID.cs - - - ProductionCode\MailHeaderInfo.cs - - - ProductionCode\BufferBuilder.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\System\Net\TlsStream.cs - - - Common\System\Net\InternalException.cs - - - Common\System\Net\LazyAsyncResult.cs - - - Common\System\Net\ContextAwareResult.cs - - - Common\System\Net\Mail\MailBnfHelper.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\Mail\DotAtomReader.cs - - - Common\System\Net\Mail\MailAddressParser.cs - - - Common\System\Net\Mail\QuotedStringFormatReader.cs - - - Common\System\Net\Mail\WhitespaceReader.cs - - - Common\System\Net\Mail\QuotedPairReader.cs - - - Common\System\Net\Mail\DomainLiteralReader.cs - - - Common\System\Net\SecurityProtocol.cs - - - Common\System\StringExtensions.cs - - - Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs - - - Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs - - - Common\System\Net\DebugSafeHandle.cs - - - Common\System\Net\ExceptionCheck.cs - - - Common\System\Collections\Generic\BidirectionalDictionary.cs - - - Common\System\NotImplemented.cs - - - Common\System\Net\Logging\DebugThreadTracking.cs - - - Common\System\Net\ContextFlagsPal.cs - - - Common\System\Net\NegotiationInfoClass.cs - - - Common\System\Net\NTAuthentication.Common.cs - - - Common\System\Net\SecurityStatusPal.cs - - - Common\System\Net\Security\SSPIHandleCache.cs - - - Common\System\Net\Security\NetEventSource.Security.cs - - - Common\System\HexConverter.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\System\Net\ContextAwareResult.Unix.cs - - - Common\System\Net\ContextFlagsAdapterPal.Unix.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs - - - Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs - - - Common\System\Net\Security\Unix\SafeFreeCredentials.cs - - - Common\System\Net\Security\Unix\SafeDeleteContext.cs - - - Common\System\Net\Security\NegotiateStreamPal.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs - - - Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs - - - Common\System\Net\Security\Unix\SecChannelBindings.cs - + + + + + + + + + + + + + + - - Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs - - - Common\System\Net\Security\SecurityBuffer.Windows.cs - - - Common\System\Net\Security\SecurityBufferType.Windows.cs - - - Common\System\Net\Security\SecurityContextTokenHandle.cs - - - Common\System\Net\ContextAwareResult.Windows.cs - - - Common\System\Net\SecurityStatusAdapterPal.Windows.cs - - - Common\System\Net\ContextFlagsAdapterPal.Windows.cs - - - Common\System\Net\Security\NegotiateStreamPal.Windows.cs - - - Common\System\Net\Security\NetEventSource.Security.Windows.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates_types.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs - - - Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs - - - Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs - - - Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs - - - Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs - - - Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs - - - Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs - - - Common\Interop\Windows\SspiCli\ISSPIInterface.cs - - - Common\Interop\Windows\SspiCli\SSPIAuthType.cs - - - Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs - - - Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs - - - Common\Interop\Windows\SspiCli\SafeDeleteContext.cs - - - Common\Interop\Windows\SspiCli\GlobalSSPI.cs - - - Common\Interop\Windows\SspiCli\Interop.SSPI.cs - - - Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs - - - Common\Interop\Windows\SspiCli\SSPIWrapper.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj index e4107a9b1a329..7d5e1cc07d29c 100644 --- a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj +++ b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj @@ -10,140 +10,99 @@ - - Common\System\Net\Logging\DebugThreadTracking.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\InternalException.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - + + + + - - Common\System\Net\Sockets\ProtocolType.cs - - - Common\System\Net\Sockets\SocketType.cs - - - Common\System\Net\IPAddressParserStatics.cs - - - Common\System\Net\IPEndPointStatics.cs - - - Common\System\Net\ByteOrder.cs - + + + + + - - Common\System\Net\DebugSafeHandle.cs - + - - Common\System\Net\Internals\IPAddressExtensions.cs - - - Common\System\Net\Internals\SocketExceptionFactory.Windows.cs - - - Common\System\Net\SocketProtocolSupportPal.Windows - - - Common\System\Net\SocketAddressPal.Windows - + + + + - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\WinSock\AddressInfoHints.cs - - - Common\Interop\Windows\WinSock\hostent.cs - - - Common\Interop\Windows\WinSock\Interop.closesocket.cs - - - Common\Interop\Windows\WinSock\Interop.gethostname.cs - - - Common\Interop\Windows\WinSock\Interop.GetNameInfoW.cs - - - Common\Interop\Windows\WinSock\Interop.GetAddrInfoW.cs - - - Common\Interop\Windows\WinSock\Interop.WSAStartup.cs - - - Common\Interop\Windows\WinSock\Interop.WSASocketW.cs - - - Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs - - - Common\System\Net\Sockets\ProtocolFamily.cs - - - Common\Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs - + + + + + + + + + + + + - - Common\System\Net\InteropIPAddressExtensions.Unix.cs - - - Common\System\Net\Internals\SocketAddressPal.Unix.cs - - - Common\System\Net\SocketProtocolSupportPal.Unix - - - Common\System\Net\Internals\SocketExceptionFactory.cs - - - Common\System\Net\Internals\SocketExceptionFactory.Unix.cs - - - Common\System\Net\Internals\Interop.CheckedAccess.cs - - - Common\Interop\CoreLib\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Native\Interop.Close.cs - - - Common\Interop\Unix\System.Native\Interop.GetHostName.cs - - - Common\Interop\Unix\System.Native\Interop.GetNameInfo.cs - - - Common\Interop\Unix\System.Native\Interop.HostEntries.cs - - - Common\Interop\Unix\System.Native\Interop.IPAddress.cs - - - Common\Interop\Unix\System.Native\Interop.Socket.cs - - - Common\Interop\Unix\System.Native\Interop.SocketAddress.cs - + + + + + + + + + + + + + + + @@ -161,4 +120,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj index 48b39fe617940..eb8576ed2e55f 100644 --- a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj @@ -12,17 +12,13 @@ - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.Sockets.cs - - - Common\System\Diagnostics\Tracing\TestEventListener.cs - + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj index 7fcacc540d25d..559c1bf3e45dd 100644 --- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj @@ -10,145 +10,102 @@ - - ProductionCode\System\Net\IPHostEntry.cs - + - - Common\System\Net\Logging\NetEventSource.cs - - - Common\System\Net\Sockets\ProtocolType.cs - - - Common\System\Net\Sockets\SocketType.cs - - - Common\System\Net\IPEndPointStatics.cs - - - Common\System\Net\IPAddressParserStatics.cs - - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.Http.cs - - - Common\System\Net\ByteOrder.cs - + + + + + + + + - - ProductionCode\System\Net\NameResolutionPal.Windows.cs - - - ProductionCode\System\Net\NameResolutionPal.Win32.cs - - - Common\System\Net\InternalException.cs - - - System\Net\SocketProtocolSupportPal.Windows - - - Common\System\Net\SocketAddressPal.Windows - + + + + + - - Common\System\Net\DebugSafeHandle.cs - + - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\WinSock\AddressInfoHints.cs - - - Common\Interop\Windows\WinSock\hostent.cs - - - Common\Interop\Windows\WinSock\Interop.closesocket.cs - - - Common\Interop\Windows\WinSock\Interop.gethostname.cs - - - Common\Interop\Windows\WinSock\Interop.GetNameInfoW.cs - - - Common\Interop\Windows\WinSock\Interop.GetAddrInfoW.cs - - - Common\Interop\Windows\WinSock\Interop.WSAStartup.cs - - - Common\Interop\Windows\WinSock\Interop.WSASocketW.cs - - - Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs - - - Common\System\Net\Sockets\ProtocolFamily.cs - - - Common\Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs - + + + + + + + + + + + + - - Common\System\Net\Internals\SocketAddressPal.Unix.cs - - - Common\System\Net\Internals\Interop.CheckedAccess.cs - - - Common\System\Net\InteropIPAddressExtensions.Unix.cs - - - ProductionCode\Common\System\Net\Internals\SocketExceptionFactory.cs - - - ProductionCode\Common\System\Net\Internals\SocketExceptionFactory.Unix.cs - - - ProductionCode\System\Net\NameResolutionPal.Unix.cs - - - System\Net\SocketProtocolSupportPal.Unix.cs - - - Common\Interop\CoreLib\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Native\Interop.Close.cs - - - Common\Interop\Unix\System.Native\Interop.GetHostName.cs - - - Common\Interop\Unix\System.Native\Interop.GetNameInfo.cs - - - Common\Interop\Unix\System.Native\Interop.HostEntry.cs - - - Common\Interop\Unix\System.Native\Interop.IPAddress.cs - - - Common\Interop\Unix\System.Native\Interop.Socket.cs - - - Common\Interop\Unix\System.Native\Interop.SocketAddress.cs - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj index ff5ea142ae7ac..fa51396ca607c 100644 --- a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj @@ -12,12 +12,10 @@ - - ProductionCode\System\Net\IPHostEntry.cs - - - ProductionCode\System\Net\Dns.cs - + + @@ -32,17 +30,13 @@ - - ProductionCode\Common\System\Net\Internals\SocketExceptionFactory.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\InternalException.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj index 1dafbcc8a6694..3b8c89f32df7c 100644 --- a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj +++ b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj @@ -44,31 +44,24 @@ - - Common\System\NotImplemented.cs - - - Common\System\Net\NetworkInformation\HostInformation.cs - - - Common\System\Net\NetworkInformation\NetworkInformationException.cs - - - Common\System\HexConverter.cs - + + + + - - Common\System\Net\Logging\NetEventSource.Common.cs - + - - Common\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs - - - Common\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs - + + @@ -93,55 +86,39 @@ - - Common\System\Net\ContextAwareResult.cs - - - Common\System\Net\ContextAwareResult.Windows.cs - - - Common\System\Net\LazyAsyncResult.cs - - - Common\System\Net\ByteOrder.cs - - - Common\System\Net\IPAddressParserStatics.cs - - - Common\System\Net\SocketAddress.cs - - - Common\System\Net\SocketAddressPal.Windows.cs - - - Common\System\Net\NetworkInformation\StartIPOptions.cs - - - Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs - + + + + + + + + + - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs - - - Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs - - - Common\Interop\Windows\IpHlpApi\Interop.NetworkInformation.cs - - - Common\Interop\Windows\WinSock\Interop.WinsockBSD.cs - - - Common\Interop\Windows\WinSock\Interop.WSAEventSelect.cs - - - Common\Interop\Windows\WinSock\Interop.WSAIoctl.cs - + + + + + + + @@ -158,33 +135,24 @@ - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Native\Interop.EnumerateInterfaceAddresses.cs - - - System\Net\NetworkInformation\HostInformationPal.Unix.cs - - - Common\Interop\Unix\System.Native\Interop.GetDomainName.cs - - - Common\Interop\Unix\System.Native\Interop.GetHostName.cs - - - Common\Interop\Unix\System.Native\Interop.MapTcpState.cs - - - Common\Interop\CoreLib\Unix\Interop.Errors.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - - - Common\System\IO\RowConfigReader.cs - + + + + + + + + + @@ -209,12 +177,10 @@ - - Common\System\IO\StringParser.cs - - - Common\Interop\Linux\Interop.LinuxNetDeviceFlags.cs - + + @@ -233,42 +199,33 @@ - - Common\Interop\BSD\System.Native\Interop.ProtocolStatistics.cs - - - Common\Interop\BSD\System.Native\Interop.TcpConnectionInfo.cs - + + - - Common\Interop\OSX\Interop.CoreFoundation.cs - - - Common\Interop\OSX\Interop.Libraries.cs - - - Common\Interop\OSX\Interop.RunLoop.cs - - - Common\Interop\OSX\Interop.SystemConfiguration.cs - - - Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs - + + + + + - - Common\Interop\FreeBSD\Interop.Libraries.cs - + - - Common\Interop\Unix\System.Native\Interop.NetworkChange.cs - + diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj index 4e5a858b2fb43..f9b964b19b5da 100644 --- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj +++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj @@ -6,30 +6,22 @@ - - SharedSource\StringParsingHelpers.Addresses.cs - - - SharedSource\StringParsingHelpers.Connections.cs - - - SharedSource\StringParsingHelpers.Dns.cs - - - SharedSource\StringParsingHelpers.Misc.cs - - - SharedSource\StringParsingHelpers.Statistics.cs - - - SharedSource\NetworkFiles.cs - - - SharedSource\SimpleTcpConnectionInformation.cs - - - SharedSource\SimpleGatewayIPAddressInformation.cs - + + + + + + + + @@ -47,24 +39,18 @@ - - Common\System\Net\TestLogging.cs - - - Common\System\Net\VerboseTestLogging.cs - - - Common\System\Net\EventSourceTestLogging.cs - - - Common\System\Net\Capability.Sockets.cs - - - Common\System\IO\StringParser.cs - - - Common\System\IO\RowConfigReader.cs - + + + + + + diff --git a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj index 36d2f01f06dd8..d21687048995d 100644 --- a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj +++ b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj @@ -17,108 +17,81 @@ - - Common\System\Net\ByteOrder.cs - - - Common\System\Net\IPAddressParserStatics.cs - - - Common\System\Net\SocketAddress.cs - + + + - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\InternalException.cs - + + - - Common\System\Net\Internals\IPAddressExtensions.cs - - - Common\System\Net\Internals\IPEndPointExtensions.cs - + + - - Common\System\Net\RawSocketPermissions.cs - - - Common\System\Net\SocketAddressPal.Unix.cs - - - Common\System\Net\SocketProtocolSupportPal.Unix.cs - - - Common\System\Net\NetworkInformation\UnixCommandLinePing.cs - + + + + - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Native\Interop.Close.cs - - - Common\Interop\Unix\System.Native\Interop.ReadLink.cs - - - Common\Interop\Unix\System.Native\Interop.Socket.cs - - - Common\Interop\Unix\System.Native\Interop.SocketAddress.cs - + + + + + + - - Common\System\Net\SocketAddressPal.Windows.cs - - - Common\System\Net\SocketProtocolSupportPal.Windows.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs - + + + - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs - - - Common\Interop\Windows\IpHlpApi\Interop.ICMP.cs - - - Common\Interop\Windows\WinSock\Interop.closesocket.cs - - - Common\Interop\Windows\WinSock\Interop.WSASocketW.cs - - - Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs - + + + + + + - - Common\System\Net\Sockets\SocketType.cs - + diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj index 87cbbaf4c6139..e8b25d0500fcb 100644 --- a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj +++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj @@ -13,26 +13,19 @@ - - SocketCommon\Configuration.cs - - - SocketCommon\Configuration.Ping.cs - - - Common\System\Net\RawSocketPermissions.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Native\Interop.ReadLink.cs - - - Common\System\Net\NetworkInformation\UnixCommandLinePing.cs - - - Common\System\Net\Capability.RawSocketPermissions.cs - + + + + + + + diff --git a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj index 4d6d6413db52f..336460cdd1326 100644 --- a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj @@ -29,12 +29,10 @@ - - System\Net\IPv4AddressHelper.Common.cs - - - System\Net\IPv6AddressHelper.Common.cs - + + @@ -50,145 +48,101 @@ - - Common\System\StringExtensions.cs - - - Common\System\Net\ByteOrder.cs - - - ProductionCode\System\Net\CookieComparer.cs - - - Common\System\Net\CookieFields.cs - - - Common\System\Net\CookieParser.cs - - - Common\System\Net\IPAddressParserStatics.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - - - Common\System\Net\TcpValidationHelpers.cs - - - Common\System\Net\UriScheme.cs - - - Common\System\Net\SocketAddress.cs - - - Common\System\Net\NegotiationInfoClass.cs - - - Common\System\Net\NetworkInformation\HostInformation.cs - - - Common\System\Marvin.cs - - - Common\System\Text\StringBuilderCache.cs - - - Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs - - - Common\System\HexConverter.cs - + + + + + + + + + + + + + + + + - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\NotImplemented.cs - - - Common\Interop\Windows\Crypt32\Interop.Alg.cs - - - Common\Interop\Windows\SChannel\Interop.SchProtocols.cs - - - Common\Interop\Windows\WinSock\Interop.ErrorCodes.cs - + + + + + - - Common\System\Net\SocketAddressPal.Windows.cs - - - Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs - - - Common\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs - - - Common\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs - - - Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs - - - Common\Interop\Windows\Kernel32\Interop.LocalAlloc.cs - - - Common\System\Net\NetworkInformation\InterfaceInfoPal.Windows.cs - - - Common\Interop\Windows\IpHlpApi\Interop.if_nametoindex.cs - + + + + + + + + + + - - Common\System\Net\SocketAddressPal.Unix.cs - - - Common\System\Net\NetworkInformation\HostInformationPal.Unix.cs - - - Common\System\Net\Sockets\SocketErrorPal.Unix.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Native\Interop.GetDomainName.cs - - - Common\Interop\Unix\System.Native\Interop.GetHostName.cs - - - Common\Interop\Unix\System.Native\Interop.GetNameInfo.cs - - - Common\Interop\Unix\System.Native\Interop.HostEntry.cs - - - Common\Interop\Unix\System.Native\Interop.IPAddress.cs - - - Common\System\Net\NetworkInformation\InterfaceInfoPal.Unix.cs - - - Common\Interop\Unix\System.Native\Interop.InterfaceNameToIndex.cs - - - Common\Interop\Unix\System.Native\Interop.SocketAddress.cs - + + + + + + + + + + + + + diff --git a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj index 57187bfa326d0..1ef5c758214de 100644 --- a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj +++ b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj @@ -24,9 +24,8 @@ - - Common\System\Diagnostics\Tracing\TestEventListener.cs - + diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj index 2cf3d34ae653c..1dd265af15956 100644 --- a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj +++ b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj @@ -14,149 +14,104 @@ - - ProductionCode\System\Net\Sockets\AddressFamily.cs - - - ProductionCode\System\Net\Sockets\SocketError.cs - - - ProductionCode\System\Net\IPAddress.cs - - - ProductionCode\System\Net\IPAddressParser.cs - - - ProductionCode\System\Net\IPv4AddressHelper.Common.cs - - - ProductionCode\System\Net\IPv6AddressHelper.Common.cs - - - ProductionCode\System\Net\IPEndPoint.cs - - - Common\System\Net\SocketAddress.cs - - - ProductionCode\System\Net\EndPoint.cs - - - ProductionCode\Common\System\Marvin.cs - - - ProductionCode\Common\System\Text\StringBuilderCache.cs - - - Common\System\HexConverter.cs - + + + + + + + + + + + + - - ProductionCode\System\Net\SocketException.cs - - - ProductionCode\Common\System\Net\ByteOrder.cs - - - ProductionCode\Common\System\Net\InternalException.cs - - - ProductionCode\Common\System\Net\IPAddressParserStatics.cs - - - ProductionCode\Common\System\Net\TcpValidationHelpers.cs - - - ProductionCode\Common\System\NotImplemented.cs - - - ProductionCode\Common\Interop\Windows\WinSock\Interop.ErrorCodes.cs - + + + + + + + - - ProductionCode\System\Net\SocketException.Windows.cs - - - Common\System\Net\SocketAddressPal.Windows.cs - - - Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs - - - Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs - - - Common\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs - - - Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs - - - Common\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs - - - ProductionCode\Common\Interop\Windows\Interop.Libraries.cs - - - ProductionCode\Common\Interop\Windows\NtDll\Interop.NtStatus.cs - - - ProductionCode\System\Net\NetworkInformation\InterfaceInfoPal.Windows.cs - - - ProductionCode\Common\Interop\Windows\IpHlpApi\Interop.if_nametoindex.cs - + + + + + + + + + + + - - ProductionCode\System\Net\SocketException.Unix.cs - - - Common\System\Net\NetworkInformation\HostInformationPal.Unix.cs - - - Common\System\Net\SocketAddressPal.Unix.cs - - - Common\System\Net\Sockets\SocketErrorPal.Unix.cs - - - ProductionCode\Common\Interop\Interop.CheckedAccess.cs - - - ProductionCode\Interop\Unix\Interop.Errors.cs - - - ProductionCode\Common\Interop\Unix\Interop.Libraries.cs - - - ProductionCode\Common\Interop\Unix\System.Native\Interop.GetDomainName.cs - - - ProductionCode\Common\Interop\Unix\System.Native\Interop.GetHostName.cs - - - ProductionCode\Common\Interop\Unix\System.Native\Interop.GetNameInfo.cs - - - ProductionCode\Common\Interop\Unix\System.Native\Interop.HostEntry.cs - - - ProductionCode\Common\Interop\Unix\System.Native\Interop.IPAddress.cs - - - ProductionCode\Common\Interop\Unix\System.Native\Interop.SocketAddress.cs - - - ProductionCode\Common\System\Net\NetworkInformation\InterfaceInfoPal.Unix.cs - - - ProductionCode\Common\Interop\Unix\System.Native\Interop.InterfaceNameToIndex.cs - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj index 23430eac94c22..a88f09f865e9e 100644 --- a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj +++ b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj @@ -17,54 +17,38 @@ - - ProductionCode\System\Net\CookieCollection.cs - - - ProductionCode\System\Net\Cookie.cs - - - ProductionCode\System\Net\CookieContainer.cs - - - ProductionCode\System\Net\Sockets\SocketError.cs - - - ProductionCode\System\Net\IPAddress.cs - - - ProductionCode\System\Net\EndPoint.cs - - - ProductionCode\System\Net\Sockets\AddressFamily.cs - - - ProductionCode\System\Net\CookieComparer.cs - - - Common\System\Net\CookieFields.cs - - - ProductionCode\System\Net\CookieParser.cs - - - ProductionCode\System\Net\SocketAddress.cs - - - ProductionCode\System\Net\IPEndPoint.cs - - - ProductionCode\System\Net\SocketException.cs - - - ProductionCode\System\Net\IPAddressParser.cs - - - Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs - - - Common\System\HexConverter.cs - + + + + + + + + + + + + + + + + @@ -72,85 +56,60 @@ - - Common\System\StringExtensions.cs - - - ProductionCode\Common\System\Net\ByteOrder.cs - - - ProductionCode\Common\System\Net\HttpKnownHeaderNames.cs - - - ProductionCode\Common\System\Net\IPAddressParserStatics.cs - - - ProductionCode\Common\System\Net\TcpValidationHelpers.cs - - - ProductionCode\Common\System\Net\UriScheme.cs - - - Common\System\Marvin.cs - - - Common\System\Text\StringBuilderCache.cs - + + + + + + + + - - ProductionCode\Common\System\Net\Logging\NetEventSource.Common.cs - - - ProductionCode\Common\System\Net\InternalException.cs - - - ProductionCode\Common\System\NotImplemented.cs - - - ProductionCode\Common\Interop\Windows\WinSock\Interop.ErrorCodes.cs - + + + + - - ProductionCode\System\Net\SocketException.Unix.cs - - - Common\System\Net\SocketAddressPal.Windows.cs - - - ProductionCode\System\Net\NetworkInformation\InterfaceInfoPal.Windows.cs - - - ProductionCode\Common\Interop\Windows\IpHlpApi\Interop.if_nametoindex.cs - - - ProductionCode\Common\Interop\Windows\Interop.Libraries.cs - + + + + + - - ProductionCode\System\Net\SocketException.Unix.cs - - - ProductionCode\System\Net\NetworkInformation\InterfaceInfoPal.Unix.cs - - - Common\System\Net\SocketAddressPal.Unix.cs - - - ProductionCode\Common\System\Net\Sockets\SocketErrorPal.Unix.cs - - - ProductionCode\Common\Interop\Unix\Interop.Libraries.cs - - - ProductionCode\Interop\Unix\Interop.Errors.cs - - - ProductionCode\Common\Interop\Unix\System.Native\Interop.SocketAddress.cs - - - ProductionCode\Common\Interop\Unix\System.Native\Interop.InterfaceNameToIndex.cs - + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj index 63f1a99366765..0b81d0749fb41 100644 --- a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj +++ b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj @@ -43,62 +43,45 @@ - - Common\System\Net\Http\HttpHandlerDefaults.cs - - - Common\System\Net\InternalException.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\Logging\DebugThreadTracking.cs - - - Common\System\Net\HttpDateParser.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - - - Common\System\Net\HttpValidationHelpers.cs - - - Common\System\Net\LazyAsyncResult.cs - - - Common\System\Net\ContextAwareResult.cs - - - Common\System\Net\ExceptionCheck.cs - - - Common\System\Net\TlsStream.cs - - - Common\System\Net\SecurityProtocol.cs - - - Common\System\NotImplemented.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - + + + + + + + + + + + + + + - - Common\Interop\Windows\WinInet\Interop.wininet_errors.cs - - - Common\System\Net\ContextAwareResult.Windows.cs - + + - - Common\System\Net\ContextAwareResult.Unix.cs - + @@ -124,4 +107,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj index d10fd19dfe020..e0c47d0262bdb 100644 --- a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj +++ b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj @@ -11,33 +11,24 @@ - - Common\System\Net\Capability.Security.cs - - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.Certificates.cs - - - Common\System\Net\Configuration.Http.cs - - - Common\System\Net\Configuration.Security.cs - - - Common\System\Net\Http\LoopbackServer.cs - - - Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs - - - Common\System\Net\Http\GenericLoopbackServer.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - + + + + + + + + + @@ -52,4 +43,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/libraries/System.Net.Security/src/System.Net.Security.csproj index dbf541c0f4a3d..868faddb5727a 100644 --- a/src/libraries/System.Net.Security/src/System.Net.Security.csproj +++ b/src/libraries/System.Net.Security/src/System.Net.Security.csproj @@ -47,66 +47,48 @@ - - Common\System\Net\Logging\DebugThreadTracking.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\InternalException.cs - + + + - - Common\System\Net\DebugSafeHandle.cs - - - Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs - - - Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs - + + + Common\System\Net\ArrayBuffer.cs - - Common\System\Net\ExceptionCheck.cs - - - Common\System\Net\LazyAsyncResult.cs - - - Common\System\Net\SecurityProtocol.cs - - - Common\System\Net\UriScheme.cs - + + + + - - Common\System\NotImplemented.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - - - Common\System\Net\Security\SSPIHandleCache.cs - - - Common\System\Net\ContextFlagsPal.cs - - - Common\System\Net\NegotiationInfoClass.cs - - - Common\System\Net\NTAuthentication.Common.cs - - - Common\System\Net\SecurityStatusPal.cs - - - Common\System\HexConverter.cs - + + + + + + + + @@ -155,166 +137,114 @@ - - Common\System\Net\Security\SecurityBuffer.Windows.cs - - - Common\System\Net\Security\SecurityBufferType.Windows.cs - + + - - Common\System\Net\SecurityStatusAdapterPal.Windows.cs - - - Common\System\Net\ContextFlagsAdapterPal.Windows.cs - - - Common\System\Net\Security\NegotiateStreamPal.Windows.cs - - - Common\System\Net\Security\SecurityContextTokenHandle.cs - + + + + - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates.cs - - - Common\Interop\Windows\Crypt32\Interop.certificates_types.cs - - - Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs - - - Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs - - - Common\Interop\Windows\SChannel\Interop.Alerts.cs - - - Common\Interop\Windows\SChannel\Interop.SchProtocols.cs - - - Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs - - - Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs - - - Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs - - - Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs - - - Common\Interop\Windows\SChannel\Interop.Sec_Application_Protocols.cs - - - Common\Interop\Windows\SChannel\UnmanagedCertificateContext.cs - - - Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs - - - Common\Interop\Windows\SspiCli\GlobalSSPI.cs - - - Common\Interop\Windows\SspiCli\Interop.SSPI.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs - - - Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs - - - Common\System\Collections\Generic\BidirectionalDictionary.cs - - - Common\Interop\Windows\SspiCli\SafeDeleteContext.cs - - - Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs - - - Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs - - - Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs - - - Common\Interop\Windows\SspiCli\SSPIAuthType.cs - - - Common\Interop\Windows\SspiCli\ISSPIInterface.cs - - - Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs - - - Common\Interop\Windows\SspiCli\SSPIWrapper.cs - - - Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.Initialization.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs - - - Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs - - - Common\System\Net\ContextFlagsAdapterPal.Unix.cs - - - Common\System\Net\Http\TlsCertificateExtensions.cs - - - Common\System\Net\Security\NegotiateStreamPal.Unix.cs - - - Common\System\Net\Security\Unix\SafeDeleteContext.cs - - - Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs - - - Common\System\Net\Security\Unix\SafeFreeCredentials.cs - - - Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs - - - Common\System\Net\Security\Unix\SecChannelBindings.cs - + + + + + + + + + + + + + + + + @@ -327,119 +257,82 @@ - - Common\System\Net\Security\CertificateValidation.Unix.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSsl.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Ssl.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtx.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SetProtocolOptions.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtxOptions.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs - - - Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs - - - Common\System\Net\Security\Unix\SafeDeleteSslContext.cs - - - Common\System\Net\Security\Unix\SafeFreeCertContext.cs - - - Common\System\Net\Security\Unix\SafeFreeSslCredentials.cs - + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\Interop\OSX\Interop.CoreFoundation.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFData.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFDate.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFError.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFString.cs - - - Common\Interop\OSX\Interop.Libraries.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SslErr.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ssl.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Chain.cs - - - Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs - + + + + + + + + + + + + diff --git a/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj b/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj index 81eb118f1cc59..b1b8131d7655a 100644 --- a/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj @@ -7,20 +7,15 @@ - - Common\System\Net\EnterpriseTests\EnterpriseTestConfiguration.cs - - - Common\System\Net\VirtualNetwork\VirtualNetwork.cs - - - Common\System\Net\VirtualNetwork\VirtualNetworkStream.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - - - ProductionCode\Common\System\Threading\Tasks\TaskToApm.cs - + + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index 1717a98df4cc8..ef6656e25ae68 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -30,62 +30,44 @@ - - Common\System\IO\DelegateStream.cs - - - Common\System\Net\Capability.Security.cs - - - Common\System\Net\SslStreamCertificatePolicy.cs - - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.Security.cs - - - Common\System\Net\Configuration.Certificates.cs - - - Common\System\Net\Configuration.Http.cs - - - Common\System\Net\HttpsTestClient.cs - - - Common\System\Net\HttpsTestServer.cs - - - Common\System\Net\SslProtocolSupport.cs - - - Common\System\Net\TestLogging.cs - - - Common\System\Net\VerboseTestLogging.cs - - - Common\System\Net\EventSourceTestLogging.cs - - - Common\System\Net\VirtualNetwork\VirtualNetwork.cs - - - Common\System\Net\VirtualNetwork\VirtualNetworkStream.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - - - ProductionCode\Common\System\Threading\Tasks\TaskToApm.cs - + + + + + + + + + + + + + + + + + - - src\SniHelper.cs - + @@ -101,27 +83,22 @@ - - Common\System\Diagnostics\Tracing\TestEventListener.cs - + - - Common\System\Net\Capability.Security.Windows.cs - + - - Common\System\Net\Capability.Security.Unix.cs - - - Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs - - - Common\Interop\Unix\Interop.Libraries.cs - + + + diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/SslStress.csproj b/src/libraries/System.Net.Security/tests/StressTests/SslStress/SslStress.csproj index 439b1e86e02c8..cb7c136f227c3 100644 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/SslStress.csproj +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/SslStress.csproj @@ -5,10 +5,11 @@ enable - + - \ No newline at end of file + diff --git a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj index d61c5a7777595..49823f8c08916 100644 --- a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj @@ -26,61 +26,44 @@ - - CommonTest\System\Net\SslProtocolSupport.cs - - - Common\System\HexConverter.cs - + + - - ProductionCode\System\Net\Security\SslStream.cs - - - ProductionCode\System\Net\Security\SslClientAuthenticationOptions.cs - - - ProductionCode\System\Net\Security\SslServerAuthenticationOptions.cs - - - ProductionCode\System\Net\Security\SslAuthenticationOptions.cs - - - ProductionCode\System\Net\Security\SslApplicationProtocol.cs - - - ProductionCode\System\Net\Security\SslConnectionInfo.cs - - - ProductionCode\System\Net\Security\SslStream.Implementation.Adapters.cs - - - ProductionCode\System\Net\SslStreamContext.cs - - - ProductionCode\Common\System\Net\SecurityProtocol.cs - - - ProductionCode\Common\System\Net\TlsAlertType.cs - - - ProductionCode\Common\System\Net\TlsAlertMessage.cs - - - Common\Interop\Windows\SChannel\Interop.Alerts.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - + + + + + + + + + + + + + - - ProductionCode\Common\System\Net\Logging\NetEventSource.Common.cs - - - ProductionCode\Common\System\Net\InternalException.cs - + + diff --git a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj index 3d74a78391235..b40455379cd3f 100644 --- a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -48,70 +48,50 @@ - - Common\System\IO\StreamHelpers.CopyValidation.cs - + - - Common\System\Net\Logging\DebugThreadTracking.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\InternalException.cs - + + + - - Common\System\Net\DebugSafeHandleMinusOneIsInvalid.cs - + - - Common\System\Net\ContextAwareResult.cs - - - Common\System\Net\LazyAsyncResult.cs - - - Common\System\Net\ByteOrder.cs - - - Common\System\Net\IPEndPointStatics.cs - - - Common\System\Net\IPAddressParserStatics.cs - - - Common\System\Net\ExceptionCheck.cs - - - Common\System\Net\RangeValidationHelpers.cs - - - Common\System\Net\SocketAddress.cs - - - Common\System\Net\TcpValidationHelpers.cs - + + + + + + + + + - - Common\System\Net\Internals\IPEndPointExtensions.cs - - - Common\System\Net\Internals\IPAddressExtensions.cs - - - Common\System\Net\Internals\SocketExceptionFactory.cs - - - Common\System\Net\Sockets\ProtocolFamily.cs - - - Common\System\Net\Sockets\ProtocolType.cs - - - Common\System\Net\Sockets\SocketType.cs - + + + + + + @@ -128,127 +108,87 @@ - - Common\System\Net\ContextAwareResult.Windows.cs - - - Common\System\Net\SocketAddressPal.Windows.cs - - - Common\System\Net\SocketProtocolSupportPal.Windows - + + + - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\WinSock\Interop.accept.cs - - - Common\Interop\Windows\WinSock\Interop.bind.cs - - - Common\Interop\Windows\WinSock\Interop.closesocket.cs - - - Common\Interop\Windows\WinSock\Interop.getpeername.cs - - - Common\Interop\Windows\WinSock\Interop.getsockname.cs - - - Common\Interop\Windows\WinSock\Interop.getsockopt.cs - - - Common\Interop\Windows\WinSock\Interop.ioctlsocket.cs - - - Common\Interop\Windows\WinSock\Interop.listen.cs - - - Common\Interop\Windows\WinSock\Interop.recv.cs - - - Common\Interop\Windows\WinSock\Interop.recvfrom.cs - - - Common\Interop\Windows\WinSock\Interop.select.cs - - - Common\Interop\Windows\WinSock\Interop.send.cs - - - Common\Interop\Windows\WinSock\Interop.sendto.cs - - - Common\Interop\Windows\WinSock\Interop.setsockopt.cs - - - Common\Interop\Windows\WinSock\Interop.shutdown.cs - - - Common\Interop\Windows\WinSock\Interop.TransmitFile.cs - - - Common\Interop\Windows\WinSock\Interop.WinsockBSD.cs - - - Common\Interop\Windows\WinSock\Interop.WinsockAsync.cs - - - Common\Interop\Windows\WinSock\Interop.WSAConnect.cs - - - Common\Interop\Windows\WinSock\Interop.WSADuplicateSocket.cs - - - Common\Interop\Windows\WinSock\Interop.WSAGetOverlappedResult.cs - - - Common\Interop\Windows\WinSock\Interop.WSAIoctl.cs - - - Common\Interop\Windows\WinSock\Interop.WSARecv.cs - - - Common\Interop\Windows\WinSock\Interop.WSARecvFrom.cs - - - Common\Interop\Windows\WinSock\Interop.WSASend.cs - - - Common\Interop\Windows\WinSock\Interop.WSASendTo.cs - - - Common\Interop\Windows\WinSock\Interop.WSASocketW.cs - - - Common\Interop\Windows\WinSock\Interop.WSASocketW.SafeCloseSocket.cs - - - Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs - - - Common\Interop\Windows\WinSock\SafeNativeOverlapped.cs - - - Common\Interop\Windows\WinSock\WSABuffer.cs - - - Common\Interop\Windows\WinSock\Interop.WSAPROTOCOL_INFOW.cs - - - Common\Interop\Windows\Interop.CancelIoEx.cs - - - Common\Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs - - - Common\Interop\Windows\Kernel32\Interop.HandleInformation.cs - - - Common\System\Net\CompletionPortHelper.Windows.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -264,135 +204,92 @@ - - Common\System\Net\ContextAwareResult.Unix.cs - - - Common\System\Net\InteropIPAddressExtensions.Unix.cs - - - Common\System\Net\SocketAddressPal.Unix.cs - - - Common\System\Net\SocketProtocolSupportPal.Unix - - - Common\System\Net\Sockets\SocketErrorPal.Unix - - - Common\System\Threading\Tasks\TaskToApm.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Native\Interop.Accept.cs - - - Common\Interop\Unix\System.Native\Interop.Bind.cs - - - Common\Interop\Unix\System.Native\Interop.Close.cs - - - Common\Interop\Unix\System.Native\Interop.Connect.cs - - - Common\Interop\Unix\System.Native\Interop.Fcntl.cs - - - Common\Interop\Unix\Interop.Disconnect.cs - - - Common\Interop\Unix\System.Native\Interop.GetBytesAvailable.cs - - - Common\Interop\Unix\Interop.GetDomainSocketSizes.cs - - - Common\Interop\Unix\System.Native\Interop.GetPeerName.cs - - - Common\Interop\Unix\System.Native\Interop.GetSocketErrorOption.cs - - - Common\Interop\Unix\System.Native\Interop.GetSocketType.cs - - - Common\Interop\Unix\System.Native\Interop.GetSockName.cs - - - Common\Interop\Unix\System.Native\Interop.GetSockOpt.cs - - - Common\Interop\Unix\System.Native\Interop.IPAddress.cs - - - Common\Interop\Unix\System.Native\Interop.IPPacketInformation.cs - - - Common\Interop\Unix\System.Native\Interop.LingerOption.cs - - - Common\Interop\Unix\System.Native\Interop.SendFile.cs - - - Common\Interop\Unix\System.Native\Interop.SetSendTimeout.cs - - - Common\Interop\Unix\System.Native\Interop.SetReceiveTimeout.cs - - - Common\Interop\Unix\Interop.Stat.cs - - - Common\Interop\Unix\System.Native\Interop.Listen.cs - - - Common\Interop\Unix\System.Native\Interop.MemSet.cs - - - Common\Interop\Unix\System.Native\Interop.MessageHeader.cs - - - Common\Interop\Unix\System.Native\Interop.MulticastOption.cs - - - Common\Interop\Unix\System.Native\Interop.Poll.cs - - - Common\Interop\Unix\System.Native\Interop.PlatformSocketSupport.cs - - - Common\Interop\Unix\System.Native\Interop.ReceiveMessage.cs - - - Common\Interop\Unix\System.Native\Interop.SendMessage.cs - - - Common\Interop\Unix\System.Native\Interop.SetSockOpt.cs - - - Common\Interop\Unix\System.Native\Interop.Shutdown.cs - - - Common\Interop\Unix\System.Native\Interop.Socket.cs - - - Common\Interop\Unix\System.Native\Interop.SocketEvent.cs - - - Common\Interop\Unix\System.Native\Interop.SocketAddress.cs - - - Common\Interop\Unix\System.Native\Interop.Pipe.cs - - - Common\Interop\Unix\System.Native\Interop.Write.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -413,4 +310,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj index 7d1142099157c..ab01170df35f4 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj @@ -47,63 +47,44 @@ - - SocketCommon\Configuration.cs - - - SocketCommon\Configuration.Sockets.cs - - - SocketCommon\TestSettings.cs - - - SocketCommon\Fletcher32.cs - - - SocketCommon\SocketTestExtensions.cs - - - SocketCommon\SocketTestServer.cs - - - SocketCommon\SocketTestServerAsync.cs - - - SocketCommon\SocketTestServerAPM.cs - - - SocketCommon\SocketImplementationType.cs - + + + + + + + + + - - Common\System\Net\TestLogging.cs - - - Common\System\Net\VerboseTestLogging.cs - - - Common\System\Net\EventSourceTestLogging.cs - - - Common\System\Net\Capability.Sockets.cs - - - Common\System\ShouldNotBeInvokedException.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - - - Common\System\Buffers\NativeMemoryManager.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - - - Common\System\Diagnostics\Tracing\TestEventListener.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj b/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj index 282b766f7fcb3..525298aa6f339 100644 --- a/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj +++ b/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj @@ -6,24 +6,18 @@ - - Common\System\IO\DelegatingStream.cs - - - Common\System\IO\ChunkedMemoryStream.cs - - - Common\System\Threading\Tasks\BeginEndAwaitableAdapter.cs - - - Common\System\Threading\Tasks\RendezvousAwaitable.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - - - Common\System\HexConverter.cs - + + + + + + diff --git a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj index b011f8361e954..140cbb8132dd0 100644 --- a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj +++ b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj @@ -6,29 +6,21 @@ - - Common\System\Net\Capability.Security.cs - - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.Certificates.cs - - - Common\System\Net\Configuration.Http.cs - - - Common\System\Net\Configuration.Security.cs - - - Common\System\Net\Http\LoopbackServer.cs - - - Common\System\Net\Http\GenericLoopbackServer.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - + + + + + + + + - \ No newline at end of file + diff --git a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj index e7d45fd91bcca..5fd0e9acb783c 100644 --- a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj +++ b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj @@ -12,21 +12,16 @@ - - Common\System\Net\CaseInsensitiveAscii.cs - - - Common\System\StringExtensions.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - - - Common\System\Net\HttpValidationHelpers.cs - - - Common\System\Net\Logging\NetEventSource.Common.cs - + + + + + diff --git a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj index 60ee641776b69..cfed5c7b93113 100644 --- a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj +++ b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj @@ -10,22 +10,17 @@ - - Common\System\Net\Logging\NetEventSource.Common.cs - - - Common\System\Net\UriScheme.cs - - - Common\System\Net\WebSockets\WebSocketValidate.cs - + + + - - Common\System\Net\HttpKnownHeaderNames.cs - - - Common\System\Net\SecurityProtocol.cs - + + @@ -54,4 +49,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj index d685d7b270d7f..3b7eb276d0e9c 100644 --- a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj +++ b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj @@ -9,39 +9,28 @@ - - Common\System\Net\Capability.Security.cs - - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.Certificates.cs - - - Common\System\Net\Configuration.Http.cs - - - Common\System\Net\Configuration.Security.cs - - - Common\System\Net\Configuration.WebSockets.cs - - - Common\System\Net\EventSourceTestLogging.cs - - - Common\System\Net\Http\LoopbackProxyServer.cs - - - Common\System\Net\Http\LoopbackServer.cs - - - Common\System\Net\Http\GenericLoopbackServer.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - + + + + + + + + + + + @@ -60,4 +49,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj index 81bfe86e00cd7..5153548a7ce1f 100644 --- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj +++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj @@ -8,12 +8,10 @@ annotations - - Common\System\Net\WebSockets\ManagedWebSocket.cs - - - Common\System\Net\WebSockets\WebSocketValidate.cs - + + @@ -42,4 +40,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj index 733a903456852..eb4d89c4de15c 100644 --- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj +++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj @@ -3,18 +3,14 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) - - Common\System\Net\WebSockets\WebSocketCreateTest.cs - - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.WebSockets.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - + + + + - \ No newline at end of file + diff --git a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj index 06f9a2cf0c80b..40ce98387e9db 100644 --- a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj +++ b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj @@ -17,12 +17,10 @@ - - Common\System\Net\WebSockets\WebSocketValidate.cs - - - Common\System\Net\WebSockets\ManagedWebSocket.cs - + + @@ -38,4 +36,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj index 453ddb8ea157a..be4a5cfccf8fc 100644 --- a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj +++ b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj @@ -6,17 +6,13 @@ - - Common\System\Net\WebSockets\WebSocketCreateTest.cs - - - Common\System\Net\Configuration.cs - - - Common\System\Net\Configuration.WebSockets.cs - - - Common\System\Net\HttpKnownHeaderNames.cs - + + + + - \ No newline at end of file + diff --git a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj index 61d5ca2cc9cbf..0adc822c3d1e8 100644 --- a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj +++ b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj @@ -3,24 +3,18 @@ $(NetCoreAppCurrent) - - Common\System\CollectionsIEnumerableTest.cs - - - Common\System\CollectionsICollectionTest.cs - - - Common\System\CollectionsIListTest.cs - - - Common\System\CollectionsUtils.cs - - - Common\System\ShouldNotBeInvokedException.cs - - - Common\System\CollectionsIDictionaryTest.cs - + + + + + + @@ -39,16 +33,14 @@ - - Common\System\Diagnostics\DebuggerAttributes.cs - + - - Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj index 951b720326973..2252cd2cdc121 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj +++ b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj @@ -17,12 +17,10 @@ System\Text - - Common\System\NotImplemented.cs - - - Common\System\HexConverter.cs - + + diff --git a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj index 1f88c208e95f0..b69a6969bdae7 100644 --- a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj +++ b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj @@ -6,24 +6,20 @@ $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix - - Common\System\Collections\Generic\ArrayBuilder.cs - - - Common\System\HexConverter.cs - + + - - System\IPv4AddressHelper.Common.cs - + - - System\IPv6AddressHelper.Common.cs - + @@ -37,9 +33,8 @@ - - Common\System\Text\ValueStringBuilder.cs - + @@ -50,4 +45,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj b/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj index f1f97bbd7e89e..52d11acea9fb1 100644 --- a/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj +++ b/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj @@ -15,11 +15,9 @@ - - Common\System\Text\ValueStringBuilder.cs - - - Common\System\HexConverter.cs - + + \ No newline at end of file diff --git a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj index 55c377e763119..bc755de8120e6 100644 --- a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj +++ b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj @@ -6,12 +6,10 @@ - - Common\System\Collections\Generic\EnumerableHelpers.cs - - - Common\System\Text\StringBuilderCache.cs - + + diff --git a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj index 27fc4e7023b8e..f397c8aebbd85 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj +++ b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj @@ -3,12 +3,10 @@ $(NetCoreAppCurrent) - - Common\System\Collections\DictionaryExtensions.cs - - - Common\System\IO\TempFile.cs - + + diff --git a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj index 87a3ba557100a..9b130cfa612af 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj +++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj @@ -4,9 +4,8 @@ $(NetCoreAppCurrent) - - Common\System\Collections\DictionaryExtensions.cs - + diff --git a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj index c0215be859644..833bf50383d10 100644 --- a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj +++ b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj @@ -8,15 +8,12 @@ $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix - - Common\System\StringBuilderCache.cs - - - Common\System\Marvin.cs - - - Common\System\HexConverter.cs - + + + @@ -794,9 +791,8 @@ - - System\LocalAppContextSwitches.Common.cs - + diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj index a3beda715d3df..b04baf688a7e0 100644 --- a/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj @@ -3,9 +3,8 @@ $(NetCoreAppCurrent) - - Common\System\ShouldNotBeInvokedException.cs - + diff --git a/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj index b28cbb68ef06e..d14c1e04b7e7a 100644 --- a/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj @@ -7,8 +7,7 @@ - - Common\System\Threading\TrackingSynchronizationContext.cs - + \ No newline at end of file diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj index c7b6e43f2f4ab..4e06985c52e55 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj @@ -34,9 +34,8 @@ - - Common\System\IO\TempDirectory.cs - + - - Common\System\IO\TempDirectory.cs - + - - Common\System\Reflection\Emit\IgnoreAccessChecksToAttributeBuilder.cs - + @@ -33,4 +32,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index e2054078129e7..64f48835fde45 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -9,12 +9,10 @@ enable - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs - + + diff --git a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj index 73119be2190f9..e3d82ffed0a33 100644 --- a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj +++ b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj @@ -6,24 +6,18 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.FreeLibrary.cs - - - Common\Interop\Windows\Interop.GetModuleHandle.cs - - - Common\Interop\Windows\Interop.LoadLibraryEx.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs - - - Common\System\IO\TempFile.cs - + + + + + + diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj b/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj index 346761c5ded63..2c3eb7011daa8 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj @@ -4,12 +4,10 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) - - Common\System\IO\TempDirectory.cs - - - Common\System\IO\TempFile.cs - + + @@ -71,4 +69,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj b/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj index bc9f91e515bcd..f96a3551aa4b8 100644 --- a/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj +++ b/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj @@ -7,13 +7,12 @@ true - - Common\System\Reflection\MockParameterInfo.cs - - - - Common\System\IO\TempFile.cs - + + + @@ -65,4 +64,4 @@ - \ No newline at end of file + 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 dc0dd95dcbf84..100a496b86af7 100644 --- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj @@ -8,23 +8,28 @@ - - - - - - + + + + + + - - System\Numerics\Hashing\HashHelpers.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj index 42835e7473b68..8bed771d65125 100644 --- a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj +++ b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj @@ -7,12 +7,10 @@ - - System\Numerics\Hashing\HashHelpers.cs - - - TypeNameComparer.cs - + + diff --git a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj index 87e65b381d465..5e102a633daef 100644 --- a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj +++ b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj @@ -18,9 +18,8 @@ - - Common\System\Drawing\Helpers.cs - + @@ -55,7 +54,7 @@ + Visible="false" /> - - Common\System\NotImplemented.cs - - - Microsoft\Win32\SafeHandles\SafeTokenHandle.cs - - - Common\Interop\Interop.Libraries.cs - - - Common\Interop\Interop.LUID.cs - - - Common\Interop\Interop.LUID_AND_ATTRIBUTES.cs - - - Common\Interop\Interop.TOKEN_PRIVILEGE.cs - - - Common\Interop\Interop.SecurityImpersonationLevel.cs - - - Common\Interop\Interop.Errors.cs - - - Common\Interop\Interop.ProcessOptions.cs - - - Common\Interop\Interop.LookupPrivilegeValue.cs - - - Common\Interop\Interop.RevertToSelf.cs - - - Common\Interop\Interop.ConvertSdToStringSd.cs - - - Common\Interop\Interop.ConvertStringSdToSd.cs - - - Common\Interop\Interop.GetSecurityInfoByHandle.cs - - - Common\Interop\Interop.SetSecurityInfoByHandle.cs - - - Common\Interop\Interop.GetSecurityInfoByName.cs - - - Common\Interop\Interop.SetSecurityInfoByName.cs - - - Common\Interop\Interop.GetSecurityDescriptorLength.cs - - - Common\Interop\Interop.CloseHandle.cs - - - Common\Interop\Interop.OpenThreadToken_SafeTokenHandle.cs - - - Common\Interop\Interop.OpenProcessToken_IntPtrs.cs - - - Common\Interop\Interop.GetCurrentProcess_IntPtr.cs - - - Common\Interop\Interop.SetThreadToken.cs - - - Common\Interop\Interop.GetCurrentThread.cs - - - Common\Interop\Interop.AdjustTokenPrivileges.cs - - - Common\Interop\Interop.DuplicateTokenEx_SafeTokenHandle.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -120,4 +94,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj b/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj index 485f96ce4cf4a..3b2959c20ba89 100644 --- a/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj +++ b/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj @@ -86,69 +86,48 @@ - - Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs - - - Internal\Cryptography\BasicSymmetricCipher.cs - - - Internal\Cryptography\Helpers.cs - - - Internal\Cryptography\HashProvider.cs - - - Common\Internal\Cryptography\PemKeyImportHelpers.cs - - - Internal\Cryptography\UniversalCryptoTransform.cs - - - Internal\Cryptography\UniversalCryptoEncryptor.cs - - - Internal\Cryptography\UniversalCryptoDecryptor.cs - - - Common\System\Memory\PointerMemoryManager.cs - - - Common\System\Security\Cryptography\CryptoPool.cs - - - Common\System\Security\Cryptography\DSAKeyFormatHelper.cs - - - Common\System\Security\Cryptography\EccKeyFormatHelper.cs - - - Common\System\Security\Cryptography\KeyBlobHelpers.cs - - - Common\System\Security\Cryptography\KeyFormatHelper.cs - - - Common\System\Security\Cryptography\KeySizeHelpers.cs - - - Common\System\Security\Cryptography\Oids.cs - - - Common\System\Security\Cryptography\PasswordBasedEncryption.cs - - - Common\System\Security\Cryptography\PemLabels.cs - - - Common\System\Security\Cryptography\Pkcs12Kdf.cs - - - Common\System\Security\Cryptography\RSAKeyFormatHelper.cs - - - Common\System\Security\Cryptography\RsaPaddingProcessor.cs - + + + + + + + + + + + + + + + + + + + + + Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml @@ -306,290 +285,196 @@ - - Internal\Cryptography\BasicSymmetricCipherBCrypt.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\BCrypt\AesBCryptModes.cs - - - Common\Interop\Windows\BCrypt\Cng.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptImportKey.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptEncryptDecrypt.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs - - - Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs - - - Common\Interop\Windows\BCrypt\Interop.AsymmetricEncryption.Types.cs - - - Common\Interop\Windows\BCrypt\Interop.Blobs.cs - - - Common\Interop\Windows\BCrypt\Interop.CreateCryptographicException.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptOpenAlgorithmProvider.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptCloseAlgorithmProvider.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptDestroyHash.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptCreateHash.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptHashData.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptFinishHash.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs - - - Internal\Windows\NCrypt\Interop.NCryptDeriveKeyMaterial.cs - - - Internal\Windows\NCrypt\Interop.NCryptDeriveSecretAgreement.cs - - - Internal\Windows\NCrypt\Interop.NCryptBuffer.cs - - - Internal\Windows\BCrypt\BCryptAlgorithmCache.cs - - - Common\Interop\Windows\BCrypt\DESBCryptModes.cs - - - Common\Interop\Windows\BCrypt\RC2BCryptModes.cs - - - Common\Interop\Windows\BCrypt\TripleDesBCryptModes.cs - - - Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs - - - Common\Interop\Windows\Crypt32\Interop.HashIdAlg.cs - - - Common\Interop\Windows\NCrypt\Interop.AsymmetricPaddingMode.cs - - - Common\Interop\Windows\NCrypt\Interop.ErrorCode.cs - - - Common\Interop\Windows\NCrypt\Interop.EncryptDecrypt.cs - - - Common\Interop\Windows\NCrypt\Interop.Keys.cs - - - Common\Interop\Windows\NCrypt\Interop.NCryptFreeObject.cs - - - Common\Interop\Windows\NCrypt\Interop.NCryptOpenStorageProvider.cs - - - Common\Interop\Windows\NCrypt\Interop.ErrorCode.cs - - - Common\Interop\Windows\NCrypt\Interop.SignVerify.cs - - - Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs - - - Microsoft\Win32\SafeHandles\SafeBCryptAlgorithmHandle.cs - - - Microsoft\Win32\SafeHandles\SafeBCryptHashHandle.cs - - - Microsoft\Win32\SafeHandles\SafeUnicodeStringHandle.cs - - - Internal\Cryptography\CngCommon.Hash.cs - - - Internal\Cryptography\CngCommon.SignVerify.cs - - - Internal\Cryptography\HashProviderCng.cs - - - Internal\Cryptography\Windows\CryptoThrowHelper.cs - - - Internal\Cryptography\Windows\ErrorCodeHelper.cs - - - Internal\Windows\kernel32\Interop.FormatMessage.cs - - - Common\System\Security\Cryptography\CngPkcs8.cs - - - Common\System\Security\Cryptography\DSACng.cs - - - Common\System\Security\Cryptography\DSACng.ImportExport.cs - - - Common\System\Security\Cryptography\DSACng.SignVerify.cs - - - Common\System\Security\Cryptography\ECCng.HashAlgorithm.cs - - - Common\System\Security\Cryptography\ECCng.ImportExport.cs - - - Common\System\Security\Cryptography\ECDsaCng.cs - - - Common\System\Security\Cryptography\ECDsaCng.ImportExport.cs - - - Common\System\Security\Cryptography\ECDsaCng.cs - - - Common\System\Security\Cryptography\ECDsaCng.HashData.cs - - - Common\System\Security\Cryptography\ECDsaCng.ImportExport.cs - - - Common\System\Security\Cryptography\ECDsaCng.SignVerify.cs - - - Common\System\Security\Cryptography\RSACng.cs - - - Common\System\Security\Cryptography\RSACng.EncryptDecrypt.cs - - - Common\System\Security\Cryptography\RSACng.ImportExport.cs - - - Common\System\Security\Cryptography\RSACng.SignVerify.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Dsa.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.ImportExport.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcKey.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.EcKey.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Ecdh.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EVP.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Hmac.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.RAND.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs - - - Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeDsaHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeEcKeyHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeEvpMdCtxHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeEvpPkeyCtxHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeHmacCtxHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafeEvpPKeyHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs - - - Common\System\Security\Cryptography\DSAOpenSsl.cs - - - Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.cs - - - Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.Derive.cs - - - Common\System\Security\Cryptography\ECDiffieHellmanOpenSslPublicKey.cs - - - Common\System\Security\Cryptography\ECDsaOpenSsl.cs - - - Common\System\Security\Cryptography\ECOpenSsl.cs - - - Common\System\Security\Cryptography\ECOpenSsl.ImportExport.cs - - - Common\System\Security\Cryptography\RSAOpenSsl.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -602,90 +487,62 @@ - - Common\Interop\OSX\Interop.CoreFoundation.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFData.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFError.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFString.cs - - - Common\Interop\OSX\Interop.Libraries.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Digest.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ecc.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Hmac.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.KeyAgree.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.PAL_HashAlgorithm.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Random.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.RSA.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.Export.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Symmetric.cs - - - Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs - - - Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs - - - Common\System\Security\Cryptography\DSASecurityTransforms.cs - - - Common\System\Security\Cryptography\EccSecurityTransforms.cs - - - Common\System\Security\Cryptography\ECDiffieHellmanSecurityTransforms.cs - - - Common\System\Security\Cryptography\ECDsaSecurityTransforms.cs - - - Common\System\Security\Cryptography\RSASecurityTransforms.cs - - - Common\System\Security\Cryptography\SecKeyPair.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -696,27 +553,20 @@ - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EVP.Cipher.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs - - - Common\Microsoft\Win32\SafeHandles\SafeEvpCipherCtxHandle.Unix.cs - - - Common\System\Security\Cryptography\ECDiffieHellmanDerivation.cs - + + + + + + + diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj index 8b648f3cc436c..6d55e3483025d 100644 --- a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj @@ -3,99 +3,68 @@ $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix - - CommonTest\System\IO\PositionValueStream.cs - - - CommonTest\System\RandomDataGenerator.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesCipherTests.Data.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesCipherTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesContractTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesCornerTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesModeTests.cs - - - CommonTest\System\Security\Cryptography\ByteUtils.cs - - - CommonTest\System\Security\Cryptography\CryptoUtils.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\DecryptorReusability.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESCipherTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESReusabilityTests.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -130,71 +99,51 @@ - - Common\Interop\Unix\Interop.Libraries.cs - + - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs - + + + + + + + + + + + + + + + + + + + @@ -224,75 +173,52 @@ - - CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESCipherTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DesTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.NistValidation.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2CipherTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Tests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj b/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj index 0aae024d50dde..21e5ad64657b5 100644 --- a/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj +++ b/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj @@ -70,249 +70,168 @@ - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\BCrypt\AesBCryptModes.cs - - - Common\Interop\Windows\BCrypt\Cng.cs - - - Interop\Windows\BCrypt\Interop.BCryptImportKey.cs - - - Interop\Windows\BCrypt\Interop.BCryptEncryptDecrypt.cs - - - Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs - - - Common\Interop\Windows\BCrypt\Interop.AsymmetricEncryption.Types.cs - - - Common\Interop\Windows\BCrypt\Interop.Blobs.cs - - - Common\Interop\Windows\BCrypt\Interop.CreateCryptographicException.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptOpenAlgorithmProvider.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptCloseAlgorithmProvider.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptDestroyHash.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptCreateHash.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptHashData.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptFinishHash.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs - - - Internal\Windows\BCrypt\BCryptAlgorithmCache.cs - - - Internal\Windows\BCrypt\Interop.BCryptChainingModes.cs - - - Internal\Windows\BCrypt\Interop.BCryptKeyDataBlob.cs - - - Common\Interop\Windows\BCrypt\TripleDesBCryptModes.cs - - - Internal\Windows\Crypt32\Interop.FindOidInfo.cs - - - Common\Interop\Windows\Crypt32\Interop.HashIdAlg.cs - - - Internal\Windows\NCrypt\Interop.AsymmetricPaddingMode.cs - - - Internal\Windows\NCrypt\Interop.EncryptDecrypt.cs - - - Internal\Windows\NCrypt\Interop.ErrorCode.cs - - - Internal\Windows\NCrypt\Interop.Keys.cs - - - Internal\Windows\NCrypt\Interop.NCryptAlgorithms.cs - - - Internal\Windows\NCrypt\Interop.NCryptFreeObject.cs - - - Internal\Windows\NCrypt\Interop.NCryptCipherKeyBlob.cs - - - Internal\Windows\NCrypt\Interop.NCryptPropertyNames.cs - - - Internal\Windows\NCrypt\Interop.NCryptOpenStorageProvider.cs - - - Internal\Windows\NCrypt\Interop.NCryptDeriveKeyMaterial.cs - - - Internal\Windows\NCrypt\Interop.NCryptDeriveSecretAgreement.cs - - - Internal\Windows\NCrypt\Interop.NCryptBuffer.cs - - - Internal\Windows\NCrypt\Interop.Properties.cs - - - Internal\Windows\NCrypt\Interop.SignVerify.cs - - - Internal\Windows\NCrypt\Interop.UiPolicy.cs - - - Internal\Windows\kernel32\Interop.FormatMessage.cs - - - Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs - - - Microsoft\Win32\SafeHandles\SafeBCryptHashHandle.cs - - - Microsoft\Win32\SafeHandles\SafeBCryptAlgorithmHandle.cs - - - Microsoft\Win32\SafeHandles\SafeUnicodeStringHandle.cs - - - Internal\Cryptography\Windows\CryptoThrowHelper.cs - - - Internal\Cryptography\Windows\ErrorCodeHelper.cs - - - Internal\Cryptography\CngCommon.Hash.cs - - - Internal\Cryptography\CngCommon.SignVerify.cs - - - Internal\Cryptography\HashProvider.cs - - - Internal\Cryptography\HashProviderCng.cs - - - Internal\Cryptography\Helpers.cs - - - Internal\Cryptography\BasicSymmetricCipher.cs - - - Internal\Cryptography\BasicSymmetricCipherBCrypt.cs - - - Internal\Cryptography\UniversalCryptoTransform.cs - - - Internal\Cryptography\UniversalCryptoEncryptor.cs - - - Internal\Cryptography\UniversalCryptoDecryptor.cs - - - Common\System\Memory\PointerMemoryManager.cs - - - Common\System\Security\Cryptography\CryptoPool.cs - - - Common\System\Security\Cryptography\CngPkcs8.cs - - - Common\System\Security\Cryptography\DSACng.cs - - - Common\System\Security\Cryptography\DSACng.ImportExport.cs - - - Common\System\Security\Cryptography\DSACng.SignVerify.cs - - - Common\System\Security\Cryptography\EccKeyFormatHelper.cs - - - Common\System\Security\Cryptography\ECCng.ImportExport.cs - - - Common\System\Security\Cryptography\ECDiffieHellmanCng.cs - - - Common\System\Security\Cryptography\ECDiffieHellmanCng.ImportExport.cs - - - Common\System\Security\Cryptography\ECDsaCng.ImportExport.cs - - - Common\System\Security\Cryptography\ECCng.HashAlgorithm.cs - - - Common\System\Security\Cryptography\ECDsaCng.cs - - - Common\System\Security\Cryptography\ECDsaCng.HashData.cs - - - Common\System\Security\Cryptography\ECDsaCng.SignVerify.cs - - - Common\System\Security\Cryptography\KeyBlobHelpers.cs - - - Common\System\Security\Cryptography\KeyFormatHelper.cs - - - Common\System\Security\Cryptography\KeySizeHelpers.cs - - - Common\System\Security\Cryptography\Oids.cs - - - Common\System\Security\Cryptography\PasswordBasedEncryption.cs - - - Common\System\Security\Cryptography\Pkcs12Kdf.cs - - - Common\System\Security\Cryptography\RSACng.cs - - - Common\System\Security\Cryptography\RSACng.EncryptDecrypt.cs - - - Common\System\Security\Cryptography\RSACng.ImportExport.cs - - - Common\System\Security\Cryptography\RSACng.SignVerify.cs - - - Common\System\Security\Cryptography\RsaPaddingProcessor.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj index a5d72223d4701..f8a3847aa5683 100644 --- a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj @@ -15,81 +15,58 @@ - - CommonTest\AlgorithmImplementations\AES\AesCipherTests.Data.cs - - - CommonTest\AlgorithmImplementations\AES\AesCornerTests.cs - - - CommonTest\AlgorithmImplementations\AES\DecryptorReusability.cs - - - CommonTest\AlgorithmImplementations\AES\AesFactory.cs - + + + + - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESFactory.cs - + - - CommonTest\System\Security\Cryptography\ByteUtils.cs - - - CommonTest\System\Security\Cryptography\CryptoUtils.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs - + + + + + - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs - + + + + + + - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs - - - CommonTest\System\IO\PositionValueStream.cs - + + + + + + + @@ -99,135 +76,93 @@ - - CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - CommonTest\AlgorithmImplementations\AES\AesContractTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESCipherTests.cs - - - CommonTest\AlgorithmImplementations\AES\AesModeTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESReusabilityTests.cs - - - CommonTest\AlgorithmImplementations\AES\AesCipherTests.cs - + + + + + - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs - + + + + + + + + diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj index 85f5b05c2e6f6..f495318ac1968 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj +++ b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj @@ -24,12 +24,10 @@ - - Internal\Cryptography\Helpers.cs - - - Common\System\Security\Cryptography\KeySizeHelpers.cs - + + @@ -40,9 +38,8 @@ - - Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs - + @@ -56,99 +53,68 @@ - - Internal\Cryptography\BasicSymmetricCipher.cs - - - Internal\Cryptography\UniversalCryptoTransform.cs - - - Internal\Cryptography\UniversalCryptoEncryptor.cs - - - Internal\Cryptography\UniversalCryptoDecryptor.cs - - - Internal\Cryptography\Windows\CryptoThrowHelper.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptCreateHash.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptDecrypt.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptDeriveKey.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptEncrypt.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptExportKey.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptGenKey.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptGetDefaultProvider.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptGetHashParam.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptGetKeyParam.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptGetUserKey.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptHashData.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptImportKey.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptSetKeyParam.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptSignHash.cs - - - Common\Interop\Windows\Advapi32\SafeHashHandle.cs - - - Common\Interop\Windows\Advapi32\SafeKeyHandle.cs - - - Common\Interop\Windows\Advapi32\SafeProvHandle.cs - - - Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs - - - Common\Interop\Windows\kernel32\Interop.FormatMessage.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -162,4 +128,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj index 887d4a3e1f205..33a4d4b814609 100644 --- a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj @@ -10,33 +10,24 @@ - - CommonTest\System\Security\Cryptography\ByteUtils.cs - - - CommonTest\System\Security\Cryptography\CryptoUtils.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs - - - CommonTest\System\IO\PositionValueStream.cs - + + + + + + + + + @@ -51,80 +42,55 @@ - - CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESCipherTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DesTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2CipherTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Tests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj index 19f6ae909d28f..5c496e61e5367 100644 --- a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj +++ b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj @@ -20,90 +20,66 @@ - - Internal\Cryptography\Helpers.cs - - - System\Security\Cryptography\CryptoPool.cs - - - Common\System\HexConverter.cs - + + + - - Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs - - - Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs - - - Common\Interop\Windows\BCrypt\Cng.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptFormatObject.cs - - - Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs - - - Internal\Cryptography\Windows\CryptoThrowHelper.cs - - - Internal\Windows\kernel32\Interop.FormatMessage.cs - - - Common\Interop\Windows\Interop.Libraries.cs - + + + + + + + + + - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.LookupFriendlyNameByOid.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs - - - Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs - - - Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs - + + + + + + + + + + + - - Common\System\Memory\PointerMemoryManager.cs - + Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml diff --git a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj index 1a63d7889f1b9..e366899cb1db0 100644 --- a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj @@ -5,9 +5,8 @@ - - Common\System\Security\Cryptography\CryptoPool.cs - + @@ -90,11 +89,9 @@ - - CommonTest\System\Security\Cryptography\ByteUtils.cs - - - Common\System\Memory\PointerMemoryManager.cs - + + diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj index 6f9f04c70d574..7887093637116 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj @@ -18,129 +18,88 @@ - - Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs - - - Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs - - - Internal\Cryptography\Helpers.cs - - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Dsa.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.ImportExport.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcKey.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Dsa.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Ecdh.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.EcKey.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Rsa.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs - - - Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeDsaHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeEcKeyHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeEvpPkeyCtxHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeEvpPKeyHandle.Unix.cs - - - Common\System\Memory\PointerMemoryManager.cs - - - Common\System\Security\Cryptography\CryptoPool.cs - - - Common\System\Security\Cryptography\DSAOpenSsl.cs - - - Common\System\Security\Cryptography\ECDiffieHellmanDerivation.cs - - - Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.cs - - - Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.Derive.cs - - - Common\System\Security\Cryptography\ECDiffieHellmanOpenSslPublicKey.cs - - - Common\System\Security\Cryptography\ECDsaOpenSsl.cs - - - Common\System\Security\Cryptography\ECOpenSsl.cs - - - Common\System\Security\Cryptography\ECOpenSsl.ImportExport.cs - - - Common\System\Security\Cryptography\KeyBlobHelpers.cs - - - Common\System\Security\Cryptography\RSAOpenSsl.cs - - - Common\System\Security\Cryptography\RsaPaddingProcessor.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj index f766dd7a378c3..0b3981c915681 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj @@ -6,179 +6,124 @@ - - Common\Interop\Unix\Interop.Libraries.cs - - - CommonTest\System\Security\Cryptography\ByteUtils.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs - - - CommonTest\System\IO\PositionValueStream.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs - + + + + + + + + + + + + + + - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs - - - CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs - + + + + + + + + + + + + + + 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 8f3d58028081e..1af7e2dab0cc2 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 @@ -56,12 +56,10 @@ - - Internal\Cryptography\Helpers.cs - - - Common\System\HexConverter.cs - + + @@ -160,225 +158,153 @@ - - Common\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs - - - Common\Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs - - - Common\Interop\Windows\Advapi32\SafeHashHandle.cs - - - Common\Interop\Windows\Advapi32\SafeKeyHandle.cs - - - Common\Interop\Windows\Advapi32\SafeProvHandle.cs - - - Common\Interop\Windows\Crypt32\Interop.CERT_CONTEXT.cs - - - Common\Interop\Windows\Crypt32\Interop.CERT_ID.cs - - - Common\Interop\Windows\Crypt32\Interop.CERT_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CERT_ISSUER_SERIAL_NUMBER.cs - - - Common\Interop\Windows\Crypt32\Interop.CERT_PUBLIC_KEY_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CertContextPropId.cs - - - Common\Interop\Windows\Crypt32\Interop.CertCreateCertificateContext.cs - - - Common\Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs - - - Common\Interop\Windows\Crypt32\Interop.CertGetCertificateContextProperty.cs - - - Common\Interop\Windows\Crypt32\Interop.CertGetPublicKeyLength.cs - - - Common\Interop\Windows\Crypt32\Interop.CertIdChoice.cs - - - Common\Interop\Windows\Crypt32\Interop.CertNameStrTypeAndFlags.cs - - - Common\Interop\Windows\Crypt32\Interop.CertNameToStr.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_CMS_RECIPIENT_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_CTRL_DECRYPT_PARA.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_CTRL_KEY_AGREE_DECRYPT_PARA.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_ENVELOPED_ENCODE_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_AGREE_RECIPIENT_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_TRANS_RECIPIENT_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_RC2_AUX_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCODE_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCRYPTED_KEY_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CMsgCmsRecipientChoice.cs - - - Common\Interop\Windows\Crypt32\Interop.CMsgKeyAgreeOriginatorChoice.cs - - - Common\Interop\Windows\Crypt32\Interop.CmsKeyAgreeKeyChoice.cs - - - Common\Interop\Windows\Crypt32\Interop.CRYPT_ALGORITHM_IDENTIFIER.cs - - - Common\Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTE.cs - - - Common\Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTE_TYPE_VALUE.cs - - - Common\Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTES.cs - - - Common\Interop\Windows\Crypt32\Interop.CRYPT_BIT_BLOB.cs - - - Common\Interop\Windows\Crypt32\Interop.CRYPT_KEY_PROV_INFO.cs - - - Common\Interop\Windows\Crypt32\Interop.CRYPT_RC2_CBC_PARAMETERS.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptAcquireCertificatePrivateKey.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptAcquireCertificatePrivateKeyFlags.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptDecodeObject.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptDecodeObjectStructType.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptEncodeDecodeWrappers.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptEncodeObject.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptKeySpec.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptMsgClose.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptMsgControl.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptMsgGetParam.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptMsgOpenToDecode.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptMsgOpenToEncode.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptMsgParamType.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptMsgType.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptMsgUpdate.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptRc2Version.cs - - - Common\Interop\Windows\Crypt32\Interop.DATA_BLOB.cs - - - Common\Interop\Windows\Crypt32\Interop.ErrorCode.cs - - - Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs - - - Common\Interop\Windows\Crypt32\Interop.MsgControlType.cs - - - Common\Interop\Windows\Crypt32\Interop.MsgEncodingType.cs - - - Common\Interop\Windows\kernel32\Interop.FormatMessage.cs - - - Common\Interop\Windows\kernel32\Interop.Heap.cs - - - Common\Interop\Windows\NCrypt\Interop.ErrorCode.cs - - - Common\Interop\Windows\NCrypt\Interop.Properties.cs - - - Common\Interop\Windows\NCrypt\Interop.NCryptFreeObject.cs - - - Common\Interop\Windows\Interop.Libraries.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\Internal\Cryptography\Windows\CryptoThrowHelper.cs - - - Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs - + + @@ -417,15 +343,12 @@ - - Common\System\Memory\PointerMemoryManager.cs - - - Common\System\Security\Cryptography\CryptoPool.cs - - - Common\System\Security\Cryptography\Oids.cs - + + + Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml @@ -655,9 +578,8 @@ - - Common\System\Security\Cryptography\KeyFormatHelper.cs - + Common\System\Security\Cryptography\Asn1\DigestInfoAsn.xml @@ -704,12 +626,10 @@ Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml.cs Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml - - Common\System\Security\Cryptography\PasswordBasedEncryption.cs - - - Common\System\Security\Cryptography\Pkcs12Kdf.cs - + + System\Security\Cryptography\Pkcs\Asn1\SecretBagAsn.xml diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj index 6ec360c29c787..84063fc61066b 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj @@ -4,9 +4,8 @@ $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);$(NetFrameworkCurrent)-Windows_NT - - CommonTest\System\Security\Cryptography\ByteUtils.cs - + diff --git a/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj b/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj index df10307ed4244..908b170d33d57 100644 --- a/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj +++ b/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj @@ -24,28 +24,22 @@ - - Common\System\Threading\Tasks\ForceAsyncAwaiter.cs - - - Internal\Cryptography\Helpers.cs - - - Common\System\Security\Cryptography\CryptoPool.cs - - - Common\System\Security\Cryptography\KeySizeHelpers.cs - - - Common\System\Security\Cryptography\Oids.cs - - - Common\System\Threading\Tasks\TaskToApm.cs - + + + + + + - \ No newline at end of file + diff --git a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj index 6a871d8603058..02859eff46c5c 100644 --- a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj @@ -3,9 +3,8 @@ $(NetCoreAppCurrent) - - CommonTest\System\IO\PositionValueStream.cs - + @@ -23,4 +22,4 @@ - \ No newline at end of file + 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 08baa54b43202..3c36e6ececf1c 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 @@ -10,33 +10,24 @@ - - Common\Interop\Windows\Crypt32\Interop.CryptProtectData.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptUnprotectData.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptProtectDataFlags.cs - - - Common\Interop\Windows\Crypt32\Interop.DATA_BLOB.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Internal\Cryptography\Windows\CryptoThrowHelper.cs - - - Internal\Windows\kernel32\Interop.FormatMessage.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\System\HResults.cs - + + + + + + + + + diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj index 412b5dd0ac062..2d90d9b44f076 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj @@ -5,8 +5,7 @@ - - CommonTest\System\Security\Cryptography\ByteUtils.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj index 1d0586c53367d..d1de01a95e8c8 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj +++ b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj @@ -12,24 +12,18 @@ - - Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs - - - Common\System\Memory\PointerMemoryManager.cs - - - Common\System\Security\Cryptography\CryptoPool.cs - - - Common\System\Security\Cryptography\Oids.cs - - - Common\System\Security\Cryptography\KeyBlobHelpers.cs - - - Common\System\Security\Cryptography\KeySizeHelpers.cs - + + + + + + Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml @@ -105,15 +99,12 @@ Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.manual.cs Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml - - Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs - - - Internal\Cryptography\Helpers.cs - - - Common\System\HexConverter.cs - + + + @@ -250,54 +241,38 @@ - - Common\Interop\Windows\Crypt32\Interop.CertCloseStore.cs - - - Common\Interop\Windows\Crypt32\Interop.CertNameToStr.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptMsgClose.cs - - - Common\Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptFormatObject.cs - - - Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs - - - Common\Internal\Cryptography\Windows\CryptoThrowHelper.cs - - - Common\Internal\Windows\kernel32\Interop.FormatMessage.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptDestroyKey.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptExportKey.cs - - - Common\Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs - - - Common\Interop\Windows\BCrypt\Interop.Blobs.cs - - - Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs - - - Common\Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafeBCryptKeyHandle.cs - + + + + + + + + + + + + + + + + @@ -308,15 +283,12 @@ System\Security\Cryptography\X509Certificates\Asn1\DistributionPointNameAsn.xml - - Common\System\Security\Cryptography\KeyFormatHelper.cs - - - Common\System\Security\Cryptography\PasswordBasedEncryption.cs - - - Common\System\Security\Cryptography\Pkcs12Kdf.cs - + + + @@ -338,224 +310,152 @@ - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\System.Native\Interop.Permissions.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.GetIntegerBytes.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Encode.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OCSP.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs12.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs7.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs - - - Common\Interop\Unix\Interop.Close.cs - - - Common\Interop\Unix\System.Native\Interop.FChMod.cs - - - Common\Interop\Unix\Interop.GetEUid.cs - - - Common\Interop\Unix\Interop.GetPwUid.cs - - - Common\Interop\Unix\System.Native\Interop.Stat.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs - - - Common\Interop\Unix\System.Security.Cryptography.Native\Interop.PooledCrypto.cs - - - Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafePkcs12Handle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafePkcs7Handle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs - - - Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs - - - Common\System\IO\PersistedFiles.Unix.cs - - - Common\System\IO\PersistedFiles.Names.Unix.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs - - - Common\Interop\OSX\Interop.CoreFoundation.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFData.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFDate.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFError.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFString.cs - - - Common\Interop\OSX\Interop.Libraries.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ecc.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.PAL_HashAlgorithm.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.RSA.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.Export.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Trust.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Chain.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Store.cs - - - Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs - - - Common\System\Security\Cryptography\DSAKeyFormatHelper.cs - - - Common\System\Security\Cryptography\DSASecurityTransforms.cs - - - Common\System\Security\Cryptography\EccKeyFormatHelper.cs - - - Common\System\Security\Cryptography\EccSecurityTransforms.cs - - - Common\System\Security\Cryptography\ECDsaSecurityTransforms.cs - - - Common\System\Security\Cryptography\KeyFormatHelper.cs - - - Common\System\Security\Cryptography\PasswordBasedEncryption.cs - - - Common\System\Security\Cryptography\Pkcs12Kdf.cs - - - Common\System\Security\Cryptography\RSAKeyFormatHelper.cs - - - Common\System\Security\Cryptography\RsaPaddingProcessor.cs - - - Common\System\Security\Cryptography\RSASecurityTransforms.cs - - - Common\System\Security\Cryptography\SecKeyPair.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Common\System\Security\Cryptography\Asn1\CurveAsn.xml diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index 3f129ff6efe9a..8b6a83aeef888 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj @@ -8,12 +8,10 @@ - - Common\System\Memory\PointerMemoryManager.cs - - - Common\System\Security\Cryptography\CryptoPool.cs - + + @@ -40,9 +38,8 @@ - - CommonTest\System\Security\Cryptography\ByteUtils.cs - + @@ -65,73 +62,52 @@ - - Common\Interop\Unix\Interop.Libraries.cs - - - Common\Interop\Unix\Interop.Errors.cs - - - Common\Interop\Unix\Interop.GetEUid.cs - - - Common\Interop\Unix\Interop.GetPwUid.cs - - - Common\Interop\Unix\System.Native\Interop.FChMod.cs - - - Common\Interop\Unix\System.Native\Interop.Permissions.cs - - - Common\Interop\Unix\System.Native\Interop.Stat.cs - - - Common\System\IO\PersistedFiles.Unix.cs - - - Common\System\IO\PersistedFiles.Names.Unix.cs - + + + + + + + + + - - Common\Interop\OSX\Interop.CoreFoundation.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFData.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFError.cs - - - Common\Interop\OSX\Interop.CoreFoundation.CFString.cs - - - Common\Interop\OSX\Interop.Libraries.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs - - - Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs - - - Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs - - - Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs - + + + + + + + + + + + + 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 44784da1fb405..36df5bdcd8a39 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 @@ -83,9 +83,8 @@ - - Common\System\HexConverter.cs - + @@ -115,4 +114,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj index 4a7ef1ddb9bc4..4302a20e0f240 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -182,15 +182,12 @@ - - System\Security\IStackWalk.cs - - - System\Security\PermissionSet.cs - - - System\Security\Permissions\PermissionState.cs - + + + diff --git a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj index 17bbfa7f04173..e7796c051a09c 100644 --- a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj +++ b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj @@ -28,161 +28,110 @@ - - Common\Interop\Interop.Libraries.cs - - - Common\Interop\Windows\Advapi32\Interop.UNICODE_STRING.cs - - - Common\Interop\Windows\Advapi32\Interop.OBJECT_ATTRIBUTES.cs - - - Common\Interop\Interop.TOKENS.cs - - - Common\Interop\Interop.WinError.cs - - - Common\Interop\Interop.Winnt.cs - - - Common\Interop\Interop.NtStatus.cs - - - Common\Interop\Interop.LSAStructs.cs - - - Common\Interop\Interop.SECURITY_LOGON_SESSION_DATA.cs - - - Common\Interop\Interop.GetCurrentProcess.cs - - - Common\Interop\Interop.GetCurrentThread.cs - - - Common\Interop\Interop.ClaimSecurityAttributes.cs - - - Common\Interop\Interop.OpenProcessToken.cs - - - Common\Interop\Interop.GetTokenInformation.cs - - - Common\Interop\Interop.DuplicateTokenEx.cs - - - Common\Interop\Interop.DuplicateHandle.cs - - - Common\Interop\Interop.CloseHandle.cs - - - Common\Interop\Interop.LsaGetLogonSessionData.cs - - - Common\Interop\Interop.LsaFreeReturnBuffer.cs - - - Common\Interop\Interop.LsaLookupNames2.cs - - - Common\Interop\Interop.LsaLookupSids.cs - - - Common\Interop\Interop.LsaClose.cs - - - Common\Interop\Interop.LsaFreeMemory.cs - - - Common\Interop\Interop.LsaOpenPolicy.cs - - - Common\Interop\Interop.ConvertStringSidToSid.cs - - - Common\Interop\Interop.CreateWellKnownSid.cs - - - Common\Interop\Interop.GetWindowsAccountDomainSid.cs - - - Common\Interop\Interop.IsWellKnownSid.cs - - - Common\Interop\Interop.IsEqualDomainSid.cs - - - Common\Interop\Interop.OpenThreadToken.cs - - - Common\Interop\Interop.RevertToSelf.cs - - - Common\Interop\Interop.ImpersonateLoggedOnUser.cs - - - Common\Interop\Interop.LsaNtStatusToWinError.cs - - - Common\Interop\Windows\Advapi32\Interop.LSA_STRING.cs - - - Common\Interop\Windows\SspiCli\Interop.AuthenticationPackageNames.cs - - - Common\Interop\Windows\SspiCli\Interop.KerbLogonSubmitType.cs - - - Common\Interop\Windows\SspiCli\Interop.KerbS4uLogin.cs - - - Common\Interop\Windows\SspiCli\Interop.LsaConnectUntrusted.cs - - - Common\Interop\Windows\SspiCli\Interop.LsaDeregisterLogonProcess.cs - - - Common\Interop\Windows\SspiCli\Interop.LsaLogonUser.cs - - - Common\Interop\Windows\SspiCli\Interop.LsaLookupAuthenticationPackage.cs - - - Common\Interop\Windows\SspiCli\Interop.QuotaLimits.cs - - - Common\Interop\Windows\SspiCli\Interop.SecurityLogonType.cs - - - Common\Interop\Windows\SspiCli\Interop.TokenSource.cs - - - Common\Interop\Windows\Advapi32\Interop.AllocateLocallyUniqueId.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLsaHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLsaMemoryHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLsaPolicyHandle.cs - - - Common\Microsoft\Win32\SafeHandles\SafeLsaReturnBufferHandle.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Common\Interop\Interop.CheckTokenMembership.cs - + diff --git a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj index 1607b7dbbce2b..6a95ac054f99e 100644 --- a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj +++ b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj @@ -12,8 +12,7 @@ - - Common\System\Threading\ThreadTestHelpers.cs - + \ No newline at end of file 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 6c47b7598ab68..2001619b1d36e 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -9,78 +9,54 @@ true - - Common\System\Text\ValueStringBuilder.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.Errors.cs - - - Common\Interop\Windows\Interop.ServiceProcessOptions.cs - - - Common\Interop\Windows\Interop.CloseServiceHandle.cs - - - Common\Interop\Windows\Interop.ControlService.cs - - - Common\Interop\Windows\Interop.EnumDependentServices.cs - - - Common\Interop\Windows\Interop.EnumServicesStatusEx.cs - - - Common\Interop\Windows\Interop.GetServiceDisplayName.cs - - - Common\Interop\Windows\Interop.GetServiceKeyName.cs - - - Common\Interop\Windows\Interop.OpenSCManager.cs - - - Common\Interop\Windows\Interop.OpenService.cs - - - Common\Interop\Windows\Interop.QueryServiceConfig.cs - - - Common\Interop\Windows\Interop.QueryServiceStatus.cs - - - Common\Interop\Windows\Interop.StartService.cs - - - Common\Interop\Windows\Interop.ENUM_SERVICE_STATUS.cs - - - Common\Interop\Windows\Interop.ENUM_SERVICE_STATUS_PROCESS.cs - - - Common\Interop\Windows\Interop.QUERY_SERVICE_CONFIG.cs - - - Common\Interop\Windows\Interop.SERVICE_STATUS.cs - - - Common\Interop\Windows\Interop.SERVICE_TABLE_ENTRY.cs - - - Common\Interop\Windows\Interop.SetServiceStatus.cs - - - Common\Interop\Windows\Interop.WTSSESSION_NOTIFICATION.cs - - - Common\Interop\Windows\Interop.RegisterServiceCtrlHandlerEx.cs - - - Common\Interop\Windows\Interop.StartServiceCtrlDispatcher.cs - + + + + + + + + + + + + + + + + + + + + + + + + @@ -117,4 +93,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj index a93989888aa84..cc521a253c498 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj @@ -11,41 +11,29 @@ Component - - Microsoft\Win32\SafeHandles\SafeServiceHandle.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.ServiceProcessOptions.cs - - - Common\Interop\Windows\Interop.CloseServiceHandle.cs - - - Common\Interop\Windows\Interop.OpenSCManager.cs - - - Common\Interop\Windows\Interop.OpenService.cs - - - Common\Interop\Windows\Interop.CreateService.cs - - - Common\Interop\Windows\Interop.SERVICE_DESCRIPTION.cs - - - Common\Interop\Windows\Interop.ChangeServiceConfig2.cs - - - Common\Interop\Windows\Interop.SERVICE_DELAYED_AUTOSTART_INFO.cs - - - Common\Interop\Windows\Interop.DeleteService.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - + + + + + + + + + + + + \ No newline at end of file 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 54071d3f8948f..1eceb585538a1 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 @@ -31,21 +31,16 @@ - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Interop\Windows\Interop.BOOL.cs - - - Common\Interop\Windows\Interop.GetCPInfoEx.cs - - - Common\Interop\Windows\Interop.MAX_PATH.cs - - - Common\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs - + + + + + @@ -79,4 +74,4 @@ Data\PreferredCodePageNames.csv System\Text\EncodingTable.Data.cs - \ No newline at end of file + 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 176198fafdd57..ba44ed2803d2a 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 @@ -27,15 +27,12 @@ - - System\Text\UnicodeDebug.cs - - - System\Text\UnicodeUtility.cs - - - Common\System\HexConverter.cs - + + + @@ -48,4 +45,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj b/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj index 5c821348d95b4..26f3b0dd17c6d 100644 --- a/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj +++ b/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj @@ -46,14 +46,11 @@ CharUnicodeInfo\UnicodeData.$(UnicodeUcdVersion).txt UnicodeData.txt - - System\Text\UnicodeDebug.cs - - - System\Text\UnicodeUtility.cs - - - Common\System\HexConverter.cs - + + + 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 a261c488c7293..9c7a7662cd1f7 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -15,12 +15,10 @@ enable - - Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs - - - Common\System\HexConverter.cs - + + @@ -213,9 +211,8 @@ - - Common\System\Buffers\ArrayBufferWriter.cs - + @@ -224,9 +221,8 @@ - - Common\System\Collections\Generic\ReferenceEqualityComparer.cs - + diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj index 89f75872b706b..c0ed35c265de4 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj @@ -5,9 +5,8 @@ true - - CommonTest\System\IO\WrappedMemoryStream.cs - + @@ -133,12 +132,12 @@ - + - - CommonTest\System\Buffers\ArrayBufferWriter.cs - + diff --git a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj index f3a73189a0b72..e068db478403e 100644 --- a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj +++ b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj @@ -47,18 +47,14 @@ - - Common\System\NotImplemented.cs - - - Common\System\HexConverter.cs - - - Common\System\Collections\Generic\ValueListBuilder.cs - - - Common\System\Text\ValueStringBuilder.cs - + + + + @@ -73,4 +69,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj index b89454d09d19d..7e0eeff932956 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj +++ b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj @@ -31,9 +31,8 @@ - - System\Text\RegularExpressions\RegexParseError.cs - + @@ -43,8 +42,7 @@ - - Common\System\Diagnostics\DebuggerAttributes.cs - + - \ No newline at end of file + 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 3ad5f73d3e174..baa988815a97b 100644 --- a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -7,19 +7,30 @@ true - + - - - - - - - - - - + + + + + + + + + + @@ -41,4 +52,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj index d5d815abc08a7..c60e1d656cd04 100644 --- a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj +++ b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj @@ -3,8 +3,10 @@ $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT - - + + @@ -12,4 +14,4 @@ - \ No newline at end of file + 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 bc603a3817bae..74dcb78e781e4 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -25,8 +25,10 @@ - - + + @@ -40,4 +42,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj index 46c9198e3b0d6..18e2caa001ee1 100644 --- a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj +++ b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj @@ -13,8 +13,7 @@ - - Common\System\Diagnostics\DebuggerAttributes.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj index 495e5054c7ca5..9b8f3480190fd 100644 --- a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj +++ b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj @@ -23,8 +23,7 @@ - - CommonTest\System\Threading\ThreadTestHelpers.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj index 9e20116e0ba46..7b588c9979dbd 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj @@ -41,9 +41,8 @@ - - Common\Internal\Padding.cs - + @@ -76,4 +75,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj b/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj index 1b02b25a8553c..64d15af718d8e 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj @@ -21,11 +21,9 @@ - - Common\System\Diagnostics\Tracing\TestEventListener.cs - - - Common\System\Diagnostics\DebuggerAttributes.cs - + + - \ No newline at end of file + diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj b/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj index 65d89caaf8e72..6a7215d2b5cb5 100644 --- a/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj +++ b/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj @@ -9,14 +9,11 @@ - - Common\System\Threading\Tasks\Sources\ManualResetValueTaskSource.cs - - - Common\System\Threading\Tasks\Sources\ManualResetValueTaskSourceFactory.cs - - - Common\System\Threading\Tasks\GetStateMachineData.cs - + + + - \ No newline at end of file + diff --git a/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj b/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj index 0c93e3a41ffa0..b758ad3f2f258 100644 --- a/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj +++ b/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj @@ -7,9 +7,8 @@ - - Common\System\Diagnostics\Tracing\TestEventListener.cs - + @@ -25,8 +24,7 @@ - - CommonTest\System\Threading\ThreadPoolHelpers.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj index d05826479b00d..d123c71e67a98 100644 --- a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj +++ b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj @@ -48,15 +48,12 @@ - - Common\System\Diagnostics\Tracing\TestEventListener.cs - - - CommonTest\System\Threading\ThreadPoolHelpers.cs - - - Common\System\Threading\Tasks\TaskTimeoutExtensions.cs - + + + - \ No newline at end of file + diff --git a/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj b/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj index 5834cb689cb11..5f4448b2bc4fb 100644 --- a/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj +++ b/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj @@ -12,9 +12,8 @@ - - CommonTest\System\Threading\ThreadTestHelpers.cs - + diff --git a/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj b/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj index c178d826b6809..f4741b497460e 100644 --- a/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj +++ b/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj @@ -8,8 +8,7 @@ - - CommonTest\System\Threading\ThreadTestHelpers.cs - + - \ No newline at end of file + diff --git a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj index ed2ea9ccca87b..30d9b8f8a207f 100644 --- a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj +++ b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj @@ -10,8 +10,7 @@ - - CommonTest\System\Threading\ThreadTestHelpers.cs - + \ No newline at end of file diff --git a/src/libraries/System.Threading/src/System.Threading.csproj b/src/libraries/System.Threading/src/System.Threading.csproj index 6401755e4cdbc..dbe7a3df3fbdd 100644 --- a/src/libraries/System.Threading/src/System.Threading.csproj +++ b/src/libraries/System.Threading/src/System.Threading.csproj @@ -14,9 +14,8 @@ - - Common\System\HResults.cs - + diff --git a/src/libraries/System.Threading/tests/System.Threading.Tests.csproj b/src/libraries/System.Threading/tests/System.Threading.Tests.csproj index 4e27b5fc95d26..5b1b5b087b2a2 100644 --- a/src/libraries/System.Threading/tests/System.Threading.Tests.csproj +++ b/src/libraries/System.Threading/tests/System.Threading.Tests.csproj @@ -32,11 +32,9 @@ - - CommonTest\System\Diagnostics\Tracing\TestEventListener.cs - - - CommonTest\System\Threading\ThreadTestHelpers.cs - + + \ No newline at end of file diff --git a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj index dd5adc8a69195..0cca329fd19e2 100644 --- a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj +++ b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj @@ -14,35 +14,26 @@ - - System\Index.cs - - - System\Numerics\BitOperations.cs - - - System\Numerics\Hashing\HashHelpers.cs - - - System\Range.cs - - - System\Text\Rune.cs - - - System\Text\Unicode\Utf8.cs - + + + + + + - - System\Numerics\BitOperations.cs - - - System\Text\Rune.cs - - - System\Text\Unicode\Utf8.cs - + + + @@ -50,99 +41,68 @@ - - Common\System\Marvin.cs - - - Common\System\NotImplemented.cs - - - System\Char8.cs - - - System\Text\TrimType.cs - - - System\Text\UnicodeDebug.cs - - - System\Text\UnicodeUtility.cs - - - System\Text\Unicode\Utf16Utility.cs - - - System\Text\Unicode\Utf16Utility.Validation.cs - - - System\Text\Utf8StringComparer.cs - - - System\Text\ASCIIUtility.cs - - - System\Text\ASCIIUtility.Helpers.cs - - - System\Text\Unicode\Utf8Utility.cs - - - System\Text\Unicode\Utf8Utility.Helpers.cs - - - System\Text\Unicode\Utf8Utility.Validation.cs - - - System\Text\Unicode\Utf8Utility.Transcoding.cs - - - System\Text\Unicode\Utf8Utility.WhiteSpace.NonCoreLib.cs - - - System\Utf8StringSplitOptions.cs - - - System\Utf8Extensions.cs - - - System\Utf8String.cs - - - System\Utf8String.Comparison.cs - - - System\Utf8String.Construction.cs - - - System\Utf8String.Conversion.cs - - - System\Utf8String.Enumeration.cs - - - System\Utf8String.Manipulation.cs - - - System\Utf8String.Searching.cs - - - System\Text\Utf8Span.cs - - - System\Text\Utf8Span.Comparison.cs - - - System\Text\Utf8Span.Conversion.cs - - - System\Text\Utf8Span.Enumeration.cs - - - System\Text\Utf8Span.Manipulation.cs - - - System\Text\Utf8Span.Searching.cs - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -174,4 +134,4 @@ - \ No newline at end of file + diff --git a/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj b/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj index 8779e2c76d94b..2b5750a370783 100644 --- a/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj +++ b/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj @@ -10,9 +10,8 @@ - - Common\System\HexConverter.cs - + diff --git a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj index 5608db2ffe150..57b50723275cc 100644 --- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj @@ -6,60 +6,42 @@ true - - Common\Interop\Windows\Crypt32\Interop.CertAddCertificateLinkToStore.cs - - - Common\Interop\Windows\Crypt32\Interop.CertCloseStore.cs - - - Common\Interop\Windows\Crypt32\Interop.CertDuplicateCertificateContext.cs - - - Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore_IntPtr.cs - - - Common\Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs - - - Common\Interop\Windows\Crypt32\Interop.CertOpenStore.cs - - - Common\Interop\Windows\Crypt32\Interop.CryptUIDlgCertificate.cs - - - Common\Interop\Windows\User32\Interop.MessageBeep.cs - - - Common\Interop\Windows\WinMm\Interop.MMCKINFO.cs - - - Common\Interop\Windows\WinMm\Interop.mmioAscend.cs - - - Common\Interop\Windows\WinMm\Interop.mmioClose.cs - - - Common\Interop\Windows\WinMm\Interop.mmioDescend.cs - - - Common\Interop\Windows\WinMm\Interop.mmioRead.cs - - - Common\Interop\Windows\WinMm\Interop.mmioOpen.cs - - - Common\Interop\Windows\WinMm\Interop.PlaySound.cs - - - Common\Interop\Windows\Interop.Libraries.cs - - - Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs - - - Common\System\Text\ValueStringBuilder.cs - + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj index ebd9e736f130a..7396a53455fe9 100644 --- a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj +++ b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj @@ -8,9 +8,8 @@ - - Common\System\Drawing\Helpers.cs - + @@ -27,4 +26,4 @@ - \ No newline at end of file +