Update dashboard discovery to use .dll instead of executable (#2018)

* Update dashboard discovery to use .dll * Only override for Mac
dotnet · Jan 31, 2024 · 7807b9f · 7807b9f
1 parent eb62805
commit 7807b9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/eng/dashboardpack/Sdk.targets b/eng/dashboardpack/Sdk.targets
@@ -7,6 +7,7 @@
     <AspireDashboardDir>$([MSBuild]::EnsureTrailingSlash('$(AspireDashboardDir)'))</AspireDashboardDir>
     <AspireDashboardPath Condition=" '$(AspireDashboardPath)' == '' ">$([MSBuild]::NormalizePath($(AspireDashboardDir), 'Aspire.Dashboard'))</AspireDashboardPath>
     <AspireDashboardPath Condition=" '$(OS)' == 'Windows_NT' and !$(AspireDashboardPath.EndsWith('.exe')) ">$(AspireDashboardPath).exe</AspireDashboardPath>
+    <AspireDashboardPath Condition="$([MSBuild]::IsOsPlatform('OSX')) and !$(AspireDashboardPath.EndsWith('.dll'))">$(AspireDashboardPath).dll</AspireDashboardPath>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Aspire.Hosting/build/Aspire.Hosting.targets b/src/Aspire.Hosting/build/Aspire.Hosting.targets
@@ -17,7 +17,7 @@
     </ItemGroup>
 
   </Target>
-  
+
   <!-- Generate the data structures for doing the codegen for project resources -->
   <Target Name="CreateAspireProjectMetadataSources"
           DependsOnTargets="_CreateAspireProjectResources">
@@ -111,7 +111,7 @@ internal static class ]]>%(ClassName)<![CDATA[
       <Code Type="Fragment" Language="cs">
         <![CDATA[
           HashSet<ITaskItem> nonExecutableReferences = new HashSet<ITaskItem>();
-          
+
           foreach (var appProject in AppProjectTargetFramework)
           {
             var additionalProperties = appProject.GetMetadata("AdditionalPropertiesFromProject");
@@ -120,7 +120,7 @@ internal static class ]]>%(ClassName)<![CDATA[
               // Skip any projects that don't contain the right metadata
               continue;
             }
-                
+
             var additionalPropertiesXml = XElement.Parse(additionalProperties);
             foreach (var targetFrameworkElement in additionalPropertiesXml.Elements())
             {
@@ -211,6 +211,7 @@ internal static class ]]>%(ClassName)<![CDATA[
       <AspireDashboardDir>$([MSBuild]::EnsureTrailingSlash('$(AspireDashboardDir)'))</AspireDashboardDir>
       <AspireDashboardPath Condition=" '$(AspireDashboardPath)' == '' ">$([MSBuild]::NormalizePath($(AspireDashboardDir), 'Aspire.Dashboard'))</AspireDashboardPath>
       <AspireDashboardPath Condition=" '$(OS)' == 'Windows_NT' and !$(AspireDashboardPath.EndsWith('.exe')) ">$(AspireDashboardPath).exe</AspireDashboardPath>
+      <AspireDashboardPath Condition="$([MSBuild]::IsOsPlatform('OSX')) and !$(AspireDashboardPath.EndsWith('.dll'))">$(AspireDashboardPath).dll</AspireDashboardPath>
     </PropertyGroup>
 
     <ItemGroup>