Skip to content
Closed
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
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,11 @@ jobs:
root: "."
paths:
# Just enough for integration tests and deploy
- backend/Build/out/ApiServer/Release/net6.0/linux-x64/publish/
- backend/Build/out/BwdServer/Release/net6.0/linux-x64/publish/
- backend/Build/out/QueueWorker/Release/net6.0/linux-x64/publish/
- backend/Build/out/CronChecker/Release/net6.0/linux-x64/publish/
- backend/Build/out/ExecHost/Release/net6.0/linux-x64/publish/
- backend/Build/out/ApiServer/Release/net7.0/linux-x64/publish/
- backend/Build/out/BwdServer/Release/net7.0/linux-x64/publish/
- backend/Build/out/QueueWorker/Release/net7.0/linux-x64/publish/
- backend/Build/out/CronChecker/Release/net7.0/linux-x64/publish/
- backend/Build/out/ExecHost/Release/net7.0/linux-x64/publish/
- show-large-files-and-directories
- save_cache:
paths:
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
- run: ./scripts/build/_dotnet-wrapper paket restore
- run: ./scripts/build/_dotnet-wrapper publish -c Release src/Wasm/Wasm.fsproj
- run: cp -f backend/src/Wasm/static/BlazorWorker.js backend/static/
- run: rsync -a backend/Build/out/Wasm/Release/net6.0/publish/wwwroot/_framework/ backend/static/blazor/
- run: rsync -a backend/Build/out/Wasm/Release/net7.0/publish/wwwroot/_framework/ backend/static/blazor/
- assert-clean-worktree
- persist_to_workspace:
root: "."
Expand Down
12 changes: 6 additions & 6 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
"name": "Attach to ApiServer",
"type": "coreclr",
"request": "attach",
"program": "/home/dark/app/backend/Build/out/ApiServer/Debug/net6.0/linux-x64/ApiServer",
"program": "/home/dark/app/backend/Build/out/ApiServer/Debug/net7.0/linux-x64/ApiServer",
"stopAtEntry": true
},
{
"name": "ApiServer",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-apiserver",
"program": "/home/dark/app/backend/Build/out/ApiServer/Debug/net6.0/linux-x64/ApiServer",
"program": "/home/dark/app/backend/Build/out/ApiServer/Debug/net7.0/linux-x64/ApiServer",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
Expand All @@ -27,7 +27,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-bwdserver",
"program": "/home/dark/app/backend/Build/out/BwdServer/Debug/net6.0/linux-x64/BwdServer",
"program": "/home/dark/app/backend/Build/out/BwdServer/Debug/net7.0/linux-x64/BwdServer",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
Expand All @@ -38,7 +38,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-tests",
"program": "/home/dark/app/backend/Build/out/Tests/Debug/net6.0/linux-x64/Tests",
"program": "/home/dark/app/backend/Build/out/Tests/Debug/net7.0/linux-x64/Tests",
//"args": ["--filter-test-list", "HttpClient"],
"args": ["--filter-test-case", "response-string-text"],
"cwd": "${workspaceFolder}/backend",
Expand All @@ -58,7 +58,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-benchmark",
"program": "/home/dark/app/backend/Build/out/Benchmark/Debug/net6.0/linux-x64/Benchmark",
"program": "/home/dark/app/backend/Build/out/Benchmark/Debug/net7.0/linux-x64/Benchmark",
"args": ["fizzbuzz"],
"cwd": "${workspaceFolder}/backend",
"stopAtEntry": true,
Expand All @@ -78,7 +78,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-fuzztests",
"program": "/home/dark/app/backend/Build/out/FuzzTests/Debug/net6.0/linux-x64/FuzzTests",
"program": "/home/dark/app/backend/Build/out/FuzzTests/Debug/net7.0/linux-x64/FuzzTests",
"args": ["--filter-test-list", "executePure"],
"cwd": "${workspaceFolder}/backend",
"stopAtEntry": false,
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ RUN /home/dark/install-exe-file \
# (runtime-deps, runtime, and sdk), see
# https://github.com/dotnet/dotnet-docker/blob/master/src

ENV DOTNET_SDK_VERSION=6.0.300 \
ENV DOTNET_SDK_VERSION=7.0.102 \
# Skip extraction of XML docs - generally not useful within an
# image/container - helps performance
NUGET_XMLDOC_MODE=skip \
Expand All @@ -449,11 +449,11 @@ set -e
case ${TARGETARCH} in
arm64)
ARCH=arm64
CHECKSUM=67eb088ccad197a39f104af60f3e6d12ea9b17560e059c0f7c8e956005d919d00bf0f3e487b06280be63ad57aa8895f16ebc8c92107c5019c9cf47bd620ea925
CHECKSUM=a98abed737214bd61266d1a5d5096ae34537c6bef04696670d88684e9783bab6f6d45823f775648d723c4e031b1bd341f771baa6b265d2b6e5f5158213721627
;;
amd64)
ARCH=x64
CHECKSUM=52d720e90cfb889a92d605d64e6d0e90b96209e1bd7eab00dab1d567017d7a5a4ff4adbc55aff4cffcea4b1bf92bb8d351859d00d8eb65059eec5e449886c938
CHECKSUM=7667aae20a9e50d31d1fc004cdc5cb033d2682d3aa793dde28fa2869de5ac9114e8215a87447eb734e87073cfe9496c1c9b940133567f12b3a7dea31a813967f
;;
*) exit 1;;
esac
Expand Down
2 changes: 1 addition & 1 deletion backend/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"paket": {
"version": "6.2.1",
"version": "7.2.0",
"commands": ["paket"]
},
"dotnet-trace": {
Expand Down
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": "6.0.300",
"version": "7.0.102",
"rollForward": "disable"
}
}
6 changes: 3 additions & 3 deletions backend/paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version 6.2.1
version 7.2.0

source https://api.nuget.org/v3/index.json
framework: net6.0
framework: net7.0
storage: none

// Basics
Expand Down Expand Up @@ -66,4 +66,4 @@ nuget Argu = 6.1.1
group Wasm
source https://api.nuget.org/v3/index.json
// Wasm - this is in its own group to avoid a clash with OpenTelemetry
nuget Microsoft.AspNetCore.Components.WebAssembly = 6.0.1
nuget Microsoft.AspNetCore.Components.WebAssembly = 7.0.2
148 changes: 70 additions & 78 deletions backend/paket.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
STORAGE: NONE
RESTRICTION: == net6.0
RESTRICTION: == net7.0
NUGET
remote: https://api.nuget.org/v3/index.json
Argu (6.1.1)
Expand Down Expand Up @@ -833,80 +833,72 @@ NUGET
GROUP Wasm
NUGET
remote: https://api.nuget.org/v3/index.json
Microsoft.AspNetCore.Authorization (6.0.5) - restriction: >= net6.0
Microsoft.AspNetCore.Metadata (>= 6.0.5) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Logging.Abstractions (>= 6.0.1) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Options (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.AspNetCore.Components (6.0.5) - restriction: >= net6.0
Microsoft.AspNetCore.Authorization (>= 6.0.5) - restriction: >= net6.0
Microsoft.AspNetCore.Components.Analyzers (>= 6.0.5) - restriction: >= net6.0
Microsoft.AspNetCore.Components.Analyzers (6.0.5) - restriction: >= net6.0
Microsoft.AspNetCore.Components.Forms (6.0.5) - restriction: >= net6.0
Microsoft.AspNetCore.Components (>= 6.0.5) - restriction: >= net6.0
Microsoft.AspNetCore.Components.Web (6.0.5) - restriction: >= net6.0
Microsoft.AspNetCore.Components (>= 6.0.5) - restriction: >= net6.0
Microsoft.AspNetCore.Components.Forms (>= 6.0.5) - restriction: >= net6.0
Microsoft.Extensions.DependencyInjection (>= 6.0) - restriction: >= net6.0
Microsoft.JSInterop (>= 6.0.5) - restriction: >= net6.0
System.IO.Pipelines (>= 6.0.3) - restriction: >= net6.0
Microsoft.AspNetCore.Components.WebAssembly (6.0.1)
Microsoft.AspNetCore.Components.Web (>= 6.0.1) - restriction: >= net6.0
Microsoft.Extensions.Configuration.Binder (>= 6.0) - restriction: >= net6.0
Microsoft.Extensions.Configuration.Json (>= 6.0) - restriction: >= net6.0
Microsoft.Extensions.Logging (>= 6.0) - restriction: >= net6.0
Microsoft.JSInterop.WebAssembly (>= 6.0.1) - restriction: >= net6.0
Microsoft.AspNetCore.Metadata (6.0.5) - restriction: >= net6.0
Microsoft.Extensions.Configuration (6.0.1) - restriction: >= net6.0
Microsoft.Extensions.Configuration.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Primitives (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Configuration.Abstractions (6.0) - restriction: >= net6.0
Microsoft.Extensions.Primitives (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Configuration.Binder (6.0) - restriction: >= net6.0
Microsoft.Extensions.Configuration.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Configuration.FileExtensions (6.0) - restriction: >= net6.0
Microsoft.Extensions.Configuration (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Configuration.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.FileProviders.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.FileProviders.Physical (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Primitives (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Configuration.Json (6.0) - restriction: >= net6.0
Microsoft.Extensions.Configuration (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Configuration.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Configuration.FileExtensions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.FileProviders.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
System.Text.Json (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.DependencyInjection (6.0) - restriction: >= net6.0
Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.DependencyInjection.Abstractions (6.0) - restriction: >= net6.0
Microsoft.Extensions.FileProviders.Abstractions (6.0) - restriction: >= net6.0
Microsoft.Extensions.Primitives (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.FileProviders.Physical (6.0) - restriction: >= net6.0
Microsoft.Extensions.FileProviders.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.FileSystemGlobbing (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Primitives (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.FileSystemGlobbing (6.0) - restriction: >= net6.0
Microsoft.Extensions.Logging (6.0) - restriction: >= net6.0
Microsoft.Extensions.DependencyInjection (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Logging.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Options (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
System.Diagnostics.DiagnosticSource (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Logging.Abstractions (6.0.1) - restriction: >= net6.0
Microsoft.Extensions.Options (6.0) - restriction: >= net6.0
Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Primitives (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.Extensions.Primitives (6.0) - restriction: >= net6.0
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.JSInterop (6.0.5) - restriction: >= net6.0
Microsoft.JSInterop.WebAssembly (6.0.5) - restriction: >= net6.0
Microsoft.JSInterop (>= 6.0.5) - restriction: >= net6.0
System.Diagnostics.DiagnosticSource (6.0) - restriction: >= net6.0
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
System.IO.Pipelines (6.0.3) - restriction: >= net6.0
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: >= net6.0
System.Text.Encodings.Web (6.0) - restriction: >= net6.0
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
System.Text.Json (6.0.4) - restriction: >= net6.0
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
System.Text.Encodings.Web (>= 6.0) - restriction: || (>= net461) (>= netstandard2.0)
Microsoft.AspNetCore.Authorization (7.0.2) - restriction: >= net7.0
Microsoft.AspNetCore.Metadata (>= 7.0.2) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Logging.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Options (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.AspNetCore.Components (7.0.2) - restriction: >= net7.0
Microsoft.AspNetCore.Authorization (>= 7.0.2) - restriction: >= net7.0
Microsoft.AspNetCore.Components.Analyzers (>= 7.0.2) - restriction: >= net7.0
Microsoft.AspNetCore.Components.Analyzers (7.0.2) - restriction: >= net7.0
Microsoft.AspNetCore.Components.Forms (7.0.2) - restriction: >= net7.0
Microsoft.AspNetCore.Components (>= 7.0.2) - restriction: >= net7.0
Microsoft.AspNetCore.Components.Web (7.0.2) - restriction: >= net7.0
Microsoft.AspNetCore.Components (>= 7.0.2) - restriction: >= net7.0
Microsoft.AspNetCore.Components.Forms (>= 7.0.2) - restriction: >= net7.0
Microsoft.Extensions.DependencyInjection (>= 7.0) - restriction: >= net7.0
Microsoft.JSInterop (>= 7.0.2) - restriction: >= net7.0
System.IO.Pipelines (>= 7.0) - restriction: >= net7.0
Microsoft.AspNetCore.Components.WebAssembly (7.0.2)
Microsoft.AspNetCore.Components.Web (>= 7.0.2) - restriction: >= net7.0
Microsoft.Extensions.Configuration.Binder (>= 7.0.2) - restriction: >= net7.0
Microsoft.Extensions.Configuration.Json (>= 7.0) - restriction: >= net7.0
Microsoft.Extensions.Logging (>= 7.0) - restriction: >= net7.0
Microsoft.JSInterop.WebAssembly (>= 7.0.2) - restriction: >= net7.0
Microsoft.AspNetCore.Metadata (7.0.2) - restriction: >= net7.0
Microsoft.Extensions.Configuration (7.0) - restriction: >= net7.0
Microsoft.Extensions.Configuration.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Primitives (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Configuration.Abstractions (7.0) - restriction: >= net7.0
Microsoft.Extensions.Primitives (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Configuration.Binder (7.0.2) - restriction: >= net7.0
Microsoft.Extensions.Configuration.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Configuration.FileExtensions (7.0) - restriction: >= net7.0
Microsoft.Extensions.Configuration (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Configuration.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.FileProviders.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.FileProviders.Physical (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Primitives (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Configuration.Json (7.0) - restriction: >= net7.0
Microsoft.Extensions.Configuration (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Configuration.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Configuration.FileExtensions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.FileProviders.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
System.Text.Json (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.DependencyInjection (7.0) - restriction: >= net7.0
Microsoft.Extensions.DependencyInjection.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.DependencyInjection.Abstractions (7.0) - restriction: >= net7.0
Microsoft.Extensions.FileProviders.Abstractions (7.0) - restriction: >= net7.0
Microsoft.Extensions.Primitives (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.FileProviders.Physical (7.0) - restriction: >= net7.0
Microsoft.Extensions.FileProviders.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.FileSystemGlobbing (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Primitives (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.FileSystemGlobbing (7.0) - restriction: >= net7.0
Microsoft.Extensions.Logging (7.0) - restriction: >= net7.0
Microsoft.Extensions.DependencyInjection (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Logging.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Options (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Logging.Abstractions (7.0) - restriction: >= net7.0
Microsoft.Extensions.Options (7.0) - restriction: >= net7.0
Microsoft.Extensions.DependencyInjection.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Primitives (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Extensions.Primitives (7.0) - restriction: >= net7.0
Microsoft.JSInterop (7.0.2) - restriction: >= net7.0
Microsoft.JSInterop.WebAssembly (7.0.2) - restriction: >= net7.0
Microsoft.JSInterop (>= 7.0.2) - restriction: >= net7.0
System.IO.Pipelines (7.0) - restriction: >= net7.0
System.Text.Encodings.Web (7.0) - restriction: >= net7.0
System.Text.Json (7.0.1) - restriction: >= net7.0
System.Text.Encodings.Web (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
4 changes: 2 additions & 2 deletions backend/src/ApiServer/ApiServer.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>6.0</LangVersion>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>7.0</LangVersion>
<OtherFlags>--warnaserror</OtherFlags>
<!-- Publishing configuration -->
<PublishReadyToRun>true</PublishReadyToRun>
Expand Down
Loading