From 07d35274e35e4f347d43939d8527fbf93736bd36 Mon Sep 17 00:00:00 2001
From: Roman Marusyk <Marusyk@users.noreply.github.com>
Date: Mon, 30 Dec 2019 14:03:17 +0200
Subject: [PATCH] Consolidate .netcoreapp.cs files in Common project (#1178)

---
 ...estsBase.netcoreapp.cs => RealFormatterTestsBase.cs} |  0
 ...erTestsBase.netcoreapp.cs => RealParserTestsBase.cs} |  0
 .../System.ComponentModel.TypeConverter.Tests.csproj    |  3 +--
 .../tests/TypeDescriptorTests.cs                        |  5 +++--
 .../tests/TypeDescriptorTests.netcoreapp.cs             | 17 -----------------
 .../System.Memory/tests/System.Memory.Tests.csproj      |  4 ++--
 .../System.Runtime/tests/System.Runtime.Tests.csproj    | 10 ++++------
 7 files changed, 10 insertions(+), 29 deletions(-)
 rename src/libraries/Common/tests/System/{RealFormatterTestsBase.netcoreapp.cs => RealFormatterTestsBase.cs} (100%)
 rename src/libraries/Common/tests/System/{RealParserTestsBase.netcoreapp.cs => RealParserTestsBase.cs} (100%)
 delete mode 100644 src/libraries/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.netcoreapp.cs

diff --git a/src/libraries/Common/tests/System/RealFormatterTestsBase.netcoreapp.cs b/src/libraries/Common/tests/System/RealFormatterTestsBase.cs
similarity index 100%
rename from src/libraries/Common/tests/System/RealFormatterTestsBase.netcoreapp.cs
rename to src/libraries/Common/tests/System/RealFormatterTestsBase.cs
diff --git a/src/libraries/Common/tests/System/RealParserTestsBase.netcoreapp.cs b/src/libraries/Common/tests/System/RealParserTestsBase.cs
similarity index 100%
rename from src/libraries/Common/tests/System/RealParserTestsBase.netcoreapp.cs
rename to src/libraries/Common/tests/System/RealParserTestsBase.cs
diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
index bc6b773..f0a6206 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
@@ -128,13 +128,12 @@
     <Compile Include="TypeDescriptionProviderTests.cs" />
     <Compile Include="TypeDescriptionProviderAttributeTests.cs" />
     <Compile Include="TypeDescriptorTests.cs" />
-    <Compile Include="TypeDescriptorTests.netcoreapp.cs" Condition="'$(TargetsNetCoreApp)' == 'true'" />
     <Compile Include="TypeListConverterTests.cs" />
     <Compile Include="UInt16ConverterTests.cs" />
     <Compile Include="UInt32ConverterTests.cs" />
     <Compile Include="UInt64ConverterTests.cs" />
     <Compile Include="UriTypeConverterTests.cs" />
-    <Compile Include="VersionConverterTests.cs" Condition="'$(TargetsNetCoreApp)' == 'true'" />
+    <Compile Include="VersionConverterTests.cs" />
     <Compile Include="Drawing\StringTypeConverterTestBase.cs" />
     <Compile Include="TimerTests.cs" />
     <Compile Include="ContainerTests.cs" />
diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.cs b/src/libraries/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.cs
index 7054440..de2353a 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.cs
+++ b/src/libraries/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.cs
@@ -11,7 +11,7 @@ using Xunit;
 
 namespace System.ComponentModel.Tests
 {
-    public partial class TypeDescriptorTests
+    public class TypeDescriptorTests
     {
         [Fact]
         public void AddProvider_InvokeObject_GetProviderReturnsExpected()
@@ -484,6 +484,8 @@ namespace System.ComponentModel.Tests
         [InlineData(typeof(ClassIDerived), typeof(IBaseConverter))]
         [InlineData(typeof(Uri), typeof(UriTypeConverter))]
         [InlineData(typeof(CultureInfo), typeof(CultureInfoConverter))]
+        [InlineData(typeof(Version), typeof(VersionConverter))]
+        [InlineData(typeof(IComponent), typeof(ComponentConverter))]
         public static void GetConverter(Type targetType, Type resultConverterType)
         {
             TypeConverter converter = TypeDescriptor.GetConverter(targetType);
@@ -1098,7 +1100,6 @@ namespace System.ComponentModel.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework throws NullReferenceException")]
         public void SortDescriptorArray_Invoke_ReturnsExpected()
         {
             var notADescriptor1 = new object();
diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.netcoreapp.cs b/src/libraries/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.netcoreapp.cs
deleted file mode 100644
index 3fd584a..0000000
--- a/src/libraries/System.ComponentModel.TypeConverter/tests/TypeDescriptorTests.netcoreapp.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Xunit;
-
-namespace System.ComponentModel.Tests
-{
-    public partial class TypeDescriptorTests
-    {
-        [Theory]
-        [InlineData(typeof(Version), typeof(VersionConverter))]
-        [InlineData(typeof(IComponent), typeof(ComponentConverter))]
-        public static void GetConverter_NetCoreApp(Type targetType, Type resultConverterType) =>
-            GetConverter(targetType, resultConverterType);
-    }
-}
diff --git a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
index aebd4ba..b094bda 100644
--- a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
+++ b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
@@ -15,9 +15,9 @@
     <Compile Include="MemoryMarshal\AsReadOnlyRef.cs" />
     <Compile Include="MemoryMarshal\CreateSpan.cs" />
     <Compile Include="MemoryMarshal\CreateReadOnlySpan.cs" />
-    <Compile Include="$(CommonPath)..\tests\System\RealFormatterTestsBase.netcoreapp.cs" Link="ParsersAndFormatters\Formatter\RealFormatterTestsBase.netcoreapp.cs" />
+    <Compile Include="$(CommonPath)..\tests\System\RealFormatterTestsBase.cs" Link="ParsersAndFormatters\Formatter\RealFormatterTestsBase.cs" />
     <Compile Include="ParsersAndFormatters\Formatter\RealFormatterTests.cs" />
-    <Compile Include="$(CommonPath)..\tests\System\RealParserTestsBase.netcoreapp.cs" Link="ParsersAndFormatters\Parser\RealParserTestsBase.netcoreapp.cs" />
+    <Compile Include="$(CommonPath)..\tests\System\RealParserTestsBase.cs" Link="ParsersAndFormatters\Parser\RealParserTestsBase.cs" />
     <Compile Include="ParsersAndFormatters\Parser\RealParserTests.cs" />
     <Compile Include="ReadOnlySpan\Contains.byte.cs" />
     <Compile Include="ReadOnlySpan\Contains.T.cs" />
diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
index a31bad6..7e0e48e 100644
--- a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
+++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
@@ -131,10 +131,11 @@
     <Compile Include="System\SByteTests.cs" />
     <Compile Include="System\SingleTests.cs" />
     <Compile Include="System\StackOverflowExceptionTests.cs" />
+    <Compile Include="System\String.SplitTests.cs" />
     <Compile Include="System\StringComparerTests.cs" />
     <Compile Include="System\StringGetHashCodeTests.cs" />
+    <Compile Include="System\StringSplitExtensions.cs" />
     <Compile Include="System\StringTests.cs" />
-    <Compile Include="System\String.SplitTests.cs" />
     <Compile Include="System\SystemExceptionTests.cs" />
     <Compile Include="System\TimeoutExceptionTests.cs" />
     <Compile Include="System\TimeSpanTests.cs" />
@@ -256,14 +257,11 @@
     <Compile Include="System\Text\Unicode\Utf8Tests.cs" />
     <Compile Include="System\Text\Unicode\Utf8UtilityTests.ValidateBytes.cs" />
     <Compile Include="System\ArgIteratorTests.cs" />
-    <Compile Include="$(CommonPath)..\tests\System\RealFormatterTestsBase.netcoreapp.cs" Link="System\RealFormatterTestsBase.netcoreapp.cs" />
+    <Compile Include="$(CommonPath)..\tests\System\RealFormatterTestsBase.cs" Link="System\RealFormatterTestsBase.cs" />
     <Compile Include="System\RealFormatterTests.cs" />
-    <Compile Include="$(CommonPath)..\tests\System\RealParserTestsBase.netcoreapp.cs" Link="System\RealParserTestsBase.netcoreapp.cs" />
+    <Compile Include="$(CommonPath)..\tests\System\RealParserTestsBase.cs" Link="System\RealParserTestsBase.cs" />
     <Compile Include="System\RealParserTests.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNetCoreApp)' != 'true'">
-    <Compile Include="System\StringSplitExtensions.cs" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.Generic.Serialization.Tests.cs">
       <Link>Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs</Link>
-- 
2.7.4