Skip to content

Commit 9e92fe8

Browse files
committed
Fix FSharp.Core deps and FsToolkit deps conflicts. Update application icon.
1 parent 9681d4d commit 9e92fe8

File tree

4 files changed

+17
-25
lines changed

4 files changed

+17
-25
lines changed
File renamed without changes.

src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
<GenerateProgramFile>false</GenerateProgramFile>
8-
<ApplicationIcon>TaskSeq.ico</ApplicationIcon>
8+
<ApplicationIcon>..\..\assets\TaskSeq.ico</ApplicationIcon>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12+
<Content Include="..\..\assets\TaskSeq.ico" Link="TaskSeq.ico" />
1213
<Compile Include="AssemblyInfo.fs" />
1314
<Compile Include="Nunit.Extensions.fs" />
1415
<Compile Include="TestUtils.fs" />
@@ -50,11 +51,10 @@
5051
</ItemGroup>
5152

5253
<ItemGroup>
53-
<Content Include="TaskSeq.ico" />
54-
</ItemGroup>
55-
56-
<ItemGroup>
57-
<PackageReference Include="FsToolkit.ErrorHandling.TaskResult" Version="3.3.0" />
54+
<!-- align test project with minimal required version for TaskSeq -->
55+
<!-- we use 6.0.3 here and not 6.0.2 because TaskResult lib requires it-->
56+
<PackageReference Update="FSharp.Core" Version="6.0.3" />
57+
<PackageReference Include="FsToolkit.ErrorHandling.TaskResult" Version="3.2.0" />
5858
<PackageReference Include="FsUnit.xUnit" Version="5.1.0" />
5959
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
6060
<PackageReference Include="xunit" Version="2.4.2" />

src/FSharp.Control.TaskSeq/FSharp.Control.TaskSeq.fsproj

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.1</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6-
<ApplicationIcon>TaskSeq.ico</ApplicationIcon>
6+
<ApplicationIcon>..\..\assets\TaskSeq.ico</ApplicationIcon>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
88
<Title>Computation expression 'taskSeq' for processing IAsyncEnumerable sequences and module functions</Title>
99
<Version>$(Version)</Version>
@@ -31,35 +31,27 @@ This library brings C#'s concept of 'await foreach' to F#.</Description>
3131
</PackageReleaseNotes>
3232
</PropertyGroup>
3333

34-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
35-
<OtherFlags></OtherFlags>
36-
</PropertyGroup>
37-
38-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
39-
<OtherFlags></OtherFlags>
40-
</PropertyGroup>
41-
4234
<ItemGroup>
35+
<Content Include="..\..\assets\TaskSeq.ico" Link="TaskSeq.ico" />
36+
<None Include="..\..\taskseq-icon.png">
37+
<Pack>True</Pack>
38+
<PackagePath>\</PackagePath>
39+
</None>
40+
<None Include="..\..\assets\nuget-package-readme.md" Pack="true" PackagePath="" />
4341
<Compile Include="Utils.fs" />
4442
<Compile Include="TaskSeqBuilder.fs" />
4543
<Compile Include="TaskSeqInternal.fs" />
4644
<Compile Include="TaskSeq.fsi" />
4745
<Compile Include="TaskSeq.fs" />
4846
</ItemGroup>
4947

48+
<ItemGroup />
5049

5150

52-
<ItemGroup>
53-
<None Include="..\..\taskseq-icon.png">
54-
<Pack>True</Pack>
55-
<PackagePath>\</PackagePath>
56-
</None>
57-
<None Include="..\..\assets\nuget-package-readme.md" Pack="true" PackagePath="" />
58-
</ItemGroup>
59-
60-
51+
<ItemGroup />
6152

6253
<ItemGroup>
54+
<!-- maximal compatibility with minimal required FSharp.Core version for TaskSeq -->
6355
<PackageReference Update="FSharp.Core" Version="6.0.2" />
6456
</ItemGroup>
6557
</Project>
-175 KB
Binary file not shown.

0 commit comments

Comments
 (0)