Skip to content

Commit

Permalink
chore: upgrade dotnet to 6.0 (#102)
Browse files Browse the repository at this point in the history
* chore: upgrade dotnet to 6.0

* build: setup dotnet version for CodeQL
  • Loading branch information
AleF83 authored Feb 1, 2022
1 parent e39fea1 commit b631b7d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/OpenIdConnectServerMock.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -10,7 +10,7 @@

<ItemGroup>
<PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.21" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
</ItemGroup>
Expand Down

0 comments on commit b631b7d

Please sign in to comment.