Skip to content
Open
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
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Development container for Scripture Forge.
# Based on Ubuntu 24.04 with .NET 8.0 SDK and Node.js 22.
ARG DOTNET_VERSION=8.0
# Based on Ubuntu 24.04 with .NET 10.0 SDK and Node.js 22.
ARG DOTNET_VERSION=10.0
ARG UBUNTU_NAME=noble

FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-${UBUNTU_NAME}-amd64
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This directory contains the configuration to use

## What's Included

- **Ubuntu 24.04** base image with .NET 8.0 SDK and Node.js 22
- **Ubuntu 24.04** base image with .NET 10.0 SDK and Node.js 22
- **MongoDB 8.0** running as a companion container
- System dependencies (ffmpeg, mercurial) pre-installed
- Paratext directories and configuration pre-created
Expand Down
1 change: 1 addition & 0 deletions .devcontainer/post-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
set -euo pipefail

echo "=== Restoring .NET tools ==="
sudo dotnet workload update
dotnet tool restore

echo "=== Restoring .NET packages ==="
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# Environments in which to run, such as those used in development and production, or which are candidates to
# move to.
os: ["ubuntu-24.04"]
dotnet_version: ["8.0.x"]
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
# Continue building in other environments to see which are working.
Expand All @@ -31,7 +31,7 @@ jobs:
persist-credentials: false

- name: "Deps: .NET"
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
with:
dotnet-version: ${{matrix.dotnet_version}}
cache: true
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-24.04"]
dotnet_version: ["8.0.x"]
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
fail-fast: false
Expand All @@ -146,7 +146,7 @@ jobs:
persist-credentials: false

- name: "Deps: .NET"
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
with:
dotnet-version: ${{matrix.dotnet_version}}
cache: true
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ jobs:
persist-credentials: false

- name: Initialize CodeQL
uses: github/codeql-action/init@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
with:
languages: javascript
config-file: ./.github/codeql/codeql-javascript-config.yml
dependency-caching: true

- name: Autobuild
uses: github/codeql-action/autobuild@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
uses: github/codeql-action/autobuild@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1

analyze-csharp:
name: Analyze C#
Expand All @@ -47,7 +47,7 @@ jobs:

strategy:
matrix:
dotnet_version: ["8.0.x"]
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]

Expand All @@ -58,7 +58,7 @@ jobs:
persist-credentials: false

- name: "Deps: .NET"
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
with:
dotnet-version: ${{matrix.dotnet_version}}
cache: true
Expand All @@ -85,17 +85,17 @@ jobs:
run: cd src/RealtimeServer && (npm ci || (sleep 3m && npm ci))

- name: Initialize CodeQL
uses: github/codeql-action/init@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
with:
languages: csharp
queries: security-and-quality
dependency-caching: true

- name: Autobuild
uses: github/codeql-action/autobuild@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
uses: github/codeql-action/autobuild@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
with:
upload: False
output: sarif-results
Expand All @@ -109,7 +109,7 @@ jobs:
output: sarif-results/csharp.sarif

- name: Upload SARIF
uses: github/codeql-action/upload-sarif@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
with:
sarif_file: sarif-results/csharp.sarif

Expand All @@ -128,14 +128,14 @@ jobs:
persist-credentials: false

- name: Initialize CodeQL
uses: github/codeql-action/init@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
with:
languages: python
queries: security-and-quality
dependency-caching: true

- name: Autobuild
uses: github/codeql-action/autobuild@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
uses: github/codeql-action/autobuild@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
14 changes: 7 additions & 7 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-24.04"]
dotnet_version: ["8.0.x"]
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
if: |
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-24.04"]
dotnet_version: ["8.0.x"]
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
runs-on: ${{matrix.os}}
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-24.04"]
dotnet_version: ["8.0.x"]
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
runs-on: ${{matrix.os}}
Expand Down Expand Up @@ -206,7 +206,7 @@ jobs:
src/RealtimeServer/lib
src/RealtimeServer/node_modules
- name: "Deps: .NET"
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
with:
dotnet-version: ${{matrix.dotnet_version}}
cache: true
Expand All @@ -231,7 +231,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-24.04"]
dotnet_version: ["8.0.x"]
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
runs-on: ${{matrix.os}}
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-24.04"]
dotnet_version: ["8.0.x"]
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
runs-on: ${{matrix.os}}
Expand Down Expand Up @@ -384,7 +384,7 @@ jobs:
~/.cache/ms-playwright

- name: "Deps: .NET"
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
with:
dotnet-version: ${{matrix.dotnet_version}}
cache: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-live.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
build_commit: "${{ needs.determine_build_commit.outputs.build_commit }}"
release_branch: "sf-live"

dotnet_version: "8.0.x"
dotnet_version: "10.0.x"
node_version: "22.13.0"
npm_version: "11.11.0"
# When bumping OS version, the server will need to authorize the new default rsync args.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
build_commit: ${{ needs.determine_build_commit.outputs.build_commit }}
release_branch: "sf-qa"

dotnet_version: "8.0.x"
dotnet_version: "10.0.x"
node_version: "22.13.0"
npm_version: "11.11.0"
# When bumping OS version, the server will need to authorize the new default rsync args.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
ref: ${{inputs.build_commit}}
fetch-depth: "0"
- name: "Deps: .NET"
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
with:
dotnet-version: ${{inputs.dotnet_version}}
cache: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zizmor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload SARIF file
uses: github/codeql-action/upload-sarif@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
with:
sarif_file: results.sarif
category: zizmor
10 changes: 5 additions & 5 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"type": "coreclr",
"request": "attach",
// Uncomment the following lines and adjust local path to allow breaking on ParatextData source code. Also do
// `cp ~/.nuget/packages/paratextdata/9.5.0.19/lib/netstandard2.0/ParatextData.pdb "${SF_REPO}"/src/SIL.XForge.Scripture/bin/Debug/net8.0/`
// `cp ~/.nuget/packages/paratextdata/9.5.0.24/lib/netstandard2.0/ParatextData.pdb "${SF_REPO}"/src/SIL.XForge.Scripture/bin/Debug/net10.0/`
// "justMyCode": false,
// "suppressJITOptimizations": true,
// "sourceFileMap": {
// "F:\\BuildAgent\\work\\86ab85dfab82ae21\\ParatextData": "${workspaceFolder}/../Paratext/ParatextData"
// "C:\\BuildAgent\\work\\86ab85dfab82ae21\\ParatextData": "${workspaceFolder}/../Paratext/ParatextData"
// },
// "symbolOptions": {
// "moduleFilter": {
Expand Down Expand Up @@ -107,7 +107,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "dotnet build",
"program": "${workspaceRoot}/src/SIL.XForge.Scripture/bin/Debug/net8.0/SIL.XForge.Scripture.dll",
"program": "${workspaceRoot}/src/SIL.XForge.Scripture/bin/Debug/net10.0/SIL.XForge.Scripture.dll",
"args": ["--start-ng-serve=listen", "--node-options=--inspect=9230"],
"cwd": "${workspaceRoot}/src/SIL.XForge.Scripture/",
"stopAtEntry": false,
Expand All @@ -121,7 +121,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "dotnet build",
"program": "${workspaceRoot}/src/SIL.XForge.Scripture/bin/Debug/net8.0/SIL.XForge.Scripture.dll",
"program": "${workspaceRoot}/src/SIL.XForge.Scripture/bin/Debug/net10.0/SIL.XForge.Scripture.dll",
"args": ["--start-ng-serve=yes"],
"cwd": "${workspaceRoot}/src/SIL.XForge.Scripture/",
"stopAtEntry": false,
Expand Down Expand Up @@ -178,7 +178,7 @@
"request": "launch",
"preLaunchTask": "build-migrator",
// This build target can be adjusted to a newer migration being worked on by changing the path in 'program', and in the tasks.json build-migrator 'cwd'.
"program": "${workspaceRoot}/src/Migrations/WhitespaceRestoreMigration/bin/Debug/net8.0/WhitespaceRestoreMigration.dll",
"program": "${workspaceRoot}/src/Migrations/WhitespaceRestoreMigration/bin/Debug/net10.0/WhitespaceRestoreMigration.dll",
"stopAtEntry": false,
"console": "integratedTerminal",
"args": ["read", "${workspaceRoot}/src/SIL.XForge.Scripture"],
Expand Down
4 changes: 2 additions & 2 deletions src/Help/UpdateHelp/UpdateHelp.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/Migrations/BackoutCommits/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/bin/Debug/net8.0/BackoutCommits.dll",
"program": "${workspaceFolder}/bin/Debug/net10.0/BackoutCommits.dll",
"args": [],
"cwd": "${workspaceFolder}",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
Expand Down
2 changes: 1 addition & 1 deletion src/Migrations/BackoutCommits/BackoutCommits.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>BackoutCommits</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Migrations/ServalMigration/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static async Task Main(string[] args)
string? sfAdminRequestValues = Environment.GetEnvironmentVariable("SF_PROJECT_ADMINS");
if (string.IsNullOrWhiteSpace(sfAppDir))
{
// This calculated from "web-xforge\src\Migrations\ServalMigration\bin\Debug\net8.0"
// This calculated from "web-xforge\src\Migrations\ServalMigration\bin\Debug\net10.0"
sfAppDir = Environment.GetEnvironmentVariable("SF_APP_DIR") ?? "../../../../../SIL.XForge.Scripture";
}

Expand Down
2 changes: 1 addition & 1 deletion src/Migrations/ServalMigration/ServalMigration.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Migrations/UsxFormat/Migrations.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Migrations/WhitespaceRestoreMigration/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace WhitespaceRestoreMigration;
/// "read" mode only doesn't write a migration. It does touch the local hg repo, and even temporarily disable sync on
/// projects.
///
/// Usage: cd bin/Debug/net8.0; ASPNETCORE_ENVIRONMENT=Development ./WhitespaceRestoreMigration read
/// Usage: cd bin/Debug/net10.0; ASPNETCORE_ENVIRONMENT=Development ./WhitespaceRestoreMigration read
/// ../../../../../SIL.XForge.Scripture
///
/// Usage on server: export SF_APP_DIR=/path/to/sf/app; sudo --user $(stat --format='%G' "${SF_APP_DIR}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/RealtimeServer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG ARCHITECTURE=amd64
ARG DOTNET_VERSION=8.0
ARG DOTNET_VERSION=10.0
ARG UBUNTU_NAME=noble # 24.04
ARG NODE_VERSION=22.13.0

Expand Down
2 changes: 1 addition & 1 deletion src/RealtimeServer/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"sourceMap": true,
// This long path points up from `.../bin/Debug/net8.0/...` to the RealtimeServer source code.
// This long path points up from `.../bin/Debug/net10.0/...` to the RealtimeServer source code.
"sourceRoot": "../../../../../../../../../src/RealtimeServer/common/",
"declaration": true,
"target": "es6",
Expand Down
2 changes: 1 addition & 1 deletion src/SIL.XForge.Scripture/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.

ARG ARCHITECTURE=amd64
ARG DOTNET_VERSION=8.0
ARG DOTNET_VERSION=10.0
ARG UBUNTU_NAME=noble # 24.04

FROM mcr.microsoft.com/dotnet/aspnet:$DOTNET_VERSION-$UBUNTU_NAME-$ARCHITECTURE AS base
Expand Down
Loading
Loading