Skip to content

Update dotnet 3.1 (needed to support Apple Silicon M1) #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 5, 2021
Merged

Update dotnet 3.1 (needed to support Apple Silicon M1) #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4553484
Update dotnet 3.1
StefanScherer Feb 12, 2021
89e063d
Update TargetFramework to 3.1
StefanScherer May 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions result/dotnet/Dockerfile.1809
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder

WORKDIR /Result
COPY Result/Result.csproj .
Expand All @@ -8,7 +8,7 @@ COPY /Result .
RUN dotnet publish -c Release -o /out Result.csproj

# app image
FROM mcr.microsoft.com/dotnet/core/aspnet:2.1
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1

WORKDIR /app
ENTRYPOINT ["dotnet", "Result.dll"]
Expand Down
2 changes: 1 addition & 1 deletion result/dotnet/Result/Result.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions vote/dotnet/Dockerfile.1809
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder

WORKDIR /Vote
COPY Vote/Vote.csproj .
Expand All @@ -8,7 +8,7 @@ COPY /Vote .
RUN dotnet publish -c Release -o /out Vote.csproj

# app image
FROM mcr.microsoft.com/dotnet/core/aspnet:2.1
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1

WORKDIR /app
ENTRYPOINT ["dotnet", "Vote.dll"]
Expand Down
2 changes: 1 addition & 1 deletion vote/dotnet/Vote/Vote.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder

WORKDIR /Worker
COPY src/Worker/Worker.csproj .
Expand All @@ -8,7 +8,7 @@ COPY src/Worker/ .
RUN dotnet publish -c Release -o /out Worker.csproj

# app image
FROM mcr.microsoft.com/dotnet/core/runtime:2.1
FROM mcr.microsoft.com/dotnet/core/runtime:3.1

WORKDIR /app
ENTRYPOINT ["dotnet", "Worker.dll"]
Expand Down
4 changes: 2 additions & 2 deletions worker/dotnet/Dockerfile.1809
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder

WORKDIR /Worker
COPY Worker/Worker.csproj .
Expand All @@ -8,7 +8,7 @@ COPY /Worker .
RUN dotnet publish -c Release -o /out Worker.csproj

# app image
FROM mcr.microsoft.com/dotnet/core/runtime:2.1
FROM mcr.microsoft.com/dotnet/core/runtime:3.1

WORKDIR /app
ENTRYPOINT ["dotnet", "Worker.dll"]
Expand Down
2 changes: 1 addition & 1 deletion worker/dotnet/Worker/Worker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion worker/src/Worker/Worker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down