Skip to content

Commit c5a8605

Browse files
CopilotAArnott
andcommitted
Fix StyleCop warnings and reorganize WriteToOutput method
Co-authored-by: AArnott <[email protected]>
1 parent 407eb5a commit c5a8605

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

src/NerdBank.GitVersioning/ReleaseManager.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,12 @@ public ReleaseInfo SimulatePrepareRelease(string projectDirectory, string releas
325325
return new ReleaseInfo(originalBranchInfo, releaseBranchInfo);
326326
}
327327

328+
public void WriteToOutput(ReleaseInfo releaseInfo)
329+
{
330+
string json = JsonConvert.SerializeObject(releaseInfo, Formatting.Indented, new SemanticVersionJsonConverter());
331+
this.stdout.WriteLine(json);
332+
}
333+
328334
private static bool IsVersionDecrement(SemanticVersion oldVersion, SemanticVersion newVersion)
329335
{
330336
if (newVersion.Version > oldVersion.Version)
@@ -479,12 +485,6 @@ private SemanticVersion GetNextDevVersion(VersionOptions versionOptions, Version
479485
return nextDevVersion.SetFirstPrereleaseTag(versionOptions.ReleaseOrDefault.FirstUnstableTagOrDefault);
480486
}
481487

482-
public void WriteToOutput(ReleaseInfo releaseInfo)
483-
{
484-
string json = JsonConvert.SerializeObject(releaseInfo, Formatting.Indented, new SemanticVersionJsonConverter());
485-
this.stdout.WriteLine(json);
486-
}
487-
488488
/// <summary>
489489
/// Exception indicating an error during preparation of a release.
490490
/// </summary>

test/Nerdbank.GitVersioning.Tests/ReleaseManagerTests.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ private void AssertError(Action testCode, ReleasePreparationError expectedError)
720720
public void SimulatePrepareRelease_BasicScenario()
721721
{
722722
this.InitializeSourceControl();
723-
723+
724724
var versionOptions = new VersionOptions()
725725
{
726726
Version = SemanticVersion.Parse("1.2-beta"),
@@ -746,7 +746,7 @@ public void SimulatePrepareRelease_BasicScenario()
746746
public void SimulatePrepareRelease_WithPrereleaseTag()
747747
{
748748
this.InitializeSourceControl();
749-
749+
750750
var versionOptions = new VersionOptions()
751751
{
752752
Version = SemanticVersion.Parse("1.2-beta"),
@@ -772,7 +772,7 @@ public void SimulatePrepareRelease_WithPrereleaseTag()
772772
public void SimulatePrepareRelease_WithVersionIncrement()
773773
{
774774
this.InitializeSourceControl();
775-
775+
776776
var versionOptions = new VersionOptions()
777777
{
778778
Version = SemanticVersion.Parse("1.2-beta"),
@@ -798,7 +798,7 @@ public void SimulatePrepareRelease_WithVersionIncrement()
798798
public void SimulatePrepareRelease_WithNextVersion()
799799
{
800800
this.InitializeSourceControl();
801-
801+
802802
var versionOptions = new VersionOptions()
803803
{
804804
Version = SemanticVersion.Parse("1.2-beta"),
@@ -820,14 +820,13 @@ public void SimulatePrepareRelease_WithNextVersion()
820820
Assert.Equal("1.5-alpha", result.CurrentBranch.Version.ToString());
821821
}
822822

823-
// Note: SameVersionError test removed because it requires very specific conditions
823+
// Note: SameVersionError test removed because it requires very specific conditions
824824
// that are difficult to reproduce in simulation mode
825-
826825
[Fact]
827826
public void SimulatePrepareRelease_BranchAlreadyExists()
828827
{
829828
this.InitializeSourceControl();
830-
829+
831830
var versionOptions = new VersionOptions()
832831
{
833832
Version = SemanticVersion.Parse("1.2-beta"),
@@ -853,7 +852,7 @@ public void SimulatePrepareRelease_BranchAlreadyExists()
853852
public void SimulatePrepareRelease_OnReleaseBranch()
854853
{
855854
this.InitializeSourceControl();
856-
855+
857856
var versionOptions = new VersionOptions()
858857
{
859858
Version = SemanticVersion.Parse("1.2-beta"),

0 commit comments

Comments
 (0)