Merge pull request #766 from nunit/prepare317

OsirisTerje · web-flow · commit a8d20348242d · 2020-07-11T20:51:27.000+02:00
Prepare for 3.17 release
diff --git a/README.md b/README.md
@@ -29,9 +29,9 @@ or raise an issue [![](https://img.shields.io/github/issues/nunit/NUnit3-vs-Adap
 
 ## Documentation
 
-The [NUnit3TestAdapter wiki](https://github.com/nunit/docs/wiki/Visual-Studio-Test-Adapter) is the best place to start.
+The [NUnit3TestAdapter wiki](https://docs.nunit.org/articles/vs-test-adapter/Index.html) is the best place to start.
 
-Also check the [release notes](https://github.com/nunit/docs/wiki/Adapter-Release-Notes).
+Also check the [release notes](https://docs.nunit.org/articles/vs-test-adapter/Adapter-Release-Notes.html).
 
 
 
diff --git a/nuget/NUnit3TestAdapter.nuspec b/nuget/NUnit3TestAdapter.nuspec
@@ -19,7 +19,7 @@
 
           Note that with this package you should not install the VSIX adapter package.
         </description>
-        <releaseNotes>This release works with NUnit 3.0 and higher only.  Also see  https://github.com/nunit/docs/wiki/Adapter-Release-Notes  </releaseNotes>
+        <releaseNotes>This release works with NUnit 3.0 and higher only.  Also see  https://docs.nunit.org/articles/vs-test-adapter/Adapter-Release-Notes.html  </releaseNotes>
         <copyright>Copyright (c) 2011-2020 Charlie Poole, 2014-2020 Terje Sandstrom</copyright>
         <language>en-US</language>
         <tags>test visualstudio testadapter nunit nunit3 dotnet</tags>
diff --git a/src/NUnit.TestAdapter.Tests.Acceptance/Utils.cs b/src/NUnit.TestAdapter.Tests.Acceptance/Utils.cs
@@ -69,7 +69,8 @@ public static DirectoryMutex CreateMutexDirectory(string parentDirectory, string
 
             for (var id = 1; ; id++)
             {
-                var path = Path.Combine(parentDirectory,
+                var path = Path.Combine(
+                    parentDirectory,
                     safeName is null ? id.ToString() :
                     id == 1 ? safeName :
                     safeName + "_" + id);
diff --git a/src/NUnit.TestAdapter.Tests.Acceptance/WorkspaceTools/IsolatedWorkspace.cs b/src/NUnit.TestAdapter.Tests.Acceptance/WorkspaceTools/IsolatedWorkspace.cs
@@ -16,7 +16,7 @@ public sealed partial class IsolatedWorkspace : IDisposable
 
         public IsolatedWorkspace(DirectoryMutex directoryMutex, ToolResolver toolResolver)
         {
-            this.directoryMutex = directoryMutex ?? throw new ArgumentNullException(nameof(toolResolver)); ;
+            this.directoryMutex = directoryMutex ?? throw new ArgumentNullException(nameof(toolResolver));
             this.toolResolver = toolResolver ?? throw new ArgumentNullException(nameof(toolResolver));
         }
 
diff --git a/src/NUnit3TestAdapterInstall/source.extension.vsixmanifest b/src/NUnit3TestAdapterInstall/source.extension.vsixmanifest
@@ -6,7 +6,7 @@
         <Description xml:space="preserve">NUnit 3 adapter for running tests in Visual Studio. Works with NUnit 3.x.
 For running NUnit 2 tests, use the NUnit 2 adapter.
 Note that use of VSIX Test adapters are deprecated in VS 2019, we recommend you to use the nuget versions of the adapter. </Description>
-        <MoreInfo>https://github.com/nunit/docs/wiki/Visual-Studio-Test-Adapter</MoreInfo>
+        <MoreInfo>https://docs.nunit.org/articles/vs-test-adapter/Index.html</MoreInfo>
         <License>license.rtf</License>
         <Icon>nunit_90.png</Icon>
         <PreviewImage>preview.png</PreviewImage>
diff --git a/src/NUnitTestAdapter/NUnitEngine/DiscoveryExtensions.cs b/src/NUnitTestAdapter/NUnitEngine/DiscoveryExtensions.cs
@@ -6,7 +6,6 @@ namespace NUnit.VisualStudio.TestAdapter.NUnitEngine
 {
     public class DiscoveryExtensions
     {
-
         public TestConverter TestConverter { get; private set; }
 
         public IList<TestCase> Convert(NUnitResults discoveryResults, ITestLogger logger, string assemblyPath, IAdapterSettings settings)
diff --git a/src/NUnitTestAdapter/NUnitEngine/NUnitTestCase.cs b/src/NUnitTestAdapter/NUnitEngine/NUnitTestCase.cs
@@ -43,7 +43,7 @@ public enum eRunState
             NA,
             Runnable,
             Explicit
-        };
+        }
 
         public bool IsTestCase => !IsNull && Node.Name == "test-case";
         public bool IsParameterizedMethod => Type == "ParameterizedMethod";
diff --git a/src/NUnitTestAdapter/NUnitEngine/NUnitTestEvent.cs b/src/NUnitTestAdapter/NUnitEngine/NUnitTestEvent.cs
@@ -170,7 +170,6 @@ public IEnumerable<NUnitAttachment> NUnitAttachments
                 return nUnitAttachments;
             }
         }
-
     }
 
 
diff --git a/src/NUnitTestAdapter/NUnitEngine/NUnitTestEventTestCase.cs b/src/NUnitTestAdapter/NUnitEngine/NUnitTestEventTestCase.cs
@@ -2,7 +2,6 @@
 
 namespace NUnit.VisualStudio.TestAdapter.NUnitEngine
 {
-
     public interface INUnitTestEventTestCase : INUnitTestEvent
     {
         NUnitFailure Failure { get; }
diff --git a/src/NUnitTestAdapter/NUnitEngine/NUnitTestEventTestOutput.cs b/src/NUnitTestAdapter/NUnitEngine/NUnitTestEventTestOutput.cs
@@ -87,6 +87,5 @@ public NUnitTestEventTestOutput(XmlNode node) : base(node)
         // Notes:
         // The input doesnt have any id, but used testid instead.
         // Properties FullName and Name is not in use
-
     }
 }
diff --git a/src/NUnitTestAdapter/NUnitTestAdapter.cs b/src/NUnitTestAdapter/NUnitTestAdapter.cs
@@ -228,7 +228,7 @@ protected TestPackage CreateTestPackage(string assemblyName, IGrouping<string, T
 
             if (Settings.StopOnError)
                 package.Settings[PackageSettings.StopOnError] = true;
-            
+
             if (Settings.SkipNonTestAssemblies)
                 package.Settings[PackageSettings.SkipNonTestAssemblies] = true;
 
diff --git a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("NUnit 3 Test Adapter for Visual Studio")]
-[assembly: AssemblyDescription("A package containing the NUnit 3 TestAdapter for Visual Studio 2012 onwards.  With this package you don't need to install the VSIX adapter package, and you don't need to upload the adapter to your TFS server.\r\n        \r\nNote that this package ONLY contains the adapter, not the NUnit framework.  You must also get the framework. You only need one such package for a solution. \r\n\r\nThe package works with Visual Studio 2012 and newer.\r\n")]
+[assembly: AssemblyDescription("A package containing the NUnit 3 TestAdapter for Visual Studio 2012 onwards.  With this package you don't need to install the VSIX adapter package, and you don't need to upload the adapter to your Azure DevOps server.\r\n        \r\nNote that this package ONLY contains the adapter, not the NUnit framework.  You must also get the framework. You only need one such package for a solution. \r\n\r\nThe package works with Visual Studio 2012 and newer.\r\n")]
 [assembly: AssemblyCompany("NUnit Project")]
 [assembly: AssemblyProduct("NUnit3TestAdapter")]
 [assembly: AssemblyCopyright("Copyright © 2011-2020 Charlie Poole, 2014-2020 Terje Sandstrom")]
diff --git a/src/NUnitTestAdapter/TestConverter.cs b/src/NUnitTestAdapter/TestConverter.cs
@@ -201,7 +201,7 @@ private TestCase MakeTestCaseFromXmlNode(NUnitTestCase testNode)
                                     new Uri(NUnitTestAdapter.ExecutorUri),
                                     _sourceAssembly)
             {
-                DisplayName = CreateDisplayName(fullyQualifiedName,testNode.Name), // .Replace(".",":"), //"N:Name -> MS:DisplayName", // testNode.Name,
+                DisplayName = CreateDisplayName(fullyQualifiedName, testNode.Name), // .Replace(".",":"), //"N:Name -> MS:DisplayName", // testNode.Name,
                 CodeFilePath = null,
                 LineNumber = 0,
             };
diff --git a/src/NUnitTestAdapterTests/AdapterSettingsTests.cs b/src/NUnitTestAdapterTests/AdapterSettingsTests.cs
@@ -397,7 +397,6 @@ public void MapWarningToTestsFailing(string setting)
         public void MapWarningToTestsDefault()
         {
             _settings.Load("");
-           
         }
 
         [TestCase("Name", DisplayNameOptions.Name)]
@@ -432,9 +431,6 @@ public void TestDefaults()
                 Assert.That(_settings.DisplayName, Is.EqualTo(DisplayNameOptions.Name));
                 Assert.That(_settings.MapWarningTo, Is.EqualTo(TestOutcome.Skipped));
             });
-            
         }
-
-
     }
 }
diff --git a/src/NUnitTestAdapterTests/TestConverterTests.cs b/src/NUnitTestAdapterTests/TestConverterTests.cs
@@ -25,8 +25,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml;
-//using System.Xml;
-
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using NSubstitute;
 using NUnit.Framework;

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,8 @@ public static DirectoryMutex CreateMutexDirectory(string parentDirectory, string`
`69`	`69`
`70`	`70`	`for (var id = 1; ; id++)`
`71`	`71`	`{`
`72`		`- var path = Path.Combine(parentDirectory,`
	`72`	`+ var path = Path.Combine(`
	`73`	`+ parentDirectory,`
`73`	`74`	`safeName is null ? id.ToString() :`
`74`	`75`	`id == 1 ? safeName :`
`75`	`76`	`safeName + "_" + id);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public sealed partial class IsolatedWorkspace : IDisposable`
`16`	`16`
`17`	`17`	`public IsolatedWorkspace(DirectoryMutex directoryMutex, ToolResolver toolResolver)`
`18`	`18`	`{`
`19`		`- this.directoryMutex = directoryMutex ?? throw new ArgumentNullException(nameof(toolResolver)); ;`
	`19`	`+ this.directoryMutex = directoryMutex ?? throw new ArgumentNullException(nameof(toolResolver));`
`20`	`20`	`this.toolResolver = toolResolver ?? throw new ArgumentNullException(nameof(toolResolver));`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ namespace NUnit.VisualStudio.TestAdapter.NUnitEngine`
`6`	`6`	`{`
`7`	`7`	`public class DiscoveryExtensions`
`8`	`8`	`{`
`9`		`-`
`10`	`9`	`public TestConverter TestConverter { get; private set; }`
`11`	`10`
`12`	`11`	`public IList<TestCase> Convert(NUnitResults discoveryResults, ITestLogger logger, string assemblyPath, IAdapterSettings settings)`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,6 @@ public IEnumerable<NUnitAttachment> NUnitAttachments`
`170`	`170`	`return nUnitAttachments;`
`171`	`171`	`}`
`172`	`172`	`}`
`173`		`-`
`174`	`173`	`}`
`175`	`174`
`176`	`175`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace NUnit.VisualStudio.TestAdapter.NUnitEngine`
`4`	`4`	`{`
`5`		`-`
`6`	`5`	`public interface INUnitTestEventTestCase : INUnitTestEvent`
`7`	`6`	`{`
`8`	`7`	`NUnitFailure Failure { get; }`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,5 @@ public NUnitTestEventTestOutput(XmlNode node) : base(node)`
`87`	`87`	`// Notes:`
`88`	`88`	`// The input doesnt have any id, but used testid instead.`
`89`	`89`	`// Properties FullName and Name is not in use`
`90`		`-`
`91`	`90`	`}`
`92`	`91`	`}`