Skip to content

Commit aa8362d

Browse files
TheAngryByrdTheAngryByrd
committed
Paket targets now part of Directory.Build.targets
1 parent 0dcfb29 commit aa8362d

File tree

13 files changed

+92
-83
lines changed

13 files changed

+92
-83
lines changed

‎benchmarks/benchmarks.fsproj‎

Lines changed: 31 additions & 31 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 Include="..\src\FsToolkit.ErrorHandling.JobResult\FsToolkit.ErrorHandling.JobResult.fsproj" />
31-
</ItemGroup>
32-
<Import Project="..\.paket\Paket.Restore.targets" />
33-
</Project>
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>
33+
</Project>

‎build/build.fsproj‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>net7.0</TargetFramework>
5-
<IsPackable>false</IsPackable>
6-
</PropertyGroup>
7-
<ItemGroup>
2+
<PropertyGroup>
3+
<OutputType>Exe</OutputType>
4+
<TargetFramework>net7.0</TargetFramework>
5+
<IsPackable>false</IsPackable>
6+
</PropertyGroup>
7+
<ItemGroup>
88

9-
<Compile Include="build.fs" />
10-
</ItemGroup>
11-
<Import Project="..\.paket\Paket.Restore.targets" />
12-
</Project>
9+
<Compile Include="build.fs" />
10+
</ItemGroup>
11+
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
</ItemGroup>
1313
<ItemGroup>
1414
<Compile Include="Library.fs" />
15-
<None Include="paket.references"/>
15+
<None Include="paket.references" />
1616
<Watch Include="@(None)" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<ProjectReference Include="..\FsToolkit.ErrorHandling\FsToolkit.ErrorHandling.fsproj" />
2020
</ItemGroup>
21-
<Import Project="..\..\.paket\Paket.Restore.targets" />
22-
</Project>
21+
22+
</Project>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<ProjectReference Include="..\FsToolkit.ErrorHandling.TaskResult\FsToolkit.ErrorHandling.TaskResult.fsproj" />
19+
<ProjectReference
20+
Include="..\FsToolkit.ErrorHandling.TaskResult\FsToolkit.ErrorHandling.TaskResult.fsproj" />
2021
</ItemGroup>
2122

22-
<Import Project="..\..\.paket\Paket.Restore.targets" />
23-
</Project>
23+
24+
</Project>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@
2020
<Compile Include="JobResultOptionCE.fs" />
2121
<Compile Include="JobResultOptionOp.fs" />
2222

23-
<None Include="paket.references"/>
23+
<None Include="paket.references" />
2424
<Watch Include="@(None)" />
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<ProjectReference Include="..\FsToolkit.ErrorHandling.TaskResult\FsToolkit.ErrorHandling.TaskResult.fsproj" />
28+
<ProjectReference
29+
Include="..\FsToolkit.ErrorHandling.TaskResult\FsToolkit.ErrorHandling.TaskResult.fsproj" />
2930
</ItemGroup>
3031

31-
<Import Project="..\..\.paket\Paket.Restore.targets" />
32-
</Project>
32+
33+
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<Compile Include="TaskResultOption.fs" />
2525
<Compile Include="TaskResultOptionCE.fs" />
2626
<Compile Include="TaskResultOptionOp.fs" />
27-
<None Include="paket.references"/>
27+
<None Include="paket.references" />
2828
<Watch Include="@(None)" />
2929
</ItemGroup>
3030

3131
<ItemGroup>
3232
<ProjectReference Include="..\FsToolkit.ErrorHandling\FsToolkit.ErrorHandling.fsproj" />
3333
</ItemGroup>
3434

35-
<Import Project="..\..\.paket\Paket.Restore.targets" />
36-
</Project>
35+
36+
</Project>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,4 @@
4747
</ItemGroup>
4848

4949

50-
<Import Project="..\..\.paket\Paket.Restore.targets" />
5150
</Project>

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,23 @@
99
<ProjectReference Include="../../src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj">
1010
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
1111
</ProjectReference>
12-
<ProjectReference Include="../../src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj">
12+
<ProjectReference
13+
Include="../../src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj">
1314
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
1415
</ProjectReference>
1516
</ItemGroup>
16-
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
17-
<ProjectReference Include="../../src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj">
17+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
18+
<ProjectReference
19+
Include="../../src/FsToolkit.ErrorHandling.AsyncSeq/FsToolkit.ErrorHandling.AsyncSeq.fsproj">
1820
</ProjectReference>
1921
</ItemGroup>
2022

2123
<ItemGroup>
2224
<Compile Include="AsyncSeq.fs" />
2325
<Compile Include="Main.fs" />
24-
<None Include="paket.references"/>
26+
<None Include="paket.references" />
2527
<Watch Include="@(None)" />
2628
</ItemGroup>
2729

2830

29-
<Import Project="..\..\.paket\Paket.Restore.targets" />
30-
</Project>
31+
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<ProjectReference Include="..\..\src\FsToolkit.ErrorHandling.IcedTasks\FsToolkit.ErrorHandling.IcedTasks.fsproj" />
17+
<ProjectReference
18+
Include="..\..\src\FsToolkit.ErrorHandling.IcedTasks\FsToolkit.ErrorHandling.IcedTasks.fsproj" />
1819
</ItemGroup>
1920

2021

21-
<Import Project="..\..\.paket\Paket.Restore.targets" />
22-
</Project>
22+
</Project>

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@
88
<ProjectReference Include="../../src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj">
99
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
1010
</ProjectReference>
11-
<ProjectReference Include="../../src/FsToolkit.ErrorHandling.TaskResult/FsToolkit.ErrorHandling.TaskResult.fsproj">
11+
<ProjectReference
12+
Include="../../src/FsToolkit.ErrorHandling.TaskResult/FsToolkit.ErrorHandling.TaskResult.fsproj">
1213
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
1314
</ProjectReference>
14-
<ProjectReference Include="../../src/FsToolkit.ErrorHandling.JobResult/FsToolkit.ErrorHandling.JobResult.fsproj">
15+
<ProjectReference
16+
Include="../../src/FsToolkit.ErrorHandling.JobResult/FsToolkit.ErrorHandling.JobResult.fsproj">
1517
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
1618
</ProjectReference>
1719
</ItemGroup>
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
19-
<ProjectReference Include="../../src/FsToolkit.ErrorHandling.JobResult/FsToolkit.ErrorHandling.JobResult.fsproj">
20+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
21+
<ProjectReference
22+
Include="../../src/FsToolkit.ErrorHandling.JobResult/FsToolkit.ErrorHandling.JobResult.fsproj">
2023
</ProjectReference>
2124
</ItemGroup>
2225

@@ -34,9 +37,9 @@
3437
<Compile Include="List.fs" />
3538
<Compile Include="JobResultOption.fs" />
3639
<Compile Include="Main.fs" />
37-
<None Include="paket.references"/>
40+
<None Include="paket.references" />
3841
<Watch Include="@(None)" />
3942
</ItemGroup>
4043

41-
<Import Project="..\..\.paket\Paket.Restore.targets" />
42-
</Project>
44+
45+
</Project>

0 commit comments

Comments
 (0)