Merge pull request #3698 from GitTools/dependabot/nuget/NUnit.Analyze…

…rs-3.8.0

(deps): Bump NUnit.Analyzers from 3.6.1 to 3.8.0

.editorconfig

@@ -61,11 +61,11 @@ dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
 dotnet_style_prefer_simplified_interpolation = true:suggestion
 
 # Dispose rules (CA2000 and CA2213) ported to IDE analyzers. We already execute the CA rules on the repo, so disable the IDE ones.
+dotnet_diagnostic.IDE0005.severity = none
 dotnet_diagnostic.IDE0067.severity = none
 dotnet_diagnostic.IDE0068.severity = none
 dotnet_diagnostic.IDE0069.severity = none
 dotnet_diagnostic.CA1016.severity = none
-
 #### C# Coding Conventions ####
 
 # Prefer "var" everywhere

src/Directory.Packages.props

@@ -24,7 +24,7 @@
     <PackageVersion Include="MSBuild.ProjectCreation" Version="10.0.0" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="NUnit" Version="3.13.3" />
-    <PackageVersion Include="NUnit.Analyzers" Version="3.6.1" />
+    <PackageVersion Include="NUnit.Analyzers" Version="3.8.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="JunitXml.TestLogger" Version="3.0.134" />
     <PackageVersion Include="Roslynator.Analyzers" Version="4.5.0" />

src/GitVersion.Core.Tests/MergeMessageTests.cs

@@ -31,7 +31,7 @@ public void EmptyMessageString(string message)
     [TestCase("")]
     [TestCase("\t\t  ")]
     [TestCase(null)]
-    public void EmptyTagPrefix(string prefix)
+    public void EmptyTagPrefix(string? prefix)
     {
         // Arrange
         const string message = "Updated some code.";

src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs

@@ -86,7 +86,7 @@ public void ToStringWithInvalidFormatTest()
     [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
     [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4")]
     [TestCase(1, 2, 3, "", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4")]
-    public string ToStringTests(int major, int minor, int patch, string preReleaseName, int? preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
+    public string ToStringTests(int major, int minor, int patch, string? preReleaseName, int? preReleaseVersion, int? buildCount, string? branchName, string? sha, string? otherMetadata)
     {
         var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
         return semVer.ToString();
@@ -96,7 +96,7 @@ public string ToStringTests(int major, int minor, int patch, string preReleaseNa
     [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
     [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4")]
     [TestCase(1, 2, 3, "", 4, 10, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4")]
-    public string ToStringWithSFormatTests(int major, int minor, int patch, string preReleaseName, int? preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
+    public string ToStringWithSFormatTests(int major, int minor, int patch, string? preReleaseName, int? preReleaseVersion, int? buildCount, string? branchName, string? sha, string? otherMetadata)
     {
         var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
         return semVer.ToString("s");
@@ -105,7 +105,7 @@ public string ToStringWithSFormatTests(int major, int minor, int patch, string p
     [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
     [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3")]
     [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3")]
-    public string ToStringWithFormatJTests(int major, int minor, int patch, string preReleaseName, int? preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
+    public string ToStringWithFormatJTests(int major, int minor, int patch, string? preReleaseName, int? preReleaseVersion, int? buildCount, string? branchName, string? sha, string? otherMetadata)
     {
         var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
         return semVer.ToString("j");
@@ -115,7 +115,7 @@ public string ToStringWithFormatJTests(int major, int minor, int patch, string p
     [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
     [TestCase(1, 2, 3, "beta", 4, 5, null, null, null, ExpectedResult = "1.2.3-beta.4+5")]
     [TestCase(1, 2, 3, "", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4+5")]
-    public string ToStringWithFormatFTests(int major, int minor, int patch, string preReleaseName, int? preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
+    public string ToStringWithFormatFTests(int major, int minor, int patch, string? preReleaseName, int? preReleaseVersion, int? buildCount, string? branchName, string? sha, string? otherMetadata)
     {
         var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
         return semVer.ToString("f");
@@ -125,7 +125,7 @@ public string ToStringWithFormatFTests(int major, int minor, int patch, string p
     [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
     [TestCase(1, 2, 3, "beta", 4, 5, null, null, null, ExpectedResult = "1.2.3-beta.4+5")]
     [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4+5.Branch.theBranch.Sha.theSha.theOtherMetaData")]
-    public string ToStringWithFormatITests(int major, int minor, int patch, string preReleaseName, int? preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
+    public string ToStringWithFormatITests(int major, int minor, int patch, string? preReleaseName, int? preReleaseVersion, int? buildCount, string? branchName, string? sha, string? otherMetadata)
     {
         var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
         return semVer.ToString("i");

src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -136,7 +136,7 @@ public void ShouldNotTakeVersionFromUnrelatedMerge(string commitMessage)
     [TestCase("Merge branch 'support/0.2.0'", "support", "0.2.0")]
     [TestCase("Merge branch 'support/0.2.0'", null, null)]
     [TestCase("Merge branch 'release/2.0.0'", null, "2.0.0")]
-    public void TakesVersionFromMergeOfConfiguredReleaseBranch(string message, string? releaseBranch, string expectedVersion)
+    public void TakesVersionFromMergeOfConfiguredReleaseBranch(string message, string? releaseBranch, string? expectedVersion)
     {
         var configurationBuilder = GitFlowConfigurationBuilder.New;
         if (releaseBranch != null)

src/GitVersion.Output.Tests/Output/AssemblyFileVersionTests.cs

@@ -12,7 +12,7 @@ public class AssemblyFileVersionTests : TestBase
     [TestCase(AssemblyFileVersioningScheme.MajorMinorPatch, 1, 2, 3, 4, "1.2.3.0")]
     [TestCase(AssemblyFileVersioningScheme.MajorMinorPatchTag, 1, 2, 3, 4, "1.2.3.4")]
     public void ValidateAssemblyFileVersionBuilder(AssemblyFileVersioningScheme assemblyFileVersioningScheme, int major, int minor, int patch,
-        int tag, string versionString)
+        int tag, string? versionString)
     {
         var semVer = new SemanticVersion(major, minor, patch)
         {

src/GitVersion.Output.Tests/Output/InformationalVersionBuilderTests.cs

@@ -19,7 +19,7 @@ public class InformationalVersionBuilderTests : TestBase
     [TestCase("release/1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "beta2", null, null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
     [TestCase("release/1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "alpha2", null, null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
     public void ValidateInformationalVersionBuilder(string branchName, string sha, string shortSha, int major, int minor, int patch,
-        string tag, string versionSourceSha, int? commitsSinceTag, string versionString)
+        string? tag, string? versionSourceSha, int? commitsSinceTag, string versionString)
     {
         var semanticVersion = new SemanticVersion
         {

src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs

@@ -35,6 +35,9 @@ public void Setup()
         this.projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
     }
 
+    [TearDown]
+    public void Teardown() => this.projectFileUpdater.Dispose();
+
     [TestCase("Microsoft.NET.Sdk")]
     [TestCase("Microsoft.NET.Sdk.Worker")]
     [TestCase("Microsoft.NET.Sdk.Web")]