From df6cec2c75c72e23f8618c4c53722bdbe963b632 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Tue, 17 Sep 2024 05:51:20 +0000 Subject: [PATCH 1/3] Namespace refactor for the SWA integration --- .../Program.cs | 2 -- .../SwaApiEndpointAnnotation.cs | 4 +--- .../SwaAppEndpointAnnotation.cs | 4 +--- .../SwaAppHostingExtension.cs | 9 +-------- .../SwaResource.cs | 4 +--- .../SwaResourceOptions.cs | 7 +++++++ 6 files changed, 11 insertions(+), 19 deletions(-) create mode 100644 src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaResourceOptions.cs diff --git a/examples/swa/CommunityToolkit.Aspire.StaticWebApps.AppHost/Program.cs b/examples/swa/CommunityToolkit.Aspire.StaticWebApps.AppHost/Program.cs index ba1d723..ae59408 100644 --- a/examples/swa/CommunityToolkit.Aspire.StaticWebApps.AppHost/Program.cs +++ b/examples/swa/CommunityToolkit.Aspire.StaticWebApps.AppHost/Program.cs @@ -1,5 +1,3 @@ -using CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps; - var builder = DistributedApplication.CreateBuilder(args); var api = builder.AddProject("api"); diff --git a/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaApiEndpointAnnotation.cs b/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaApiEndpointAnnotation.cs index fd48da1..8eefbb8 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaApiEndpointAnnotation.cs +++ b/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaApiEndpointAnnotation.cs @@ -1,6 +1,4 @@ -using Aspire.Hosting.ApplicationModel; - -namespace CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps; +namespace Aspire.Hosting.ApplicationModel; public class SwaApiEndpointAnnotation(IResourceBuilder resource) : IResourceAnnotation { diff --git a/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaAppEndpointAnnotation.cs b/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaAppEndpointAnnotation.cs index 74cc2a0..0e175ff 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaAppEndpointAnnotation.cs +++ b/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaAppEndpointAnnotation.cs @@ -1,6 +1,4 @@ -using Aspire.Hosting.ApplicationModel; - -namespace CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps; +namespace Aspire.Hosting.ApplicationModel; public class SwaAppEndpointAnnotation(IResourceBuilder resource) : IResourceAnnotation { diff --git a/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaAppHostingExtension.cs b/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaAppHostingExtension.cs index 4421d25..fbab4a1 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaAppHostingExtension.cs +++ b/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaAppHostingExtension.cs @@ -1,7 +1,6 @@ -using Aspire.Hosting; using Aspire.Hosting.ApplicationModel; -namespace CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps; +namespace Aspire.Hosting; public static class SwaAppHostingExtension { @@ -71,9 +70,3 @@ public static IResourceBuilder WithAppResource(this IResourceBuilde public static IResourceBuilder WithApiResource(this IResourceBuilder builder, IResourceBuilder apiResource) => builder.WithAnnotation(new(apiResource), ResourceAnnotationMutationBehavior.Replace); } - -public class SwaResourceOptions -{ - public int Port { get; set; } = 4280; - public int DevServerTimeout { get; set; } = 60; -} \ No newline at end of file diff --git a/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaResource.cs b/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaResource.cs index d531dd9..362a185 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaResource.cs +++ b/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaResource.cs @@ -1,6 +1,4 @@ -using Aspire.Hosting.ApplicationModel; - -namespace CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps; +namespace Aspire.Hosting.ApplicationModel; public class SwaResource(string name, string workingDirectory) : ExecutableResource(name, "swa", workingDirectory) { diff --git a/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaResourceOptions.cs b/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaResourceOptions.cs new file mode 100644 index 0000000..af37052 --- /dev/null +++ b/src/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps/SwaResourceOptions.cs @@ -0,0 +1,7 @@ +namespace Aspire.Hosting; + +public class SwaResourceOptions +{ + public int Port { get; set; } = 4280; + public int DevServerTimeout { get; set; } = 60; +} \ No newline at end of file From 9d547b00e932ff5df4b30933a6eb388c118134eb Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Tue, 17 Sep 2024 05:53:31 +0000 Subject: [PATCH 2/3] Namespace refactor for the java integration --- .../java/CommunityToolkit.Aspire.Java.AppHost/Program.cs | 2 -- .../JavaAppContainerResource.cs | 5 +---- .../JavaAppContainerResourceOptions.cs | 2 +- .../JavaAppExecutableResource.cs | 5 +---- .../JavaAppExecutableResourceOptions.cs | 2 +- .../JavaAppHostingExtension.cs | 3 +-- 6 files changed, 5 insertions(+), 14 deletions(-) diff --git a/examples/java/CommunityToolkit.Aspire.Java.AppHost/Program.cs b/examples/java/CommunityToolkit.Aspire.Java.AppHost/Program.cs index 274a867..00dc5d3 100644 --- a/examples/java/CommunityToolkit.Aspire.Java.AppHost/Program.cs +++ b/examples/java/CommunityToolkit.Aspire.Java.AppHost/Program.cs @@ -1,5 +1,3 @@ -using CommunityToolkit.Aspire.Hosting.Java; - var builder = DistributedApplication.CreateBuilder(args); var apiapp = builder.AddProject("apiapp"); diff --git a/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppContainerResource.cs b/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppContainerResource.cs index 13c3790..dccc9cf 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppContainerResource.cs +++ b/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppContainerResource.cs @@ -1,7 +1,4 @@ -using Aspire.Hosting; -using Aspire.Hosting.ApplicationModel; - -namespace CommunityToolkit.Aspire.Hosting.Java; +namespace Aspire.Hosting.ApplicationModel; /// /// A resource that represents a Java application. diff --git a/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppContainerResourceOptions.cs b/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppContainerResourceOptions.cs index bd722c7..52fe3a3 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppContainerResourceOptions.cs +++ b/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppContainerResourceOptions.cs @@ -1,4 +1,4 @@ -namespace CommunityToolkit.Aspire.Hosting.Java; +namespace Aspire.Hosting.ApplicationModel; /// /// This represents the options entity for configuring a Java application running in a container. diff --git a/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppExecutableResource.cs b/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppExecutableResource.cs index b9ac382..c9726e2 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppExecutableResource.cs +++ b/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppExecutableResource.cs @@ -1,7 +1,4 @@ -using Aspire.Hosting; -using Aspire.Hosting.ApplicationModel; - -namespace CommunityToolkit.Aspire.Hosting.Java; +namespace Aspire.Hosting.ApplicationModel; /// /// A resource that represents a Java application. diff --git a/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppExecutableResourceOptions.cs b/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppExecutableResourceOptions.cs index bd1c117..17354d8 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppExecutableResourceOptions.cs +++ b/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppExecutableResourceOptions.cs @@ -1,4 +1,4 @@ -namespace CommunityToolkit.Aspire.Hosting.Java; +namespace Aspire.Hosting.ApplicationModel; /// /// This represents the options entity for configuring an executable Java application. diff --git a/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppHostingExtension.cs b/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppHostingExtension.cs index 0008859..3e8c055 100644 --- a/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppHostingExtension.cs +++ b/src/CommunityToolkit.Aspire.Hosting.Java/JavaAppHostingExtension.cs @@ -1,10 +1,9 @@ using System.Globalization; using CommunityToolkit.Aspire.Hosting.Java.Utils; -using Aspire.Hosting; using Aspire.Hosting.ApplicationModel; -namespace CommunityToolkit.Aspire.Hosting.Java; +namespace Aspire.Hosting; /// /// Provides extension methods for adding Java applications to an . From 9367190aaddc64527ffb46af3dc02322feabde9c Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Tue, 17 Sep 2024 05:56:32 +0000 Subject: [PATCH 3/3] Namespace refactor for the nodejs integration extensions --- .../Program.cs | 2 -- .../NodeJSHostingExtensions.cs | 7 ++++--- .../NodePackageInstaller.cs | 3 +-- .../PathNormalizer.cs | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/examples/nodejs-ext/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.AppHost/Program.cs b/examples/nodejs-ext/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.AppHost/Program.cs index 635a398..d63f79f 100644 --- a/examples/nodejs-ext/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.AppHost/Program.cs +++ b/examples/nodejs-ext/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.AppHost/Program.cs @@ -1,5 +1,3 @@ -using CommunityToolkit.Aspire.Hosting.NodeJS.Extensions; - var builder = DistributedApplication.CreateBuilder(args); builder.AddViteApp("vite-demo") diff --git a/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/NodeJSHostingExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/NodeJSHostingExtensions.cs index 7510320..c6efbd4 100644 --- a/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/NodeJSHostingExtensions.cs +++ b/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/NodeJSHostingExtensions.cs @@ -1,9 +1,10 @@ -using Aspire.Hosting; -using Aspire.Hosting.ApplicationModel; +using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Lifecycle; +using Aspire.Hosting.Utils; +using CommunityToolkit.Aspire.Hosting.NodeJS.Extensions; using Microsoft.Extensions.Hosting; -namespace CommunityToolkit.Aspire.Hosting.NodeJS.Extensions; +namespace Aspire.Hosting; public static class NodeJSHostingExtensions { diff --git a/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/NodePackageInstaller.cs b/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/NodePackageInstaller.cs index 5d0146c..1999646 100644 --- a/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/NodePackageInstaller.cs +++ b/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/NodePackageInstaller.cs @@ -5,14 +5,13 @@ namespace CommunityToolkit.Aspire.Hosting.NodeJS.Extensions; - /// /// Represents a Node package installer. /// /// The package manager to use. /// The logger service to use. /// The notification service to use. -class NodePackageInstaller(string packageManager, ResourceLoggerService loggerService, ResourceNotificationService notificationService) +internal class NodePackageInstaller(string packageManager, ResourceLoggerService loggerService, ResourceNotificationService notificationService) { /// /// Finds the Node.js resources using the specified package manager and installs the packages. diff --git a/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/PathNormalizer.cs b/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/PathNormalizer.cs index 9ee056d..46cab78 100644 --- a/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/PathNormalizer.cs +++ b/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/PathNormalizer.cs @@ -1,4 +1,4 @@ -namespace CommunityToolkit.Aspire.Hosting.NodeJS.Extensions; +namespace Aspire.Hosting.Utils; // Copied from https://github.com/dotnet/aspire/blob/50ca9fa670af5c70782dc75d2961956b06f1a403/src/Shared/PathNormalizer.cs internal static class PathNormalizer