Add support for additional DotNetRuntime (dotnet#7158)

akoeplinger · Apr 12, 2021 · 5dc1370 · 5dc1370
1 parent 5c4b272
commit 5dc1370
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/src/Microsoft.DotNet.Helix/Sdk/Readme.md b/src/Microsoft.DotNet.Helix/Sdk/Readme.md
@@ -152,6 +152,23 @@ Given a local folder `$(TestFolder)` containing `runtests.cmd`, this will run `r
     <HelixPostCommands>$(HelixPostCommands);echo 'One Pepperoni Pizza'</HelixPostCommands>
   </PropertyGroup>
 
+  <!--
+    Optional additional dotnet runtimes or SDKs for correlation payloads
+    PackageType (defaults to runtime)
+    Channel (defaults to Current)
+  -->
+  <ItemGroup>
+    <!-- Includes the 6.0.0-preview.4.21178.6 dotnet runtime package version from the Current channel, using the DotNetCliRuntime -->
+    <AdditionalDotNetPackage Include="6.0.0-preview.4.21178.6">
+      <!-- 'sdk', 'runtime' or 'aspnetcore-runtime' -->
+      <PackageType>runtime</PackageType>
+      <!-- 'Current' or 'LTS', determines what channel 'latest' version pulls from -->
+      <Channel>Current</Channel>
+    </AdditionalDotNetPackage>
+    <!-- Includes the 6.0.0-preview.4.21175.1 version, using the default runtime packageType, DotNetCliRuntime, and Current channel  -->
+    <AdditionalDotNetPackage Include="6.0.0-preview.4.21175.1" />
+  </ItemGroup>
+
   <!--
     XUnit Runner
       Enabling this will create one work item for each xunit test project specified.

diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets
@@ -18,4 +18,27 @@
       <HelixPreCommands Condition="!$(IsPosixShell)">$(HelixPreCommands);set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\$(DotNetCliDestination);set DOTNET_CLI_TELEMETRY_OPTOUT=1</HelixPreCommands>
     </PropertyGroup>
   </Target>
+
+  <Target Name="AddAdditionalRuntimes" 
+          Condition="@(AdditionalDotNetPackage->Count()) != 0"
+          AfterTargets="Build" 
+          Outputs="%(AdditionalDotNetPackage.Identity)">
+    <PropertyGroup>
+      <_channel>%(AdditionalDotNetPackage.Channel)</_channel>
+      <_channel Condition=" '$(_channel)' == '' ">Current</_channel>
+      <_packageType>%(AdditionalDotNetPackage.PackageType)</_packageType>
+      <_packageType Condition=" '$(_packageType)' == '' ">runtime</_packageType>
+    </PropertyGroup>
+
+    <Message Text = "Adding correlation payload for additional .NET Core package: Version: '%(AdditionalDotNetPackage.Identity)'  Runtime: '$(DotNetCliRuntime)' PackageType: '$(_packageType)' Channel: '$(_channel)' "/>
+    <FindDotNetCliPackage Version="%(AdditionalDotNetPackage.Identity)" Runtime="$(DotNetCliRuntime)" PackageType="$(_packageType)" Channel="$(_channel)">
+      <Output TaskParameter="PackageUri" PropertyName="DotNetCliPackageUri"/>
+    </FindDotNetCliPackage>
+    <ItemGroup>
+      <HelixCorrelationPayload Include="dotnet-additional">
+        <Uri>$(DotNetCliPackageUri)</Uri>
+        <Destination>$(DotNetCliDestination)</Destination>
+      </HelixCorrelationPayload>
+    </ItemGroup>
+  </Target>
 </Project>