Browse Source

Hide TreatIncludeAsLiteral from project browser, make the default value "true" (otherwise files named "a%def.cs" are added incorrectly to the project).

MSBuildInternals: when creating a temporary MSBuild project to inspect the properties of a non-default configuration, specify the path of the project file so that projects containing <Import Project="relativePath" /> can be loaded (fixes editing properties in the release configuration of the forms designer project)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2582 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 18 years ago
parent
commit
4b0b2e2690
  1. 4
      src/Main/Base/Project/Src/Project/Items/ProjectItem.cs
  2. 3
      src/Main/Base/Project/Src/Project/MSBuildInternals.cs

4
src/Main/Base/Project/Src/Project/Items/ProjectItem.cs

@ -47,6 +47,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -47,6 +47,7 @@ namespace ICSharpCode.SharpDevelop.Project
throw new ArgumentNullException("project");
this.project = project;
this.buildItem = buildItem;
this.treatIncludeAsLiteral = true;
}
protected ProjectItem(IProject project, ItemType itemType)
@ -55,7 +56,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -55,7 +56,7 @@ namespace ICSharpCode.SharpDevelop.Project
}
protected ProjectItem(IProject project, ItemType itemType, string include)
: this(project, itemType, include, false)
: this(project, itemType, include, true)
{
}
@ -75,6 +76,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -75,6 +76,7 @@ namespace ICSharpCode.SharpDevelop.Project
}
}
[Browsable(false)]
public bool TreatIncludeAsLiteral {
get { return treatIncludeAsLiteral; }
set { treatIncludeAsLiteral = value; }

3
src/Main/Base/Project/Src/Project/MSBuildInternals.cs

@ -122,6 +122,9 @@ namespace ICSharpCode.SharpDevelop.Project @@ -122,6 +122,9 @@ namespace ICSharpCode.SharpDevelop.Project
try {
MSBuild.Engine engine = CreateEngine();
tempProject = engine.CreateNewProject();
// tell MSBuild the path so that projects containing <Import Project="relativePath" />
// can be loaded
tempProject.FullFileName = baseProject.FullFileName;
MSBuildBasedProject.InitializeMSBuildProject(tempProject);
tempProject.LoadXml(baseProject.Xml);
tempProject.SetProperty("Configuration", configuration);

Loading…
Cancel
Save