diff --git a/.aspire/settings.json b/.aspire/settings.json new file mode 100644 index 000000000..ba179b4ae --- /dev/null +++ b/.aspire/settings.json @@ -0,0 +1,3 @@ +{ + "appHostPath": "../src/eShop.AppHost/eShop.AppHost.csproj" +} \ No newline at end of file diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 473fe019f..7aa5749ed 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -22,7 +22,8 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4 with: - global-json-file: global.json + dotnet-version: '10.0.x' + dotnet-quality: 'preview' - uses: actions/setup-node@v4 with: node-version: lts/* @@ -31,8 +32,8 @@ jobs: - name: Install .NET HTTPS Development Certificate # if: matrix.os == 'ubuntu-latest' run: | - dotnet tool update -g linux-dev-certs - dotnet linux-dev-certs install + dotnet dev-certs https --clean + dotnet dev-certs https --trust - name: Install Playwright Browsers run: npx playwright install chromium - name: Run Playwright tests diff --git a/Directory.Packages.props b/Directory.Packages.props index 82f18f839..7977f7386 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,12 +2,12 @@ true true - 9.0.7 - 9.0.7 - 9.4.0 - 9.4.0-preview.1.25378.8 + 10.0.0-preview.7.25380.108 + 10.0.0-preview.7.25380.108 + 9.4.2 + 9.4.2-preview.1.25428.12 2.71.0 - 7.1.1 + 7.3.1 8.1.0 @@ -23,7 +23,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -34,35 +34,34 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - - + + - + - - + + @@ -71,13 +70,13 @@ - - - - - + + + + + - + @@ -86,15 +85,16 @@ - - - + + + + - + - + - + \ No newline at end of file diff --git a/global.json b/global.json index 4765dc3c3..55e0e2cf3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.200", + "version": "10.0.100-rc.1.25451.107", "rollForward": "latestFeature", "allowPrerelease": true } diff --git a/src/Basket.API/Basket.API.csproj b/src/Basket.API/Basket.API.csproj index 9864d23cc..35ae5138b 100644 --- a/src/Basket.API/Basket.API.csproj +++ b/src/Basket.API/Basket.API.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 2964ec8e-0d48-4541-b305-94cab537f867 true diff --git a/src/Catalog.API/Catalog.API.csproj b/src/Catalog.API/Catalog.API.csproj index 40c4cf416..7cfc37162 100644 --- a/src/Catalog.API/Catalog.API.csproj +++ b/src/Catalog.API/Catalog.API.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable d1b521ec-3411-4d39-98c6-8509466ed471 diff --git a/src/Catalog.API/Catalog.API.json b/src/Catalog.API/Catalog.API.json index a258df845..558048a09 100644 --- a/src/Catalog.API/Catalog.API.json +++ b/src/Catalog.API/Catalog.API.json @@ -1,5 +1,5 @@ { - "openapi": "3.0.1", + "openapi": "3.1.1", "info": { "title": "eShop - Catalog HTTP API", "description": "The Catalog Microservice HTTP API. This is a Data-Driven/CRUD microservice sample", @@ -23,7 +23,11 @@ "schema": { "type": "array", "items": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" } } @@ -81,6 +85,7 @@ "description": "The catalog item id", "required": true, "schema": { + "pattern": "^-?(?:0|[1-9]\\d*)$", "type": "integer", "format": "int32" } @@ -136,6 +141,7 @@ "description": "The id of the catalog item to delete", "required": true, "schema": { + "pattern": "^-?(?:0|[1-9]\\d*)$", "type": "integer", "format": "int32" } @@ -176,6 +182,7 @@ "description": "The catalog item id", "required": true, "schema": { + "pattern": "^-?(?:0|[1-9]\\d*)$", "type": "integer", "format": "int32" } @@ -416,7 +423,11 @@ "in": "query", "description": "Number of items to return in a single page of results", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 10 } @@ -426,7 +437,11 @@ "in": "query", "description": "The index of the page of results to return", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 0 } @@ -535,7 +550,11 @@ "in": "query", "description": "Number of items to return in a single page of results", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 10 } @@ -545,7 +564,11 @@ "in": "query", "description": "The index of the page of results to return", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 0 } @@ -609,7 +632,11 @@ "in": "query", "description": "Number of items to return in a single page of results", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 10 } @@ -619,7 +646,11 @@ "in": "query", "description": "The index of the page of results to return", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 0 } @@ -683,7 +714,11 @@ "in": "query", "description": "Number of items to return in a single page of results", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 10 } @@ -693,7 +728,11 @@ "in": "query", "description": "The index of the page of results to return", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 0 } @@ -704,7 +743,11 @@ "description": "The type of items to return", "required": true, "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" } }, @@ -714,7 +757,11 @@ "description": "The brand of items to return", "required": true, "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" } }, @@ -767,7 +814,11 @@ "in": "query", "description": "Number of items to return in a single page of results", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 10 } @@ -777,7 +828,11 @@ "in": "query", "description": "The index of the page of results to return", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 0 } @@ -788,7 +843,11 @@ "description": "The brand of items to return", "required": true, "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" } }, @@ -837,7 +896,11 @@ "type": "object", "properties": { "id": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "brand": { @@ -852,46 +915,94 @@ "type": "object", "properties": { "id": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "name": { "type": "string" }, "description": { - "type": "string" + "type": [ + "null", + "string" + ] }, "price": { - "type": "number", + "pattern": "^-?(?:0|[1-9]\\d*)(?:\\.\\d+)?$", + "type": [ + "number", + "string" + ], "format": "double" }, "pictureFileName": { - "type": "string" + "type": [ + "null", + "string" + ] }, "catalogTypeId": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "catalogType": { - "$ref": "#/components/schemas/CatalogType" + "oneOf": [ + { + "type": "null" + }, + { + "$ref": "#/components/schemas/CatalogType" + } + ] }, "catalogBrandId": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "catalogBrand": { - "$ref": "#/components/schemas/CatalogBrand" + "oneOf": [ + { + "type": "null" + }, + { + "$ref": "#/components/schemas/CatalogBrand" + } + ] }, "availableStock": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "restockThreshold": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "maxStockThreshold": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "onReorder": { @@ -906,7 +1017,11 @@ "type": "object", "properties": { "id": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "type": { @@ -924,15 +1039,27 @@ "type": "object", "properties": { "pageIndex": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "pageSize": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "count": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int64" }, "data": { @@ -947,20 +1074,37 @@ "type": "object", "properties": { "type": { - "type": "string" + "type": [ + "null", + "string" + ] }, "title": { - "type": "string" + "type": [ + "null", + "string" + ] }, "status": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "null", + "integer", + "string" + ], "format": "int32" }, "detail": { - "type": "string" + "type": [ + "null", + "string" + ] }, "instance": { - "type": "string" + "type": [ + "null", + "string" + ] } } } diff --git a/src/Catalog.API/Catalog.API_v2.json b/src/Catalog.API/Catalog.API_v2.json index 1bd5bfbd4..3750990af 100644 --- a/src/Catalog.API/Catalog.API_v2.json +++ b/src/Catalog.API/Catalog.API_v2.json @@ -1,5 +1,5 @@ { - "openapi": "3.0.1", + "openapi": "3.1.1", "info": { "title": "eShop - Catalog HTTP API", "description": "The Catalog Microservice HTTP API. This is a Data-Driven/CRUD microservice sample", @@ -23,7 +23,11 @@ "schema": { "type": "array", "items": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" } } @@ -81,6 +85,7 @@ "description": "The catalog item id", "required": true, "schema": { + "pattern": "^-?(?:0|[1-9]\\d*)$", "type": "integer", "format": "int32" } @@ -136,6 +141,7 @@ "description": "The id of the catalog item to delete", "required": true, "schema": { + "pattern": "^-?(?:0|[1-9]\\d*)$", "type": "integer", "format": "int32" } @@ -174,6 +180,7 @@ "description": "The id of the catalog item to delete", "required": true, "schema": { + "pattern": "^-?(?:0|[1-9]\\d*)$", "type": "integer", "format": "int32" } @@ -241,6 +248,7 @@ "description": "The catalog item id", "required": true, "schema": { + "pattern": "^-?(?:0|[1-9]\\d*)$", "type": "integer", "format": "int32" } @@ -481,7 +489,11 @@ "in": "query", "description": "Number of items to return in a single page of results", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 10 } @@ -491,7 +503,11 @@ "in": "query", "description": "The index of the page of results to return", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 0 } @@ -509,7 +525,11 @@ "in": "query", "description": "The type of items to return", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" } }, @@ -518,7 +538,11 @@ "in": "query", "description": "The brand of items to return", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" } }, @@ -571,7 +595,11 @@ "in": "query", "description": "Number of items to return in a single page of results", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 10 } @@ -581,7 +609,11 @@ "in": "query", "description": "The index of the page of results to return", "schema": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32", "default": 0 } @@ -641,7 +673,11 @@ "type": "object", "properties": { "id": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "brand": { @@ -656,46 +692,94 @@ "type": "object", "properties": { "id": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "name": { "type": "string" }, "description": { - "type": "string" + "type": [ + "null", + "string" + ] }, "price": { - "type": "number", + "pattern": "^-?(?:0|[1-9]\\d*)(?:\\.\\d+)?$", + "type": [ + "number", + "string" + ], "format": "double" }, "pictureFileName": { - "type": "string" + "type": [ + "null", + "string" + ] }, "catalogTypeId": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "catalogType": { - "$ref": "#/components/schemas/CatalogType" + "oneOf": [ + { + "type": "null" + }, + { + "$ref": "#/components/schemas/CatalogType" + } + ] }, "catalogBrandId": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "catalogBrand": { - "$ref": "#/components/schemas/CatalogBrand" + "oneOf": [ + { + "type": "null" + }, + { + "$ref": "#/components/schemas/CatalogBrand" + } + ] }, "availableStock": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "restockThreshold": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "maxStockThreshold": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "onReorder": { @@ -710,7 +794,11 @@ "type": "object", "properties": { "id": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "type": { @@ -728,15 +816,27 @@ "type": "object", "properties": { "pageIndex": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "pageSize": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int32" }, "count": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "integer", + "string" + ], "format": "int64" }, "data": { @@ -751,20 +851,37 @@ "type": "object", "properties": { "type": { - "type": "string" + "type": [ + "null", + "string" + ] }, "title": { - "type": "string" + "type": [ + "null", + "string" + ] }, "status": { - "type": "integer", + "pattern": "^-?(?:0|[1-9]\\d*)$", + "type": [ + "null", + "integer", + "string" + ], "format": "int32" }, "detail": { - "type": "string" + "type": [ + "null", + "string" + ] }, "instance": { - "type": "string" + "type": [ + "null", + "string" + ] } } } diff --git a/src/Catalog.API/Infrastructure/CatalogContext.cs b/src/Catalog.API/Infrastructure/CatalogContext.cs index a065e8b2b..64aad78b6 100644 --- a/src/Catalog.API/Infrastructure/CatalogContext.cs +++ b/src/Catalog.API/Infrastructure/CatalogContext.cs @@ -11,9 +11,9 @@ public CatalogContext(DbContextOptions options, IConfiguration c { } - public DbSet CatalogItems { get; set; } - public DbSet CatalogBrands { get; set; } - public DbSet CatalogTypes { get; set; } + public required DbSet CatalogItems { get; set; } + public required DbSet CatalogBrands { get; set; } + public required DbSet CatalogTypes { get; set; } protected override void OnModelCreating(ModelBuilder builder) { diff --git a/src/ClientApp/ClientApp.csproj b/src/ClientApp/ClientApp.csproj index 3a115583d..c1c133240 100644 --- a/src/ClientApp/ClientApp.csproj +++ b/src/ClientApp/ClientApp.csproj @@ -1,10 +1,10 @@ - net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0 - $(TargetFrameworks);net9.0-windows10.0.19041.0 + net10.0-android;net10.0-ios;net10.0-maccatalyst;net10.0 + $(TargetFrameworks);net10.0-windows10.0.19041.0 - + - Exe + Exe eShop.ClientApp true true @@ -39,7 +39,7 @@ 10.0.17763.0 6.5 - + false diff --git a/src/ClientApp/Converters/WebNavigatingEventArgsConverter.cs b/src/ClientApp/Converters/WebNavigatingEventArgsConverter.cs index e10fdbd4a..05b5b2cf3 100644 --- a/src/ClientApp/Converters/WebNavigatingEventArgsConverter.cs +++ b/src/ClientApp/Converters/WebNavigatingEventArgsConverter.cs @@ -1,31 +1,22 @@ using System.Globalization; -using CommunityToolkit.Maui.Converters; +using Microsoft.Maui.Controls; namespace eShop.ClientApp.Converters; -public class WebNavigatingEventArgsConverter : ICommunityToolkitValueConverter +public class WebNavigatingEventArgsConverter : IValueConverter { - public Type FromType => typeof(WebNavigatingEventArgs); - - public Type ToType => typeof(string); - - public object DefaultConvertReturnValue => string.Empty; - - public object DefaultConvertBackReturnValue => null; - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var eventArgs = value as WebNavigatingEventArgs; - if (eventArgs == null) + if (value is WebNavigatingEventArgs eventArgs) { - throw new ArgumentException("Expected WebNavigatingEventArgs as value", "value"); + return eventArgs.Url ?? string.Empty; } - return eventArgs.Url; + return string.Empty; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { - throw new NotImplementedException(); + throw new NotImplementedException("ConvertBack is not supported for WebNavigatingEventArgsConverter."); } } diff --git a/src/ClientApp/ViewModels/OrderDetailViewModel.cs b/src/ClientApp/ViewModels/OrderDetailViewModel.cs index e9e3d802c..47dd18532 100644 --- a/src/ClientApp/ViewModels/OrderDetailViewModel.cs +++ b/src/ClientApp/ViewModels/OrderDetailViewModel.cs @@ -6,8 +6,7 @@ namespace eShop.ClientApp.ViewModels; -[QueryProperty(nameof(OrderNumber), "OrderNumber")] -public partial class OrderDetailViewModel : ViewModelBase +public partial class OrderDetailViewModel : ViewModelBase, IQueryAttributable { private readonly IAppEnvironmentService _appEnvironmentService; private readonly ISettingsService _settingsService; @@ -58,4 +57,19 @@ private async Task ToggleCancelOrderAsync() IsSubmittedOrder = false; } + + public override void ApplyQueryAttributes(IDictionary query) + { + if (query.TryGetValue("OrderNumber", out var orderNumber)) + { + if (orderNumber is string orderNumberString && int.TryParse(orderNumberString, out var parsedOrderNumber)) + { + OrderNumber = parsedOrderNumber; + } + else if (orderNumber is int intOrderNumber) + { + OrderNumber = intOrderNumber; + } + } + } } diff --git a/src/EventBus/EventBus.csproj b/src/EventBus/EventBus.csproj index f7d83870d..b3a006b0d 100644 --- a/src/EventBus/EventBus.csproj +++ b/src/EventBus/EventBus.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 eShop.EventBus true diff --git a/src/EventBusRabbitMQ/EventBusRabbitMQ.csproj b/src/EventBusRabbitMQ/EventBusRabbitMQ.csproj index 3f4064e4b..959ff4487 100644 --- a/src/EventBusRabbitMQ/EventBusRabbitMQ.csproj +++ b/src/EventBusRabbitMQ/EventBusRabbitMQ.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 eShop.EventBusRabbitMQ true true diff --git a/src/EventBusRabbitMQ/RabbitMqDependencyInjectionExtensions.cs b/src/EventBusRabbitMQ/RabbitMqDependencyInjectionExtensions.cs index a1e1f9513..9590d77c1 100644 --- a/src/EventBusRabbitMQ/RabbitMqDependencyInjectionExtensions.cs +++ b/src/EventBusRabbitMQ/RabbitMqDependencyInjectionExtensions.cs @@ -1,5 +1,7 @@ using eShop.EventBusRabbitMQ; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Configuration; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.Extensions.Hosting; @@ -14,6 +16,10 @@ public static class RabbitMqDependencyInjectionExtensions private const string SectionName = "EventBus"; + [UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", + Justification = "EventBusOptions is a simple POCO with public properties that are safe for trimming.")] + [UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", + Justification = "EventBusOptions is a simple POCO with public properties that are safe for AOT.")] public static IEventBusBuilder AddRabbitMqEventBus(this IHostApplicationBuilder builder, string connectionName) { ArgumentNullException.ThrowIfNull(builder); diff --git a/src/HybridApp/Components/Routes.razor b/src/HybridApp/Components/Routes.razor index 339a6a400..561a47720 100644 --- a/src/HybridApp/Components/Routes.razor +++ b/src/HybridApp/Components/Routes.razor @@ -3,4 +3,10 @@ + + Not found + +

Sorry, there's nothing at this address.

+ + diff --git a/src/HybridApp/GlobalSuppressions.cs b/src/HybridApp/GlobalSuppressions.cs new file mode 100644 index 000000000..e28effbf0 --- /dev/null +++ b/src/HybridApp/GlobalSuppressions.cs @@ -0,0 +1,32 @@ +// Suppressions for Razor-generated routing code in MAUI Blazor apps +// +// CONTEXT: After upgrading to .NET 10, the enhanced trimming analysis now flags Razor-generated +// code for Router and LayoutView components as potentially unsafe. However, these warnings are +// false positives in the context of MAUI Blazor Hybrid apps. +// +// TECHNICAL DETAILS: +// - IL2111: Router.NotFoundPage.set and LayoutView.Layout.set use reflection for component discovery +// - IL2110: LayoutView internal fields are accessed via reflection during layout resolution +// +// SAFETY: These suppressions are safe because: +// 1. Layout components are explicitly referenced in Routes.razor and preserved by Razor compilation +// 2. MAUI Blazor hybrid apps don't use aggressive trimming that would remove referenced components +// 3. The Router and LayoutView are core Blazor components designed to work with reflection +// +// ALTERNATIVES ATTEMPTED: +// - Adding DynamicallyAccessedMembers attributes to layout components (failed) +// - Restructuring Router configuration to avoid LayoutView (failed) +// - Using direct component references instead of typeof() (failed) +// +// This is a known limitation documented in the official MAUI repository. +// Tracking issue: https://github.com/dotnet/maui/issues/22368 + +[assembly: System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage( + "Trimming", + "IL2111", + Justification = "Blazor Router and LayoutView components use safe reflection patterns that are preserved by the MAUI build process.")] + +[assembly: System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage( + "Trimming", + "IL2110", + Justification = "Blazor LayoutView internal fields are accessed via reflection in a controlled manner that's safe for MAUI hybrid apps.")] \ No newline at end of file diff --git a/src/HybridApp/HybridApp.csproj b/src/HybridApp/HybridApp.csproj index 690b49cbf..fafde034a 100644 --- a/src/HybridApp/HybridApp.csproj +++ b/src/HybridApp/HybridApp.csproj @@ -1,10 +1,10 @@  - net9.0-android;net9.0-ios;net9.0-maccatalyst - $(TargetFrameworks);net9.0-windows10.0.19041.0 + net10.0-android;net10.0-ios;net10.0-maccatalyst + $(TargetFrameworks);net10.0-windows10.0.19041.0 - + + $(SuppressedTrimAnalysisWarnings);IL2111 eShop App diff --git a/src/HybridApp/Services/CatalogJsonContext.cs b/src/HybridApp/Services/CatalogJsonContext.cs new file mode 100644 index 000000000..9e5cd4b69 --- /dev/null +++ b/src/HybridApp/Services/CatalogJsonContext.cs @@ -0,0 +1,16 @@ +using System.Text.Json.Serialization; +using eShop.WebAppComponents.Catalog; + +namespace eShop.HybridApp.Services; + +[JsonSerializable(typeof(CatalogItem))] +[JsonSerializable(typeof(CatalogResult))] +[JsonSerializable(typeof(List))] +[JsonSerializable(typeof(CatalogBrand[]))] +[JsonSerializable(typeof(CatalogItemType[]))] +[JsonSerializable(typeof(CatalogBrand))] +[JsonSerializable(typeof(CatalogItemType))] +[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)] +public partial class CatalogJsonContext : JsonSerializerContext +{ +} \ No newline at end of file diff --git a/src/HybridApp/Services/CatalogService.cs b/src/HybridApp/Services/CatalogService.cs index ed7d96c42..4e430dca1 100644 --- a/src/HybridApp/Services/CatalogService.cs +++ b/src/HybridApp/Services/CatalogService.cs @@ -13,41 +13,41 @@ public class CatalogService(HttpClient httpClient) : ICatalogService public Task GetCatalogItem(int id) { var uri = $"{remoteServiceBaseUrl}items/{id}?api-version=2.0"; - return httpClient.GetFromJsonAsync(uri); + return httpClient.GetFromJsonAsync(uri, CatalogJsonContext.Default.CatalogItem); } public async Task GetCatalogItems(int pageIndex, int pageSize, int? brand, int? type) { var uri = GetAllCatalogItemsUri(remoteServiceBaseUrl, pageIndex, pageSize, brand, type); - var result = await httpClient.GetFromJsonAsync($"{uri}&api-version=2.0"); + var result = await httpClient.GetFromJsonAsync($"{uri}&api-version=2.0", CatalogJsonContext.Default.CatalogResult); return result!; } public async Task> GetCatalogItems(IEnumerable ids) { var uri = $"{remoteServiceBaseUrl}items/by?ids={string.Join("&ids=", ids)}&api-version=2.0"; - var result = await httpClient.GetFromJsonAsync>(uri); + var result = await httpClient.GetFromJsonAsync(uri, CatalogJsonContext.Default.ListCatalogItem); return result!; } public Task GetCatalogItemsWithSemanticRelevance(int page, int take, string text) { var url = $"{remoteServiceBaseUrl}items/withsemanticrelevance?text={HttpUtility.UrlEncode(text)}&pageIndex={page}&pageSize={take}&api-version=2.0"; - var result = httpClient.GetFromJsonAsync(url); + var result = httpClient.GetFromJsonAsync(url, CatalogJsonContext.Default.CatalogResult); return result!; } public async Task> GetBrands() { var uri = $"{remoteServiceBaseUrl}catalogBrands?api-version=2.0"; - var result = await httpClient.GetFromJsonAsync(uri); + var result = await httpClient.GetFromJsonAsync(uri, CatalogJsonContext.Default.CatalogBrandArray); return result!; } public async Task> GetTypes() { var uri = $"{remoteServiceBaseUrl}catalogTypes?api-version=2.0"; - var result = await httpClient.GetFromJsonAsync(uri); + var result = await httpClient.GetFromJsonAsync(uri, CatalogJsonContext.Default.CatalogItemTypeArray); return result!; } diff --git a/src/Identity.API/Identity.API.csproj b/src/Identity.API/Identity.API.csproj index 81963e3e0..a43408dce 100644 --- a/src/Identity.API/Identity.API.csproj +++ b/src/Identity.API/Identity.API.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5 diff --git a/src/IntegrationEventLogEF/IntegrationEventLogEF.csproj b/src/IntegrationEventLogEF/IntegrationEventLogEF.csproj index a78659bf7..c66035f39 100644 --- a/src/IntegrationEventLogEF/IntegrationEventLogEF.csproj +++ b/src/IntegrationEventLogEF/IntegrationEventLogEF.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 eShop.IntegrationEventLogEF false diff --git a/src/OrderProcessor/OrderProcessor.csproj b/src/OrderProcessor/OrderProcessor.csproj index 7403c6680..5a0892a9e 100644 --- a/src/OrderProcessor/OrderProcessor.csproj +++ b/src/OrderProcessor/OrderProcessor.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 true true diff --git a/src/Ordering.API/Application/Behaviors/ValidatorBehavior.cs b/src/Ordering.API/Application/Behaviors/ValidatorBehavior.cs index 8cb1fa092..c7678cdfa 100644 --- a/src/Ordering.API/Application/Behaviors/ValidatorBehavior.cs +++ b/src/Ordering.API/Application/Behaviors/ValidatorBehavior.cs @@ -17,8 +17,10 @@ public async Task Handle(TRequest request, RequestHandlerDelegate v.Validate(request)) + var validationTasks = _validators.Select(v => v.ValidateAsync(request, cancellationToken)); + var validationResults = await Task.WhenAll(validationTasks); + + var failures = validationResults .SelectMany(result => result.Errors) .Where(error => error != null) .ToList(); diff --git a/src/Ordering.API/Extensions/Extensions.cs b/src/Ordering.API/Extensions/Extensions.cs index 74540edb0..cce11955b 100644 --- a/src/Ordering.API/Extensions/Extensions.cs +++ b/src/Ordering.API/Extensions/Extensions.cs @@ -1,4 +1,6 @@ -internal static class Extensions +using FluentValidation; + +internal static class Extensions { public static void AddApplicationServices(this IHostApplicationBuilder builder) { @@ -40,10 +42,7 @@ public static void AddApplicationServices(this IHostApplicationBuilder builder) }); // Register the command validators for the validator behavior (validators based on FluentValidation library) - services.AddSingleton, CancelOrderCommandValidator>(); - services.AddSingleton, CreateOrderCommandValidator>(); - services.AddSingleton>, IdentifiedCommandValidator>(); - services.AddSingleton, ShipOrderCommandValidator>(); + services.AddValidatorsFromAssemblyContaining(); services.AddScoped(); services.AddScoped(); diff --git a/src/Ordering.API/Ordering.API.csproj b/src/Ordering.API/Ordering.API.csproj index 1b9ac55e8..43649ebc5 100644 --- a/src/Ordering.API/Ordering.API.csproj +++ b/src/Ordering.API/Ordering.API.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 eShop.Ordering.API 7161b768-033d-41c7-bc5d-37528275e1f3 @@ -26,7 +26,8 @@ - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Ordering.Domain/Ordering.Domain.csproj b/src/Ordering.Domain/Ordering.Domain.csproj index e54e3c66d..a660eb8f9 100644 --- a/src/Ordering.Domain/Ordering.Domain.csproj +++ b/src/Ordering.Domain/Ordering.Domain.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Ordering.Infrastructure/Ordering.Infrastructure.csproj b/src/Ordering.Infrastructure/Ordering.Infrastructure.csproj index 653a3f0d7..f1cb95690 100644 --- a/src/Ordering.Infrastructure/Ordering.Infrastructure.csproj +++ b/src/Ordering.Infrastructure/Ordering.Infrastructure.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 false diff --git a/src/PaymentProcessor/PaymentProcessor.csproj b/src/PaymentProcessor/PaymentProcessor.csproj index 45e8094b5..7e7bc141d 100644 --- a/src/PaymentProcessor/PaymentProcessor.csproj +++ b/src/PaymentProcessor/PaymentProcessor.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/WebApp/WebApp.csproj b/src/WebApp/WebApp.csproj index c03dcff79..5b402aa01 100644 --- a/src/WebApp/WebApp.csproj +++ b/src/WebApp/WebApp.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 2d86f364-a439-47c5-9468-3b85a7d9a18e enable eShop.WebApp diff --git a/src/WebAppComponents/WebAppComponents.csproj b/src/WebAppComponents/WebAppComponents.csproj index 399d75272..5d3f2cb94 100644 --- a/src/WebAppComponents/WebAppComponents.csproj +++ b/src/WebAppComponents/WebAppComponents.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable eShop.WebAppComponents diff --git a/src/WebhookClient/WebhookClient.csproj b/src/WebhookClient/WebhookClient.csproj index 6aae4ae24..31e276022 100644 --- a/src/WebhookClient/WebhookClient.csproj +++ b/src/WebhookClient/WebhookClient.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable eShop.WebhookClient diff --git a/src/Webhooks.API/Webhooks.API.csproj b/src/Webhooks.API/Webhooks.API.csproj index 7bdf3e1b2..1d32dbb6e 100644 --- a/src/Webhooks.API/Webhooks.API.csproj +++ b/src/Webhooks.API/Webhooks.API.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/eShop.AppHost/eShop.AppHost.csproj b/src/eShop.AppHost/eShop.AppHost.csproj index 57f27a15c..d035dc17b 100644 --- a/src/eShop.AppHost/eShop.AppHost.csproj +++ b/src/eShop.AppHost/eShop.AppHost.csproj @@ -3,7 +3,7 @@ Exe - net9.0 + net10.0 enable false b99dbce4-17d4-41d2-858a-2b0529d60bb8 diff --git a/src/eShop.ServiceDefaults/OpenApi.Extensions.cs b/src/eShop.ServiceDefaults/OpenApi.Extensions.cs index 7a60753b8..8e939142e 100644 --- a/src/eShop.ServiceDefaults/OpenApi.Extensions.cs +++ b/src/eShop.ServiceDefaults/OpenApi.Extensions.cs @@ -68,14 +68,6 @@ public static IHostApplicationBuilder AddDefaultOpenApi( options.ApplySecuritySchemeDefinitions(); options.ApplyOperationDeprecatedStatus(); options.ApplyApiVersionDescription(); - options.ApplySchemaNullableFalse(); - // Clear out the default servers so we can fallback to - // whatever ports have been allocated for the service by Aspire - options.AddDocumentTransformer((document, context, cancellationToken) => - { - document.Servers = []; - return Task.CompletedTask; - }); }); } } diff --git a/src/eShop.ServiceDefaults/OpenApiOptionsExtensions.cs b/src/eShop.ServiceDefaults/OpenApiOptionsExtensions.cs index b2dab8e01..981fdeaf6 100644 --- a/src/eShop.ServiceDefaults/OpenApiOptionsExtensions.cs +++ b/src/eShop.ServiceDefaults/OpenApiOptionsExtensions.cs @@ -6,8 +6,8 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Primitives; -using Microsoft.OpenApi.Any; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; +using System.Text.Json.Nodes; namespace eShop.ServiceDefaults; @@ -116,19 +116,17 @@ public static OpenApiOptions ApplyAuthorizationChecks(this OpenApiOptions option return Task.CompletedTask; } + operation.Responses ??= new OpenApiResponses(); operation.Responses.TryAdd("401", new OpenApiResponse { Description = "Unauthorized" }); operation.Responses.TryAdd("403", new OpenApiResponse { Description = "Forbidden" }); - var oAuthScheme = new OpenApiSecurityScheme - { - Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "oauth2" } - }; + var oAuthScheme = new OpenApiSecuritySchemeReference("oauth2", null); operation.Security = new List { new() { - [oAuthScheme] = scopes + [oAuthScheme] = scopes.ToList() } }; @@ -153,40 +151,22 @@ public static OpenApiOptions ApplyApiVersionDescription(this OpenApiOptions opti options.AddOperationTransformer((operation, context, cancellationToken) => { // Find parameter named "api-version" and add a description to it - var apiVersionParameter = operation.Parameters.FirstOrDefault(p => p.Name == "api-version"); + var apiVersionParameter = operation.Parameters?.FirstOrDefault(p => p.Name == "api-version"); if (apiVersionParameter is not null) { apiVersionParameter.Description = "The API version, in the format 'major.minor'."; - switch (context.DocumentName) { - case "v1": - apiVersionParameter.Schema.Example = new OpenApiString("1.0"); - break; - case "v2": - apiVersionParameter.Schema.Example = new OpenApiString("2.0"); - break; - } - } - return Task.CompletedTask; - }); - return options; - } - - // This extension method adds a schema transformer that sets "nullable" to false for all optional properties. - public static OpenApiOptions ApplySchemaNullableFalse(this OpenApiOptions options) - { - options.AddSchemaTransformer((schema, context, cancellationToken) => - { - if (schema.Properties is not null) - { - foreach (var property in schema.Properties) + if (apiVersionParameter.Schema is OpenApiSchema targetSchema) { - if (schema.Required?.Contains(property.Key) != true) - { - property.Value.Nullable = false; + switch (context.DocumentName) { + case "v1": + targetSchema.Example = JsonNode.Parse("\"1.0\""); + break; + case "v2": + targetSchema.Example = JsonNode.Parse("\"2.0\""); + break; } } } - return Task.CompletedTask; }); return options; @@ -203,7 +183,7 @@ public Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransformerC } var identityUrlExternal = identitySection.GetRequiredValue("Url"); - var scopes = identitySection.GetRequiredSection("Scopes").GetChildren().ToDictionary(p => p.Key, p => p.Value); + var scopes = identitySection.GetRequiredSection("Scopes").GetChildren().ToDictionary(p => p.Key, p => p.Value ?? string.Empty); var securityScheme = new OpenApiSecurityScheme { Type = SecuritySchemeType.OAuth2, @@ -219,6 +199,7 @@ public Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransformerC } }; document.Components ??= new(); + document.Components.SecuritySchemes ??= new Dictionary(); document.Components.SecuritySchemes.Add("oauth2", securityScheme); return Task.CompletedTask; } diff --git a/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj b/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj index 64dcec048..aa4b394ae 100644 --- a/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj +++ b/src/eShop.ServiceDefaults/eShop.ServiceDefaults.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable @@ -12,6 +12,7 @@ + diff --git a/tests/Basket.UnitTests/Basket.UnitTests.csproj b/tests/Basket.UnitTests/Basket.UnitTests.csproj index ccc52080c..1d5601b84 100644 --- a/tests/Basket.UnitTests/Basket.UnitTests.csproj +++ b/tests/Basket.UnitTests/Basket.UnitTests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 false false false diff --git a/tests/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj b/tests/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj index 65a10e2ab..bfe11daf7 100644 --- a/tests/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj +++ b/tests/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 false false diff --git a/tests/ClientApp.UnitTests/ClientApp.UnitTests.csproj b/tests/ClientApp.UnitTests/ClientApp.UnitTests.csproj index acb7cd84c..b1789d8f0 100644 --- a/tests/ClientApp.UnitTests/ClientApp.UnitTests.csproj +++ b/tests/ClientApp.UnitTests/ClientApp.UnitTests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable false diff --git a/tests/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj b/tests/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj index 761f2d38e..6db0412ee 100644 --- a/tests/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj +++ b/tests/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 false false diff --git a/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs b/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs index f0e9f372b..8a66f4ceb 100644 --- a/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs +++ b/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs @@ -50,7 +50,7 @@ public async Task Handle_return_false_if_order_is_not_persisted() public void Handle_throws_exception_when_no_buyerId() { //Assert - Assert.ThrowsException(() => new Buyer(string.Empty, string.Empty)); + Assert.ThrowsExactly(() => new Buyer(string.Empty, string.Empty)); } private Buyer FakeBuyer() diff --git a/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs b/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs index bd62f684a..56a4835e8 100644 --- a/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs +++ b/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs @@ -28,7 +28,7 @@ public void Create_buyer_item_fail() var name = "fakeUser"; //Act - Assert - Assert.ThrowsException(() => new Buyer(identity, name)); + Assert.ThrowsExactly(() => new Buyer(identity, name)); } [TestMethod] @@ -84,7 +84,7 @@ public void create_payment_method_expiration_fail() var expiration = DateTime.UtcNow.AddYears(-1); //Act - Assert - Assert.ThrowsException(() => new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration)); + Assert.ThrowsExactly(() => new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration)); } [TestMethod] diff --git a/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs b/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs index c91533e2a..7cbfc2bed 100644 --- a/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs +++ b/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs @@ -39,7 +39,7 @@ public void Invalid_number_of_units() var units = -1; //Act - Assert - Assert.ThrowsException(() => new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units)); + Assert.ThrowsExactly(() => new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units)); } [TestMethod] @@ -54,7 +54,7 @@ public void Invalid_total_of_order_item_lower_than_discount_applied() var units = 1; //Act - Assert - Assert.ThrowsException(() => new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units)); + Assert.ThrowsExactly(() => new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units)); } [TestMethod] @@ -72,7 +72,7 @@ public void Invalid_discount_setting() var fakeOrderItem = new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units); //Assert - Assert.ThrowsException(() => fakeOrderItem.SetNewDiscount(-1)); + Assert.ThrowsExactly(() => fakeOrderItem.SetNewDiscount(-1)); } [TestMethod] @@ -90,7 +90,7 @@ public void Invalid_units_setting() var fakeOrderItem = new OrderItem(productId, productName, unitPrice, discount, pictureUrl, units); //Assert - Assert.ThrowsException(() => fakeOrderItem.AddUnits(-1)); + Assert.ThrowsExactly(() => fakeOrderItem.AddUnits(-1)); } [TestMethod] diff --git a/tests/Ordering.UnitTests/Ordering.UnitTests.csproj b/tests/Ordering.UnitTests/Ordering.UnitTests.csproj index a2bebdb41..ec9494e22 100644 --- a/tests/Ordering.UnitTests/Ordering.UnitTests.csproj +++ b/tests/Ordering.UnitTests/Ordering.UnitTests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 false false false