diff --git a/src/stampver.Tests/stampverTests.cs b/src/stampver.Tests/stampverTests.cs index 9e5e631..30ada06 100644 --- a/src/stampver.Tests/stampverTests.cs +++ b/src/stampver.Tests/stampverTests.cs @@ -569,10 +569,10 @@ public void CallingStampverWithIncrementPatchCommandWithVerbose_IncrementsAndOut TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.1\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.1\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.1.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.1.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.1\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.1\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.1.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.1.0\")]"); } [Test] @@ -592,10 +592,10 @@ public void CallingStampverWithIncrementBuildCommandWithVerbose_IncrementsAndOut TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.1\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.1\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.1.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.1.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.1\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.1\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.1.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.1.0\")]"); } [Test] @@ -615,10 +615,10 @@ public void CallingStampverWithIncrementMinorCommandWithVerbose_IncrementsAndOut TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.4.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.4.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.1.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.1.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.4.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.4.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.1.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.1.0.0\")]"); } [Test] @@ -638,10 +638,10 @@ public void CallingStampverWithIncrementMajorCommandWithVerbose_IncrementsAndOut TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"2.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"2.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"2.0.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"2.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"2.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"2.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"2.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"2.0.0.0\")]"); } [Test] @@ -680,10 +680,10 @@ public void CallingStampverWithDecrementPatchCommandWithVerbose_IncrementsAndOut TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); } [Test] @@ -703,10 +703,10 @@ public void CallingStampverWithDecrementBuildCommandWithVerbose_IncrementsAndOut TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); } [Test] @@ -726,10 +726,10 @@ public void CallingStampverWithDecrementMinorCommandWithVerbose_IncrementsAndOut TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.2.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.2.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.2.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.2.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); } [Test] @@ -749,10 +749,10 @@ public void CallingStampverWithDecrementMajorCommandWithVerbose_IncrementsAndOut TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"0.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"0.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"0.0.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"0.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"0.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"0.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"0.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"0.0.0.0\")]"); } [Test] @@ -791,10 +791,10 @@ public void CallingStampverWithExplicitVersionCommandAndValidVersionNumberWithVe TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"5.6.7\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"5.6.7\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"5.6.7\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"5.6.7\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"5.6.7\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"5.6.7\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"5.6.7\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Changed (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"5.6.7\")]"); } [Test] @@ -832,10 +832,10 @@ public void CallingStampverWithIncrementPatchCommandWithDryrun_IncrementsAndOutp TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.1\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.1\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.1.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.1.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.1\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.1\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.1.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.1.0\")]"); } [Test] @@ -854,10 +854,10 @@ public void CallingStampverWithIncrementBuildCommandWithDryrun_IncrementsAndOutp TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.1\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.1\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.1.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.1.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.1\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.1\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.1.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.1.0\")]"); } [Test] @@ -876,10 +876,10 @@ public void CallingStampverWithIncrementMinorCommandWithDryrun_IncrementsAndOutp TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.4.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.4.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.1.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.1.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.4.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.4.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.1.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.1.0.0\")]"); } [Test] @@ -898,10 +898,10 @@ public void CallingStampverWithIncrementMajorCommandWithDryrun_IncrementsAndOutp TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"2.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"2.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"2.0.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"2.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"2.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"2.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"2.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"2.0.0.0\")]"); } [Test] @@ -939,10 +939,10 @@ public void CallingStampverWithDecrementPatchCommandWithDryrun_IncrementsAndOutp TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); } [Test] @@ -961,10 +961,10 @@ public void CallingStampverWithDecrementBuildCommandWithDryrun_IncrementsAndOutp TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); } [Test] @@ -983,10 +983,10 @@ public void CallingStampverWithDecrementMinorCommandWithDryrun_IncrementsAndOutp TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.2.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.2.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"1.2.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"1.2.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"1.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"1.0.0.0\")]"); } [Test] @@ -1005,10 +1005,10 @@ public void CallingStampverWithDecrementMajorCommandWithDryrun_IncrementsAndOutp TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"0.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"0.3.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"0.0.0.0\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"0.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"0.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"0.3.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"0.0.0.0\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"0.0.0.0\")]"); } [Test] @@ -1046,10 +1046,10 @@ public void CallingStampverWithExplicitVersionCommandAndValidVersionNumberWithDr TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File1"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File2"); TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Processing file: File3"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"5.6.7\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"5.6.7\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"5.6.7\")]"); - TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change: [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"5.6.7\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 36): [assembly: AssemblyVersion(\"1.3.0\")] to [assembly: AssemblyVersion(\"5.6.7\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 37): [assembly: AssemblyFileVersion(\"1.3.0\")] to [assembly: AssemblyFileVersion(\"5.6.7\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 34): [assembly: AssemblyVersion(\"1.0.0.0\")] to [assembly: AssemblyVersion(\"5.6.7\")]"); + TestHelpers.AssertContains(fakeIOWrapper.StdOutputLines, "Would change (Line 35): [assembly: AssemblyFileVersion(\"1.0.0.0\")] to [assembly: AssemblyFileVersion(\"5.6.7\")]"); } [Test] diff --git a/src/stampver/Stampver.cs b/src/stampver/Stampver.cs index 2cff3fe..b8e4d1f 100644 --- a/src/stampver/Stampver.cs +++ b/src/stampver/Stampver.cs @@ -72,7 +72,7 @@ public void Run() for (var i = 0; i < fileLines.Length; i++) { - var result = ProcessFileLine(fileLines[i], versionArgs); + var result = ProcessFileLine(fileLines[i], i+1, versionArgs); if (result.LineWasModified) { fileHasBeenModified = true; @@ -115,7 +115,7 @@ public void Run() } } - private ProcessedLineResult ProcessFileLine(string fileLine, VersionArgs versionArgs) + private ProcessedLineResult ProcessFileLine(string fileLine, int fileLineNumber, VersionArgs versionArgs) { var regex = new Regex(@"Assembly(?:|File)Version\(""(?\d{1,5}\.\d{1,5}\.(?:\d{1,5}|\*|)(?:\.|)(?:\d{1,5}|\*|))""\)"); @@ -147,8 +147,8 @@ private ProcessedLineResult ProcessFileLine(string fileLine, VersionArgs version replacedVersionNumber = originalAssemblyVersion.GetVersionString(); } var newFileLine = fileLine.Replace(originalVersionNumber, replacedVersionNumber); - var prefix = versionArgs.IsDryrun ? "Would Change:" : "Changed:"; - LogIfVerbose($"{prefix} {fileLine} to {newFileLine}", versionArgs); + var prefix = versionArgs.IsDryrun ? "Would Change" : "Changed"; + LogIfVerbose($"{prefix} (Line {fileLineNumber}): {fileLine} to {newFileLine}", versionArgs); return new ProcessedLineResult(newFileLine, true, replacedVersionNumber); }