diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9dbe1fe..fc8f1dd 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -41,6 +41,16 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + - name: Setup NodeJS version + uses: actions/setup-node@v2-beta + with: + node-version: '14' + + - name: Setup dotnet version + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v1 diff --git a/src/Dockerfile b/src/Dockerfile index 73edc7f..e0532e3 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Build -FROM mcr.microsoft.com/dotnet/sdk:3.1 as source +FROM mcr.microsoft.com/dotnet/sdk:6.0 as source ARG target="Release" RUN apt-get update && apt-get install unzip @@ -19,7 +19,7 @@ RUN dotnet publish -c $target -o obj/docker/publish RUN cp -r /src/obj/docker/publish /OpenIdConnectServerMock # Stage 2: Release -FROM mcr.microsoft.com/dotnet/aspnet:3.1 as release +FROM mcr.microsoft.com/dotnet/aspnet:6.0 as release ARG target="Release" RUN if [ $target = "Debug" ]; then apt-get update && apt-get install unzip && rm -rf /var/lib/apt/lists/* && curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l /vsdbg; fi diff --git a/src/OpenIdConnectServerMock.csproj b/src/OpenIdConnectServerMock.csproj index b50116d..6bbce35 100644 --- a/src/OpenIdConnectServerMock.csproj +++ b/src/OpenIdConnectServerMock.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 @@ -10,7 +10,7 @@ - +