Skip to content

Commit c0a9533

Browse files
committed
minor tweak to MSBuild logic
removing dotnet_host logic since we're no longer spawning anything. consolidate RID patterns for easier viewing in binlogs
1 parent 3b95c7c commit c0a9533

File tree

1 file changed

+4
-26
lines changed

1 file changed

+4
-26
lines changed

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

+4-26
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
This defaulting needs to happen in the SDK targets so this metadata affects NuGet Restore.
2424
-->
2525
<ItemGroup Condition="'$(IsAspireHost)' == 'true'">
26-
26+
2727
<ProjectReference Update="@(ProjectReference)">
2828
<IsAspireProjectResource Condition="'%(IsAspireProjectResource)' != 'false'">true</IsAspireProjectResource>
2929

@@ -68,7 +68,7 @@
6868
<_AppHostVersion>%(_AppHostPackageReference.Version)</_AppHostVersion>
6969
</PropertyGroup>
7070

71-
<!-- If the version is still empty, then we assume the project is using Central Package Management,
71+
<!-- If the version is still empty, then we assume the project is using Central Package Management,
7272
and we try to extract the PackageVersion Items. -->
7373
<ItemGroup Condition="'$(_AppHostVersion)' == ''">
7474
<_AppHostPackageReference />
@@ -93,36 +93,14 @@
9393
</PropertyGroup>
9494

9595
<!-- At this point, we should have the version either by CPM or PackageReference, so we fail if not. -->
96-
<Error Condition="'$(_AppHostVersion)' == ''"
96+
<Error Condition="'$(_AppHostVersion)' == ''"
9797
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." />
9898

9999
<!--The following is the list of the RIDs that we currently multitarget for DCP and Dashboard packages-->
100100
<ItemGroup>
101-
<_DashboardAndDCPSupportedTargetingRIDs Include="win-x64" />
102-
<_DashboardAndDCPSupportedTargetingRIDs Include="win-x86" />
103-
<_DashboardAndDCPSupportedTargetingRIDs Include="win-arm64" />
104-
<_DashboardAndDCPSupportedTargetingRIDs Include="linux-x64" />
105-
<_DashboardAndDCPSupportedTargetingRIDs Include="linux-arm64" />
106-
<_DashboardAndDCPSupportedTargetingRIDs Include="osx-x64" />
107-
<_DashboardAndDCPSupportedTargetingRIDs Include="osx-arm64" />
101+
<_DashboardAndDCPSupportedTargetingRIDs Include="win-x64;win-x86;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64" />
108102
</ItemGroup>
109103

110-
<!-- If running in .NET Core, DOTNET_HOST_PATH is set to point to the dotnet executable being used
111-
for the build. -->
112-
<PropertyGroup>
113-
<_DotNetHostPath>$(DOTNET_HOST_PATH)</_DotNetHostPath>
114-
</PropertyGroup>
115-
116-
<!-- If running on .NET Framework MSBuild, then DOTNET_HOST_PATH won't be set, so we need to construct
117-
the path using well-known properties. -->
118-
<PropertyGroup Condition="'$(_DotNetHostPath)' == ''">
119-
<_DotNetHostDirectory>$(NetCoreRoot)</_DotNetHostDirectory>
120-
<_DotNetHostFileName>dotnet</_DotNetHostFileName>
121-
<_DotNetHostFileName Condition="'$(OS)' == 'Windows_NT'">dotnet.exe</_DotNetHostFileName>
122-
123-
<_DotNetHostPath>$(_DotNetHostDirectory)\$(_DotNetHostFileName)</_DotNetHostPath>
124-
</PropertyGroup>
125-
126104
<!-- Call Aspire.RuntimeIdentifier.Tool to get the RIDs for Dashboard and DCP packages -->
127105
<PickBestRid RuntimeGraphPath="$(BundledRuntimeIdentifierGraphFile)" CurrentRid="$(NETCoreSdkRuntimeIdentifier)" SupportedRids="@(_DashboardAndDCPSupportedTargetingRIDs)">
128106
<Output TaskParameter="MatchingRid" PropertyName="_DashboardAndDcpRID" />

0 commit comments

Comments
 (0)