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/.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/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/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/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.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/App.razor b/reqifviewer/App.razor index 298974f..74c02b3 100644 --- a/reqifviewer/App.razor +++ b/reqifviewer/App.razor @@ -1,5 +1,5 @@