|
1 | 1 | <Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test" TreatAsLocalProperty="ProjectToBuild">
|
2 | 2 |
|
| 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 | + |
3 | 16 | <PropertyGroup>
|
4 | 17 | <!--
|
5 | 18 | When invoking helix.proj for the whole repo with build.cmd, ProjectToBuild will be set to the path to this project.
|
|
43 | 56 | !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}
|
44 | 57 | -->
|
45 | 58 | <HelixCorrelationPayload Include="dotnet-cli"
|
46 |
| - Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'" |
| 59 | + Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal' AND '$(IsPublicRuntime)' == 'false'" |
47 | 60 | Destination="dotnet-cli"
|
48 | 61 | Uri="https://dotnetbuilds.blob.core.windows.net/internal/Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(DotNetCliRuntime)$(ArchiveExtension)$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))" />
|
49 | 62 |
|
50 | 63 | <AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
|
51 |
| - Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal'"> |
| 64 | + Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal' OR '$(IsPublicRuntime)' == 'true'"> |
52 | 65 | <PackageType>runtime</PackageType>
|
53 | 66 | </AdditionalDotNetPackage>
|
54 | 67 | </ItemGroup>
|
|
0 commit comments