bump TFM to netcoreapp3.1

baronfel · Krzysztof-Cieslak · commit 08db28dd59c7 · 2020-02-18T15:59:48.000+01:00
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -27,16 +27,10 @@
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExeDir Condition=" Exists('$(PaketBootStrapperExePath)') " >$([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\</PaketBootStrapperExeDir>
-
+    
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT' ">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
     <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
 
-    <!-- Disable automagic references for F# DotNet SDK -->
-    <!-- This will not do anything for other project types -->
-    <!-- see https://github.com/fsharp/fslang-design/blob/master/tooling/FST-1002-fsharp-in-dotnet-sdk.md -->
-    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
-    <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
-
     <!-- Disable Paket restore under NCrunch build -->
     <PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled>
 
@@ -136,7 +130,7 @@
         <!-- Parse our simple 'paket.restore.cached' json ...-->
         <PaketRestoreCachedSplitObject Include="$([System.Text.RegularExpressions.Regex]::Split(`$(PaketRestoreCachedContents)`, `{|}|,`))"></PaketRestoreCachedSplitObject>
         <!-- Keep Key, Value ItemGroup-->
-        <PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)"
+        <PaketRestoreCachedKeyValue Include="@(PaketRestoreCachedSplitObject)" 
             Condition=" $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `&quot;: &quot;`).Length) &gt; 1 ">
           <Key>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``))</Key>
           <Value>$([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``))</Value>
@@ -169,7 +163,7 @@
     <Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
     <Error Text="Stop build because of PAKET_ERROR_ON_MSBUILD_EXEC and we need a full restore (hashes don't match)" Condition=" '$(PAKET_ERROR_ON_MSBUILD_EXEC)' == 'true' AND '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true'" />
     <Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true' " ContinueOnError="false" />
-
+    
     <!-- Step 2 Detect project specific changes -->
     <ItemGroup>
       <MyTargetFrameworks Condition="'$(TargetFramework)' != '' " Include="$(TargetFramework)"></MyTargetFrameworks>
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.100"
+    "version": "3.1.101"
   }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -2,7 +2,7 @@ version 5.241.6
 source https://api.nuget.org/v3/index.json
 
 storage: none
-framework: netstandard2.0, netcoreapp3.0
+framework: netstandard2.0, netcoreapp3.1
 
 nuget Expecto
 nuget Newtonsoft.Json
@@ -37,10 +37,10 @@ group netstandard2.0
   nuget FSharp.Control.Websockets >= 0.2
   nuget FSharp.Core >= 4.2.3
 
-group netcoreapp3.0
+group netcoreapp3.1
   source https://api.nuget.org/v3/index.json
   storage: none
-  framework: netcoreapp3.0
+  framework: netcoreapp3.1
 
   nuget Giraffe ~> 4.0
 
diff --git a/paket.lock b/paket.lock
diff --git a/sample/ChannelsSample/ChannelsSample.fsproj b/sample/ChannelsSample/ChannelsSample.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
diff --git a/sample/ChannelsSample/paket.references b/sample/ChannelsSample/paket.references
@@ -1,3 +1,3 @@
-group netcoreapp3.0
+group netcoreapp3.1
   FSharp.Core
   Giraffe
diff --git a/sample/Controller.Sample/Controller.Sample.fsproj b/sample/Controller.Sample/Controller.Sample.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
diff --git a/sample/Controller.Sample/paket.references b/sample/Controller.Sample/paket.references
@@ -1,3 +1,3 @@
-group netcoreapp3.0
+group netcoreapp3.1
   FSharp.Core
   Giraffe
diff --git a/sample/CsrfSample/CsrfSample.fsproj b/sample/CsrfSample/CsrfSample.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DebugType>portable</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
diff --git a/sample/CsrfSample/paket.references b/sample/CsrfSample/paket.references
@@ -1,3 +1,3 @@
-group netcoreapp3.0
+group netcoreapp3.1
   FSharp.Core
   Giraffe
diff --git a/sample/FunctionsSample/paket.references b/sample/FunctionsSample/paket.references
@@ -1,4 +1,4 @@
-group netcoreapp3.0
+group netcoreapp3.1
   FSharp.Core
   Giraffe
   Microsoft.NET.Sdk.Functions
diff --git a/sample/JWTSample/JWTSample.fsproj b/sample/JWTSample/JWTSample.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
diff --git a/sample/JWTSample/paket.references b/sample/JWTSample/paket.references
@@ -1,3 +1,3 @@
-group netcoreapp3.0
+group netcoreapp3.1
   FSharp.Core
   Giraffe
diff --git a/sample/Saturn.Sample/Saturn.Sample.fsproj b/sample/Saturn.Sample/Saturn.Sample.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DebugType>portable</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
diff --git a/sample/Saturn.Sample/paket.references b/sample/Saturn.Sample/paket.references
@@ -1,3 +1,3 @@
-group netcoreapp3.0
+group netcoreapp3.1
   FSharp.Core
   Giraffe
diff --git a/sample/TurbolinksSample/TurbolinksSample.fsproj b/sample/TurbolinksSample/TurbolinksSample.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
@@ -17,4 +17,4 @@
     </Content>
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>
diff --git a/sample/WindowsAuthSample/WindowsAuthSample.fsproj b/sample/WindowsAuthSample/WindowsAuthSample.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
@@ -11,4 +11,4 @@
     <Compile Include="WindowsAuthSample.fs" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>
diff --git a/sample/gRpcSample.Client/gRpcSample.Client.fsproj b/sample/gRpcSample.Client/gRpcSample.Client.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/sample/gRpcSample.Client/paket.references b/sample/gRpcSample.Client/paket.references
@@ -1,5 +1,5 @@
 protobuf-net.Grpc.HttpClient
 
-group netcoreapp3.0
+group netcoreapp3.1
   FSharp.Core
   TaskBuilder.fs
diff --git a/sample/gRpcSample/gRpcSample.fsproj b/sample/gRpcSample/gRpcSample.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Saturn\Saturn.fsproj" />
@@ -12,4 +12,4 @@
     <Compile Include="gRpcSample.fs" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>
diff --git a/src/Saturn.AzureFunctions/Saturn.AzureFunctions.fsproj b/src/Saturn.AzureFunctions/Saturn.AzureFunctions.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netstandard2.0; netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0; netcoreapp3.1</TargetFrameworks>
     <DebugType>portable</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Azure Functions support for Saturn</Description>
@@ -15,7 +15,7 @@
     <Compile Include="AzureFunctions.fs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
diff --git a/src/Saturn.AzureFunctions/paket.references b/src/Saturn.AzureFunctions/paket.references
@@ -2,5 +2,5 @@ group netstandard2.0
   FSharp.Core framework: netstandard2.0
   Microsoft.AspNetCore.Mvc.Abstractions framework: netstandard2.0
 
-group netcoreapp3.0
+group netcoreapp3.1
   FSharp.Core framework: netstandard2.0
diff --git a/src/Saturn.Extensions.Authorization/Saturn.Extensions.Authorization.fsproj b/src/Saturn.Extensions.Authorization/Saturn.Extensions.Authorization.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <DebugType>portable</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Common OAuth extensions for Saturn</Description>
@@ -14,7 +14,7 @@
   <ItemGroup>
     <Compile Include="OAuth.fs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
diff --git a/src/Saturn.Extensions.Authorization/paket.references b/src/Saturn.Extensions.Authorization/paket.references
@@ -4,7 +4,7 @@ group netstandard2.0
   Microsoft.AspNetCore.Authentication.Google framework: netstandard2.0
   Microsoft.AspNetCore.Authentication.OAuth framework: netstandard2.0
 
-group netcoreapp3.0
-  FSharp.Core framework: netcoreapp3.0
-  Microsoft.AspNetCore.Authentication.Google framework: netcoreapp3.0
+group netcoreapp3.1
+  FSharp.Core framework: netcoreapp3.1
+  Microsoft.AspNetCore.Authentication.Google framework: netcoreapp3.1
 
diff --git a/src/Saturn.Extensions.HttpSys/Saturn.Extensions.HttpSys.fsproj b/src/Saturn.Extensions.HttpSys/Saturn.Extensions.HttpSys.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <DebugType>portable</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>HTTP.SYS server support for Saturn</Description>
@@ -15,7 +15,7 @@
     <Compile Include="Saturn.HttpSys.fs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
diff --git a/src/Saturn.Extensions.HttpSys/paket.references b/src/Saturn.Extensions.HttpSys/paket.references
@@ -2,5 +2,5 @@ group netstandard2.0
   FSharp.Core framework: netstandard2.0
   Microsoft.AspNetCore.Server.HttpSys framework: netstandard2.0
 
-group netcoreapp3.0
-  FSharp.Core framework: netcoreapp3.0
+group netcoreapp3.1
+  FSharp.Core framework: netcoreapp3.1
diff --git a/src/Saturn.Extensions.OpenIdConnect/Saturn.Extensions.OpenIdConnect.fsproj b/src/Saturn.Extensions.OpenIdConnect/Saturn.Extensions.OpenIdConnect.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <DebugType>portable</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>OpenID Connection authentication support for Saturn</Description>
@@ -16,7 +16,7 @@
     <Compile Include="OpenId.fs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
diff --git a/src/Saturn.Extensions.OpenIdConnect/paket.references b/src/Saturn.Extensions.OpenIdConnect/paket.references
@@ -3,6 +3,6 @@ group netstandard2.0
   FSharp.Core framework: netstandard2.0
   Microsoft.AspNetCore.Authentication.OpenIdConnect framework: netstandard2.0
 
-group netcoreapp3.0
-  FSharp.Core framework: netcoreapp3.0
-  Microsoft.AspNetCore.Authentication.OpenIdConnect framework: netcoreapp3.0
+group netcoreapp3.1
+  FSharp.Core framework: netcoreapp3.1
+  Microsoft.AspNetCore.Authentication.OpenIdConnect framework: netcoreapp3.1
diff --git a/src/Saturn.Extensions.Turbolinks/Saturn.Extensions.Turbolinks.fsproj b/src/Saturn.Extensions.Turbolinks/Saturn.Extensions.Turbolinks.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0; netcoreapp3.1</TargetFrameworks>
     <DebugType>portable</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>Turbolinks support for Saturn</Description>
@@ -15,7 +15,7 @@
     <Compile Include="Turbolinks.fs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
diff --git a/src/Saturn.Extensions.Turbolinks/paket.references b/src/Saturn.Extensions.Turbolinks/paket.references
@@ -1,5 +1,5 @@
 group netstandard2.0
   FSharp.Core framework: netstandard2.0
 
-group netcoreapp3.0
-  FSharp.Core framework: netcoreapp3.0
+group netcoreapp3.1
+  FSharp.Core framework: netcoreapp3.1
diff --git a/src/Saturn.Extensions.gRPC/Saturn.Extensions.gRPC.fsproj b/src/Saturn.Extensions.gRPC/Saturn.Extensions.gRPC.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DebugType>portable</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>GRPC support for Saturn</Description>
diff --git a/src/Saturn.Extensions.gRPC/paket.references b/src/Saturn.Extensions.gRPC/paket.references
@@ -1,3 +1,3 @@
-group netcoreapp3.0
+group netcoreapp3.1
   FSharp.Core
   protobuf-net.Grpc.AspNetCore
diff --git a/src/Saturn/Application.fs b/src/Saturn/Application.fs
@@ -58,7 +58,7 @@ module Application =
         let! cnt = response.Content.ReadAsStringAsync()
         let user = JObject.Parse cnt
 #endif
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         let! responseStream = response.Content.ReadAsStreamAsync()
         let! user = System.Text.Json.JsonSerializer.DeserializeAsync(responseStream)
 #endif
@@ -409,7 +409,7 @@ module Application =
                 let! cnt = response.Content.ReadAsStringAsync()
                 let user = JObject.Parse cnt
 #endif
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
                 let! responseStream = response.Content.ReadAsStreamAsync()
                 let! user = System.Text.Json.JsonSerializer.DeserializeAsync(responseStream)
 #endif
@@ -495,7 +495,7 @@ module Application =
 #if NETSTANDARD2_0
         s.AddAuthorization (Action<AuthorizationOptions> policyBuilder)
 #endif
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
         s.AddAuthorizationCore (Action<AuthorizationOptions> policyBuilder)
 #endif
       { state with
diff --git a/src/Saturn/Saturn.fsproj b/src/Saturn/Saturn.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyName>Saturn</AssemblyName>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netcoreapp3.0;netstandard2.0;</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netstandard2.0;</TargetFrameworks>
     <DebugType>portable</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
@@ -24,7 +24,7 @@
     <Compile Include="Links.fs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
diff --git a/src/Saturn/paket.references b/src/Saturn/paket.references
diff --git a/tests/Saturn.UnitTests/Saturn.UnitTests.fsproj b/tests/Saturn.UnitTests/Saturn.UnitTests.fsproj
diff --git a/tests/Saturn.UnitTests/paket.references b/tests/Saturn.UnitTests/paket.references

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "3.0.100"`
	`3`	`+ "version": "3.1.101"`
`4`	`4`	`}`
`5`	`5`	`}`