diff --git a/BuildServer/lib/tasks/dotnetcompile.js b/BuildServer/lib/tasks/dotnetcompile.js
index 638fb79..e4d9c06 100644
--- a/BuildServer/lib/tasks/dotnetcompile.js
+++ b/BuildServer/lib/tasks/dotnetcompile.js
@@ -13,8 +13,16 @@ module.exports = function (params, processor) {
 	if (!settings.skipCodeSigning && !params.skipCodeSigning) {
 		compileParams.SigningKey = settings.codeSigningKeyFile;
 	}
-	if (!settings.isCodeAnalysisUnsupported && !params.ignoreCodeAnalysis) {
-		compileParams.CodeAnalysisRuleSet = settings.codeAnalysisRuleSet;
+	if (settings.isCodeAnalysisUnsupported) {
+		if (params.forceCodeAnalysis) {
+			processor.onError("Code analysis is not supported");
+			processor.done();
+			return;
+		}
+	} else {
+		if (!settings.ignoreCodeAnalysisByDefault || params.forceCodeAnalysis) {
+			compileParams.CodeAnalysisRuleSet = settings.codeAnalysisRuleSet;
+		}
 	}
 	return dotnetbuilderwrapper(compileParams, processor);
 }