diff --git a/DotNetBuilder/Compiler.cs b/DotNetBuilder/Compiler.cs index fecbb51..9b1878d 100644 --- a/DotNetBuilder/Compiler.cs +++ b/DotNetBuilder/Compiler.cs @@ -74,6 +74,7 @@ namespace MicroBuildServer.DotNetBuilder var globalProperty = new Dictionary(); globalProperty.Add("Configuration", "Release"); globalProperty.Add("Platform", "Any CPU"); + globalProperty.Add("VisualStudioVersion", "14.0"); if (!string.IsNullOrEmpty(request.OutputDirectory)) { globalProperty.Add("OutputDirectory", request.OutputDirectory); @@ -89,7 +90,7 @@ namespace MicroBuildServer.DotNetBuilder globalProperty.Add("CodeAnalysisRuleSet", request.CodeAnalysisRuleSet); } - var buildRequest = new BuildRequestData(request.SolutionPath, globalProperty, null, new [] { request.Target }, null); + var buildRequest = new BuildRequestData(request.SolutionPath, globalProperty, "14.0", new [] { request.Target }, null); var parameters = new BuildParameters(pc); parameters.Loggers = new ILogger[] { logger }; diff --git a/DotNetBuilder/MicroBuildServer.DotNetBuilder.csproj b/DotNetBuilder/MicroBuildServer.DotNetBuilder.csproj index 23a63dc..cc946a2 100644 --- a/DotNetBuilder/MicroBuildServer.DotNetBuilder.csproj +++ b/DotNetBuilder/MicroBuildServer.DotNetBuilder.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,10 +9,11 @@ Properties MicroBuildServer.DotNetBuilder MicroBuildServer.DotNetBuilder - v4.0 + v4.6 512 ..\ true + x86 @@ -23,6 +24,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -32,16 +34,27 @@ TRACE prompt 4 + false ..\packages\NUnit.Runners.2.6.3\tools\lib\log4net.dll - - - - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll + + C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.dll + + + C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.Engine.dll + + + C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.Framework.dll + + + C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.Utilities.Core.dll + + + ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + True ..\packages\NuGet.CommandLine.2.8.5\tools\NuGet.exe @@ -94,7 +107,9 @@ - + + Designer + diff --git a/DotNetBuilder/app.config b/DotNetBuilder/app.config index 4e3d51b..0712cda 100644 --- a/DotNetBuilder/app.config +++ b/DotNetBuilder/app.config @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/DotNetBuilder/packages.config b/DotNetBuilder/packages.config index a788ea1..f525b72 100644 --- a/DotNetBuilder/packages.config +++ b/DotNetBuilder/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file