Merge pull request #590 from nunit/release310

Release 3.10

.editorconfig

@@ -11,6 +11,6 @@ root = true
 indent_style = space
 indent_size = 4
 
-[*.{proj,csproj,vcxproj,xproj,json,config,nuspec,xml}]
+[*.{proj,csproj,vcxproj,xproj,json,config,nuspec,xml,yml}]
 indent_style = space
 indent_size = 2

.travis.yml

@@ -1,25 +1,31 @@
 language: csharp
 sudo: required
 
-dotnet: 2.1.4 # SDK version; includes runtime version 2.0.5. Need 2.0+ for netcoreapp2.0 tests.
-
+dotnet: 2.1.401
 mono: 5.10.0 # Need 5.2+ for the included MSBuild.
 
 matrix:
   include:
     - os: linux
       install:
-        - sudo apt-get install dotnet-sharedframework-microsoft.netcore.app-1.1.6
-
-    - os: osx
-      install:
-        - curl https://download.microsoft.com/download/A/7/E/A7EF2AFF-F77B-4F77-A21B-0F7BD09A4065/dotnet-osx-x64.1.1.6.pkg -O
-        - sudo installer -pkg dotnet-osx-x64.1.1.6.pkg -target /
+        - wget -q https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb
+        - sudo dpkg -i packages-microsoft-prod.deb
+        - sudo apt-get install apt-transport-https
+        - sudo apt-get update
+        - sudo apt-get install dotnet-sharedframework-microsoft.netcore.app-1.1.2
+        - sudo apt-get install dotnet-runtime-2.0.6
 
+# macOS package restore currently taking >30 mins on Travis
+#    - os: osx
       # .NET Core 2 requires OSX 10.12+
       # https://github.com/dotnet/core/blob/master/release-notes/2.0/2.0-supported-os.md#macos
       # https://docs.travis-ci.com/user/reference/osx/#OS-X-Version
-      osx_image: xcode9.1
+#      osx_image: xcode9.4
+#      install:
+#        - curl https://download.microsoft.com/download/D/0/2/D028801E-0802-43C8-9F9F-C7DB0A39B344/dotnet-osx-x64.1.1.2.pkg -O
+#        - sudo installer -pkg dotnet-osx-x64.1.1.2.pkg -target /
+#        - curl https://download.microsoft.com/download/8/D/A/8DA04DA7-565B-4372-BBCE-D44C7809A467/dotnet-runtime-2.0.6-osx-x64.pkg -O
+#        - sudo installer -pkg dotnet-runtime-2.0.6-osx-x64.pkg -target /
 
 script:
   - ./build.sh --target "Travis" --configuration "Release"

CHANGES.txt

@@ -1,4 +1,63 @@
-NUnit 3.9 - September 5, 2018
+NUnit Console 3.10 - March 24, 2019
+
+This release merges the .NET Standard version of the engine back into the nunit.engine
+NuGet package and adds a .NET Standard 2.0 version of the engine that re-enables most
+services and extensions. This deprecates the `nunit.engine.netstandard` NuGet package.
+Any test runners using the old .NET Standard version of the engine should switch to
+this release.
+
+The `--params` command line option which took multiple test parameters separated by
+a semi-colon is now deprecated in favor of the new `--testparam` command line option.
+One of the most common uses for test parameters was to pass connection strings into
+tests but this required workarounds to handle the semi-colons. Now you must pass in
+each test paramater separately using a `--testparam` or `-tp` option for each.
+
+Issues Resolved
+
+ * 8 TempResourceFile.Dispose causes run to hang
+ * 23 In nunit3-console you cannot pass parameters containing ';' because they always get splitted
+ * 178 Add date and time to console output
+ * 282 "Execution terminated after first error" does not fail the console runner
+ * 388 Merge .NET Standard Engine back into the main solution
+ * 389 Update Mono.Cecil to latest
+ * 433 All messages from EventListenerTextWriter goes to console output independent on stream name
+ * 454 Misc improvements to ExtensionServiceTests
+ * 455 Remove CF, Silverlight and PORTABLE functionality
+ * 464 NUnit Console Reports Successful Exit Code When there is an Exception on Dispose
+ * 473 ArgumentException: DTD is prohibited in this XML document
+ * 476 .NET Standard engine to load extensions
+ * 479 Merge .NET Standard Engine code back into the main solution
+ * 483 Error in SetUpFixture does not result in non-zero exit code
+ * 485 Invalid integer arguments do not display properly in error message
+ * 493 Correct order of params to Guard.ArgumentValid()
+ * 498 Reset console colors after Ctrl-C
+ * 501 Create result directory if it does not exist
+ * 502 Remove unused method from build.cake
+ * 506 Dogfood NUnit.Analyzers via the nunit-console tests
+ * 508 Re-Enable OSX CI tests
+ * 515 Appveyor CI failing on master
+ * 518 Correct Refactoring Error
+ * 519 Break up multiple console error messages with colour
+ * 523 Reloading multiple files causes exception
+ * 524 .NET Standard 2.0 engine crashes when .NET Framework extensions are in Global NuGet Cache
+ * 525 Separate NuGet Restore for Appveyor build
+ * 531 Building a forked master branch results in publishing artifacts
+ * 533 Duplicate ids when loading a project
+ * 544 Deprecate nunit.netstandard.engine NuGet package
+ * 546 Cannot run a project file using --process:Separate
+ * 547 --labels=Before ignores --nocolor
+ * 556 Appveyor CI failing due to nuget restore
+ * 557 Disable CliFallbackFolder as a nuget source
+ * 562 Fix typo in comment
+ * 563 ProjectService is incorrectly initialized in agents
+ * 565 Eliminate -dbg suffix from version
+ * 566 SettingsService is not needed in agents
+ * 567 Unnecessary call to IProjectService
+ * 571 Space characters in the work directory path are not properly handled
+ * 583 NUnit Console NuGet Package Doesn't Load Extensions
+ * 587 Disable new MSBuild GenerateSupportedRuntime functionality, which breaks framework targetting
+
+NUnit Console 3.9 - September 5, 2018
 
 This release should stop the dreaded SocketException problem on shutdown. The
 console also no longer returns -5 when AppDomains fail to unload at the end of a
@@ -31,7 +90,7 @@ Issues Resolved
  * 456 NuGet Package : Add `repository` metadata.
  * 461 Use MSBuild /restore
 
-NUnit 3.8 - January 27, 2018
+NUnit Console 3.8 - January 27, 2018
 
 This release includes several fixes when unloading AppDomains and better error reporting. The
 aggregate NuGet packages also include updated versions of several extensions.
@@ -67,7 +126,7 @@ Issues Resolved
  * 350 Invalid assemblies no longer give an error message
  * 355 NuGet package links to outdated license
 
-NUnit 3.7 - July 13, 2017
+NUnit Console 3.7 - July 13, 2017
 
 Engine
 
@@ -106,7 +165,7 @@ Issues Resolved
  * 254 Correct misprint ".con" -> ".com"
  * 252 Console crashes when specifying both format and transform for result
 
-NUnit 3.6.1 - March 6, 2017
+NUnit Console 3.6.1 - March 6, 2017
 
 Engine
 
@@ -117,7 +176,7 @@ Issues Resolved
 
  * 168 Intermittent errors while running tests after updating to 3.6
 
-NUnit 3.6 - January 14, 2017
+NUnit Console 3.6 - January 14, 2017
 
 Console Runner
 
@@ -158,7 +217,7 @@ Issues Resolved
  * 157 Fix Detection of invalid framework when --inprocess
  * 159 Update extension versions in the NuSpec Files
 
-NUnit 3.5 - October 11, 2016
+NUnit Console 3.5 - October 11, 2016
 
 This is the first version of NUnit where the framework will be released separately from the
 console runner, engine and other extensions. From this point forward, the NUnit console and engine will be

CONTRIBUTING.md

@@ -45,7 +45,7 @@ A great place to start is by going through the [NUnit release notes](https://git
 
 We love pull requests, but would prefer that new contributors start with smaller issues and let us know before you contribute to prevent duplication of work.
 
-To help new contributors get their feet wet, we have marked a number of issues with the `easyfix` label. These are great places to start.
+To help new contributors get their feet wet, we have marked a number of issues with the [good first issue](https://github.com/nunit/nunit-console/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) label. These are great places to start.
 
 It is also a good idea to add a comment to an issue that you are working on to let everyone know. If you stop working on it, also please let us know.
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Charlie Poole, Rob Prouse
+Copyright (c) 2019 Charlie Poole, Rob Prouse
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NUnitConsole.sln

@@ -14,7 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		BUILDING.md = BUILDING.md
 		CHANGES.txt = CHANGES.txt
 		CONTRIBUTING.md = CONTRIBUTING.md
-		EngineAndConsoleTests.nunit = EngineAndConsoleTests.nunit
 		LICENSE.txt = LICENSE.txt
 		NOTICES.txt = NOTICES.txt
 		NuGet.config = NuGet.config
@@ -65,7 +64,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runners", "runners", "{F3E8
 	ProjectSection(SolutionItems) = preProject
 		nuget\runners\nunit.console-runner-with-extensions.nuspec = nuget\runners\nunit.console-runner-with-extensions.nuspec
 		nuget\runners\nunit.console-runner.nuspec = nuget\runners\nunit.console-runner.nuspec
-		nuget\runners\nunit.runners.nuspec = nuget\runners\nunit.runners.nuspec
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mock-assembly", "src\NUnitEngine\mock-assembly\mock-assembly.csproj", "{D2C80E4B-1117-4F02-AB02-E453BDA0C58E}"
@@ -80,6 +78,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "choco", "choco", "{4FDF7BFA
 		choco\nunit-console-with-extensions.nuspec = choco\nunit-console-with-extensions.nuspec
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", "{9A7C8370-ED1F-486F-A8F5-C5BF4221464E}"
+	ProjectSection(SolutionItems) = preProject
+		nuget\deprecated\nunit.engine.netstandard.nuspec = nuget\deprecated\nunit.engine.netstandard.nuspec
+		nuget\deprecated\nunit.runners.nuspec = nuget\deprecated\nunit.runners.nuspec
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -140,6 +144,7 @@ Global
 		{D2C80E4B-1117-4F02-AB02-E453BDA0C58E} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
 		{B1D90742-39BD-429C-8E87-C5CD2991DF27} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
 		{4FDF7BFA-A337-41D3-898D-C6A98278E6AD} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
+		{9A7C8370-ED1F-486F-A8F5-C5BF4221464E} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}

NuGet.config

@@ -2,7 +2,8 @@
 <configuration>
   <packageSources>
     <add key="NUnit AppVeyor CI" value="https://ci.appveyor.com/nuget/nunit" />
-    <add key="NUNit MyGet Feed" value="https://www.myget.org/F/nunit/api/v2" />
+    <add key="NUnit MyGet Feed" value="https://www.myget.org/F/nunit/api/v3/index.json" />
+    <add key="NUnit Analyzers MyGet Feed" value="https://www.myget.org/F/nunit-analyzers/api/v3/index.json" protocolVersion="3" />
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>

README.md

@@ -20,7 +20,7 @@ The latest stable release of the NUnit Console is [available on NuGet](https://w
 
 The Console/Engine are available in various packages:
 - [NUnit.ConsoleRunner](https://www.nuget.org/packages/NUnit.ConsoleRunner/): The NUnit Console, with no extensions.
-- [NUnit.Console](https://www.nuget.org/packages/NUnit.Console/): The NUnit Console, with key extensions additionally packaged. Also available as an [msi installer](https://github.com/nunit/nunit-console/releases).
+- [NUnit.Console](https://www.nuget.org/packages/NUnit.Console/): The NUnit Console, with key extensions additionally packaged. Also available as an [msi installer](https://github.com/nunit/nunit-console/releases), you may need to add your **actual** msi install location to the `Path` environment variable after installing, for example: `C:\Program Files (x86)\NUnit.org\nunit-console`.
 - [NUnit.Engine](https://www.nuget.org/packages/NUnit.Engine/) & [NUnit.Engine.Api](https://www.nuget.org/packages/NUnit.Engine.Api/): Packages intended for custom runners integrating directly with the NUnit Engine. 
 
 ## Documentation ##

appveyor.yml

@@ -5,6 +5,7 @@ branches:
 image: Visual Studio 2017
 
 build_script:
+  - nuget restore src\NUnitEngine\mock-assembly\mock-assembly.csproj
   - ps: .\build.ps1 -Target "Appveyor" -Configuration "Release"
 
 # disable built-in tests.
@@ -23,3 +24,4 @@ deploy:
     skip_symbols: true
     on:
       branch: master
+      APPVEYOR_REPO_NAME: nunit/nunit-console