From 9294f61e289f51665d542a3eb0791d9419c764f4 Mon Sep 17 00:00:00 2001
From: David Negstad <David.Negstad@microsoft.com>
Date: Wed, 31 Jan 2024 08:28:21 -0800
Subject: [PATCH 1/2] Update dashboard discovery to use .dll

---
 eng/dashboardpack/Sdk.targets                   | 3 +--
 src/Aspire.Hosting/build/Aspire.Hosting.targets | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/eng/dashboardpack/Sdk.targets b/eng/dashboardpack/Sdk.targets
index 53efbd5df8..f3dc800b33 100644
--- a/eng/dashboardpack/Sdk.targets
+++ b/eng/dashboardpack/Sdk.targets
@@ -5,8 +5,7 @@
   <PropertyGroup>
     <AspireDashboardDir Condition=" '$(AspireDashboardDir)' == '' ">$([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', 'tools'))</AspireDashboardDir>
     <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=" '$(AspireDashboardPath)' == '' ">$([MSBuild]::NormalizePath($(AspireDashboardDir), 'Aspire.Dashboard.dll'))</AspireDashboardPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Aspire.Hosting/build/Aspire.Hosting.targets b/src/Aspire.Hosting/build/Aspire.Hosting.targets
index 6ddaa06950..05e3b5b1b1 100644
--- 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())
             {
@@ -209,8 +209,7 @@ internal static class ]]>%(ClassName)<![CDATA[
   <Target Name="SetDashboardDiscoveryAttributes" BeforeTargets="GetAssemblyAttributes" Condition=" '$(AspireDashboardDir)' != '' ">
     <PropertyGroup>
       <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=" '$(AspireDashboardPath)' == '' ">$([MSBuild]::NormalizePath($(AspireDashboardDir), 'Aspire.Dashboard.dll'))</AspireDashboardPath>
     </PropertyGroup>
 
     <ItemGroup>

From 2621000488457903db8eb7102c15673588e21b72 Mon Sep 17 00:00:00 2001
From: David Negstad <David.Negstad@microsoft.com>
Date: Wed, 31 Jan 2024 11:00:01 -0800
Subject: [PATCH 2/2] Only override for Mac

---
 eng/dashboardpack/Sdk.targets                   | 4 +++-
 src/Aspire.Hosting/build/Aspire.Hosting.targets | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/eng/dashboardpack/Sdk.targets b/eng/dashboardpack/Sdk.targets
index f3dc800b33..f903ca475d 100644
--- a/eng/dashboardpack/Sdk.targets
+++ b/eng/dashboardpack/Sdk.targets
@@ -5,7 +5,9 @@
   <PropertyGroup>
     <AspireDashboardDir Condition=" '$(AspireDashboardDir)' == '' ">$([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', 'tools'))</AspireDashboardDir>
     <AspireDashboardDir>$([MSBuild]::EnsureTrailingSlash('$(AspireDashboardDir)'))</AspireDashboardDir>
-    <AspireDashboardPath Condition=" '$(AspireDashboardPath)' == '' ">$([MSBuild]::NormalizePath($(AspireDashboardDir), 'Aspire.Dashboard.dll'))</AspireDashboardPath>
+    <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
index 05e3b5b1b1..521182535a 100644
--- a/src/Aspire.Hosting/build/Aspire.Hosting.targets
+++ b/src/Aspire.Hosting/build/Aspire.Hosting.targets
@@ -209,7 +209,9 @@ internal static class ]]>%(ClassName)<![CDATA[
   <Target Name="SetDashboardDiscoveryAttributes" BeforeTargets="GetAssemblyAttributes" Condition=" '$(AspireDashboardDir)' != '' ">
     <PropertyGroup>
       <AspireDashboardDir>$([MSBuild]::EnsureTrailingSlash('$(AspireDashboardDir)'))</AspireDashboardDir>
-      <AspireDashboardPath Condition=" '$(AspireDashboardPath)' == '' ">$([MSBuild]::NormalizePath($(AspireDashboardDir), 'Aspire.Dashboard.dll'))</AspireDashboardPath>
+      <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>