From e53117b95282306723645208024e1200fc8cbf65 Mon Sep 17 00:00:00 2001 From: Eric Fleming Date: Tue, 17 Dec 2019 09:08:55 -0700 Subject: [PATCH] Updating to netcore3.1 (#338) * Updating to .NET Core 3.1 * Updating nuget packages * Updating dockerfile for 3.1 --- src/ApplicationCore/ApplicationCore.csproj | 2 +- src/Infrastructure/Infrastructure.csproj | 6 +++--- src/Web/Dockerfile | 4 ++-- src/Web/Web.csproj | 18 +++++++++--------- tests/FunctionalTests/FunctionalTests.csproj | 8 ++++---- tests/IntegrationTests/IntegrationTests.csproj | 6 +++--- tests/UnitTests/UnitTests.csproj | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ApplicationCore/ApplicationCore.csproj b/src/ApplicationCore/ApplicationCore.csproj index f92c57e..2eefde9 100644 --- a/src/ApplicationCore/ApplicationCore.csproj +++ b/src/ApplicationCore/ApplicationCore.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj index a819db4..429e97e 100644 --- a/src/Infrastructure/Infrastructure.csproj +++ b/src/Infrastructure/Infrastructure.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/Web/Dockerfile b/src/Web/Dockerfile index a243642..775328e 100644 --- a/src/Web/Dockerfile +++ b/src/Web/Dockerfile @@ -7,7 +7,7 @@ # # RUN COMMAND # docker run --name eshopweb --rm -it -p 5106:5106 web -FROM mcr.microsoft.com/dotnet/core/sdk:3.0 AS build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build WORKDIR /app COPY *.sln . @@ -17,7 +17,7 @@ RUN dotnet restore RUN dotnet publish -c Release -o out -FROM mcr.microsoft.com/dotnet/core/aspnet:3.0 AS runtime +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS runtime WORKDIR /app COPY --from=build /app/src/Web/out ./ diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj index 87f2a17..d8faabb 100644 --- a/src/Web/Web.csproj +++ b/src/Web/Web.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 Microsoft.eShopWeb.Web aspnet-Web2-1FA3F72E-E7E3-4360-9E49-1CCCD7FE85F7 latest @@ -18,17 +18,17 @@ - - - + + + - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/FunctionalTests/FunctionalTests.csproj b/tests/FunctionalTests/FunctionalTests.csproj index 478bd82..c9bc9fd 100644 --- a/tests/FunctionalTests/FunctionalTests.csproj +++ b/tests/FunctionalTests/FunctionalTests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 Microsoft.eShopWeb.FunctionalTests false @@ -13,14 +13,14 @@ - - + + all runtime; build; native; contentfiles; analyzers - + diff --git a/tests/IntegrationTests/IntegrationTests.csproj b/tests/IntegrationTests/IntegrationTests.csproj index df9a526..b8cef00 100644 --- a/tests/IntegrationTests/IntegrationTests.csproj +++ b/tests/IntegrationTests/IntegrationTests.csproj @@ -1,14 +1,14 @@  - netcoreapp3.0 + netcoreapp3.1 Microsoft.eShopWeb.IntegrationTests false - - + + diff --git a/tests/UnitTests/UnitTests.csproj b/tests/UnitTests/UnitTests.csproj index 8727af1..af7ddfb 100644 --- a/tests/UnitTests/UnitTests.csproj +++ b/tests/UnitTests/UnitTests.csproj @@ -1,14 +1,14 @@  - netcoreapp3.0 + netcoreapp3.1 Microsoft.eShopWeb.UnitTests false - +