Suppress importing the orchestration SDK targets in test AppHosts, so…

… the projects build even if the workload is not installed.
dotnet · Jan 19, 2024 · e0a57dd · e0a57dd
1 parent e257742
commit e0a57dd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/playground/dapr/AppHost/Directory.Build.targets b/playground/dapr/AppHost/Directory.Build.targets
@@ -3,6 +3,9 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../../'))" />
 
   <!-- NOTE: These lines are only required because we are using P2P references, not NuGet. They will not exist in real apps. -->
+  <PropertyGroup>
+    <_SuppressImportAspireHostingOrchestrationTargets>true</_SuppressImportAspireHostingOrchestrationTargets>
+  </PropertyGroup>
   <Import Project="..\..\..\src\Aspire.Hosting\build\Aspire.Hosting.targets" />
   <Import Project="..\..\..\src\Aspire.Hosting.Sdk\SDK\Sdk.targets" />
 

diff --git a/playground/eShopLite/AppHost/Directory.Build.targets b/playground/eShopLite/AppHost/Directory.Build.targets
@@ -3,6 +3,9 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
   <!-- NOTE: These lines are only required because we are using P2P references, not NuGet. They will not exist in real apps. -->
+  <PropertyGroup>
+    <_SuppressImportAspireHostingOrchestrationTargets>true</_SuppressImportAspireHostingOrchestrationTargets>
+  </PropertyGroup>
   <Import Project="..\..\..\src\Aspire.Hosting\build\Aspire.Hosting.targets" />
   <Import Project="..\..\..\src\Aspire.Hosting.Sdk\SDK\Sdk.targets" />
 

diff --git a/playground/orleans/OrleansAppHost/Directory.Build.targets b/playground/orleans/OrleansAppHost/Directory.Build.targets
@@ -3,6 +3,9 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
   <!-- NOTE: These lines are only required because we are using P2P references, not NuGet. They will not exist in real apps. -->
+  <PropertyGroup>
+    <_SuppressImportAspireHostingOrchestrationTargets>true</_SuppressImportAspireHostingOrchestrationTargets>
+  </PropertyGroup>
   <Import Project="..\..\..\src\Aspire.Hosting\build\Aspire.Hosting.targets" />
   <Import Project="..\..\..\src\Aspire.Hosting.Sdk\SDK\Sdk.targets" />
 

diff --git a/src/Aspire.Hosting.Sdk/SDK/Sdk.targets b/src/Aspire.Hosting.Sdk/SDK/Sdk.targets
@@ -49,6 +49,6 @@
   also contains Aspire.Hosting.Orchestration and vice versa. Once Aspire/DCP are public
   we can move it to WorkloadManifest.targets to ensure future correctness.
   -->
-  <Import Project="Sdk.targets" Sdk="Aspire.Hosting.Orchestration" />
+  <Import Project="Sdk.targets" Sdk="Aspire.Hosting.Orchestration" Condition="'$(_SuppressImportAspireHostingOrchestrationTargets)' != 'true'" />
 
 </Project>
diff --git a/tests/testproject/TestProject.AppHost/Directory.Build.targets b/tests/testproject/TestProject.AppHost/Directory.Build.targets
@@ -3,6 +3,9 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
   <!-- NOTE: These lines are only required because we are using P2P references, not NuGet. They will not exist in real apps. -->
+  <PropertyGroup>
+    <_SuppressImportAspireHostingOrchestrationTargets>true</_SuppressImportAspireHostingOrchestrationTargets>
+  </PropertyGroup>
   <Import Project="..\..\..\src\Aspire.Hosting\build\Aspire.Hosting.targets" />
   <Import Project="..\..\..\src\Aspire.Hosting.Sdk\SDK\Sdk.targets" />