diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index c392382aa..6c951c245 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -13,11 +13,12 @@ jobs: steps: - uses: actions/checkout@v3 - - - name: Setup .NET Core - uses: actions/setup-dotnet@v3.0.3 + + - name: Setup dotnet + uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 7.0 + dotnet-quality: 'ga' - name: Install dependencies run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8951b7109..1a222eeeb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,12 +16,12 @@ jobs: fetch-depth: 0 #fetch-depth is needed for GitVersion - name: Install and calculate the new version with GitVersion - uses: gittools/actions/gitversion/setup@v0.9.15 + uses: gittools/actions/gitversion/setup@v0 with: versionSpec: 5.x - name: Determine Version - uses: gittools/actions/gitversion/execute@v0.9.15 + uses: gittools/actions/gitversion/execute@v0 id: gitversion # step id used as reference for output values - name: Display GitVersion outputs @@ -30,9 +30,10 @@ jobs: echo "CommitsSinceVersionSource: ${{ steps.gitversion.outputs.CommitsSinceVersionSource }}" - name: Setup dotnet - uses: actions/setup-dotnet@v3.0.3 + uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.100 + dotnet-version: 7.0 + dotnet-quality: 'ga' - name: Install dependencies run: dotnet restore @@ -66,12 +67,6 @@ jobs: 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 diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj index 6d2346f8f..18d20b016 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/ReactiveExample/ReactiveExample.csproj @@ -11,8 +11,8 @@ 2.0 - - + + diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index cb5731ae6..f9a8bf50b 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -27,9 +27,9 @@ - - - + + + diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj index 6ff3c35a1..edd3dd689 100644 --- a/UICatalog/UICatalog.csproj +++ b/UICatalog/UICatalog.csproj @@ -28,7 +28,7 @@ - + diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index b2907d091..57747a3ba 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -21,16 +21,16 @@ TRACE;DEBUG_IDISPOSABLE - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive