Просмотр исходного кода

Rename Microsoft.Aspnetcore.Testing to Microsoft.AspNetCore.InternalTesting (#51713)

* Rename Microsoft.Aspnetcore.Testing to Microsoft.AspNetCore.TestUtils

* Pack Microsoft.Aspnetcore.Testutils

* Rename Microsoft.AspNetCore.Testing.props to Microsoft.AspNetCore.TestUtils.props

* TestUtils -> InternalTesting

* Renames

* Update WebApplicationFunctionalTests.cs

* Update HubConnectionTests.cs
William Godbe 2 лет назад
Родитель
Сommit
fc8decab6a
100 измененных файлов с 140 добавлено и 123 удалено
  1. 38 21
      AspNetCore.sln
  2. 1 1
      docs/EventSourceAndCounters.md
  3. 1 1
      eng/ProjectReferences.props
  4. 2 2
      eng/targets/CSharp.Common.props
  5. 1 1
      src/Antiforgery/test/DefaultAntiforgeryTokenGeneratorTest.cs
  6. 1 1
      src/Caching/SqlServer/test/SqlServerCacheWithDatabaseTest.cs
  7. 1 1
      src/Caching/StackExchangeRedis/test/TimeExpirationTests.cs
  8. 1 1
      src/Components/Authorization/test/AuthorizeViewTest.cs
  9. 1 1
      src/Components/Components.slnf
  10. 1 1
      src/Components/Components/test/EventCallbackFactoryBinderExtensionsTest.cs
  11. 1 1
      src/Components/Components/test/ParameterViewTest.Assignment.cs
  12. 1 1
      src/Components/Components/test/RendererTest.cs
  13. 1 1
      src/Components/Endpoints/test/EndpointHtmlRendererTest.cs
  14. 1 1
      src/Components/Server/test/Circuits/CircuitRegistryTest.cs
  15. 1 1
      src/Components/Server/test/Circuits/RemoteJSDataStreamTest.cs
  16. 1 1
      src/Components/Server/test/Circuits/RevalidatingServerAuthenticationStateProviderTest.cs
  17. 1 1
      src/Components/WebAssembly/WebAssembly/test/Hosting/RootComponentMappingTest.cs
  18. 1 1
      src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyCultureProviderTest.cs
  19. 1 1
      src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyHostTest.cs
  20. 1 1
      src/Components/WebAssembly/WebAssembly/test/PullFromJSDataStreamTest.cs
  21. 1 1
      src/Components/WebView/test/E2ETest/WebViewManagerE2ETests.cs
  22. 1 1
      src/Components/test/E2ETest/AssemblyInfo.cs
  23. 1 1
      src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
  24. 1 1
      src/Components/test/E2ETest/ServerRenderingTests/InteractivityTest.cs
  25. 1 1
      src/Components/test/E2ETest/ServerRenderingTests/RenderingTest.cs
  26. 1 1
      src/Components/test/E2ETest/Tests/AuthTest.cs
  27. 1 1
      src/Components/test/E2ETest/Tests/BindTest.cs
  28. 1 1
      src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
  29. 1 1
      src/Components/test/E2ETest/Tests/CircuitTests.cs
  30. 1 1
      src/Components/test/E2ETest/Tests/ComponentRenderingTestBase.cs
  31. 1 1
      src/Components/test/E2ETest/Tests/DynamicComponentRenderingTest.cs
  32. 1 1
      src/Components/test/E2ETest/Tests/ErrorNotificationTest.cs
  33. 1 1
      src/Components/test/E2ETest/Tests/EventTest.cs
  34. 1 1
      src/Components/test/E2ETest/Tests/FormsInputDateTest.cs
  35. 1 1
      src/Components/test/E2ETest/Tests/GlobalizationTest.cs
  36. 1 1
      src/Components/test/E2ETest/Tests/JSRootComponentsTest.cs
  37. 1 1
      src/Components/test/E2ETest/Tests/RoutingTest.cs
  38. 1 1
      src/Components/test/E2ETest/Tests/SvgTest.cs
  39. 2 2
      src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj
  40. 1 1
      src/Components/test/testassets/Components.TestServer/Program.cs
  41. 1 1
      src/DataProtection/Abstractions/test/DataProtectionCommonExtensionsTests.cs
  42. 1 1
      src/DataProtection/Cryptography.Internal/test/Cng/BCRYPT_KEY_LENGTHS_STRUCT_Tests.cs
  43. 1 1
      src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs
  44. 1 1
      src/DataProtection/Cryptography.Internal/test/Cng/CachedAlgorithmHandlesTests.cs
  45. 1 1
      src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs
  46. 1 1
      src/DataProtection/DataProtection.slnf
  47. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactoryTest.cs
  48. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactoryTest.cs
  49. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs
  50. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializerTests.cs
  51. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializerTests.cs
  52. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs
  53. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs
  54. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/ContainerUtilsTests.cs
  55. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/DataProtectionUtilityExtensionsTests.cs
  56. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/HostingTests.cs
  57. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Internal/KeyManagementOptionsSetupTest.cs
  58. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/DeferredKeyTests.cs
  59. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingBasedDataProtectorTests.cs
  60. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingProviderTests.cs
  61. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/RegistryPolicyResolverTests.cs
  62. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/FileSystemXmlRepositoryTests.cs
  63. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/RegistryXmlRepositoryTests.cs
  64. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SP800_108/SP800_108Tests.cs
  65. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SecretTests.cs
  66. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/XmlEncryption/DpapiNGXmlEncryptionTests.cs
  67. 1 1
      src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/XmlEncryption/DpapiXmlEncryptionTests.cs
  68. 1 1
      src/DataProtection/Extensions/test/DataProtectionProviderTests.cs
  69. 1 1
      src/DataProtection/Extensions/test/X509StoreIsAvailableAttribute.cs
  70. 1 1
      src/DataProtection/StackExchangeRedis/test/DataProtectionRedisTests.cs
  71. 1 1
      src/DataProtection/StackExchangeRedis/test/TestRedisServerIsAvailableAttribute.cs
  72. 1 1
      src/DataProtection/shared/test/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs
  73. 1 1
      src/DataProtection/shared/test/ConditionalRunTestOnlyWindowsAttribute.cs
  74. 1 1
      src/DataProtection/shared/test/ExceptionAssert2.cs
  75. 1 1
      src/DefaultBuilder/DefaultBuilder.slnf
  76. 2 2
      src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebApplicationFunctionalTests.cs
  77. 1 1
      src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
  78. 1 1
      src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs
  79. 1 1
      src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebHostTests.cs
  80. 1 1
      src/FileProviders/Embedded/test/EmbeddedFileProviderTests.cs
  81. 1 1
      src/FileProviders/FileProviders.slnf
  82. 1 1
      src/Framework/AspNetCoreAnalyzers/test/Http/HeaderDictionaryAddTest.cs
  83. 1 1
      src/Framework/AspNetCoreAnalyzers/test/RouteEmbeddedLanguage/FrameworkParametersCompletionProviderTests.cs
  84. 1 1
      src/Framework/AspNetCoreAnalyzers/test/RouteEmbeddedLanguage/RoutePatternCompletionProviderTests.cs
  85. 1 1
      src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs
  86. 1 1
      src/Framework/Framework.slnf
  87. 1 1
      src/Framework/test/PackageTests.cs
  88. 1 1
      src/Framework/test/SharedFxTests.cs
  89. 1 1
      src/Framework/test/TargetingPackTests.cs
  90. 1 1
      src/Framework/test/TestData.cs
  91. 1 1
      src/Grpc/Grpc.slnf
  92. 1 1
      src/Grpc/Interop/test/InteropTests/InteropTests.cs
  93. 1 1
      src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/RouteTests.cs
  94. 1 1
      src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/ServerStreamingTests.cs
  95. 1 1
      src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/UnaryTests.cs
  96. 1 1
      src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ServerStreamingServerCallHandlerTests.cs
  97. 1 1
      src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/UnaryServerCallHandlerTests.cs
  98. 1 1
      src/HealthChecks/HealthChecks/test/DefaultHealthCheckServiceTest.cs
  99. 1 1
      src/HealthChecks/HealthChecks/test/HealthCheckPublisherHostedServiceTest.cs
  100. 1 1
      src/Hosting/Hosting.slnf

+ 38 - 21
AspNetCore.sln

@@ -545,8 +545,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteropTests", "src\Grpc\In
 EndProject
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{05A169C7-4F20-4516-B10A-B13C5649D346}"
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{05A169C7-4F20-4516-B10A-B13C5649D346}"
 EndProject
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Testing", "src\Testing\src\Microsoft.AspNetCore.Testing.csproj", "{3D06E2C9-44F7-408D-802C-42D7E55F08E7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Tests", "src\Hosting\Hosting\test\Microsoft.AspNetCore.Hosting.Tests.csproj", "{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}"
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Tests", "src\Hosting\Hosting\test\Microsoft.AspNetCore.Hosting.Tests.csproj", "{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}"
 EndProject
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C8415333-2A64-4FF0-8FC9-652694A11A77}"
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C8415333-2A64-4FF0-8FC9-652694A11A77}"
@@ -1266,8 +1264,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3CBC4802-E
 EndProject
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.FunctionalTests", "src\Servers\test\FunctionalTests\ServerComparison.FunctionalTests.csproj", "{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}"
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.FunctionalTests", "src\Servers\test\FunctionalTests\ServerComparison.FunctionalTests.csproj", "{48E64014-B249-4644-8AEB-CDEE8ABA0DC2}"
 EndProject
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Testing.Tests", "src\Testing\test\Microsoft.AspNetCore.Testing.Tests.csproj", "{1542DC58-1836-4191-A9C5-51D1716D2543}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{6126DCE4-9692-4EE2-B240-C65743572995}"
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{6126DCE4-9692-4EE2-B240-C65743572995}"
 EndProject
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestApp", "src\Components\test\testassets\BasicTestApp\BasicTestApp.csproj", "{46FB7E93-1294-4068-B80A-D4864F78277A}"
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestApp", "src\Components\test\testassets\BasicTestApp\BasicTestApp.csproj", "{46FB7E93-1294-4068-B80A-D4864F78277A}"
@@ -1780,6 +1776,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Output
 EndProject
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OutputCaching.StackExchangeRedis", "src\Middleware\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis\src\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis.csproj", "{F232B503-D412-45EE-8B31-EFD46B9FA302}"
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OutputCaching.StackExchangeRedis", "src\Middleware\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis\src\Microsoft.AspNetCore.OutputCaching.StackExchangeRedis.csproj", "{F232B503-D412-45EE-8B31-EFD46B9FA302}"
 EndProject
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.InternalTesting", "src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj", "{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.InternalTesting.Tests", "src\Testing\test\Microsoft.AspNetCore.InternalTesting.Tests.csproj", "{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}"
+EndProject
 Global
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Any CPU = Debug|Any CPU
@@ -3888,22 +3888,6 @@ Global
 		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x64.Build.0 = Release|Any CPU
 		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x64.Build.0 = Release|Any CPU
 		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x86.ActiveCfg = Release|Any CPU
 		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x86.ActiveCfg = Release|Any CPU
 		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x86.Build.0 = Release|Any CPU
 		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1}.Release|x86.Build.0 = Release|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|arm64.Build.0 = Debug|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|x64.Build.0 = Debug|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Debug|x86.Build.0 = Debug|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|arm64.ActiveCfg = Release|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|arm64.Build.0 = Release|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|x64.ActiveCfg = Release|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|x64.Build.0 = Release|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|x86.ActiveCfg = Release|Any CPU
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7}.Release|x86.Build.0 = Release|Any CPU
 		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|arm64.ActiveCfg = Debug|Any CPU
 		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -10717,6 +10701,38 @@ Global
 		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x64.Build.0 = Release|Any CPU
 		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x64.Build.0 = Release|Any CPU
 		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x86.ActiveCfg = Release|Any CPU
 		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x86.ActiveCfg = Release|Any CPU
 		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x86.Build.0 = Release|Any CPU
 		{F232B503-D412-45EE-8B31-EFD46B9FA302}.Release|x86.Build.0 = Release|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|arm64.Build.0 = Debug|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x64.Build.0 = Debug|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Debug|x86.Build.0 = Debug|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|arm64.Build.0 = Release|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x64.ActiveCfg = Release|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x64.Build.0 = Release|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x86.ActiveCfg = Release|Any CPU
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E}.Release|x86.Build.0 = Release|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|arm64.Build.0 = Debug|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x64.Build.0 = Debug|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Debug|x86.Build.0 = Debug|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|arm64.ActiveCfg = Release|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|arm64.Build.0 = Release|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x64.ActiveCfg = Release|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x64.Build.0 = Release|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x86.ActiveCfg = Release|Any CPU
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 		HideSolutionNode = FALSE
@@ -10983,7 +10999,6 @@ Global
 		{E763DA15-8F4E-446C-99B8-309053C75598} = {7A331A1C-E2C4-4E37-B0A0-B5AA10661229}
 		{E763DA15-8F4E-446C-99B8-309053C75598} = {7A331A1C-E2C4-4E37-B0A0-B5AA10661229}
 		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1} = {E763DA15-8F4E-446C-99B8-309053C75598}
 		{3ADC50B9-2EBB-422A-8424-F9FC67841CA1} = {E763DA15-8F4E-446C-99B8-309053C75598}
 		{05A169C7-4F20-4516-B10A-B13C5649D346} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
 		{05A169C7-4F20-4516-B10A-B13C5649D346} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
-		{3D06E2C9-44F7-408D-802C-42D7E55F08E7} = {05A169C7-4F20-4516-B10A-B13C5649D346}
 		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987} = {68C2D913-06D4-4EAC-9283-78465BF214E1}
 		{ECAA6AB0-CFF3-4D1B-AA25-2A0F72730987} = {68C2D913-06D4-4EAC-9283-78465BF214E1}
 		{C8415333-2A64-4FF0-8FC9-652694A11A77} = {2DB7E3C7-D213-4609-95DD-72561F23AB58}
 		{C8415333-2A64-4FF0-8FC9-652694A11A77} = {2DB7E3C7-D213-4609-95DD-72561F23AB58}
 		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA} = {C8415333-2A64-4FF0-8FC9-652694A11A77}
 		{9EF96554-7BDB-4679-B08E-7D98FAE6A2AA} = {C8415333-2A64-4FF0-8FC9-652694A11A77}
@@ -11596,6 +11611,8 @@ Global
 		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C} = {C445B129-0A4D-41F5-8347-6534B6B12303}
 		{CAEB7F57-28A8-451C-95D0-45FCAA3C726C} = {C445B129-0A4D-41F5-8347-6534B6B12303}
 		{A939893A-B3CD-48F6-80D3-340C8A6E275B} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
 		{A939893A-B3CD-48F6-80D3-340C8A6E275B} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
 		{F232B503-D412-45EE-8B31-EFD46B9FA302} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
 		{F232B503-D412-45EE-8B31-EFD46B9FA302} = {AA5ABFBC-177C-421E-B743-005E0FD1248B}
+		{B0A8E5D4-BC5A-448E-B222-431B6B2EB58E} = {05A169C7-4F20-4516-B10A-B13C5649D346}
+		{15D08EA7-8C63-45FB-8B4D-C5F8E43B433E} = {05A169C7-4F20-4516-B10A-B13C5649D346}
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}
 		SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

+ 1 - 1
docs/EventSourceAndCounters.md

@@ -169,7 +169,7 @@ namespace Microsoft.AspNetCore.Authentication.Internal
 
 
 ## Automated Testing of EventSources
 ## Automated Testing of EventSources
 
 
-EventSources can be tested using the `EventSourceTestBase` base class in `Microsoft.AspNetCore.Testing`. An example test is below:
+EventSources can be tested using the `EventSourceTestBase` base class in `Microsoft.AspNetCore.InternalTesting`. An example test is below:
 
 
 ```csharp
 ```csharp
 // The base class MUST be used for EventSource testing because EventSources are global and parallel tests can cause issues.
 // The base class MUST be used for EventSource testing because EventSources are global and parallel tests can cause issues.

+ 1 - 1
eng/ProjectReferences.props

@@ -162,7 +162,7 @@
     <ProjectReferenceProvider Include="Microsoft.Extensions.WebEncoders" ProjectPath="$(RepoRoot)src\WebEncoders\src\Microsoft.Extensions.WebEncoders.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.WebEncoders" ProjectPath="$(RepoRoot)src\WebEncoders\src\Microsoft.Extensions.WebEncoders.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" ProjectPath="$(RepoRoot)src\HealthChecks\Abstractions\src\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" ProjectPath="$(RepoRoot)src\HealthChecks\Abstractions\src\Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks" ProjectPath="$(RepoRoot)src\HealthChecks\HealthChecks\src\Microsoft.Extensions.Diagnostics.HealthChecks.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Diagnostics.HealthChecks" ProjectPath="$(RepoRoot)src\HealthChecks\HealthChecks\src\Microsoft.Extensions.Diagnostics.HealthChecks.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.Testing.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.InternalTesting" ProjectPath="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.InternalTesting.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Features" ProjectPath="$(RepoRoot)src\Extensions\Features\src\Microsoft.Extensions.Features.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Features" ProjectPath="$(RepoRoot)src\Extensions\Features\src\Microsoft.Extensions.Features.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" ProjectPath="$(RepoRoot)src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.JsonTranscoding\Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" ProjectPath="$(RepoRoot)src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.JsonTranscoding\Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Grpc.Swagger" ProjectPath="$(RepoRoot)src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.Swagger\Microsoft.AspNetCore.Grpc.Swagger.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Grpc.Swagger" ProjectPath="$(RepoRoot)src\Grpc\JsonTranscoding\src\Microsoft.AspNetCore.Grpc.Swagger\Microsoft.AspNetCore.Grpc.Swagger.csproj" />

+ 2 - 2
eng/targets/CSharp.Common.props

@@ -7,13 +7,13 @@
   </PropertyGroup>
   </PropertyGroup>
 
 
   <ItemGroup Condition=" $(IsTestProject) ">
   <ItemGroup Condition=" $(IsTestProject) ">
-    <Reference Include="Microsoft.AspNetCore.Testing" />
+    <Reference Include="Microsoft.AspNetCore.InternalTesting" />
     <Reference Include="Moq" />
     <Reference Include="Moq" />
     <Reference Include="NETStandard.Library" />
     <Reference Include="NETStandard.Library" />
     <Compile Include="$(SharedSourceRoot)test\SuccessfulTests.cs" LinkBase="SharedTests" Visible="false" />
     <Compile Include="$(SharedSourceRoot)test\SuccessfulTests.cs" LinkBase="SharedTests" Visible="false" />
   </ItemGroup>
   </ItemGroup>
 
 
-  <Import Project="$(RepoRoot)src\Testing\src\build\Microsoft.AspNetCore.Testing.props" Condition=" $(IsTestProject) " />
+  <Import Project="$(RepoRoot)src\Testing\src\build\Microsoft.AspNetCore.InternalTesting.props" Condition=" $(IsTestProject) " />
 
 
   <ItemDefinitionGroup Condition=" $(IsTestProject) ">
   <ItemDefinitionGroup Condition=" $(IsTestProject) ">
     <Content>
     <Content>

+ 1 - 1
src/Antiforgery/test/DefaultAntiforgeryTokenGeneratorTest.cs

@@ -5,7 +5,7 @@
 using System.Security.Claims;
 using System.Security.Claims;
 using System.Security.Cryptography;
 using System.Security.Cryptography;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Moq;
 using Moq;
 
 
 namespace Microsoft.AspNetCore.Antiforgery.Internal;
 namespace Microsoft.AspNetCore.Antiforgery.Internal;

+ 1 - 1
src/Caching/SqlServer/test/SqlServerCacheWithDatabaseTest.cs

@@ -7,7 +7,7 @@ using System.Data;
 using System.Globalization;
 using System.Globalization;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Data.SqlClient;
 using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration;

+ 1 - 1
src/Caching/StackExchangeRedis/test/TimeExpirationTests.cs

@@ -3,7 +3,7 @@
 
 
 using System;
 using System;
 using System.Threading;
 using System.Threading;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Caching.Memory;
 using Xunit;
 using Xunit;

+ 1 - 1
src/Components/Authorization/test/AuthorizeViewTest.cs

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Authorization.Infrastructure;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Test.Helpers;
 using Microsoft.AspNetCore.Components.Test.Helpers;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 
 
 namespace Microsoft.AspNetCore.Components.Authorization;
 namespace Microsoft.AspNetCore.Components.Authorization;

+ 1 - 1
src/Components/Components.slnf

@@ -142,7 +142,7 @@
       "src\\SignalR\\common\\SignalR.Common\\src\\Microsoft.AspNetCore.SignalR.Common.csproj",
       "src\\SignalR\\common\\SignalR.Common\\src\\Microsoft.AspNetCore.SignalR.Common.csproj",
       "src\\SignalR\\server\\Core\\src\\Microsoft.AspNetCore.SignalR.Core.csproj",
       "src\\SignalR\\server\\Core\\src\\Microsoft.AspNetCore.SignalR.Core.csproj",
       "src\\SignalR\\server\\SignalR\\src\\Microsoft.AspNetCore.SignalR.csproj",
       "src\\SignalR\\server\\SignalR\\src\\Microsoft.AspNetCore.SignalR.csproj",
-      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj",
+      "src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj",
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
     ]
     ]
   }
   }

+ 1 - 1
src/Components/Components/test/EventCallbackFactoryBinderExtensionsTest.cs

@@ -3,7 +3,7 @@
 
 
 using System.ComponentModel;
 using System.ComponentModel;
 using System.Globalization;
 using System.Globalization;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.Components;
 namespace Microsoft.AspNetCore.Components;
 
 

+ 1 - 1
src/Components/Components/test/ParameterViewTest.Assignment.cs

@@ -3,7 +3,7 @@
 
 
 using System.Collections;
 using System.Collections;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.Rendering;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.DotNet.RemoteExecutor;
 using Microsoft.DotNet.RemoteExecutor;
 
 
 namespace Microsoft.AspNetCore.Components;
 namespace Microsoft.AspNetCore.Components;

+ 1 - 1
src/Components/Components/test/RendererTest.cs

@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Components.HotReload;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Test.Helpers;
 using Microsoft.AspNetCore.Components.Test.Helpers;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 
 
 namespace Microsoft.AspNetCore.Components.Test;
 namespace Microsoft.AspNetCore.Components.Test;

+ 1 - 1
src/Components/Endpoints/test/EndpointHtmlRendererTest.cs

@@ -18,7 +18,7 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.FileProviders;

+ 1 - 1
src/Components/Server/test/Circuits/CircuitRegistryTest.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Options;

+ 1 - 1
src/Components/Server/test/Circuits/RemoteJSDataStreamTest.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Options;
 using Microsoft.JSInterop;
 using Microsoft.JSInterop;

+ 1 - 1
src/Components/Server/test/Circuits/RevalidatingServerAuthenticationStateProviderTest.cs

@@ -4,7 +4,7 @@
 using System.Security.Claims;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Server;
 using Microsoft.AspNetCore.Components.Server;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 
 
 namespace Microsoft.AspNetCore.Components;
 namespace Microsoft.AspNetCore.Components;

+ 1 - 1
src/Components/WebAssembly/WebAssembly/test/Hosting/RootComponentMappingTest.cs

@@ -3,7 +3,7 @@
 
 
 using System.Text;
 using System.Text;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
 

+ 1 - 1
src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyCultureProviderTest.cs

@@ -3,7 +3,7 @@
 
 
 using System.Globalization;
 using System.Globalization;
 using Microsoft.AspNetCore.Components.WebAssembly.Services;
 using Microsoft.AspNetCore.Components.WebAssembly.Services;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
 

+ 1 - 1
src/Components/WebAssembly/WebAssembly/test/Hosting/WebAssemblyHostTest.cs

@@ -3,7 +3,7 @@
 
 
 using System.Globalization;
 using System.Globalization;
 using System.Text.Json;
 using System.Text.Json;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.JSInterop;
 using Microsoft.JSInterop;
 using Moq;
 using Moq;

+ 1 - 1
src/Components/WebAssembly/WebAssembly/test/PullFromJSDataStreamTest.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.JSInterop;
 using Microsoft.JSInterop;
 using Moq;
 using Moq;
 
 

+ 1 - 1
src/Components/WebView/test/E2ETest/WebViewManagerE2ETests.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
 using System.Diagnostics;
 using System.Diagnostics;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.Components.WebViewE2E.Test;
 namespace Microsoft.AspNetCore.Components.WebViewE2E.Test;
 
 

+ 1 - 1
src/Components/test/E2ETest/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 [assembly: Retry]
 [assembly: Retry]

+ 1 - 1
src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs

@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.Logging.Testing;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using TestServer;
 using TestServer;
 using Xunit.Abstractions;
 using Xunit.Abstractions;

+ 1 - 1
src/Components/test/E2ETest/ServerRenderingTests/InteractivityTest.cs

@@ -5,7 +5,7 @@ using Components.TestServer.RazorComponents;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using TestServer;
 using TestServer;
 using Xunit.Abstractions;
 using Xunit.Abstractions;

+ 1 - 1
src/Components/test/E2ETest/ServerRenderingTests/RenderingTest.cs

@@ -7,7 +7,7 @@ using Components.TestServer.RazorComponents;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using TestServer;
 using TestServer;
 using Xunit.Abstractions;
 using Xunit.Abstractions;

+ 1 - 1
src/Components/test/E2ETest/Tests/AuthTest.cs

@@ -5,7 +5,7 @@ using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 

+ 1 - 1
src/Components/test/E2ETest/Tests/BindTest.cs

@@ -6,7 +6,7 @@ using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using OpenQA.Selenium.Support.UI;
 using Xunit.Abstractions;
 using Xunit.Abstractions;

+ 1 - 1
src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs

@@ -5,7 +5,7 @@ using HostedInAspNet.Server;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using Xunit.Abstractions;
 using Xunit.Abstractions;

+ 1 - 1
src/Components/test/E2ETest/Tests/CircuitTests.cs

@@ -5,7 +5,7 @@ using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using TestServer;
 using TestServer;
 using Xunit.Abstractions;
 using Xunit.Abstractions;

+ 1 - 1
src/Components/test/E2ETest/Tests/ComponentRenderingTestBase.cs

@@ -9,7 +9,7 @@ using BasicTestApp.HierarchicalImportsTest.Subdir;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 

+ 1 - 1
src/Components/test/E2ETest/Tests/DynamicComponentRenderingTest.cs

@@ -5,7 +5,7 @@ using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using OpenQA.Selenium.Support.UI;
 using Xunit.Abstractions;
 using Xunit.Abstractions;

+ 1 - 1
src/Components/test/E2ETest/Tests/ErrorNotificationTest.cs

@@ -5,7 +5,7 @@ using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 

+ 1 - 1
src/Components/test/E2ETest/Tests/EventTest.cs

@@ -5,7 +5,7 @@ using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Interactions;
 using OpenQA.Selenium.Interactions;
 using OpenQA.Selenium.Support.Extensions;
 using OpenQA.Selenium.Support.Extensions;

+ 1 - 1
src/Components/test/E2ETest/Tests/FormsInputDateTest.cs

@@ -6,7 +6,7 @@ using BasicTestApp.FormsTest;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 

+ 1 - 1
src/Components/test/E2ETest/Tests/GlobalizationTest.cs

@@ -6,7 +6,7 @@ using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 

+ 1 - 1
src/Components/test/E2ETest/Tests/JSRootComponentsTest.cs

@@ -5,7 +5,7 @@ using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 

+ 1 - 1
src/Components/test/E2ETest/Tests/RoutingTest.cs

@@ -9,7 +9,7 @@ using BasicTestApp.RouterTest;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Interactions;
 using OpenQA.Selenium.Interactions;
 using Xunit.Abstractions;
 using Xunit.Abstractions;

+ 1 - 1
src/Components/test/E2ETest/Tests/SvgTest.cs

@@ -5,7 +5,7 @@ using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.E2ETesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 

+ 2 - 2
src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj

@@ -23,7 +23,7 @@
     <Reference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
     <Reference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
     <Reference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" />
     <Reference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" />
     <Reference Include="Microsoft.AspNetCore.SignalR" />
     <Reference Include="Microsoft.AspNetCore.SignalR" />
-    <Reference Include="Microsoft.AspNetCore.Testing" />
+    <Reference Include="Microsoft.AspNetCore.InternalTesting" />
     <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="Microsoft.Extensions.Hosting" />
   </ItemGroup>
   </ItemGroup>
 
 
@@ -38,7 +38,7 @@
 
 
   <ItemGroup>
   <ItemGroup>
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>Microsoft.AspNetCore.Testing.BasicTestApp.ContentRoot</_Parameter1>
+      <_Parameter1>Microsoft.AspNetCore.InternalTesting.BasicTestApp.ContentRoot</_Parameter1>
       <_Parameter2 Condition="'$(IsHelixJob)' != 'true'">$([MSBuild]::NormalizeDirectory('$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\BasicTestApp'))'))</_Parameter2>
       <_Parameter2 Condition="'$(IsHelixJob)' != 'true'">$([MSBuild]::NormalizeDirectory('$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\BasicTestApp'))'))</_Parameter2>
       <_Parameter2 Condition="'$(IsHelixJob)' == 'true'">..\BasicTestApp</_Parameter2>
       <_Parameter2 Condition="'$(IsHelixJob)' == 'true'">..\BasicTestApp</_Parameter2>
     </AssemblyAttribute>
     </AssemblyAttribute>

+ 1 - 1
src/Components/test/testassets/Components.TestServer/Program.cs

@@ -52,7 +52,7 @@ public class Program
     private static (IHost host, string basePath) CreateDevServerHost(string[] args)
     private static (IHost host, string basePath) CreateDevServerHost(string[] args)
     {
     {
         var contentRoot = typeof(Program).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
         var contentRoot = typeof(Program).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
-            .Single(a => a.Key == "Microsoft.AspNetCore.Testing.BasicTestApp.ContentRoot")
+            .Single(a => a.Key == "Microsoft.AspNetCore.InternalTesting.BasicTestApp.ContentRoot")
             .Value;
             .Value;
 
 
         var finalArgs = args.Concat(new[]
         var finalArgs = args.Concat(new[]

+ 1 - 1
src/DataProtection/Abstractions/test/DataProtectionCommonExtensionsTests.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Security.Cryptography;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text;
 using Microsoft.AspNetCore.DataProtection.Abstractions;
 using Microsoft.AspNetCore.DataProtection.Abstractions;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Moq;
 using Moq;
 using Xunit;
 using Xunit;
 
 

+ 1 - 1
src/DataProtection/Cryptography.Internal/test/Cng/BCRYPT_KEY_LENGTHS_STRUCT_Tests.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
 using Microsoft.AspNetCore.Cryptography.Internal;
 using Microsoft.AspNetCore.Cryptography.Internal;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Xunit;
 using Xunit;
 
 
 namespace Microsoft.AspNetCore.Cryptography.Cng;
 namespace Microsoft.AspNetCore.Cryptography.Cng;

+ 1 - 1
src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs

@@ -4,7 +4,7 @@
 using System;
 using System;
 using System.Linq;
 using System.Linq;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Xunit;
 using Xunit;
 
 
 namespace Microsoft.AspNetCore.Cryptography.Cng;
 namespace Microsoft.AspNetCore.Cryptography.Cng;

+ 1 - 1
src/DataProtection/Cryptography.Internal/test/Cng/CachedAlgorithmHandlesTests.cs

@@ -5,7 +5,7 @@ using System;
 using System.Text;
 using System.Text;
 using Microsoft.AspNetCore.Cryptography.SafeHandles;
 using Microsoft.AspNetCore.Cryptography.SafeHandles;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Xunit;
 using Xunit;
 
 
 namespace Microsoft.AspNetCore.Cryptography.Cng;
 namespace Microsoft.AspNetCore.Cryptography.Cng;

+ 1 - 1
src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs

@@ -5,7 +5,7 @@ using System;
 using System.Text;
 using System.Text;
 using Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2;
 using Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Xunit;
 using Xunit;
 
 
 namespace Microsoft.AspNetCore.Cryptography.KeyDerivation;
 namespace Microsoft.AspNetCore.Cryptography.KeyDerivation;

+ 1 - 1
src/DataProtection/DataProtection.slnf

@@ -33,7 +33,7 @@
       "src\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj",
       "src\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj",
       "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
       "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
       "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
       "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
-      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
+      "src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj"
     ]
     ]
   }
   }
 }
 }

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactoryTest.cs

@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationM
 using Microsoft.AspNetCore.DataProtection.Cng;
 using Microsoft.AspNetCore.DataProtection.Cng;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using Moq;
 
 

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactoryTest.cs

@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationM
 using Microsoft.AspNetCore.DataProtection.Cng;
 using Microsoft.AspNetCore.DataProtection.Cng;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using Moq;
 
 

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs

@@ -11,7 +11,7 @@ using Microsoft.AspNetCore.DataProtection.Cng;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Managed;
 using Microsoft.AspNetCore.DataProtection.Managed;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 
 
 namespace Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 namespace Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializerTests.cs

@@ -6,7 +6,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.Cryptography;
 using Microsoft.AspNetCore.Cryptography;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 
 
 namespace Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 namespace Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializerTests.cs

@@ -6,7 +6,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.Cryptography;
 using Microsoft.AspNetCore.Cryptography;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 
 
 namespace Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 namespace Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs

@@ -5,7 +5,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Text;
 using Microsoft.AspNetCore.Cryptography.Cng;
 using Microsoft.AspNetCore.Cryptography.Cng;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.DataProtection.Cng;
 namespace Microsoft.AspNetCore.DataProtection.Cng;
 
 

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs

@@ -5,7 +5,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Text;
 using Microsoft.AspNetCore.Cryptography.Cng;
 using Microsoft.AspNetCore.Cryptography.Cng;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.DataProtection.Cng;
 namespace Microsoft.AspNetCore.DataProtection.Cng;
 
 

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/ContainerUtilsTests.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
 using Microsoft.AspNetCore.DataProtection.Internal;
 using Microsoft.AspNetCore.DataProtection.Internal;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.DataProtection.Test;
 namespace Microsoft.AspNetCore.DataProtection.Test;
 
 

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/DataProtectionUtilityExtensionsTests.cs

@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.DataProtection.Infrastructure;
 using Microsoft.AspNetCore.DataProtection.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Hosting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Moq;
 using Moq;
 
 
 namespace Microsoft.AspNetCore.DataProtection;
 namespace Microsoft.AspNetCore.DataProtection;

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/HostingTests.cs

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.DataProtection.KeyManagement.Internal;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Hosting;

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Internal/KeyManagementOptionsSetupTest.cs

@@ -6,7 +6,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Win32;
 using Microsoft.Win32;
 
 

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/DeferredKeyTests.cs

@@ -5,7 +5,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.KeyManagement.Internal;
 using Microsoft.AspNetCore.DataProtection.KeyManagement.Internal;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Moq;
 using Moq;
 
 
 namespace Microsoft.AspNetCore.DataProtection.KeyManagement;
 namespace Microsoft.AspNetCore.DataProtection.KeyManagement;

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingBasedDataProtectorTests.cs

@@ -7,7 +7,7 @@ using System.Text;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.KeyManagement.Internal;
 using Microsoft.AspNetCore.DataProtection.KeyManagement.Internal;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Options;

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingProviderTests.cs

@@ -5,7 +5,7 @@ using System.Globalization;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.KeyManagement.Internal;
 using Microsoft.AspNetCore.DataProtection.KeyManagement.Internal;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Options;
 using Moq;
 using Moq;

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/RegistryPolicyResolverTests.cs

@@ -6,7 +6,7 @@ using System.Security.Cryptography;
 using System.Xml.Linq;
 using System.Xml.Linq;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Win32;
 using Microsoft.Win32;
 
 
 namespace Microsoft.AspNetCore.DataProtection;
 namespace Microsoft.AspNetCore.DataProtection;

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/FileSystemXmlRepositoryTests.cs

@@ -4,7 +4,7 @@
 using System.Globalization;
 using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices;
 using System.Xml.Linq;
 using System.Xml.Linq;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 
 

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Repositories/RegistryXmlRepositoryTests.cs

@@ -4,7 +4,7 @@
 using System.Globalization;
 using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices;
 using System.Xml.Linq;
 using System.Xml.Linq;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Win32;
 using Microsoft.Win32;
 
 

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SP800_108/SP800_108Tests.cs

@@ -4,7 +4,7 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.DataProtection.SP800_108;
 namespace Microsoft.AspNetCore.DataProtection.SP800_108;
 
 

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/SecretTests.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.DataProtection;
 namespace Microsoft.AspNetCore.DataProtection;
 
 

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/XmlEncryption/DpapiNGXmlEncryptionTests.cs

@@ -3,7 +3,7 @@
 
 
 using System.Xml.Linq;
 using System.Xml.Linq;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 
 
 namespace Microsoft.AspNetCore.DataProtection.XmlEncryption;
 namespace Microsoft.AspNetCore.DataProtection.XmlEncryption;

+ 1 - 1
src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/XmlEncryption/DpapiXmlEncryptionTests.cs

@@ -3,7 +3,7 @@
 
 
 using System.Xml.Linq;
 using System.Xml.Linq;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 
 
 namespace Microsoft.AspNetCore.DataProtection.XmlEncryption;
 namespace Microsoft.AspNetCore.DataProtection.XmlEncryption;

+ 1 - 1
src/DataProtection/Extensions/test/DataProtectionProviderTests.cs

@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.DataProtection.Internal;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Repositories;
 using Microsoft.AspNetCore.DataProtection.Repositories;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Options;

+ 1 - 1
src/DataProtection/Extensions/test/X509StoreIsAvailableAttribute.cs

@@ -3,7 +3,7 @@
 
 
 using System;
 using System;
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Cryptography.X509Certificates;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.DataProtection;
 namespace Microsoft.AspNetCore.DataProtection;
 
 

+ 1 - 1
src/DataProtection/StackExchangeRedis/test/DataProtectionRedisTests.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using System.Xml;
 using System.Xml;
 using System.Xml.Linq;
 using System.Xml.Linq;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Moq;
 using Moq;
 using StackExchange.Redis;
 using StackExchange.Redis;
 using Xunit;
 using Xunit;

+ 1 - 1
src/DataProtection/StackExchangeRedis/test/TestRedisServerIsAvailableAttribute.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
 using System;
 using System;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.DataProtection;
 namespace Microsoft.AspNetCore.DataProtection;
 
 

+ 1 - 1
src/DataProtection/shared/test/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs

@@ -3,7 +3,7 @@
 
 
 using System;
 using System;
 using Microsoft.AspNetCore.Cryptography.Cng;
 using Microsoft.AspNetCore.Cryptography.Cng;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.DataProtection.Test.Shared;
 namespace Microsoft.AspNetCore.DataProtection.Test.Shared;
 
 

+ 1 - 1
src/DataProtection/shared/test/ConditionalRunTestOnlyWindowsAttribute.cs

@@ -3,7 +3,7 @@
 
 
 using System;
 using System;
 using Microsoft.AspNetCore.Cryptography.Cng;
 using Microsoft.AspNetCore.Cryptography.Cng;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore.DataProtection.Test.Shared;
 namespace Microsoft.AspNetCore.DataProtection.Test.Shared;
 
 

+ 1 - 1
src/DataProtection/shared/test/ExceptionAssert2.cs

@@ -5,7 +5,7 @@ using System;
 using System.Security.Cryptography;
 using System.Security.Cryptography;
 using Xunit;
 using Xunit;
 
 
-namespace Microsoft.AspNetCore.Testing;
+namespace Microsoft.AspNetCore.InternalTesting;
 
 
 internal static class ExceptionAssert2
 internal static class ExceptionAssert2
 {
 {

+ 1 - 1
src/DefaultBuilder/DefaultBuilder.slnf

@@ -40,7 +40,7 @@
       "src\\Servers\\Kestrel\\Transport.NamedPipes\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj",
       "src\\Servers\\Kestrel\\Transport.NamedPipes\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj",
       "src\\Servers\\Kestrel\\Transport.Quic\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj",
       "src\\Servers\\Kestrel\\Transport.Quic\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj",
       "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj",
       "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj",
-      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
+      "src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj"
     ]
     ]
   }
   }
 }
 }

+ 2 - 2
src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebApplicationFunctionalTests.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.EventLog;
 using Microsoft.Extensions.Logging.EventLog;
 
 
@@ -153,7 +153,7 @@ public class WebApplicationFunctionalTests : LoggedTest
             // so we loop until success or a timeout.
             // so we loop until success or a timeout.
             await configChangedTcs.Task.DefaultTimeout();
             await configChangedTcs.Task.DefaultTimeout();
 
 
-            var timeoutTicks = Environment.TickCount64 + Testing.TaskExtensions.DefaultTimeoutDuration;
+            var timeoutTicks = Environment.TickCount64 + InternalTesting.TaskExtensions.DefaultTimeoutDuration;
             var logWritten = false;
             var logWritten = false;
 
 
             while (!logWritten && Environment.TickCount < timeoutTicks)
             while (!logWritten && Environment.TickCount < timeoutTicks)

+ 1 - 1
src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs

@@ -4,7 +4,7 @@
 using System.Net.Http;
 using System.Net.Http;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging;
 using Xunit.Sdk;
 using Xunit.Sdk;
 
 

+ 1 - 1
src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs

@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing.Constraints;
 using Microsoft.AspNetCore.Routing.Constraints;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.AspNetCore.TestHost;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.Tests;
 using Microsoft.AspNetCore.Tests;
 using Microsoft.DotNet.RemoteExecutor;
 using Microsoft.DotNet.RemoteExecutor;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration;

+ 1 - 1
src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebHostTests.cs

@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing.Constraints;
 using Microsoft.AspNetCore.Routing.Constraints;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.AspNetCore.TestHost;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging;

+ 1 - 1
src/FileProviders/Embedded/test/EmbeddedFileProviderTests.cs

@@ -4,7 +4,7 @@
 using System;
 using System;
 using System.Linq;
 using System.Linq;
 using System.Reflection;
 using System.Reflection;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Xunit;
 using Xunit;
 
 
 namespace Microsoft.Extensions.FileProviders.Embedded.Tests;
 namespace Microsoft.Extensions.FileProviders.Embedded.Tests;

+ 1 - 1
src/FileProviders/FileProviders.slnf

@@ -6,7 +6,7 @@
       "src\\FileProviders\\Embedded\\test\\Microsoft.Extensions.FileProviders.Embedded.Tests.csproj",
       "src\\FileProviders\\Embedded\\test\\Microsoft.Extensions.FileProviders.Embedded.Tests.csproj",
       "src\\FileProviders\\Manifest.MSBuildTask\\src\\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj",
       "src\\FileProviders\\Manifest.MSBuildTask\\src\\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj",
       "src\\FileProviders\\Manifest.MSBuildTask\\test\\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Tests.csproj",
       "src\\FileProviders\\Manifest.MSBuildTask\\test\\Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Tests.csproj",
-      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
+      "src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj"
     ]
     ]
   }
   }
 }
 }

+ 1 - 1
src/Framework/AspNetCoreAnalyzers/test/Http/HeaderDictionaryAddTest.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.CodeAnalysis.Testing;
 using VerifyCS = Microsoft.AspNetCore.Analyzers.Verifiers.CSharpCodeFixVerifier<
 using VerifyCS = Microsoft.AspNetCore.Analyzers.Verifiers.CSharpCodeFixVerifier<
     Microsoft.AspNetCore.Analyzers.Http.HeaderDictionaryAddAnalyzer,
     Microsoft.AspNetCore.Analyzers.Http.HeaderDictionaryAddAnalyzer,

+ 1 - 1
src/Framework/AspNetCoreAnalyzers/test/RouteEmbeddedLanguage/FrameworkParametersCompletionProviderTests.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
 using Microsoft.AspNetCore.Analyzers.RouteEmbeddedLanguage.Infrastructure;
 using Microsoft.AspNetCore.Analyzers.RouteEmbeddedLanguage.Infrastructure;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.Completion;
 
 
 namespace Microsoft.AspNetCore.Analyzers.RouteEmbeddedLanguage;
 namespace Microsoft.AspNetCore.Analyzers.RouteEmbeddedLanguage;

+ 1 - 1
src/Framework/AspNetCoreAnalyzers/test/RouteEmbeddedLanguage/RoutePatternCompletionProviderTests.cs

@@ -3,7 +3,7 @@
 
 
 using System.Text;
 using System.Text;
 using Microsoft.AspNetCore.Analyzers.RouteEmbeddedLanguage.Infrastructure;
 using Microsoft.AspNetCore.Analyzers.RouteEmbeddedLanguage.Infrastructure;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.Text;
 
 

+ 1 - 1
src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs

@@ -4,7 +4,7 @@
 using System.Collections.Immutable;
 using System.Collections.Immutable;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Diagnostics;

+ 1 - 1
src/Framework/Framework.slnf

@@ -107,7 +107,7 @@
       "src\\SignalR\\common\\SignalR.Common\\src\\Microsoft.AspNetCore.SignalR.Common.csproj",
       "src\\SignalR\\common\\SignalR.Common\\src\\Microsoft.AspNetCore.SignalR.Common.csproj",
       "src\\SignalR\\server\\Core\\src\\Microsoft.AspNetCore.SignalR.Core.csproj",
       "src\\SignalR\\server\\Core\\src\\Microsoft.AspNetCore.SignalR.Core.csproj",
       "src\\SignalR\\server\\SignalR\\src\\Microsoft.AspNetCore.SignalR.csproj",
       "src\\SignalR\\server\\SignalR\\src\\Microsoft.AspNetCore.SignalR.csproj",
-      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj",
+      "src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj",
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
       "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
     ]
     ]
   }
   }

+ 1 - 1
src/Framework/test/PackageTests.cs

@@ -10,7 +10,7 @@ using System.Reflection.Metadata;
 using System.Reflection.PortableExecutable;
 using System.Reflection.PortableExecutable;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 
 namespace Microsoft.AspNetCore;
 namespace Microsoft.AspNetCore;

+ 1 - 1
src/Framework/test/SharedFxTests.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Reflection.Metadata;
 using System.Reflection.Metadata;
 using System.Reflection.PortableExecutable;
 using System.Reflection.PortableExecutable;
 using System.Xml.Linq;
 using System.Xml.Linq;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Linq;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 

+ 1 - 1
src/Framework/test/TargetingPackTests.cs

@@ -7,7 +7,7 @@ using System.Reflection.Metadata;
 using System.Reflection.PortableExecutable;
 using System.Reflection.PortableExecutable;
 using System.Runtime.CompilerServices;
 using System.Runtime.CompilerServices;
 using System.Xml.Linq;
 using System.Xml.Linq;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using NuGet.Versioning;
 using NuGet.Versioning;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 

+ 1 - 1
src/Framework/test/TestData.cs

@@ -3,7 +3,7 @@
 
 
 using System.Reflection;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 
 
 namespace Microsoft.AspNetCore;
 namespace Microsoft.AspNetCore;
 
 

+ 1 - 1
src/Grpc/Grpc.slnf

@@ -26,7 +26,7 @@
       "src\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj",
       "src\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj",
       "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
       "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
       "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
       "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
-      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
+      "src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj"
     ]
     ]
   }
   }
 }
 }

+ 1 - 1
src/Grpc/Interop/test/InteropTests/InteropTests.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
 using InteropTests.Helpers;
 using InteropTests.Helpers;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 
 namespace InteropTests;
 namespace InteropTests;

+ 1 - 1
src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/RouteTests.cs

@@ -9,7 +9,7 @@ using System.Text.Json;
 using Grpc.Core;
 using Grpc.Core;
 using IntegrationTestsWebsite;
 using IntegrationTestsWebsite;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.Infrastructure;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.Infrastructure;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 
 namespace Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests;
 namespace Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests;

+ 1 - 1
src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/ServerStreamingTests.cs

@@ -7,7 +7,7 @@ using Grpc.Core;
 using IntegrationTestsWebsite;
 using IntegrationTestsWebsite;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.Infrastructure;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.Infrastructure;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 
 namespace Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests;
 namespace Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests;

+ 1 - 1
src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/UnaryTests.cs

@@ -10,7 +10,7 @@ using IntegrationTestsWebsite;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.Infrastructure;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.Infrastructure;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 
 
 namespace Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests;
 namespace Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests;

+ 1 - 1
src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ServerStreamingServerCallHandlerTests.cs

@@ -19,7 +19,7 @@ using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.CallHandlers;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.CallHandlers;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Transcoding;
 using Transcoding;
 using Xunit.Abstractions;
 using Xunit.Abstractions;
 using MethodOptions = Grpc.Shared.Server.MethodOptions;
 using MethodOptions = Grpc.Shared.Server.MethodOptions;

+ 1 - 1
src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/UnaryServerCallHandlerTests.cs

@@ -22,7 +22,7 @@ using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.CallHandlers;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.Primitives;
 using Microsoft.Extensions.Primitives;
 using Transcoding;
 using Transcoding;
 using Xunit.Abstractions;
 using Xunit.Abstractions;

+ 1 - 1
src/HealthChecks/HealthChecks/test/DefaultHealthCheckServiceTest.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
 using System.Threading;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging;

+ 1 - 1
src/HealthChecks/HealthChecks/test/HealthCheckPublisherHostedServiceTest.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
 using System.Threading;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging;

+ 1 - 1
src/Hosting/Hosting.slnf

@@ -33,7 +33,7 @@
       "src\\Servers\\Kestrel\\Transport.NamedPipes\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj",
       "src\\Servers\\Kestrel\\Transport.NamedPipes\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.csproj",
       "src\\Servers\\Kestrel\\Transport.Quic\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj",
       "src\\Servers\\Kestrel\\Transport.Quic\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj",
       "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj",
       "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj",
-      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
+      "src\\Testing\\src\\Microsoft.AspNetCore.InternalTesting.csproj"
     ]
     ]
   }
   }
 }
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов