Merge pull request #19 from buvinghausen/bump-sdk

Bump sdk
buvinghausen · Nov 10, 2020 · 3cb44de · 3cb44de
2 parents 6cd8e45 + 9d412f6
commit 3cb44de
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,10 +9,18 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core 5.0 Preview 7 SDK
+    - name: Setup .NET 5.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100-preview.7.20366.6
+        dotnet-version: 5.0.*
+    - name: Setup .NET Core 3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.*
+    - name: Setup .NET Core 2.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 2.1.*
       env:
         DOTNET_NOLOGO: 1
         DOTNET_CLI_TELEMETRY_OPTOUT: 1

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,10 +9,10 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core 5.0 Preview 7 SDK
+    - name: Setup .NET 5.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100-preview.7.20366.6
+        dotnet-version: 5.0.*
       env:
         DOTNET_NOLOGO: 1
         DOTNET_CLI_TELEMETRY_OPTOUT: 1

diff --git a/TaskTupleAwaiter.sln b/TaskTupleAwaiter.sln
@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\ci.yml = .github\workflows\ci.yml
 		src\Directory.Build.props = src\Directory.Build.props
 		test\Directory.Build.props = test\Directory.Build.props
-		global.json = global.json
 		LICENSE.txt = LICENSE.txt
 		README.md = README.md
 		.github\workflows\release.yml = .github\workflows\release.yml

diff --git a/global.json b/global.json