Update to .NET 5 final release

k94ll13nn3 · Nov 11, 2020 · 8a9c005 · 8a9c005
1 parent 553722e
commit 8a9c005
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,12 +16,6 @@ jobs:
         fetch-depth: 0 # for minver
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.100-rc.2.20479.15
-    - name: Setup .NET Core for Wyam
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 2.1.811
     - name: Execute build
       run: |
         dotnet build --configuration Release /nologo
@@ -31,6 +25,11 @@ jobs:
       with:
         name: strinken
         path: artifacts/*
+    - name: Setup .NET Core for Wyam
+      if: contains(github.event.head_commit.message, '[build-doc]') && github.ref == 'refs/heads/master'
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 2.1.811
     - name: Generate doc
       if: contains(github.event.head_commit.message, '[build-doc]') && github.ref == 'refs/heads/master'
       run: |

diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "5.0.100-rc.2.20479.15",
+    "version": "5.0.100",
     "rollForward": "latestMajor",
-    "allowPrerelease": true
+    "allowPrerelease": false
   }
 }
diff --git a/tests/Strinken.Public.Tests/Strinken.Public.Tests.csproj b/tests/Strinken.Public.Tests/Strinken.Public.Tests.csproj
@@ -4,13 +4,13 @@
     <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Strinken\Strinken.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

diff --git a/tests/Strinken.Tests/Strinken.Tests.csproj b/tests/Strinken.Tests/Strinken.Tests.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">