update expected

SonarSource · Mar 9, 2023 · 7fe2b29 · 7fe2b29
1 parent 520ee39
commit 7fe2b29
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 152 deletions.
diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S1186.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S1186.json
diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S2094.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S2094.json
diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3168.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3168.json
diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3990.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3990.json
diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3992.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3992.json
diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusionsTest--net7.0-S2699.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusionsTest--net7.0-S2699.json
diff --git a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude1.cs b/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude1.cs
diff --git a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude2.cs b/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude2.cs
diff --git a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude3.cs b/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude3.cs
diff --git a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Include.cs b/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Include.cs
diff --git a/...Exclusions/SonarLintExclusionsExcludeAllButOne/SonarLintExclusionsExcludeAllButOne.csproj b/...Exclusions/SonarLintExclusionsExcludeAllButOne/SonarLintExclusionsExcludeAllButOne.csproj
diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/TestFramework/AnalysisScaffolding.cs b/analyzers/tests/SonarAnalyzer.UnitTest/TestFramework/AnalysisScaffolding.cs
@@ -91,23 +91,7 @@ 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,