Skip to content

Commit 563d4d3

Browse files
SchlenkRSchlenkR
committed
- Reintegrated Tests projects in solution
- net8.0
1 parent 47c6927 commit 563d4d3

26 files changed

+49
-51
lines changed

‎Directory.Build.props

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<Version>12.0.0</Version>
4+
<Version>12.1.0</Version>
55

66
<Authors>Ronald Schlenker</Authors>
77
<Copyright>Copyright 2023 Ronald Schlenker</Copyright>
@@ -15,7 +15,10 @@
1515
<FsDocsLicenseLink>https://github.com/fsprojects/FsHttp/blob/master/LICENSE</FsDocsLicenseLink>
1616
<FsDocsReleaseNotesLink>https://www.nuget.org/packages/FsHttp#release-body-tab</FsDocsReleaseNotesLink>
1717

18-
<PackageReleaseNotes>
18+
<PackageReleaseNotes>
19+
v12.1.0
20+
- net8.0
21+
1922
v12.0.0
2023
- 137: Change the type for FsHttpUrl.additionalQueryParams from obj to string
2124
- Removed (auto opened) Async.await and Task.map/await

‎FsHttp.sln

+12-5
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ VisualStudioVersion = 17.0.32014.148
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{13B4B071-F3F1-4E38-93E4-CFA72611A84F}"
77
EndProject
8-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsHttp", "src\FsHttp\FsHttp.fsproj", "{D1AD2123-678B-4DC9-9DBA-3D6FF2E30F61}"
8+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsHttp", "src\FsHttp\FsHttp.fsproj", "{D1AD2123-678B-4DC9-9DBA-3D6FF2E30F61}"
99
EndProject
10-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsHttp.FSharpData", "src\FsHttp.FSharpData\FsHttp.FSharpData.fsproj", "{07320ED5-9E4A-452E-80C3-007C3303735F}"
10+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsHttp.FSharpData", "src\FsHttp.FSharpData\FsHttp.FSharpData.fsproj", "{07320ED5-9E4A-452E-80C3-007C3303735F}"
1111
EndProject
12-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsHttp.NewtonsoftJson", "src\FsHttp.NewtonsoftJson\FsHttp.NewtonsoftJson.fsproj", "{CB577E4F-F4F0-4ADA-BD90-036B5ECF17AD}"
12+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsHttp.NewtonsoftJson", "src\FsHttp.NewtonsoftJson\FsHttp.NewtonsoftJson.fsproj", "{CB577E4F-F4F0-4ADA-BD90-036B5ECF17AD}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.CSharp", "src\Test.CSharp\Test.CSharp.csproj", "{1163EF7E-1845-4D2A-8C3F-8691618500DF}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.CSharp", "src\Test.CSharp\Test.CSharp.csproj", "{1163EF7E-1845-4D2A-8C3F-8691618500DF}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestWebServer", "src\TestWebServer\TestWebServer.csproj", "{E7E326FD-1D66-4DBD-AB60-D006D3B77244}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestWebServer", "src\TestWebServer\TestWebServer.csproj", "{E7E326FD-1D66-4DBD-AB60-D006D3B77244}"
17+
EndProject
18+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Tests", "src\Tests\Tests.fsproj", "{63A6AF47-CB3F-4DBA-A16E-B66D6EFA3573}"
1719
EndProject
1820
Global
1921
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,6 +43,10 @@ Global
4143
{E7E326FD-1D66-4DBD-AB60-D006D3B77244}.Debug|Any CPU.Build.0 = Debug|Any CPU
4244
{E7E326FD-1D66-4DBD-AB60-D006D3B77244}.Release|Any CPU.ActiveCfg = Release|Any CPU
4345
{E7E326FD-1D66-4DBD-AB60-D006D3B77244}.Release|Any CPU.Build.0 = Release|Any CPU
46+
{63A6AF47-CB3F-4DBA-A16E-B66D6EFA3573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{63A6AF47-CB3F-4DBA-A16E-B66D6EFA3573}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{63A6AF47-CB3F-4DBA-A16E-B66D6EFA3573}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{63A6AF47-CB3F-4DBA-A16E-B66D6EFA3573}.Release|Any CPU.Build.0 = Release|Any CPU
4450
EndGlobalSection
4551
GlobalSection(SolutionProperties) = preSolution
4652
HideSolutionNode = FALSE
@@ -51,6 +57,7 @@ Global
5157
{CB577E4F-F4F0-4ADA-BD90-036B5ECF17AD} = {13B4B071-F3F1-4E38-93E4-CFA72611A84F}
5258
{1163EF7E-1845-4D2A-8C3F-8691618500DF} = {13B4B071-F3F1-4E38-93E4-CFA72611A84F}
5359
{E7E326FD-1D66-4DBD-AB60-D006D3B77244} = {13B4B071-F3F1-4E38-93E4-CFA72611A84F}
60+
{63A6AF47-CB3F-4DBA-A16E-B66D6EFA3573} = {13B4B071-F3F1-4E38-93E4-CFA72611A84F}
5461
EndGlobalSection
5562
GlobalSection(ExtensibilityGlobals) = postSolution
5663
SolutionGuid = {490D0829-D4E3-4267-8132-14A5B0C9D347}

‎docs/Builders_and_Evaluation.fsx.bak

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index: 6
99

1010
(*** condition: prepare ***)
1111
#nowarn "211"
12-
#r "../FsHttp/bin/Release/net6.0/FsHttp.dll"
12+
#r "../FsHttp/bin/Release/net8.0/FsHttp.dll"
1313
open FsHttp
1414

1515

‎docs/Configuration.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index: 12
99

1010
(*** condition: prepare ***)
1111
#nowarn "211"
12-
#r "../src/FsHttp/bin/Release/net6.0/FsHttp.dll"
12+
#r "../src/FsHttp/bin/Release/net8.0/FsHttp.dll"
1313
open FsHttp
1414

1515

‎docs/FSI.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index: 9
99

1010
(*** condition: prepare ***)
1111
#nowarn "211"
12-
#r "../FsHttp/bin/Release/net6.0/FsHttp.dll"
12+
#r "../FsHttp/bin/Release/net8.0/FsHttp.dll"
1313
open FsHttp
1414

1515

‎docs/HttpClient_Http_Message.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index: 11
99

1010
(*** condition: prepare ***)
1111
#nowarn "211"
12-
#r "../src/FsHttp/bin/Release/net6.0/FsHttp.dll"
12+
#r "../src/FsHttp/bin/Release/net8.0/FsHttp.dll"
1313
open FsHttp
1414

1515

‎docs/Overview.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index: 2
99

1010
(*** condition: prepare ***)
1111
#nowarn "211"
12-
#r "../FsHttp/bin/Release/net6.0/FsHttp.dll"
12+
#r "../FsHttp/bin/Release/net8.0/FsHttp.dll"
1313
open FsHttp
1414

1515

‎docs/Request_Headers.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index: 4
99

1010
(*** condition: prepare ***)
1111
#nowarn "211"
12-
#r "../src/FsHttp/bin/Release/net6.0/FsHttp.dll"
12+
#r "../src/FsHttp/bin/Release/net8.0/FsHttp.dll"
1313
open FsHttp
1414

1515

‎docs/Requesting_FormData.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index: 6
99

1010
(*** condition: prepare ***)
1111
#nowarn "211"
12-
#r "../src/FsHttp/bin/Release/net6.0/FsHttp.dll"
12+
#r "../src/FsHttp/bin/Release/net8.0/FsHttp.dll"
1313
open FsHttp
1414

1515

‎docs/Requesting_Multipart_Files.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index: 5
99

1010
(*** condition: prepare ***)
1111
#nowarn "211"
12-
#r "../src/FsHttp/bin/Release/net6.0/FsHttp.dll"
12+
#r "../src/FsHttp/bin/Release/net8.0/FsHttp.dll"
1313
open FsHttp
1414

1515

‎docs/Response_Handling.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index: 8
99

1010
(*** condition: prepare ***)
1111
#nowarn "211"
12-
#r "../src/FsHttp/bin/Release/net6.0/FsHttp.dll"
12+
#r "../src/FsHttp/bin/Release/net8.0/FsHttp.dll"
1313
open FsHttp
1414

1515

‎docs/Sending_Requests.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index: 7
99

1010
(*** condition: prepare ***)
1111
#nowarn "211"
12-
#r "../src/FsHttp/bin/Release/net6.0/FsHttp.dll"
12+
#r "../src/FsHttp/bin/Release/net8.0/FsHttp.dll"
1313
open FsHttp
1414
open System.Threading
1515

‎docs/URLs_and_Query_Params.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ index: 3
99

1010
(*** condition: prepare ***)
1111
#nowarn "211"
12-
#r "../src/FsHttp/bin/Release/net6.0/FsHttp.dll"
12+
#r "../src/FsHttp/bin/Release/net8.0/FsHttp.dll"
1313
open FsHttp
1414

1515

‎docs/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ title: FsHttp Overview
55
index: 1
66
---
77
<p align="center">
8-
<img src='./src/docs/img/logo_big.png' alt='logo' width='300' />
8+
<img src='https://raw.githubusercontent.com/fsprojects/FsHttp/master/docs/img/logo_big.png' alt='logo' width='300' />
99
</p>
1010

1111
FsHttp is a .Net HTTP client library for C# and F#. It aims for describing and executing HTTP requests in convenient ways that can be used in production and interactive environments.

‎docu.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if ((Test-Path .\.fsdocs) -eq $true) {
1919
}
2020

2121
dotnet tool restore
22-
dotnet build ./src/FsHttp/FsHttp.fsproj -c Release -f net6.0
22+
dotnet build ./src/FsHttp/FsHttp.fsproj -c Release -f net8.0
2323

2424
# what a hack...
2525
if ($null -eq $args[0]) {
@@ -32,7 +32,7 @@ dotnet fsdocs `
3232
$mode `
3333
--clean `
3434
--sourcefolder ./src `
35-
--properties Configuration=Release `
35+
--properties Configuration=Release TargetFramework=net8.0 `
3636
--sourcerepo https://github.com/fsprojects/FsHttp/blob/master/src `
3737
--parameters root /FsHttp/ `
3838
--strict

‎fiddle/assertDslCeMethods.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ open System.IO
33
open System.Reflection
44
open FSharp.Reflection
55

6-
let path = Path.Combine(__SOURCE_DIRECTORY__, "../FsHttp/bin/Debug/net6.0/FsHttp.dll")
6+
let path = Path.Combine(__SOURCE_DIRECTORY__, "../FsHttp/bin/Debug/net8.0/FsHttp.dll")
77
let asm = Assembly.LoadFile(path)
88

99
//let dslHeaderType = asm.GetExportedTypes() |> Array.map (fun t -> t.FullName)

‎fiddle/issue-103.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
#r "../FsHttp/bin/debug/net6.0/fshttp.dll"
2+
#r "../FsHttp/bin/debug/net8.0/fshttp.dll"
33

44
FsHttp.FsiInit.doInit()
55

‎fiddle/issue-106-AllowFileNameMetadata.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#r "../FsHttp/bin/Debug/net6.0/FsHttp.dll"
1+
#r "../FsHttp/bin/Debug/net8.0/FsHttp.dll"
22

33
open FsHttp
44

‎fiddle/scratch.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ bstream.Read(buffer, 0, 2000)
4343
bstream.Position <- 0
4444

4545

46-
#r "../FsHttp/bin/Debug/net6.0/FsHttp.dll"
46+
#r "../FsHttp/bin/Debug/net8.0/FsHttp.dll"
4747

4848
open FsHttp
4949

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "7.0.0",
3+
"version": "8.0.0",
44
"allowPrerelease": false,
55
"rollForward": "latestMinor"
66
}

‎src/FsHttp.FSharpData/FsHttp.FSharpData.fsproj

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
55
<Configurations>Debug;Release</Configurations>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -15,10 +15,7 @@
1515
<Compile Include="Response.fs" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="FSharp.Data" Version="4.0.1" />
19-
</ItemGroup>
20-
<ItemGroup>
21-
<PackageReference Include="FSharp.Core" Version="5.0.0" />
18+
<PackageReference Include="FSharp.Data" Version="6.3.0" />
2219
</ItemGroup>
2320
<ItemGroup>
2421
<None Include="..\..\README.md" Pack="true" PackagePath="\" />

‎src/FsHttp.NewtonsoftJson/FsHttp.NewtonsoftJson.fsproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
55
<Configurations>Debug;Release</Configurations>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -15,8 +15,7 @@
1515
<Compile Include="Operators.fs" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="FSharp.Core" Version="5.0.0" />
19-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
18+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2019
</ItemGroup>
2120
<ItemGroup>
2221
<None Include="..\..\README.md" Pack="true" PackagePath="\" />

‎src/FsHttp/FsHttp.fsproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
55
<Configurations>Debug;Release</Configurations>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -33,7 +33,6 @@
3333
<Compile Include="CSharp.fs" />
3434
</ItemGroup>
3535
<ItemGroup>
36-
<PackageReference Include="FSharp.Core" Version="5.0.0" />
3736
<PackageReference Include="System.Text.Json" Version="8.0.0" Condition="'$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netstandard2.0'" />
3837
</ItemGroup>
3938
<ItemGroup>

‎src/Test.CSharp/Test.CSharp.csproj

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66

77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

10-
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
12-
<PackageReference Include="NUnit" Version="4.0.0" />
13-
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
14-
</ItemGroup>
15-
1610
<ItemGroup>
1711
<ProjectReference Include="..\FsHttp\FsHttp.fsproj" />
1812
<ProjectReference Include="..\Tests\Tests.fsproj" />

‎src/TestWebServer/TestWebServer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
</Project>

‎src/Tests/Tests.fsproj

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net6.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<OutputType>Library</OutputType>
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -39,12 +39,11 @@
3939
</ItemGroup>
4040
<ItemGroup>
4141
<PackageReference Include="FSharp.SystemTextJson" Version="1.2.42" />
42-
<PackageReference Include="FsUnit" Version="5.1.0" />
43-
<PackageReference Include="FSharp.Data" Version="4.0.1" />
44-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
45-
<PackageReference Include="NUnit" Version="4.0.0" />
46-
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
47-
<PackageReference Include="Suave" Version="2.6.1" />
42+
<PackageReference Include="FsUnit" Version="5.6.0" />
43+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
44+
<PackageReference Include="NUnit" Version="3.14.0" />
45+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
46+
<PackageReference Include="Suave" Version="2.6.2" />
4847
</ItemGroup>
4948
<ItemGroup>
5049
<ProjectReference Include="..\FsHttp.FSharpData\FsHttp.FSharpData.fsproj" />

0 commit comments

Comments
 (0)