Skip to content

Commit e21ac9e

Browse files
StachuDotNetStachuDotNet
authored
Merge pull request #5634 from StachuDotNet/dotnet10
Upgrade to .NET 10
2 parents 7419052 + c5da255 commit e21ac9e

Some content is hidden

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

42 files changed

+173
-170
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ executors:
1717
IN_DEV_CONTAINER: true
1818
docker:
1919
# DOCKERFILE_REPO: see Dockerfile note about how this is built.
20-
- image: darklang/dark-base:7dc786d
20+
- image: darklang/dark-base:be6dd7c
2121

2222
commands:
2323
show-large-files-and-directories:
@@ -207,7 +207,7 @@ jobs:
207207
root: "."
208208
paths:
209209
# Just enough for deploy
210-
- backend/Build/out/BwdServer/Release/net8.0/linux-x64/publish/
210+
- backend/Build/out/BwdServer/Release/net10.0/linux-x64/publish/
211211
- show-large-files-and-directories
212212
- save_cache:
213213
paths:

‎Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@ ENV NUGET_XMLDOC_MODE=skip \
219219
# Enable correct mode for dotnet watch (only mode supported in a container)
220220
DOTNET_USE_POLLING_FILE_WATCHER=true
221221

222-
RUN /home/dark/install-dotnet8 \
223-
--version=8.0.303 \
224-
--arm64-sha256=09cb6b12770febe186e36971afdbcea6e8bf5fb34b7701cd8c416f597d3b7e930d05e51ccef1985e5598291540ef2d721187904587469300bb39772317e2be5c \
225-
--amd64-sha256=814ff07ccdfc8160c4a24adfda6c815e7feace88c59722f827a5a27041719067538754911fc15cb46978e16566fe0938695891723d182055190e876131faedda
222+
RUN /home/dark/install-dotnet \
223+
--version=10.0.102 \
224+
--arm64-sha256=1254141153d29b5b926e0e7b0b172a25f9c096b8ed6a182f54062c5e0b41384b30e10e2bf1ebe86ed0f58f4ff762203acd83bcf23fefb59c07af45332d794700 \
225+
--amd64-sha256=7adf40e8e5547970391cfbe474c3874c6918ce3575ac398f376c78502134e1c8a2fa3da9aca281fdaeda81671f56c851ebe9e74c5b57c5a298bd45deba63565d
226226

227227
# formatting
228228
RUN dotnet tool install fantomas --version 6.2.3 -g

‎backend/.config/dotnet-tools.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "9.0.2",
6+
"version": "10.3.1",
77
"commands": [
88
"paket"
9-
]
9+
],
10+
"rollForward": false
1011
},
1112
"dotnet-trace": {
1213
"version": "9.0.553101",
1314
"commands": [
1415
"dotnet-trace"
15-
]
16+
],
17+
"rollForward": false
1618
}
1719
}
1820
}

‎backend/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": "8.0.303",
3+
"version": "10.0.102",
44
"rollForward": "disable"
55
}
66
}

‎backend/paket.dependencies‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
version 8.0.0
22

33
source https://api.nuget.org/v3/index.json
4-
framework: net8.0
4+
framework: net10.0
55
storage: none
66

77
// Basics
88
nuget Ply = 0.3.1
99
nuget FSharpPlus = 1.5.0
1010
nuget FsRegEx = 0.7.2
1111
nuget FSharpx.Extras = 3.1.0
12-
nuget FSharp.Core = 8.0.101
13-
nuget System.Text.Json = 8.0.5
12+
nuget FSharp.Core = 10.0.100
13+
nuget System.Text.Json = 10.0.0
1414
nuget FSharp.SystemTextJson = 1.3.13
1515
nuget NodaTime = 3.2.2
1616
nuget NodaTime.Serialization.SystemTextJson = 1.3.0
17-
nuget System.IO.Hashing 8.0.0
17+
nuget System.IO.Hashing 10.0.0
1818

1919
// Sqlite and binary serialization
20-
nuget Microsoft.Data.Sqlite = 8.0.1
20+
nuget Microsoft.Data.Sqlite = 10.0.0
2121
nuget Fumble = 1.0.3
22-
nuget SQLitePCLRaw.bundle_e_sqlite3 = 2.1.10
22+
nuget SQLitePCLRaw.bundle_e_sqlite3 = 2.1.11
2323

2424
// Parser
25-
nuget FSharp.Compiler.Service = 43.8.101
25+
nuget FSharp.Compiler.Service = 43.10.100
2626

2727
// Tests
2828
nuget Expecto = 10.1.0
2929
nuget NReco.Logging.File = 1.1.7
3030
nuget SimpleBase = 4.0.0
3131

3232
// Services
33-
nuget Microsoft.Extensions.Diagnostics.HealthChecks = 8.0.0
33+
nuget Microsoft.Extensions.Diagnostics.HealthChecks = 10.0.0
3434

3535
// LibCloud
3636
nuget Sodium.Core = 1.3.4

‎backend/paket.lock‎

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
STORAGE: NONE
2-
RESTRICTION: == net8.0
2+
RESTRICTION: == net10.0
33
NUGET
44
remote: https://api.nuget.org/v3/index.json
55
Expecto (10.1)
66
FSharp.Core (>= 7.0.200)
77
Mono.Cecil (>= 0.11.4 < 1.0)
8-
FSharp.Compiler.Service (43.8.101)
9-
FSharp.Core (8.0.101)
10-
System.Buffers (>= 4.5.1)
11-
System.Collections.Immutable (>= 7.0)
12-
System.Diagnostics.DiagnosticSource (>= 7.0.2)
13-
System.Memory (>= 4.5.5)
8+
FSharp.Compiler.Service (43.10.100)
9+
FSharp.Core (10.0.100)
10+
System.Buffers (>= 4.6)
11+
System.Collections.Immutable (>= 9.0)
12+
System.Diagnostics.DiagnosticSource (>= 9.0)
13+
System.Memory (>= 4.6)
1414
System.Reflection.Emit (>= 4.7)
15-
System.Reflection.Metadata (>= 7.0)
16-
System.Runtime.CompilerServices.Unsafe (>= 6.0)
17-
FSharp.Control.AsyncSeq (3.2.1)
15+
System.Reflection.Metadata (>= 9.0)
16+
System.Runtime.CompilerServices.Unsafe (>= 6.1)
17+
FSharp.Control.AsyncSeq (4.11)
1818
FSharp.Core (>= 4.7.2)
19-
Microsoft.Bcl.AsyncInterfaces (>= 5.0)
20-
FSharp.Core (8.0.101)
19+
Microsoft.Bcl.AsyncInterfaces (>= 10.0.3)
20+
System.Threading.Channels (>= 10.0.5)
21+
FSharp.Core (10.0.100)
2122
FSharp.SystemTextJson (1.3.13)
2223
FSharp.Core (>= 4.7)
2324
System.Text.Json (>= 6.0)
@@ -40,67 +41,66 @@ NUGET
4041
Legivel (0.4.6)
4142
FSharp.Core (>= 4.6)
4243
libsodium (1.0.21)
43-
Microsoft.Bcl.AsyncInterfaces (10.0.1)
44-
Microsoft.Data.Sqlite (8.0.1)
45-
Microsoft.Data.Sqlite.Core (>= 8.0.1)
46-
SQLitePCLRaw.bundle_e_sqlite3 (>= 2.1.6)
47-
Microsoft.Data.Sqlite.Core (10.0.1)
44+
Microsoft.Bcl.AsyncInterfaces (10.0.5)
45+
Microsoft.Data.Sqlite (10.0)
46+
Microsoft.Data.Sqlite.Core (>= 10.0)
47+
SQLitePCLRaw.bundle_e_sqlite3 (>= 2.1.11)
48+
SQLitePCLRaw.core (>= 2.1.11)
49+
Microsoft.Data.Sqlite.Core (10.0.5)
4850
SQLitePCLRaw.core (>= 2.1.11)
49-
Microsoft.Extensions.Configuration (10.0.1)
50-
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.1)
51-
Microsoft.Extensions.Primitives (>= 10.0.1)
52-
Microsoft.Extensions.Configuration.Abstractions (10.0.1)
53-
Microsoft.Extensions.Primitives (>= 10.0.1)
54-
Microsoft.Extensions.Configuration.Binder (10.0.1)
55-
Microsoft.Extensions.Configuration (>= 10.0.1)
56-
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.1)
57-
Microsoft.Extensions.DependencyInjection (10.0.1)
58-
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
59-
Microsoft.Extensions.DependencyInjection.Abstractions (10.0.1)
60-
Microsoft.Extensions.Diagnostics.Abstractions (10.0.1)
61-
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
62-
Microsoft.Extensions.Options (>= 10.0.1)
63-
System.Diagnostics.DiagnosticSource (>= 10.0.1)
64-
Microsoft.Extensions.Diagnostics.HealthChecks (8.0)
65-
Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions (>= 8.0)
66-
Microsoft.Extensions.Hosting.Abstractions (>= 8.0)
67-
Microsoft.Extensions.Logging.Abstractions (>= 8.0)
68-
Microsoft.Extensions.Options (>= 8.0)
69-
Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions (10.0.1)
70-
Microsoft.Extensions.FileProviders.Abstractions (10.0.1)
71-
Microsoft.Extensions.Primitives (>= 10.0.1)
72-
Microsoft.Extensions.Hosting.Abstractions (10.0.1)
73-
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.1)
74-
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
75-
Microsoft.Extensions.Diagnostics.Abstractions (>= 10.0.1)
76-
Microsoft.Extensions.FileProviders.Abstractions (>= 10.0.1)
77-
Microsoft.Extensions.Logging.Abstractions (>= 10.0.1)
78-
Microsoft.Extensions.Logging (10.0.1)
79-
Microsoft.Extensions.DependencyInjection (>= 10.0.1)
80-
Microsoft.Extensions.Logging.Abstractions (>= 10.0.1)
81-
Microsoft.Extensions.Options (>= 10.0.1)
82-
Microsoft.Extensions.Logging.Abstractions (10.0.1)
83-
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
84-
System.Diagnostics.DiagnosticSource (>= 10.0.1)
85-
Microsoft.Extensions.Logging.Configuration (10.0.1)
86-
Microsoft.Extensions.Configuration (>= 10.0.1)
87-
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.1)
88-
Microsoft.Extensions.Configuration.Binder (>= 10.0.1)
89-
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
90-
Microsoft.Extensions.Logging (>= 10.0.1)
91-
Microsoft.Extensions.Logging.Abstractions (>= 10.0.1)
92-
Microsoft.Extensions.Options (>= 10.0.1)
93-
Microsoft.Extensions.Options.ConfigurationExtensions (>= 10.0.1)
94-
Microsoft.Extensions.Options (10.0.1)
95-
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
96-
Microsoft.Extensions.Primitives (>= 10.0.1)
97-
Microsoft.Extensions.Options.ConfigurationExtensions (10.0.1)
98-
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.1)
99-
Microsoft.Extensions.Configuration.Binder (>= 10.0.1)
100-
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
101-
Microsoft.Extensions.Options (>= 10.0.1)
102-
Microsoft.Extensions.Primitives (>= 10.0.1)
103-
Microsoft.Extensions.Primitives (10.0.1)
51+
Microsoft.Extensions.Configuration (10.0.5)
52+
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.5)
53+
Microsoft.Extensions.Primitives (>= 10.0.5)
54+
Microsoft.Extensions.Configuration.Abstractions (10.0.5)
55+
Microsoft.Extensions.Primitives (>= 10.0.5)
56+
Microsoft.Extensions.Configuration.Binder (10.0.5)
57+
Microsoft.Extensions.Configuration (>= 10.0.5)
58+
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.5)
59+
Microsoft.Extensions.DependencyInjection (10.0.5)
60+
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.5)
61+
Microsoft.Extensions.DependencyInjection.Abstractions (10.0.5)
62+
Microsoft.Extensions.Diagnostics.Abstractions (10.0.5)
63+
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.5)
64+
Microsoft.Extensions.Options (>= 10.0.5)
65+
Microsoft.Extensions.Diagnostics.HealthChecks (10.0)
66+
Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions (>= 10.0)
67+
Microsoft.Extensions.Hosting.Abstractions (>= 10.0)
68+
Microsoft.Extensions.Logging.Abstractions (>= 10.0)
69+
Microsoft.Extensions.Options (>= 10.0)
70+
Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions (10.0.5)
71+
Microsoft.Extensions.FileProviders.Abstractions (10.0.5)
72+
Microsoft.Extensions.Primitives (>= 10.0.5)
73+
Microsoft.Extensions.Hosting.Abstractions (10.0.5)
74+
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.5)
75+
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.5)
76+
Microsoft.Extensions.Diagnostics.Abstractions (>= 10.0.5)
77+
Microsoft.Extensions.FileProviders.Abstractions (>= 10.0.5)
78+
Microsoft.Extensions.Logging.Abstractions (>= 10.0.5)
79+
Microsoft.Extensions.Logging (10.0.5)
80+
Microsoft.Extensions.DependencyInjection (>= 10.0.5)
81+
Microsoft.Extensions.Logging.Abstractions (>= 10.0.5)
82+
Microsoft.Extensions.Options (>= 10.0.5)
83+
Microsoft.Extensions.Logging.Abstractions (10.0.5)
84+
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.5)
85+
Microsoft.Extensions.Logging.Configuration (10.0.5)
86+
Microsoft.Extensions.Configuration (>= 10.0.5)
87+
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.5)
88+
Microsoft.Extensions.Configuration.Binder (>= 10.0.5)
89+
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.5)
90+
Microsoft.Extensions.Logging (>= 10.0.5)
91+
Microsoft.Extensions.Logging.Abstractions (>= 10.0.5)
92+
Microsoft.Extensions.Options (>= 10.0.5)
93+
Microsoft.Extensions.Options.ConfigurationExtensions (>= 10.0.5)
94+
Microsoft.Extensions.Options (10.0.5)
95+
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.5)
96+
Microsoft.Extensions.Primitives (>= 10.0.5)
97+
Microsoft.Extensions.Options.ConfigurationExtensions (10.0.5)
98+
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.5)
99+
Microsoft.Extensions.Configuration.Binder (>= 10.0.5)
100+
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.5)
101+
Microsoft.Extensions.Options (>= 10.0.5)
102+
Microsoft.Extensions.Primitives (>= 10.0.5)
103+
Microsoft.Extensions.Primitives (10.0.5)
104104
Mono.Cecil (0.11.6)
105105
NodaTime (3.2.2)
106106
NodaTime.Serialization.SystemTextJson (1.3)
@@ -116,23 +116,23 @@ NUGET
116116
System.Memory (>= 4.5.5)
117117
Sodium.Core (1.3.4)
118118
libsodium (>= 1.0.19)
119-
SQLitePCLRaw.bundle_e_sqlite3 (2.1.10)
120-
SQLitePCLRaw.lib.e_sqlite3 (>= 2.1.10)
121-
SQLitePCLRaw.provider.e_sqlite3 (>= 2.1.10)
119+
SQLitePCLRaw.bundle_e_sqlite3 (2.1.11)
120+
SQLitePCLRaw.lib.e_sqlite3 (>= 2.1.11)
121+
SQLitePCLRaw.provider.e_sqlite3 (>= 2.1.11)
122122
SQLitePCLRaw.core (3.0.2)
123123
System.Memory (>= 4.6.3)
124124
SQLitePCLRaw.lib.e_sqlite3 (2.1.11)
125125
SQLitePCLRaw.provider.e_sqlite3 (3.0.2)
126126
SQLitePCLRaw.core (>= 3.0.2)
127127
System.Buffers (4.6.1)
128-
System.Collections.Immutable (10.0.1)
129-
System.Diagnostics.DiagnosticSource (10.0.1)
130-
System.IO.Hashing (8.0)
128+
System.Collections.Immutable (10.0.5)
129+
System.Diagnostics.DiagnosticSource (10.0.5)
130+
System.IO.Hashing (10.0)
131131
System.Memory (4.6.3)
132132
System.Reflection.Emit (4.7)
133133
System.Reflection.Emit.Lightweight (4.7)
134-
System.Reflection.Metadata (10.0.1)
135-
System.Collections.Immutable (>= 10.0.1)
134+
System.Reflection.Metadata (10.0.5)
136135
System.Runtime.CompilerServices.Unsafe (6.1.2)
137-
System.Text.Json (8.0.5)
136+
System.Text.Json (10.0)
137+
System.Threading.Channels (10.0.5)
138138
System.Threading.Tasks.Extensions (4.6.3)

‎backend/src/BuiltinCli/BuiltinCli.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<LangVersion>8.0</LangVersion>
4+
<TargetFramework>net10.0</TargetFramework>
5+
<LangVersion>10.0</LangVersion>
66
<!-- Publishing configuration -->
77
<IsPublishable>false</IsPublishable>
88
<IsTrimmable>true</IsTrimmable>

‎backend/src/BuiltinCliHost/BuiltinCliHost.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<LangVersion>8.0</LangVersion>
4+
<TargetFramework>net10.0</TargetFramework>
5+
<LangVersion>10.0</LangVersion>
66
<!-- Publishing configuration -->
77
<IsPublishable>false</IsPublishable>
88
<IsTrimmable>true</IsTrimmable>

‎backend/src/BuiltinCloudExecution/BuiltinCloudExecution.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<LangVersion>8.0</LangVersion>
5+
<TargetFramework>net10.0</TargetFramework>
6+
<LangVersion>10.0</LangVersion>
77
<!-- Publishing configuration -->
88
<IsPublishable>false</IsPublishable>
99
<IsTrimmable>false</IsTrimmable>

‎backend/src/BuiltinDarkInternal/BuiltinDarkInternal.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<LangVersion>8.0</LangVersion>
5+
<TargetFramework>net10.0</TargetFramework>
6+
<LangVersion>10.0</LangVersion>
77
<!-- Publishing configuration -->
88
<IsPublishable>false</IsPublishable>
99
<IsTrimmable>false</IsTrimmable>

0 commit comments

Comments
 (0)