Skip to content

Commit 2cdaff1

Browse files
TheAngryByrdTheAngryByrd
authored
Remove paket (#331)
* FsToolkit Core nugetfied * Add PackageReference for FSharp.Control.AsyncSeq in project file * Add Hopac and Expecto.Hopac package references to project files * Add PackageReference for IcedTasks to IcedTasks project file * Update package versions and add BenchmarkDotNet reference; refactor awaiter handling in CancellableTask modules * Update package versions and add --noCache option for Fable commands; include Fable.Mocha and Fable.Pyxpecto in test dependencies * Remove paket.references files from various projects and tests to clean up unused dependencies * Refactor test framework integration and update package dependencies - Removed Mocha as a test runner and replaced it with Pyxpecto for JavaScript and Python Fable compilers. - Updated package.json to reflect the removal of Mocha and adjusted test scripts to use Node directly. - Added conditional compilation directives to support Pyxpecto across different Fable compilers. - Cleaned up test files by removing unnecessary Mocha references and ensuring compatibility with Pyxpecto. - Introduced ignore tests for AsyncResultOption under specific compiler conditions. * Update tool and package versions in dotnet-tools.json and Directory.Packages.props * Make analysis step optional to prevent workflow failure * Update Node.js version in devcontainer and adjust node-version matrix in build workflow * Add nullable type annotations and improve documentation for Nullness module * Update FSharp.Core version to 9.0.300 in build properties * Fix documentation typos and improve comments in Nullness module
1 parent 3e3848a commit 2cdaff1

File tree

87 files changed

+428
-3136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+428
-3136
lines changed

‎.config/dotnet-tools.json

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,29 @@
22
"version": 1,
33
"isRoot": true,
44
"tools": {
5-
"paket": {
6-
"version": "9.0.2",
7-
"commands": [
8-
"paket"
9-
],
10-
"rollForward": false
11-
},
125
"fable": {
13-
"version": "4.4.0",
6+
"version": "4.25.0",
147
"commands": [
158
"fable"
169
],
1710
"rollForward": false
1811
},
1912
"fantomas": {
20-
"version": "7.0.0",
13+
"version": "7.0.2",
2114
"commands": [
2215
"fantomas"
2316
],
2417
"rollForward": false
2518
},
2619
"femto": {
27-
"version": "0.19.0",
20+
"version": "0.21.0",
2821
"commands": [
2922
"femto"
3023
],
3124
"rollForward": false
3225
},
3326
"fsharp-analyzers": {
34-
"version": "0.28.0",
27+
"version": "0.31.0",
3528
"commands": [
3629
"fsharp-analyzers"
3730
],

‎.devcontainer/devcontainer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"additionalVersions": "8.0"
2828
},
2929
"ghcr.io/devcontainers/features/node:1": {
30-
"version": "18"
30+
"version": "22"
3131
},
3232
"ghcr.io/devcontainers/features/python:1": {
3333
"version": "3.10"
@@ -46,7 +46,6 @@
4646
"ms-dotnettools.csharp",
4747
"Ionide.Ionide-fsharp",
4848
"tintoy.msbuild-project-tools",
49-
"ionide.ionide-paket",
5049
"usernamehw.errorlens",
5150
"alefragnani.Bookmarks",
5251
"oderwat.indent-rainbow",

‎.editorconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,6 @@ end_of_line = crlf
5454
[*.{ps1, psm1}]
5555
end_of_line = crlf
5656

57-
# Paket files
58-
[paket.*]
59-
trim_trailing_whitespace = true
60-
indent_size = 2
61-
62-
[*.paket.references]
63-
trim_trailing_whitespace = true
64-
indent_size = 2
65-
6657
# YAML Files
6758
[*.{yml,yaml}]
6859
indent_size = 2

‎.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
fail-fast: false
5555
matrix:
5656
os: [ubuntu-latest, windows-latest, macOS-latest]
57-
node-version: ['18', '20', 'latest' ]
57+
node-version: ['lts/-1', 'lts/*', 'latest' ]
5858
runs-on: ${{ matrix.os }}
5959

6060
steps:
@@ -164,3 +164,5 @@ jobs:
164164
with:
165165
# You can also specify the path to a folder for `sarif_file`
166166
sarif_file: analysisreports
167+
# make this step optional, so that it does not fail the workflow
168+
continue-on-error: true

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,6 @@ FakesAssemblies/
371371
**/*.Server/ModelManifest.xml
372372
_Pvt_Extensions
373373

374-
# Paket dependency manager
375-
paket-files/
376-
377374
# FAKE - F# Make
378375
.fake/
379376

‎.paket/Paket.Restore.targets

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

‎.vscode/extensions.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"recommendations": [
3-
"ionide.ionide-paket",
43
"ionide.ionide-fsharp",
54
"ionide.ionide-fake",
65
"ms-dotnettools.csharp",

‎Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<LangVersion>8.0</LangVersion>
1414
<LangVersion Condition="'$(TargetFramework)' == 'net9.0'">9.0</LangVersion>
1515
<Nullable Condition="'$(TargetFramework)' == 'net9.0'">enable</Nullable>
16-
<PaketPropsVersion>6.0.0</PaketPropsVersion> <!-- Hack to prevent paket from restoring when it should not -->
1716
</PropertyGroup>
17+
18+
1819
</Project>

‎Directory.Packages.props

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!-- Enable central package management -->
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<!-- Core 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.8" />
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.Python" Version="4.3.0" />
22+
<PackageVersion Include="Fable.Pyxpecto" Version="1.3.0" />
23+
24+
<!-- Benchmarks group dependencies -->
25+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.0" />
26+
<PackageVersion Include="BenchmarkDotNet.Annotations" Version="0.15.0" />
27+
<PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.0" />
28+
29+
<!-- Build group dependencies -->
30+
<PackageVersion Include="Fake.Core.Target" Version="5.22.0" />
31+
<PackageVersion Include="Fake.DotNet.Cli" Version="5.22.0" />
32+
<PackageVersion Include="Fake.Core.ReleaseNotes" Version="5.22.0" />
33+
<PackageVersion Include="Fake.DotNet.AssemblyInfoFile" Version="5.22.0" />
34+
<PackageVersion Include="Fake.DotNet.Testing.Expecto" Version="5.22.0" />
35+
<PackageVersion Include="Fake.Tools.Git" Version="5.22.0" />
36+
<PackageVersion Include="Fake.JavaScript.Npm" Version="5.22.0" />
37+
<PackageVersion Include="Fake.Api.GitHub" Version="5.22.0" />
38+
<PackageVersion Include="Fake.BuildServer.GitHubActions" Version="5.22.0" />
39+
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.206" />
40+
<PackageVersion Include="Octokit" Version="0.53.0" />
41+
<PackageVersion Include="Nuget.Common" Version="6.6.1" />
42+
<PackageVersion Include="NuGet.Protocol" Version="6.6.1" />
43+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
44+
45+
<!-- Analyzers group dependencies -->
46+
<PackageVersion Include="Ionide.Analyzers" Version="0.14.5" />
47+
<PackageVersion Include="G-Research.FSharp.Analyzers" Version="0.15.0" />
48+
</ItemGroup>
49+
50+
51+
</Project>

‎Directory.Solution.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<_DotnetToolRestoreOutputFile>$(_BuildProjBaseIntermediateOutputPath)/dotnet-tool-restore-$(NETCoreSdkVersion)-$(OS)</_DotnetToolRestoreOutputFile>
66
</PropertyGroup>
77

8-
<Target Name="ToolRestore" BeforeTargets="Restore;CollectPackageReferences;PaketRestore" Inputs="$(_DotnetToolManifestFile)" Outputs="$(_DotnetToolRestoreOutputFile)">
8+
<Target Name="ToolRestore" BeforeTargets="Restore;CollectPackageReferences" Inputs="$(_DotnetToolManifestFile)" Outputs="$(_DotnetToolRestoreOutputFile)">
99
<Exec Command="dotnet tool restore" WorkingDirectory="$(MSBuildThisFileDirectory)" StandardOutputImportance="High" StandardErrorImportance="High" />
1010
<MakeDir Directories="$(_BuildProjBaseIntermediateOutputPath)"/>
1111
<Touch Files="$(_DotnetToolRestoreOutputFile)" AlwaysCreate="True" ForceTouch="True" />

0 commit comments

Comments
 (0)