From 8bc7fcb69d1313488df454985f4883500eef2c9b Mon Sep 17 00:00:00 2001 From: Srushti Pasari94 Date: Tue, 17 Oct 2023 15:21:43 +0530 Subject: [PATCH 1/9] Migrated to dotnet 8 and Updated packages --- Directory.Packages.props | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 831c56e21..0e441c5c9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,7 +1,7 @@ true - net7.0 + net8.0 @@ -18,23 +18,23 @@ - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -42,15 +42,15 @@ - + - - + + - + From bc0f23ffff37d88f5fc536d5bf4b8b09aff19549 Mon Sep 17 00:00:00 2001 From: Srushti <136682990+SrushtiPasari94@users.noreply.github.com> Date: Tue, 17 Oct 2023 15:30:32 +0530 Subject: [PATCH 2/9] Update dotnetcore.yml updated dotnet version to build --- .github/workflows/dotnetcore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index d5b7ee86b..3a83f9671 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -12,7 +12,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '7.0.x' + dotnet-version: '8.0.x' include-prerelease: true - name: Build with dotnet From 86fd521e9297c1ac2513e738748d79600ee9e2a6 Mon Sep 17 00:00:00 2001 From: Srushti Pasari94 Date: Fri, 20 Oct 2023 11:13:13 +0530 Subject: [PATCH 3/9] Central version file updated --- Directory.Packages.props | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 0e441c5c9..0676723ed 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,6 +2,10 @@ true net8.0 + 8.0.0-rc.2.23480.2 + 8.0.0-rc.2.23479.6 + 8.0.0-rc.2.23480.1 + 8.0.0-rc.2.23509.1 @@ -18,23 +22,23 @@ - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -42,15 +46,15 @@ - + - + - + From b6b514675ba8f27558f75ca89cdeac24bf4f91e6 Mon Sep 17 00:00:00 2001 From: Srushti Pasari94 Date: Mon, 30 Oct 2023 13:02:11 +0530 Subject: [PATCH 4/9] updated docker file, launch settings, globaljson version to net 8 --- .devcontainer/devcontainer.json | 6 +++--- .github/workflows/richnav.yml | 2 +- .vscode/launch.json | 2 +- README.md | 4 ++-- global.json | 2 +- src/PublicApi/Dockerfile | 4 ++-- src/Web/.config/dotnet-tools.json | 2 +- src/Web/Dockerfile | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2f003b0fa..256b8dabe 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,10 +2,10 @@ // README at: https://github.com/devcontainers/templates/tree/main/src/dotnet { "name": "eShopOnWeb", - "image": "mcr.microsoft.com/devcontainers/dotnet:0-7.0", - + "image": "mcr.microsoft.com/devcontainers/dotnet:0-8.0", + "customizations": { - // Configure properties specific to VS Code. + // Configure properties specific to VS Code. "vscode": { // Add the IDs of extensions you want installed when the container is created. "extensions": [ diff --git a/.github/workflows/richnav.yml b/.github/workflows/richnav.yml index d83d19f91..1202a15a9 100644 --- a/.github/workflows/richnav.yml +++ b/.github/workflows/richnav.yml @@ -12,7 +12,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Build with dotnet run: dotnet build ./Everything.sln --configuration Release /bl diff --git a/.vscode/launch.json b/.vscode/launch.json index d6ed320f6..378eecf6f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/src/Web/bin/Debug/net7.0/Web.dll", + "program": "${workspaceFolder}/src/Web/bin/Debug/net8.0/Web.dll", "args": [], "cwd": "${workspaceFolder}/src/Web", "stopAtEntry": false, diff --git a/README.md b/README.md index 156b14fbf..18ef67357 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ A list of Frequently Asked Questions about this repository can be found [here](h ## eBook -This reference application is meant to support the free .PDF download ebook: [Architecting Modern Web Applications with ASP.NET Core and Azure](https://aka.ms/webappebook), updated to **ASP.NET Core 7.0**. [Also available in ePub/mobi formats](https://dotnet.microsoft.com/learn/web/aspnet-architecture). +This reference application is meant to support the free .PDF download ebook: [Architecting Modern Web Applications with ASP.NET Core and Azure](https://aka.ms/webappebook), updated to **ASP.NET Core 8.0**. [Also available in ePub/mobi formats](https://dotnet.microsoft.com/learn/web/aspnet-architecture). You can also read the book in online pages at the .NET docs here: https://docs.microsoft.com/dotnet/architecture/modern-web-apps-azure/ @@ -24,7 +24,7 @@ The **eShopOnWeb** sample is related to the [eShopOnContainers](https://github.c The goal for this sample is to demonstrate some of the principles and patterns described in the [eBook](https://aka.ms/webappebook). It is not meant to be an eCommerce reference application, and as such it does not implement many features that would be obvious and/or essential to a real eCommerce application. > ### VERSIONS -> #### The `main` branch is currently running ASP.NET Core 7.0. +> #### The `main` branch is currently running ASP.NET Core 8.0. > #### Older versions are tagged. ## Topics (eBook TOC) diff --git a/global.json b/global.json index 8ec4b2b50..7d33bfd5e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.x", + "version": "8.0.x", "rollForward": "latestFeature" } } diff --git a/src/PublicApi/Dockerfile b/src/PublicApi/Dockerfile index 885a1551e..51e741098 100644 --- a/src/PublicApi/Dockerfile +++ b/src/PublicApi/Dockerfile @@ -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 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /app COPY . . #COPY ["src/PublicApi/PublicApi.csproj", "./PublicApi/"] diff --git a/src/Web/.config/dotnet-tools.json b/src/Web/.config/dotnet-tools.json index f331fe591..e3cadb92f 100644 --- a/src/Web/.config/dotnet-tools.json +++ b/src/Web/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "dotnet-ef": { - "version": "7.0.2", + "version": "8.0.0", "commands": [ "dotnet-ef" ] diff --git a/src/Web/Dockerfile b/src/Web/Dockerfile index 9a5e23d96..a26821003 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/sdk:7.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 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/aspnet:7.0 AS runtime +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime WORKDIR /app COPY --from=build /app/src/Web/out ./ From e213d9959f540b0531116431989cb9b9460fb7a9 Mon Sep 17 00:00:00 2001 From: Srushti Pasari94 Date: Tue, 31 Oct 2023 14:00:30 +0530 Subject: [PATCH 5/9] updated main bicep --- infra/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/main.bicep b/infra/main.bicep index f1187e74a..ffad01120 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -54,7 +54,7 @@ module web './core/host/appservice.bicep' = { appServicePlanId: appServicePlan.outputs.id keyVaultName: keyVault.outputs.name runtimeName: 'dotnetcore' - runtimeVersion: '7.0' + runtimeVersion: '8.0' tags: union(tags, { 'azd-service-name': 'web' }) appSettings: { AZURE_SQL_CATALOG_CONNECTION_STRING_KEY: 'AZURE-SQL-CATALOG-CONNECTION-STRING' From 45f59f8ccf405143ec1cbba08ae69836d1a5e572 Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Mon, 4 Dec 2023 09:06:18 -0800 Subject: [PATCH 6/9] Update Directory.Packages.props --- Directory.Packages.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 0676723ed..18955481c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,10 +2,10 @@ true net8.0 - 8.0.0-rc.2.23480.2 - 8.0.0-rc.2.23479.6 - 8.0.0-rc.2.23480.1 - 8.0.0-rc.2.23509.1 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 @@ -69,4 +69,4 @@ - \ No newline at end of file + From 7f359787135d01bccbbd2fed8a1e2eb2b801cfc1 Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Mon, 11 Dec 2023 17:50:07 -0800 Subject: [PATCH 7/9] update to 8080 --- docker-compose.override.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index dad72a571..96ccfcc1c 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -3,18 +3,18 @@ services: eshopwebmvc: environment: - ASPNETCORE_ENVIRONMENT=Docker - - ASPNETCORE_URLS=http://+:80 + - ASPNETCORE_URLS=http://+:8080 ports: - - "5106:80" + - "5106:8080" volumes: - ~/.aspnet/https:/root/.aspnet/https:ro - ~/.microsoft/usersecrets:/root/.microsoft/usersecrets:ro eshoppublicapi: environment: - ASPNETCORE_ENVIRONMENT=Docker - - ASPNETCORE_URLS=http://+:80 + - ASPNETCORE_URLS=http://+:8080 ports: - - "5200:80" + - "5200:8080" volumes: - ~/.aspnet/https:/root/.aspnet/https:ro - ~/.microsoft/usersecrets:/root/.microsoft/usersecrets:ro \ No newline at end of file From 39a04d9fba3846dd454db77f954c35349955d97b Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Mon, 11 Dec 2023 17:57:46 -0800 Subject: [PATCH 8/9] Update devcontainer.json --- .devcontainer/devcontainer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 256b8dabe..740b0fcb0 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -10,6 +10,7 @@ // Add the IDs of extensions you want installed when the container is created. "extensions": [ "ms-dotnettools.csharp", + "ms-dotnettools.csdevkit", "formulahendry.dotnet-test-explorer", "ms-vscode.vscode-node-azure-pack", "ms-kubernetes-tools.vscode-kubernetes-tools", From 2bd115930ba99a34907106bedc2d7528c76fac8b Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Mon, 11 Dec 2023 18:05:05 -0800 Subject: [PATCH 9/9] add readme to sln --- Everything.sln | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/Everything.sln b/Everything.sln index 037da0d4a..fb13a7c1d 100644 --- a/Everything.sln +++ b/Everything.sln @@ -5,36 +5,38 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8FF16BDB-352E-42A2-A25F-0B5BC3A17FD7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationCore", "src\ApplicationCore\ApplicationCore.csproj", "{1A5759FF-9990-4CF5-AD78-528452C5EFCC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationCore", "src\ApplicationCore\ApplicationCore.csproj", "{1A5759FF-9990-4CF5-AD78-528452C5EFCC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorAdmin", "src\BlazorAdmin\BlazorAdmin.csproj", "{7D7D0B73-4153-4E9B-BBD1-C9D7C8AEE970}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorAdmin", "src\BlazorAdmin\BlazorAdmin.csproj", "{7D7D0B73-4153-4E9B-BBD1-C9D7C8AEE970}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorShared", "src\BlazorShared\BlazorShared.csproj", "{6FD75683-D186-4BE3-ABD0-2324650B46B5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorShared", "src\BlazorShared\BlazorShared.csproj", "{6FD75683-D186-4BE3-ABD0-2324650B46B5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Infrastructure", "src\Infrastructure\Infrastructure.csproj", "{35457566-83CE-44FC-A650-265CC9C544DC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infrastructure", "src\Infrastructure\Infrastructure.csproj", "{35457566-83CE-44FC-A650-265CC9C544DC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PublicApi", "src\PublicApi\PublicApi.csproj", "{7F226129-E8B0-4274-87A7-347AA4F7D374}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PublicApi", "src\PublicApi\PublicApi.csproj", "{7F226129-E8B0-4274-87A7-347AA4F7D374}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "src\Web\Web.csproj", "{7559FA9E-7CFC-4615-8D09-3CDEFC765455}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web", "src\Web\Web.csproj", "{7559FA9E-7CFC-4615-8D09-3CDEFC765455}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BAA5312D-B54C-42D6-A3B9-504DD12F8250}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FunctionalTests", "tests\FunctionalTests\FunctionalTests.csproj", "{020545FF-D985-4274-9FDB-FD8B9B32D2ED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "tests\FunctionalTests\FunctionalTests.csproj", "{020545FF-D985-4274-9FDB-FD8B9B32D2ED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests", "tests\IntegrationTests\IntegrationTests.csproj", "{D6829485-DD9C-42CE-BEDE-4EB0E81021AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "tests\IntegrationTests\IntegrationTests.csproj", "{D6829485-DD9C-42CE-BEDE-4EB0E81021AC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PublicApiIntegrationTests", "tests\PublicApiIntegrationTests\PublicApiIntegrationTests.csproj", "{698594AE-78D3-429F-B5CC-3A6F6BCE397A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PublicApiIntegrationTests", "tests\PublicApiIntegrationTests\PublicApiIntegrationTests.csproj", "{698594AE-78D3-429F-B5CC-3A6F6BCE397A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "tests\UnitTests\UnitTests.csproj", "{EAD6CF0B-2979-462C-BBB9-AF723B1EB570}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "tests\UnitTests\UnitTests.csproj", "{EAD6CF0B-2979-462C-BBB9-AF723B1EB570}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7EFE7D65-5C2D-4D83-B034-D06B2D37564E}" + ProjectSection(SolutionItems) = preProject + README.md = README.md + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1A5759FF-9990-4CF5-AD78-528452C5EFCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1A5759FF-9990-4CF5-AD78-528452C5EFCC}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -77,6 +79,9 @@ Global {EAD6CF0B-2979-462C-BBB9-AF723B1EB570}.Release|Any CPU.ActiveCfg = Release|Any CPU {EAD6CF0B-2979-462C-BBB9-AF723B1EB570}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection GlobalSection(NestedProjects) = preSolution {1A5759FF-9990-4CF5-AD78-528452C5EFCC} = {8FF16BDB-352E-42A2-A25F-0B5BC3A17FD7} {7D7D0B73-4153-4E9B-BBD1-C9D7C8AEE970} = {8FF16BDB-352E-42A2-A25F-0B5BC3A17FD7}