File tree Expand file tree Collapse file tree 2 files changed +10
-9
lines changed
tests/Giraffe.TokenRouter.Tests Expand file tree Collapse file tree 2 files changed +10
-9
lines changed Original file line number Diff line number Diff line change 11<Project Sdk =" Microsoft.NET.Sdk" >
22
33 <PropertyGroup >
4- <TargetFrameworks >net461;netcoreapp2.1 </TargetFrameworks >
4+ <TargetFrameworks >net5.0 </TargetFrameworks >
55 <AssemblyName >Giraffe.TokenRouter.Tests</AssemblyName >
66 <DebugType >portable</DebugType >
77 <RollForward >Major</RollForward >
1515 <PackageReference Include =" xunit" Version =" 2.4.*" />
1616 <PackageReference Include =" xunit.runner.visualstudio" Version =" 2.4.*" />
1717 <PackageReference Include =" NSubstitute" Version =" 3.1.*" />
18- <PackageReference Include =" Giraffe" Version =" 2.0.*" />
18+ <PackageReference Include =" Giraffe" Version =" 5.0.*" />
19+ <PackageReference Include =" Giraffe.ViewEngine" Version =" 1.4.*" />
1920 </ItemGroup >
2021
2122 <ItemGroup >
Original file line number Diff line number Diff line change @@ -14,9 +14,9 @@ open Xunit.Abstractions
1414open NSubstitute
1515open Newtonsoft.Json
1616open Giraffe
17- open Giraffe.Serialization
18- open Giraffe.GiraffeViewEngine
1917open Giraffe.TokenRouter
18+ open Giraffe.ViewEngine
19+ open FSharp.Control .Tasks
2020
2121// ---------------------------------
2222// XmlAssert
@@ -78,16 +78,16 @@ let next : HttpFunc = Some >> Task.FromResult
7878
7979let mockJson ( ctx : HttpContext ) ( settings : JsonSerializerSettings option ) =
8080 let jsonSettings =
81- defaultArg settings NewtonsoftJsonSerializer .DefaultSettings
81+ defaultArg settings NewtonsoftJson.Serializer .DefaultSettings
8282 ctx.RequestServices
83- .GetService( typeof< IJsonSerializer >)
84- .Returns( NewtonsoftJsonSerializer ( jsonSettings))
83+ .GetService( typeof< Json.ISerializer >)
84+ .Returns( NewtonsoftJson.Serializer ( jsonSettings))
8585 |> ignore
8686
8787let mockXml ( ctx : HttpContext ) =
8888 ctx.RequestServices
89- .GetService( typeof< IXmlSerializer >)
90- .Returns( DefaultXmlSerializer ( DefaultXmlSerializer .DefaultSettings))
89+ .GetService( typeof< Xml.ISerializer >)
90+ .Returns( SystemXml.Serializer ( SystemXml.Serializer .DefaultSettings))
9191 |> ignore
9292
9393let mockNegotiation ( ctx : HttpContext ) =
You can’t perform that action at this time.
0 commit comments