Fix up import conditions

radical · Jul 26, 2024 · 9e48bf0 · 9e48bf0
1 parent b1726a2
commit 9e48bf0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/playground/Directory.Build.props b/playground/Directory.Build.props
@@ -2,8 +2,8 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <!-- When $(BuildForTest)==true, importing Aspire.RepoTesting.targets is needed. But import
-       only when in-repo. For out-of-repo a parent DBprops does the import -->
-  <Import Project="$(TestsSharedRepoTestingDir)Aspire.RepoTesting.props" Condition="'$(RepoRoot)' != ''" />
+       only when in-repo. For out-of-repo a parent Directory.Build.props does the import -->
+  <Import Project="$(TestsSharedRepoTestingDir)Aspire.RepoTesting.props" Condition="'$(RepoRoot)' != '' and '$(BuildForTest)' != 'true'" />
 
   <PropertyGroup>
     <!--

diff --git a/playground/Directory.Build.targets b/playground/Directory.Build.targets
@@ -3,5 +3,5 @@
 
   <!-- When $(BuildForTest)==true, importing Aspire.RepoTesting.targets is needed. But import
        only when in-repo. For the out-of-repo case a parent Directory.Build.targets does the import -->
-  <Import Project="$(TestsSharedRepoTestingDir)Aspire.RepoTesting.targets" Condition="'$(RepoRoot)' != ''" />
+  <Import Project="$(TestsSharedRepoTestingDir)Aspire.RepoTesting.targets" Condition="'$(RepoRoot)' != '' and '$(BuildForTest)' != 'true'" />
 </Project>