Skip to content

Update fcs 43.9.300 + Misc build/formatting fixes #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheAngryByrd merged 6 commits into from
May 17, 2025
Merged

Update fcs 43.9.300 + Misc build/formatting fixes #232

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be1b145
Add build scripts
TheAngryByrd May 17, 2025
b6b455b
Update package versions for FSharp.Core, FSharp.Compiler.Service, Exp…
TheAngryByrd May 17, 2025
e7850f2
Fixup Fantomas/FsLibLog issue
TheAngryByrd May 17, 2025
de4036c
Ensure fail on focus enabled in CI
TheAngryByrd May 17, 2025
3878ffb
Formatting
TheAngryByrd May 17, 2025
af5f619
Fix test command to correctly pass failedOnFocus parameter
TheAngryByrd May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<FSharpCoreVersion>6.0.0</FSharpCoreVersion>
<!-- However for the FCS project, FSharpCoreCompilerVersion needs to match whats specified in
the FSharp.Compiler.Service dependency -->
<FSharpCoreCompilerVersion>9.0.201</FSharpCoreCompilerVersion>
<FSharpCompilerVersion>43.9.201</FSharpCompilerVersion>
<ExpectoVersion>10.2.1</ExpectoVersion>
<FSharpCoreCompilerVersion>9.0.300</FSharpCoreCompilerVersion>
<FSharpCompilerVersion>43.9.300</FSharpCompilerVersion>
Comment on lines +10 to +11
Copy link
Member Author

@TheAngryByrd TheAngryByrd May 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The meat.

<ExpectoVersion>10.2.3</ExpectoVersion>
Copy link
Member Author

@TheAngryByrd TheAngryByrd May 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Slightly faster expecto tests, though our tests are still slow.

<FakeVersion>6.1.3</FakeVersion>
<NuGetAuditMode>direct</NuGetAuditMode>
</PropertyGroup>
Expand Down Expand Up @@ -38,7 +38,7 @@
<PackageVersion Include="Expecto" Version="$(ExpectoVersion)" />
<PackageVersion Include="Expecto.Diff" Version="$(ExpectoVersion)" />
<PackageVersion Include="MedallionShell" Version="1.5.1" />
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.14.3" />
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.15.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<!-- Build Dependencies-->
Expand Down
1 change: 1 addition & 0 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dotnet run --project ./build/build.fsproj -- -t %*
Copy link
Member Author

@TheAngryByrd TheAngryByrd May 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tired of having to remember the build syntax. Add cmd/sh variants.

6 changes: 6 additions & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

set -eu
set -o pipefail

FAKE_DETAILED_ERRORS=true dotnet run --project ./build/build.fsproj -- -t "$@"
15 changes: 5 additions & 10 deletions build/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ let init args =
| true, v -> v
| _ -> false

let packages () = !! "src/**/*.nupkg"
let packages () = !!"src/**/*.nupkg"

Target.create
"Clean"
Expand Down Expand Up @@ -173,17 +173,12 @@ let init args =

[<EntryPoint>]
let main args =
init (
(args
|> List.ofArray)
)
List.ofArray args
|> init

try
match args with
| [| target |] -> Target.runOrDefaultWithArguments target
| _ -> Target.runOrDefaultWithArguments "Default"

Target.runOrDefaultWithArguments "Default"
0
with e ->
printfn "%A" e
eprintfn "%A" e
1