From c72b906a39f14790da2360cc084995c116e1888f Mon Sep 17 00:00:00 2001 From: Gutemberg Ribeiro Date: Sat, 23 Nov 2019 17:11:22 -0300 Subject: [PATCH] Auto stash before merge of "master" and "origin/master" --- .github/workflows/ci.yml | 2 +- .github/workflows/publish.yml | 50 +++++++++---------- global.json | 2 +- .../Blazor.Extensions.SignalR.csproj | 3 +- ...azor.Extensions.SignalR.Test.Client.csproj | 4 +- ...azor.Extensions.SignalR.Test.Server.csproj | 2 +- 6 files changed, 31 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebec3f5..2a3c327 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,6 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.100-preview1-014459 + dotnet-version: 3.1.100-preview3-014645 - name: Build run: dotnet build --configuration Release \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3455fa0..62fc4aa 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,34 +3,34 @@ name: Publish on: push: tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 + - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10 jobs: build: - runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 3.1.100-preview1-014459 - - name: Build - run: dotnet build --configuration Release - - name: Pack - working-directory: src/Blazor.Extensions.SignalR - run: dotnet pack --configuration Release -p:Version=${GITHUB_REF##*/v} - - name: Push - working-directory: src/Blazor.Extensions.SignalR/bin/Release - run: | - dotnet nuget push Blazor.Extensions.SignalR.*.nupkg -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json - - name: Create Release - uses: actions/create-release@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: false - prerelease: false + - uses: actions/checkout@v1 + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 3.1.100-preview3-014645 + - name: Build + run: dotnet build --configuration Release + - name: Test + run: dotnet test --configuration Release --no-build + - name: Pack + run: dotnet pack --configuration Release --output packages -p:Version=${GITHUB_REF##*/v} + - name: Push + working-directory: packages + run: | + dotnet nuget push Blazor.Extensions.SignalR.*.nupkg -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json + - name: Create Release + uses: actions/create-release@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: false + prerelease: false diff --git a/global.json b/global.json index d8a3763..8699d64 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.100-preview1-014459" + "version": "3.1.100-preview3-014645" } } \ No newline at end of file diff --git a/src/Blazor.Extensions.SignalR/Blazor.Extensions.SignalR.csproj b/src/Blazor.Extensions.SignalR/Blazor.Extensions.SignalR.csproj index fed706d..80e8de0 100644 --- a/src/Blazor.Extensions.SignalR/Blazor.Extensions.SignalR.csproj +++ b/src/Blazor.Extensions.SignalR/Blazor.Extensions.SignalR.csproj @@ -13,11 +13,10 @@ true $(TargetsForTfmSpecificBuildOutput);IncludeP2POutput Blazor.Extensions.SignalR - 1.1.0-preview1 - + diff --git a/test/Blazor.Extensions.SignalR.Test.Client/Blazor.Extensions.SignalR.Test.Client.csproj b/test/Blazor.Extensions.SignalR.Test.Client/Blazor.Extensions.SignalR.Test.Client.csproj index e7fcf48..b2c0118 100644 --- a/test/Blazor.Extensions.SignalR.Test.Client/Blazor.Extensions.SignalR.Test.Client.csproj +++ b/test/Blazor.Extensions.SignalR.Test.Client/Blazor.Extensions.SignalR.Test.Client.csproj @@ -10,8 +10,8 @@ 3.0 - - + + diff --git a/test/Blazor.Extensions.SignalR.Test.Server/Blazor.Extensions.SignalR.Test.Server.csproj b/test/Blazor.Extensions.SignalR.Test.Server/Blazor.Extensions.SignalR.Test.Server.csproj index 1348960..a74a4aa 100644 --- a/test/Blazor.Extensions.SignalR.Test.Server/Blazor.Extensions.SignalR.Test.Server.csproj +++ b/test/Blazor.Extensions.SignalR.Test.Server/Blazor.Extensions.SignalR.Test.Server.csproj @@ -10,7 +10,7 @@ - +