fix merge conflict

SonarSource · Mar 9, 2023 · 120a069 · 120a069
1 parent f01f121
commit 120a069
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/TestFramework/AnalysisScaffolding.cs b/analyzers/tests/SonarAnalyzer.UnitTest/TestFramework/AnalysisScaffolding.cs
@@ -91,23 +91,8 @@ public static string CreateSonarProjectConfigWithFilesToAnalyze(TestContext cont
             string[] testExclusions = null,
             string[] testInclusions = null,
             string[] globalTestExclusions = null) =>
-<<<<<<< HEAD
+
             TestHelper.WriteFile(context, "SonarLint.xml", GenerateSonarLintXmlContent(language, analyzeGeneratedCode, exclusions, inclusions, globalExclusions, testExclusions, testInclusions, globalTestExclusions));
-=======
-            TestHelper.WriteFile(context, "SonarLint.xml",
-                new XDocument(
-                    new XDeclaration("1.0", "utf-8", "yes"),
-                    new XElement("AnalysisInput",
-                        new XElement("Settings",
-                            CreateKeyValuePair("Setting", $"sonar.{(language == LanguageNames.CSharp ? "cs" : "vbnet")}.ignoreHeaderComments", ignoreHeaderComments.ToString()),
-                            CreateKeyValuePair("Setting", $"sonar.{(language == LanguageNames.CSharp ? "cs" : "vbnet")}.analyzeGeneratedCode", analyzeGeneratedCode.ToString()),
-                            CreateKeyValuePair("Setting", "sonar.exclusions", string.Join(",", exclusions ?? Array.Empty<string>())),
-                            CreateKeyValuePair("Setting", "sonar.inclusions", string.Join(",", inclusions ?? Array.Empty<string>())),
-                            CreateKeyValuePair("Setting", "sonar.global.exclusions", string.Join(",", globalExclusions ?? Array.Empty<string>())),
-                            CreateKeyValuePair("Setting", "sonar.test.exclusions", string.Join(",", testExclusions ?? Array.Empty<string>())),
-                            CreateKeyValuePair("Setting", "sonar.test.inclusions", string.Join(",", testInclusions ?? Array.Empty<string>())),
-                            CreateKeyValuePair("Setting", "sonar.global.test.exclusions", string.Join(",", globalTestExclusions ?? Array.Empty<string>()))))).ToString());
->>>>>>> 11aa64900 (Addressed PR comments)
 
         public static string GenerateSonarLintXmlContent(
             string language = LanguageNames.CSharp,