From 10d5cc75b50291ffaf700253198c639abacb6b4e Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <igor.velikorossov@microsoft.com>
Date: Thu, 10 Apr 2025 11:52:37 +1000
Subject: [PATCH] (Re)enable running tests from cli without specifying build
 infra

That is, allow running the following
    .\build.cmd -test -projects .\tests\Aspire.Cli.Tests\Aspire.Cli.Tests.csproj

...instead of requiring /p:GITHUB_ACTIONS=true or /p:SYSTEM_TEAMPROJECT=foo
to indicate the test is run in GHA or AzDO.
---
 eng/Testing.targets | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/eng/Testing.targets b/eng/Testing.targets
index b41cd7ceb59..b631ca7b509 100644
--- a/eng/Testing.targets
+++ b/eng/Testing.targets
@@ -29,7 +29,15 @@
     <!-- See https://learn.microsoft.com/azure/devops/pipelines/build/variables#system-variables -->
     <IsAzdoCIRunner Condition=" '$(SYSTEM_TEAMPROJECT)' != '' ">true</IsAzdoCIRunner>
 
+    <!-- See https://github.com/dotnet/arcade/blob/main/src/Microsoft.DotNet.Helix/Sdk/Readme.md#common-helix-client-environment-variables -->
+    <IsHelix Condition=" '$(HELIX_CORRELATION_ID)' != '' ">true</IsHelix>
+
     <IsAzdoHelixRunner Condition=" '$(PrepareForHelix)' == 'true' ">true</IsAzdoHelixRunner>
+
+    <!--
+      If we haven't detected the tests are run on build agents, then we presume we're running tests locally.
+      -->
+    <IsLocalDevLoop Condition=" '$(IsGitHubActionsRunner)' != 'true' and '$(IsAzdoCIRunner)' != 'true' and '$(IsHelix)' != 'true' and '$(IsAzdoHelixRunner)' != 'true' ">true</IsLocalDevLoop>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -57,6 +65,9 @@
 
     <!-- Otherwise, run tests on AzDO CI agents -->
     <SkipTests Condition=" '$(IsAzdoCIRunner)' == 'true' and '$(RunOnAzdoCI)' == 'true' ">false</SkipTests>
+
+    <!-- If we're running locally, we don't skip tests -->
+    <SkipTests Condition=" '$(IsLocalDevLoop)' == 'true' ">false</SkipTests>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(IsTestProject)' == 'true' and '$(IncludeTestUtilities)' == 'true' ">