Fixed naming of projects and solutions and removed netcore seperate namespace #6 #4

solutions/vs2017/CSharpCore1TestDemo/CSharpCore1TestDemo.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2003
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3CoreTestDemo", "NUnit3CoreTestDemo.csproj", "{38F3367C-274D-4B31-9D38-69F949000A61}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpCore1TestDemo", "CSharpCore1TestDemo.csproj", "{38F3367C-274D-4B31-9D38-69F949000A61}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

solutions/vs2017/CSharpCore2TestDemo/CSharpCore2TestDemo.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2003
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3Core2TestDemo", "NUnit3Core2TestDemo.csproj", "{38F3367C-274D-4B31-9D38-69F949000A61}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpCore2TestDemo", "CSharpCore2TestDemo.csproj", "{38F3367C-274D-4B31-9D38-69F949000A61}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/csharp/AsyncTests.cs

@@ -1,13 +1,9 @@
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-#if NETCOREAPP1_1 || NETCOREAPP2_0
-namespace NUnitCoreTestDemo
-#else
+
 namespace NUnitTestDemo
-#endif
 {
 	public class AsyncTests
 	{

src/csharp/ExpectedOutcomeAttributes.cs

@@ -1,15 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NUnit.Framework;
+using NUnit.Framework;
+
 
-#if NETCOREAPP1_1 || NETCOREAPP2_0
-namespace NUnitCoreTestDemo
-#else
 namespace NUnitTestDemo
-#endif
 {
     public class ExpectPassAttribute : PropertyAttribute
     {

src/csharp/GenericTests.cs

@@ -1,14 +1,9 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 using NUnit.Framework;
 
-#if NETCOREAPP1_1 || NETCOREAPP2_0
-namespace NUnitCoreTestDemo
-#else
+
 namespace NUnitTestDemo
-#endif
 {
     [TestFixture(typeof(int))]
     public class GenericTests<T>

src/csharp/InheritedTestTests.cs

@@ -1,11 +1,6 @@
-using System;
-using NUnit.Framework;
+using NUnit.Framework;
 
-#if NETCOREAPP1_1 || NETCOREAPP2_0
-namespace NUnitCoreTestDemo
-#else
 namespace NUnitTestDemo
-#endif
 {
     public abstract class InheritedTestBaseClass
     {

src/csharp/OneTimeSetUpTests.cs

@@ -1,13 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NUnit.Framework;
+using NUnit.Framework;
+
 
-#if NETCOREAPP1_1 || NETCOREAPP2_0
-namespace NUnitCoreTestDemo
-#else
 namespace NUnitTestDemo
-#endif
 {
     [TestFixture, ExpectPass]
     public class OneTimeSetUpTests

src/csharp/ParameterizedTests.cs

@@ -1,11 +1,8 @@
 using System;
 using NUnit.Framework;
 
-#if NETCOREAPP1_1 || NETCOREAPP2_0
-namespace NUnitCoreTestDemo
-#else
+
 namespace NUnitTestDemo
-#endif
 {
     public class ParameterizedTests
     {

src/csharp/SetUpFixtureTests.cs

@@ -1,13 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NUnit.Framework;
+using NUnit.Framework;
+
 
-#if NETCOREAPP1_1 || NETCOREAPP2_0
-namespace NUnitCoreTestDemo.SetUpFixture
-#else
 namespace NUnitTestDemo.SetUpFixture
-#endif
 {
     [SetUpFixture]
     public class SetUpFixture

src/csharp/SimpleTests.cs

@@ -2,11 +2,8 @@
 using NUnit.Framework;
 
 
-#if NETCOREAPP1_1 || NETCOREAPP2_0
-namespace NUnitCoreTestDemo
-#else
+
 namespace NUnitTestDemo
-#endif
 {
     public class SimpleTests
     {

src/csharp/TextOutputTests.cs

@@ -1,16 +1,11 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using System.Text;
 using NUnit.Framework;
 using System.Diagnostics;
 
-#if NETCOREAPP1_1 || NETCOREAPP2_0
-namespace NUnitCoreTestDemo
-#else
+
 namespace NUnitTestDemo
-#endif
 {
     [ExpectPass]
     public class TextOutputTests

src/csharp/Theories.cs

@@ -1,18 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NUnit.Framework;
+using NUnit.Framework;
+
 
-#if NETCOREAPP1_1 || NETCOREAPP2_0
-namespace NUnitCoreTestDemo
-#else
 namespace NUnitTestDemo
-#endif
 {
     public class Theories
     {
         [Datapoints]
-        int[] data = new int[] { 0, 1, 42 };
+        int[] data = { 0, 1, 42 };
 
         [Theory, ExpectPass]
         public void Theory_AllCasesSucceed(int a, int b)