diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-04-03 15:11:31 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-04-03 15:11:31 +0400 |
| commit | 04cd009e59f43027f3c929ebe8e2a54d1dcf8e7f (patch) | |
| tree | f26750dc82c97e9d3c65d2a795bc2440e45cb93e /main/src/core/MonoDevelop.Core | |
| parent | d198191ff7ca99572289eb3d747efbd12cbc29ea (diff) | |
| parent | 2a2acd5ead201d2efc29a850d7c9635535d781ed (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Core')
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj | 10 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj index 1baa40ba82..ab314fa0b0 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj @@ -498,11 +498,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> @@ -567,9 +562,12 @@ <Folder Include="MonoDevelop.Core.Web\" /> <Folder Include="MonoDevelop.Projects.SharedAssetsProjects\" /> </ItemGroup> - <Target Name="BeforeBuild" Inputs="BuildVariables.cs.in; ..\..\..\..\version.config" 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 197ff41d21..3aa93435ad 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 @@ -287,7 +287,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); |