From 3610f47caac9ebd42b20df7502a2e5bc0070fd53 Mon Sep 17 00:00:00 2001 From: samatstarion Date: Sun, 10 May 2026 16:34:27 +0200 Subject: [PATCH 1/4] [Update] to NET10 and update dependencies --- .github/workflows/CodeQuality.yml | 18 ++++++++++-------- .github/workflows/codeql-analysis.yml | 6 +++--- .../web-app-publish-docker-container.yml | 2 +- docker-build-attested.sh | 4 ++-- docker-build-local.sh | 4 ++-- docker-compose.yml | 2 -- reqifviewer.Tests/reqifviewer.Tests.csproj | 14 +++++++------- reqifviewer/Dockerfile | 4 ++-- reqifviewer/reqifviewer.csproj | 12 ++++++------ 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/CodeQuality.yml b/.github/workflows/CodeQuality.yml index b25d543..936c4be 100644 --- a/.github/workflows/CodeQuality.yml +++ b/.github/workflows/CodeQuality.yml @@ -10,19 +10,19 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6.0.2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5.2.0 with: distribution: 'temurin' java-version: '17' overwrite-settings: false - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5.1.0 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: install wasm-tools run: dotnet workload install wasm-tools @@ -33,15 +33,17 @@ jobs: - name: Sonarqube Begin env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + SONAR_SCANNER_OPTS: "-Xmx4096m" run: | dotnet tool install --global dotnet-sonarscanner - dotnet sonarscanner begin /k:"STARIONGROUP_reqifviewer" /o:"stariongroup" /d:sonar.token="$SONAR_TOKEN" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="./CoverageResults/coverage.opencover.xml" + dotnet tool install --global dotnet-coverage + dotnet sonarscanner begin /k:"STARIONGROUP_reqifviewer" /o:"stariongroup" /d:sonar.token="$SONAR_TOKEN" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml - name: Build - run: dotnet build --no-restore /p:ContinuousIntegrationBuild=true + run: dotnet build --no-restore --no-incremental /p:ContinuousIntegrationBuild=true - - name: Test with the dotnet CLI - run: dotnet test reqifviewer.sln --no-build --no-restore --verbosity normal /p:CollectCoverage=true /p:CoverletOutput="../CoverageResults/" /p:MergeWith="../CoverageResults/coverage.json" /p:CoverletOutputFormat=\"opencover,json\" + - name: Run Tests and Compute Coverage + run: dotnet-coverage collect "dotnet test reqifviewer.sln --no-restore --no-build --verbosity normal" -f xml -o "coverage.xml" - name: Sonarqube end env: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7734f4c..c51a1f8 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6.0.2 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. @@ -27,9 +27,9 @@ jobs: languages: csharp - name: Setup .NET Core - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5.1.0 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: install wasm-tools run: dotnet workload install wasm-tools - name: Install dependencies diff --git a/.github/workflows/web-app-publish-docker-container.yml b/.github/workflows/web-app-publish-docker-container.yml index cc58140..77a62de 100644 --- a/.github/workflows/web-app-publish-docker-container.yml +++ b/.github/workflows/web-app-publish-docker-container.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout branch - uses: actions/checkout@v4 + uses: actions/checkout@v6.0.2 - name: Login to DockerHub Registry run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin diff --git a/docker-build-attested.sh b/docker-build-attested.sh index 54d82cd..e36c48d 100644 --- a/docker-build-attested.sh +++ b/docker-build-attested.sh @@ -22,9 +22,9 @@ else docker buildx use "$BUILDER" fi -ECHO "Pull latest version of mcr.microsoft.com/dotnet/sdk:9.0" +ECHO "Pull latest version of mcr.microsoft.com/dotnet/sdk:10.0" -docker pull mcr.microsoft.com/dotnet/sdk:9.0 +docker pull mcr.microsoft.com/dotnet/sdk:10.0 echo "Building and Pushing Docker image with SBOM and provenance for version: $VERSION" diff --git a/docker-build-local.sh b/docker-build-local.sh index 2171ca5..4f99b64 100644 --- a/docker-build-local.sh +++ b/docker-build-local.sh @@ -12,9 +12,9 @@ fi VERSION="$1" -ECHO "Pull latest version of mcr.microsoft.com/dotnet/sdk:9.0" +ECHO "Pull latest version of mcr.microsoft.com/dotnet/sdk:10.0" -docker pull mcr.microsoft.com/dotnet/sdk:9.0 +docker pull mcr.microsoft.com/dotnet/sdk:10.0 echo "Building local Docker image for version: $VERSION" diff --git a/docker-compose.yml b/docker-compose.yml index 2a2710b..b6fbd90 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.8" - services: reqifviewer: image: index.docker.io/STARIONGROUP/reqifviewer:latest diff --git a/reqifviewer.Tests/reqifviewer.Tests.csproj b/reqifviewer.Tests/reqifviewer.Tests.csproj index 5c8099e..513b042 100644 --- a/reqifviewer.Tests/reqifviewer.Tests.csproj +++ b/reqifviewer.Tests/reqifviewer.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 Starion Group S.A. reqifviewer.Tests reqifviewer test project @@ -12,16 +12,16 @@ - + - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/reqifviewer/Dockerfile b/reqifviewer/Dockerfile index 2503c72..d59d62d 100644 --- a/reqifviewer/Dockerfile +++ b/reqifviewer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build COPY Nuget.Config . COPY reqifviewer reqifviewer @@ -10,7 +10,7 @@ RUN dotnet build "reqifviewer/reqifviewer.csproj" -c Release -o /app/build --no- FROM build AS publish RUN dotnet publish reqifviewer -c Release -o /app/publish -FROM mcr.microsoft.com/dotnet/aspnet:9.0.11-alpine3.23 AS final +FROM mcr.microsoft.com/dotnet/aspnet:10.0.5-alpine3.23 AS final WORKDIR /app RUN mkdir /app/logs diff --git a/reqifviewer/reqifviewer.csproj b/reqifviewer/reqifviewer.csproj index 88ad061..967233d 100644 --- a/reqifviewer/reqifviewer.csproj +++ b/reqifviewer/reqifviewer.csproj @@ -2,14 +2,14 @@ reqifviewer - 4.3.1 + 5.0.0 Web Application to inspect ReqIF files - net9.0 + net10.0 Starion Group S.A. - Copyright 2022-2025 Starion Group S.A. + Copyright 2022-2026 Starion Group S.A. Sam Gerené @@ -33,10 +33,10 @@ - - + + - + From 2040224416ec81c7e871c327d66397abaf3d052d Mon Sep 17 00:00:00 2001 From: samatstarion Date: Sun, 10 May 2026 17:07:52 +0200 Subject: [PATCH 2/4] [Fix] homepage layout after Radzen 10 upgrade --- .gitignore | 2 ++ reqifviewer/Pages/_Host.cshtml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dfcfd56..1f6312a 100644 --- a/.gitignore +++ b/.gitignore @@ -348,3 +348,5 @@ MigrationBackup/ # Ionide (cross platform F# VS Code tools) working folder .ionide/ + +/.claude/settings.local.json diff --git a/reqifviewer/Pages/_Host.cshtml b/reqifviewer/Pages/_Host.cshtml index 1810ea5..20f2e19 100644 --- a/reqifviewer/Pages/_Host.cshtml +++ b/reqifviewer/Pages/_Host.cshtml @@ -38,7 +38,9 @@ - + + + From c2a83818c9f09df4e108d58844be975e9b7eac3f Mon Sep 17 00:00:00 2001 From: samatstarion Date: Sun, 10 May 2026 17:11:44 +0200 Subject: [PATCH 3/4] [Update] Copyright to 2021-2026 --- NOTICE | 2 +- reqifviewer.Tests/Pages/Index/IndexPageTestFixture.cs | 2 +- .../SpecElementWithAttributesExtensionTestFixture.cs | 2 +- reqifviewer/App.razor | 2 +- reqifviewer/Components/AttributeDefinitionsComponent.razor | 2 +- reqifviewer/Components/AttributeValuesComponent.razor | 2 +- reqifviewer/Components/SpecObjectComponent.razor | 2 +- reqifviewer/Components/SpecObjectsComponent.razor | 2 +- reqifviewer/Components/SpecificationsComponent.razor | 2 +- reqifviewer/Navigation/NavigationManagerExtensions.cs | 2 +- .../AttributeDefinition/AttributeDefinitionDetailsPage.razor | 2 +- .../DataTypeDefinition/DataTypeDefinitionDetailsPage.razor | 2 +- .../Pages/DataTypeDefinition/DataTypeDefinitionPage.razor | 2 +- .../Pages/ExternalObjects/ExternalObjectDetailsPage.razor | 2 +- reqifviewer/Pages/ExternalObjects/ExternalObjectPage.razor | 2 +- reqifviewer/Pages/Index/AboutComponent.razor | 4 ++-- reqifviewer/Pages/Index/IndexPage.razor | 2 +- reqifviewer/Pages/ReqIF/ReqIFStatistics.razor | 2 +- reqifviewer/Pages/SpecObject/SpecObjectDetailsPage.razor | 2 +- reqifviewer/Pages/SpecObject/SpecObjectPage.razor | 2 +- reqifviewer/Pages/SpecRelation/SpecRelationDetailsPage.razor | 2 +- reqifviewer/Pages/SpecRelation/SpecRelationPage.razor | 2 +- reqifviewer/Pages/SpecType/SpecTypeDetailsPage.razor | 2 +- reqifviewer/Pages/SpecType/SpecTypePage.razor | 2 +- .../Pages/Specification/SpecificationDetailsPage.razor | 2 +- reqifviewer/Pages/Specification/SpecificationPage.razor | 2 +- reqifviewer/Program.cs | 2 +- .../ReqIFExtensions/SpecElementWithAttributesExtensions.cs | 2 +- reqifviewer/ReqIFExtensions/SpecTypeExtensions.cs | 2 +- reqifviewer/Resources/IResourceLoader.cs | 2 +- reqifviewer/Resources/ResourceLoader.cs | 2 +- reqifviewer/Resources/ascii-art.txt | 2 +- reqifviewer/Shared/MainLayout.razor | 4 ++-- reqifviewer/Shared/SideMenu.razor | 2 +- reqifviewer/Utilities/Constants.cs | 2 +- 35 files changed, 37 insertions(+), 37 deletions(-) diff --git a/NOTICE b/NOTICE index 82a4c97..dbedbf2 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ reqifviewer -Copyright 2021-2025 Starion Group S.A. +Copyright 2021-2026 Starion Group S.A. https://github.com/STARIONGROUP/reqifviewer This product includes software developed by Starion Group S.A. diff --git a/reqifviewer.Tests/Pages/Index/IndexPageTestFixture.cs b/reqifviewer.Tests/Pages/Index/IndexPageTestFixture.cs index 92b877d..82044f5 100644 --- a/reqifviewer.Tests/Pages/Index/IndexPageTestFixture.cs +++ b/reqifviewer.Tests/Pages/Index/IndexPageTestFixture.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------------------------- // // -// Copyright 2023-2025 Starion Group S.A. +// Copyright 2021-2026 Starion Group S.A. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/reqifviewer.Tests/ReqIFExtensions/SpecElementWithAttributesExtensionTestFixture.cs b/reqifviewer.Tests/ReqIFExtensions/SpecElementWithAttributesExtensionTestFixture.cs index eb5748b..5692e33 100644 --- a/reqifviewer.Tests/ReqIFExtensions/SpecElementWithAttributesExtensionTestFixture.cs +++ b/reqifviewer.Tests/ReqIFExtensions/SpecElementWithAttributesExtensionTestFixture.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------------------------- // // -// Copyright 2021-2025 Starion Group S.A. +// Copyright 2021-2026 Starion Group S.A. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/reqifviewer/App.razor b/reqifviewer/App.razor index 298974f..74c02b3 100644 --- a/reqifviewer/App.razor +++ b/reqifviewer/App.razor @@ -1,5 +1,5 @@