From 72bd6bcc2d36cb98219da3e161088a037ee741e7 Mon Sep 17 00:00:00 2001 From: Lance McCarthy Date: Mon, 20 Nov 2023 17:47:41 -0500 Subject: [PATCH] [asp.net] Finish updating ASP.NET project to .NET 8 also deleted unused global.json --- src/AspNetCore/MyAspNetCoreApp.sln | 5 ----- src/AspNetCore/MyAspNetCoreApp/Dockerfile | 4 ++-- src/AspNetCore/MyAspNetCoreApp/Dockerfile_CentOS | 2 +- src/AspNetCore/global.json | 3 --- 4 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 src/AspNetCore/global.json diff --git a/src/AspNetCore/MyAspNetCoreApp.sln b/src/AspNetCore/MyAspNetCoreApp.sln index f00eb3d..83458fb 100644 --- a/src/AspNetCore/MyAspNetCoreApp.sln +++ b/src/AspNetCore/MyAspNetCoreApp.sln @@ -5,11 +5,6 @@ VisualStudioVersion = 17.2.32630.192 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyAspNetCoreApp", "MyAspNetCoreApp\MyAspNetCoreApp.csproj", "{F44DA130-BCF4-493B-AC08-D60560DA2A87}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D3C3BDAC-8C1E-4B2A-9F68-6AC02F3396F9}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/AspNetCore/MyAspNetCoreApp/Dockerfile b/src/AspNetCore/MyAspNetCoreApp/Dockerfile index c39500d..b34ead0 100644 --- a/src/AspNetCore/MyAspNetCoreApp/Dockerfile +++ b/src/AspNetCore/MyAspNetCoreApp/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app EXPOSE 80 EXPOSE 443 @@ -12,7 +12,7 @@ RUN apt-get update \ -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build # Change work directory to the subfolder with this project WORKDIR /src/MyAspNetCoreApp # Copy over the code files diff --git a/src/AspNetCore/MyAspNetCoreApp/Dockerfile_CentOS b/src/AspNetCore/MyAspNetCoreApp/Dockerfile_CentOS index 69e6489..e1e74a5 100644 --- a/src/AspNetCore/MyAspNetCoreApp/Dockerfile_CentOS +++ b/src/AspNetCore/MyAspNetCoreApp/Dockerfile_CentOS @@ -19,4 +19,4 @@ RUN yum install libgdiplus -y # Install aspnetcore runtime (if your base image does not have it already) RUN rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm -RUN yum install aspnetcore-runtime-6.0 -y \ No newline at end of file +RUN yum install aspnetcore-runtime-8.0 -y \ No newline at end of file diff --git a/src/AspNetCore/global.json b/src/AspNetCore/global.json deleted file mode 100644 index f2ac83f..0000000 --- a/src/AspNetCore/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projects": [ "src", "test" ] -} \ No newline at end of file