Merge pull request #25 from CommunityToolkit/namespace-fix

namespace fix
CommunityToolkit · Sep 17, 2024 · db67da9 · db67da9
2 parents ebe006d + 9367190
commit db67da9
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 41 deletions.
diff --git 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<Projects.CommunityToolkit_Aspire_Java_ApiApp>("apiapp");

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
@@ -1,5 +1,3 @@
-using CommunityToolkit.Aspire.Hosting.NodeJS.Extensions;
-
 var builder = DistributedApplication.CreateBuilder(args);
 
 builder.AddViteApp("vite-demo")

diff --git 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<Projects.CommunityToolkit_Aspire_StaticWebApps_ApiApp>("api");

diff --git 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<IResourceWithEndpoints> resource) : IResourceAnnotation
 {

diff --git 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<IResourceWithEndpoints> resource) : IResourceAnnotation
 {

diff --git 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<SwaResource> WithAppResource(this IResourceBuilde
     public static IResourceBuilder<SwaResource> WithApiResource(this IResourceBuilder<SwaResource> builder, IResourceBuilder<IResourceWithEndpoints> apiResource) =>
         builder.WithAnnotation<SwaApiEndpointAnnotation>(new(apiResource), ResourceAnnotationMutationBehavior.Replace);
 }
-
-public class SwaResourceOptions
-{
-    public int Port { get; set; } = 4280;
-    public int DevServerTimeout { get; set; } = 60;
-}
diff --git 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
@@ -0,0 +1,7 @@
+namespace Aspire.Hosting;
+
+public class SwaResourceOptions
+{
+    public int Port { get; set; } = 4280;
+    public int DevServerTimeout { get; set; } = 60;
+}
diff --git 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;
 
 /// <summary>
 /// 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
@@ -1,4 +1,4 @@
-namespace CommunityToolkit.Aspire.Hosting.Java;
+namespace Aspire.Hosting.ApplicationModel;
 
 /// <summary>
 /// 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
@@ -1,7 +1,4 @@
-using Aspire.Hosting;
-using Aspire.Hosting.ApplicationModel;
-
-namespace CommunityToolkit.Aspire.Hosting.Java;
+namespace Aspire.Hosting.ApplicationModel;
 
 /// <summary>
 /// 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
@@ -1,4 +1,4 @@
-namespace CommunityToolkit.Aspire.Hosting.Java;
+namespace Aspire.Hosting.ApplicationModel;
 
 /// <summary>
 /// 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
@@ -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;
 
 /// <summary>
 /// Provides extension methods for adding Java applications to an <see cref="IDistributedApplicationBuilder"/>.

diff --git 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
@@ -5,14 +5,13 @@
 
 namespace CommunityToolkit.Aspire.Hosting.NodeJS.Extensions;
 
-
 /// <summary>
 /// Represents a Node package installer.
 /// </summary>
 /// <param name="packageManager">The package manager to use.</param>
 /// <param name="loggerService">The logger service to use.</param>
 /// <param name="notificationService">The notification service to use.</param>
-class NodePackageInstaller(string packageManager, ResourceLoggerService loggerService, ResourceNotificationService notificationService)
+internal class NodePackageInstaller(string packageManager, ResourceLoggerService loggerService, ResourceNotificationService notificationService)
 {
     /// <summary>
     /// 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
@@ -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