net 6

ssrdio · Mar 2, 2023 · 9974f77 · 9974f77
1 parent bb7e6fd
commit 9974f77
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/dockerimage/Dockerfile b/dockerimage/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS securebank
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS securebank
 WORKDIR /app
 
 COPY src/SecureBank/SecureBank.csproj ./
@@ -8,7 +8,7 @@ COPY src/SecureBank/ ./
 
 RUN dotnet publish --output /app/out --configuration Release --runtime linux-x64 -p:EnvironmentName=Production;
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS storeapi
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS storeapi
 WORKDIR /app
 
 COPY src/StoreAPI/StoreAPI.csproj ./

diff --git a/src/SecureBank/Dockerfile b/src/SecureBank/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
 WORKDIR /app
 
 COPY SecureBank.csproj ./
@@ -9,7 +9,7 @@ COPY . ./
 ARG build=Release
 RUN dotnet publish --output /app/out --configuration ${build} -p:EnvironmentName=Production;
 
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS runtime
 WORKDIR /app
 COPY --from=build-env /app/out ./
 

diff --git a/src/SecureBank/SecureBank.csproj b/src/SecureBank/SecureBank.csproj
@@ -19,9 +19,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.12" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
     <PackageReference Include="Standard.CommonUtils" Version="0.0.1.7" />

diff --git a/src/SecureBank/Startup.cs b/src/SecureBank/Startup.cs
@@ -225,7 +225,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.GenerateCtfdExport($"{AppContext.BaseDirectory}/Ctf");
             }
 
-            if (Configuration["SeedingSettings:Seed"].ToLower() == "true")
+            if (Configuration["SeedingSettings:Seed"]?.ToLower() == "true")
             {
                 if (!string.IsNullOrEmpty(Configuration["SeedingSettings:UserPassword"]))
                 {

diff --git a/src/StoreAPI/Dockerfile b/src/StoreAPI/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
 WORKDIR /app
 
 COPY StoreAPI.csproj ./
@@ -9,7 +9,7 @@ COPY . ./
 ARG build=Debug
 RUN dotnet publish --output /app/out --configuration ${build} -p:EnvironmentName=Production;
 
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS runtime
 WORKDIR /app
 COPY --from=build-env /app/out ./