Skip to content

Commit a8d5269

Browse files
authored
Merge pull request #186 from bartelink/exclude-assets
Add ExcludeAssets for FSharp.Core
2 parents bc5e3c2 + b22c24d commit a8d5269

4 files changed

Lines changed: 5 additions & 12 deletions

File tree

src/FsHttp.FSharpData/FsHttp.FSharpData.fsproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0</TargetFrameworks>
3+
<TargetFramework>net6.0</TargetFramework>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
55
<Configurations>Debug;Release</Configurations>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
7-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
8-
</PropertyGroup>
9-
<PropertyGroup>
107
<Description>FSharp.Data (JSON) integration package for FsHttp</Description>
118
<PackageId>FsHttp.FSharpData</PackageId>
129
</PropertyGroup>

src/FsHttp.NewtonsoftJson/FsHttp.NewtonsoftJson.fsproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0</TargetFrameworks>
3+
<TargetFramework>net6.0</TargetFramework>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
55
<Configurations>Debug;Release</Configurations>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
7-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
87
</PropertyGroup>
98
<PropertyGroup>
109
<Description>JSON.Net (Newtonsoft.Json) integration package for FsHttp</Description>

src/FsHttp/FsHttp.fsproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0</TargetFrameworks>
3+
<TargetFramework>net6.0</TargetFramework>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
55
<Configurations>Debug;Release</Configurations>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
7-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
87
<LangVersion>8</LangVersion>
98
<GenerateDocumentationFile>true</GenerateDocumentationFile>
109
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\FsHttp.xml</DocumentationFile>
11-
</PropertyGroup>
12-
<PropertyGroup>
1310
<Description>A .Net HTTP client library for F#, C#, and friends</Description>
1411
<PackageId>FsHttp</PackageId>
1512
</PropertyGroup>
@@ -49,6 +46,6 @@
4946
Removal triggers issues in dotnet publish, e.g. for Lambda projects
5047
Also avoids Rider search finding stuff in FSharp.Core.xml
5148
-->
52-
<PackageReference Include="FSharp.Core" Version="5.0.2" />
49+
<PackageReference Include="FSharp.Core" Version="5.0.2" ExcludeAssets="contentfiles" />
5350
</ItemGroup>
5451
</Project>

src/Tests/Tests.fsproj

Lines changed: 1 addition & 1 deletion
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+
<TargetFramework>net6.0</TargetFramework>
55
<Configurations>Debug;Release</Configurations>
66
</PropertyGroup>
77
<ItemGroup>

0 commit comments

Comments
 (0)