From c1077ca1ccec6d1fa090ca33ec8f37e10abcdb90 Mon Sep 17 00:00:00 2001 From: Richard Webb Date: Fri, 14 Feb 2025 23:47:11 +0000 Subject: [PATCH] Don't try to disable CA2243 in the generated version info files for F# --- src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs | 7 ++++++- test/Nerdbank.GitVersioning.Tests/AssemblyInfoTest.cs | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs b/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs index 28bb33201..238627f13 100644 --- a/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs +++ b/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs @@ -709,9 +709,14 @@ public FSharpCodeGenerator(string ns) { } + protected override IEnumerable WarningCodesToSuppress { get; } = []; + internal override void AddAnalysisSuppressions() { - this.CodeBuilder.AppendLine($"#nowarn {string.Join(" ", this.WarningCodesToSuppress.Select(c => $"\"{c}\""))}"); + if (this.WarningCodesToSuppress.Any()) + { + this.CodeBuilder.AppendLine($"#nowarn {string.Join(" ", this.WarningCodesToSuppress.Select(c => $"\"{c}\""))}"); + } } internal override void AddComment(string comment) diff --git a/test/Nerdbank.GitVersioning.Tests/AssemblyInfoTest.cs b/test/Nerdbank.GitVersioning.Tests/AssemblyInfoTest.cs index 390aa42d2..45b2aa3aa 100644 --- a/test/Nerdbank.GitVersioning.Tests/AssemblyInfoTest.cs +++ b/test/Nerdbank.GitVersioning.Tests/AssemblyInfoTest.cs @@ -61,7 +61,6 @@ public void FSharpGenerator(bool? thisAssemblyClass) // //------------------------------------------------------------------------------ -#nowarn ""CA2243"" namespace AssemblyInfo [] @@ -121,7 +120,6 @@ public void FSharpGeneratorWithNamespace(string thisAssemblyNamespace, string ro // //------------------------------------------------------------------------------ -#nowarn ""CA2243"" namespace {( !string.IsNullOrWhiteSpace(thisAssemblyNamespace)