Merge pull request #186 from bartelink/exclude-assets

Add ExcludeAssets for FSharp.Core
SchlenkR · Mar 5, 2024 · a8d5269 · a8d5269
2 parents bc5e3c2 + b22c24d
commit a8d5269
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git 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
@@ -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/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>
diff --git 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>