updating to net7.0

.travis.yml

@@ -1,7 +1,7 @@
 language: csharp
 dist: trusty
 env: MONO_BASE_PATH=/usr/lib/mono/
-dotnet: 2.0.0
+dotnet: 7.0.0
 mono:
   - 5.2.0
   - latest # => "stable release"

HttpFs.IntegrationTests/AssemblyInfo.fs

@@ -4,16 +4,16 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("HttpFs.IntegrationTests")>]
 [<assembly: AssemblyProductAttribute("HttpFs.IntegrationTests")>]
-[<assembly: AssemblyCopyrightAttribute("Copyright © 2020")>]
+[<assembly: AssemblyCopyrightAttribute("Copyright © 2023")>]
 [<assembly: AssemblyDescriptionAttribute("A simple, functional HTTP client library for F#")>]
-[<assembly: AssemblyVersionAttribute("5.4.0")>]
-[<assembly: AssemblyFileVersionAttribute("5.4.0")>]
+[<assembly: AssemblyVersionAttribute("5.4.1")>]
+[<assembly: AssemblyFileVersionAttribute("5.4.1")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "HttpFs.IntegrationTests"
     let [<Literal>] AssemblyProduct = "HttpFs.IntegrationTests"
-    let [<Literal>] AssemblyCopyright = "Copyright © 2020"
+    let [<Literal>] AssemblyCopyright = "Copyright © 2023"
     let [<Literal>] AssemblyDescription = "A simple, functional HTTP client library for F#"
-    let [<Literal>] AssemblyVersion = "5.4.0"
-    let [<Literal>] AssemblyFileVersion = "5.4.0"
+    let [<Literal>] AssemblyVersion = "5.4.1"
+    let [<Literal>] AssemblyFileVersion = "5.4.1"

HttpFs.IntegrationTests/HttpFs.IntegrationTests.fsproj

@@ -4,7 +4,7 @@
     <Name>HttpFs.IntegrationTests</Name>
     <AssemblyName>HttpFs.IntegrationTests</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
+    <TargetFrameworks>net7.0;net471</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 

HttpFs.IntegrationTests/HttpServer.fs

@@ -123,6 +123,9 @@ let app =
         >=> Cookie.setCookie (HttpCookie.create "cookie1" "baboon" None (Some "/Invalid") None true true None )
         >=> Successful.OK ""
 
+      Filters.path "/CookieNonAscii"
+        >=> Cookie.setCookie (HttpCookie.createKV "cookie1" "яЏ§§їДЙ")
+        >=> Successful.OK "body"
 
       Filters.path "/NoCookies" >=> Successful.OK "body"
 

HttpFs.IntegrationTests/Tests.fs

@@ -358,6 +358,16 @@ let tests =
       Expect.equal response.statusCode 200 "statusCode should be equal"
     }
 
+    testCaseAsync "cookies non ascii chars" <| async {
+      use! response =
+        Request.create Get (uriFor "/CookieNonAscii")
+        |> getResponse
+        |> Alt.toAsync
+
+      Expect.equal response.statusCode 200 "statusCode should be equal"
+      Expect.equal (response.cookies.ContainsKey "cookie1") true "should be present"
+    }
+
     testCaseAsync "reading the body as bytes works properly" <| async {
       use! response =
         Request.create Get (uriFor "/Raw")

HttpFs.SampleApplication/HttpFs.SampleApplication.fsproj

@@ -4,7 +4,7 @@
     <Name>HttpFs.SampleApplication</Name>
     <AssemblyName>HttpFs.SampleApplication</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

HttpFs.SamplePostApplication/HttpClient.SamplePostApplication.fsproj

@@ -4,7 +4,7 @@
     <Name>HttpFs.SamplePostApplication</Name>
     <AssemblyName>HttpFs.SamplePostApplication</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
+    <TargetFrameworks>net7.0;net471</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

HttpFs.UnitTests/AssemblyInfo.fs

@@ -4,16 +4,16 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("HttpFs.UnitTests")>]
 [<assembly: AssemblyProductAttribute("HttpFs.UnitTests")>]
-[<assembly: AssemblyCopyrightAttribute("Copyright © 2020")>]
+[<assembly: AssemblyCopyrightAttribute("Copyright © 2023")>]
 [<assembly: AssemblyDescriptionAttribute("A simple, functional HTTP client library for F#")>]
-[<assembly: AssemblyVersionAttribute("5.4.0")>]
-[<assembly: AssemblyFileVersionAttribute("5.4.0")>]
+[<assembly: AssemblyVersionAttribute("5.4.1")>]
+[<assembly: AssemblyFileVersionAttribute("5.4.1")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "HttpFs.UnitTests"
     let [<Literal>] AssemblyProduct = "HttpFs.UnitTests"
-    let [<Literal>] AssemblyCopyright = "Copyright © 2020"
+    let [<Literal>] AssemblyCopyright = "Copyright © 2023"
     let [<Literal>] AssemblyDescription = "A simple, functional HTTP client library for F#"
-    let [<Literal>] AssemblyVersion = "5.4.0"
-    let [<Literal>] AssemblyFileVersion = "5.4.0"
+    let [<Literal>] AssemblyVersion = "5.4.1"
+    let [<Literal>] AssemblyFileVersion = "5.4.1"

HttpFs.UnitTests/HttpFs.UnitTests.fsproj

@@ -4,7 +4,7 @@
     <AssemblyName>HttpFs.UnitTests</AssemblyName>
     <Name>HttpFs.UnitTests</Name>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
+    <TargetFrameworks>net7.0;net471</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>

HttpFs/AssemblyInfo.fs

@@ -4,16 +4,16 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("HttpFs")>]
 [<assembly: AssemblyProductAttribute("HttpFs")>]
-[<assembly: AssemblyCopyrightAttribute("Copyright © 2020")>]
+[<assembly: AssemblyCopyrightAttribute("Copyright © 2023")>]
 [<assembly: AssemblyDescriptionAttribute("A simple, functional HTTP client library for F#")>]
-[<assembly: AssemblyVersionAttribute("5.4.0")>]
-[<assembly: AssemblyFileVersionAttribute("5.4.0")>]
+[<assembly: AssemblyVersionAttribute("5.4.1")>]
+[<assembly: AssemblyFileVersionAttribute("5.4.1")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "HttpFs"
     let [<Literal>] AssemblyProduct = "HttpFs"
-    let [<Literal>] AssemblyCopyright = "Copyright © 2020"
+    let [<Literal>] AssemblyCopyright = "Copyright © 2023"
     let [<Literal>] AssemblyDescription = "A simple, functional HTTP client library for F#"
-    let [<Literal>] AssemblyVersion = "5.4.0"
-    let [<Literal>] AssemblyFileVersion = "5.4.0"
+    let [<Literal>] AssemblyVersion = "5.4.1"
+    let [<Literal>] AssemblyFileVersion = "5.4.1"

HttpFs/HttpFs.fsproj

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <AssemblyName>HttpFs</AssemblyName>
     <PackageId>Http.fs</PackageId>
-    <Version>5.4.0</Version>
-    <TargetFrameworks>netstandard2.0;net471</TargetFrameworks>
+    <Version>5.4.1</Version>
+    <TargetFrameworks>netstandard2.1;net471</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\paket-files\haf\YoLo\YoLo.fs">

HttpFs/paket.template

@@ -9,12 +9,12 @@ dependencies
   framework: net471
     FSharp.Core >= LOCKEDVERSION
     Hopac >= LOCKEDVERSION
-  framework: netstandard2.0
+  framework: netstandard2.1
     FSharp.Core >= LOCKEDVERSION
     Hopac >= LOCKEDVERSION
 
 files
-  bin/Release/netstandard2.0/HttpFs.dll ==> lib/netstandard2.0
-  bin/Release/netstandard2.0/HttpFs.xml ==> lib/netstandard2.0
+  bin/Release/netstandard2.1/HttpFs.dll ==> lib/netstandard2.1
+  bin/Release/netstandard2.1/HttpFs.xml ==> lib/netstandard2.1
   bin/Release/net471/HttpFs.dll ==> lib/net471
   bin/Release/net471/HttpFs.xml ==> lib/net471

RELEASE_NOTES.md

@@ -1,3 +1,5 @@
+#### 5.4.1 — 2023-08-02
+* netstandard 2.1 upgrade
 #### 5.4.0 — 2018-06-27
 * Delete verb now supports body
 * Support for custom http method

Rakefile

@@ -70,7 +70,7 @@ end
 
 namespace :tests do
   task :integration do
-    Kernel.system({"TEST_PORT" => "2345"}, "dotnet run -p HttpFs.IntegrationTests -c #{Configuration} --no-restore --no-build --framework netcoreapp2.0")
+    Kernel.system({"TEST_PORT" => "2345"}, "dotnet run -p HttpFs.IntegrationTests -c #{Configuration} --no-restore --no-build --framework net7.0")
     system "HttpFs.IntegrationTests/bin/#{Configuration}/net471/HttpFs.IntegrationTests.exe", clr_command: true
   end
   task :unit do

appveyor.yml

@@ -1,4 +1,4 @@
-image: Visual Studio 2017
+image: Visual Studio 2022
 
 build_script:
   - cmd: build.cmd

build.fsx

@@ -56,18 +56,18 @@ let build project framework =
     })
 
 Target "BuildTest" (fun _ ->
-    build "HttpFs.UnitTests/HttpFs.UnitTests.fsproj" "netcoreapp2.0"
+    build "HttpFs.UnitTests/HttpFs.UnitTests.fsproj" "net7.0"
     build "HttpFs.UnitTests/HttpFs.UnitTests.fsproj" "net471"
-    build "HttpFs.IntegrationTests/HttpFs.IntegrationTests.fsproj" "netcoreapp2.0"
+    build "HttpFs.IntegrationTests/HttpFs.IntegrationTests.fsproj" "net7.0"
     build "HttpFs.IntegrationTests/HttpFs.IntegrationTests.fsproj" "net471"
 )
 
 Target "RunTest" (fun _ ->
-    DotNetCli.RunCommand id ("HttpFs.UnitTests/bin/"+configuration+"/netcoreapp2.0/HttpFs.UnitTests.dll --summary --sequenced")
+    DotNetCli.RunCommand id ("HttpFs.UnitTests/bin/"+configuration+"/net7.0/HttpFs.UnitTests.dll --summary --sequenced")
     //Shell.Exec ("HttpFs.UnitTests/bin/"+configuration+"/net471/HttpFs.UnitTests.exe","--summary --sequenced")
     //|> fun r -> if r<>0 then failwith "HttpFs.UnitTests.exe failed"
 
-    DotNetCli.RunCommand id ("HttpFs.IntegrationTests/bin/"+configuration+"/netcoreapp2.0/HttpFs.IntegrationTests.dll --summary --sequenced")
+    DotNetCli.RunCommand id ("HttpFs.IntegrationTests/bin/"+configuration+"/net7.0/HttpFs.IntegrationTests.dll --summary --sequenced")
     //Shell.Exec ("HttpFs.IntegrationTests/bin/"+configuration+"/net471/HttpFs.IntegrationTests.exe","--summary --sequenced")
     //|> fun r -> if r<>0 then failwith "HttpFs.IntegrationTests.exe failed"
 )