|
|
|
@ -158,13 +158,16 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
#region Get Property
|
|
|
|
#region Get Property
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// Retrieves the evaluated property '<paramref name="propertyName"/>' from the
|
|
|
|
/// Retrieves the evaluated property '<paramref name="propertyName"/>' from the
|
|
|
|
/// active configuration/platform.
|
|
|
|
/// active configuration/platform. This method can retrieve any MSBuild property, including those
|
|
|
|
|
|
|
|
/// defined in imported .target files.
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="propertyName">The name of the MSBuild property to read.</param>
|
|
|
|
/// <param name="propertyName">The name of the MSBuild property to read.</param>
|
|
|
|
/// <returns>The evaluated value of the property, or null if the property doesn't exist</returns>
|
|
|
|
/// <returns>The evaluated value of the property, or null if the property doesn't exist</returns>
|
|
|
|
public string GetProperty(string propertyName) |
|
|
|
public string GetEvaluatedProperty(string propertyName) |
|
|
|
{ |
|
|
|
{ |
|
|
|
return project.GetEvaluatedProperty(propertyName); |
|
|
|
lock (SyncRoot) { |
|
|
|
|
|
|
|
return project.GetEvaluatedProperty(propertyName); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
MSBuild.Project evaluatingTempProject; |
|
|
|
MSBuild.Project evaluatingTempProject; |
|
|
|
@ -195,13 +198,15 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
public string GetProperty(string configuration, string platform, string propertyName, |
|
|
|
public string GetProperty(string configuration, string platform, string propertyName, |
|
|
|
out PropertyStorageLocations location) |
|
|
|
out PropertyStorageLocations location) |
|
|
|
{ |
|
|
|
{ |
|
|
|
MSBuild.BuildPropertyGroup group; |
|
|
|
lock (SyncRoot) { |
|
|
|
MSBuild.BuildProperty prop = FindPropertyObject(configuration, platform, propertyName, |
|
|
|
MSBuild.BuildPropertyGroup group; |
|
|
|
out group, out location); |
|
|
|
MSBuild.BuildProperty prop = FindPropertyObject(configuration, platform, propertyName, |
|
|
|
if (prop == null) |
|
|
|
out group, out location); |
|
|
|
return null; |
|
|
|
if (prop == null) |
|
|
|
else |
|
|
|
return null; |
|
|
|
return prop.FinalValue; |
|
|
|
else |
|
|
|
|
|
|
|
return prop.FinalValue; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
@ -243,13 +248,15 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
string propertyName, |
|
|
|
string propertyName, |
|
|
|
out PropertyStorageLocations location) |
|
|
|
out PropertyStorageLocations location) |
|
|
|
{ |
|
|
|
{ |
|
|
|
MSBuild.BuildPropertyGroup group; |
|
|
|
lock (SyncRoot) { |
|
|
|
MSBuild.BuildProperty prop = FindPropertyObject(configuration, platform, propertyName, |
|
|
|
MSBuild.BuildPropertyGroup group; |
|
|
|
out group, out location); |
|
|
|
MSBuild.BuildProperty prop = FindPropertyObject(configuration, platform, propertyName, |
|
|
|
if (prop == null) |
|
|
|
out group, out location); |
|
|
|
return null; |
|
|
|
if (prop == null) |
|
|
|
else |
|
|
|
return null; |
|
|
|
return prop.Value; |
|
|
|
else |
|
|
|
|
|
|
|
return prop.Value; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
@ -428,6 +435,18 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
string propertyName, string newValue, |
|
|
|
string propertyName, string newValue, |
|
|
|
PropertyStorageLocations location, |
|
|
|
PropertyStorageLocations location, |
|
|
|
bool treatPropertyValueAsLiteral) |
|
|
|
bool treatPropertyValueAsLiteral) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
ProjectPropertyChangedEventArgs args; |
|
|
|
|
|
|
|
lock (SyncRoot) { |
|
|
|
|
|
|
|
args = SetPropertyInternal(configuration, platform, propertyName, newValue, location, treatPropertyValueAsLiteral); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
OnPropertyChanged(args); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ProjectPropertyChangedEventArgs SetPropertyInternal(string configuration, string platform, |
|
|
|
|
|
|
|
string propertyName, string newValue, |
|
|
|
|
|
|
|
PropertyStorageLocations location, |
|
|
|
|
|
|
|
bool treatPropertyValueAsLiteral) |
|
|
|
{ |
|
|
|
{ |
|
|
|
PropertyStorageLocations oldLocation; |
|
|
|
PropertyStorageLocations oldLocation; |
|
|
|
MSBuild.BuildPropertyGroup existingPropertyGroup; |
|
|
|
MSBuild.BuildPropertyGroup existingPropertyGroup; |
|
|
|
@ -562,7 +581,7 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
propertyInsertionPosition, |
|
|
|
propertyInsertionPosition, |
|
|
|
treatPropertyValueAsLiteral); |
|
|
|
treatPropertyValueAsLiteral); |
|
|
|
} |
|
|
|
} |
|
|
|
OnPropertyChanged(args); |
|
|
|
return args; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
@ -611,17 +630,29 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
|
|
|
|
|
|
|
|
#region IProjectItemListProvider interface
|
|
|
|
#region IProjectItemListProvider interface
|
|
|
|
List<ProjectItem> items = new List<ProjectItem>(); |
|
|
|
List<ProjectItem> items = new List<ProjectItem>(); |
|
|
|
ReadOnlyCollection<ProjectItem> itemsReadOnly; |
|
|
|
volatile ReadOnlyCollection<ProjectItem> itemsReadOnly; |
|
|
|
ICollection<ItemType> availableFileItemTypes = ItemType.DefaultFileItems; |
|
|
|
volatile ICollection<ItemType> availableFileItemTypes = ItemType.DefaultFileItems; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
|
|
/// Gets the list of items in the project. This member is thread-safe.
|
|
|
|
|
|
|
|
/// The returned collection is guaranteed not to change - adding new items or removing existing items
|
|
|
|
|
|
|
|
/// will create a new collection.
|
|
|
|
|
|
|
|
/// </summary>
|
|
|
|
public override ReadOnlyCollection<ProjectItem> Items { |
|
|
|
public override ReadOnlyCollection<ProjectItem> Items { |
|
|
|
get { |
|
|
|
get { |
|
|
|
return itemsReadOnly ?? (itemsReadOnly = items.AsReadOnly()); |
|
|
|
ReadOnlyCollection<ProjectItem> c = itemsReadOnly; |
|
|
|
|
|
|
|
if (c == null) { |
|
|
|
|
|
|
|
lock (SyncRoot) { |
|
|
|
|
|
|
|
c = Array.AsReadOnly(items.ToArray()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
itemsReadOnly = c; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return c; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>
|
|
|
|
/// Gets the list of available file item types.
|
|
|
|
/// Gets the list of available file item types. This member is thread-safe.
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
public override ICollection<ItemType> AvailableFileItemTypes { |
|
|
|
public override ICollection<ItemType> AvailableFileItemTypes { |
|
|
|
get { |
|
|
|
get { |
|
|
|
@ -634,22 +665,27 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
internal void CreateItemsListFromMSBuild() |
|
|
|
internal void CreateItemsListFromMSBuild() |
|
|
|
{ |
|
|
|
{ |
|
|
|
foreach (ProjectItem item in items) { |
|
|
|
WorkbenchSingleton.AssertMainThread(); |
|
|
|
item.Dispose(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
items.Clear(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Set<ItemType> availableFileItemTypes = new Set<ItemType>(); |
|
|
|
lock (SyncRoot) { |
|
|
|
availableFileItemTypes.AddRange(ItemType.DefaultFileItems); |
|
|
|
foreach (ProjectItem item in items) { |
|
|
|
foreach (MSBuild.BuildItem item in project.GetEvaluatedItemsByName("AvailableItemName")) { |
|
|
|
item.Dispose(); |
|
|
|
availableFileItemTypes.Add(new ItemType(item.Include)); |
|
|
|
} |
|
|
|
} |
|
|
|
items.Clear(); |
|
|
|
this.availableFileItemTypes = availableFileItemTypes.AsReadOnly(); |
|
|
|
itemsReadOnly = null; // remove readonly variant of item list - will regenerate on next Items call
|
|
|
|
|
|
|
|
|
|
|
|
foreach (MSBuild.BuildItem item in project.EvaluatedItems) { |
|
|
|
Set<ItemType> availableFileItemTypes = new Set<ItemType>(); |
|
|
|
if (item.IsImported) continue; |
|
|
|
availableFileItemTypes.AddRange(ItemType.DefaultFileItems); |
|
|
|
|
|
|
|
foreach (MSBuild.BuildItem item in project.GetEvaluatedItemsByName("AvailableItemName")) { |
|
|
|
|
|
|
|
availableFileItemTypes.Add(new ItemType(item.Include)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.availableFileItemTypes = availableFileItemTypes.AsReadOnly(); |
|
|
|
|
|
|
|
|
|
|
|
items.Add(CreateProjectItem(item)); |
|
|
|
foreach (MSBuild.BuildItem item in project.EvaluatedItems) { |
|
|
|
|
|
|
|
if (item.IsImported) continue; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
items.Add(CreateProjectItem(item)); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -662,30 +698,35 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
if (item.IsAddedToProject) |
|
|
|
if (item.IsAddedToProject) |
|
|
|
throw new ArgumentException("item is already added to project", "item"); |
|
|
|
throw new ArgumentException("item is already added to project", "item"); |
|
|
|
|
|
|
|
|
|
|
|
items.Add(item); |
|
|
|
WorkbenchSingleton.AssertMainThread(); |
|
|
|
foreach (MSBuild.BuildItemGroup g in project.ItemGroups) { |
|
|
|
|
|
|
|
if (g.IsImported || !string.IsNullOrEmpty(g.Condition) || g.Count == 0) |
|
|
|
lock (SyncRoot) { |
|
|
|
continue; |
|
|
|
items.Add(item); |
|
|
|
if (g[0].Name == item.ItemType.ItemName) { |
|
|
|
itemsReadOnly = null; // remove readonly variant of item list - will regenerate on next Items call
|
|
|
|
MSBuildInternals.AddItemToGroup(g, item); |
|
|
|
foreach (MSBuild.BuildItemGroup g in project.ItemGroups) { |
|
|
|
return; |
|
|
|
if (g.IsImported || !string.IsNullOrEmpty(g.Condition) || g.Count == 0) |
|
|
|
} |
|
|
|
continue; |
|
|
|
if (g[0].Name == "Reference") |
|
|
|
if (g[0].Name == item.ItemType.ItemName) { |
|
|
|
continue; |
|
|
|
|
|
|
|
if (ItemType.DefaultFileItems.Contains(new ItemType(g[0].Name))) { |
|
|
|
|
|
|
|
if (ItemType.DefaultFileItems.Contains(item.ItemType)) { |
|
|
|
|
|
|
|
MSBuildInternals.AddItemToGroup(g, item); |
|
|
|
MSBuildInternals.AddItemToGroup(g, item); |
|
|
|
return; |
|
|
|
return; |
|
|
|
} else { |
|
|
|
} |
|
|
|
|
|
|
|
if (g[0].Name == "Reference") |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
|
|
|
|
if (ItemType.DefaultFileItems.Contains(new ItemType(g[0].Name))) { |
|
|
|
|
|
|
|
if (ItemType.DefaultFileItems.Contains(item.ItemType)) { |
|
|
|
|
|
|
|
MSBuildInternals.AddItemToGroup(g, item); |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MSBuildInternals.AddItemToGroup(g, item); |
|
|
|
|
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
MSBuild.BuildItemGroup newGroup = project.AddNewItemGroup(); |
|
|
|
MSBuildInternals.AddItemToGroup(g, item); |
|
|
|
MSBuildInternals.AddItemToGroup(newGroup, item); |
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
MSBuild.BuildItemGroup newGroup = project.AddNewItemGroup(); |
|
|
|
|
|
|
|
MSBuildInternals.AddItemToGroup(newGroup, item); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
bool IProjectItemListProvider.RemoveProjectItem(ProjectItem item) |
|
|
|
bool IProjectItemListProvider.RemoveProjectItem(ProjectItem item) |
|
|
|
@ -697,39 +738,24 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
if (!item.IsAddedToProject) |
|
|
|
if (!item.IsAddedToProject) |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
|
|
|
|
|
|
|
|
if (items.Remove(item)) { |
|
|
|
WorkbenchSingleton.AssertMainThread(); |
|
|
|
project.RemoveItem(item.BuildItem); |
|
|
|
|
|
|
|
item.BuildItem = null; // make the item free again
|
|
|
|
lock (SyncRoot) { |
|
|
|
return true; |
|
|
|
if (items.Remove(item)) { |
|
|
|
} else { |
|
|
|
itemsReadOnly = null; // remove readonly variant of item list - will regenerate on next Items call
|
|
|
|
throw new InvalidOperationException("Expected that the item is added to this project!"); |
|
|
|
project.RemoveItem(item.BuildItem); |
|
|
|
|
|
|
|
item.BuildItem = null; // make the item free again
|
|
|
|
|
|
|
|
return true; |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
throw new InvalidOperationException("Expected that the item is added to this project!"); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public override bool IsFileInProject(string fileName) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
return FindProjectItem(this, fileName) != null; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public FileProjectItem FindFile(string fileName) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
return FindProjectItem(this, fileName); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
internal static FileProjectItem FindProjectItem(IProject project, string fileName) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
return Linq.Find(Linq.OfType<FileProjectItem>(project.Items), |
|
|
|
|
|
|
|
delegate(FileProjectItem item) { |
|
|
|
|
|
|
|
return FileUtility.IsEqualFileName(item.FileName, fileName); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
// return project.Items.OfType<FileProjectItem>().Find(
|
|
|
|
|
|
|
|
// item => FileUtility.IsEqualFileName(item.FileName, outputFileName));
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
#endregion
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
#region Wrapped MSBuild Properties
|
|
|
|
#region Wrapped MSBuild Properties
|
|
|
|
public override string AppDesignerFolder { |
|
|
|
public override string AppDesignerFolder { |
|
|
|
get { return GetProperty("AppDesignerFolder"); } |
|
|
|
get { return GetEvaluatedProperty("AppDesignerFolder"); } |
|
|
|
set { SetProperty("AppDesignerFolder", value); } |
|
|
|
set { SetProperty("AppDesignerFolder", value); } |
|
|
|
} |
|
|
|
} |
|
|
|
#endregion
|
|
|
|
#endregion
|
|
|
|
@ -773,12 +799,12 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
InitializeMSBuildProject(); |
|
|
|
InitializeMSBuildProject(); |
|
|
|
|
|
|
|
|
|
|
|
project.Load(fileName); |
|
|
|
project.Load(fileName); |
|
|
|
this.ActiveConfiguration = GetProperty("Configuration") ?? this.ActiveConfiguration; |
|
|
|
this.ActiveConfiguration = GetEvaluatedProperty("Configuration") ?? this.ActiveConfiguration; |
|
|
|
this.ActivePlatform = GetProperty("Platform") ?? this.ActivePlatform; |
|
|
|
this.ActivePlatform = GetEvaluatedProperty("Platform") ?? this.ActivePlatform; |
|
|
|
|
|
|
|
|
|
|
|
CreateItemsListFromMSBuild(); |
|
|
|
CreateItemsListFromMSBuild(); |
|
|
|
LoadConfigurationPlatformNamesFromMSBuild(); |
|
|
|
LoadConfigurationPlatformNamesFromMSBuild(); |
|
|
|
IdGuid = GetProperty("ProjectGuid"); |
|
|
|
IdGuid = GetEvaluatedProperty("ProjectGuid"); |
|
|
|
} finally { |
|
|
|
} finally { |
|
|
|
isLoading = false; |
|
|
|
isLoading = false; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -788,7 +814,9 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
#region Saving
|
|
|
|
#region Saving
|
|
|
|
public override void Save(string fileName) |
|
|
|
public override void Save(string fileName) |
|
|
|
{ |
|
|
|
{ |
|
|
|
project.Save(fileName); |
|
|
|
lock (SyncRoot) { |
|
|
|
|
|
|
|
project.Save(fileName); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
#endregion
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
@ -796,8 +824,10 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
protected override void OnActiveConfigurationChanged(EventArgs e) |
|
|
|
protected override void OnActiveConfigurationChanged(EventArgs e) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (!isLoading) { |
|
|
|
if (!isLoading) { |
|
|
|
project.GlobalProperties.SetProperty("Configuration", this.ActiveConfiguration, true); |
|
|
|
lock (SyncRoot) { |
|
|
|
CreateItemsListFromMSBuild(); |
|
|
|
project.GlobalProperties.SetProperty("Configuration", this.ActiveConfiguration, true); |
|
|
|
|
|
|
|
CreateItemsListFromMSBuild(); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
base.OnActiveConfigurationChanged(e); |
|
|
|
base.OnActiveConfigurationChanged(e); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -805,8 +835,10 @@ namespace ICSharpCode.SharpDevelop.Project |
|
|
|
protected override void OnActivePlatformChanged(EventArgs e) |
|
|
|
protected override void OnActivePlatformChanged(EventArgs e) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (!isLoading) { |
|
|
|
if (!isLoading) { |
|
|
|
project.GlobalProperties.SetProperty("Platform", this.ActivePlatform, true); |
|
|
|
lock (SyncRoot) { |
|
|
|
CreateItemsListFromMSBuild(); |
|
|
|
project.GlobalProperties.SetProperty("Platform", this.ActivePlatform, true); |
|
|
|
|
|
|
|
CreateItemsListFromMSBuild(); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
base.OnActivePlatformChanged(e); |
|
|
|
base.OnActivePlatformChanged(e); |
|
|
|
} |
|
|
|
} |
|
|
|
|
Daniel Grunwald
19 years ago