From 0fb13f4261d23b91da526bc8a79c25d523734530 Mon Sep 17 00:00:00 2001
From: Ruben Bartelink <ruben@bartelink.com>
Date: Tue, 5 Mar 2024 13:50:30 +0000
Subject: [PATCH 1/2] Add ExcludeAssets for FSharp.Core

---
 src/FsHttp/FsHttp.fsproj | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/FsHttp/FsHttp.fsproj b/src/FsHttp/FsHttp.fsproj
index a7063704..45444e29 100644
--- a/src/FsHttp/FsHttp.fsproj
+++ b/src/FsHttp/FsHttp.fsproj
@@ -1,15 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Configurations>Debug;Release</Configurations>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <LangVersion>8</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\FsHttp.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup>
     <Description>A .Net HTTP client library for F#, C#, and friends</Description>
     <PackageId>FsHttp</PackageId>
   </PropertyGroup>
@@ -49,6 +46,6 @@
         Removal triggers issues in dotnet publish, e.g. for Lambda projects
         Also avoids Rider search finding stuff in FSharp.Core.xml
     -->
-    <PackageReference Include="FSharp.Core" Version="5.0.2" />
+    <PackageReference Include="FSharp.Core" Version="5.0.2" ExcludeAssets="contentfiles" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From b22c24db65ac6423c3c438104923404f6e4bd4c6 Mon Sep 17 00:00:00 2001
From: Ruben Bartelink <ruben@bartelink.com>
Date: Tue, 5 Mar 2024 13:53:40 +0000
Subject: [PATCH 2/2] Consistency changes

---
 src/FsHttp.FSharpData/FsHttp.FSharpData.fsproj         | 5 +----
 src/FsHttp.NewtonsoftJson/FsHttp.NewtonsoftJson.fsproj | 3 +--
 src/Tests/Tests.fsproj                                 | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/FsHttp.FSharpData/FsHttp.FSharpData.fsproj b/src/FsHttp.FSharpData/FsHttp.FSharpData.fsproj
index 6e4a68ab..af587e43 100644
--- a/src/FsHttp.FSharpData/FsHttp.FSharpData.fsproj
+++ b/src/FsHttp.FSharpData/FsHttp.FSharpData.fsproj
@@ -1,12 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Configurations>Debug;Release</Configurations>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-  </PropertyGroup>
-  <PropertyGroup>
     <Description>FSharp.Data (JSON) integration package for FsHttp</Description>
     <PackageId>FsHttp.FSharpData</PackageId>
   </PropertyGroup>
diff --git a/src/FsHttp.NewtonsoftJson/FsHttp.NewtonsoftJson.fsproj b/src/FsHttp.NewtonsoftJson/FsHttp.NewtonsoftJson.fsproj
index 159018c4..d8fa0c6f 100644
--- a/src/FsHttp.NewtonsoftJson/FsHttp.NewtonsoftJson.fsproj
+++ b/src/FsHttp.NewtonsoftJson/FsHttp.NewtonsoftJson.fsproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Configurations>Debug;Release</Configurations>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
   <PropertyGroup>
     <Description>JSON.Net (Newtonsoft.Json) integration package for FsHttp</Description>
diff --git a/src/Tests/Tests.fsproj b/src/Tests/Tests.fsproj
index e0b616ff..13aea037 100644
--- a/src/Tests/Tests.fsproj
+++ b/src/Tests/Tests.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
   <ItemGroup>