minor tweak to MSBuild logic

removing dotnet_host logic since we're no longer spawning anything. consolidate RID patterns for easier viewing in binlogs

Author: baronfel

src/Aspire.AppHost.Sdk/Aspire.AppHost.Sdk.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <PackageTags>aspire apphost sdk</PackageTags>
     <Description>.NET Aspire AppHost SDK. Must be referenced by .NET Aspire AppHost projects.</Description>
-    <TargetsForTfmSpecificContentInPackage>_PublishAndPackRIDTool;$(TargetsForTfmSpecificContentInPackage)</TargetsForTfmSpecificContentInPackage>
+    <TargetsForTfmSpecificContentInPackage>_AddTaskToPackage;$(TargetsForTfmSpecificContentInPackage)</TargetsForTfmSpecificContentInPackage>
     <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
@@ -18,15 +18,13 @@
     <None Update="SDK\AutoImport.props;SDK\*.targets" Pack="true" PackagePath="Sdk\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
     <None Update="SDK\Sdk.in.props" Pack="true" PerformTextReplacement="True" PackagePath="Sdk\Sdk.props" CopyToOutputDirectory="PreserveNewest" />
     <None Update="SDK\Sdk.in.targets" Pack="true" PerformTextReplacement="True" PackagePath="Sdk\Sdk.targets" />
-
-    <!-- Adding a project reference to the tool to avoid MSBuild having clashes when building this project before the other. -->
-    <ProjectReference Include="Aspire.AppHost.Tasks\Aspire.AppHost.Tasks.csproj" Private="true" />
+    <ProjectReference Include="Aspire.AppHost.Tasks\Aspire.AppHost.Tasks.csproj" />
   </ItemGroup>
 
-  <Target Name="_PublishAndPackRIDTool">
+  <Target Name="_AddTaskToPackage">
     <MSBuild Projects="@(ProjectReference)" Targets="Build" Properties="TargetFramework=netstandard2.0">
       <Output TaskParameter="TargetOutputs" ItemName="TaskDlls" />
-      
+
     </MSBuild>
     <ItemGroup>
       <TfmSpecificPackageFile Include="@(TaskDlls)" PackagePath="tasks/netstandard2.0/%(TaskDlls.RecursiveDir)" />

src/Aspire.AppHost.Sdk/SDK/Sdk.in.targets

@@ -23,7 +23,7 @@
   This defaulting needs to happen in the SDK targets so this metadata affects NuGet Restore.
   -->
   <ItemGroup Condition="'$(IsAspireHost)' == 'true'">
-    
+
     <ProjectReference Update="@(ProjectReference)">
       <IsAspireProjectResource Condition="'%(IsAspireProjectResource)' != 'false'">true</IsAspireProjectResource>
 
@@ -68,7 +68,7 @@
       <_AppHostVersion>%(_AppHostPackageReference.Version)</_AppHostVersion>
     </PropertyGroup>
 
-    <!-- If the version is still empty, then we assume the project is using Central Package Management, 
+    <!-- If the version is still empty, then we assume the project is using Central Package Management,
          and we try to extract the PackageVersion Items. -->
     <ItemGroup Condition="'$(_AppHostVersion)' == ''">
       <_AppHostPackageReference />
@@ -93,36 +93,14 @@
     </PropertyGroup>
 
     <!-- At this point, we should have the version either by CPM or PackageReference, so we fail if not. -->
-    <Error Condition="'$(_AppHostVersion)' == ''" 
+    <Error Condition="'$(_AppHostVersion)' == ''"
        Text="$(MSBuildProjectName) is a .NET Aspire AppHost project that needs a package reference to Aspire.Hosting.AppHost version 8.2.0 or above to work correctly." />
 
     <!--The following is the list of the RIDs that we currently multitarget for DCP and Dashboard packages-->
     <ItemGroup>
-      <_DashboardAndDCPSupportedTargetingRIDs Include="win-x64" />
-      <_DashboardAndDCPSupportedTargetingRIDs Include="win-x86" />
-      <_DashboardAndDCPSupportedTargetingRIDs Include="win-arm64" />
-      <_DashboardAndDCPSupportedTargetingRIDs Include="linux-x64" />
-      <_DashboardAndDCPSupportedTargetingRIDs Include="linux-arm64" />
-      <_DashboardAndDCPSupportedTargetingRIDs Include="osx-x64" />
-      <_DashboardAndDCPSupportedTargetingRIDs Include="osx-arm64" />
+      <_DashboardAndDCPSupportedTargetingRIDs Include="win-x64;win-x86;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64" />
     </ItemGroup>
 
-    <!-- If running in .NET Core, DOTNET_HOST_PATH is set to point to the dotnet executable being used
-    for the build. -->
-    <PropertyGroup>
-      <_DotNetHostPath>$(DOTNET_HOST_PATH)</_DotNetHostPath>
-    </PropertyGroup>
-
-    <!-- If running on .NET Framework MSBuild, then DOTNET_HOST_PATH won't be set, so we need to construct
-    the path using well-known properties. -->
-    <PropertyGroup Condition="'$(_DotNetHostPath)' == ''">
-      <_DotNetHostDirectory>$(NetCoreRoot)</_DotNetHostDirectory>
-      <_DotNetHostFileName>dotnet</_DotNetHostFileName>
-      <_DotNetHostFileName Condition="'$(OS)' == 'Windows_NT'">dotnet.exe</_DotNetHostFileName>
-
-      <_DotNetHostPath>$(_DotNetHostDirectory)\$(_DotNetHostFileName)</_DotNetHostPath>
-    </PropertyGroup>
-
     <!-- Call Aspire.RuntimeIdentifier.Tool to get the RIDs for Dashboard and DCP packages -->
     <PickBestRid RuntimeGraphPath="$(BundledRuntimeIdentifierGraphFile)" CurrentRid="$(NETCoreSdkRuntimeIdentifier)" SupportedRids="@(_DashboardAndDCPSupportedTargetingRIDs)">
       <Output TaskParameter="MatchingRid" PropertyName="_DashboardAndDcpRID" />