diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0dbcde5f2..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: /verbosity Diagnostic + #additionalArguments: /b develop id: gitversion # step id used as reference for output values - name: Setup dotnet 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/GitVersion.yml b/GitVersion.yml index 0f9ad3113..f6ded5b00 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,34 +1,28 @@ -next-version: 1.14.0 - mode: ContinuousDeployment tag-prefix: '[vV]' -continuous-delivery-fallback-tag: 'pre' - +continuous-delivery-fallback-tag: pre branches: develop: mode: ContinuousDeployment tag: pre - regex: ^develop - + regex: develop + source-branches: + - main + pre-release-weight: 100 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: {} 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