Skip to content

Commit eed4f9f

Browse files
SchlenkRSchlenkR
committed
Merge branch 'master' into pr/bartelink/185
2 parents 9b18bfb + e215088 commit eed4f9f

6 files changed

Lines changed: 66 additions & 48 deletions

File tree

‎Directory.Build.props‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<Version>14.4.1</Version>
4+
<Version>14.4.2</Version>
55

66
<Authors>Ronald Schlenker</Authors>
77
<Copyright>Copyright 2024 Ronald Schlenker</Copyright>
@@ -16,56 +16,57 @@
1616
<FsDocsReleaseNotesLink>https://www.nuget.org/packages/FsHttp#release-body-tab</FsDocsReleaseNotesLink>
1717

1818
<PackageReleaseNotes>
19-
v14.4.2
20-
- Reduced FSharp.Core version dependency back down to 5.0.0
21-
- Removed net7.0, net8.0 TFM-specific builds
19+
14.4.2
20+
- Thanks @bartelink
21+
Pinned FSharp.Core to 5.0.2 in all library projects
22+
Removed net7.0, net8.0 TFM-specific builds
2223

23-
v14.4.1
24+
14.4.1
2425
- Fixed missing explicit dependency on FSharp.Core
2526

26-
v14.4.0
27+
14.4.0
2728
- Fixed pre-configured requests
2829

29-
v14.3.0
30+
14.3.0
3031
- Added `GetList` JsonElement extension
3132

32-
v14.2.0
33+
14.2.0
3334
- (Breaking change) Separated Config and PrintHint (...and many more things in these domains)
3435

35-
v14.1.0
36+
14.1.0
3637
- (Breaking change) Renamed `Extensions.To...Enumerable` to `Extensions.To...Seq`
3738
- Added `toJsonList...` overloads
3839

39-
v14.0.0
40+
14.0.0
4041
- (Breaking change) Renamed types in Domain:
4142
BodyContent -> SinglepartContent
4243
RequestContent -> BodyContent
4344
FsHttpUrl -> FsHttpTarget
4445
- (Breaking change) FsHttpUrl (now FsHttpTarget) and Header restructured: method, address and queryParams are now part of the FsHttpTarget type.
4546
- Added `headerTransformers` to Config for better composability
4647

47-
v13.3.0
48+
13.3.0
4849
- (Breaking change) All `Response._TAsync` functions (task based) in F# require a CancellationToken now.
4950
- (Breaking change) Extension methods rework
5051
- (Breaking change) There's no more StartingContext, which means:
5152
we give up a little bit of safety here, for the sake of pre-configuring HTTP requests
5253
without specifying the URL. This is a trade-off we are willing to take.
5354

54-
v12.2.0
55+
12.2.0
5556
- added HttpMethods for better composability
5657

57-
v12.1.0
58+
12.1.0
5859
- net8.0
5960

60-
v12.0.0
61+
12.0.0
6162
- #137 / #102: Change the type for FsHttpUrl.additionalQueryParams from obj to string
6263
- Removed (auto opened) Async.await and Task.map/await
6364
- Moved (auto opened) Async.map to FsHttp.Helper.Async.map
6465

65-
v11.1.0
66+
11.1.0
6667
- #130 / #105: Add method for user-supplied cancellation token
6768

68-
v11.0.0
69+
11.0.0
6970
- #121 (Breaking change): Turning off debug logs in FSI (breaking change in signature / namespace)
7071
- #124: Support Repeating Query Parameters (thanks @DaveJohnson8080)
7172
- #106 (Breaking change): Allow filename metadata with other "parts" (thanks @dawedawe)
@@ -85,50 +86,50 @@
8586
-- Old release notes below --
8687
-----------------------------
8788

88-
v7.0.0
89+
7.0.0
8990
- #92: `expect` and `assert` pass through the original response instead of unit.
9091

91-
v8.0.0
92+
8.0.0
9293
- #93 (thanks @drhumlen): Changed content type 'text/json' to 'application/json'.
9394
- Http modules are always AutoOpen in both Dsl and DslCE.
9495
- No extra modules for builder methods.
9596

96-
v8.0.1
97+
8.0.1
9798
- #89: No more blocking requests using net5 with FSI.
9899

99-
v9.0.0 / v9.0.1
100+
9.0.0 / 9.0.1
100101
- Redefined builders (see README.md).
101102
- Many breaking changes (see "Migrations" sections in the docu).
102103

103-
v9.0.2
104+
9.0.2
104105
- Added JSON toArray functions
105106
- Fixed #99: Response.saveFile should create the directory if not present.
106107

107-
v9.0.3
108+
9.0.3
108109
- Supporting netstandard2.1 again.
109110

110-
v9.0.4
111+
9.0.4
111112
- Referenced lowest possible FSharp.Core and other referenced packages version.
112113

113-
v9.0.5
114+
9.0.5
114115
- Support for netstandard2.0.
115116
- New 'FsHttp.NewtonsoftJson' integration package.
116117
- More JSON functions and defaults config.
117118

118-
v9.0.6
119+
9.0.6
119120
- #100 - Removed FSI print messages.
120121

121-
v9.1.0
122+
9.1.0
122123
- Fixed naming inconsistency for 'Response.deserialize...' functions.
123124
- More C# JSON functions.
124125

125-
v9.1.1
126+
9.1.1
126127
- Fix: Using GlobalConfig.Json.defaultJsonSerializerOptions as default for jsonSerialize.
127128

128-
v9.1.2
129+
9.1.2
129130
- Fixed #103: FSI response printing and initialization doesn't work out of the box anymore.
130131

131-
v10.0.0
132+
10.0.0
132133
- .Net 7 support (thank you @Samuel-Dufour)
133134
- Breaking change: Corrected typo "guessMineTypeFromPath" -> "guessMimeTypeFromPath"
134135
- Breaking change: Module 'Helper', 'HelperInternal' and 'HelperAutos' refactored
@@ -139,15 +140,11 @@
139140
- PrintHint.printDebugMessages: Moved to FsHttp.Helper.Fsi.logDebugMessages as a global switch
140141
- #113 - Config.timeoutInSeconds bug
141142

142-
v10.1.0
143+
10.1.0
143144
- #117: Escape string for query params values (by @maciej-izak - thank you)
144145
(!!) This can be seen as breaking change.
145146
- #112: Allow to add (multiple) headers (by @Samuel-Dufour - thank you)
146147
</PackageReleaseNotes>
147148
</PropertyGroup>
148149

149-
<ItemGroup>
150-
<PackageReference Update="FSharp.Core" Version="8.0.100" />
151-
</ItemGroup>
152-
153150
</Project>

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFrameworks>net6.0</TargetFrameworks>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
55
<Configurations>Debug;Release</Configurations>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
7+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
78
</PropertyGroup>
89
<PropertyGroup>
910
<Description>FSharp.Data (JSON) integration package for FsHttp</Description>
@@ -16,7 +17,6 @@
1617
</ItemGroup>
1718
<ItemGroup>
1819
<PackageReference Include="FSharp.Data" Version="6.3.0" />
19-
<PackageReference Include="FSharp.Core" Version="8.0.100" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
@@ -25,4 +25,11 @@
2525
<ItemGroup>
2626
<ProjectReference Include="..\FsHttp\FsHttp.fsproj" />
2727
</ItemGroup>
28+
<ItemGroup>
29+
<!--
30+
We require F# Core >= 5 due to string interpolation.
31+
AND: We have this in all library projects; NOT in the test projects.
32+
-->
33+
<PackageReference Include="FSharp.Core" Version="5.0.2" />
34+
</ItemGroup>
2835
</Project>

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFrameworks>net6.0</TargetFrameworks>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
55
<Configurations>Debug;Release</Configurations>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
7+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
78
</PropertyGroup>
89
<PropertyGroup>
910
<Description>JSON.Net (Newtonsoft.Json) integration package for FsHttp</Description>
@@ -24,4 +25,11 @@
2425
<ItemGroup>
2526
<ProjectReference Include="..\FsHttp\FsHttp.fsproj" />
2627
</ItemGroup>
28+
<ItemGroup>
29+
<!--
30+
We require F# Core >= 5 due to string interpolation.
31+
AND: We have this in all library projects; NOT in the test projects.
32+
-->
33+
<PackageReference Include="FSharp.Core" Version="5.0.2" />
34+
</ItemGroup>
2735
</Project>

‎src/FsHttp/FsHttp.fsproj‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFrameworks>net6.0</TargetFrameworks>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
55
<Configurations>Debug;Release</Configurations>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
7+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
78
<LangVersion>8</LangVersion>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\FsHttp.xml</DocumentationFile>
811
</PropertyGroup>
912
<PropertyGroup>
1013
<Description>A .Net HTTP client library for F#, C#, and friends</Description>
1114
<PackageId>FsHttp</PackageId>
1215
</PropertyGroup>
13-
<PropertyGroup>
14-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\FsHttp.xml</DocumentationFile>
16-
</PropertyGroup>
1716
<ItemGroup>
1817
<Compile Include="AssemblyInfo.fs" />
1918
<Compile Include="Domain.fs" />
@@ -38,6 +37,18 @@
3837
<None Include="..\..\docs\img\logo_small.png" Pack="true" PackagePath="\" />
3938
</ItemGroup>
4039
<ItemGroup>
41-
<PackageReference Include="FSharp.Core" Version="8.0.100" />
40+
<!--
41+
- Intentionally depend on a minimal version of FSharp.Core as the package previously did prior to V13
42+
see https://github.com/fsprojects/FsHttp/issues/183
43+
- Releases 13-14.4.0 did not include a nuspec declaration of their dependency on FSharp.Core V8.0.100,
44+
so tools like Paket will gravitate toward those broken versions if we make the version constraint more restrictive
45+
- We require F# Core >= 5 due to string interpolation.
46+
- We have this in all library projects; NOT in the test projects.
47+
(https://fsharp.github.io/fsharp-compiler-docs/fsharp-core-notes.html#Package-authors-should-pin-their-FSharp-Core-reference)
48+
- ExcludeAssets is a workaround for malformed FSharp.Core packages https://github.com/dotnet/fsharp/issues/12706 via https://github.com/fsprojects/Paket/issues/4149
49+
Removal triggers issues in dotnet publish, e.g. for Lambda projects
50+
Also avoids Rider search finding stuff in FSharp.Core.xml
51+
-->
52+
<PackageReference Include="FSharp.Core" Version="5.0.2" />
4253
</ItemGroup>
4354
</Project>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
6-
7-
<IsPackable>false</IsPackable>
86
</PropertyGroup>
97

108
<ItemGroup>

‎src/Tests/Tests.fsproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>net8.0</TargetFrameworks>
5-
<IsPackable>false</IsPackable>
6-
<OutputType>Library</OutputType>
7-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
85
<Configurations>Debug;Release</Configurations>
96
</PropertyGroup>
107
<ItemGroup>

0 commit comments

Comments
 (0)