Skip to content

Commit 466ced3

Browse files
TheAngryByrdTheAngryByrd
committed
FsToolkit Core nugetfied
1 parent 3e3848a commit 466ced3

33 files changed

+201
-96
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@
1515
<Nullable Condition="'$(TargetFramework)' == 'net9.0'">enable</Nullable>
1616
<PaketPropsVersion>6.0.0</PaketPropsVersion> <!-- Hack to prevent paket from restoring when it should not -->
1717
</PropertyGroup>
18+
19+
1820
</Project>

‎Directory.Packages.props‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!-- Enable central package management -->
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<!-- Dependencies from paket.dependencies -->
8+
<PackageVersion Include="FSharp.Core" Version="6.0.1" />
9+
<PackageVersion Include="Hopac" Version="0.5.1" />
10+
<PackageVersion Include="FSharp.Control.AsyncSeq" Version="3.2.1" />
11+
<PackageVersion Include="Fable.Core" Version="4.2.0" />
12+
<PackageVersion Include="IcedTasks" Version="0.11.7" />
13+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
14+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
15+
16+
<!-- Test group dependencies -->
17+
<PackageVersion Include="Expecto" Version="10.2.3" />
18+
<PackageVersion Include="Expecto.Hopac" Version="10.2.3" />
19+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
20+
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.15.3" />
21+
<PackageVersion Include="Fable.Mocha" Version="2.9.0" />
22+
<PackageVersion Include="Fable.Python" Version="3.0.0" />
23+
<PackageVersion Include="Fable.Pyxpecto" Version="1.0.0" />
24+
25+
<!-- Benchmarks group dependencies -->
26+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
27+
<PackageVersion Include="BenchmarkDotNet.Annotations" Version="0.13.5" />
28+
<PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.5" />
29+
30+
<!-- Build group dependencies -->
31+
<PackageVersion Include="Fake.Core.Target" Version="5.22.0" />
32+
<PackageVersion Include="Fake.DotNet.Cli" Version="5.22.0" />
33+
<PackageVersion Include="Fake.Core.ReleaseNotes" Version="5.22.0" />
34+
<PackageVersion Include="Fake.DotNet.AssemblyInfoFile" Version="5.22.0" />
35+
<PackageVersion Include="Fake.DotNet.Paket" Version="5.22.0" />
36+
<PackageVersion Include="Fake.DotNet.Testing.Expecto" Version="5.22.0" />
37+
<PackageVersion Include="Fake.Tools.Git" Version="5.22.0" />
38+
<PackageVersion Include="Fake.JavaScript.Npm" Version="5.22.0" />
39+
<PackageVersion Include="Fake.Api.GitHub" Version="5.22.0" />
40+
<PackageVersion Include="Fake.BuildServer.GitHubActions" Version="5.22.0" />
41+
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.206" />
42+
<PackageVersion Include="Octokit" Version="0.53.0" />
43+
<PackageVersion Include="Nuget.Common" Version="6.6.1" />
44+
<PackageVersion Include="NuGet.Protocol" Version="6.6.1" />
45+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
46+
47+
<!-- Analyzers group dependencies -->
48+
<PackageVersion Include="Ionide.Analyzers" Version="1.0.0" />
49+
<PackageVersion Include="G-Research.FSharp.Analyzers" Version="1.0.0" />
50+
</ItemGroup>
51+
52+
53+
</Project>

‎build/build.fsproj‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,16 @@
99
<Compile Include="DotEnv.fs" />
1010
<Compile Include="build.fs" />
1111
</ItemGroup>
12-
<Import Project="..\.paket\Paket.Restore.targets" />
12+
<ItemGroup>
13+
<PackageReference Include="Fake.Core.Target" />
14+
<PackageReference Include="Fake.DotNet.Cli" />
15+
<PackageReference Include="Fake.Core.ReleaseNotes" />
16+
<PackageReference Include="Fake.DotNet.AssemblyInfoFile" />
17+
<PackageReference Include="Fake.DotNet.Paket" />
18+
<PackageReference Include="Fake.DotNet.Testing.Expecto" />
19+
<PackageReference Include="Fake.Tools.Git" />
20+
<PackageReference Include="Fake.JavaScript.Npm" />
21+
<PackageReference Include="Fake.Api.GitHub" />
22+
<PackageReference Include="Fake.BuildServer.GitHubActions" />
23+
</ItemGroup>
1324
</Project>

‎src/Directory.Build.props‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,20 @@
2525
<PropertyGroup>
2626
<NoWarn>$(NoWarn);FS2003</NoWarn>
2727
</PropertyGroup>
28+
29+
<ItemGroup>
30+
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Microsoft.Bcl.AsyncInterfaces" />
31+
</ItemGroup>
32+
<Choose>
33+
<When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net9.0'))">
34+
<ItemGroup>
35+
<PackageReference Include="FSharp.Core" VersionOverride="9.0.300-beta.25181.1" />
36+
</ItemGroup>
37+
</When>
38+
<Otherwise>
39+
<ItemGroup>
40+
<PackageReference Include="FSharp.Core" VersionOverride="6.0.4" />
41+
</ItemGroup>
42+
</Otherwise>
43+
</Choose>
2844
</Project>

‎src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
55
<TargetFrameworks>netstandard2.1;netstandard2.0;net9.0</TargetFrameworks>
6-
76
<DebugType>portable</DebugType>
87
</PropertyGroup>
98
<!-- Add source files to "fable" folder in Nuget package -->
@@ -12,11 +11,8 @@
1211
</ItemGroup>
1312
<ItemGroup>
1413
<Compile Include="Library.fs" />
15-
<None Include="paket.references" />
16-
<Watch Include="@(None)" />
1714
</ItemGroup>
1815
<ItemGroup>
1916
<ProjectReference Include="..\FsToolkit.ErrorHandling\FsToolkit.ErrorHandling.fsproj" />
2017
</ItemGroup>
21-
<Import Project="..\..\.paket\Paket.Restore.targets" />
2218
</Project>

‎src/FsToolkit.ErrorHandling.IcedTasks/FsToolkit.ErrorHandling.IcedTasks.fsproj‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,11 @@
99
</PropertyGroup>
1010
<ItemGroup>
1111
<Compile Include="CancellableTaskResultBuilderBase.fs" />
12-
<Compile Include="CancellableTaskOptionBuilderBase.fs" />
1312
<Compile Include="CancellableTaskResultCE.fs" />
14-
<Compile Include="CancellableTaskOptionCE.fs" />
15-
<None Include="paket.references" />
1613
<Compile Include="CancellableTaskValidationCE.fs" />
1714
<Compile Include="CancellableTaskValidationOp.fs" />
1815
</ItemGroup>
1916
<ItemGroup>
20-
<ProjectReference
21-
Include="..\FsToolkit.ErrorHandling\FsToolkit.ErrorHandling.fsproj" />
17+
<ProjectReference Include="..\FsToolkit.ErrorHandling\FsToolkit.ErrorHandling.fsproj" />
2218
</ItemGroup>
23-
<Import Project="..\..\.paket\Paket.Restore.targets" />
2419
</Project>

‎src/FsToolkit.ErrorHandling/AsyncResultCE.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ module AsyncResultCEExtensions =
149149

150150
member inline _.Using
151151
(
152-
resource: 'ok :> IDisposable,
152+
resource: 'ok :> IDisposableNull,
153153
[<InlineIfLambda>] binder: 'ok -> Async<Result<'U, 'error>>
154154
) : Async<Result<'U, 'error>> =
155155
async.Using(resource, binder)

‎src/FsToolkit.ErrorHandling/AsyncResultOptionCE.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ module AsyncResultOptionCEExtensions =
142142

143143
member inline _.Using
144144
(
145-
resource: 'ok :> IDisposable,
145+
resource: 'ok :> IDisposableNull,
146146
[<InlineIfLambda>] binder: 'ok -> AsyncResultOption<'okOutput, 'error>
147147
) : AsyncResultOption<'okOutput, 'error> =
148148
async.Using(resource, binder)

‎src/FsToolkit.ErrorHandling/AsyncValidationCE.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ module AsyncValidationCE =
4848

4949
member inline _.Using
5050
(
51-
resource: 'disposable :> IDisposable,
51+
resource: 'disposable :> IDisposableNull,
5252
[<InlineIfLambda>] binder: 'disposable -> AsyncValidation<'okOutput, 'error>
5353
) : AsyncValidation<'okOutput, 'error> =
5454
async.Using(resource, binder)

‎src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,8 @@
5656
<Compile Include="Array.fs" />
5757
<Compile Include="Seq.fs" />
5858
<None Include="Script.fsx" />
59-
<None Include="paket.references" />
60-
<Watch Include="@(None)" />
6159
</ItemGroup>
62-
<!-- Add source files to "fable" folder in Nuget package -->
6360
<ItemGroup>
6461
<Content Include="*.fsproj; **\*.fs" Exclude="Task.fs; **\Task*.fs" PackagePath="fable\" />
6562
</ItemGroup>
66-
<Import Project="..\..\.paket\Paket.Restore.targets" />
6763
</Project>

0 commit comments

Comments
 (0)