|
|
@ -402,9 +402,6 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
Dictionary<string, string> globalProps = new Dictionary<string, string>(); |
|
|
|
Dictionary<string, string> globalProps = new Dictionary<string, string>(); |
|
|
|
InitializeMSBuildProjectProperties(globalProps); |
|
|
|
InitializeMSBuildProjectProperties(globalProps); |
|
|
|
globalProps["Configuration"] = configuration; |
|
|
|
globalProps["Configuration"] = configuration; |
|
|
|
|
|
|
|
|
|
|
|
//HACK: the ActivePlatform property should be set properly before entering here, but sometimes it does not
|
|
|
|
|
|
|
|
if (platform != null) |
|
|
|
|
|
|
|
globalProps["Platform"] = platform; |
|
|
|
globalProps["Platform"] = platform; |
|
|
|
MSBuild.Project project = MSBuildInternals.LoadProject(projectCollection, projectFile, globalProps); |
|
|
|
MSBuild.Project project = MSBuildInternals.LoadProject(projectCollection, projectFile, globalProps); |
|
|
|
if (openCurrentConfiguration) |
|
|
|
if (openCurrentConfiguration) |
|
|
@ -1246,7 +1243,9 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
{ |
|
|
|
{ |
|
|
|
this.projectCollection = loadInformation.ParentSolution.MSBuildProjectCollection; |
|
|
|
this.projectCollection = loadInformation.ParentSolution.MSBuildProjectCollection; |
|
|
|
this.FileName = loadInformation.FileName; |
|
|
|
this.FileName = loadInformation.FileName; |
|
|
|
|
|
|
|
if (loadInformation.Configuration != null) |
|
|
|
this.ActiveConfiguration = loadInformation.Configuration; |
|
|
|
this.ActiveConfiguration = loadInformation.Configuration; |
|
|
|
|
|
|
|
if (loadInformation.Platform != null) |
|
|
|
this.ActivePlatform = loadInformation.Platform; |
|
|
|
this.ActivePlatform = loadInformation.Platform; |
|
|
|
|
|
|
|
|
|
|
|
projectFile = ProjectRootElement.Open(loadInformation.FileName, projectCollection); |
|
|
|
projectFile = ProjectRootElement.Open(loadInformation.FileName, projectCollection); |
|
|
|