From 2b0c75136dccbd0a911dd40a7c0935e2d2efa261 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 13 Apr 2014 13:57:14 +0200 Subject: [PATCH] For ToolsVersion="12.0" projects, use the MSBuild 12.0 engine. --- README.md | 15 +-- SharpDevelop.Tests.sln | 7 ++ SharpDevelop.sln | 15 ++- clean.bat | 6 +- debugbuild.bat | 4 +- releasebuild.bat | 4 +- src/Automated.proj | 4 +- ...CSharpCode.SharpDevelop.BuildWorker.csproj | 6 +- .../app.config | 6 +- .../Configuration/AssemblyInfo.cs | 27 +++++ ...arpCode.SharpDevelop.BuildWorker120.csproj | 101 ++++++++++++++++++ .../app.config | 32 ++++++ .../Build/MSBuildEngine/BuildWorkerManager.cs | 1 + .../MSBuildEngine/MSBuildEngineWorker.cs | 4 +- src/Main/SharpDevelop/SharpDevelop.csproj | 2 +- .../Templates/SharpDevelop.Setup.sln | 18 ++++ src/Setup/Files.wxs | 6 ++ src/Setup/Setup.wxs | 1 + 18 files changed, 237 insertions(+), 22 deletions(-) create mode 100644 src/Main/ICSharpCode.SharpDevelop.BuildWorker120/Configuration/AssemblyInfo.cs create mode 100644 src/Main/ICSharpCode.SharpDevelop.BuildWorker120/ICSharpCode.SharpDevelop.BuildWorker120.csproj create mode 100644 src/Main/ICSharpCode.SharpDevelop.BuildWorker120/app.config create mode 100644 src/Main/SharpDevelop/Templates/SharpDevelop.Setup.sln diff --git a/README.md b/README.md index c43697f4fd..15807e93b5 100644 --- a/README.md +++ b/README.md @@ -26,12 +26,13 @@ If you want to contribute see ["Joining the team"](https://github.com/icsharpcod ##Extended Requirements (building #Develop) + - [Microsoft Build Tools 2013](www.microsoft.com/en-us/download/details.aspx?id=40760) - [.NET 3.5 SP1](http://www.microsoft.com/en-au/download/details.aspx?id=22) - - [.NET 4.5 SDK](http://www.microsoft.com/en-au/download/details.aspx?id=30653) (part of [Windows SDK 8.0](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx)) - - Windows SDK 7.1 (?? not sure if this still is necessary...) - - Windows SDK 7.0 (optional; C++ compiler needed for profiler) + - [.NET 4.5 SDK] (part of [Windows SDK 8.0](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx)) + - [Windows SDK 7.1](http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B) (?? not sure if this still is necessary...) + - [Windows SDK 7.0](http://www.microsoft.com/en-us/download/details.aspx?id=3138) (optional; C++ compiler needed for profiler) - [Windows PowerShell](http://www.microsoft.com/en-us/download/details.aspx?id=34595) - - [SD Git Repository](https://github.com/icsharpcode/SharpDevelop.git) + - If you have cloned the SD git repository: git must be available on your PATH ##Libraries and Integrated tools: @@ -42,7 +43,7 @@ If you want to contribute see ["Joining the team"](https://github.com/icsharpcod * [ITextSharp](http://sourceforge.net/projects/itextsharp/) * [log4Net](https://github.com/apache/log4net) * Mono T4 -* [Mono.Cecil](https://github.com/jbevain/cecil): MIT License (thanks to **Jb Evain**) - +* [Mono.Cecil](https://github.com/jbevain/cecil): MIT License (thanks to **Jb Evain**) * [Sharp Svn](https://sharpsvn.open.collab.net/) * [SQLite](https://sqlite.org/) * [WPFToolkit](https://wpf.codeplex.com/) @@ -58,8 +59,8 @@ If you want to contribute see ["Joining the team"](https://github.com/icsharpcod ##Reusable Libraries (Part of #Develop): -* [AvalonEdit](https://github.com/icsharpcode/SharpDevelop/wiki/AvalonEdit) -* Debugger.Core +* [AvalonEdit](http://avalonedit.net/) +* [Debugger.Core](https://github.com/icsharpcode/SharpDevelop/tree/master/src/AddIns/Debugger/Debugger.Core) * [ICSharpCode.Core](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Main/Core) * [ICSharpCode.Decompiler](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Libraries/ICSharpCode.Decompiler) * [NRefactory](https://github.com/icsharpcode/NRefactory) diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln index abb69b1f6b..6a3094b7fe 100644 --- a/SharpDevelop.Tests.sln +++ b/SharpDevelop.Tests.sln @@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Wi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDevelop", "src\Main\SharpDevelop\SharpDevelop.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker120", "src\Main\ICSharpCode.SharpDevelop.BuildWorker120\ICSharpCode.SharpDevelop.BuildWorker120.csproj", "{6F273DA5-E10C-45A6-9071-7313ECD98C90}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{2A232EF1-EB95-41C6-B63A-C106E0C95D3C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" @@ -280,6 +282,10 @@ Global {1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|Any CPU.Build.0 = Debug|Any CPU {1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.ActiveCfg = Release|Any CPU {1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.Build.0 = Release|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.Build.0 = Release|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU @@ -647,6 +653,7 @@ Global {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} {8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} {1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {6F273DA5-E10C-45A6-9071-7313ECD98C90} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} {D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} {6222A3A1-83CE-47A3-A4E4-A018F82D44D8} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} diff --git a/SharpDevelop.sln b/SharpDevelop.sln index c425e8c62c..681b50ed21 100644 --- a/SharpDevelop.sln +++ b/SharpDevelop.sln @@ -22,6 +22,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Wi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDevelop", "src\Main\SharpDevelop\SharpDevelop.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker120", "src\Main\ICSharpCode.SharpDevelop.BuildWorker120\ICSharpCode.SharpDevelop.BuildWorker120.csproj", "{6F273DA5-E10C-45A6-9071-7313ECD98C90}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{2A232EF1-EB95-41C6-B63A-C106E0C95D3C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" @@ -229,6 +231,10 @@ Global {1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|Any CPU.Build.0 = Debug|Any CPU {1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.ActiveCfg = Release|Any CPU {1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.Build.0 = Release|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.Build.0 = Release|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU @@ -373,6 +379,10 @@ Global {40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.Build.0 = Debug|Any CPU {40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.ActiveCfg = Release|Any CPU {40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.Build.0 = Release|Any CPU + {0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.Build.0 = Release|Any CPU {0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.Build.0 = Debug|Any CPU {0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -497,10 +507,6 @@ Global {3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.Build.0 = Debug|Any CPU {3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.ActiveCfg = Release|Any CPU {3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.Build.0 = Release|Any CPU - {0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -514,6 +520,7 @@ Global {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} {8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} {1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {6F273DA5-E10C-45A6-9071-7313ECD98C90} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} {D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} diff --git a/clean.bat b/clean.bat index fe06abd3ec..98b7efba83 100755 --- a/clean.bat +++ b/clean.bat @@ -1,4 +1,6 @@ -%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug +@set PROGFILES=%PROGRAMFILES% +@if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)% +"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug @IF %ERRORLEVEL% NEQ 0 PAUSE -%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release +"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release @IF %ERRORLEVEL% NEQ 0 PAUSE \ No newline at end of file diff --git a/debugbuild.bat b/debugbuild.bat index f39954f3bb..7d4ad2a1ad 100755 --- a/debugbuild.bat +++ b/debugbuild.bat @@ -1,4 +1,6 @@ -%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU" +@set PROGFILES=%PROGRAMFILES% +@if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)% +"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU" %* @IF %ERRORLEVEL% NEQ 0 GOTO err @exit /B 0 :err diff --git a/releasebuild.bat b/releasebuild.bat index cb115d984f..2a49d9c333 100755 --- a/releasebuild.bat +++ b/releasebuild.bat @@ -1,4 +1,6 @@ -%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU" +@set PROGFILES=%PROGRAMFILES% +@if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)% +"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU" %* @IF %ERRORLEVEL% NEQ 0 GOTO err @exit /B 0 :err diff --git a/src/Automated.proj b/src/Automated.proj index 7943a7578f..5b47626ecd 100644 --- a/src/Automated.proj +++ b/src/Automated.proj @@ -21,8 +21,8 @@ properties available for the projects inside the solution (but this works using the command line) --> - - "$(MSBuildBinPath)\..\v4.0.30319\msbuild.exe" + + "$(MSBuildExtensionsPath)\12.0\Bin\msbuild.exe" /m /p:Configuration=Release $(BuildProperties) "/p:SharpDevelopBinPath=$(SharpDevelopBin)" $(BuildProperties) "/p:FSharpBuildTasksPath=$(SharpDevelopSrc)\AddIns\BackendBindings\FSharp\RequiredLibraries" diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj index 8580f8ef95..424ff79e3d 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj @@ -49,8 +49,10 @@ - - + + + 4.0 + 3.5 diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config index 92fe986e09..5691c95e4c 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config @@ -1,6 +1,10 @@  - + + +
+ + diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/Configuration/AssemblyInfo.cs b/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/Configuration/AssemblyInfo.cs new file mode 100644 index 0000000000..1d6c87f697 --- /dev/null +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/Configuration/AssemblyInfo.cs @@ -0,0 +1,27 @@ +// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this +// software and associated documentation files (the "Software"), to deal in the Software +// without restriction, including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or +// substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + +using System; +using System.Reflection; + +[assembly: AssemblyTitle("SharpDevelop Build Worker for MSBuild 12.0")] +[assembly: AssemblyDescription("Runs MSBuild 12.0")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: CLSCompliant(true)] diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/ICSharpCode.SharpDevelop.BuildWorker120.csproj b/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/ICSharpCode.SharpDevelop.BuildWorker120.csproj new file mode 100644 index 0000000000..9bc7e6672d --- /dev/null +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/ICSharpCode.SharpDevelop.BuildWorker120.csproj @@ -0,0 +1,101 @@ + + + + {6F273DA5-E10C-45A6-9071-7313ECD98C90} + Debug + AnyCPU + Exe + ICSharpCode.SharpDevelop.BuildWorker + ICSharpCode.SharpDevelop.BuildWorker120 + v4.5.1 + False + False + 4 + False + ..\..\..\bin\ + True + ..\ICSharpCode.SharpDevelop.snk + False + File + False + -Microsoft.Globalization#CA1303 + + + False + obj\$(Configuration)\ + + + true + Full + False + True + DEBUG;TRACE + obj\ + + + False + None + True + False + TRACE + + + False + Off + 4194304 + AnyCPU + 4096 + True + + + + + + + + 3.5 + + + + + + + Configuration\GlobalAssemblyInfo.cs + + + BuildJob.cs + + + EventSource.cs + + + EventTypes.cs + + + ExtendedBinaryReader.cs + + + HostProcess.cs + + + MSBuild40.cs + + + Program.cs + + + + + + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} + ICSharpCode.Core + false + + + + + + + + + \ No newline at end of file diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/app.config b/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/app.config new file mode 100644 index 0000000000..0e9d54308b --- /dev/null +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/app.config @@ -0,0 +1,32 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Main/SharpDevelop/Project/Build/MSBuildEngine/BuildWorkerManager.cs b/src/Main/SharpDevelop/Project/Build/MSBuildEngine/BuildWorkerManager.cs index 507c61df1b..1fd518f4bd 100644 --- a/src/Main/SharpDevelop/Project/Build/MSBuildEngine/BuildWorkerManager.cs +++ b/src/Main/SharpDevelop/Project/Build/MSBuildEngine/BuildWorkerManager.cs @@ -34,6 +34,7 @@ namespace ICSharpCode.SharpDevelop.Project readonly List freeWorkers = new List(); readonly string workerProcessName; + public static readonly BuildWorkerManager MSBuild120 = new BuildWorkerManager("ICSharpCode.SharpDevelop.BuildWorker120.exe"); public static readonly BuildWorkerManager MSBuild40 = new BuildWorkerManager("ICSharpCode.SharpDevelop.BuildWorker40.exe"); public static readonly BuildWorkerManager MSBuild35 = new BuildWorkerManager("ICSharpCode.SharpDevelop.BuildWorker35.exe"); diff --git a/src/Main/SharpDevelop/Project/Build/MSBuildEngine/MSBuildEngineWorker.cs b/src/Main/SharpDevelop/Project/Build/MSBuildEngine/MSBuildEngineWorker.cs index a1cefac003..88a221d635 100644 --- a/src/Main/SharpDevelop/Project/Build/MSBuildEngine/MSBuildEngineWorker.cs +++ b/src/Main/SharpDevelop/Project/Build/MSBuildEngine/MSBuildEngineWorker.cs @@ -159,8 +159,10 @@ namespace ICSharpCode.SharpDevelop.Project loggerChain.HandleError(new BuildError(job.ProjectFileName, ".NET 3.5 SP1 is required to build this project.")); tcs.SetResult(false); } - } else { + } else if (projectMinimumSolutionVersion <= SolutionFormatVersion.VS2010) { BuildWorkerManager.MSBuild40.RunBuildJob(job, loggerChain, OnDone, cancellationToken); + } else { + BuildWorkerManager.MSBuild120.RunBuildJob(job, loggerChain, OnDone, cancellationToken); } return tcs.Task; } diff --git a/src/Main/SharpDevelop/SharpDevelop.csproj b/src/Main/SharpDevelop/SharpDevelop.csproj index 90d7f354bf..abc1ba0b2e 100644 --- a/src/Main/SharpDevelop/SharpDevelop.csproj +++ b/src/Main/SharpDevelop/SharpDevelop.csproj @@ -258,6 +258,7 @@ Never + @@ -330,7 +331,6 @@ - diff --git a/src/Main/SharpDevelop/Templates/SharpDevelop.Setup.sln b/src/Main/SharpDevelop/Templates/SharpDevelop.Setup.sln new file mode 100644 index 0000000000..bad5c47864 --- /dev/null +++ b/src/Main/SharpDevelop/Templates/SharpDevelop.Setup.sln @@ -0,0 +1,18 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +# SharpDevelop 4.0.0.5860 +Project("{CFEE4113-1246-4D54-95CB-156813CB8593}") = "SharpDevelop.Setup", "SharpDevelop.Setup.wixproj", "{FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}.Release|Any CPU.Build.0 = Release|Any CPU + {FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}.Release|Any CPU.ActiveCfg = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs index 768ca1de22..c9aaef23c8 100644 --- a/src/Setup/Files.wxs +++ b/src/Setup/Files.wxs @@ -312,6 +312,12 @@ + + + + + + diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs index 1502825aff..1633ffb543 100644 --- a/src/Setup/Setup.wxs +++ b/src/Setup/Setup.wxs @@ -195,6 +195,7 @@ +