diff --git a/.github/workflows/ReleaseNotes.md b/.github/workflows/ReleaseNotes.md index aab7f1e8..8a10727a 100644 --- a/.github/workflows/ReleaseNotes.md +++ b/.github/workflows/ReleaseNotes.md @@ -1 +1,4 @@ -* [Client] Restored _Server_ and _Port_ behavior of client options (#2005). +* nuget: Changed code signing and nuget certificate (**BREAKING CHANGE**). +* TopicTemplates: Updated samples, parameter validation (#2022). +* ManagedClient: Switch SubscribeAsync/UnsubscribeAsync to IEnumerable (#2026). +* Server: Fix _LoadingRetainedMessageAsync_ not executed (#2025). \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5813f5bd..da2e1956 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: [push, pull_request] env: - VERSION: "4.3.6.${{github.run_number}}" + VERSION: "4.3.7.${{github.run_number}}" jobs: build: @@ -17,7 +17,7 @@ jobs: sdk-version: 18362 - name: Setup .NET SDK - uses: actions/setup-dotnet@v1.9.0 + uses: actions/setup-dotnet@v4 with: dotnet-version: | 3.1.x @@ -28,7 +28,7 @@ jobs: uses: microsoft/setup-msbuild@v1.1 - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Signing Certificate run: | @@ -42,14 +42,6 @@ jobs: - name: Build solution run: msbuild MQTTnet.sln /t:Build /p:Configuration="Release" /verbosity:m /p:FileVersion=${{ env.VERSION }} /p:AssemblyVersion=${{ env.VERSION }} /p:PackageVersion=${{ env.VERSION }} /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=${{ github.workspace }}\certificate.snk - - name: Collect nuget Packages - uses: actions/upload-artifact@v2 - with: - name: nuget Packages - path: | - **\*.nupkg - **\*.snupkg - - name: Setup VSTest uses: darenm/Setup-VSTest@v1 @@ -59,6 +51,32 @@ jobs: - name: ASP.NET Tests run: vstest.console.exe Source\MQTTnet.AspNetCore.Tests\bin\Release\netcoreapp3.1\MQTTnet.AspNetCore.Tests.dll + - name: Install sign CLI tool + run: dotnet tool install --tool-path . sign --version 0.9.0-beta.23127.3 + + - name: Sign nugets + shell: pwsh + run: > + ./sign code azure-key-vault ` + "**/*.nupkg" ` + --base-directory "${{ github.workspace }}/Source" ` + --publisher-name "MQTTnet" ` + --description "MQTTnet" ` + --description-url "https://github.com/dotnet/MQTTnet" ` + --azure-key-vault-tenant-id "${{ secrets.AZURE_TENANT_ID }}" ` + --azure-key-vault-client-id "${{ secrets.AZURE_CLIENT_ID }}" ` + --azure-key-vault-client-secret "${{ secrets.AZURE_CLIENT_SECRET }}" ` + --azure-key-vault-certificate "${{ secrets.KEY_VAULT_CERTIFICATE_ID }}" ` + --azure-key-vault-url "${{ secrets.KEY_VAULT_URL }}" + + - name: Upload signed nuget packages + uses: actions/upload-artifact@v4 + with: + name: signed-nugets + path: | + ${{ github.workspace }}/Source/**/*.nupkg + ${{ github.workspace }}/Source/**/*.snupkg + - name: Publish MyGet nugets if: ${{ github.event_name == 'push' }} - run: dotnet nuget push **/*.nupkg -k ${{ secrets.MYGET_API_KEY }} -s https://www.myget.org/F/mqttnet/api/v3/index.json --skip-duplicate \ No newline at end of file + run: dotnet nuget push ${{ github.workspace }}/Source/**/*.nupkg -k ${{ secrets.MYGET_API_KEY }} -s https://www.myget.org/F/mqttnet/api/v3/index.json --skip-duplicate diff --git a/MQTTnet.sln b/MQTTnet.sln index 4350c299..c5755c2a 100644 --- a/MQTTnet.sln +++ b/MQTTnet.sln @@ -10,6 +10,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution CODE-OF-CONDUCT.md = CODE-OF-CONDUCT.md LICENSE = LICENSE README.md = README.md + .github\workflows\ReleaseNotes.md = .github\workflows\ReleaseNotes.md + .github\workflows\ci.yml = .github\workflows\ci.yml EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.AspNetCore", "Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj", "{F10C4060-F7EE-4A83-919F-FF723E72F94A}"