Update based on code review

nunit · Apr 28, 2017 · ba194ae · ba194ae
1 parent 5ee708f
commit ba194ae
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 53 deletions.
diff --git a/src/NUnitEngine/mock-assembly/mock-assembly.netstandard.csproj b/src/NUnitEngine/mock-assembly/mock-assembly.netstandard.csproj
@@ -3,23 +3,13 @@
     <RootNamespace>NUnit.Tests</RootNamespace>
     <TargetFramework>netstandard1.6</TargetFramework>
     <AssemblyName>mock-assembly</AssemblyName>
-    <IntermediateOutputPath>obj\$(Configuration)\netstandard\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Version>$(PackageVersion)</Version>
   </PropertyGroup>
   <ItemGroup>

diff --git 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.
         /// </summary>
         string ID { get; set; }
-        
+
         /// <summary>
         /// Loads the tests in an assembly.
         /// </summary>

diff --git a/src/NUnitEngine/nunit.engine.netstandard/nunit.engine.netstandard.csproj b/src/NUnitEngine/nunit.engine.netstandard/nunit.engine.netstandard.csproj
@@ -3,7 +3,6 @@
     <TargetFramework>netstandard1.3</TargetFramework>
     <RootNamespace>NUnit.Engine</RootNamespace>
     <AssemblyName>nunit.engine.netstandard</AssemblyName>
-    <IntermediateOutputPath>obj\$(Configuration)\netstandard\</IntermediateOutputPath>
     <PackageVersion Condition=" '$(PackageVersion)' == '' ">3.7.0-dev</PackageVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -12,16 +11,8 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>    
-    <Version>$(PackageVersion)</Version>    
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Version>$(PackageVersion)</Version>
     <PackageLicenseUrl>http://nunit.org/nuget/nunit3-license.txt</PackageLicenseUrl>
     <PackageProjectUrl>http://nunit.org</PackageProjectUrl>
     <PackageIconUrl>https://cdn.rawgit.com/nunit/resources/master/images/icon/nunit_256.png</PackageIconUrl>

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
@@ -5,16 +5,7 @@
     <TargetFramework>netcoreapp1.1</TargetFramework>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>False</DelaySign>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Version>$(PackageVersion)</Version>
   </PropertyGroup>
 

diff --git 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,40 +164,40 @@ 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" ) );
             Assert.AreEqual(string.Empty,
                 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"),