From b8a0f415f2ae37bd95fb2c3cb1566f2898fe434d Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 06:44:01 -0600 Subject: [PATCH 1/7] Verifying builds --- Example/Example.csproj | 4 ++-- FSharpExample/FSharpExample.fsproj | 4 ++-- ReactiveExample/ReactiveExample.csproj | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 4 ++++ UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index 29a5d6b31..25912df88 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.14.0-pre0001 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 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/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index b3d492515..b0170509d 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -6,8 +6,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.14.0-pre0001 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index fb2c6191a..566fc260f 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -10,6 +10,10 @@ 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 $(Version) 1.14.0--> + 1.14.0.0 + 1.14.0.0 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 + 1.14.0-pre0001 diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index d82850d80..82edbd57f 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -9,8 +9,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.14.0-pre0001 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 0166d1158..5b169ff62 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -10,8 +10,8 @@ 1.14.0.0 1.14.0.0 - 1.14.0 - 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.14.0-pre0001 + 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 TRACE From 1a17ecabdeb9f6df580e9700f157fcab2baae9e8 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 06:47:45 -0600 Subject: [PATCH 2/7] Commented version info --- Example/Example.csproj | 4 ++-- ReactiveExample/ReactiveExample.csproj | 4 ++-- Terminal.Gui/Terminal.Gui.csproj | 5 +---- UICatalog/UICatalog.csproj | 4 ++-- UnitTests/UnitTests.csproj | 4 ++-- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Example/Example.csproj b/Example/Example.csproj index 25912df88..31656bc28 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -4,10 +4,10 @@ net7.0 - 1.14.0.0 + diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index b0170509d..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 566fc260f..e748e6653 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -10,10 +10,7 @@ 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 $(Version) 1.14.0--> - 1.14.0.0 - 1.14.0.0 - 1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7 - 1.14.0-pre0001 + diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 82edbd57f..3b68d0c27 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -7,10 +7,10 @@ Linux - 1.14.0.0 + TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 5b169ff62..634cb5429 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -8,10 +8,10 @@ - 1.14.0.0 + TRACE From 037e4bcf0d53734f32c8d65074eff7a462d41480 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 06:56:45 -0600 Subject: [PATCH 3/7] Tweaked yml for gitversion --- .github/workflows/dotnet-core.yml | 20 +++++++++++++++++--- .github/workflows/publish.yml | 8 ++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index ff23467b7..e8e8e6daa 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -12,24 +12,38 @@ on: jobs: build: - runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Install and calculate the new version with GitVersion + uses: gittools/actions/gitversion/setup@v0 + with: + versionSpec: '6.x' + includePrerelease: true + + - name: Determine Version + uses: gittools/actions/gitversion/execute@v0 + with: + useConfigFile: true + id: gitversion # step id used as reference for output values + - name: Setup .NET Core 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-gitversion /updateprojectfiles + 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..0fcbb059e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,17 +21,21 @@ jobs: - name: Install and calculate the new version with GitVersion uses: gittools/actions/gitversion/setup@v0 with: - versionSpec: 5.x + versionSpec: '6.x' + includePrerelease: true - name: Determine Version uses: gittools/actions/gitversion/execute@v0 + with: + useConfigFile: true 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 From 01a60f7c22190833b26103e00567e272137c4c0a Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 06:58:56 -0600 Subject: [PATCH 4/7] fetch-depth: 0 --- .github/workflows/dotnet-core.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index e8e8e6daa..3e7ffef93 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -16,7 +16,9 @@ jobs: steps: - uses: actions/checkout@v3 - + with: + fetch-depth: 0 #fetch-depth is needed for GitVersion + - name: Install and calculate the new version with GitVersion uses: gittools/actions/gitversion/setup@v0 with: From ad28a475797defe21b05c3a1f9a247587409c02d Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:05:06 -0600 Subject: [PATCH 5/7] gitversion 6 --- .github/workflows/dotnet-core.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 3e7ffef93..3297f6848 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -28,7 +28,9 @@ jobs: - name: Determine Version uses: gittools/actions/gitversion/execute@v0 with: - useConfigFile: true + versionSpec: '6.x' + includePrerelease: true + useConfigFile: true id: gitversion # step id used as reference for output values - name: Setup .NET Core From abc131cfc1dcddbaebe23485d4389e895bde385b Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:08:53 -0600 Subject: [PATCH 6/7] backed out gitversion from PR --- .github/workflows/dotnet-core.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 3297f6848..a163dc542 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -19,19 +19,17 @@ jobs: with: fetch-depth: 0 #fetch-depth is needed for GitVersion - - name: Install and calculate the new version with GitVersion - uses: gittools/actions/gitversion/setup@v0 - with: - versionSpec: '6.x' - includePrerelease: true + # - name: Install and calculate the new version with GitVersion + # uses: gittools/actions/gitversion/setup@v0 + # with: + # versionSpec: '6.x' + # includePrerelease: true - - name: Determine Version - uses: gittools/actions/gitversion/execute@v0 - with: - versionSpec: '6.x' - includePrerelease: true - useConfigFile: true - id: gitversion # step id used as reference for output values + # - name: Determine Version + # uses: gittools/actions/gitversion/execute@v0 + # with: + # useConfigFile: true + # id: gitversion # step id used as reference for output values - name: Setup .NET Core uses: actions/setup-dotnet@v3 From 207078594db51d78f459530e496e26edba69ead8 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Mon, 28 Aug 2023 07:10:12 -0600 Subject: [PATCH 7/7] backed out gitversion from PR --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index a163dc542..9e1622caa 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -43,7 +43,7 @@ jobs: - name: Build Debug run: | - dotnet-gitversion /updateprojectfiles + #dotnet-gitversion /updateprojectfiles dotnet build --configuration Debug --no-restore - name: Test