Move to .NET 5 SDK

nullean · Nov 17, 2020 · 2684a31 · 2684a31
1 parent 659e92e
commit 2684a31
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,10 @@ jobs:
         git tag --list
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.201'
+          dotnet-version: '3.1.201'
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '5.0.100'
         source-url: https://nuget.pkg.github.com/nullean/index.json
       env:
         NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
     <MinVerMinimumMajorMinor>0.2</MinVerMinimumMajorMinor>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="2.2.0">
+    <PackageReference Include="MinVer" Version="2.3.1">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "minver-cli": {
-      "version": "2.2.0",
+      "version": "2.3.1",
       "commands": [
         "minver"
       ]
@@ -15,7 +15,7 @@
       ]
     },
     "nupkg-validator": {
-      "version": "0.2.2",
+      "version": "0.4.0",
       "commands": [
         "nupkg-validator"
       ]

diff --git a/examples/ScratchPad/ScratchPad.csproj b/examples/ScratchPad/ScratchPad.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/global.json b/global.json
@@ -1,8 +1,7 @@
 {
   "sdk": {
-    "version": "3.1.200"
-  },
-  "version": "8.0.0-alpha1",
-  "doc_current": "master",
-  "doc_branch": "master"
+    "version": "5.0.100",
+    "rollForward": "latestFeature",
+    "allowPrerelease": false
+  }
 }
diff --git a/proc.sln b/proc.sln
@@ -20,6 +20,16 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0F267D58-B5AA-4D04-B346-12B283E37B68}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E89606EC-111B-4151-997C-8006627F1926}"
+ProjectSection(SolutionItems) = preProject
+	dotnet-tools.json = dotnet-tools.json
+	readme.md = readme.md
+	build.sh = build.sh
+	build.bat = build.bat
+	Directory.Build.props = Directory.Build.props
+	global.json = global.json
+	.editorconfig = .editorconfig
+	.gitignore = .gitignore
+EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{E4B3DD3A-E36C-46D6-B35E-D824EB9B3C06}"
 EndProject

diff --git a/tests/Proc.Tests.Binary/Proc.Tests.Binary.csproj b/tests/Proc.Tests.Binary/Proc.Tests.Binary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Proc.Tests.Binary</AssemblyName>
     <RootNamespace>Proc.Tests.Binary</RootNamespace>
     <NoWarn>CS1701,CS1591</NoWarn>

diff --git a/tests/Proc.Tests/Proc.Tests.csproj b/tests/Proc.Tests/Proc.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Proc.Tests</AssemblyName>
     <RootNamespace>ProcNet.Tests</RootNamespace>
     <IsPackable>false</IsPackable>