diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c42f6e1900..33adfb0be9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,10 +1,27 @@ name: Publish Terminal.Gui + on: push: + branches: [ main, v2_release ] tags: - v* + paths-ignore: + - '**.md' + + pull_request: + branches: [ develop, v2_develop ] + types: + - closed + paths-ignore: + - '**.md' jobs: + if_merged: + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + steps: + - run: | + echo The PR was merged publish: name: Build and Publish to Nuget.org @@ -45,34 +62,27 @@ jobs: - name: Pack run: dotnet pack -c Release --include-symbols -p:Version='${{ steps.gitversion.outputs.SemVer }}' - - name: Test to generate Code Coverage Report - run: | - sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json - dotnet test --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings - mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/ + # - name: Test to generate Code Coverage Report + # run: | + # sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json + # dotnet test --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings + # mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/ - - name: Create Test Coverage Badge - uses: simon-k/dotnet-code-coverage-badge@v1.0.0 - id: create_coverage_badge - with: - label: Unit Test Coverage - color: brightgreen - path: UnitTests/TestResults/coverage.opencover.xml - gist-filename: code-coverage.json - # https://gist.github.com/migueldeicaza/90ef67a684cb71db1817921a970f8d27 - gist-id: 90ef67a684cb71db1817921a970f8d27 - gist-auth-token: ${{ secrets.GIST_AUTH_TOKEN }} + # - name: Create Test Coverage Badge + # uses: simon-k/dotnet-code-coverage-badge@v1.0.0 + # id: create_coverage_badge + # with: + # label: Unit Test Coverage + # color: brightgreen + # path: UnitTests/TestResults/coverage.opencover.xml + # gist-filename: code-coverage.json + # gist-id: 90ef67a684cb71db1817921a970f8d27 + # gist-auth-token: ${{ secrets.GIST_AUTH_TOKEN }} - - name: Print Code Coverage - run: | - echo "Code coverage percentage: ${{steps.create_coverage_badge.outputs.percentage}}%" - echo "Badge data: ${{steps.create_coverage_badge.outputs.badge}}" + # - name: Print Code Coverage + # run: | + # echo "Code coverage percentage: ${{steps.create_coverage_badge.outputs.percentage}}%" + # echo "Badge data: ${{steps.create_coverage_badge.outputs.badge}}" - #- name: Prep GitHub Packages - # run: dotnet nuget add source --username tig --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/tig/index.json" - - #- name: Publish to GitHub packages - # run: dotnet nuget push NStack/bin/Release/*.nupkg --api-key ${{ secrets.GITHUB_TOKEN }} --source "github" - - name: Publish to NuGet.org - run: dotnet nuget push Terminal.Gui/bin/Release/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json + run: dotnet nuget push Terminal.Gui/bin/Release/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} diff --git a/Example/Example.csproj b/Example/Example.csproj index d53cc3e760..29a5d6b31a 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -3,12 +3,11 @@ Exe net7.0 - - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre0002 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d + 1.14.0.0 + 1.14.0.0 + 1.14.0 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj index 0be44075ae..304775cced 100644 --- a/FSharpExample/FSharpExample.fsproj +++ b/FSharpExample/FSharpExample.fsproj @@ -2,10 +2,10 @@ Exe net6.0 - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d - 1.13.6-pre0002 + 1.14.0.0 + 1.14.0.0 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + 1.14.0 diff --git a/GitVersion.yml b/GitVersion.yml index 7372abcf28..9fa7b37949 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,26 +1,24 @@ mode: ContinuousDeployment tag-prefix: '[vV]' +continuous-delivery-fallback-tag: 'pre' branches: develop: - tag: pre + mode: ContinuousDeployment + tag: pre.{BranchName} main: tag: rc increment: Patch source-branches: - develop - - release + - main feature: tag: useBranchName regex: ^features?[/-] source-branches: - develop - main - - release - - feature - - support - - hotfix pull-request: - tag: PullRequest + tag: PullRequest.{BranchName} increment: Inherit ignore: sha: [] diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 67bc3c4590..b3d4925150 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -3,12 +3,11 @@ Exe net7.0 - - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre0002 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d + 1.14.0.0 + 1.14.0.0 + 1.14.0 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 72d467a0f0..89a179f813 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -1,30 +1,51 @@  + + + + + + + 1.14.0.0 + 1.14.0.0 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 + $(Version) + 1.14.0 + + + + portable + TRACE;DEBUG_IDISPOSABLE portable - - - - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d - 1.13.6-pre0002 + net472;netstandard2.1;net7.0 + Terminal.Gui + Terminal.Gui + true + + + + + + - + + + True @@ -35,6 +56,9 @@ \ + + + True @@ -48,39 +72,37 @@ Strings.Designer.cs - - - - - + + + - net472;netstandard2.1;net7.0 - Terminal.Gui - Terminal.Gui - bin\Release\Terminal.Gui.xml - true - true Terminal.Gui - $(PackageVersion) MIT https://github.com/gui-cs/Terminal.Gui/ - https://github.com/gui-cs/Terminal.Gui.git - git - true - snupkg - - true - - true logo.png README.md csharp, terminal, c#, f#, gui, toolkit, console, tui Cross platform Terminal UI toolkit for .NET - Miguel de Icaza, Charlie Kindel + Miguel de Icaza, Tig Kindel A toolkit for building rich console apps for .NET that works on Windows, Mac, and Linux/Unix. Terminal.Gui - Cross platform Terminal User Interface (TUI) toolkit for .NET See: https://github.com/gui-cs/Terminal.Gui/releases + bin\Release\Terminal.Gui.xml + true + true + https://github.com/gui-cs/Terminal.Gui.git + git + true + snupkg + + true + + upstream + true + true + Embedded + Miguel de Icaza, Tig Kindel (@tig), @BDisp \ No newline at end of file diff --git a/Terminal.sln b/Terminal.sln index b0837d7501..5f66cd27c1 100644 --- a/Terminal.sln +++ b/Terminal.sln @@ -19,6 +19,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md CONTRIBUTING.md = CONTRIBUTING.md .github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml + GitVersion.yml = GitVersion.yml + global.json = global.json + nuget.config = nuget.config .github\workflows\publish.yml = .github\workflows\publish.yml README.md = README.md testenvironments.json = testenvironments.json diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 8feabd825f..d82850d80c 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -4,14 +4,13 @@ net7.0 8.0 UICatalog.UICatalogApp + Linux - - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre0002 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d - Linux + 1.14.0.0 + 1.14.0.0 + 1.14.0 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 TRACE diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index fdfd5dbbb0..0166d1158b 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -7,12 +7,11 @@ false - - 1.13.6.0 - 1.13.6.0 - 1.13.6-pre0002 - 1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d + 1.14.0.0 + 1.14.0.0 + 1.14.0 + 1.14.0+Branch.v1-develop-branching-update.Sha.f47377ce8ba5a97f2f84c745eca04c336b094e96 TRACE diff --git a/global.json b/global.json index 2dd1c167e4..cf0511e14d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk":{ - "version":"7.0.100", - "rollForward":"latestMajor" + "version":"7.0.200", + "rollForward":"latestMinor" } } diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000000..7d10988665 --- /dev/null +++ b/nuget.config @@ -0,0 +1,12 @@ + + + + + + + + + + + +