From 5937106baa06423403b2522e2f5181c0596a7047 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sun, 12 Jan 2014 13:48:32 +0000 Subject: [PATCH] #274 Support running mspec tests for .NET 4.5 projects. --- .../MachineSpecifications/src/MSpecApplication.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/src/MSpecApplication.cs b/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/src/MSpecApplication.cs index f431cded03..1bdb066595 100644 --- a/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/src/MSpecApplication.cs +++ b/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/src/MSpecApplication.cs @@ -90,7 +90,7 @@ namespace ICSharpCode.MachineSpecifications string executableName = "mspec"; if (TargetPlatformIs32Bit(project)) executableName += "-x86"; - if (UsesClr4(project)) + if (!ProjectUsesDotnet20Runtime(project)) executableName += "-clr4"; executableName += ".exe"; @@ -98,12 +98,11 @@ namespace ICSharpCode.MachineSpecifications } } - bool UsesClr4(IProject project) + static 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; }