Skip to content

Commit

Permalink
target framework
Browse files Browse the repository at this point in the history
  • Loading branch information
ivanpaulovich committed Nov 15, 2021
1 parent 9fc48e1 commit f55080c
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions accounts-api-seed/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build

RUN dotnet tool update --global dotnet-ef --version 5.0.1
RUN dotnet tool update --global dotnet-ef
WORKDIR /src
COPY . .
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
Expand Down
2 changes: 1 addition & 1 deletion accounts-api/src/Application/Application.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<NoWarn>$(NoWarn);CA1062;1591</NoWarn>
<Nullable>enable</Nullable>
<NullableReferenceTypes>true</NullableReferenceTypes>
Expand Down
3 changes: 2 additions & 1 deletion accounts-api/src/Domain/Domain.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>preview</LangVersion>
<NoWarn>$(NoWarn);CA1062;1591</NoWarn>
<Nullable>enable</Nullable>
<NullableReferenceTypes>true</NullableReferenceTypes>
Expand Down
2 changes: 1 addition & 1 deletion accounts-api/src/Infrastructure/Infrastructure.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<NoWarn>$(NoWarn);CA1062;1591</NoWarn>
<Nullable>enable</Nullable>
<NullableReferenceTypes>true</NullableReferenceTypes>
Expand Down
4 changes: 2 additions & 2 deletions accounts-api/src/WebApi/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine AS base
FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["src/WebApi/WebApi.csproj", "src/WebApi/"]
COPY ["src/Application/Application.csproj", "src/Application/"]
Expand Down
2 changes: 1 addition & 1 deletion accounts-api/src/WebApi/WebApi.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<NoWarn>$(NoWarn);CA1062;1591;CA1801;S1128;S1481;S1075</NoWarn>
<Nullable>enable</Nullable>
<NullableReferenceTypes>true</NullableReferenceTypes>
Expand Down
2 changes: 1 addition & 1 deletion accounts-api/test/ComponentTests/ComponentTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
<NullableReferenceTypes>true</NullableReferenceTypes>
Expand Down
2 changes: 1 addition & 1 deletion accounts-api/test/EndToEndTests/EndToEndTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
<NullableReferenceTypes>true</NullableReferenceTypes>
Expand Down
2 changes: 1 addition & 1 deletion accounts-api/test/IntegrationTests/IntegrationTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
<NullableReferenceTypes>true</NullableReferenceTypes>
Expand Down
2 changes: 1 addition & 1 deletion accounts-api/test/UnitTests/UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
<NullableReferenceTypes>true</NullableReferenceTypes>
Expand Down
4 changes: 2 additions & 2 deletions identity-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["identity-server/IdentityServer.csproj", "identity-server/"]
RUN dotnet restore "identity-server/IdentityServer.csproj"
Expand Down

0 comments on commit f55080c

Please sign in to comment.