Browse Source

Fixed opening projects without explicitly set ToolsVersion

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/dotnet4@4119 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
422880a2a1
  1. 5
      src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs
  2. 6
      src/Main/Base/Project/Src/Project/MSBuildEngine.cs

5
src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs

@ -332,7 +332,10 @@ namespace ICSharpCode.SharpDevelop.Project @@ -332,7 +332,10 @@ namespace ICSharpCode.SharpDevelop.Project
Dictionary<string, string> globalProps = new Dictionary<string, string>();
globalProps["Configuration"] = configuration;
globalProps["Platform"] = platform;
var project = new MSBuild.Project(projectFile, globalProps, projectFile.ToolsVersion, projectCollection);
string toolsVersion = projectFile.ToolsVersion;
if (string.IsNullOrEmpty(toolsVersion))
toolsVersion = projectCollection.DefaultToolsVersion;
var project = new MSBuild.Project(projectFile, globalProps, toolsVersion, projectCollection);
return new ConfiguredProject(this, project);
} catch {
// Leave lock only on exceptions.

6
src/Main/Base/Project/Src/Project/MSBuildEngine.cs

@ -76,7 +76,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -76,7 +76,7 @@ namespace ICSharpCode.SharpDevelop.Project
}
public static void StartBuild(MSBuildBasedProject project, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink, IEnumerable<string> additionalTargetFiles)
public static void StartBuild(IProject project, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink, IEnumerable<string> additionalTargetFiles)
{
if (project == null)
throw new ArgumentNullException("project");
@ -92,12 +92,12 @@ namespace ICSharpCode.SharpDevelop.Project @@ -92,12 +92,12 @@ namespace ICSharpCode.SharpDevelop.Project
engine.StartBuild();
}
MSBuildBasedProject project;
IProject project;
ProjectBuildOptions options;
IBuildFeedbackSink feedbackSink;
IEnumerable<string> additionalTargetFiles;
private MSBuildEngine(MSBuildBasedProject project, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
private MSBuildEngine(IProject project, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
{
this.project = project;
this.options = options;

Loading…
Cancel
Save