From 9ef1739affd9ea7d5bb93d30a3310cb3e2dba687 Mon Sep 17 00:00:00 2001 From: Benjamin Abt Date: Tue, 23 Nov 2021 14:30:44 +0100 Subject: [PATCH 1/6] fix --- .github/workflows/ci.yml | 2 -- version.json | 40 +++++++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70160c0..62f6368 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,8 +49,6 @@ jobs: /p:Version=${{ steps.nbgv.outputs.NuGetPackageVersion }} - name: Push to NuGet - ## push only stable packages - if: github.ref == 'refs/heads/main' run: dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGET_DEPLOY_KEY }} --source https://api.nuget.org/v3/index.json diff --git a/version.json b/version.json index fd5cc0c..6088b6e 100644 --- a/version.json +++ b/version.json @@ -1,19 +1,25 @@ { - "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.0", - "nugetPackageVersion": { - "semVer": 1 // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1. - }, - "publicReleaseRefSpec": [ - "^refs/heads/main$" - ], - "cloudBuild": { - "buildNumber": { - "enabled": true - } - }, - "release": { - "versionIncrement" : "build", - "firstUnstableTag": "preview" + "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "1.0", + "assemblyVersion": { + "precision": "revision" // optional. Use when you want a more precise assembly version than the default major.minor. + }, + "nugetPackageVersion": { + "semVer": 1 // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1. + }, + "publicReleaseRefSpec": [ + "^refs/heads/main", // we release out of main + "^refs/tags/v\\d+\\.\\d+" // we also release tags starting with vN.N + ], + "cloudBuild": { + "setVersionVariables": true, + "buildNumber": { + "enabled": true } - } \ No newline at end of file + }, + "release": { + "branchName": "v{version}", + "versionIncrement": "minor", + "firstUnstableTag": "alpha" + } +} \ No newline at end of file From cccb9cc2ba6c45a0859d0f90157a3162d6732263 Mon Sep 17 00:00:00 2001 From: Benjamin Abt Date: Tue, 23 Nov 2021 15:22:04 +0100 Subject: [PATCH 2/6] fix --- .github/workflows/ci.yml | 9 ++++++--- .../AssemblyMetadata.SampleApp.csproj | 1 + .../AssemblyMetadata.UnitTests.csproj | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62f6368..962e655 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,8 @@ jobs: run: echo ${{ steps.nbgv.outputs.SemVer2 }} - name: Build with dotnet - run: dotnet build + run: | + dotnet build --configuration ${{ env.BuildConfig }} /p:Version=${{ steps.nbgv.outputs.AssemblyVersion }} @@ -44,12 +45,14 @@ jobs: run: dotnet test - name: Pack NuGet - run: dotnet pack + run: | + dotnet pack --configuration ${{ env.BuildConfig }} /p:Version=${{ steps.nbgv.outputs.NuGetPackageVersion }} - name: Push to NuGet - run: dotnet nuget push **/*.nupkg + run: | + dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGET_DEPLOY_KEY }} --source https://api.nuget.org/v3/index.json --no-symbols 1 \ No newline at end of file diff --git a/sample/AssemblyMetadata.SampleApp/AssemblyMetadata.SampleApp.csproj b/sample/AssemblyMetadata.SampleApp/AssemblyMetadata.SampleApp.csproj index a5d97a2..65f12ca 100644 --- a/sample/AssemblyMetadata.SampleApp/AssemblyMetadata.SampleApp.csproj +++ b/sample/AssemblyMetadata.SampleApp/AssemblyMetadata.SampleApp.csproj @@ -5,6 +5,7 @@ net6.0 BenjaminAbt.$(MSBuildProjectName) BenjaminAbt.$(MSBuildProjectName.Replace(" ", "_")) + false diff --git a/tests/AssemblyMetadata.UnitTests/AssemblyMetadata.UnitTests.csproj b/tests/AssemblyMetadata.UnitTests/AssemblyMetadata.UnitTests.csproj index 7a70b95..3345a17 100644 --- a/tests/AssemblyMetadata.UnitTests/AssemblyMetadata.UnitTests.csproj +++ b/tests/AssemblyMetadata.UnitTests/AssemblyMetadata.UnitTests.csproj @@ -4,6 +4,7 @@ net6.0 BenjaminAbt.$(MSBuildProjectName.Replace(" ", "_")) BenjaminAbt.$(MSBuildProjectName) + false From 1d79edaaffe54b53963a058a2b6c4e094e8d28cd Mon Sep 17 00:00:00 2001 From: Benjamin Abt Date: Tue, 23 Nov 2021 15:23:17 +0100 Subject: [PATCH 3/6] fix --- .github/workflows/ci.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 962e655..b3bb1eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,23 +36,13 @@ jobs: run: echo ${{ steps.nbgv.outputs.SemVer2 }} - name: Build with dotnet - run: | - dotnet build - --configuration ${{ env.BuildConfig }} - /p:Version=${{ steps.nbgv.outputs.AssemblyVersion }} + run: dotnet build --configuration ${{ env.BuildConfig }} /p:Version=${{ steps.nbgv.outputs.AssemblyVersion }} - name: Test with dotnet run: dotnet test - name: Pack NuGet - run: | - dotnet pack - --configuration ${{ env.BuildConfig }} - /p:Version=${{ steps.nbgv.outputs.NuGetPackageVersion }} + run: dotnet pack --configuration ${{ env.BuildConfig }} /p:Version=${{ steps.nbgv.outputs.NuGetPackageVersion }} - name: Push to NuGet - run: | - dotnet nuget push **/*.nupkg - --api-key ${{ secrets.NUGET_DEPLOY_KEY }} - --source https://api.nuget.org/v3/index.json - --no-symbols 1 \ No newline at end of file + run: dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGET_DEPLOY_KEY }} --source https://api.nuget.org/v3/index.json --no-symbols 1 \ No newline at end of file From 9d1c6128b6ba63610dc5cb04c44643ef46f3ff0a Mon Sep 17 00:00:00 2001 From: Benjamin Abt Date: Tue, 23 Nov 2021 15:25:47 +0100 Subject: [PATCH 4/6] fix --- .../AssemblyMetadata.SampleApp.csproj | 1 - src/AssemblyMetadata/AssemblyMetadata.csproj | 2 -- .../AssemblyMetadata.UnitTests.csproj | 1 - 3 files changed, 4 deletions(-) diff --git a/sample/AssemblyMetadata.SampleApp/AssemblyMetadata.SampleApp.csproj b/sample/AssemblyMetadata.SampleApp/AssemblyMetadata.SampleApp.csproj index 65f12ca..a5d97a2 100644 --- a/sample/AssemblyMetadata.SampleApp/AssemblyMetadata.SampleApp.csproj +++ b/sample/AssemblyMetadata.SampleApp/AssemblyMetadata.SampleApp.csproj @@ -5,7 +5,6 @@ net6.0 BenjaminAbt.$(MSBuildProjectName) BenjaminAbt.$(MSBuildProjectName.Replace(" ", "_")) - false diff --git a/src/AssemblyMetadata/AssemblyMetadata.csproj b/src/AssemblyMetadata/AssemblyMetadata.csproj index 3e92139..8bf9d42 100644 --- a/src/AssemblyMetadata/AssemblyMetadata.csproj +++ b/src/AssemblyMetadata/AssemblyMetadata.csproj @@ -9,11 +9,9 @@ Extended Assembly Metadata Information BenjaminAbt.$(MSBuildProjectName) BenjaminAbt.$(MSBuildProjectName.Replace(" ", "_")) - true - true false diff --git a/tests/AssemblyMetadata.UnitTests/AssemblyMetadata.UnitTests.csproj b/tests/AssemblyMetadata.UnitTests/AssemblyMetadata.UnitTests.csproj index 3345a17..7a70b95 100644 --- a/tests/AssemblyMetadata.UnitTests/AssemblyMetadata.UnitTests.csproj +++ b/tests/AssemblyMetadata.UnitTests/AssemblyMetadata.UnitTests.csproj @@ -4,7 +4,6 @@ net6.0 BenjaminAbt.$(MSBuildProjectName.Replace(" ", "_")) BenjaminAbt.$(MSBuildProjectName) - false From 55101a9f6fe0317bc829406f08c5320fcdd09b84 Mon Sep 17 00:00:00 2001 From: Benjamin Abt Date: Tue, 23 Nov 2021 15:27:37 +0100 Subject: [PATCH 5/6] fix --- src/AssemblyMetadata/AssemblyMetadata.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/AssemblyMetadata/AssemblyMetadata.csproj b/src/AssemblyMetadata/AssemblyMetadata.csproj index 8bf9d42..b150dc9 100644 --- a/src/AssemblyMetadata/AssemblyMetadata.csproj +++ b/src/AssemblyMetadata/AssemblyMetadata.csproj @@ -9,6 +9,7 @@ Extended Assembly Metadata Information BenjaminAbt.$(MSBuildProjectName) BenjaminAbt.$(MSBuildProjectName.Replace(" ", "_")) + true From f08c877d8536d8d36d0bff1999fd966b3c64aecd Mon Sep 17 00:00:00 2001 From: Benjamin Abt Date: Tue, 23 Nov 2021 15:30:48 +0100 Subject: [PATCH 6/6] fix --- .github/workflows/ci.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3bb1eb..36d92b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,9 @@ on: - main env: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true BuildConfig: Release + DOTNET_SDK: '6.0.100' # https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json jobs: build: @@ -27,7 +29,7 @@ jobs: - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.100' + dotnet-version: ${{ env.DOTNET_SDK }} - uses: dotnet/nbgv@master # https://github.com/dotnet/nbgv id: nbgv @@ -36,13 +38,20 @@ jobs: run: echo ${{ steps.nbgv.outputs.SemVer2 }} - name: Build with dotnet - run: dotnet build --configuration ${{ env.BuildConfig }} /p:Version=${{ steps.nbgv.outputs.AssemblyVersion }} + run: dotnet build + --configuration ${{ env.BuildConfig }} + /p:Version=${{ steps.nbgv.outputs.AssemblyVersion }} - name: Test with dotnet run: dotnet test - name: Pack NuGet - run: dotnet pack --configuration ${{ env.BuildConfig }} /p:Version=${{ steps.nbgv.outputs.NuGetPackageVersion }} - + run: dotnet pack + --configuration ${{ env.BuildConfig }} + /p:Version=${{ steps.nbgv.outputs.NuGetPackageVersion }} + - name: Push to NuGet - run: dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGET_DEPLOY_KEY }} --source https://api.nuget.org/v3/index.json --no-symbols 1 \ No newline at end of file + run: dotnet nuget push **/*.nupkg + --api-key ${{ secrets.NUGET_DEPLOY_KEY }} + --source https://api.nuget.org/v3/index.json + --no-symbols 1 \ No newline at end of file