From 833f695370f1be5cc2ca8dd7085950bc9122ce3a Mon Sep 17 00:00:00 2001 From: Dennis Sanders Date: Fri, 31 Mar 2023 21:34:35 -0500 Subject: [PATCH 1/6] Restore intended UI formatting with twitter-bootstrap 3.4.1 --- src/Web/libman.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/libman.json b/src/Web/libman.json index d841fcf58..1343cb4dc 100644 --- a/src/Web/libman.json +++ b/src/Web/libman.json @@ -7,7 +7,7 @@ "destination": "wwwroot/lib/jquery/" }, { - "library": "twitter-bootstrap@5.2.3", + "library": "twitter-bootstrap@3.4.1", "files": [ "css/bootstrap.css", "css/bootstrap.css.map", From 8bc7fcb69d1313488df454985f4883500eef2c9b Mon Sep 17 00:00:00 2001 From: Srushti Pasari94 Date: Tue, 17 Oct 2023 15:21:43 +0530 Subject: [PATCH 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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'