From 593d8cfe5c42113e3f5405b9fb5009cb9577c4ce Mon Sep 17 00:00:00 2001 From: Peter Kurhajec <61538034+PTKu@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:57:17 +0100 Subject: [PATCH] Remove support for .net 7 & updates to giversion 6.0.5 (#343) * updates to giversion 6.0.5 * removes support for dotnet 7 --- GitVersion.yml | 141 +++++++++++++++++++++++++---------- cake/Build.csproj | 2 +- cake/BuildContext.cs | 2 +- src/Directory.Build.props | 2 +- src/Directory.Packages.props | 24 +++--- 5 files changed, 116 insertions(+), 55 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index aa73778d..34fa3d31 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,54 +1,117 @@ -mode: ContinuousDeployment +assembly-versioning-scheme: MajorMinorPatch +assembly-file-versioning-scheme: MajorMinorPatch next-version: 0.19.3 +tag-prefix: '[vV]?' +version-in-branch-pattern: (?[vV]?\d+(\.\d+)?(\.\d+)?).* +major-version-bump-message: \+semver:\s?(breaking|major) +minor-version-bump-message: \+semver:\s?(feature|minor) +patch-version-bump-message: \+semver:\s?(fix|patch) +no-bump-message: \+semver:\s?(none|skip) +tag-pre-release-weight: 60000 +commit-date-format: yyyy-MM-dd +merge-message-formats: {} +update-build-number: true +semantic-version-format: Strict +strategies: +- Fallback +- ConfiguredNextVersion +- MergeMessage +- TaggedCommit +- TrackReleaseBranches +- VersionInBranchName branches: main: - regex: ^master$|^main$ - mode: ContinuousDelivery - tag: '' + label: '' increment: Patch - prevent-increment-of-merged-branch-version: true + prevent-increment: + of-merged-branch: true track-merge-target: false - source-branches: [ 'develop', 'release' ] + track-merge-message: true + regex: ^master$|^main$ + source-branches: [] + is-source-branch-for: [] tracks-release-branches: false is-release-branch: false - is-mainline: true + is-main-branch: true pre-release-weight: 55000 - develop: - regex: ^dev(elop)?(ment)?$ - mode: ContinuousDeployment - tag: alpha - increment: Minor - prevent-increment-of-merged-branch-version: false - track-merge-target: true - source-branches: [] - tracks-release-branches: true - is-release-branch: false - is-mainline: false - pre-release-weight: 0 release: - regex: ^releases?[/-] - mode: ContinuousDeployment - tag: preview - increment: None - prevent-increment-of-merged-branch-version: true + mode: ManualDeployment + label: beta + increment: Patch + prevent-increment: + of-merged-branch: true + when-branch-merged: false + when-current-commit-tagged: false track-merge-target: false - source-branches: [ 'develop', 'main', 'support', 'release' ] + track-merge-message: true + regex: ^releases?[/-](?.+) + source-branches: + - main + is-source-branch-for: [] tracks-release-branches: false is-release-branch: true - is-mainline: false - pre-release-weight: 30000 - support: - regex: ^support[/-] + is-main-branch: false + pre-release-weight: 30000 + feature: + mode: ManualDeployment + label: '{BranchName}' + increment: Inherit + prevent-increment: + when-current-commit-tagged: false + track-merge-message: true + regex: ^features?[/-](?.+) + source-branches: + - main + - release + is-source-branch-for: [] + is-main-branch: false + pre-release-weight: 30000 + pull-request: mode: ContinuousDelivery - tag: '' - increment: Patch - prevent-increment-of-merged-branch-version: true - track-merge-target: false - source-branches: [ 'main' ] - tracks-release-branches: false - is-release-branch: false - is-mainline: true - pre-release-weight: 55000 + label: PullRequest + increment: Inherit + prevent-increment: + of-merged-branch: true + when-current-commit-tagged: false + label-number-pattern: '[/-](?\d+)' + track-merge-message: true + regex: ^(pull|pull\-requests|pr)[/-] + source-branches: + - main + - release + - feature + is-source-branch-for: [] + pre-release-weight: 30000 + unknown: + mode: ManualDeployment + label: '{BranchName}' + increment: Inherit + prevent-increment: + when-current-commit-tagged: false + track-merge-message: false + regex: (?.+) + source-branches: + - main + - release + - feature + - pull-request + is-source-branch-for: [] + is-main-branch: false ignore: sha: [] -merge-message-formats: {} +mode: ContinuousDelivery +label: '{BranchName}' +increment: Inherit +prevent-increment: + of-merged-branch: false + when-branch-merged: false + when-current-commit-tagged: true +track-merge-target: false +track-merge-message: true +commit-message-incrementing: Enabled +regex: '' +source-branches: [] +is-source-branch-for: [] +tracks-release-branches: false +is-release-branch: false +is-main-branch: false \ No newline at end of file diff --git a/cake/Build.csproj b/cake/Build.csproj index d7d6396d..0de3fe35 100644 --- a/cake/Build.csproj +++ b/cake/Build.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/cake/BuildContext.cs b/cake/BuildContext.cs index 3cf6b17b..606b1157 100644 --- a/cake/BuildContext.cs +++ b/cake/BuildContext.cs @@ -169,7 +169,7 @@ public void PushNugetPackages(string artifactDirectory) } } - public IEnumerable TargetFrameworks { get; } = new List() { "net7.0", "net8.0" }; + public IEnumerable TargetFrameworks { get; } = new List() { "net8.0" }; public IEnumerable<(string ax, string approject, string solution)> GetTemplateProjects() { diff --git a/src/Directory.Build.props b/src/Directory.Build.props index aabf5692..4e39d447 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,6 @@ - net7.0;net8.0 + net8.0 diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index fe967625..8d02745e 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -1,26 +1,24 @@ - true false true - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + @@ -35,14 +33,14 @@ - + - - - + + + - - + + @@ -61,4 +59,4 @@ - + \ No newline at end of file