feat: add a 'None' IncrementType which does not perform any increment…

… operation
philasmar · Mar 20, 2024 · 66b0c02 · 66b0c02
1 parent dae6b9e
commit 66b0c02
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 9 deletions.
diff --git a/.autover/autover.json b/.autover/autover.json
@@ -6,5 +6,6 @@
       "IncrementType": "Patch"
     }
   ],
-  "UseCommitsForChangelog": false
+  "UseCommitsForChangelog": false,
+  "DefaultIncrementType": "Patch"
 }
diff --git a/.autover/changes/91e799df-e484-4aa6-b145-c257a82b748b.json b/.autover/changes/91e799df-e484-4aa6-b145-c257a82b748b.json
@@ -0,0 +1,10 @@
+{
+  "Projects": [
+    {
+      "Name": "AutoVer",
+      "ChangelogMessages": [
+        "Add a \u0027None\u0027 IncrementType which does not perform any increment operation"
+      ]
+    }
+  ]
+}
diff --git a/.autover/changes/e0a1bb4c-3276-420d-bce0-5091551ed578.json b/.autover/changes/e0a1bb4c-3276-420d-bce0-5091551ed578.json
@@ -0,0 +1,10 @@
+{
+  "Projects": [
+    {
+      "Name": "AutoVer",
+      "ChangelogMessages": [
+        "Add icon to the AutoVer NuGet package"
+      ]
+    }
+  ]
+}
diff --git a/.gitignore b/.gitignore
@@ -396,4 +396,6 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
-.idea/
+.idea/
+
+.DS_Store
diff --git a/icon.png b/icon.png
diff --git a/src/AutoVer/AutoVer.csproj b/src/AutoVer/AutoVer.csproj
@@ -17,19 +17,21 @@
         <RepositoryType>git</RepositoryType>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
+        <PackageIcon>icon.png</PackageIcon>
         <Version>0.0.14</Version>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LibGit2Sharp" Version="0.29.0" />
+      <PackageReference Include="LibGit2Sharp" Version="0.30.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
       <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-      <PackageReference Include="System.Text.Json" Version="8.0.0" />
+      <PackageReference Include="System.Text.Json" Version="8.0.3" />
     </ItemGroup>
 
     <ItemGroup>
         <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
         <None Include="..\..\README.md" Pack="true" PackagePath="" />
+        <None Include="..\..\icon.png" Pack="true" PackagePath="" />
     </ItemGroup>
 
 </Project>
diff --git a/src/AutoVer/Models/IncrementType.cs b/src/AutoVer/Models/IncrementType.cs
@@ -2,6 +2,7 @@ namespace AutoVer.Models;
 
 public enum IncrementType
 {
+    None,
     Patch,
     Minor,
     Major

diff --git a/src/AutoVer/Models/UserConfiguration.cs b/src/AutoVer/Models/UserConfiguration.cs
@@ -7,9 +7,10 @@ public class UserConfiguration
     internal string? GitRoot { get; set; }
     internal bool PersistConfiguration { get; set; }
     public List<Project> Projects { get; set; } = [];
-
     public bool UseCommitsForChangelog { get; set; } = true;
-
+
+    [JsonConverter(typeof(JsonStringEnumConverter))]
+    public IncrementType DefaultIncrementType { get; set; } = IncrementType.Patch;
     public Dictionary<string, string>? ChangelogCategories { get; set; }
 
     public class Project

diff --git a/src/AutoVer/Services/ConfigurationManager.cs b/src/AutoVer/Services/ConfigurationManager.cs
@@ -113,7 +113,7 @@ public async Task ResetUserConfiguration(UserConfiguration userConfiguration, Us
                     changeFileHandler.ResetChangeFiles(userConfiguration);
 
                 if (resetRequest.IncrementType)
-                    project.IncrementType = IncrementType.Patch;
+                    project.IncrementType = userConfiguration.DefaultIncrementType;
             }
 
             await using (var stream = new FileStream(configPath, FileMode.Create))

diff --git a/src/AutoVer/Services/IProjectHandler.cs b/src/AutoVer/Services/IProjectHandler.cs
@@ -5,6 +5,6 @@ namespace AutoVer.Services;
 public interface IProjectHandler
 {
     Task<List<ProjectDefinition>> GetAvailableProjects(string? projectPath);
-    void UpdateVersion(ProjectDefinition projectDefinition, IncrementType incrementType = IncrementType.Patch, string? prereleaseLabel = null);
+    void UpdateVersion(ProjectDefinition projectDefinition, IncrementType incrementType, string? prereleaseLabel = null);
     bool ProjectHasVersionTag(ProjectDefinition projectDefinition);
 }
diff --git a/src/AutoVer/Services/IVersionIncrementer.cs b/src/AutoVer/Services/IVersionIncrementer.cs
@@ -5,5 +5,5 @@ namespace AutoVer.Services;
 public interface IVersionIncrementer
 {
     ThreePartVersion GetCurrentVersion(string? versionText);
-    ThreePartVersion GetNextVersion(string? versionText, IncrementType incrementType = IncrementType.Patch, string? prereleaseLabel = null);
+    ThreePartVersion GetNextVersion(string? versionText, IncrementType incrementType, string? prereleaseLabel = null);
 }
diff --git a/src/AutoVer/Services/ThreePartVersionIncrementer.cs b/src/AutoVer/Services/ThreePartVersionIncrementer.cs
@@ -37,6 +37,8 @@ public ThreePartVersion GetNextVersion(string? versionText, IncrementType increm
             case IncrementType.Patch:
                 nextVersion.Patch += 1;
                 break;
+            case IncrementType.None:
+                break;
         }
 
         return nextVersion;
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ namespace AutoVer.Models; @@
     public enum IncrementType
     {
+        None,
         Patch,
         Minor,
         Major
@@ Expand Down @@