From fc9d01eee9290196d5cef720209854120f9b70a8 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 17 Mar 2012 16:17:51 +0100 Subject: [PATCH] Fixed running unit tests in .NET 4.5 project. --- .../UnitTesting/Src/NUnitConsoleCommandLine.cs | 7 +++---- .../NUnitConsoleExeSelectedTestFixture.cs | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/AddIns/Analysis/UnitTesting/Src/NUnitConsoleCommandLine.cs b/src/AddIns/Analysis/UnitTesting/Src/NUnitConsoleCommandLine.cs index 90c791c292..f6ff76fb75 100644 --- a/src/AddIns/Analysis/UnitTesting/Src/NUnitConsoleCommandLine.cs +++ b/src/AddIns/Analysis/UnitTesting/Src/NUnitConsoleCommandLine.cs @@ -240,10 +240,9 @@ namespace ICSharpCode.UnitTesting bool ProjectUsesDotnet20Runtime(IProject project) { - MSBuildBasedProject msbuildProject = project as MSBuildBasedProject; - if (msbuildProject != null) { - string targetFrameworkVersion = msbuildProject.GetEvaluatedProperty("TargetFrameworkVersion"); - return !String.Equals(targetFrameworkVersion, "v4.0", StringComparison.OrdinalIgnoreCase); + var p = project as ICSharpCode.SharpDevelop.Project.Converter.IUpgradableProject; + if (p != null && p.CurrentTargetFramework != null) { + return p.CurrentTargetFramework.SupportedRuntimeVersion == "v2.0.50727"; } return false; } diff --git a/src/AddIns/Analysis/UnitTesting/Test/Frameworks/NUnitConsoleExeSelectedTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Frameworks/NUnitConsoleExeSelectedTestFixture.cs index f84836d29b..d739c2454a 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Frameworks/NUnitConsoleExeSelectedTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Frameworks/NUnitConsoleExeSelectedTestFixture.cs @@ -55,6 +55,20 @@ namespace UnitTesting.Tests.Frameworks Assert.AreEqual(@"D:\SharpDevelop\bin\Tools\NUnit\nunit-console-dotnet2.exe", app.FileName); } + [Test] + public void TargetCpuAnyCPUDotnet45() + { + MockCSharpProject project = new MockCSharpProject(); + project.ActiveConfiguration = "Debug"; + project.ActivePlatform = "AnyCPU"; + project.SetProperty("PlatformTarget", "AnyCPU"); + project.SetProperty("TargetFrameworkVersion", "v4.5"); + + SelectedTests selectedTests = new SelectedTests(project); + NUnitConsoleApplication app = new NUnitConsoleApplication(selectedTests); + Assert.AreEqual(@"D:\SharpDevelop\bin\Tools\NUnit\nunit-console.exe", app.FileName); + } + [Test] public void NUnitConsole32BitUsedWhenTargetCpuIs32BitDotnet2() {