diff options
author | Lluis Sanchez Gual <lluis@xamarin.com> | 2014-04-04 20:02:26 +0400 |
---|---|---|
committer | Lluis Sanchez Gual <lluis@xamarin.com> | 2014-04-04 20:02:26 +0400 |
commit | 55910a7cd4a86f65983766546c6de62cc41813ad (patch) | |
tree | 85e81d387df5233358d014765b63b9fc1a763ff8 /main/src/core/MonoDevelop.Core | |
parent | 23f4f51f44c1d670af182791097f139f11eda353 (diff) | |
parent | ed5af81c38d7689c4e94ef6a20f5b503718bdd66 (diff) |
Merge branch 'master' into fsharp
Conflicts:
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Core')
5 files changed, 19 insertions, 12 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs index 00af6845a0..a03241af68 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs @@ -195,7 +195,14 @@ namespace MonoDevelop.Core.Assemblies TargetFramework fx; if (frameworks.TryGetValue (id, out fx)) return fx; - LoggingService.LogWarning ("Unregistered TargetFramework '{0}' is being requested from SystemAssemblyService", id); + + LoggingService.LogDebug ("Unregistered TargetFramework '{0}' is being requested from SystemAssemblyService, ensuring rutimes initialized and trying again", id); + foreach (var r in runtimes) + r.EnsureInitialized (); + if (frameworks.TryGetValue (id, out fx)) + return fx; + + LoggingService.LogWarning ("Unregistered TargetFramework '{0}' is being requested from SystemAssemblyService, returning empty TargetFramework", id); UpdateFrameworks (new [] { new TargetFramework (id) }); return frameworks [id]; } diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj index fc69a02190..a5ce773221 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj @@ -493,11 +493,6 @@ </EmbeddedResource> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <Target Name="BeforeBuild"> - <MakeDir Directories="$(OutputPath)" /> - <Exec Command=""$(Git)" rev-parse HEAD > $(BuildInfo)" WorkingDirectory="$(MSBuildProjectDirectory)" IgnoreExitCode="True" /> - <Exec Command=""$(Git)" rev-parse HEAD > $(VcRevision)" WorkingDirectory="$(MSBuildProjectDirectory)" IgnoreExitCode="True" /> - </Target> <ItemGroup> <ProjectReference Include="..\MonoDevelop.Projects.Formats.MSBuild\MonoDevelop.Projects.Formats.MSBuild.csproj"> <Project>{A437F1A3-78DF-4F00-8053-D32A8B1EB679}</Project> @@ -561,9 +556,12 @@ <ItemGroup> <Folder Include="MonoDevelop.Core.Web\" /> </ItemGroup> - <Target Name="BeforeBuild" Inputs="BuildVariables.cs.in; $(MSBuildProjectDirectory)\..\..\..\..\version.txt" Outputs="BuildVariables.cs"> + <Target Name="BeforeBuild" Inputs="BuildVariables.cs.in; $(MSBuildProjectDirectory)\..\..\..\..\version.config" Outputs="BuildVariables.cs"> <Csc Sources="BuildVariables.gen.cs" OutputAssembly="BuildVariables.gen.exe" /> <Exec Command="$(MonoLauncher)$(MSBuildProjectDirectory)\BuildVariables.gen.exe ." WorkingDirectory="$(MSBuildProjectDirectory)" /> <Delete Files="BuildVariables.gen.exe" /> + <MakeDir Directories="$(OutputPath)" /> + <Exec Command=""$(Git)" rev-parse HEAD > $(BuildInfo)" WorkingDirectory="$(MSBuildProjectDirectory)" IgnoreExitCode="True" /> + <Exec Command=""$(Git)" rev-parse HEAD > $(VcRevision)" WorkingDirectory="$(MSBuildProjectDirectory)" IgnoreExitCode="True" /> </Target> </Project> diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs index 5c8f5467e5..6b91a9fcdd 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs @@ -261,7 +261,9 @@ namespace MonoDevelop.Projects.Formats.MSBuild var br = new BuildResult (); foreach (MSBuildResult res in results) { - FilePath file = Path.Combine (Path.GetDirectoryName (res.ProjectFile), res.File); + FilePath file = null; + if (res.File != null) + file = Path.Combine (Path.GetDirectoryName (res.ProjectFile), res.File); if (res.IsWarning) br.AddWarning (file, res.LineNumber, res.ColumnNumber, res.Code, res.Message); diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommandExtension.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommandExtension.cs index f3c891fc88..fc0a9bf77b 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommandExtension.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CustomCommandExtension.cs @@ -79,7 +79,7 @@ namespace MonoDevelop.Projects { SolutionItemConfiguration conf = entry.GetConfiguration (configuration) as SolutionItemConfiguration; if (conf != null) { - ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory); + ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory, context.ExecutionTarget); if (conf.CustomCommands.CanExecute (entry, CustomCommandType.BeforeExecute, localContext, configuration)) conf.CustomCommands.ExecuteCommand (monitor, entry, CustomCommandType.BeforeExecute, localContext, configuration); @@ -91,7 +91,7 @@ namespace MonoDevelop.Projects base.Execute (monitor, entry, context, configuration); if (conf != null && !monitor.IsCancelRequested) { - ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory); + ExecutionContext localContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, context.ConsoleFactory, context.ExecutionTarget); if (conf.CustomCommands.CanExecute (entry, CustomCommandType.AfterExecute, localContext, configuration)) conf.CustomCommands.ExecuteCommand (monitor, entry, CustomCommandType.AfterExecute, localContext, configuration); diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExecutionContext.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExecutionContext.cs index 110c88431c..3c9207fe3e 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExecutionContext.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ExecutionContext.cs @@ -38,14 +38,14 @@ namespace MonoDevelop.Projects IConsoleFactory consoleFactory; ExecutionTarget executionTarget; - public ExecutionContext (IExecutionMode executionMode, IConsoleFactory consoleFactory, ExecutionTarget target = null) + public ExecutionContext (IExecutionMode executionMode, IConsoleFactory consoleFactory, ExecutionTarget target) { this.executionHandler = executionMode.ExecutionHandler; this.consoleFactory = consoleFactory; this.executionTarget = target; } - public ExecutionContext (IExecutionHandler executionHandler, IConsoleFactory consoleFactory, ExecutionTarget target = null) + public ExecutionContext (IExecutionHandler executionHandler, IConsoleFactory consoleFactory, ExecutionTarget target) { this.executionHandler = executionHandler; this.consoleFactory = consoleFactory; |