Merge pull request nunit#1021 from nunit/release-3.0-rc-3

NUnit 3.0 RC 3 Release
dicko2 · Nov 14, 2015 · 1205a4a · 1205a4a
2 parents 41fd061 + b64aabc
commit 1205a4a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,19 @@
-NUnit 3.0.0 Release Candidate 2 - November 8, 2015
+NUnit 3.0.0 Release Candidate 3 - November 13, 2015
+
+Engine
+
+ * The engine now only sets the config file for project.nunit to project.config if project.config exists. Otherwise, each assembly uses its own config, provided it is run in a separate AppDomain by itself. 
+
+   NOTE: It is not possible for multiple assemblies in the same AppDomain to use different configs. This is not an NUnit limitation, it's just how configs work!
+
+Issues Resolved
+
+ * 856 Extensions support for third party runners in NUnit 3.0
+ * 1003 Delete TeamCityEventHandler as it is not used
+ * 1015 Specifying .nunit project and --framework on command line causes crash
+ * 1017 Remove Assert.Multiple from framework
+
+NUnit 3.0.0 Release Candidate 2 - November 8, 2015
 
 Engine
 

diff --git a/NUnit.proj b/NUnit.proj
@@ -7,7 +7,7 @@
   <PropertyGroup Label="Common Properties">
     <ProjectName>$(MSBuildProjectName)</ProjectName>
     <PackageVersion>3.0.0</PackageVersion>
-    <PackageModifier>-rc-2</PackageModifier>
+    <PackageModifier>-rc-3</PackageModifier>
     <DisplayVersion>3.0</DisplayVersion>
     <PackageName>$(ProjectName)-$(PackageVersion)$(PackageModifier)</PackageName>
     <PackageNameCF>$(ProjectName)CF-$(PackageVersion)$(PackageModifier)</PackageNameCF>

diff --git a/src/NUnitEngine/nunit.engine.tests/Services/DomainManagerTests.cs b/src/NUnitEngine/nunit.engine.tests/Services/DomainManagerTests.cs
@@ -70,7 +70,10 @@ public void CanCreateDomain()
         [Test, Platform("Linux,Net", Reason = "get_SetupInformation() fails on Windows+Mono")]
         public void CanCreateDomainWithApplicationBaseSpecified()
         {
-            string basePath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(_package.FullName)));
+            string assemblyDir = Path.GetDirectoryName(_package.FullName);
+            string basePath = Path.GetDirectoryName(Path.GetDirectoryName(assemblyDir));
+            string relPath = assemblyDir.Substring(basePath.Length + 1);
+
             _package.Settings["BasePath"] = basePath;
             var domain = _domainManager.CreateDomain(_package);
 
@@ -83,11 +86,7 @@ public void CanCreateDomainWithApplicationBaseSpecified()
                 Path.GetFileName(setup.ConfigurationFile),
                 Is.EqualTo("mock-nunit-assembly.exe.config").IgnoreCase,
                 "ConfigurationFile");
-#if DEBUG
-            Assert.That(setup.PrivateBinPath, Is.SamePath(@"bin\Debug"), "PrivateBinPath");
-#else
-            Assert.That(setup.PrivateBinPath, Is.SamePath(@"bin\Release"), "PrivateBinPath");
-#endif
+            Assert.That(setup.PrivateBinPath, Is.SamePath(relPath), "PrivateBinPath");
             Assert.That(setup.ShadowCopyFiles, Is.Null.Or.EqualTo("false"));
         }