From 19ff48f4b8afe1223db5a5267c81f8dd753b01d2 Mon Sep 17 00:00:00 2001 From: Patrik Svensson Date: Wed, 15 Dec 2021 22:54:27 +0100 Subject: [PATCH] Clean up .NET SDK installation --- .github/workflows/ci.yaml | 21 ++++++---------- .github/workflows/docs.yaml | 6 +++-- .github/workflows/publish.yaml | 46 +++++++++++----------------------- 3 files changed, 25 insertions(+), 48 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7ee7a0c..7f71edc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,11 +18,11 @@ jobs: - name: Checkout uses: actions/checkout@master - - name: Setup dotnet 5 and 6.0.100 + - name: Setup .NET SDK uses: actions/setup-dotnet@v1 with: dotnet-version: | - 5.0.x + 5.0.301 6.0.100 - name: Setup Node.js @@ -76,20 +76,13 @@ jobs: with: fetch-depth: 0 - - name: Setup dotnet 3.1.402 + - name: Setup .NET SDK uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.402 - - - name: Setup dotnet 5.0.301 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 5.0.301 - - - name: Setup dotnet 6.0.100 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.100 + dotnet-version: | + 3.1.402 + 5.0.301 + 6.0.100 - name: Integration Tests shell: bash diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 150d955..73516dd 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -24,10 +24,12 @@ jobs: with: fetch-depth: 0 - - name: Setup dotnet 6.0.100 + - name: Setup .NET SDK uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.100 + dotnet-version: | + 5.0.301 + 6.0.100 - name: Setup Node.js uses: actions/setup-node@v2 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index bb7b973..53cc13b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -24,15 +24,12 @@ jobs: - name: Checkout uses: actions/checkout@master - - name: Setup dotnet 5.0.301 + - name: Setup .NET SDK uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.301 - - - name: Setup dotnet 6.0.100 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.100 + dotnet-version: | + 5.0.301 + 6.0.100 - name: Build shell: bash @@ -68,20 +65,13 @@ jobs: with: fetch-depth: 0 - - name: Setup dotnet 3.1.402 + - name: Setup .NET SDK uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.402 - - - name: Setup dotnet 5.0.301 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 5.0.301 - - - name: Setup dotnet 6.0.100 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.100 + dotnet-version: | + 3.1.402 + 5.0.301 + 6.0.100 - name: Build shell: bash @@ -104,21 +94,13 @@ jobs: with: fetch-depth: 0 - - name: Setup dotnet 3.1.402 + - name: Setup .NET SDK uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.402 - - - name: Setup dotnet 5.0.301 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 5.0.301 - - - name: Setup dotnet 6.0 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.x - include-prerelease: true + dotnet-version: | + 3.1.402 + 5.0.301 + 6.0.100 - name: Publish shell: bash