Skip to content

Commit

Permalink
more to .net 8
Browse files Browse the repository at this point in the history
  • Loading branch information
devedse committed Nov 25, 2023
1 parent c6d3583 commit 02fe21f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/githubactionsbuilds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore DeveMazeGeneratorCore.sln
- name: Build
Expand All @@ -141,7 +141,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Publish Untrimmed
run: dotnet publish DeveMazeGeneratorCore.ConsoleApp/DeveMazeGeneratorCore.ConsoleApp.csproj -c Release -r linux-x64 -o DeveMazeGeneratorCore.ConsoleApp/bin/Release/net8.0/linux-x64/publishuntrimmed/ /p:PublishSingleFile=true /p:SelfContained=true /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Publish Trimmed
Expand All @@ -168,7 +168,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Publish Untrimmed
run: dotnet publish DeveMazeGeneratorCore.ConsoleApp/DeveMazeGeneratorCore.ConsoleApp.csproj -c Release -r win-x64 -o DeveMazeGeneratorCore.ConsoleApp/bin/Release/net8.0/win-x64/publishuntrimmed/ /p:PublishSingleFile=true /p:SelfContained=true /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}}
- name: Publish Trimmed
Expand All @@ -195,7 +195,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
Expand Down Expand Up @@ -257,7 +257,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore DeveMazeGeneratorCore.sln
- name: Build
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore DeveMazeGeneratorCore.sln
- name: Build
Expand Down Expand Up @@ -336,7 +336,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore DeveMazeGeneratorCore.sln
- name: Build
Expand Down Expand Up @@ -368,7 +368,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore DeveMazeGeneratorCore.sln
- name: Build
Expand Down Expand Up @@ -400,7 +400,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Install workload android
run: |
dotnet workload install android
Expand Down Expand Up @@ -443,7 +443,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Install workload android
run: |
dotnet workload install android
Expand Down Expand Up @@ -570,7 +570,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Install workload android
run: |
dotnet workload install android
Expand Down
4 changes: 2 additions & 2 deletions DeveMazeGeneratorCore.ConsoleApp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#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/runtime:5.0 AS base
FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
WORKDIR /app

FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY ["DeveMazeGeneratorCore.ConsoleApp/DeveMazeGeneratorCore.ConsoleApp.csproj", "DeveMazeGeneratorCore.ConsoleApp/"]
COPY ["DeveMazeGeneratorCore/DeveMazeGeneratorCore.csproj", "DeveMazeGeneratorCore/"]
Expand Down
6 changes: 3 additions & 3 deletions DeveMazeGeneratorCore.MonoGame.Blazor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#FROM mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim-amd64 AS build
#FROM mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim-amd64 AS build
##Also install dotnet 3.1
##RUN curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -Channel 3.1 -InstallDir /usr/share/dotnet
##RUN apt update && apt install libfreetype6 -y

FROM nginx:stable-alpine AS base
COPY ./DeveMazeGeneratorCore.MonoGame.Blazor/nginxconfig/nginx.conf /etc/nginx/nginx.conf
#FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
#FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/sdk:7.0 AS build
FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY ["DeveMazeGeneratorCore.MonoGame.Blazor/DeveMazeGeneratorCore.MonoGame.Blazor.csproj", "DeveMazeGeneratorCore.MonoGame.Blazor/"]
RUN dotnet restore "DeveMazeGeneratorCore.MonoGame.Blazor/DeveMazeGeneratorCore.MonoGame.Blazor.csproj"
Expand Down
4 changes: 2 additions & 2 deletions DeveMazeGeneratorCore.Web/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:7.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim-amd64 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim-amd64 AS build
WORKDIR /src
COPY ["DeveMazeGeneratorCore.Web/DeveMazeGeneratorCore.Web.csproj", "DeveMazeGeneratorCore.Web/"]
COPY ["DeveMazeGeneratorCore/DeveMazeGeneratorCore.csproj", "DeveMazeGeneratorCore/"]
Expand Down

0 comments on commit 02fe21f

Please sign in to comment.