diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index ff23467b7..4774e5338 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -12,7 +12,6 @@ on: jobs: build: - runs-on: ubuntu-latest steps: @@ -22,14 +21,16 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 7.0 + dotnet-quality: 'ga' - name: Install dependencies run: | dotnet restore - name: Build Debug - run: dotnet build --configuration Debug --no-restore - + run: | + dotnet build --configuration Debug --no-restore + - name: Test run: | sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 568302dda..db34f23bb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,22 +16,27 @@ jobs: steps: - uses: actions/checkout@v3 with: - fetch-depth: 0 #fetch-depth is needed for GitVersion + fetch-depth: 0 # fetch-depth is needed for GitVersion - - name: Install and calculate the new version with GitVersion + - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0 with: - versionSpec: 5.x + versionSpec: '5.x' + includePrerelease: true - name: Determine Version uses: gittools/actions/gitversion/execute@v0 + with: + useConfigFile: true + #additionalArguments: /b develop id: gitversion # step id used as reference for output values - name: Setup dotnet uses: actions/setup-dotnet@v3 with: dotnet-version: 7.0 - + dotnet-quality: 'ga' + - name: Install dependencies run: dotnet restore diff --git a/Example/Example.csproj b/Example/Example.csproj index 29a5d6b31..900d2a48c 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -4,10 +4,8 @@ net7.0 - 1.14.0.0 - 1.14.0.0 - 1.14.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.0.0.0 + 1.0.0 diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 304775cce..751c1640d 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -4,8 +4,8 @@ net6.0 1.14.0.0 1.14.0.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 - 1.14.0 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 + 1.14.0-pre0001 diff --git a/GitVersion.yml b/GitVersion.yml index f9b784034..f6ded5b00 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,10 +1,14 @@ mode: ContinuousDeployment tag-prefix: '[vV]' -continuous-delivery-fallback-tag: 'pre' +continuous-delivery-fallback-tag: pre branches: develop: mode: ContinuousDeployment tag: pre + regex: develop + source-branches: + - main + pre-release-weight: 100 main: tag: rc increment: Patch @@ -22,4 +26,3 @@ branches: increment: Inherit ignore: sha: [] -merge-message-formats: {} diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index b3d492515..8e1fd42af 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -4,10 +4,10 @@ net7.0 - 1.14.0.0 + diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index fb2c6191a..10d5d70fa 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -5,11 +5,8 @@ - + 1.0.0.0 + 1.0.0 diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index d82850d80..5cefa2852 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -7,10 +7,8 @@ Linux - 1.14.0.0 - 1.14.0.0 - 1.14.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.0.0.0 + 1.0.0 TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 0166d1158..eaef38d35 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -8,10 +8,8 @@ - 1.14.0.0 - 1.14.0.0 - 1.14.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.0.0.0 + 1.0.0 TRACE