Skip to content

Commit 1db2828

Browse files
mergify[bot]mergify[bot]
authored
Merge pull request #3698 from GitTools/dependabot/nuget/NUnit.Analyzers-3.8.0
(deps): Bump NUnit.Analyzers from 3.6.1 to 3.8.0
2 parents 5e8efaf + 5b0f81d commit 1db2828

File tree

8 files changed

+14
-11
lines changed

8 files changed

+14
-11
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
6161
dotnet_style_prefer_simplified_interpolation = true:suggestion
6262

6363
# Dispose rules (CA2000 and CA2213) ported to IDE analyzers. We already execute the CA rules on the repo, so disable the IDE ones.
64+
dotnet_diagnostic.IDE0005.severity = none
6465
dotnet_diagnostic.IDE0067.severity = none
6566
dotnet_diagnostic.IDE0068.severity = none
6667
dotnet_diagnostic.IDE0069.severity = none
6768
dotnet_diagnostic.CA1016.severity = none
68-
6969
#### C# Coding Conventions ####
7070

7171
# Prefer "var" everywhere

‎src/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<PackageVersion Include="MSBuild.ProjectCreation" Version="10.0.0" />
2525
<PackageVersion Include="NSubstitute" Version="5.1.0" />
2626
<PackageVersion Include="NUnit" Version="3.13.3" />
27-
<PackageVersion Include="NUnit.Analyzers" Version="3.6.1" />
27+
<PackageVersion Include="NUnit.Analyzers" Version="3.8.0" />
2828
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
2929
<PackageVersion Include="JunitXml.TestLogger" Version="3.0.134" />
3030
<PackageVersion Include="Roslynator.Analyzers" Version="4.5.0" />

‎src/GitVersion.Core.Tests/MergeMessageTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void EmptyMessageString(string message)
3131
[TestCase("")]
3232
[TestCase("\t\t ")]
3333
[TestCase(null)]
34-
public void EmptyTagPrefix(string prefix)
34+
public void EmptyTagPrefix(string? prefix)
3535
{
3636
// Arrange
3737
const string message = "Updated some code.";

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void ToStringWithInvalidFormatTest()
8686
[TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
8787
[TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4")]
8888
[TestCase(1, 2, 3, "", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4")]
89-
public string ToStringTests(int major, int minor, int patch, string preReleaseName, int? preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
89+
public string ToStringTests(int major, int minor, int patch, string? preReleaseName, int? preReleaseVersion, int? buildCount, string? branchName, string? sha, string? otherMetadata)
9090
{
9191
var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
9292
return semVer.ToString();
@@ -96,7 +96,7 @@ public string ToStringTests(int major, int minor, int patch, string preReleaseNa
9696
[TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
9797
[TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4")]
9898
[TestCase(1, 2, 3, "", 4, 10, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4")]
99-
public string ToStringWithSFormatTests(int major, int minor, int patch, string preReleaseName, int? preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
99+
public string ToStringWithSFormatTests(int major, int minor, int patch, string? preReleaseName, int? preReleaseVersion, int? buildCount, string? branchName, string? sha, string? otherMetadata)
100100
{
101101
var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
102102
return semVer.ToString("s");
@@ -105,7 +105,7 @@ public string ToStringWithSFormatTests(int major, int minor, int patch, string p
105105
[TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
106106
[TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3")]
107107
[TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3")]
108-
public string ToStringWithFormatJTests(int major, int minor, int patch, string preReleaseName, int? preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
108+
public string ToStringWithFormatJTests(int major, int minor, int patch, string? preReleaseName, int? preReleaseVersion, int? buildCount, string? branchName, string? sha, string? otherMetadata)
109109
{
110110
var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
111111
return semVer.ToString("j");
@@ -115,7 +115,7 @@ public string ToStringWithFormatJTests(int major, int minor, int patch, string p
115115
[TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
116116
[TestCase(1, 2, 3, "beta", 4, 5, null, null, null, ExpectedResult = "1.2.3-beta.4+5")]
117117
[TestCase(1, 2, 3, "", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4+5")]
118-
public string ToStringWithFormatFTests(int major, int minor, int patch, string preReleaseName, int? preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
118+
public string ToStringWithFormatFTests(int major, int minor, int patch, string? preReleaseName, int? preReleaseVersion, int? buildCount, string? branchName, string? sha, string? otherMetadata)
119119
{
120120
var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
121121
return semVer.ToString("f");
@@ -125,7 +125,7 @@ public string ToStringWithFormatFTests(int major, int minor, int patch, string p
125125
[TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
126126
[TestCase(1, 2, 3, "beta", 4, 5, null, null, null, ExpectedResult = "1.2.3-beta.4+5")]
127127
[TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4+5.Branch.theBranch.Sha.theSha.theOtherMetaData")]
128-
public string ToStringWithFormatITests(int major, int minor, int patch, string preReleaseName, int? preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
128+
public string ToStringWithFormatITests(int major, int minor, int patch, string? preReleaseName, int? preReleaseVersion, int? buildCount, string? branchName, string? sha, string? otherMetadata)
129129
{
130130
var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
131131
return semVer.ToString("i");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void ShouldNotTakeVersionFromUnrelatedMerge(string commitMessage)
136136
[TestCase("Merge branch 'support/0.2.0'", "support", "0.2.0")]
137137
[TestCase("Merge branch 'support/0.2.0'", null, null)]
138138
[TestCase("Merge branch 'release/2.0.0'", null, "2.0.0")]
139-
public void TakesVersionFromMergeOfConfiguredReleaseBranch(string message, string? releaseBranch, string expectedVersion)
139+
public void TakesVersionFromMergeOfConfiguredReleaseBranch(string message, string? releaseBranch, string? expectedVersion)
140140
{
141141
var configurationBuilder = GitFlowConfigurationBuilder.New;
142142
if (releaseBranch != null)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class AssemblyFileVersionTests : TestBase
1212
[TestCase(AssemblyFileVersioningScheme.MajorMinorPatch, 1, 2, 3, 4, "1.2.3.0")]
1313
[TestCase(AssemblyFileVersioningScheme.MajorMinorPatchTag, 1, 2, 3, 4, "1.2.3.4")]
1414
public void ValidateAssemblyFileVersionBuilder(AssemblyFileVersioningScheme assemblyFileVersioningScheme, int major, int minor, int patch,
15-
int tag, string versionString)
15+
int tag, string? versionString)
1616
{
1717
var semVer = new SemanticVersion(major, minor, patch)
1818
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class InformationalVersionBuilderTests : TestBase
1919
[TestCase("release/1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "beta2", null, null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
2020
[TestCase("release/1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "alpha2", null, null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
2121
public void ValidateInformationalVersionBuilder(string branchName, string sha, string shortSha, int major, int minor, int patch,
22-
string tag, string versionSourceSha, int? commitsSinceTag, string versionString)
22+
string? tag, string? versionSourceSha, int? commitsSinceTag, string versionString)
2323
{
2424
var semanticVersion = new SemanticVersion
2525
{

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ public void Setup()
3535
this.projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
3636
}
3737

38+
[TearDown]
39+
public void Teardown() => this.projectFileUpdater.Dispose();
40+
3841
[TestCase("Microsoft.NET.Sdk")]
3942
[TestCase("Microsoft.NET.Sdk.Worker")]
4043
[TestCase("Microsoft.NET.Sdk.Web")]

0 commit comments

Comments
 (0)