Nell/eShopOnWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #960 from dotnet-architecture/v-sruspasari/dotnet8_migration

Browse Source 
Migrated to dotnet 8 and Updated packages.
This commit is contained in:
James Montemagno
2023-10-31 14:10:24 -07:00
committed by GitHub
parent 36746a52b7 e213d9959f
commit c04cc4bbd9
12 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.devcontainer/devcontainer.json
View File

@@ -2,7 +2,7 @@
// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet // README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
{ {
"name": "eShopOnWeb", "name": "eShopOnWeb",
"image": "mcr.microsoft.com/devcontainers/dotnet:0-7.0", "image": "mcr.microsoft.com/devcontainers/dotnet:0-8.0",
"customizations": { "customizations": {
// Configure properties specific to VS Code. // Configure properties specific to VS Code.

2
.github/workflows/dotnetcore.yml vendored
View File

@@ -12,7 +12,7 @@ jobs:
- name: Setup .NET - name: Setup .NET
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: '7.0.x' dotnet-version: '8.0.x'
include-prerelease: true include-prerelease: true
- name: Build with dotnet - name: Build with dotnet

2
.github/workflows/richnav.yml vendored
View File

@@ -12,7 +12,7 @@ jobs:
- name: Setup .NET Core - name: Setup .NET Core
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: 7.0.x dotnet-version: 8.0.x
- name: Build with dotnet - name: Build with dotnet
run: dotnet build ./Everything.sln --configuration Release /bl run: dotnet build ./Everything.sln --configuration Release /bl

2
.vscode/launch.json vendored
View File

@@ -10,7 +10,7 @@
"request": "launch", "request": "launch",
"preLaunchTask": "build", "preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path. // 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": [], "args": [],
"cwd": "${workspaceFolder}/src/Web", "cwd": "${workspaceFolder}/src/Web",
"stopAtEntry": false, "stopAtEntry": false,

44
Directory.Packages.props
View File

@@ -1,7 +1,11 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<AspNetVersion>8.0.0-rc.2.23480.2</AspNetVersion>
<SystemExtensionVersion>8.0.0-rc.2.23479.6</SystemExtensionVersion>
<EntityFramworkCoreVersion>8.0.0-rc.2.23480.1</EntityFramworkCoreVersion>
<VSCodeGeneratorVersion>8.0.0-rc.2.23509.1</VSCodeGeneratorVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageVersion Include="Ardalis.ApiEndpoints" Version="4.0.1" /> <PackageVersion Include="Ardalis.ApiEndpoints" Version="4.0.1" />
@@ -18,23 +22,23 @@
<PackageVersion Include="BuildBundlerMinifier" Version="3.2.449" PrivateAssets="All" /> <PackageVersion Include="BuildBundlerMinifier" Version="3.2.449" PrivateAssets="All" />
<PackageVersion Include="FluentValidation" Version="11.7.1" /> <PackageVersion Include="FluentValidation" Version="11.7.1" />
<PackageVersion Include="MediatR" Version="12.0.1" /> <PackageVersion Include="MediatR" Version="12.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.10" /> <PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="$(AspNetVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.11" /> <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.10" /> <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(AspNetVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" /> <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(AspNetVersion)" PrivateAssets="all" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.5" /> <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(AspNetVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.11" /> <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspNetVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.8" /> <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.8" /> <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(AspNetVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.5" /> <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="$(AspNetVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" /> <PackageVersion Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="7.0.11" /> <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="$(AspNetVersion)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" /> <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="$(SystemExtensionVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.6" /> <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="$(VSCodeGeneratorVersion)" />
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" /> <PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFramworkCoreVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" /> <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFramworkCoreVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.8"> <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EntityFramworkCoreVersion)">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion> </PackageVersion>
@@ -42,15 +46,15 @@
<PackageVersion Include="MinimalApi.Endpoint" Version="1.3.0" /> <PackageVersion Include="MinimalApi.Endpoint" Version="1.3.0" />
<PackageVersion Include="NSubstitute" Version="5.1.0" /> <PackageVersion Include="NSubstitute" Version="5.1.0" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.16" /> <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.16" />
<PackageVersion Include="System.Net.Http.Json" Version="7.0.1" /> <PackageVersion Include="System.Net.Http.Json" Version="$(SystemExtensionVersion)" />
<PackageVersion Include="System.Security.Claims" Version="4.3.0" /> <PackageVersion Include="System.Security.Claims" Version="4.3.0" />
<PackageVersion Include="System.Text.Json" Version="7.0.2" /> <PackageVersion Include="System.Text.Json" Version="$(SystemExtensionVersion)" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.32.3" /> <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" /> <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" /> <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" /> <PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
<!-- Test --> <!-- Test -->
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.8" /> <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" /> <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageVersion Include="xunit" Version="2.4.2" /> <PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5"> <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5">

4
README.md
View File

@@ -12,7 +12,7 @@ A list of Frequently Asked Questions about this repository can be found [here](h
## eBook ## 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: You can also read the book in online pages at the .NET docs here:
https://docs.microsoft.com/dotnet/architecture/modern-web-apps-azure/ 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. 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 > ### 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. > #### Older versions are tagged.
## Topics (eBook TOC) ## Topics (eBook TOC)

2
global.json
View File

@@ -1,6 +1,6 @@
{ {
"sdk": { "sdk": {
"version": "7.0.x", "version": "8.0.x",
"rollForward": "latestFeature" "rollForward": "latestFeature"
} }
} }

2
infra/main.bicep
View File

@@ -54,7 +54,7 @@ module web './core/host/appservice.bicep' = {
appServicePlanId: appServicePlan.outputs.id appServicePlanId: appServicePlan.outputs.id
keyVaultName: keyVault.outputs.name keyVaultName: keyVault.outputs.name
runtimeName: 'dotnetcore' runtimeName: 'dotnetcore'
runtimeVersion: '7.0' runtimeVersion: '8.0'
tags: union(tags, { 'azd-service-name': 'web' }) tags: union(tags, { 'azd-service-name': 'web' })
appSettings: { appSettings: {
AZURE_SQL_CATALOG_CONNECTION_STRING_KEY: 'AZURE-SQL-CATALOG-CONNECTION-STRING' AZURE_SQL_CATALOG_CONNECTION_STRING_KEY: 'AZURE-SQL-CATALOG-CONNECTION-STRING'

4
src/PublicApi/Dockerfile
View File

@@ -1,11 +1,11 @@
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. #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 WORKDIR /app
EXPOSE 80 EXPOSE 80
EXPOSE 443 EXPOSE 443
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /app WORKDIR /app
COPY . . COPY . .
#COPY ["src/PublicApi/PublicApi.csproj", "./PublicApi/"] #COPY ["src/PublicApi/PublicApi.csproj", "./PublicApi/"]

2
src/Web/.config/dotnet-tools.json
View File

@@ -3,7 +3,7 @@
"isRoot": true, "isRoot": true,
"tools": { "tools": {
"dotnet-ef": { "dotnet-ef": {
"version": "7.0.2", "version": "8.0.0",
"commands": [ "commands": [
"dotnet-ef" "dotnet-ef"
] ]

4
src/Web/Dockerfile
View File

@@ -7,7 +7,7 @@
# #
# RUN COMMAND # RUN COMMAND
# docker run --name eshopweb --rm -it -p 5106:5106 web # 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 WORKDIR /app
COPY *.sln . COPY *.sln .
@@ -17,7 +17,7 @@ RUN dotnet restore
RUN dotnet publish -c Release -o out 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 WORKDIR /app
COPY --from=build /app/src/Web/out ./ COPY --from=build /app/src/Web/out ./

2
src/Web/libman.json
View File

@@ -7,7 +7,7 @@
"destination": "wwwroot/lib/jquery/" "destination": "wwwroot/lib/jquery/"
}, },
{ {
"library": "twitter-bootstrap@5.2.3", "library": "twitter-bootstrap@3.4.1",
"files": [ "files": [
"css/bootstrap.css", "css/bootstrap.css",
"css/bootstrap.css.map", "css/bootstrap.css.map",