diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 00000000..5e9c06d7 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,100 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL Advanced" + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + schedule: + - cron: '36 14 * * 4' + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners (GitHub.com only) + # Consider using larger runners or machines with greater resources for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: csharp + build-mode: none + - language: javascript-typescript + build-mode: none + # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' + # Use `c-cpp` to analyze code written in C, C++ or both + # Use 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, + # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. + # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how + # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Set up .NET SDK version 9 + - name: Setup .NET SDK + uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9.0.x' + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + # If the analyze step fails for one of the languages you are analyzing with + # "We were unable to automatically build your code", modify the matrix above + # to set the build mode to "manual" for that language. Then modify this step + # to build your code. + # ℹ️ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + - if: matrix.build-mode == 'manual' + shell: bash + run: | + echo 'If you are using a "manual" build mode for one or more of the' \ + 'languages you are analyzing, replace this with the commands to build' \ + 'your code, for example:' + echo ' make bootstrap' + echo ' make release' + exit 1 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" diff --git a/.github/workflows/test-application.yml b/.github/workflows/test-application.yml index 4c6e16b8..ac876072 100644 --- a/.github/workflows/test-application.yml +++ b/.github/workflows/test-application.yml @@ -17,7 +17,7 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 8.0.x + 9.0.x - name: Start dependencies for tests (docker compose) run: | diff --git a/.github/workflows/validate-formatting.yml b/.github/workflows/validate-formatting.yml index 98e5521f..60ff8652 100644 --- a/.github/workflows/validate-formatting.yml +++ b/.github/workflows/validate-formatting.yml @@ -16,7 +16,7 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 8.0.x + 9.0.x - name: Format run: | diff --git a/Dockerfile b/Dockerfile index 2eba94d1..869f6d1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0.301-alpine3.18 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0.101-alpine3.20 AS build WORKDIR /app # Copy csproj and restore as distinct layers @@ -13,7 +13,7 @@ COPY src ./src RUN dotnet publish -c Release -o out ./src/Altinn.Broker.API/Altinn.Broker.API.csproj # Build runtime image -FROM mcr.microsoft.com/dotnet/aspnet:8.0.6-alpine3.18 AS final +FROM mcr.microsoft.com/dotnet/aspnet:9.0.0-alpine3.20 AS final WORKDIR /app EXPOSE 2525 ENV ASPNETCORE_URLS=http://+:2525 diff --git a/src/Altinn.Broker.API/Altinn.Broker.API.csproj b/src/Altinn.Broker.API/Altinn.Broker.API.csproj index 53df9664..71e055b0 100644 --- a/src/Altinn.Broker.API/Altinn.Broker.API.csproj +++ b/src/Altinn.Broker.API/Altinn.Broker.API.csproj @@ -1,30 +1,30 @@  - net8.0 + net9.0 enable enable - + - + - + - - - - - - + + + + + + - + - - + + diff --git a/src/Altinn.Broker.Application/Altinn.Broker.Application.csproj b/src/Altinn.Broker.Application/Altinn.Broker.Application.csproj index d60824c4..062cb98c 100644 --- a/src/Altinn.Broker.Application/Altinn.Broker.Application.csproj +++ b/src/Altinn.Broker.Application/Altinn.Broker.Application.csproj @@ -1,21 +1,21 @@  - net8.0 + net9.0 enable enable - - - - + + + + - + - + diff --git a/src/Altinn.Broker.Core/Altinn.Broker.Core.csproj b/src/Altinn.Broker.Core/Altinn.Broker.Core.csproj index bce9ab26..d43cb5ad 100644 --- a/src/Altinn.Broker.Core/Altinn.Broker.Core.csproj +++ b/src/Altinn.Broker.Core/Altinn.Broker.Core.csproj @@ -1,19 +1,19 @@  - net8.0 + net9.0 enable enable - - - - - - - - + + + + + + + + diff --git a/src/Altinn.Broker.Integrations/Altinn.Broker.Integrations.csproj b/src/Altinn.Broker.Integrations/Altinn.Broker.Integrations.csproj index d200915f..e9bc59b2 100644 --- a/src/Altinn.Broker.Integrations/Altinn.Broker.Integrations.csproj +++ b/src/Altinn.Broker.Integrations/Altinn.Broker.Integrations.csproj @@ -1,24 +1,24 @@  - net8.0 + net9.0 enable enable - - + + - - + + - - - - + + + + - + diff --git a/src/Altinn.Broker.Persistence/Altinn.Broker.Persistence.csproj b/src/Altinn.Broker.Persistence/Altinn.Broker.Persistence.csproj index 8b9bb5c9..c91e0ace 100644 --- a/src/Altinn.Broker.Persistence/Altinn.Broker.Persistence.csproj +++ b/src/Altinn.Broker.Persistence/Altinn.Broker.Persistence.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable @@ -15,13 +15,14 @@ - - - + + + + - - - + + + diff --git a/tests/Altinn.Broker.Tests.LargeFile/Altinn.Broker.Tests.LargeFile.csproj b/tests/Altinn.Broker.Tests.LargeFile/Altinn.Broker.Tests.LargeFile.csproj index a19827d0..2c90af3c 100644 --- a/tests/Altinn.Broker.Tests.LargeFile/Altinn.Broker.Tests.LargeFile.csproj +++ b/tests/Altinn.Broker.Tests.LargeFile/Altinn.Broker.Tests.LargeFile.csproj @@ -1,18 +1,18 @@  Exe - net8.0 + net9.0 enable enable Linux ..\.. - - + + - - + + diff --git a/tests/Altinn.Broker.Tests/Altinn.Broker.Tests.csproj b/tests/Altinn.Broker.Tests/Altinn.Broker.Tests.csproj index 9bf6fb32..a6142be8 100644 --- a/tests/Altinn.Broker.Tests/Altinn.Broker.Tests.csproj +++ b/tests/Altinn.Broker.Tests/Altinn.Broker.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable @@ -10,11 +10,11 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all