From dd22ce809f235b40f20737b56458bacdb8ec2b46 Mon Sep 17 00:00:00 2001 From: Levi Broderick Date: Wed, 15 Apr 2020 00:05:18 -0700 Subject: [PATCH] Remove outdated CoreFx.Private.TestUtilities.Unicode references (#34981) * Remove outdated CoreFx.Private.TestUtilities.Unicode references * Update System.Globalization.Extensions.Nls.Tests dependencies * Add System.Runtime.Nls.Tests to System.Runtime.sln * Add missing .sln entry --- .../Tools/GenUnicodeProp/GenUnicodeProp.csproj | 2 +- .../System.Globalization.Extensions.sln | 3 +++ src/libraries/System.Globalization/System.Globalization.sln | 3 +++ .../tests/NlsTests/System.Globalization.Nls.Tests.csproj | 2 +- src/libraries/System.Runtime/System.Runtime.sln | 10 ++++++++++ .../tests/NlsTests/System.Runtime.Nls.Tests.csproj | 2 +- 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj b/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj index c40c22d..a3fde0f 100644 --- a/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj +++ b/src/coreclr/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln b/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln index 1290450..af85e7b 100644 --- a/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln +++ b/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln @@ -21,6 +21,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions.Nls.Tests", "tests\NlsTests\System.Globalization.Extensions.Nls.Tests.csproj", "{CB60359A-D0ED-474E-B395-9589F1A5656A}" + ProjectSection(ProjectDependencies) = postProject + {2B96AA10-84C0-4927-8611-8D2474B990E8} = {2B96AA10-84C0-4927-8611-8D2474B990E8} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/libraries/System.Globalization/System.Globalization.sln b/src/libraries/System.Globalization/System.Globalization.sln index 36e21495..c482492 100644 --- a/src/libraries/System.Globalization/System.Globalization.sln +++ b/src/libraries/System.Globalization/System.Globalization.sln @@ -26,6 +26,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Nls.Tests", "tests\NlsTests\System.Globalization.Nls.Tests.csproj", "{6B71E284-DA57-4657-9E08-A02BAFB877CC}" + ProjectSection(ProjectDependencies) = postProject + {2395E8CA-73CB-40DF-BE40-A60BC189B737} = {2395E8CA-73CB-40DF-BE40-A60BC189B737} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{443745F1-A200-432B-A666-3D0E9F938DED}" EndProject diff --git a/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj b/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj index 7ab8074..3266b52 100644 --- a/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj +++ b/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj @@ -340,6 +340,6 @@ - + diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln index 1fad217..d5992a5 100644 --- a/src/libraries/System.Runtime/System.Runtime.sln +++ b/src/libraries/System.Runtime/System.Runtime.sln @@ -7,6 +7,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Tests", "tes {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Nls.Tests", "tests\NlsTests\System.Runtime.Nls.Tests.csproj", "{F6ED1D9D-DBF6-420A-9710-672BF78A00E4}" + ProjectSection(ProjectDependencies) = postProject + {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} + EndProjectSection +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCollectibleAssembly", "tests\TestCollectibleAssembly\TestCollectibleAssembly.csproj", "{F9C30DC5-30C1-45DA-9336-F7BE358C367C}" ProjectSection(ProjectDependencies) = postProject {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} @@ -54,6 +59,10 @@ Global {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Debug|Any CPU.Build.0 = Debug|Any CPU {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Release|Any CPU.ActiveCfg = Release|Any CPU {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Release|Any CPU.Build.0 = Release|Any CPU + {F6ED1D9D-DBF6-420A-9710-672BF78A00E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F6ED1D9D-DBF6-420A-9710-672BF78A00E4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F6ED1D9D-DBF6-420A-9710-672BF78A00E4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F6ED1D9D-DBF6-420A-9710-672BF78A00E4}.Release|Any CPU.Build.0 = Release|Any CPU {F9C30DC5-30C1-45DA-9336-F7BE358C367C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F9C30DC5-30C1-45DA-9336-F7BE358C367C}.Debug|Any CPU.Build.0 = Debug|Any CPU {F9C30DC5-30C1-45DA-9336-F7BE358C367C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -92,6 +101,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} + {F6ED1D9D-DBF6-420A-9710-672BF78A00E4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {F9C30DC5-30C1-45DA-9336-F7BE358C367C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {71DE1A1F-F8E2-452A-9D54-0385F6099DD3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} {3B7489C4-65DB-4E69-BE01-F6234133400C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178} diff --git a/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj b/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj index fa46b81..48a9940 100644 --- a/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj +++ b/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj @@ -56,6 +56,6 @@ - + -- 2.7.4