diff --git a/docs/data-cloud/aspire-integration.md b/docs/data-cloud/aspire-integration.md index 29d2cd952..b0bfdb4db 100644 --- a/docs/data-cloud/aspire-integration.md +++ b/docs/data-cloud/aspire-integration.md @@ -72,6 +72,12 @@ The MAUI Service Defaults project contains shared configuration that your MAUI a dotnet new maui-aspire-servicedefaults -n YourApp.MauiServiceDefaults ``` +Add the project to the solution: + +```dotnetcli +dotnet sln add YourApp.MauiServiceDefaults/YourApp.MauiServiceDefaults.csproj +``` + This project includes: - Service discovery configuration @@ -93,6 +99,12 @@ The App Host project orchestrates all your application services, including your dotnet new aspire-apphost -n YourApp.AppHost ``` +Add the project to the solution: + +```dotnetcli +dotnet sln add YourApp.AppHost/YourApp.AppHost.csproj +``` + Add references to your MAUI app and any web service projects: ```dotnetcli @@ -100,6 +112,15 @@ dotnet add YourApp.AppHost.csproj reference YourMauiApp/YourMauiApp.csproj dotnet add YourApp.AppHost.csproj reference YourWebService/YourWebService.csproj ``` +Add a reference to the Aspire hosting package for .NET MAUI: + +```dotnetcli +dotnet add package Aspire.Hosting.Maui --version 13.0.0-preview.1.25560.3 --project .\YourApp.AppHost\YourApp.AppHost.csproj +``` + +> [!NOTE] +> For now you need to use a preview version of the Aspire.Hosting.Maui package. + ### Configure the App Host In your App Host project's `Program.cs`, register your MAUI app and web services: @@ -207,7 +228,7 @@ public class WeatherApiClient public record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary) { - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); + public int TemperatureF => 32 + (int)(TemperatureC * 1.8); } ``` diff --git a/docs/index.yml b/docs/index.yml index a28de5e30..d57b28c38 100644 --- a/docs/index.yml +++ b/docs/index.yml @@ -263,7 +263,7 @@ conceptualContent: url: data-cloud/push-notifications.md itemType: tutorial - text: Integrate a .NET MAUI app into an Aspire orchestration - url: /data-cloud/aspire-integration.md + url: data-cloud/aspire-integration.md itemType: concept - text: Consume a REST-based web service url: data-cloud/rest.md diff --git a/docs/user-interface/controls/hybridwebview.md b/docs/user-interface/controls/hybridwebview.md index 19003b756..7b7b61051 100644 --- a/docs/user-interface/controls/hybridwebview.md +++ b/docs/user-interface/controls/hybridwebview.md @@ -1024,4 +1024,19 @@ Common patterns include: - Returning local files or in-memory content for offline or testing scenarios. - Redirecting to a different URI by returning a 3xx status code with an appropriate `Location` header. +### Implementation Restrictions + +* **Android** + * Android does not directly allow "intercept-and-continue" for requests. The implementation is to rather notify you that a request is about to happen and you can either replace the whole request or do nothing and let the webview do it. + * Android does not support custom schemes. +* **iOS/Mac Catalyst** + * iOS and Mac Catalyst do not allow interception of `http` and `https` requests. + +| Platform | Intercept HTTPS | Intercept Custom Schemes | Request Modification | +|---------------|------------------|---------------------------|----------------------| +| Android | ✅ | ❌ | ❌ | +| iOS | ❌ | ✅ | ❌ | +| Mac Catalyst | ❌ | ✅ | ❌ | +| Windows | ✅ | ✅ | ✅ | + ::: moniker-end