From fccaf81287446e1f04f5d602ff8710edeed8f1d8 Mon Sep 17 00:00:00 2001
From: Inga Lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Wed, 30 Sep 2015 15:33:14 +0300
Subject: [PATCH] Removed CodeAnalysisRuleSet setting

---
 BuildServer/lib/tasks/dotnetcompile.js | 8 ++++++--
 DotNetBuilder/CompileRequest.cs        | 2 +-
 DotNetBuilder/Compiler.cs              | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/BuildServer/lib/tasks/dotnetcompile.js b/BuildServer/lib/tasks/dotnetcompile.js
index 05847e7..553bd72 100644
--- a/BuildServer/lib/tasks/dotnetcompile.js
+++ b/BuildServer/lib/tasks/dotnetcompile.js
@@ -19,9 +19,13 @@ module.exports = function (params, processor) {
 			processor.done();
 			return;
 		}
+		compileParams.SkipCodeAnalysis = true;
 	} else {
-		if ((!settings.ignoreCodeAnalysisByDefault && !params.ignoreCodeAnalysis) || params.forceCodeAnalysis) {
-			compileParams.CodeAnalysisRuleSet = settings.codeAnalysisRuleSet;
+		if (settings.ignoreCodeAnalysisByDefault && !params.forceCodeAnalysis) {
+			compileParams.SkipCodeAnalysis = true;
+		}
+		if (params.ignoreCodeAnalysis) {
+			compileParams.SkipCodeAnalysis = true;
 		}
 	}
 	return dotnetbuilderwrapper(compileParams, processor);
diff --git a/DotNetBuilder/CompileRequest.cs b/DotNetBuilder/CompileRequest.cs
index 669afa5..9bf16ba 100644
--- a/DotNetBuilder/CompileRequest.cs
+++ b/DotNetBuilder/CompileRequest.cs
@@ -10,6 +10,6 @@
 
 		public string SigningKey { get; set; }
 
-		public string CodeAnalysisRuleSet { get; set; }
+		public bool SkipCodeAnalysis { get; set; }
 	}
 }
diff --git a/DotNetBuilder/Compiler.cs b/DotNetBuilder/Compiler.cs
index 224d90f..aa40747 100644
--- a/DotNetBuilder/Compiler.cs
+++ b/DotNetBuilder/Compiler.cs
@@ -88,7 +88,7 @@ namespace MicroBuildServer.DotNetBuilder
 				globalProperty.Add("SignAssembly", "true");
 				globalProperty.Add("AssemblyOriginatorKeyFile", request.SigningKey);
 			}
-			if (!string.IsNullOrEmpty(request.CodeAnalysisRuleSet))
+			if (!request.SkipCodeAnalysis)
 			{
 				globalProperty.Add("RunCodeAnalysis", "true");
 				globalProperty.Add("CodeAnalysisRuleSet", Path.Combine(BuilderAssemblyDirectory, "AllRules.ruleset"));