diff options
| author | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-04-16 14:28:29 +0300 |
|---|---|---|
| committer | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-04-16 14:28:29 +0300 |
| commit | ad71db8032cebc12b15c441430156b0d693fca75 (patch) | |
| tree | 431efae3fad0b9635bae51f544293a29b34a1b6e | |
| parent | c3846c3fb4e1ffdef5fcf0861196e32109ddb746 (diff) | |
[Core] Fix some warnings
4 files changed, 4 insertions, 4 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs index 376ff49a09..ff88503749 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs @@ -297,7 +297,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild var props = new MSBuildEvaluatedPropertyCollection (this); evaluatedProperties = props; - props.Sync (e, project); + props.SyncCollection (e, project); } MSBuildItemEvaluated CreateEvaluatedItem (MSBuildEngine e, object it) diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupEvaluated.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupEvaluated.cs index 26e8cf4f10..05f2898a5b 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupEvaluated.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildPropertyGroupEvaluated.cs @@ -135,7 +135,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild { } - internal void Sync (MSBuildEngine e, object project) + internal void SyncCollection (MSBuildEngine e, object project) { properties.Clear (); foreach (var p in e.GetEvaluatedProperties (project)) { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs index 16584c4677..918762f797 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs @@ -43,7 +43,6 @@ using MonoDevelop.Core.Instrumentation; using MonoDevelop.Core.Assemblies; using MonoDevelop.Projects.Extensions; using System.Collections.Immutable; -using MonoDevelop.Core.Instrumentation; namespace MonoDevelop.Projects diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs index ff616c170d..c17f2a3807 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Solution.cs @@ -755,8 +755,9 @@ namespace MonoDevelop.Projects } } - /*protected virtual*/ async Task OnPrepareExecution (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration) + /*protected virtual*/ Task OnPrepareExecution (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration) { + return Task.FromResult (0); } /*protected virtual*/ void OnStartupItemChanged(EventArgs e) |