Rename CoreFx.Private.TestUtilities.Unicode to TestUtilities.Unicode (#…

…34836) And explicitly reference it from solutions which consume it
dotnet · Apr 12, 2020 · e8ae5f8 · e8ae5f8
1 parent 040ce64
commit e8ae5f8
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 2 deletions.
diff --git a/src/libraries/Common/Common.Tests.sln b/src/libraries/Common/Common.Tests.sln
@@ -9,6 +9,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D5C979E6
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "tests\TestUtilities\TestUtilities.csproj", "{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.Unicode", "tests\TestUtilities.Unicode\TestUtilities.Unicode.csproj", "{7AA91133-B0CB-4321-986B-323A7DED12C0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,6 +25,10 @@ Global
 		{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
+		{7AA91133-B0CB-4321-986B-323A7DED12C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AA91133-B0CB-4321-986B-323A7DED12C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AA91133-B0CB-4321-986B-323A7DED12C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AA91133-B0CB-4321-986B-323A7DED12C0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -32,5 +38,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E} = {D5C979E6-ED08-4CF6-A5B2-E646481EC3A4}
+		{7AA91133-B0CB-4321-986B-323A7DED12C0} = {D5C979E6-ED08-4CF6-A5B2-E646481EC3A4}
 	EndGlobalSection
 EndGlobal
diff --git a/....Unicode/System/Text/Unicode/BidiClass.cs → ....Unicode/System/Text/Unicode/BidiClass.cs b/....Unicode/System/Text/Unicode/BidiClass.cs → ....Unicode/System/Text/Unicode/BidiClass.cs
diff --git a/....Unicode/System/Text/Unicode/CodePoint.cs → ....Unicode/System/Text/Unicode/CodePoint.cs b/....Unicode/System/Text/Unicode/CodePoint.cs → ....Unicode/System/Text/Unicode/CodePoint.cs
diff --git a/...ode/System/Text/Unicode/CodePointFlags.cs → ...ode/System/Text/Unicode/CodePointFlags.cs b/...ode/System/Text/Unicode/CodePointFlags.cs → ...ode/System/Text/Unicode/CodePointFlags.cs
diff --git a/...t/Unicode/GraphemeClusterBreakProperty.cs → ...t/Unicode/GraphemeClusterBreakProperty.cs b/...t/Unicode/GraphemeClusterBreakProperty.cs → ...t/Unicode/GraphemeClusterBreakProperty.cs
diff --git a/.../System/Text/Unicode/ParsedUnicodeData.cs → .../System/Text/Unicode/ParsedUnicodeData.cs b/.../System/Text/Unicode/ParsedUnicodeData.cs → .../System/Text/Unicode/ParsedUnicodeData.cs
diff --git a/...ode/System/Text/Unicode/PropsFileEntry.cs → ...ode/System/Text/Unicode/PropsFileEntry.cs b/...ode/System/Text/Unicode/PropsFileEntry.cs → ...ode/System/Text/Unicode/PropsFileEntry.cs
diff --git a/....Unicode/System/Text/Unicode/Resources.cs → ....Unicode/System/Text/Unicode/Resources.cs b/....Unicode/System/Text/Unicode/Resources.cs → ....Unicode/System/Text/Unicode/Resources.cs
diff --git a/...nicode/System/Text/Unicode/UnicodeData.cs → ...nicode/System/Text/Unicode/UnicodeData.cs b/...nicode/System/Text/Unicode/UnicodeData.cs → ...nicode/System/Text/Unicode/UnicodeData.cs
diff --git a/...stem/Text/Unicode/UnicodeDataFileEntry.cs → ...stem/Text/Unicode/UnicodeDataFileEntry.cs b/...stem/Text/Unicode/UnicodeDataFileEntry.cs → ...stem/Text/Unicode/UnicodeDataFileEntry.cs
diff --git a/...reFx.Private.TestUtilities.Unicode.csproj → ...ties.Unicode/TestUtilities.Unicode.csproj b/...reFx.Private.TestUtilities.Unicode.csproj → ...ties.Unicode/TestUtilities.Unicode.csproj
diff --git a/src/libraries/System.Globalization/System.Globalization.sln b/src/libraries/System.Globalization/System.Globalization.sln
@@ -27,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2ED
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{443745F1-A200-432B-A666-3D0E9F938DED}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.Unicode", "..\Common\tests\TestUtilities.Unicode\TestUtilities.Unicode.csproj", "{E5ECA266-C7E9-4597-8FFA-095BD6890407}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -53,6 +55,10 @@ Global
 		{443745F1-A200-432B-A666-3D0E9F938DED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{443745F1-A200-432B-A666-3D0E9F938DED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{443745F1-A200-432B-A666-3D0E9F938DED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5ECA266-C7E9-4597-8FFA-095BD6890407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5ECA266-C7E9-4597-8FFA-095BD6890407}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5ECA266-C7E9-4597-8FFA-095BD6890407}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5ECA266-C7E9-4597-8FFA-095BD6890407}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -63,6 +69,7 @@ Global
 		{2395E8CA-73CB-40DF-BE40-A60BC189B737} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
 		{E1E58C98-808F-4065-9C1D-E6411166AF6F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
 		{443745F1-A200-432B-A666-3D0E9F938DED} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+		{E5ECA266-C7E9-4597-8FFA-095BD6890407} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F9EC6162-389C-4439-9EB6-B357237A1812}

diff --git a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
@@ -128,6 +128,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(CommonTestPath)CoreFx.Private.TestUtilities.Unicode\CoreFx.Private.TestUtilities.Unicode.csproj" />
+    <ProjectReference Include="$(CommonTestPath)TestUtilities.Unicode\TestUtilities.Unicode.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln
@@ -42,6 +42,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2ED
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9EE64AF5-E04D-4E0E-8D87-F263E3CAF247}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.Unicode", "..\Common\tests\TestUtilities.Unicode\TestUtilities.Unicode.csproj", "{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -80,6 +82,10 @@ Global
 		{9EE64AF5-E04D-4E0E-8D87-F263E3CAF247}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9EE64AF5-E04D-4E0E-8D87-F263E3CAF247}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9EE64AF5-E04D-4E0E-8D87-F263E3CAF247}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -93,6 +99,7 @@ Global
 		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
 		{ADBCF120-3454-4A3C-9D1D-AC4293E795D6} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
 		{9EE64AF5-E04D-4E0E-8D87-F263E3CAF247} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+		{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBD1A5A2-A6F0-444D-9D7D-86D77604F1F5}

diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
@@ -280,6 +280,6 @@
     <ProjectReference Include="TestCollectibleAssembly\TestCollectibleAssembly.csproj" />
     <ProjectReference Include="TestModule\System.Reflection.TestModule.ilproj" />
     <ProjectReference Include="TestStructs\System.TestStructs.ilproj" />
-    <ProjectReference Include="$(CommonTestPath)CoreFx.Private.TestUtilities.Unicode\CoreFx.Private.TestUtilities.Unicode.csproj" />
+    <ProjectReference Include="$(CommonTestPath)TestUtilities.Unicode\TestUtilities.Unicode.csproj" />
   </ItemGroup>
 </Project>