Browse Source

Fixed running unit tests in .NET 4.5 project.

pull/18/head
Daniel Grunwald 14 years ago
parent
commit
fc9d01eee9
  1. 7
      src/AddIns/Analysis/UnitTesting/Src/NUnitConsoleCommandLine.cs
  2. 14
      src/AddIns/Analysis/UnitTesting/Test/Frameworks/NUnitConsoleExeSelectedTestFixture.cs

7
src/AddIns/Analysis/UnitTesting/Src/NUnitConsoleCommandLine.cs

@ -240,10 +240,9 @@ namespace ICSharpCode.UnitTesting @@ -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;
}

14
src/AddIns/Analysis/UnitTesting/Test/Frameworks/NUnitConsoleExeSelectedTestFixture.cs

@ -55,6 +55,20 @@ namespace UnitTesting.Tests.Frameworks @@ -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()
{

Loading…
Cancel
Save