Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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 Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,10 @@ ENV NUGET_XMLDOC_MODE=skip \
# Enable correct mode for dotnet watch (only mode supported in a container)
DOTNET_USE_POLLING_FILE_WATCHER=true

RUN /home/dark/install-dotnet8 \
--version=8.0.303 \
--arm64-sha256=09cb6b12770febe186e36971afdbcea6e8bf5fb34b7701cd8c416f597d3b7e930d05e51ccef1985e5598291540ef2d721187904587469300bb39772317e2be5c \
--amd64-sha256=814ff07ccdfc8160c4a24adfda6c815e7feace88c59722f827a5a27041719067538754911fc15cb46978e16566fe0938695891723d182055190e876131faedda
RUN /home/dark/install-dotnet10 \
--version=10.0.102 \
--arm64-sha256=1254141153d29b5b926e0e7b0b172a25f9c096b8ed6a182f54062c5e0b41384b30e10e2bf1ebe86ed0f58f4ff762203acd83bcf23fefb59c07af45332d794700 \
--amd64-sha256=7adf40e8e5547970391cfbe474c3874c6918ce3575ac398f376c78502134e1c8a2fa3da9aca281fdaeda81671f56c851ebe9e74c5b57c5a298bd45deba63565d

# formatting
RUN dotnet tool install fantomas --version 6.2.3 -g
Expand Down
8 changes: 5 additions & 3 deletions backend/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
"isRoot": true,
"tools": {
"paket": {
"version": "9.0.2",
"version": "10.3.1",
"commands": [
"paket"
]
],
"rollForward": false
},
"dotnet-trace": {
"version": "9.0.553101",
"commands": [
"dotnet-trace"
]
],
"rollForward": false
}
}
}
2 changes: 1 addition & 1 deletion backend/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.303",
"version": "10.0.102",
"rollForward": "disable"
}
}
2 changes: 1 addition & 1 deletion backend/paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version 8.0.0

source https://api.nuget.org/v3/index.json
framework: net8.0
framework: net10.0
storage: none

// Basics
Expand Down
111 changes: 54 additions & 57 deletions backend/paket.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
STORAGE: NONE
RESTRICTION: == net8.0
RESTRICTION: == net10.0
NUGET
remote: https://api.nuget.org/v3/index.json
Expecto (10.1)
Expand Down Expand Up @@ -40,67 +40,65 @@ NUGET
Legivel (0.4.6)
FSharp.Core (>= 4.6)
libsodium (1.0.21)
Microsoft.Bcl.AsyncInterfaces (10.0.1)
Microsoft.Bcl.AsyncInterfaces (10.0.2)
Microsoft.Data.Sqlite (8.0.1)
Microsoft.Data.Sqlite.Core (>= 8.0.1)
SQLitePCLRaw.bundle_e_sqlite3 (>= 2.1.6)
Microsoft.Data.Sqlite.Core (10.0.1)
Microsoft.Data.Sqlite.Core (10.0.2)
SQLitePCLRaw.core (>= 2.1.11)
Microsoft.Extensions.Configuration (10.0.1)
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.1)
Microsoft.Extensions.Primitives (>= 10.0.1)
Microsoft.Extensions.Configuration.Abstractions (10.0.1)
Microsoft.Extensions.Primitives (>= 10.0.1)
Microsoft.Extensions.Configuration.Binder (10.0.1)
Microsoft.Extensions.Configuration (>= 10.0.1)
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.1)
Microsoft.Extensions.DependencyInjection (10.0.1)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
Microsoft.Extensions.DependencyInjection.Abstractions (10.0.1)
Microsoft.Extensions.Diagnostics.Abstractions (10.0.1)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
Microsoft.Extensions.Options (>= 10.0.1)
System.Diagnostics.DiagnosticSource (>= 10.0.1)
Microsoft.Extensions.Configuration (10.0.2)
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.2)
Microsoft.Extensions.Primitives (>= 10.0.2)
Microsoft.Extensions.Configuration.Abstractions (10.0.2)
Microsoft.Extensions.Primitives (>= 10.0.2)
Microsoft.Extensions.Configuration.Binder (10.0.2)
Microsoft.Extensions.Configuration (>= 10.0.2)
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.2)
Microsoft.Extensions.DependencyInjection (10.0.2)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.2)
Microsoft.Extensions.DependencyInjection.Abstractions (10.0.2)
Microsoft.Extensions.Diagnostics.Abstractions (10.0.2)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.2)
Microsoft.Extensions.Options (>= 10.0.2)
Microsoft.Extensions.Diagnostics.HealthChecks (8.0)
Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions (>= 8.0)
Microsoft.Extensions.Hosting.Abstractions (>= 8.0)
Microsoft.Extensions.Logging.Abstractions (>= 8.0)
Microsoft.Extensions.Options (>= 8.0)
Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions (10.0.1)
Microsoft.Extensions.FileProviders.Abstractions (10.0.1)
Microsoft.Extensions.Primitives (>= 10.0.1)
Microsoft.Extensions.Hosting.Abstractions (10.0.1)
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.1)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
Microsoft.Extensions.Diagnostics.Abstractions (>= 10.0.1)
Microsoft.Extensions.FileProviders.Abstractions (>= 10.0.1)
Microsoft.Extensions.Logging.Abstractions (>= 10.0.1)
Microsoft.Extensions.Logging (10.0.1)
Microsoft.Extensions.DependencyInjection (>= 10.0.1)
Microsoft.Extensions.Logging.Abstractions (>= 10.0.1)
Microsoft.Extensions.Options (>= 10.0.1)
Microsoft.Extensions.Logging.Abstractions (10.0.1)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
System.Diagnostics.DiagnosticSource (>= 10.0.1)
Microsoft.Extensions.Logging.Configuration (10.0.1)
Microsoft.Extensions.Configuration (>= 10.0.1)
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.1)
Microsoft.Extensions.Configuration.Binder (>= 10.0.1)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
Microsoft.Extensions.Logging (>= 10.0.1)
Microsoft.Extensions.Logging.Abstractions (>= 10.0.1)
Microsoft.Extensions.Options (>= 10.0.1)
Microsoft.Extensions.Options.ConfigurationExtensions (>= 10.0.1)
Microsoft.Extensions.Options (10.0.1)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
Microsoft.Extensions.Primitives (>= 10.0.1)
Microsoft.Extensions.Options.ConfigurationExtensions (10.0.1)
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.1)
Microsoft.Extensions.Configuration.Binder (>= 10.0.1)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.1)
Microsoft.Extensions.Options (>= 10.0.1)
Microsoft.Extensions.Primitives (>= 10.0.1)
Microsoft.Extensions.Primitives (10.0.1)
Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions (10.0.2)
Microsoft.Extensions.FileProviders.Abstractions (10.0.2)
Microsoft.Extensions.Primitives (>= 10.0.2)
Microsoft.Extensions.Hosting.Abstractions (10.0.2)
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.2)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.2)
Microsoft.Extensions.Diagnostics.Abstractions (>= 10.0.2)
Microsoft.Extensions.FileProviders.Abstractions (>= 10.0.2)
Microsoft.Extensions.Logging.Abstractions (>= 10.0.2)
Microsoft.Extensions.Logging (10.0.2)
Microsoft.Extensions.DependencyInjection (>= 10.0.2)
Microsoft.Extensions.Logging.Abstractions (>= 10.0.2)
Microsoft.Extensions.Options (>= 10.0.2)
Microsoft.Extensions.Logging.Abstractions (10.0.2)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.2)
Microsoft.Extensions.Logging.Configuration (10.0.2)
Microsoft.Extensions.Configuration (>= 10.0.2)
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.2)
Microsoft.Extensions.Configuration.Binder (>= 10.0.2)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.2)
Microsoft.Extensions.Logging (>= 10.0.2)
Microsoft.Extensions.Logging.Abstractions (>= 10.0.2)
Microsoft.Extensions.Options (>= 10.0.2)
Microsoft.Extensions.Options.ConfigurationExtensions (>= 10.0.2)
Microsoft.Extensions.Options (10.0.2)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.2)
Microsoft.Extensions.Primitives (>= 10.0.2)
Microsoft.Extensions.Options.ConfigurationExtensions (10.0.2)
Microsoft.Extensions.Configuration.Abstractions (>= 10.0.2)
Microsoft.Extensions.Configuration.Binder (>= 10.0.2)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 10.0.2)
Microsoft.Extensions.Options (>= 10.0.2)
Microsoft.Extensions.Primitives (>= 10.0.2)
Microsoft.Extensions.Primitives (10.0.2)
Mono.Cecil (0.11.6)
NodaTime (3.2.2)
NodaTime.Serialization.SystemTextJson (1.3)
Expand All @@ -125,14 +123,13 @@ NUGET
SQLitePCLRaw.provider.e_sqlite3 (3.0.2)
SQLitePCLRaw.core (>= 3.0.2)
System.Buffers (4.6.1)
System.Collections.Immutable (10.0.1)
System.Diagnostics.DiagnosticSource (10.0.1)
System.Collections.Immutable (10.0.2)
System.Diagnostics.DiagnosticSource (10.0.2)
System.IO.Hashing (8.0)
System.Memory (4.6.3)
System.Reflection.Emit (4.7)
System.Reflection.Emit.Lightweight (4.7)
System.Reflection.Metadata (10.0.1)
System.Collections.Immutable (>= 10.0.1)
System.Reflection.Metadata (10.0.2)
System.Runtime.CompilerServices.Unsafe (6.1.2)
System.Text.Json (8.0.5)
System.Threading.Tasks.Extensions (4.6.3)
2 changes: 1 addition & 1 deletion backend/src/BuiltinCli/BuiltinCli.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/BuiltinCliHost/BuiltinCliHost.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/BuiltinDarkInternal/BuiltinDarkInternal.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/BuiltinExecution/BuiltinExecution.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/BuiltinExecution/Libs/X509.fs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ let fns : List<BuiltInFn> =
(function
| _, _, _, [ DString certString ] ->
try
let cert = new X509Certificate2(UTF8.toBytes certString)
let cert = X509CertificateLoader.LoadCertificate(UTF8.toBytes certString)
// Workaround to support ECC certs
// https://www.pkisolutions.com/accessing-and-using-certificate-private-keys-in-net-framework-net-core/
let publicKey : AsymmetricAlgorithm =
Expand Down
2 changes: 1 addition & 1 deletion backend/src/BuiltinPM/BuiltinPM.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/BwdServer/BwdServer.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<PublishReadyToRun>true</PublishReadyToRun>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/Cli/Cli.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<IsTrimmable>true</IsTrimmable>
<!-- Publishing configuration -->
Expand Down
2 changes: 1 addition & 1 deletion backend/src/DvalReprDeveloper/DvalReprDeveloper.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/LibCloud/LibCloud.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/LibCloudExecution/LibCloudExecution.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- This library only exists so that we can separate LibCloudStdLib from LibCloud -->
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/LibConfig/LibConfig.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/LibDB/LibDB.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/LibExecution/LibExecution.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/LibHttpMiddleware/LibHttpMiddleware.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<IsPublishable>false</IsPublishable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/LibPackageManager/LibPackageManager.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/LibParser/LibParser.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<IsPublishable>false</IsPublishable>
<IsTrimmable>false</IsTrimmable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/LibService/LibService.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/LibTreeSitter/LibTreeSitter.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<IsPublishable>false</IsPublishable>
Expand Down
2 changes: 1 addition & 1 deletion backend/src/LocalExec/LocalExec.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<!-- Publishing configuration -->
<PublishReadyToRun>true</PublishReadyToRun>
Expand Down
Loading