Skip to content

Commit 4442d17

Browse files
TheAngryByrdTheAngryByrd
committed
paket back in projects
1 parent af4f755 commit 4442d17

File tree

14 files changed

+120
-160
lines changed

14 files changed

+120
-160
lines changed

‎Directory.Build.targets‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎benchmarks/benchmarks.fsproj‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
5-
<OutputType>Exe</OutputType>
6-
<LangVersion>preview</LangVersion>
7-
</PropertyGroup>
8-
<PropertyGroup>
9-
<PlatformTarget>AnyCPU</PlatformTarget>
10-
<DebugSymbols>true</DebugSymbols>
11-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
12-
<Optimize>true</Optimize>
13-
<Configuration>Release</Configuration>
14-
<IsPackable>false</IsPackable>
15-
<NoWarn>FS1204;FS3501;FS3511</NoWarn>
16-
</PropertyGroup>
17-
<PropertyGroup Condition="'$(Configuration)'=='Release'">
18-
<Tailcalls>true</Tailcalls>
19-
</PropertyGroup>
20-
<ItemGroup>
21-
<Compile Include="ApplicativeTests.fs" />
22-
<Compile Include="Benchmarks.fs" />
23-
<Compile Include="AsyncResultCE.fs" />
24-
<Compile Include="TaskResultCE.fs" />
25-
</ItemGroup>
26-
<ItemGroup>
27-
<Compile Include="Program.fs" />
28-
</ItemGroup>
29-
<ItemGroup>
30-
<ProjectReference
31-
Include="..\src\FsToolkit.ErrorHandling.JobResult\FsToolkit.ErrorHandling.JobResult.fsproj" />
32-
</ItemGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net7.0</TargetFramework>
5+
<OutputType>Exe</OutputType>
6+
<LangVersion>preview</LangVersion>
7+
</PropertyGroup>
8+
<PropertyGroup>
9+
<PlatformTarget>AnyCPU</PlatformTarget>
10+
<DebugSymbols>true</DebugSymbols>
11+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
12+
<Optimize>true</Optimize>
13+
<Configuration>Release</Configuration>
14+
<IsPackable>false</IsPackable>
15+
<NoWarn>FS1204;FS3501;FS3511</NoWarn>
16+
</PropertyGroup>
17+
<PropertyGroup Condition="'$(Configuration)'=='Release'">
18+
<Tailcalls>true</Tailcalls>
19+
</PropertyGroup>
20+
<ItemGroup>
21+
<Compile Include="ApplicativeTests.fs" />
22+
<Compile Include="Benchmarks.fs" />
23+
<Compile Include="AsyncResultCE.fs" />
24+
<Compile Include="TaskResultCE.fs" />
25+
</ItemGroup>
26+
<ItemGroup>
27+
<Compile Include="Program.fs" />
28+
</ItemGroup>
29+
<ItemGroup>
30+
<ProjectReference Include="..\src\FsToolkit.ErrorHandling.JobResult\FsToolkit.ErrorHandling.JobResult.fsproj" />
31+
</ItemGroup>
32+
<Import Project="..\.paket\Paket.Restore.targets" />
3333
</Project>

‎build/build.fsproj‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>net7.0</TargetFramework>
5-
<IsPackable>false</IsPackable>
6-
</PropertyGroup>
7-
<ItemGroup>
8-
9-
<Compile Include="build.fs" />
10-
</ItemGroup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net7.0</TargetFramework>
6+
<IsPackable>false</IsPackable>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<Compile Include="build.fs" />
10+
</ItemGroup>
11+
<Import Project="..\.paket\Paket.Restore.targets" />
1112
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
<ItemGroup>
1919
<ProjectReference Include="..\FsToolkit.ErrorHandling\FsToolkit.ErrorHandling.fsproj" />
2020
</ItemGroup>
21-
21+
<Import Project="..\..\.paket\Paket.Restore.targets" />
2222
</Project>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
55
<TargetFrameworks>netstandard2.1</TargetFrameworks>
66
<LangVersion>preview</LangVersion>
77
<DebugType>portable</DebugType>
88
<NoWarn>FS3511;FS3513</NoWarn>
99
</PropertyGroup>
10-
1110
<ItemGroup>
1211
<Compile Include="CancellableTaskResultCE.fs" />
13-
1412
<None Include="paket.references" />
1513
<Watch Include="@(None)" />
1614
</ItemGroup>
17-
1815
<ItemGroup>
19-
<ProjectReference
20-
Include="..\FsToolkit.ErrorHandling.TaskResult\FsToolkit.ErrorHandling.TaskResult.fsproj" />
16+
<ProjectReference Include="..\FsToolkit.ErrorHandling.TaskResult\FsToolkit.ErrorHandling.TaskResult.fsproj" />
2117
</ItemGroup>
22-
23-
18+
<Import Project="..\..\.paket\Paket.Restore.targets" />
2419
</Project>

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
55
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
66
<DebugType>portable</DebugType>
77
</PropertyGroup>
8-
98
<ItemGroup>
109
<Compile Include="Result.fs" />
1110
<Compile Include="Job.fs" />
@@ -19,15 +18,11 @@
1918
<Compile Include="JobResultOption.fs" />
2019
<Compile Include="JobResultOptionCE.fs" />
2120
<Compile Include="JobResultOptionOp.fs" />
22-
2321
<None Include="paket.references" />
2422
<Watch Include="@(None)" />
2523
</ItemGroup>
26-
2724
<ItemGroup>
28-
<ProjectReference
29-
Include="..\FsToolkit.ErrorHandling.TaskResult\FsToolkit.ErrorHandling.TaskResult.fsproj" />
25+
<ProjectReference Include="..\FsToolkit.ErrorHandling.TaskResult\FsToolkit.ErrorHandling.TaskResult.fsproj" />
3026
</ItemGroup>
31-
32-
27+
<Import Project="..\..\.paket\Paket.Restore.targets" />
3328
</Project>

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
55
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
@@ -8,8 +8,6 @@
88
<LangVersion>preview</LangVersion>
99
<NoWarn>FS1204;FS3511;FS3513</NoWarn>
1010
</PropertyGroup>
11-
12-
1311
<ItemGroup>
1412
<Compile Include="Result.fs" />
1513
<Compile Include="Task.fs" />
@@ -27,10 +25,8 @@
2725
<None Include="paket.references" />
2826
<Watch Include="@(None)" />
2927
</ItemGroup>
30-
3128
<ItemGroup>
3229
<ProjectReference Include="..\FsToolkit.ErrorHandling\FsToolkit.ErrorHandling.fsproj" />
3330
</ItemGroup>
34-
35-
31+
<Import Project="..\..\.paket\Paket.Restore.targets" />
3632
</Project>

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

Lines changed: 43 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,46 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<PropertyGroup>
4-
<OutputType>Library</OutputType>
5-
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
6-
<LangVersion>preview</LangVersion>
7-
<DebugType>portable</DebugType>
8-
</PropertyGroup>
9-
10-
11-
<ItemGroup>
12-
<Compile Include="Shims.fs" />
13-
<Compile Include="Result.fs" />
14-
<Compile Include="ResultCE.fs" />
15-
<Compile Include="ResultOp.fs" />
16-
<Compile Include="ResultOption.fs" />
17-
<Compile Include="ResultOptionCE.fs" />
18-
<Compile Include="ResultOptionOp.fs" />
19-
<Compile Include="Async.fs" />
20-
<Compile Include="AsyncResult.fs" />
21-
<Compile Include="AsyncResultCE.fs" />
22-
<Compile Include="AsyncResultOp.fs" />
23-
<Compile Include="Validation.fs" />
24-
<Compile Include="ValidationOp.fs" />
25-
<Compile Include="ValidationCE.fs" />
26-
<Compile Include="Option.fs" />
27-
<Compile Include="OptionCE.fs" />
28-
<Compile Include="OptionOp.fs" />
29-
<Compile Include="ValueOption.fs" />
30-
<Compile Include="ValueOptionCE.fs" />
31-
<Compile Include="AsyncOption.fs" />
32-
<Compile Include="AsyncOptionCE.fs" />
33-
<Compile Include="AsyncOptionOp.fs" />
34-
<Compile Include="AsyncResultOption.fs" />
35-
<Compile Include="AsyncResultOptionCE.fs" />
36-
<Compile Include="AsyncResultOptionOp.fs" />
37-
<Compile Include="List.fs" />
38-
<Compile Include="Seq.fs" />
39-
<None Include="Script.fsx" />
40-
<None Include="paket.references" />
41-
<Watch Include="@(None)" />
42-
</ItemGroup>
43-
44-
<!-- Add source files to "fable" folder in Nuget package -->
45-
<ItemGroup>
46-
<Content Include="*.fsproj; **\*.fs" PackagePath="fable\" />
47-
</ItemGroup>
48-
49-
3+
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
6+
<LangVersion>preview</LangVersion>
7+
<DebugType>portable</DebugType>
8+
</PropertyGroup>
9+
<ItemGroup>
10+
<Compile Include="Shims.fs" />
11+
<Compile Include="Result.fs" />
12+
<Compile Include="ResultCE.fs" />
13+
<Compile Include="ResultOp.fs" />
14+
<Compile Include="ResultOption.fs" />
15+
<Compile Include="ResultOptionCE.fs" />
16+
<Compile Include="ResultOptionOp.fs" />
17+
<Compile Include="Async.fs" />
18+
<Compile Include="AsyncResult.fs" />
19+
<Compile Include="AsyncResultCE.fs" />
20+
<Compile Include="AsyncResultOp.fs" />
21+
<Compile Include="Validation.fs" />
22+
<Compile Include="ValidationOp.fs" />
23+
<Compile Include="ValidationCE.fs" />
24+
<Compile Include="Option.fs" />
25+
<Compile Include="OptionCE.fs" />
26+
<Compile Include="OptionOp.fs" />
27+
<Compile Include="ValueOption.fs" />
28+
<Compile Include="ValueOptionCE.fs" />
29+
<Compile Include="AsyncOption.fs" />
30+
<Compile Include="AsyncOptionCE.fs" />
31+
<Compile Include="AsyncOptionOp.fs" />
32+
<Compile Include="AsyncResultOption.fs" />
33+
<Compile Include="AsyncResultOptionCE.fs" />
34+
<Compile Include="AsyncResultOptionOp.fs" />
35+
<Compile Include="List.fs" />
36+
<Compile Include="Seq.fs" />
37+
<None Include="Script.fsx" />
38+
<None Include="paket.references" />
39+
<Watch Include="@(None)" />
40+
</ItemGroup>
41+
<!-- Add source files to "fable" folder in Nuget package -->
42+
<ItemGroup>
43+
<Content Include="*.fsproj; **\*.fs" PackagePath="fable\" />
44+
</ItemGroup>
45+
<Import Project="..\..\.paket\Paket.Restore.targets" />
5046
</Project>

‎tests/FsToolkit.ErrorHandling.AsyncSeq.Tests/FsToolkit.ErrorHandling.AsyncSeq.Tests.fsproj‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,19 @@
99
<ProjectReference Include="../../src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj">
1010
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
1111
</ProjectReference>
12-
<ProjectReference
13-
Include="../../src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj">
12+
<ProjectReference Include="../../src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj">
1413
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
1514
</ProjectReference>
1615
</ItemGroup>
1716
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
18-
<ProjectReference
19-
Include="../../src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj">
17+
<ProjectReference Include="../../src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj">
2018
</ProjectReference>
2119
</ItemGroup>
22-
2320
<ItemGroup>
2421
<Compile Include="AsyncSeq.fs" />
2522
<Compile Include="Main.fs" />
2623
<None Include="paket.references" />
2724
<Watch Include="@(None)" />
2825
</ItemGroup>
29-
30-
26+
<Import Project="..\..\.paket\Paket.Restore.targets" />
3127
</Project>

‎tests/FsToolkit.ErrorHandling.IcedTasks.Tests/FsToolkit.ErrorHandling.IcedTasks.Tests.fsproj‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net7.0</TargetFramework>
66
</PropertyGroup>
7-
87
<ItemGroup>
98
<Compile Include="../FsToolkit.ErrorHandling.TaskResult.Tests/Expecto.fs" />
109
<Compile Include="CancellableTaskResultCE.fs" />
1110
<Compile Include="Main.fs" />
1211
<None Include="paket.references" />
1312
<Watch Include="@(None)" />
1413
</ItemGroup>
15-
1614
<ItemGroup>
17-
<ProjectReference
18-
Include="..\..\src\FsToolkit.ErrorHandling.IcedTasks\FsToolkit.ErrorHandling.IcedTasks.fsproj" />
15+
<ProjectReference Include="..\..\src\FsToolkit.ErrorHandling.IcedTasks\FsToolkit.ErrorHandling.IcedTasks.fsproj" />
1916
</ItemGroup>
20-
21-
17+
<Import Project="..\..\.paket\Paket.Restore.targets" />
2218
</Project>

0 commit comments

Comments
 (0)