diff --git a/src/NUnitEngine/mock-assembly/mock-assembly.netstandard.csproj b/src/NUnitEngine/mock-assembly/mock-assembly.netstandard.csproj
index befc7558a..d5c579962 100644
--- a/src/NUnitEngine/mock-assembly/mock-assembly.netstandard.csproj
+++ b/src/NUnitEngine/mock-assembly/mock-assembly.netstandard.csproj
@@ -3,23 +3,13 @@
NUnit.Tests
netstandard1.6
mock-assembly
- obj\$(Configuration)\netstandard\
true
..\..\nunit.snk
- False
- false
- false
- false
- false
- false
- false
- false
- false
- false
+ false
$(PackageVersion)
diff --git a/src/NUnitEngine/nunit.engine.api/Extensibility/IFrameworkDriver.cs b/src/NUnitEngine/nunit.engine.api/Extensibility/IFrameworkDriver.cs
index 47e813559..be1f9d8c2 100644
--- a/src/NUnitEngine/nunit.engine.api/Extensibility/IFrameworkDriver.cs
+++ b/src/NUnitEngine/nunit.engine.api/Extensibility/IFrameworkDriver.cs
@@ -8,10 +8,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -40,7 +40,7 @@ public interface IFrameworkDriver
/// used to ensure that test ids are unique across drivers.
///
string ID { get; set; }
-
+
///
/// Loads the tests in an assembly.
///
diff --git a/src/NUnitEngine/nunit.engine.netstandard/nunit.engine.netstandard.csproj b/src/NUnitEngine/nunit.engine.netstandard/nunit.engine.netstandard.csproj
index c0064fbe3..6bd5f0bed 100644
--- a/src/NUnitEngine/nunit.engine.netstandard/nunit.engine.netstandard.csproj
+++ b/src/NUnitEngine/nunit.engine.netstandard/nunit.engine.netstandard.csproj
@@ -3,7 +3,6 @@
netstandard1.3
NUnit.Engine
nunit.engine.netstandard
- obj\$(Configuration)\netstandard\
3.7.0-dev
@@ -12,16 +11,8 @@
..\..\nunit.snk
True
- false
- false
- false
- false
- false
- false
- false
- false
- false
- $(PackageVersion)
+ false
+ $(PackageVersion)
http://nunit.org/nuget/nunit3-license.txt
http://nunit.org
https://cdn.rawgit.com/nunit/resources/master/images/icon/nunit_256.png
diff --git a/src/NUnitEngine/nunit.engine.tests.netstandard/nunit.engine.tests.netstandard.csproj b/src/NUnitEngine/nunit.engine.tests.netstandard/nunit.engine.tests.netstandard.csproj
index b75f3b1d0..12663a49c 100644
--- a/src/NUnitEngine/nunit.engine.tests.netstandard/nunit.engine.tests.netstandard.csproj
+++ b/src/NUnitEngine/nunit.engine.tests.netstandard/nunit.engine.tests.netstandard.csproj
@@ -5,16 +5,7 @@
netcoreapp1.1
True
..\..\nunit.snk
- False
- false
- false
- false
- false
- false
- false
- false
- false
- false
+ false
$(PackageVersion)
diff --git a/src/NUnitEngine/nunit.engine.tests/Internal/PathUtilTests.cs b/src/NUnitEngine/nunit.engine.tests/Internal/PathUtilTests.cs
index f8dc40913..62f7c2d02 100644
--- a/src/NUnitEngine/nunit.engine.tests/Internal/PathUtilTests.cs
+++ b/src/NUnitEngine/nunit.engine.tests/Internal/PathUtilTests.cs
@@ -8,10 +8,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -78,11 +78,11 @@ public void Canonicalize()
PathUtils.Canonicalize( @"C:\folder1\.\folder2\..\file.tmp" ) );
Assert.AreEqual( @"folder1\file.tmp",
PathUtils.Canonicalize( @"folder1\.\folder2\..\file.tmp" ) );
- Assert.AreEqual( @"folder1\file.tmp",
+ Assert.AreEqual( @"folder1\file.tmp",
PathUtils.Canonicalize( @"folder1\folder2\.\..\file.tmp" ) );
- Assert.AreEqual( @"file.tmp",
+ Assert.AreEqual( @"file.tmp",
PathUtils.Canonicalize( @"folder1\folder2\..\.\..\file.tmp" ) );
- Assert.AreEqual( @"file.tmp",
+ Assert.AreEqual( @"file.tmp",
PathUtils.Canonicalize( @"folder1\folder2\..\..\..\file.tmp" ) );
}
@@ -91,7 +91,7 @@ public void Canonicalize()
[Platform(Exclude="Linux,UNIX,MacOSX")]
public void RelativePath()
{
- Assert.AreEqual( @"folder2\folder3", PathUtils.RelativePath(
+ Assert.AreEqual( @"folder2\folder3", PathUtils.RelativePath(
@"c:\folder1", @"c:\folder1\folder2\folder3" ) );
Assert.AreEqual( @"..\folder2\folder3", PathUtils.RelativePath(
@"c:\folder1", @"c:\folder2\folder3" ) );
@@ -111,11 +111,11 @@ public void RelativePath()
// First filePath consisting just of a root:
Assert.AreEqual(@"folder1\folder2", PathUtils.RelativePath(
@"C:\", @"C:\folder1\folder2"));
-
+
// Trailing directory separator in first filePath shall be ignored:
Assert.AreEqual(@"folder2\folder3", PathUtils.RelativePath(
@"c:\folder1\", @"c:\folder1\folder2\folder3"));
-
+
// Case-insensitive behavior, preserving 2nd filePath directories in result:
Assert.AreEqual(@"Folder2\Folder3", PathUtils.RelativePath(
@"C:\folder1", @"c:\folder1\Folder2\Folder3"));
@@ -164,24 +164,24 @@ public void Canonicalize()
PathUtils.Canonicalize( "/folder1/./folder2/../file.tmp" ) );
Assert.AreEqual( "folder1/file.tmp",
PathUtils.Canonicalize( "folder1/./folder2/../file.tmp" ) );
- Assert.AreEqual( "folder1/file.tmp",
+ Assert.AreEqual( "folder1/file.tmp",
PathUtils.Canonicalize( "folder1/folder2/./../file.tmp" ) );
- Assert.AreEqual( "file.tmp",
+ Assert.AreEqual( "file.tmp",
PathUtils.Canonicalize( "folder1/folder2/.././../file.tmp" ) );
- Assert.AreEqual( "file.tmp",
+ Assert.AreEqual( "file.tmp",
PathUtils.Canonicalize( "folder1/folder2/../../../file.tmp" ) );
}
[Test]
public void RelativePath()
{
- Assert.AreEqual( "folder2/folder3",
+ Assert.AreEqual( "folder2/folder3",
PathUtils.RelativePath( "/folder1", "/folder1/folder2/folder3" ) );
- Assert.AreEqual( "../folder2/folder3",
+ Assert.AreEqual( "../folder2/folder3",
PathUtils.RelativePath( "/folder1", "/folder2/folder3" ) );
- Assert.AreEqual( "bin/debug",
+ Assert.AreEqual( "bin/debug",
PathUtils.RelativePath( "/folder1", "bin/debug" ) );
- Assert.AreEqual( "../other/folder",
+ Assert.AreEqual( "../other/folder",
PathUtils.RelativePath( "/folder", "/other/folder" ) );
Assert.AreEqual( "../../d",
PathUtils.RelativePath( "/a/b/c", "/a/d" ) );
@@ -189,15 +189,15 @@ public void RelativePath()
PathUtils.RelativePath("/a/b", "/a/b"));
Assert.AreEqual(string.Empty,
PathUtils.RelativePath("/", "/"));
-
+
// First filePath consisting just of a root:
Assert.AreEqual("folder1/folder2", PathUtils.RelativePath(
"/", "/folder1/folder2"));
-
+
// Trailing directory separator in first filePath shall be ignored:
Assert.AreEqual("folder2/folder3", PathUtils.RelativePath(
"/folder1/", "/folder1/folder2/folder3"));
-
+
// Case-sensitive behavior:
Assert.AreEqual("../Folder1/Folder2/folder3",
PathUtils.RelativePath("/folder1", "/Folder1/Folder2/folder3"),