From a66f359bae007ccca94a40c72388d0c6884f1226 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Tue, 29 Aug 2023 06:23:32 -0600 Subject: [PATCH 1/9] regen .yml --- GitVersion.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 0f9ad3113..77322c4ef 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,34 +1,27 @@ -next-version: 1.14.0 - mode: ContinuousDeployment tag-prefix: '[vV]' -continuous-delivery-fallback-tag: 'pre' - +continuous-delivery-fallback-tag: pre +next-version: 1.14.0 branches: develop: mode: ContinuousDeployment tag: pre - regex: ^develop - + regex: ^develop?[/-] main: tag: rc increment: Patch source-branches: - develop - main -- feature: tag: useBranchName regex: ^features?[/-] source-branches: - develop - main -- pull-request: tag: PullRequest.{BranchName} increment: Inherit - - ignore: sha: [] merge-message-formats: {} From 16c272c891160769e4dcdf0e4cf76fb94cbd5aac Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:27:40 -0600 Subject: [PATCH 2/9] next version --- GitVersion.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/GitVersion.yml b/GitVersion.yml index 77322c4ef..6aa4a88a0 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,3 +1,4 @@ +next-version: 1.14.0 mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: pre From 1842cae74a6fbf3165b6411e2cd6085d65208e57 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:28:24 -0600 Subject: [PATCH 3/9] source-branch to develop --- GitVersion.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 6aa4a88a0..e36328d29 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -2,12 +2,13 @@ next-version: 1.14.0 mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: pre -next-version: 1.14.0 branches: develop: mode: ContinuousDeployment tag: pre regex: ^develop?[/-] + source-branches: + - main main: tag: rc increment: Patch From 1407b803ed1684df3b89cccd8cc104f903df682c Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:38:36 -0600 Subject: [PATCH 4/9] /b ? --- .github/workflows/publish.yml | 4 ++-- GitVersion.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0dbcde5f2..79613b03a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,14 +21,14 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0 with: - versionSpec: '6.x' + versionSpec: '5.x' includePrerelease: true - name: Determine Version uses: gittools/actions/gitversion/execute@v0 with: useConfigFile: true - #additionalArguments: /verbosity Diagnostic + additionalArguments: /b develop id: gitversion # step id used as reference for output values - name: Setup dotnet diff --git a/GitVersion.yml b/GitVersion.yml index e36328d29..f038b97e7 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -26,4 +26,3 @@ branches: increment: Inherit ignore: sha: [] -merge-message-formats: {} From ac5c23587508a749e9c3d614b7d2501f4a4bf680 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:42:21 -0600 Subject: [PATCH 5/9] back to 6.x --- .github/workflows/publish.yml | 2 +- GitVersion.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 79613b03a..add0ca6a1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,7 +21,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0 with: - versionSpec: '5.x' + versionSpec: '6.x' includePrerelease: true - name: Determine Version diff --git a/GitVersion.yml b/GitVersion.yml index f038b97e7..37b879e91 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -6,9 +6,10 @@ branches: develop: mode: ContinuousDeployment tag: pre - regex: ^develop?[/-] + regex: develop source-branches: - main + pre-release-weight: 100 main: tag: rc increment: Patch From 0392d080987f9fa532d53de0416edddaaff0320f Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:43:39 -0600 Subject: [PATCH 6/9] back to 5.x --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index add0ca6a1..db34f23bb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,14 +21,14 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0 with: - versionSpec: '6.x' + versionSpec: '5.x' includePrerelease: true - name: Determine Version uses: gittools/actions/gitversion/execute@v0 with: useConfigFile: true - additionalArguments: /b develop + #additionalArguments: /b develop id: gitversion # step id used as reference for output values - name: Setup dotnet From f98721262fcf50331b90a4bd924b3423095f980f Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:45:57 -0600 Subject: [PATCH 7/9] testing without next-version --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 37b879e91..7898afc35 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,4 @@ -next-version: 1.14.0 +#next-version: 1.14.0 mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: pre From 4014b679fda56f8b894950a1048aa6c63ec469fa Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:47:51 -0600 Subject: [PATCH 8/9] develop now publishes --- GitVersion.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 7898afc35..f6ded5b00 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,3 @@ -#next-version: 1.14.0 mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: pre From 17b4e3d56bde753f2524084afcf90e33a3fa1f01 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Wed, 30 Aug 2023 06:49:34 -0600 Subject: [PATCH 9/9] cleaned out version info from csproj --- Example/Example.csproj | 6 ++---- Terminal.Gui/Terminal.Gui.csproj | 8 ++------ UICatalog/UICatalog.csproj | 6 ++---- UnitTests/UnitTests.csproj | 6 ++---- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index 31656bc28..900d2a48c 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -4,10 +4,8 @@ net7.0 - + 1.0.0.0 + 1.0.0 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index e748e6653..10d5d70fa 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -5,12 +5,8 @@ - - + 1.0.0.0 + 1.0.0 diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 3b68d0c27..5cefa2852 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -7,10 +7,8 @@ Linux - + 1.0.0.0 + 1.0.0 TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 634cb5429..eaef38d35 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -8,10 +8,8 @@ - + 1.0.0.0 + 1.0.0 TRACE