Skip to content

[CI] Add Azure CLI as Helix test dependency for basic tests #13420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
+27 −0
Open

[CI] Add Azure CLI as Helix test dependency for basic tests #13420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81efe83
[CI] Azdo: Install az cli for running tests on helix/Windows
radical Dec 10, 2025
401dff4
Update tests/helix/send-to-helix-inner.proj
radical Dec 10, 2025
bb1c1ef
Apply suggestion from @radical
radical Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/helix/send-to-helix-basictests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<!-- needed to run 9.0 tests on helix -->
<NeedsSdksForTesting>true</NeedsSdksForTesting>
<IncludeDotNetCli>false</IncludeDotNetCli>
<!-- Enable Azure CLI for basic tests -->
<NeedsAzCli>true</NeedsAzCli>

<TargetFrameworkSuffixRegex>^(.*?)(-net[\d.]+)?$</TargetFrameworkSuffixRegex>
</PropertyGroup>
Expand Down
25 changes: 25 additions & 0 deletions tests/helix/send-to-helix-inner.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
<_AzureFunctionsCliUrl Condition="'$(OS)' == 'Windows_NT'">https://github.com/Azure/azure-functions-core-tools/releases/download/4.0.7512/Azure.Functions.Cli.min.win-x64.4.0.7512.zip</_AzureFunctionsCliUrl>
<_AzureFunctionsCliUrl Condition="'$(OS)' != 'Windows_NT'">https://github.com/Azure/azure-functions-core-tools/releases/download/4.0.7512/Azure.Functions.Cli.linux-x64.4.0.7512.zip</_AzureFunctionsCliUrl>

<!-- Azure CLI URL for Helix runs - Windows x64 zip version -->
<_AzureCliWindowsUrl Condition="'$(OS)' == 'Windows_NT'">https://aka.ms/installazurecliwindowszipx64</_AzureCliWindowsUrl>

<_DefaultSdkDirNameForTests>dotnet-tests</_DefaultSdkDirNameForTests>
<BuildHelixWorkItemsDependsOn Condition="'$(NeedsAzCli)' == 'true'">$(BuildHelixWorkItemsDependsOn);DownloadAzureCliForHelix</BuildHelixWorkItemsDependsOn>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -165,6 +169,27 @@

<Target Name="PrepareDependencies" DependsOnTargets="$(PrepareDependenciesDependsOn)" />

<!--
The file downloaded from the url doesn't have an extension, which causes Helix sdk to not
treat it as a zip file even when AsArchive=true is used.
So, we explicitly download and rename it to az-cli.zip before adding to HelixCorrelationPayload.
-->
<Target Name="DownloadAzureCliForHelix" Condition="'$(NeedsAzCli)' == 'true' and '$(OS)' == 'Windows_NT'">
<DownloadFile
SourceUrl="$(_AzureCliWindowsUrl)"
DestinationFolder="$(ArtifactsBinDir)">
<Output TaskParameter="DownloadedFile" ItemName="_AzureCliArchive" />
</DownloadFile>

<Move SourceFiles="@(_AzureCliArchive)" DestinationFiles="$(ArtifactsBinDir)\az-cli.zip" />

<ItemGroup>
<HelixCorrelationPayload Include="$(ArtifactsBinDir)\az-cli.zip" Destination="az-cli" AsArchive="true" />
<HelixPreCommand Include="set PATH=%HELIX_CORRELATION_PAYLOAD%\az-cli\bin%3B%PATH%" />
<HelixPreCommand Include="az --version" />
</ItemGroup>
</Target>

<Target Name="BuildHelixWorkItems" DependsOnTargets="$(BuildHelixWorkItemsDependsOn)" BeforeTargets="Build">
<MSBuild Projects="$(RepoRoot)\eng\dcppack\Aspire.Hosting.Orchestration.$(NETCoreSdkRuntimeIdentifier).csproj" Targets="GetDCPBinaryLocation">
<Output TaskParameter="TargetOutputs" PropertyName="DCPBinaryLocation" />
Expand Down