Skip to content

Commit 922a5dc

Browse files
1eyewonder1eyewonder
committed
net10 upgrades
1 parent 9cd957e commit 922a5dc

File tree

22 files changed

+59
-55
lines changed

22 files changed

+59
-55
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"isRoot": true,
44
"tools": {
55
"fable": {
6-
"version": "4.25.0",
6+
"version": "4.27.0",
77
"commands": [
88
"fable"
99
],
1010
"rollForward": false
1111
},
1212
"fantomas": {
13-
"version": "7.0.2",
13+
"version": "7.0.3",
1414
"commands": [
1515
"fantomas"
1616
],
@@ -24,7 +24,7 @@
2424
"rollForward": false
2525
},
2626
"fsharp-analyzers": {
27-
"version": "0.31.0",
27+
"version": "0.34.1",
2828
"commands": [
2929
"fsharp-analyzers"
3030
],

‎.devcontainer/devcontainer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
},
2020
// https://github.com/devcontainers/features/blob/main/src/github-cli/README.md
2121
"ghcr.io/devcontainers/features/github-cli:1": {},
22-
// https://github.com/devcontainers-contrib/features/blob/main/src/starship/README.md
23-
"ghcr.io/devcontainers-contrib/features/starship:1": {},
22+
// https://github.com/devcontainers-extra/features/blob/main/src/starship/README.md
23+
"ghcr.io/devcontainers-extra/features/starship:1": {},
2424
// https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
2525
"ghcr.io/devcontainers/features/dotnet:2": {
26-
"version": "9.0",
27-
"additionalVersions": "8.0"
26+
"version": "10.0",
27+
"additionalVersions": ["8.0", "9.0"]
2828
},
2929
"ghcr.io/devcontainers/features/node:1": {
3030
"version": "22"

‎.github/workflows/build.yml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ jobs:
2424
runs-on: ${{ matrix.os }}
2525

2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v5
2828
- name: Setup necessary dotnet SDKs
29-
uses: actions/setup-dotnet@v3
29+
uses: actions/setup-dotnet@v5
3030
with:
3131
global-json-file: global.json
3232
dotnet-version: |
3333
8.x
3434
9.x
35+
10.x
3536
3637
- name: Build via Bash
3738
if: runner.os != 'Windows'
@@ -58,20 +59,21 @@ jobs:
5859
runs-on: ${{ matrix.os }}
5960

6061
steps:
61-
- uses: actions/checkout@v3
62+
- uses: actions/checkout@v5
6263

6364
- name: Setup Node.js
64-
uses: actions/setup-node@v3
65+
uses: actions/setup-node@v5
6566
with:
6667
node-version: ${{ matrix.node-version }}
6768

6869
- name: Setup necessary dotnet SDKs
69-
uses: actions/setup-dotnet@v3
70+
uses: actions/setup-dotnet@v5
7071
with:
7172
global-json-file: global.json
7273
dotnet-version: |
7374
8.x
7475
9.x
76+
10.x
7577
7678
- name: Build via Bash
7779
if: runner.os != 'Windows'
@@ -105,12 +107,13 @@ jobs:
105107
python-version: ${{ matrix.python-version }}
106108

107109
- name: Setup necessary dotnet SDKs
108-
uses: actions/setup-dotnet@v3
110+
uses: actions/setup-dotnet@v5
109111
with:
110112
global-json-file: global.json
111113
dotnet-version: |
112114
8.x
113115
9.x
116+
10.x
114117
- name: Build via Bash
115118
if: runner.os != 'Windows'
116119
run: |
@@ -132,7 +135,7 @@ jobs:
132135
runs-on: ubuntu-latest
133136
steps:
134137

135-
- uses: actions/checkout@v3
138+
- uses: actions/checkout@v5
136139

137140
- name: Build and run dev container task
138141
uses: devcontainers/[email protected]
@@ -144,14 +147,15 @@ jobs:
144147
analyze:
145148
runs-on: ubuntu-latest
146149
steps:
147-
- uses: actions/checkout@v3
150+
- uses: actions/checkout@v5
148151
- name: Setup necessary dotnet SDKs
149-
uses: actions/setup-dotnet@v3
152+
uses: actions/setup-dotnet@v5
150153
with:
151154
global-json-file: global.json
152155
dotnet-version: |
153156
8.x
154157
9.x
158+
10.x
155159
- name: Analyze
156160
run: |
157161
chmod +x ./build.sh

‎.vscode/launch.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
"name": "benchmarks",
66
"type": "coreclr",
77
"request": "launch",
8-
"program": "${workspaceFolder}/benchmarks/bin/Release/net8.0/benchmarks.exe",
9-
"args": ["-m", "--runtimes", "net8.0", "--filter", "*"],
8+
"program": "${workspaceFolder}/benchmarks/bin/Release/net10.0/benchmarks.exe",
9+
"args": ["-m", "--runtimes", "net10.0", "--filter", "*"],
1010
"env": {
1111
"ASPNETCORE_ENVIRONMENT": "Development"
1212
},
1313
"console": "integratedTerminal",
1414
"preLaunchTask": "build release",
15-
"cwd": "${workspaceFolder}/benchmarks/bin/Release/net8.0/"
15+
"cwd": "${workspaceFolder}/benchmarks/bin/Release/net10.0/"
1616
}
1717
]
1818
}

‎Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<DisableCheckingDuplicateNuGetItems>true</DisableCheckingDuplicateNuGetItems>
4-
<NoWarn>$(NoWarn);FS2003;NU1903;NU1904;FS0057</NoWarn>
4+
<NoWarn>$(NoWarn);FS2003;NU1902;NU1903;NU1904;FS0057</NoWarn>
55
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
66
<WarningsAsErrors />
77
<!--
@@ -11,8 +11,8 @@
1111
Then, we're assuming if you're building for net9.0 you're using F# 9 Language features.
1212
-->
1313
<LangVersion>8.0</LangVersion>
14-
<LangVersion Condition="'$(TargetFramework)' == 'net9.0'">9.0</LangVersion>
15-
<Nullable Condition="'$(TargetFramework)' == 'net9.0'">enable</Nullable>
14+
<LangVersion Condition="'$(TargetFramework)' == 'net10.0'">10.0</LangVersion>
15+
<Nullable Condition="'$(TargetFramework)' == 'net10.0'">enable</Nullable>
1616
</PropertyGroup>
1717

1818

‎Directory.Packages.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageVersion Include="Hopac" Version="0.5.1" />
1010
<PackageVersion Include="FSharp.Control.AsyncSeq" Version="3.2.1" />
1111
<PackageVersion Include="Fable.Core" Version="4.2.0" />
12-
<PackageVersion Include="IcedTasks" Version="0.11.8" />
12+
<PackageVersion Include="IcedTasks" Version="0.11.9" />
1313
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
1414
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
1515

@@ -22,29 +22,29 @@
2222
<PackageVersion Include="Fable.Pyxpecto" Version="1.3.0" />
2323

2424
<!-- 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" />
25+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
26+
<PackageVersion Include="BenchmarkDotNet.Annotations" Version="0.15.6" />
27+
<PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.6" />
2828

2929
<!-- 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" />
30+
<PackageVersion Include="Fake.Core.Target" Version="6.1.4" />
31+
<PackageVersion Include="Fake.DotNet.Cli" Version="6.1.4" />
32+
<PackageVersion Include="Fake.Core.ReleaseNotes" Version="6.1.4" />
33+
<PackageVersion Include="Fake.DotNet.AssemblyInfoFile" Version="6.1.4" />
34+
<PackageVersion Include="Fake.DotNet.Testing.Expecto" Version="6.1.4" />
35+
<PackageVersion Include="Fake.Tools.Git" Version="6.1.4" />
36+
<PackageVersion Include="Fake.JavaScript.Npm" Version="6.1.4" />
37+
<PackageVersion Include="Fake.Api.GitHub" Version="6.1.4" />
38+
<PackageVersion Include="Fake.BuildServer.GitHubActions" Version="6.1.4" />
3939
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.206" />
4040
<PackageVersion Include="Octokit" Version="0.53.0" />
4141
<PackageVersion Include="Nuget.Common" Version="6.6.1" />
4242
<PackageVersion Include="NuGet.Protocol" Version="6.6.1" />
4343
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
4444

4545
<!-- Analyzers group dependencies -->
46-
<PackageVersion Include="Ionide.Analyzers" Version="0.14.5" />
47-
<PackageVersion Include="G-Research.FSharp.Analyzers" Version="0.15.0" />
46+
<PackageVersion Include="Ionide.Analyzers" Version="0.14.10" />
47+
<PackageVersion Include="G-Research.FSharp.Analyzers" Version="0.20.0" />
4848
</ItemGroup>
4949

5050

‎benchmarks/benchmarks.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77
<PropertyGroup>

‎build/build.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88
<ItemGroup>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "10.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

‎src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Microsoft.Bcl.AsyncInterfaces" />
3131
</ItemGroup>
3232
<Choose>
33-
<When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net9.0'))">
33+
<When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net10.0'))">
3434
<ItemGroup>
35-
<PackageReference Include="FSharp.Core" VersionOverride="9.0.300" />
35+
<PackageReference Include="FSharp.Core" VersionOverride="10.0.100" />
3636
</ItemGroup>
3737
</When>
3838
<Otherwise>

0 commit comments

Comments
 (0)