.NET8, dependencies and az cli updates

Azure · Apr 12, 2024 · 257ba3d · 257ba3d
1 parent 8b88b45
commit 257ba3d
Show file tree

Hide file tree

Showing 20 changed files with 84 additions and 105 deletions.
diff --git a/AAD.Giraffe/AAD.Giraffe.fsproj b/AAD.Giraffe/AAD.Giraffe.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
@@ -12,9 +12,8 @@
     <Compile Include="Noop.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="5.0.0" />
-    <PackageReference Include="Giraffe" Version="5.*" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.7.0" />
+    <PackageReference Include="Giraffe" Version="6.3.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.*" />
   </ItemGroup>
 </Project>
diff --git a/AAD.Giraffe/PartProtector.fs b/AAD.Giraffe/PartProtector.fs
@@ -3,7 +3,6 @@ namespace AAD
 open Microsoft.AspNetCore.Http
 open System.Threading.Tasks
 open Giraffe
-open FSharp.Control.Tasks.V2.ContextInsensitive
 open System.IdentityModel.Tokens.Jwt
 open Microsoft.IdentityModel.Protocols.OpenIdConnect
 open Microsoft.Extensions.Caching.Memory
@@ -53,7 +52,7 @@ module PartProtector =
             member __.Verify (getDemand: HttpContext -> Task<Demand>) 
                              (onSuccess: JwtSecurityToken -> HttpHandler) = 
                 fun next (ctx:HttpContext) -> 
-                    task {
+                    backgroundTask {
                         let handleSuccess,handleMissing,result =
                             ResultHandler.mkDefault onSuccess
                         let! demand = getDemand ctx
@@ -67,7 +66,7 @@ module PartProtector =
                                  (onSuccess: JwtSecurityToken -> HttpHandler)
                                  (onError: JwtSecurityToken option -> WWWAuthenticate -> HttpHandler) = 
                 fun next (ctx:HttpContext) -> 
-                    task {
+                    backgroundTask {
                         let handleSuccess,handleMissing,result =
                             ResultHandler.mkNew onError onSuccess
                         let! demand = getDemand ctx
@@ -84,10 +83,10 @@ module PartProtector =
     let mkDefault (httpClient: HttpClient)
                   (audiences: #seq<Audience>)
                   (authority: System.Uri) =
-        task {
+        backgroundTask {
             let getConfiguration =
                 let cache = new MemoryCache(new MemoryCacheOptions(SizeLimit = 1L)) 
-                fun () -> cache.GetOrCreateAsync(1, fun e -> task {
+                fun () -> cache.GetOrCreateAsync(1, fun e -> backgroundTask {
                     let! r = OpenIdConnectConfigurationRetriever
                                 .GetAsync(sprintf "%O/.well-known/openid-configuration" authority, httpClient, System.Threading.CancellationToken.None)
                                 .ConfigureAwait false

diff --git a/AAD.Suave/AAD.Suave.fsproj b/AAD.Suave/AAD.Suave.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
@@ -12,8 +12,7 @@
     <Compile Include="Noop.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="5.0.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.7.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
     <PackageReference Include="Suave" Version="2.6.*" />
   </ItemGroup>
 </Project>
diff --git a/AAD.Suave/PartProtector.fs b/AAD.Suave/PartProtector.fs
@@ -5,7 +5,6 @@ open Suave.Operators
 open System.IdentityModel.Tokens.Jwt
 open Microsoft.IdentityModel.Protocols.OpenIdConnect
 open Microsoft.Extensions.Caching.Memory
-open FSharp.Control.Tasks.V2.ContextInsensitive
 
 /// PartProtector is the interface for a stateful protector instance.
 /// Use PartProtector module to create the instances implementing this interface.
@@ -86,7 +85,7 @@ module PartProtector =
             let getConfiguration =
                 let cache = new MemoryCache(new MemoryCacheOptions(SizeLimit = 1L)) 
                 fun () -> 
-                    cache.GetOrCreateAsync(1, fun e -> task {
+                    cache.GetOrCreateAsync(1, fun e -> backgroundTask {
                         let! r = OpenIdConnectConfigurationRetriever
                                     .GetAsync(sprintf "%O/.well-known/openid-configuration" authority, httpClient, System.Threading.CancellationToken.None)
                                     .ConfigureAwait false

diff --git a/AAD.Test/AAD.Test.fsproj b/AAD.Test/AAD.Test.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>79a3edd0-2092-40a2-a04d-dcb46d5ca9ed</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
@@ -19,25 +19,22 @@
     <Compile Include="ResourceOwnerTests.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
-    <PackageReference Include="Serilog.Sinks.XUnit" Version="1.0.6" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.5" />
     <PackageReference Include="Suave" Version="2.6.*" />
-    <PackageReference Include="unquote" Version="4.0.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+    <PackageReference Include="unquote" Version="7.0.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.6.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.*" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.*" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.60.2" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.5.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
     <ProjectReference Include="..\AAD.fs\AAD.fs.fsproj" />
     <ProjectReference Include="..\AAD.Suave\AAD.Suave.fsproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="5.0.0" />
-  </ItemGroup>
 </Project>
diff --git a/AAD.Test/Logging.fs b/AAD.Test/Logging.fs
@@ -3,7 +3,6 @@ module AADTests.Logging
 open System.Threading
 open System.Threading.Tasks
 open System.Net.Http
-open FSharp.Control.Tasks
 
 type Log = string -> (string*obj) list -> unit
 
@@ -12,7 +11,7 @@ type HttpClientLogger(innerHandler, log:Log) =
     member private __.baseImpl (request, cancellationToken) = base.SendAsync (request, cancellationToken)
     override this.SendAsync(request:HttpRequestMessage, cancellationToken:CancellationToken):Task<HttpResponseMessage> =
 
-        task {
+        backgroundTask {
             if isNull request.Content then
                 log "Request: {req}" ["req", box request]
             else

diff --git a/AAD.fs.tasks/AAD.fs.tasks.fsproj b/AAD.fs.tasks/AAD.fs.tasks.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DefineConstants>TASKS</DefineConstants>
   </PropertyGroup>
@@ -12,11 +12,9 @@
     <Compile Include="../AAD.fs/Requestor.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="5.0.0" />
-    <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.6.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.7.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.6.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.60.2" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.5.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/AAD.fs/AAD.fs.fsproj b/AAD.fs/AAD.fs.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
@@ -11,11 +11,9 @@
     <Compile Include="ResourceOwner.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="5.0.0" />
-    <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.6.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.7.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.6.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.60.2" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.5.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/AAD.fs/Awaitable.fs b/AAD.fs/Awaitable.fs
@@ -6,8 +6,7 @@ open System
 module internal AwaitableBuilder =
     open System.Threading.Tasks
 #if TASKS
-    open FSharp.Control.Tasks
-    let awaitable = task
+    let awaitable = backgroundTask
     type Awaitable<'r> = Task<'r>
 
     [<RequireQualifiedAccess>]
@@ -16,8 +15,8 @@ module internal AwaitableBuilder =
         let inline awaitTask x = x
         let inline awaitUnitTask (x:Task) = x.ContinueWith<unit>(fun _ -> ())
         let inline awaitAsync x = Async.StartAsTask x
-        let inline map f (x:Task<_>) = task { let! v = x in return f v }
-        let inline bind f (x:Task<_>) = task { let! v = x in return! f v }
+        let inline map f (x:Task<_>) = backgroundTask { let! v = x in return f v }
+        let inline bind f (x:Task<_>) = backgroundTask { let! v = x in return! f v }
         let inline whenAll (xs:#seq<Task<'t>>) = Task.WhenAll<'t> (Array.ofSeq xs)
 #else
     let awaitable = async

diff --git a/AAD.fs/ResourceOwner.fs b/AAD.fs/ResourceOwner.fs
@@ -8,12 +8,11 @@ open System.IdentityModel.Tokens.Jwt
 module internal TokenCache =
     open System.Threading.Tasks
     open Microsoft.Extensions.Caching.Memory
-    open FSharp.Control.Tasks
 
     let mkNew options =
         let cache = new MemoryCache(options)
         let getOrAdd key (mkEntry: string -> Task<Result<JwtSecurityToken,_>>) =
-            cache.GetOrCreateAsync(key, fun e -> task {
+            cache.GetOrCreateAsync(key, fun e -> backgroundTask {
                 let! r = mkEntry key
                 match r with
                 | Ok entry ->
@@ -37,15 +36,14 @@ module internal Introspector =
     open YoLo
     open Microsoft.IdentityModel.Tokens
     open Microsoft.IdentityModel.Protocols.OpenIdConnect
-    open FSharp.Control.Tasks.V2.ContextInsensitive
 
     let mkNew (cache:string -> (string -> Task<_>) -> Task<_>)
               (audiences: #seq<Audience>)
               (getConfig: unit -> Awaitable<OpenIdConnectConfiguration>) = 
         let handler = JwtSecurityTokenHandler()
 
         let local (jwtEncodedString: string) =
-            task {
+            backgroundTask {
                 try
                     let! oidcConfig = getConfig()
                     let vparams = TokenValidationParameters

diff --git a/AAD.tasks.Test/AAD.tasks.Test.fsproj b/AAD.tasks.Test/AAD.tasks.Test.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>79a3edd0-2092-40a2-a04d-dcb46d5ca9ed</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
@@ -18,23 +18,20 @@
     <Compile Include="ResourceOwnerTests.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
-    <PackageReference Include="Serilog.Sinks.XUnit" Version="1.0.6" />
-    <PackageReference Include="unquote" Version="4.0.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.5" />
+    <PackageReference Include="unquote" Version="7.0.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="12.*" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.*" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <ProjectReference Include="..\AAD.fs.tasks\AAD.fs.tasks.fsproj" />
     <ProjectReference Include="..\AAD.Giraffe\AAD.Giraffe.fsproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="5.0.0" />
-  </ItemGroup>
 </Project>
diff --git a/AAD.tasks.Test/ResourceOwnerTests.fs b/AAD.tasks.Test/ResourceOwnerTests.fs
@@ -5,7 +5,6 @@ open System.Threading
 open System.Threading.Tasks
 open Xunit
 open Swensen.Unquote
-open FSharp.Control.Tasks.V2.ContextInsensitive
 open AAD
 open AADTests.TestsCommon
 
@@ -14,7 +13,7 @@ open AADTests.TestsCommon
 type Parties() =
     let mutable last = None
     let init httpClient =
-        task {
+        backgroundTask {
             match last with
             | Some args -> return args
             | _ ->
@@ -47,7 +46,7 @@ type ThreeBodyProblem(output: Xunit.Abstractions.ITestOutputHelper, fixture: Par
 
     [<Fact>]
     member __.``Admin can write and read`` () =
-        task {
+        backgroundTask {
           let _, proxy = fixture.Init httpClient
           let requestor = 
             proxy |> TaskRequestor.mkNew (ResourceProxy.authenticate ([settings.Scope], ClientId settings.AdminAppId, Secret settings.AdminSecret, settings.Authority))
@@ -59,7 +58,7 @@ type ThreeBodyProblem(output: Xunit.Abstractions.ITestOutputHelper, fixture: Par
 
     [<Fact>]
     member __.``Writer can write but not read`` () =
-        task {
+        backgroundTask {
           let _, proxy = fixture.Init httpClient
           let requestor = 
             proxy |> TaskRequestor.mkNew (ResourceProxy.authenticate ([settings.Scope], ClientId settings.WriterAppId, Secret settings.WriterSecret, settings.Authority))
@@ -74,7 +73,7 @@ type ThreeBodyProblem(output: Xunit.Abstractions.ITestOutputHelper, fixture: Par
 
     [<Fact>]
     member __.``Reader can read`` () =
-        task {
+        backgroundTask {
           let _, proxy = fixture.Init httpClient
           let requestor = 
             proxy |> TaskRequestor.mkNew (ResourceProxy.authenticate ([settings.Scope], ClientId settings.ReaderAppId, Secret settings.ReaderSecret, settings.Authority))
@@ -84,7 +83,7 @@ type ThreeBodyProblem(output: Xunit.Abstractions.ITestOutputHelper, fixture: Par
 
     [<Fact>]
     member __.``Forbidden`` () =
-        task {
+        backgroundTask {
           let _, proxy = fixture.Init httpClient
           let! response = proxy.provision() // should always succeed
 

diff --git a/AAD.tasks.Test/ResourceProxy.fs b/AAD.tasks.Test/ResourceProxy.fs
@@ -3,7 +3,6 @@ namespace AADTests
 open System
 open System.Threading.Tasks
 open System.Net.Http
-open FSharp.Control.Tasks
 open AAD
 open Microsoft.Identity.Client
 
@@ -26,7 +25,7 @@ module ResourceProxy =
             member __.httpClient = httpClient
             member __.address = address
             member __.provision() = 
-                task {
+                backgroundTask {
                     use r = new HttpRequestMessage(Method = HttpMethod.Head,
                                                    RequestUri = address)
                     withHeaders r.Headers
@@ -35,7 +34,7 @@ module ResourceProxy =
                         raise (ProxyException response.StatusCode)
                 } :> Task
             member __.read() = 
-                task {
+                backgroundTask {
                     use r = new HttpRequestMessage(Method = HttpMethod.Get,
                                                    RequestUri = address)
                     withHeaders r.Headers
@@ -46,7 +45,7 @@ module ResourceProxy =
                     return content
                 }
             member __.write() = 
-                task {
+                backgroundTask {
                     use r = new HttpRequestMessage(Method = HttpMethod.Put,
                                                    RequestUri = address)
                     withHeaders r.Headers