diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs index dfae97e7e9..2290ebbc5f 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs @@ -79,17 +79,16 @@ namespace CSharpBinding return base.GetDefaultItemType(fileName); } - public override void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink) + public override void StartBuild(ProjectBuildOptions options, IBuildFeedbackSink feedbackSink) { if (this.MinimumSolutionVersion == Solution.SolutionVersionVS2005) { MSBuildEngine.StartBuild(this, - buildServices, options, feedbackSink, MSBuildEngine.AdditionalTargetFiles.Concat( new [] { Path.Combine(MSBuildEngine.SharpDevelopBinPath, "SharpDevelop.CheckMSBuild35Features.targets") })); } else { - base.StartBuild(buildServices, options, feedbackSink); + base.StartBuild(options, feedbackSink); } } diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs index 807b2dec0e..7cda0da62c 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs @@ -101,17 +101,16 @@ namespace VBNetBinding return base.GetDefaultItemType(fileName); } - public override void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink) + public override void StartBuild(ProjectBuildOptions options, IBuildFeedbackSink feedbackSink) { if (this.MinimumSolutionVersion == Solution.SolutionVersionVS2005) { MSBuildEngine.StartBuild(this, - buildServices, options, feedbackSink, MSBuildEngine.AdditionalTargetFiles.Concat( new [] { Path.Combine(MSBuildEngine.SharpDevelopBinPath, "SharpDevelop.CheckMSBuild35Features.targets") })); } else { - base.StartBuild(buildServices, options, feedbackSink); + base.StartBuild(options, feedbackSink); } } diff --git a/src/Main/Base/Project/Src/Project/AbstractProject.cs b/src/Main/Base/Project/Src/Project/AbstractProject.cs index 221e10c311..fccceed433 100644 --- a/src/Main/Base/Project/Src/Project/AbstractProject.cs +++ b/src/Main/Base/Project/Src/Project/AbstractProject.cs @@ -490,7 +490,7 @@ namespace ICSharpCode.SharpDevelop.Project { } - public virtual void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink) + public virtual void StartBuild(ProjectBuildOptions options, IBuildFeedbackSink feedbackSink) { feedbackSink.ReportError(new BuildError { ErrorText = "Building project " + Name + " is not supported.", IsWarning = true }); // we don't know how to build anything, report that we're done. diff --git a/src/Main/Base/Project/Src/Project/BuildEngine.cs b/src/Main/Base/Project/Src/Project/BuildEngine.cs index 9108095798..3947ea7ca5 100644 --- a/src/Main/Base/Project/Src/Project/BuildEngine.cs +++ b/src/Main/Base/Project/Src/Project/BuildEngine.cs @@ -272,7 +272,7 @@ namespace ICSharpCode.SharpDevelop.Project public void DoStartBuild(object state) { - project.StartBuild(engine.serviceContainer, options, this); + project.StartBuild(options, this); } public void ReportError(BuildError error) @@ -315,7 +315,6 @@ namespace ICSharpCode.SharpDevelop.Project BuildNode rootNode; readonly IBuildable rootProject; readonly BuildResults results = new BuildResults(); - readonly ThreadSafeServiceContainer serviceContainer = new ThreadSafeServiceContainer(); DateTime buildStart; readonly List projectsCurrentlyBuilding = new List(); @@ -538,7 +537,6 @@ namespace ICSharpCode.SharpDevelop.Project /// void ReportDone() { - serviceContainer.Dispose(); if (combinedBuildFeedbackSink != null) { if (combinedBuildFeedbackSink is MessageViewSink) { // Special case GUI-builds so that they have more information available: diff --git a/src/Main/Base/Project/Src/Project/IProject.cs b/src/Main/Base/Project/Src/Project/IProject.cs index 46b901ac77..6075991b94 100644 --- a/src/Main/Base/Project/Src/Project/IProject.cs +++ b/src/Main/Base/Project/Src/Project/IProject.cs @@ -274,7 +274,7 @@ namespace ICSharpCode.SharpDevelop.Project /// Starts building the project using the specified options. /// This member must be implemented thread-safe. /// - void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink); + void StartBuild(ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink); /// /// Gets the name of the buildable item. diff --git a/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs b/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs index 2e19c758b9..d9452b5dd3 100644 --- a/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs +++ b/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs @@ -1076,9 +1076,9 @@ namespace ICSharpCode.SharpDevelop.Project return result; } - public override void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink) + public override void StartBuild(ProjectBuildOptions options, IBuildFeedbackSink feedbackSink) { - MSBuildEngine.StartBuild(this, buildServices, options, feedbackSink, MSBuildEngine.AdditionalTargetFiles); + MSBuildEngine.StartBuild(this, options, feedbackSink, MSBuildEngine.AdditionalTargetFiles); } public override ProjectBuildOptions CreateProjectBuildOptions(BuildOptions options, bool isRootBuildable) diff --git a/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildEngine.cs b/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildEngine.cs index 6346fcd461..d5a1630b3c 100755 --- a/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildEngine.cs +++ b/src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildEngine.cs @@ -93,12 +93,10 @@ namespace ICSharpCode.SharpDevelop.Project MSBuildLoggerFilters = AddInTree.BuildItems(LoggerFiltersPath, null, false); } - public static void StartBuild(IProject project, ThreadSafeServiceContainer serviceContainer, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink, IEnumerable additionalTargetFiles) + public static void StartBuild(IProject project, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink, IEnumerable additionalTargetFiles) { if (project == null) throw new ArgumentNullException("project"); - if (serviceContainer == null) - throw new ArgumentNullException("serviceContainer"); if (options == null) throw new ArgumentNullException("options"); if (feedbackSink == null) @@ -111,7 +109,6 @@ namespace ICSharpCode.SharpDevelop.Project if (project.MinimumSolutionVersion >= Solution.SolutionVersionVS2010) { engine.additionalTargetFiles.Add(Path.Combine(Path.GetDirectoryName(typeof(MSBuildEngine).Assembly.Location), "SharpDevelop.TargetingPack.targets")); } - engine.serviceContainer = serviceContainer; engine.StartBuild(); } @@ -120,7 +117,6 @@ namespace ICSharpCode.SharpDevelop.Project ProjectBuildOptions options; IBuildFeedbackSink feedbackSink; List additionalTargetFiles; - ThreadSafeServiceContainer serviceContainer; private MSBuildEngine(IProject project, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink) { diff --git a/src/Main/Base/Project/Src/Project/MSBuildFileProject.cs b/src/Main/Base/Project/Src/Project/MSBuildFileProject.cs index 233a300052..ccfe8feeab 100644 --- a/src/Main/Base/Project/Src/Project/MSBuildFileProject.cs +++ b/src/Main/Base/Project/Src/Project/MSBuildFileProject.cs @@ -22,9 +22,9 @@ namespace ICSharpCode.SharpDevelop.Project TypeGuid = "{00000000-0000-0000-0000-000000000000}"; } - public override void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink) + public override void StartBuild(ProjectBuildOptions options, IBuildFeedbackSink feedbackSink) { - MSBuildEngine.StartBuild(this, buildServices, options, feedbackSink, MSBuildEngine.AdditionalTargetFiles); + MSBuildEngine.StartBuild(this, options, feedbackSink, MSBuildEngine.AdditionalTargetFiles); } } } diff --git a/src/Main/Base/Project/Src/Project/Solution/Solution.cs b/src/Main/Base/Project/Src/Project/Solution/Solution.cs index dae8dce496..1972ffc99f 100644 --- a/src/Main/Base/Project/Src/Project/Solution/Solution.cs +++ b/src/Main/Base/Project/Src/Project/Solution/Solution.cs @@ -1202,7 +1202,7 @@ namespace ICSharpCode.SharpDevelop.Project return result; } - void IBuildable.StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink) + void IBuildable.StartBuild(ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink) { // building a solution finishes immediately: we only care for the dependencies feedbackSink.Done(true); diff --git a/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs b/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs index be51dcc4aa..dd0ead90ef 100644 --- a/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs +++ b/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs @@ -151,7 +151,7 @@ namespace ICSharpCode.SharpDevelop.Project return new IBuildable[0]; } - public void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink) + public void StartBuild(ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink) { } } @@ -245,11 +245,11 @@ namespace ICSharpCode.SharpDevelop.Project return lastCompilationPass.Index > comparisonPass.Index; } - public void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink) + public void StartBuild(ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink) { IProject p = wrapped as IProject; if (p == null) { - wrapped.StartBuild(buildServices, buildOptions, feedbackSink); + wrapped.StartBuild(buildOptions, feedbackSink); } else { lock (unmodifiedProjects) { if (!unmodifiedProjects.TryGetValue(p, out lastCompilationPass)) { @@ -272,7 +272,7 @@ namespace ICSharpCode.SharpDevelop.Project feedbackSink.Done(true); } else { lastCompilationPass = factory.CurrentPass; - wrapped.StartBuild(buildServices, buildOptions, new BuildFeedbackSink(p, feedbackSink, factory.CurrentPass)); + wrapped.StartBuild(buildOptions, new BuildFeedbackSink(p, feedbackSink, factory.CurrentPass)); } } }