Skip to content

Commit fd80be8

Browse files
committed
IsPublicRuntime
1 parent 22fef7d commit fd80be8

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

eng/helix/helix.proj

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test" TreatAsLocalProperty="ProjectToBuild">
22

3+
<!--
4+
TEMPORARY workaround while we wait for https://github.com/dotnet/arcade/issues/8336 to be addressed.
5+
When the runtime version we're ingesting was built publicly, or we're building in public CI, IsPublicRuntime should be true,
6+
causing us to use the normal workflow of downloading it from the public location in Helix.
7+
When the runtime was built internally (which necessarily also means we're building in the internal project), IsPublicRuntime should be false,
8+
causing us to pass the right Sas token to get Helx to download it from the internal location.
9+
Once https://github.com/dotnet/arcade/issues/8336, we only need to set AdditionalDotNetPackage below,
10+
not HelixCorrelationPayload.
11+
-->
12+
<PropertyGroup>
13+
<IsPublicRuntime>false</IsPublicRuntime>
14+
</PropertyGroup>
15+
316
<PropertyGroup>
417
<!--
518
When invoking helix.proj for the whole repo with build.cmd, ProjectToBuild will be set to the path to this project.
@@ -43,12 +56,12 @@
4356
!temporary! e.g. https://dotnetbuilds.blob.core.windows.net/internal/Runtime/6.0.2-servicing.22060.12/dotnet-runtime-6.0.2-win-x86.zip?{token}
4457
-->
4558
<HelixCorrelationPayload Include="dotnet-cli"
46-
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'"
59+
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal' AND '$(IsPublicRuntime)' == 'false'"
4760
Destination="dotnet-cli"
4861
Uri="https://dotnetbuilds.blob.core.windows.net/internal/Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(DotNetCliRuntime)$(ArchiveExtension)$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))" />
4962

5063
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
51-
Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal'">
64+
Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal' OR '$(IsPublicRuntime)' == 'true'">
5265
<PackageType>runtime</PackageType>
5366
</AdditionalDotNetPackage>
5467
</ItemGroup>

0 commit comments

Comments
 (0)