Update to .NET 5.0

frank-fs · Nov 18, 2020 · 89b95a1 · 89b95a1
1 parent c76d444
commit 89b95a1
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 306 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,43 @@
+name: CI
+
+on:
+  push:
+    tags:
+      - v[0-9]+.[0-9]+.[0-9]+
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Build, test, and pack
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use dotnet CLI
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '5.0.x' # SDK Version to use.
+    - name: Build
+      run: |
+        dotnet restore
+        dotnet build -c Release --no-restore
+    - name: Test
+      run: dotnet test -c Release --no-restore --no-build --framework net5.0 --logger "GitHubActions;report-warnings=false"
+    - name: Pack
+      run: dotnet pack -c Release --no-restore --no-build --include-symbols -o out
+    - name: Upload artifact
+      uses: actions/upload-artifact@v1
+      with:
+        name: nupkg
+        path: ./out
+    - name: Push
+      if: startsWith( github.ref, 'refs/tags/v' )
+      env:
+        API_KEY: ${{ secrets.NUGET_API_KEY }}
+        SOURCE: 'https://api.nuget.org/v3/index.json'
+      run: |
+        dotnet nuget push out/*.*nupkg --source $SOURCE --api-key $API_KEY
+
diff --git a/.travis.yml b/.travis.yml
diff --git a/Frank.sln b/Frank.sln
@@ -16,8 +16,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Sample", "sample\Sample\Sam
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Frank.Giraffe", "sample\Frank.Giraffe\Frank.Giraffe.fsproj", "{288DD553-E875-48CC-BE7A-F17D6CC248A2}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Frank.Falco", "sample\Frank.Falco\Frank.Falco.fsproj", "{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -64,18 +62,6 @@ Global
 		{288DD553-E875-48CC-BE7A-F17D6CC248A2}.Release|x64.Build.0 = Release|Any CPU
 		{288DD553-E875-48CC-BE7A-F17D6CC248A2}.Release|x86.ActiveCfg = Release|Any CPU
 		{288DD553-E875-48CC-BE7A-F17D6CC248A2}.Release|x86.Build.0 = Release|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Debug|x64.Build.0 = Debug|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Debug|x86.Build.0 = Debug|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Release|x64.ActiveCfg = Release|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Release|x64.Build.0 = Release|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Release|x86.ActiveCfg = Release|Any CPU
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -84,7 +70,6 @@ Global
 		{6B884F96-1AC1-4D94-B124-4E45802BC9CA} = {E7FEC957-359E-4B20-B0C1-F93552F6701F}
 		{B00F5976-D710-493F-90DB-CEB8703DF924} = {D44D293C-2E08-4249-8274-1B5BB8EA273D}
 		{288DD553-E875-48CC-BE7A-F17D6CC248A2} = {D44D293C-2E08-4249-8274-1B5BB8EA273D}
-		{ED5FD678-C822-4C2A-ABC3-E75C4B9B0CE7} = {D44D293C-2E08-4249-8274-1B5BB8EA273D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {69BCA08B-4B88-4702-91B2-B5E891A078D9}

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/sample/Frank.Falco/Extensions.fs b/sample/Frank.Falco/Extensions.fs
diff --git a/sample/Frank.Falco/Frank.Falco.fsproj b/sample/Frank.Falco/Frank.Falco.fsproj
diff --git a/sample/Frank.Falco/Program.fs b/sample/Frank.Falco/Program.fs
diff --git a/sample/Frank.Falco/WebRoot/main.css b/sample/Frank.Falco/WebRoot/main.css
diff --git a/sample/Frank.Falco/web.config b/sample/Frank.Falco/web.config
diff --git a/sample/Frank.Giraffe/Frank.Giraffe.fsproj b/sample/Frank.Giraffe/Frank.Giraffe.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <DebugType>portable</DebugType>
     <AssemblyName>Frank.Giraffe</AssemblyName>
@@ -23,8 +23,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Giraffe" Version="4.0.*" />
+    <PackageReference Include="Giraffe" Version="5.0.0-alpha-003" />
+    <PackageReference Include="Giraffe.ViewEngine" Version="1.2.0" />
     <PackageReference Include="TaskBuilder.fs" Version="2.1.*" />
+    <PackageReference Update="FSharp.Core" Version="5.0.0" />
   </ItemGroup>
 
 </Project>