Browse Source

Merge pull request #50 from linquize/prefer32-bug

AnyCPU 32-bit Preferred should only be available for .NET 4.5 projects
pull/49/merge
Daniel Grunwald 12 years ago
parent
commit
22f834bac1
  1. 4
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildAdvanced.xaml.cs
  2. 2
      src/Main/Base/Project/Src/Project/Behaviors/DotNetStartBehavior.cs

4
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildAdvanced.xaml.cs

@ -60,7 +60,9 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -60,7 +60,9 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
this.TargetCPU = new List<KeyItemPair>();
supports32BitPreferred = false;
if (DotnetDetection.IsDotnet45Installed()) {
supports32BitPreferred = projectOptions.Project.MinimumSolutionVersion >= Solution.SolutionVersionVS2010;
var upgradableProject = projectOptions.Project as IUpgradableProject;
if (upgradableProject != null && upgradableProject.CurrentTargetFramework.IsBasedOn(TargetFramework.Net45))
supports32BitPreferred = projectOptions.Project.MinimumSolutionVersion >= Solution.SolutionVersionVS2010;
// Show 32 vs. 64 options even for library projects;
// it's relevant for web applications.
}

2
src/Main/Base/Project/Src/Project/Behaviors/DotNetStartBehavior.cs

@ -114,7 +114,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -114,7 +114,7 @@ namespace ICSharpCode.SharpDevelop.Project
if (fx != null)
UpdateAppConfig(fx);
if (Project.OutputType != OutputType.Library) {
if (DotnetDetection.IsDotnet45Installed()) {
if (DotnetDetection.IsDotnet45Installed() && fx.IsBasedOn(TargetFramework.Net45)) {
Project.SetProperty(null, Project.ActivePlatform, "Prefer32Bit", "True", PropertyStorageLocations.PlatformSpecific, true);
} else {
Project.SetProperty(null, Project.ActivePlatform, "PlatformTarget", "x86", PropertyStorageLocations.PlatformSpecific, true);

Loading…
Cancel
Save