Update SDK version to NET 5.0 at Github Actions

Signed-off-by: Sagilio <Sagilio@outlook.com>
casbin · Nov 28, 2020 · 057406d · 057406d
1 parent 8abaea5
commit 057406d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 26 deletions.
diff --git a/.github/workflows/github-actions-benchmark.yml b/.github/workflows/github-actions-benchmark.yml
@@ -13,17 +13,17 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Setup .NET Core 3.1.x
+    - name: Setup .NET 3.1.x SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1
+        dotnet-version: 3.1.x
 
-    - name: Setup .NET 5.0.x
+    - name: Setup .NET 5.0.x SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100-rc.1.20452.10
+        dotnet-version: 5.0.x
 
-    - name: Check dotnet sdk install
+    - name: Check .NET info
       run: dotnet --info
 
     - name: Install dependencies
@@ -38,7 +38,7 @@ jobs:
     - name: Run Benchmark
       run: |
         cd Casbin.Benchmark
-        dotnet run -c Release --filter **
+        dotnet run -c Release --filter ** -f net5
 
     - name: Upload benchmark results to artefacts
       uses: actions/upload-artifact@v1.0.0

diff --git a/.github/workflows/github-actions-build.yml b/.github/workflows/github-actions-build.yml
@@ -33,17 +33,17 @@ jobs:
     - name: Check tags
       run: git tag -l -n
 
-    - name: Setup dotnet 3.1.x sdk
+    - name: Setup .NET Core 3.1.x SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1
+        dotnet-version: 3.1.x
 
-    - name: Setup .NET 5.0.x
+    - name: Setup .NET 5.0.x SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100-rc.1.20452.10
+        dotnet-version: 5.0.x
 
-    - name: Check dotnet sdk install
+    - name: Check .NET info
       run: dotnet --info
 
     - name: Install dependencies

diff --git a/.github/workflows/github-actions-release.yml b/.github/workflows/github-actions-release.yml
@@ -12,17 +12,17 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Setup .NET Core 3.1.x
+    - name: Setup .NET Core 3.1.x SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1
+        dotnet-version: 3.1.x
 
-    - name: Setup .NET 5.0.x
+    - name: Setup .NET 5.0.x SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100-rc.1.20452.10
+        dotnet-version: 5.0.x
 
-    - name: Check dotnet sdk install
+    - name: Check .NET info
       run: dotnet --info
 
     - name: Install dependencies

diff --git a/Casbin.Benchmark/Casbin.Benchmark.csproj b/Casbin.Benchmark/Casbin.Benchmark.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <ServerGarbageCollection>true</ServerGarbageCollection>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net48;netcoreapp3.1;net5</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/NetCasbin.UnitTest/NetCasbin.UnitTest.csproj b/NetCasbin.UnitTest/NetCasbin.UnitTest.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -14,23 +14,18 @@ stages:
       vmImage: 'windows-latest'
 
     steps:
-      - task : UseDotNet@2
-        displayName: Add 2.1.x dotnet sdk
-        inputs:
-          packageType: 'sdk'
-          version: '2.1.x'
 
       - task : UseDotNet@2
-        displayName: Add 3.1.x dotnet sdk
+        displayName: Add .NET 3.1.x SDK
         inputs:
           packageType: 'sdk'
           version: '3.1.x'
 
       - task : UseDotNet@2
-        displayName: Add 5.0.x dotnet sdk
+        displayName: Add .NET 5.0.x SDK
         inputs:
           packageType: 'sdk'
-          version: '5.0.100-rc.1.20452.10'
+          version: '5.0.x'
 
       - task: DotNetCoreCLI@2
         displayName: Build projects