Fixed naming of projects and solutions and removed netcore seperate n…

…amespace #6 #4
nunit · Dec 25, 2017 · a6f28a0 · a6f28a0
1 parent f71bd31
commit a6f28a0
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 70 deletions.
diff --git a/...it3CoreTestDemo/NUnit3CoreTestDemo.csproj → ...pCore1TestDemo/CSharpCore1TestDemo.csproj b/...it3CoreTestDemo/NUnit3CoreTestDemo.csproj → ...pCore1TestDemo/CSharpCore1TestDemo.csproj
diff --git a/...NUnit3CoreTestDemo/NUnit3CoreTestDemo.sln → ...harpCore1TestDemo/CSharpCore1TestDemo.sln b/...NUnit3CoreTestDemo/NUnit3CoreTestDemo.sln → ...harpCore1TestDemo/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

diff --git a/...3Core2TestDemo/NUnit3Core2TestDemo.csproj → ...pCore2TestDemo/CSharpCore2TestDemo.csproj b/...3Core2TestDemo/NUnit3Core2TestDemo.csproj → ...pCore2TestDemo/CSharpCore2TestDemo.csproj
diff --git a/...nit3Core2TestDemo/NUnit3Core2TestDemo.sln → ...harpCore2TestDemo/CSharpCore2TestDemo.sln b/...nit3Core2TestDemo/NUnit3Core2TestDemo.sln → ...harpCore2TestDemo/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

diff --git a/src/csharp/AsyncTests.cs b/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
 	{

diff --git a/src/csharp/ExpectedOutcomeAttributes.cs b/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;
-
-#if NETCOREAPP1_1 || NETCOREAPP2_0
-namespace NUnitCoreTestDemo
-#else
+using NUnit.Framework;
+
+
 namespace NUnitTestDemo
-#endif
 {
     public class ExpectPassAttribute : PropertyAttribute
     {

diff --git a/src/csharp/GenericTests.cs b/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>

diff --git a/src/csharp/InheritedTestTests.cs b/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
     {

diff --git a/src/csharp/OneTimeSetUpTests.cs b/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

diff --git a/src/csharp/ParameterizedTests.cs b/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
     {

diff --git a/src/csharp/SetUpFixtureTests.cs b/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

diff --git a/src/csharp/SimpleTests.cs b/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
     {

diff --git a/src/csharp/TextOutputTests.cs b/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

diff --git a/src/csharp/Theories.cs b/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)