From e8ae5f8507aa5397b048cf66d3289503f77c445d Mon Sep 17 00:00:00 2001 From: Levi Broderick Date: Sun, 12 Apr 2020 10:36:36 -0700 Subject: [PATCH] Rename CoreFx.Private.TestUtilities.Unicode to TestUtilities.Unicode (#34836) And explicitly reference it from solutions which consume it --- src/libraries/Common/Common.Tests.sln | 7 +++++++ .../System/Text/Unicode/BidiClass.cs | 0 .../System/Text/Unicode/CodePoint.cs | 0 .../System/Text/Unicode/CodePointFlags.cs | 0 .../System/Text/Unicode/GraphemeClusterBreakProperty.cs | 0 .../System/Text/Unicode/ParsedUnicodeData.cs | 0 .../System/Text/Unicode/PropsFileEntry.cs | 0 .../System/Text/Unicode/Resources.cs | 0 .../System/Text/Unicode/UnicodeData.cs | 0 .../System/Text/Unicode/UnicodeDataFileEntry.cs | 0 .../TestUtilities.Unicode.csproj} | 0 .../System.Globalization/System.Globalization.sln | 7 +++++++ .../tests/System.Globalization.Tests.csproj | 2 +- src/libraries/System.Runtime/System.Runtime.sln | 7 +++++++ .../System.Runtime/tests/System.Runtime.Tests.csproj | 2 +- 15 files changed, 23 insertions(+), 2 deletions(-) rename src/libraries/Common/tests/{CoreFx.Private.TestUtilities.Unicode => TestUtilities.Unicode}/System/Text/Unicode/BidiClass.cs (100%) rename src/libraries/Common/tests/{CoreFx.Private.TestUtilities.Unicode => TestUtilities.Unicode}/System/Text/Unicode/CodePoint.cs (100%) rename src/libraries/Common/tests/{CoreFx.Private.TestUtilities.Unicode => TestUtilities.Unicode}/System/Text/Unicode/CodePointFlags.cs (100%) rename src/libraries/Common/tests/{CoreFx.Private.TestUtilities.Unicode => TestUtilities.Unicode}/System/Text/Unicode/GraphemeClusterBreakProperty.cs (100%) rename src/libraries/Common/tests/{CoreFx.Private.TestUtilities.Unicode => TestUtilities.Unicode}/System/Text/Unicode/ParsedUnicodeData.cs (100%) rename src/libraries/Common/tests/{CoreFx.Private.TestUtilities.Unicode => TestUtilities.Unicode}/System/Text/Unicode/PropsFileEntry.cs (100%) rename src/libraries/Common/tests/{CoreFx.Private.TestUtilities.Unicode => TestUtilities.Unicode}/System/Text/Unicode/Resources.cs (100%) rename src/libraries/Common/tests/{CoreFx.Private.TestUtilities.Unicode => TestUtilities.Unicode}/System/Text/Unicode/UnicodeData.cs (100%) rename src/libraries/Common/tests/{CoreFx.Private.TestUtilities.Unicode => TestUtilities.Unicode}/System/Text/Unicode/UnicodeDataFileEntry.cs (100%) rename src/libraries/Common/tests/{CoreFx.Private.TestUtilities.Unicode/CoreFx.Private.TestUtilities.Unicode.csproj => TestUtilities.Unicode/TestUtilities.Unicode.csproj} (100%) diff --git a/src/libraries/Common/Common.Tests.sln b/src/libraries/Common/Common.Tests.sln index f59b8efdd9cad..c1ef093cd7e71 100644 --- 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/src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/BidiClass.cs b/src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/BidiClass.cs similarity index 100% rename from src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/BidiClass.cs rename to src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/BidiClass.cs diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/CodePoint.cs b/src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/CodePoint.cs similarity index 100% rename from src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/CodePoint.cs rename to src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/CodePoint.cs diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/CodePointFlags.cs b/src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/CodePointFlags.cs similarity index 100% rename from src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/CodePointFlags.cs rename to src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/CodePointFlags.cs diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/GraphemeClusterBreakProperty.cs b/src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/GraphemeClusterBreakProperty.cs similarity index 100% rename from src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/GraphemeClusterBreakProperty.cs rename to src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/GraphemeClusterBreakProperty.cs diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/ParsedUnicodeData.cs b/src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/ParsedUnicodeData.cs similarity index 100% rename from src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/ParsedUnicodeData.cs rename to src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/ParsedUnicodeData.cs diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/PropsFileEntry.cs b/src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/PropsFileEntry.cs similarity index 100% rename from src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/PropsFileEntry.cs rename to src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/PropsFileEntry.cs diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/Resources.cs b/src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/Resources.cs similarity index 100% rename from src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/Resources.cs rename to src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/Resources.cs diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/UnicodeData.cs b/src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/UnicodeData.cs similarity index 100% rename from src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/UnicodeData.cs rename to src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/UnicodeData.cs diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/UnicodeDataFileEntry.cs b/src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/UnicodeDataFileEntry.cs similarity index 100% rename from src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/System/Text/Unicode/UnicodeDataFileEntry.cs rename to src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/UnicodeDataFileEntry.cs diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/CoreFx.Private.TestUtilities.Unicode.csproj b/src/libraries/Common/tests/TestUtilities.Unicode/TestUtilities.Unicode.csproj similarity index 100% rename from src/libraries/Common/tests/CoreFx.Private.TestUtilities.Unicode/CoreFx.Private.TestUtilities.Unicode.csproj rename to src/libraries/Common/tests/TestUtilities.Unicode/TestUtilities.Unicode.csproj diff --git a/src/libraries/System.Globalization/System.Globalization.sln b/src/libraries/System.Globalization/System.Globalization.sln index 6613d4e21ceca..4607fdfb14973 100644 --- 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 index e80dbea1a4745..be9b72574bcdc 100644 --- a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj +++ b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj @@ -128,6 +128,6 @@ - + diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln index 655effb4ec4a2..1fad2177e6341 100644 --- 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 index b9f60988e48d2..bff03ab27acf5 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj @@ -280,6 +280,6 @@ - +