Skip to content

Commit 31029b1

Browse files
authored
Merge pull request #3185 from fsprojects/dependabot/github_actions/actions/setup-dotnet-5
Bump actions/setup-dotnet from 4 to 5
2 parents ba7961c + 44ac553 commit 31029b1

4 files changed

Lines changed: 18 additions & 4 deletions

File tree

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v5
1919
- name: Setup .NET Core
20-
uses: actions/setup-dotnet@v4
20+
uses: actions/setup-dotnet@v5
2121
- name: Init
2222
run: dotnet fsi build.fsx -p Init
2323
- name: Build
@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/checkout@v5
4949

5050
- name: Setup .NET Core
51-
uses: actions/setup-dotnet@v4
51+
uses: actions/setup-dotnet@v5
5252

5353
- name: Run analyzers
5454
run: dotnet fsi build.fsx -- -p Analyze

.github/workflows/push-client.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v5
1616
- name: Setup .NET Core
17-
uses: actions/setup-dotnet@v4
17+
uses: actions/setup-dotnet@v5
1818
- name: PushClient
1919
run: dotnet fsi build.fsx -p PushClient
2020
env:

.github/workflows/regressions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v5
1111
- name: Setup .NET Core
12-
uses: actions/setup-dotnet@v4
12+
uses: actions/setup-dotnet@v5
1313
with:
1414
dotnet-version: |
1515
7.0.104

src/Fantomas.Client.Tests/EndToEndTests.fs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,20 @@ type EndToEndTests() =
5858

5959
let fsharpFile = Path.Combine(subDirectory.FullName, "File.fs")
6060
File.Create(fsharpFile).Dispose()
61+
62+
// Create a .editorconfig file to override any parent configuration
63+
let editorConfigPath = Path.Combine(subDirectory.FullName, ".editorconfig")
64+
65+
let editorConfigContent =
66+
"""
67+
root = true
68+
69+
[*.fs]
70+
end_of_line = lf
71+
"""
72+
73+
File.WriteAllText(editorConfigPath, editorConfigContent)
74+
6175
do! callback fsharpFile
6276
}
6377

0 commit comments

Comments
 (0)