From 28cfdce5b092a21d6fa79c4f8057ab9d636f5649 Mon Sep 17 00:00:00 2001 From: Inga Lovinde <52715130+inga-lovinde@users.noreply.github.com> Date: Mon, 19 Oct 2015 18:05:19 +0300 Subject: [PATCH] Custom .NET configuration support implemented --- BuildServer/lib/tasks/dotnetbuild.js | 1 + BuildServer/lib/tasks/dotnetcompile.js | 1 + BuildServer/lib/tasks/dotnetpackwebapp.js | 1 + DotNetBuilder/CompileRequest.cs | 2 ++ DotNetBuilder/Compiler.cs | 2 +- 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/BuildServer/lib/tasks/dotnetbuild.js b/BuildServer/lib/tasks/dotnetbuild.js index 7a70d3c..64c8f21 100644 --- a/BuildServer/lib/tasks/dotnetbuild.js +++ b/BuildServer/lib/tasks/dotnetbuild.js @@ -24,6 +24,7 @@ module.exports = function (params, processor) { skipCodeSigning: params.skipCodeSigning, forceCodeAnalysis: params.forceCodeAnalysis, ignoreCodeAnalysis: params.ignoreCodeAnalysis, + configuration: params.configuration, target: "Build" } } diff --git a/BuildServer/lib/tasks/dotnetcompile.js b/BuildServer/lib/tasks/dotnetcompile.js index 553bd72..ad18e9f 100644 --- a/BuildServer/lib/tasks/dotnetcompile.js +++ b/BuildServer/lib/tasks/dotnetcompile.js @@ -7,6 +7,7 @@ module.exports = function (params, processor) { var compileParams = { command: "compile", SolutionPath: processor.context.exported + "/" + params.solution, + Configuration: params.configuration, Target: params.target, OutputDirectory: params.overrideOutputDirectory }; diff --git a/BuildServer/lib/tasks/dotnetpackwebapp.js b/BuildServer/lib/tasks/dotnetpackwebapp.js index 1ad7755..75a5fe8 100644 --- a/BuildServer/lib/tasks/dotnetpackwebapp.js +++ b/BuildServer/lib/tasks/dotnetpackwebapp.js @@ -40,6 +40,7 @@ module.exports = function (params, processor) { solution: "MakePackage.msbuild", skipCodeSigning: params.skipCodeSigning, isCodeAnalysisUnsupported: params.isCodeAnalysisUnsupported, + configuration: params.configuration, target: "Package", overrideOutputDirectory: processor.context.release } diff --git a/DotNetBuilder/CompileRequest.cs b/DotNetBuilder/CompileRequest.cs index 9bf16ba..600382c 100644 --- a/DotNetBuilder/CompileRequest.cs +++ b/DotNetBuilder/CompileRequest.cs @@ -6,6 +6,8 @@ public string Target { get; set; } + public string Configuration { get; set; } + public string OutputDirectory { get; set; } public string SigningKey { get; set; } diff --git a/DotNetBuilder/Compiler.cs b/DotNetBuilder/Compiler.cs index aa40747..6e4e412 100644 --- a/DotNetBuilder/Compiler.cs +++ b/DotNetBuilder/Compiler.cs @@ -76,7 +76,7 @@ namespace MicroBuildServer.DotNetBuilder var pc = new ProjectCollection(); var globalProperty = new Dictionary(); - globalProperty.Add("Configuration", "Release"); + globalProperty.Add("Configuration", request.Configuration ?? "Release"); globalProperty.Add("Platform", "Any CPU"); globalProperty.Add("VisualStudioVersion", "14.0"); if (!string.IsNullOrEmpty(request.OutputDirectory))