From 66b0c0257797666d5daca11fcbcecf9196531459 Mon Sep 17 00:00:00 2001 From: Philippe El Asmar Date: Tue, 19 Mar 2024 22:37:46 -0400 Subject: [PATCH] feat: add a 'None' IncrementType which does not perform any increment operation --- .autover/autover.json | 3 ++- .../91e799df-e484-4aa6-b145-c257a82b748b.json | 10 ++++++++++ .../e0a1bb4c-3276-420d-bce0-5091551ed578.json | 10 ++++++++++ .gitignore | 4 +++- icon.png | Bin 0 -> 39614 bytes src/AutoVer/AutoVer.csproj | 6 ++++-- src/AutoVer/Models/IncrementType.cs | 1 + src/AutoVer/Models/UserConfiguration.cs | 5 +++-- src/AutoVer/Services/ConfigurationManager.cs | 2 +- src/AutoVer/Services/IProjectHandler.cs | 2 +- src/AutoVer/Services/IVersionIncrementer.cs | 2 +- .../Services/ThreePartVersionIncrementer.cs | 2 ++ 12 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 .autover/changes/91e799df-e484-4aa6-b145-c257a82b748b.json create mode 100644 .autover/changes/e0a1bb4c-3276-420d-bce0-5091551ed578.json create mode 100644 icon.png diff --git a/.autover/autover.json b/.autover/autover.json index 302f2f6..f949d43 100644 --- a/.autover/autover.json +++ b/.autover/autover.json @@ -6,5 +6,6 @@ "IncrementType": "Patch" } ], - "UseCommitsForChangelog": false + "UseCommitsForChangelog": false, + "DefaultIncrementType": "Patch" } \ No newline at end of file diff --git a/.autover/changes/91e799df-e484-4aa6-b145-c257a82b748b.json b/.autover/changes/91e799df-e484-4aa6-b145-c257a82b748b.json new file mode 100644 index 0000000..ffb6e61 --- /dev/null +++ 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" + ] + } + ] +} \ No newline at end of file diff --git a/.autover/changes/e0a1bb4c-3276-420d-bce0-5091551ed578.json b/.autover/changes/e0a1bb4c-3276-420d-bce0-5091551ed578.json new file mode 100644 index 0000000..df89632 --- /dev/null +++ b/.autover/changes/e0a1bb4c-3276-420d-bce0-5091551ed578.json @@ -0,0 +1,10 @@ +{ + "Projects": [ + { + "Name": "AutoVer", + "ChangelogMessages": [ + "Add icon to the AutoVer NuGet package" + ] + } + ] +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 0bdc52e..672a697 100644 --- a/.gitignore +++ b/.gitignore @@ -396,4 +396,6 @@ FodyWeavers.xsd # JetBrains Rider *.sln.iml -.idea/ \ No newline at end of file +.idea/ + +.DS_Store \ No newline at end of file diff --git a/icon.png b/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d28ec140c084ecda0db3ba4f5958537d7cceff34 GIT binary patch literal 39614 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∓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 README.md LICENSE + icon.png 0.0.14 - + - + + diff --git a/src/AutoVer/Models/IncrementType.cs b/src/AutoVer/Models/IncrementType.cs index 87c07e1..36158a0 100644 --- 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 index 4a0c497..c7005fb 100644 --- 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 Projects { get; set; } = []; - public bool UseCommitsForChangelog { get; set; } = true; - + + [JsonConverter(typeof(JsonStringEnumConverter))] + public IncrementType DefaultIncrementType { get; set; } = IncrementType.Patch; public Dictionary? ChangelogCategories { get; set; } public class Project diff --git a/src/AutoVer/Services/ConfigurationManager.cs b/src/AutoVer/Services/ConfigurationManager.cs index 96c16cb..915d3cb 100644 --- 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 index 90108a2..cd51491 100644 --- a/src/AutoVer/Services/IProjectHandler.cs +++ b/src/AutoVer/Services/IProjectHandler.cs @@ -5,6 +5,6 @@ namespace AutoVer.Services; public interface IProjectHandler { Task> 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); } \ No newline at end of file diff --git a/src/AutoVer/Services/IVersionIncrementer.cs b/src/AutoVer/Services/IVersionIncrementer.cs index 8504529..389d51e 100644 --- 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); } \ No newline at end of file diff --git a/src/AutoVer/Services/ThreePartVersionIncrementer.cs b/src/AutoVer/Services/ThreePartVersionIncrementer.cs index 6c32a98..b5b844d 100644 --- 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;