Merge branch 'main' into minio_integration

Author: aaronpowell

.github/workflows/code-coverage.yml

@@ -15,7 +15,7 @@ jobs:
           pattern: testresults-*
 
       - name: Combine coverage reports
-        uses: danielpalme/ReportGenerator-GitHub-Action@5.4.5
+        uses: danielpalme/ReportGenerator-GitHub-Action@5.4.7
         with:
           reports: "**/*.cobertura.xml"
           targetdir: "${{ github.workspace }}/report"

Directory.Build.props

@@ -38,7 +38,7 @@
   <!-- Versioning -->
   <PropertyGroup>
     <ToolkitMinorVersion>5</ToolkitMinorVersion>
-    <ToolkitPatchVersion>0</ToolkitPatchVersion>
+    <ToolkitPatchVersion>1</ToolkitPatchVersion>
     <ToolkitPreviewVersion>preview.1</ToolkitPreviewVersion>
 
     <VersionPrefix>$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)</VersionPrefix>

docs/diagnostics.md

@@ -13,3 +13,7 @@ Once a release of .NET Aspire with that API is available, the API in the .NET As
 ## CTASPIRE002
 
 Support for loading extensions into SQLite requires either a NuGet package or folder path to the library to be provided, and as a result there is some custom logic to load the extension based on the path or NuGet package. This logic will require some experimenting to figure out edge cases, so the feature for extension loading will be kept as experimental until it is proven to be stable.
+
+## CTASPIRE003
+
+The API is marked for deprecation and will be removed in a future release.

examples/dbgate/CommunityToolkit.Aspire.Hosting.DbGate.AppHost/CommunityToolkit.Aspire.Hosting.DbGate.AppHost.csproj

@@ -18,6 +18,7 @@
     <ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions\CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.csproj" IsAspireProjectResource="false" />
     <ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.Redis.Extensions\CommunityToolkit.Aspire.Hosting.Redis.Extensions.csproj" IsAspireProjectResource="false" />
     <ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.SqlServer.Extensions\CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.csproj" IsAspireProjectResource="false" />
+    <ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.MySql.Extensions\CommunityToolkit.Aspire.Hosting.MySql.Extensions.csproj" IsAspireProjectResource="false" />
   </ItemGroup>
 
 

examples/dbgate/CommunityToolkit.Aspire.Hosting.DbGate.AppHost/Program.cs

@@ -32,4 +32,14 @@
 sqlserver2.AddDatabase("db12");
 
 
+var mysql1 = builder.AddMySql("mysql1")
+    .WithDbGate(c => c.WithHostPort(8068));
+mysql1.AddDatabase("db13");
+mysql1.AddDatabase("db14");
+
+var mysql2 = builder.AddMySql("mysql2")
+    .WithDbGate();
+mysql2.AddDatabase("db15");
+mysql2.AddDatabase("db16");
+
 builder.Build().Run();

examples/mysql-ext/CommunityToolkit.Aspire.Hosting.MySql.Extensions.AppHost/Program.cs

@@ -1,7 +1,8 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
 var mysql1 = builder.AddMySql("mysql1")
-    .WithAdminer(c => c.WithHostPort(8989));
+    .WithAdminer(c => c.WithHostPort(8989))
+    .WithDbGate(c => c.WithHostPort(9999));
 mysql1.AddDatabase("db1");
 mysql1.AddDatabase("db2");
 

examples/swa/CommunityToolkit.Aspire.StaticWebApps.AppHost/CommunityToolkit.Aspire.StaticWebApps.AppHost.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)"/>
+  <Sdk Name="Aspire.AppHost.Sdk" Version="$(AspireAppHostSdkVersion)" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.NodeJS.Extensions\CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.csproj" IsAspireProjectResource="false" />
     <ProjectReference Include="..\CommunityToolkit.Aspire.StaticWebApps.ApiApp\CommunityToolkit.Aspire.StaticWebApps.ApiApp.csproj" />
     <ProjectReference Include="..\..\..\src\CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps\CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps.csproj" IsAspireProjectResource="false" />
   </ItemGroup>

examples/swa/CommunityToolkit.Aspire.StaticWebApps.AppHost/Program.cs

@@ -4,13 +4,15 @@
     .WithHttpHealthCheck("/health");
 
 var web = builder
-    .AddNpmApp("web", Path.Combine(builder.AppHostDirectory, "..", "CommunityToolkit.Aspire.StaticWebApps.WebApp"), "dev")
-    .WithHttpEndpoint(env: "PORT")
+    .AddViteApp("web", Path.Combine(builder.AppHostDirectory, "..", "CommunityToolkit.Aspire.StaticWebApps.WebApp"))
+    .WithNpmPackageInstallation()
     .WithHttpHealthCheck("/");
 
+#pragma warning disable CTASPIRE003 // Type or member is obsolete
 _ = builder
     .AddSwaEmulator("swa")
     .WithAppResource(web)
     .WithApiResource(api);
+#pragma warning restore CTASPIRE003 // Type or member is obsolete
 
 builder.Build().Run();

src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/README.md

@@ -1,5 +1,7 @@
 # CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps library
 
+**Deprecation warning**: This library is deprecated and will be removed in a future release, refer to https://github.com/CommunityToolkit/Aspire/issues/698 for more information.
+
 Provides extensions methods and resource definitions for the .NET Aspire AppHost to support running Azure Static Web Apps locally using the emulator using the [Azure Static Web App CLI](https://learn.microsoft.com/azure/static-web-apps/local-development).
 
 ## Getting Started

src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaApiEndpointAnnotation.cs

@@ -4,6 +4,11 @@ namespace Aspire.Hosting.ApplicationModel;
 /// Represents an annotation for an API endpoint in a Static Web App.
 /// </summary>
 /// <param name="resource">The resource builder for resources with endpoints.</param>
+[Obsolete(
+    message: "The SWA emulator integration is going to be removed in a future release.",
+    error: false,
+    DiagnosticId = "CTASPIRE003",
+    UrlFormat = "https://github.com/CommunityToolit/aspire/issues/698")]
 public class SwaApiEndpointAnnotation(IResourceBuilder<IResourceWithEndpoints> resource) : IResourceAnnotation
 {
     /// <summary>