Removing Contract.Assume

HHobeck · HHobeck · commit 9ddc1f35404b · 2024-02-22T16:34:13.000+01:00
diff --git a/src/GitVersion.Core/Git/ReferenceName.cs b/src/GitVersion.Core/Git/ReferenceName.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Contracts;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 using GitVersion.Helpers;
@@ -85,8 +84,6 @@ public bool TryGetSemanticVersion([NotNullWhen(true)] out (SemanticVersion Value
     {
         result = default;
 
-        Contract.Assume(versionPatternRegex.ToString().StartsWith('^'));
-
         int length = 0;
         foreach (var branchPart in WithoutOrigin.Split(GetBranchSeparator()))
         {
diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeliveryVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeliveryVersionCalculator.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics.Contracts;
 using GitVersion.Common;
 using GitVersion.Logging;
 
@@ -23,20 +22,17 @@ public SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseV
 
     private SemanticVersion CalculateInternal(SemanticVersion semanticVersion, ICommit? baseVersionSource)
     {
-        Contract.Assume(semanticVersion.PreReleaseTag.Number.HasValue);
-
         var buildMetaData = CreateVersionBuildMetaData(baseVersionSource);
-        Contract.Assume(buildMetaData.CommitsSinceTag.HasValue);
 
         return new SemanticVersion(semanticVersion)
         {
             PreReleaseTag = new SemanticVersionPreReleaseTag(semanticVersion.PreReleaseTag)
             {
-                Number = semanticVersion.PreReleaseTag.Number.Value + buildMetaData.CommitsSinceTag - 1
+                Number = semanticVersion.PreReleaseTag.Number!.Value + buildMetaData.CommitsSinceTag - 1
             },
             BuildMetaData = new SemanticVersionBuildMetaData(buildMetaData)
             {
-                CommitsSinceVersionSource = buildMetaData.CommitsSinceTag.Value,
+                CommitsSinceVersionSource = buildMetaData.CommitsSinceTag!.Value,
                 CommitsSinceTag = null
             }
         };
diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeploymentVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculators/ContinuousDeploymentVersionCalculator.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics.Contracts;
 using GitVersion.Common;
 using GitVersion.Logging;
 
@@ -18,14 +17,13 @@ public SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseV
     private SemanticVersion CalculateInternal(SemanticVersion semanticVersion, ICommit? baseVersionSource)
     {
         var buildMetaData = CreateVersionBuildMetaData(baseVersionSource);
-        Contract.Assume(buildMetaData.CommitsSinceTag.HasValue);
 
         return new SemanticVersion(semanticVersion)
         {
             PreReleaseTag = SemanticVersionPreReleaseTag.Empty,
             BuildMetaData = new SemanticVersionBuildMetaData(buildMetaData)
             {
-                CommitsSinceVersionSource = buildMetaData.CommitsSinceTag.Value,
+                CommitsSinceVersionSource = buildMetaData.CommitsSinceTag!.Value,
                 CommitsSinceTag = null
             }
         };
diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculators/ManualDeploymentVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculators/ManualDeploymentVersionCalculator.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics.Contracts;
 using GitVersion.Common;
 using GitVersion.Logging;
 
@@ -18,7 +17,6 @@ public SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseV
     private SemanticVersion CalculateInternal(SemanticVersion semanticVersion, ICommit? baseVersionSource)
     {
         var buildMetaData = CreateVersionBuildMetaData(baseVersionSource);
-        Contract.Assume(buildMetaData.CommitsSinceTag.HasValue);
 
         return new SemanticVersion(semanticVersion)
         {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Diagnostics.CodeAnalysis;`
`2`		`-using System.Diagnostics.Contracts;`
`3`	`2`	`using System.Text.RegularExpressions;`
`4`	`3`	`using GitVersion.Extensions;`
`5`	`4`	`using GitVersion.Helpers;`
`@@ -85,8 +84,6 @@ public bool TryGetSemanticVersion([NotNullWhen(true)] out (SemanticVersion Value`
`85`	`84`	`{`
`86`	`85`	`result = default;`
`87`	`86`
`88`		`- Contract.Assume(versionPatternRegex.ToString().StartsWith('^'));`
`89`		`-`
`90`	`87`	`int length = 0;`
`91`	`88`	`foreach (var branchPart in WithoutOrigin.Split(GetBranchSeparator()))`
`92`	`89`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System.Diagnostics.Contracts;`
`2`	`1`	`using GitVersion.Common;`
`3`	`2`	`using GitVersion.Logging;`
`4`	`3`
`@@ -23,20 +22,17 @@ public SemanticVersion Calculate(SemanticVersion semanticVersion, ICommit? baseV`
`23`	`22`
`24`	`23`	`private SemanticVersion CalculateInternal(SemanticVersion semanticVersion, ICommit? baseVersionSource)`
`25`	`24`	`{`
`26`		`- Contract.Assume(semanticVersion.PreReleaseTag.Number.HasValue);`
`27`		`-`
`28`	`25`	`var buildMetaData = CreateVersionBuildMetaData(baseVersionSource);`
`29`		`- Contract.Assume(buildMetaData.CommitsSinceTag.HasValue);`
`30`	`26`
`31`	`27`	`return new SemanticVersion(semanticVersion)`
`32`	`28`	`{`
`33`	`29`	`PreReleaseTag = new SemanticVersionPreReleaseTag(semanticVersion.PreReleaseTag)`
`34`	`30`	`{`
`35`		`- Number = semanticVersion.PreReleaseTag.Number.Value + buildMetaData.CommitsSinceTag - 1`
	`31`	`+ Number = semanticVersion.PreReleaseTag.Number!.Value + buildMetaData.CommitsSinceTag - 1`
`36`	`32`	`},`
`37`	`33`	`BuildMetaData = new SemanticVersionBuildMetaData(buildMetaData)`
`38`	`34`	`{`
`39`		`- CommitsSinceVersionSource = buildMetaData.CommitsSinceTag.Value,`
	`35`	`+ CommitsSinceVersionSource = buildMetaData.CommitsSinceTag!.Value,`
`40`	`36`	`CommitsSinceTag = null`
`41`	`37`	`}`
`42`	`38`	`};`