Rename CoreFx.Private.TestUtilities and reference it in slns (#34656)

* Rename CoreFx.Private.TestUtilities to TestUtilities * Add TestUtilities reference to slns
dotnet · Apr 7, 2020 · d0dc66b · d0dc66b
1 parent 893882f
commit d0dc66b
Show file tree

Hide file tree

Showing 216 changed files with 1,565 additions and 184 deletions.
diff --git a/src/libraries/Common/Common.Tests.sln b/src/libraries/Common/Common.Tests.sln
@@ -5,6 +5,10 @@ VisualStudioVersion = 15.0.26430.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "tests\Common.Tests.csproj", "{C72FD34C-539A-4447-9796-62A229571199}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D5C979E6-ED08-4CF6-A5B2-E646481EC3A4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "tests\TestUtilities\TestUtilities.csproj", "{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,11 +19,18 @@ Global
 		{C72FD34C-539A-4447-9796-62A229571199}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C72FD34C-539A-4447-9796-62A229571199}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C72FD34C-539A-4447-9796-62A229571199}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5E554AE7-CBC2-4C34-9FEA-1A6250CE5D3F}
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E} = {D5C979E6-ED08-4CF6-A5B2-E646481EC3A4}
+	EndGlobalSection
 EndGlobal
diff --git a/...estUtilities/Interop/Interop.Libraries.cs → ...estUtilities/Interop/Interop.Libraries.cs b/...estUtilities/Interop/Interop.Libraries.cs → ...estUtilities/Interop/Interop.Libraries.cs
diff --git a/...vate.TestUtilities/System/AdminHelpers.cs → ...ests/TestUtilities/System/AdminHelpers.cs b/...vate.TestUtilities/System/AdminHelpers.cs → ...ests/TestUtilities/System/AdminHelpers.cs
diff --git a/....TestUtilities/System/AssertExtensions.cs → .../TestUtilities/System/AssertExtensions.cs b/....TestUtilities/System/AssertExtensions.cs → .../TestUtilities/System/AssertExtensions.cs
diff --git a/.../System/Buffers/BoundedMemory.Creation.cs → .../System/Buffers/BoundedMemory.Creation.cs b/.../System/Buffers/BoundedMemory.Creation.cs → .../System/Buffers/BoundedMemory.Creation.cs
diff --git a/...ties/System/Buffers/BoundedMemory.Unix.cs → ...ties/System/Buffers/BoundedMemory.Unix.cs b/...ties/System/Buffers/BoundedMemory.Unix.cs → ...ties/System/Buffers/BoundedMemory.Unix.cs
diff --git a/...s/System/Buffers/BoundedMemory.Windows.cs → ...s/System/Buffers/BoundedMemory.Windows.cs b/...s/System/Buffers/BoundedMemory.Windows.cs → ...s/System/Buffers/BoundedMemory.Windows.cs
diff --git a/...Utilities/System/Buffers/BoundedMemory.cs → ...Utilities/System/Buffers/BoundedMemory.cs b/...Utilities/System/Buffers/BoundedMemory.cs → ...Utilities/System/Buffers/BoundedMemory.cs
diff --git a/...ies/System/Buffers/PoisonPagePlacement.cs → ...ies/System/Buffers/PoisonPagePlacement.cs b/...ies/System/Buffers/PoisonPagePlacement.cs → ...ies/System/Buffers/PoisonPagePlacement.cs
diff --git a/...tilities/System/IO/FileCleanupTestBase.cs → ...tilities/System/IO/FileCleanupTestBase.cs b/...tilities/System/IO/FileCleanupTestBase.cs → ...tilities/System/IO/FileCleanupTestBase.cs
diff --git a/...tilities/System/PlatformDetection.Unix.cs → ...tilities/System/PlatformDetection.Unix.cs b/...tilities/System/PlatformDetection.Unix.cs → ...tilities/System/PlatformDetection.Unix.cs
diff --git a/...ities/System/PlatformDetection.Windows.cs → ...ities/System/PlatformDetection.Windows.cs b/...ities/System/PlatformDetection.Windows.cs → ...ities/System/PlatformDetection.Windows.cs
diff --git a/...TestUtilities/System/PlatformDetection.cs → ...TestUtilities/System/PlatformDetection.cs b/...TestUtilities/System/PlatformDetection.cs → ...TestUtilities/System/PlatformDetection.cs
diff --git a/...ivate.TestUtilities/System/RetryHelper.cs → ...tests/TestUtilities/System/RetryHelper.cs b/...ivate.TestUtilities/System/RetryHelper.cs → ...tests/TestUtilities/System/RetryHelper.cs
diff --git a/...e.TestUtilities/System/TestEnvironment.cs → ...s/TestUtilities/System/TestEnvironment.cs b/...e.TestUtilities/System/TestEnvironment.cs → ...s/TestUtilities/System/TestEnvironment.cs
diff --git a/...stUtilities/System/ThreadCultureChange.cs → ...stUtilities/System/ThreadCultureChange.cs b/...stUtilities/System/ThreadCultureChange.cs → ...stUtilities/System/ThreadCultureChange.cs
diff --git a/...ities/CoreFx.Private.TestUtilities.csproj → .../tests/TestUtilities/TestUtilities.csproj b/...ities/CoreFx.Private.TestUtilities.csproj → .../tests/TestUtilities/TestUtilities.csproj
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
@@ -321,7 +321,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsTestProject)' == 'true' and '$(IsTestSupportProject)' != 'true'">
-    <ProjectReference Include="$(CommonTestPath)CoreFx.Private.TestUtilities\CoreFx.Private.TestUtilities.csproj" />
+    <ProjectReference Include="$(CommonTestPath)TestUtilities\TestUtilities.csproj" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(IsTestProject)' == 'true' and '$(IsTestSupportProject)' != 'true'">

diff --git a/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln b/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27213.1
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -20,6 +20,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E89
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{4853B3B6-3F48-43CA-B750-5B870EE4A96F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -38,6 +40,10 @@ Global
 		{1427906B-FF3D-422A-8278-F2B7E89DE12A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1427906B-FF3D-422A-8278-F2B7E89DE12A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1427906B-FF3D-422A-8278-F2B7E89DE12A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4853B3B6-3F48-43CA-B750-5B870EE4A96F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4853B3B6-3F48-43CA-B750-5B870EE4A96F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4853B3B6-3F48-43CA-B750-5B870EE4A96F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4853B3B6-3F48-43CA-B750-5B870EE4A96F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -46,6 +52,7 @@ Global
 		{82B54697-0251-47A1-8546-FC507D0F3B08} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
 		{149D7DFE-2FAC-4A38-89AD-E24CE63AACB8} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
 		{1427906B-FF3D-422A-8278-F2B7E89DE12A} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
+		{4853B3B6-3F48-43CA-B750-5B870EE4A96F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {89BC0057-5CFB-4B4B-B255-A5EDB54CFEAE}

diff --git a/...agnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln b/...agnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27213.1
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B83AFCDC-F6A3-4216-8098-8F163179D131}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,13 +29,18 @@ Global
 		{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B83AFCDC-F6A3-4216-8098-8F163179D131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B83AFCDC-F6A3-4216-8098-8F163179D131}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B83AFCDC-F6A3-4216-8098-8F163179D131}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B83AFCDC-F6A3-4216-8098-8F163179D131}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{0657A043-0AEE-445E-9BE4-0B3A9D80318F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
 		{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
+		{B83AFCDC-F6A3-4216-8098-8F163179D131} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {53827F58-3CA5-4CEF-9176-70DD35463C1E}

diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln b/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Cachin
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Memory.Tests", "tests\Microsoft.Extensions.Caching.Memory.Tests.csproj", "{DE244209-5EC7-47DD-8EC9-7B634DFDA1B7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9BE95529-D00D-4D03-82F1-103891E17F28}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{DE244209-5EC7-47DD-8EC9-7B634DFDA1B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DE244209-5EC7-47DD-8EC9-7B634DFDA1B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE244209-5EC7-47DD-8EC9-7B634DFDA1B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BE95529-D00D-4D03-82F1-103891E17F28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BE95529-D00D-4D03-82F1-103891E17F28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BE95529-D00D-4D03-82F1-103891E17F28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9BE95529-D00D-4D03-82F1-103891E17F28}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -41,6 +47,7 @@ Global
 		{CB26F7AD-3279-4BBB-B33A-485CBF2B0787} = {20ACD179-AFDD-456A-9D27-5F4B036BA5AB}
 		{802F8E4B-C890-4312-B8A1-BF0201C7F949} = {02F50816-753B-4542-BDB9-80B6AD32D31F}
 		{DE244209-5EC7-47DD-8EC9-7B634DFDA1B7} = {A56177C8-32A9-4C5A-9AE8-312F209B3F32}
+		{9BE95529-D00D-4D03-82F1-103891E17F28} = {A56177C8-32A9-4C5A-9AE8-312F209B3F32}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {67FE26A1-86FB-4A0F-83E4-3CD98E58DF2E}

diff --git a/...s/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln b/...s/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Config
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder.Tests", "tests\Microsoft.Extensions.Configuration.Binder.Tests.csproj", "{6AAC9F65-3F45-41B0-991F-530F652E53AD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{6AAC9F65-3F45-41B0-991F-530F652E53AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6AAC9F65-3F45-41B0-991F-530F652E53AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6AAC9F65-3F45-41B0-991F-530F652E53AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -41,6 +47,7 @@ Global
 		{C6976CEC-09C6-430E-8576-B0AFE6BAD263} = {19975C7D-D7E2-4551-84BF-8522B6FC30C3}
 		{220E2B81-5D96-4999-A3CA-D9F681B3C8F4} = {CC762868-69E6-47E7-912C-FFF27A07C5F3}
 		{6AAC9F65-3F45-41B0-991F-530F652E53AD} = {9CAA4208-C432-49B4-8661-4DDE821EF154}
+		{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83} = {9CAA4208-C432-49B4-8661-4DDE821EF154}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B5E9104-9917-47A2-B17C-D420E6A13467}

diff --git a/...t.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.sln b/...t.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.sln
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Config
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine.Tests", "tests\Microsoft.Extensions.Configuration.CommandLine.Tests.csproj", "{2A8DAEB6-95DE-47F1-88E0-42675279FD87}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{84B6A2DB-2E4B-49B7-98B0-B4032A04585C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{2A8DAEB6-95DE-47F1-88E0-42675279FD87}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A8DAEB6-95DE-47F1-88E0-42675279FD87}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A8DAEB6-95DE-47F1-88E0-42675279FD87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84B6A2DB-2E4B-49B7-98B0-B4032A04585C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84B6A2DB-2E4B-49B7-98B0-B4032A04585C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84B6A2DB-2E4B-49B7-98B0-B4032A04585C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84B6A2DB-2E4B-49B7-98B0-B4032A04585C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -41,6 +47,7 @@ Global
 		{657CD674-B225-4D8B-BFF0-41F4B0203FB5} = {BDE47CA9-FA28-4B80-97AD-C1ADA07E109F}
 		{D5F9AD72-D55D-4110-8FB4-9340A1DDE7B9} = {1E7E6E50-5748-4E9A-A36D-5DFF485957A3}
 		{2A8DAEB6-95DE-47F1-88E0-42675279FD87} = {9361978B-A180-4DC2-AD57-82D7B94964CD}
+		{84B6A2DB-2E4B-49B7-98B0-B4032A04585C} = {9361978B-A180-4DC2-AD57-82D7B94964CD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1ACDC382-2E7D-462F-8373-7D106D8A0244}

diff --git a/...guration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.sln b/...guration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.sln
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Config
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables.Tests", "tests\Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj", "{3BEF9DD3-9E82-49B6-A06E-1A899ED2FD93}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{3BEF9DD3-9E82-49B6-A06E-1A899ED2FD93}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3BEF9DD3-9E82-49B6-A06E-1A899ED2FD93}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BEF9DD3-9E82-49B6-A06E-1A899ED2FD93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -41,6 +47,7 @@ Global
 		{E36A657C-4A6E-4C47-9D1E-51D32C00C52D} = {D35C3BB9-F9D1-409E-968F-D73563B3FC36}
 		{598A83F4-1A18-4814-BC48-E536FA378004} = {82C89D4E-F7EB-45D4-AC9F-BB952B620767}
 		{3BEF9DD3-9E82-49B6-A06E-1A899ED2FD93} = {BB7360F9-FD16-4E3A-9FE9-9870B97A49BB}
+		{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52} = {BB7360F9-FD16-4E3A-9FE9-9870B97A49BB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BF2C57DF-CD27-4C93-A689-19A72E6FC5B4}

diff --git a/...nsions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.sln b/...nsions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.sln
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Config
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions.Tests", "tests\Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj", "{50FBFD93-356A-4439-97A3-592A066D23A8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8D869833-69B7-4C0B-A13B-D3073EE2D912}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{50FBFD93-356A-4439-97A3-592A066D23A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{50FBFD93-356A-4439-97A3-592A066D23A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50FBFD93-356A-4439-97A3-592A066D23A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D869833-69B7-4C0B-A13B-D3073EE2D912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D869833-69B7-4C0B-A13B-D3073EE2D912}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D869833-69B7-4C0B-A13B-D3073EE2D912}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D869833-69B7-4C0B-A13B-D3073EE2D912}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -41,6 +47,7 @@ Global
 		{AEC76790-0008-4755-A097-77E52F7EE38C} = {368FB595-071C-445D-A56B-88781300D2B7}
 		{1A6B0717-13B3-4F15-AD71-5BE3FEE0F9DC} = {3C64296E-E07A-41E3-BE26-AF909F556B1B}
 		{50FBFD93-356A-4439-97A3-592A066D23A8} = {C31D33A1-28EE-4C1E-A859-5D8154527838}
+		{8D869833-69B7-4C0B-A13B-D3073EE2D912} = {C31D33A1-28EE-4C1E-A859-5D8154527838}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DB6ECFE5-FAD1-4F02-A143-0A39A506ED11}

diff --git a/...braries/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.sln b/...braries/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.sln
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Config
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Ini.Tests", "tests\Microsoft.Extensions.Configuration.Ini.Tests.csproj", "{85280091-78E2-4558-B6AB-F30B4F92BCF7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1271138D-3837-4315-A3B4-E085DCD61FBC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{85280091-78E2-4558-B6AB-F30B4F92BCF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{85280091-78E2-4558-B6AB-F30B4F92BCF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85280091-78E2-4558-B6AB-F30B4F92BCF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1271138D-3837-4315-A3B4-E085DCD61FBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1271138D-3837-4315-A3B4-E085DCD61FBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1271138D-3837-4315-A3B4-E085DCD61FBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1271138D-3837-4315-A3B4-E085DCD61FBC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -41,6 +47,7 @@ Global
 		{7E5EF3B6-FF5A-4536-9A3C-4A9288F69ABE} = {8EF05751-E815-46ED-A495-4F38C40AF8DB}
 		{B5665E0B-EF8D-4A3F-9CDC-FCD1B0F4A784} = {34CD290F-ED23-4066-97D3-3D37E8658E1D}
 		{85280091-78E2-4558-B6AB-F30B4F92BCF7} = {2474302E-ABBF-4B9C-832F-1C3DF82C4769}
+		{1271138D-3837-4315-A3B4-E085DCD61FBC} = {2474302E-ABBF-4B9C-832F-1C3DF82C4769}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E4A50DE9-C0E3-44CC-A3DD-45A49DFFDCD3}

diff --git a/...aries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln b/...aries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
@@ -15,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EFA97506
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json.Tests", "tests\Microsoft.Extensions.Configuration.Json.Tests.csproj", "{328889E2-78ED-4774-83FB-188BABA34FB9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{14C31A82-8817-44FF-A28B-9B05797FDC4C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{328889E2-78ED-4774-83FB-188BABA34FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{328889E2-78ED-4774-83FB-188BABA34FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{328889E2-78ED-4774-83FB-188BABA34FB9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14C31A82-8817-44FF-A28B-9B05797FDC4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14C31A82-8817-44FF-A28B-9B05797FDC4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14C31A82-8817-44FF-A28B-9B05797FDC4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14C31A82-8817-44FF-A28B-9B05797FDC4C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -41,6 +47,7 @@ Global
 		{39B9BECA-B7EA-426A-B1DF-91C1318AA1EB} = {DDBAD8C5-F7BE-4EB7-9B1F-AD8CAE548DB3}
 		{1B86310E-A8A9-497B-BA92-BB9E273DC1CE} = {8163E80F-4982-4BC2-A0AA-FF1284E62964}
 		{328889E2-78ED-4774-83FB-188BABA34FB9} = {EFA97506-2078-4F34-9491-9C300446FA64}
+		{14C31A82-8817-44FF-A28B-9B05797FDC4C} = {EFA97506-2078-4F34-9491-9C300446FA64}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6208DEC0-032F-495E-853B-A725B4DD1F45}

diff --git a/...t.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln b/...t.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Config
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets", "ref\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{B900DBCF-CCCC-4774-935A-356D924220D3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{B900DBCF-CCCC-4774-935A-356D924220D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B900DBCF-CCCC-4774-935A-356D924220D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B900DBCF-CCCC-4774-935A-356D924220D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -41,6 +47,7 @@ Global
 		{F26BD9D3-D2B9-41BF-8A4C-A7DE13F66F9D} = {C09E450E-9666-4062-86CE-FD85407A5DEA}
 		{3AEBC02F-98FB-409A-B387-C6B119A8411A} = {14AACC29-CD5B-4A3D-A2FB-9EEE2D42E683}
 		{B900DBCF-CCCC-4774-935A-356D924220D3} = {AF104F7B-B3E9-4EE4-84CE-4F56D9F8FCFE}
+		{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2} = {14AACC29-CD5B-4A3D-A2FB-9EEE2D42E683}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {907BC82F-9820-431B-B62F-3695F3B0BE65}