Fix project names

microsoft · Nov 23, 2024 · b171320 · b171320
1 parent 1710d40
commit b171320
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 21 deletions.
diff --git a/...emanticWorkench.Aspire.AppHost/.gitignore → ...manticWorkbench.Aspire.AppHost/.gitignore b/...emanticWorkench.Aspire.AppHost/.gitignore → ...manticWorkbench.Aspire.AppHost/.gitignore
diff --git a/...emanticWorkench.Aspire.AppHost/Program.cs → ...manticWorkbench.Aspire.AppHost/Program.cs b/...emanticWorkench.Aspire.AppHost/Program.cs → ...manticWorkbench.Aspire.AppHost/Program.cs
diff --git a/...re.AppHost/Properties/launchSettings.json → ...re.AppHost/Properties/launchSettings.json b/...re.AppHost/Properties/launchSettings.json → ...re.AppHost/Properties/launchSettings.json
diff --git a/...st/SemanticWorkench.Aspire.AppHost.csproj → ...t/SemanticWorkbench.Aspire.AppHost.csproj b/...st/SemanticWorkench.Aspire.AppHost.csproj → ...t/SemanticWorkbench.Aspire.AppHost.csproj
@@ -9,6 +9,7 @@
     <Nullable>enable</Nullable>
     <IsAspireHost>true</IsAspireHost>
     <UserSecretsId>b43d9a6d-f7bd-491d-b1f9-82372d537e4e</UserSecretsId>
+    <RootNamespace>SemanticWorkench.Aspire.AppHost</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...cWorkench.Aspire.AppHost/appsettings.json → ...Workbench.Aspire.AppHost/appsettings.json b/...cWorkench.Aspire.AppHost/appsettings.json → ...Workbench.Aspire.AppHost/appsettings.json
diff --git a/aspire-orchestrator/SemanticWorkbench.Aspire.Hosting.Extensions/VirtualEnvironment.cs b/aspire-orchestrator/SemanticWorkbench.Aspire.Hosting.Extensions/VirtualEnvironment.cs
@@ -15,27 +15,13 @@ internal sealed class VirtualEnvironment(string virtualEnvironmentPath)
         {
             string[] allowedExtensions = [".exe", ".cmd", ".bat"];
 
-            foreach (var allowedExtension in allowedExtensions)
-            {
-                string executablePath = Path.Join(virtualEnvironmentPath, "Scripts", name + allowedExtension);
-
-                if (File.Exists(executablePath))
-                {
-                    return executablePath;
-                }
-            }
-        }
-        else
-        {
-            var executablePath = Path.Join(virtualEnvironmentPath, "bin", name);
-
-            if (File.Exists(executablePath))
-            {
-                return executablePath;
-            }
+            return allowedExtensions
+                .Select(allowedExtension => Path.Join(virtualEnvironmentPath, "Scripts", name + allowedExtension))
+                .FirstOrDefault(File.Exists);
         }
 
-        return null;
+        var executablePath = Path.Join(virtualEnvironmentPath, "bin", name);
+        return File.Exists(executablePath) ? executablePath : null;
     }
 
     /// <summary>

diff --git a/...ench.Aspire.ServiceDefaults/Extensions.cs → ...ench.Aspire.ServiceDefaults/Extensions.cs b/...ench.Aspire.ServiceDefaults/Extensions.cs → ...ench.Aspire.ServiceDefaults/Extensions.cs
diff --git a/...ticWorkench.Aspire.ServiceDefaults.csproj → ...icWorkbench.Aspire.ServiceDefaults.csproj b/...ticWorkench.Aspire.ServiceDefaults.csproj → ...icWorkbench.Aspire.ServiceDefaults.csproj
@@ -5,6 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>
+    <RootNamespace>SemanticWorkench.Aspire.ServiceDefaults</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/aspire-orchestrator/SemanticWorkbench.Aspire.sln b/aspire-orchestrator/SemanticWorkbench.Aspire.sln
@@ -2,9 +2,9 @@
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.0.0
 MinimumVisualStudioVersion = 17.8.0.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SemanticWorkench.Aspire.AppHost", "SemanticWorkench.Aspire.AppHost\SemanticWorkench.Aspire.AppHost.csproj", "{85D9E2AF-8F25-4006-A375-A66E2259CB69}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SemanticWorkbench.Aspire.AppHost", "SemanticWorkbench.Aspire.AppHost\SemanticWorkbench.Aspire.AppHost.csproj", "{85D9E2AF-8F25-4006-A375-A66E2259CB69}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SemanticWorkench.Aspire.ServiceDefaults", "SemanticWorkench.Aspire.ServiceDefaults\SemanticWorkench.Aspire.ServiceDefaults.csproj", "{1A1BA42B-F071-42ED-BF6D-4BD51F2D7A41}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SemanticWorkbench.Aspire.ServiceDefaults", "SemanticWorkbench.Aspire.ServiceDefaults\SemanticWorkbench.Aspire.ServiceDefaults.csproj", "{1A1BA42B-F071-42ED-BF6D-4BD51F2D7A41}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-03-simple-chatbot", "..\examples\dotnet\dotnet-03-simple-chatbot\dotnet-03-simple-chatbot.csproj", "{670F22E3-71CC-4A9B-8BB8-DA855CFC0EEC}"
 EndProject