From 35ccf4e189753eaa20a00481fb645cf75c3d15cc Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Tue, 3 Aug 2021 04:03:35 -0500
Subject: [PATCH] [build] use 'dotnet workload install --source' (#6138)

Use the new `--source` parameter when calling `dotnet workload
install`. This was not working previously, and the only option was to
generate a `NuGet.config` in the current working directory.
---
 .../create-packs/Directory.Build.targets      | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index a7a0ab1c742..b82bd4a5f99 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -101,25 +101,16 @@
     <!-- dotnet workload install android-aot -->
     <PropertyGroup>
       <_TempDirectory>$(DotNetPreviewPath)..\.xa-workload-temp-$([System.IO.Path]::GetRandomFileName())</_TempDirectory>
-      <_NuGetConfig>$(_TempDirectory)\NuGet.config</_NuGetConfig>
-      <_NuGetContent>
-<![CDATA[
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="local" value="$(OutputPath)" />
-    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
-  </packageSources>
-</configuration>
-]]>
-      </_NuGetContent>
     </PropertyGroup>
-    <WriteLinesToFile File="$(_NuGetConfig)" Lines="$(_NuGetContent)" Overwrite="true" />
-    <Exec
-        WorkingDirectory="$(_TempDirectory)"
-        Command="&quot;$(DotNetPreviewTool)&quot; workload install android-aot --skip-manifest-update --verbosity diag --temp-dir &quot;$(_TempDirectory)&quot;"
-    />
+    <ItemGroup>
+      <_InstallArguments Include="--skip-manifest-update" />
+      <_InstallArguments Include="--verbosity diag" />
+      <_InstallArguments Include="--source &quot;$(OutputPath.TrimEnd('\'))&quot;" />
+      <_InstallArguments Include="--source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
+      <_InstallArguments Include="--temp-dir &quot;$(_TempDirectory)&quot;" />
+    </ItemGroup>
+    <MakeDir Directories="$(_TempDirectory)" />
+    <Exec Command="&quot;$(DotNetPreviewTool)&quot; workload install android-aot @(_InstallArguments, ' ')" WorkingDirectory="$(_TempDirectory)" />
     <RemoveDir Directories="$(_TempDirectory)" />
   </Target>