From bcd62ed9e32e01a190563750182e627d762da7c5 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Tue, 20 Dec 2022 10:00:46 -0600
Subject: [PATCH] [build] pack .NET `.nupkg` files in parallel

Previously, we were calling `dotnet pack` serially for many projects,
such as:

    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack ... &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />

This ends up taking a while:

    Target CreateAllPacks 52.127s
        Task Exec 3.712s
        Task Exec 3.569s
        Task Exec 3.432s
        Task Exec 3.434s
        Task Exec 24.741s
        Task Exec 7.257s
        Task Exec 2.507s
        Task Exec 3.468s

Instead, we can create a `@(_ProjectsToPack)` item group, set
`%(AdditionalProperties)`, and call the `<MSBuild/>` task:

    <MSBuild
        Projects="@(_ProjectsToPack)"
        Targets="Pack"
        Properties="@(_GlobalProperties)"
        BuildInParallel="$(BuildInParallel)"
    />

This is faster because:

* We don't shell out to a new `dotnet.exe` each time.

* `<MSBuild/>` task knows how to run in parallel, managing multiple
  MSBuild nodes.

This also has the benefit of including these `dotnet pack` commands in
the `.binlog`. Previously, we would just have console output for them.

After these changes, I instead see:

    Target CreateAllPacks 5.857s
        Task MSBuild 5.857s

From my numbers before, I am unsure why one of the `dotnet pack`
commands took ~24 seconds. But I believe this change should reduce the
time to the *slowest` individual `dotnet pack` now.

It could save up to ~1 min of time in the `CreateAllPacks` target.
---
 .../create-packs/Directory.Build.targets      | 50 ++++++++++++-------
 .../Microsoft.Android.Templates.csproj        |  2 +-
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index 8cb06e245c0..4ecda2455d9 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -46,9 +46,9 @@
 
   <Target Name="_SetGlobalProperties">
     <ItemGroup>
-      <_GlobalProperties Include="-p:Configuration=$(Configuration)" />
-      <_GlobalProperties Include="-p:NuGetLicense=$(NuGetLicense)" />
-      <_GlobalProperties Include="-p:IncludeSymbols=False" />
+      <_GlobalProperties Include="Configuration=$(Configuration)" />
+      <_GlobalProperties Include="NuGetLicense=$(NuGetLicense)" />
+      <_GlobalProperties Include="IncludeSymbols=False" />
     </ItemGroup>
   </Target>
 
@@ -58,30 +58,42 @@
 
   <Target Name="_CreateDefaultRefPack"
       Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidDefaultTargetDotnetApiLevel)' and Exists('$(_MonoAndroidNETOutputRoot)$(AndroidDefaultTargetDotnetApiLevel)\Mono.Android.dll') ">
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidDefaultTargetDotnetApiLevel) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
+    <ItemGroup>
+      <_ProjectsToPack Include="Microsoft.Android.Ref.proj"     AdditionalProperties="AndroidApiLevel=$(AndroidDefaultTargetDotnetApiLevel)" />
+    </ItemGroup>
   </Target>
 
   <Target Name="_CreatePreviewPacks"
       Condition=" '$(AndroidLatestStableApiLevel)' != '$(AndroidLatestUnstableApiLevel)' and Exists('$(_MonoAndroidNETOutputRoot)$(AndroidLatestUnstableApiLevel)\Mono.Android.dll') ">
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-arm   &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-arm64 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-x86   &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) -p:AndroidRID=android-x64   &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidApiLevel=$(AndroidLatestUnstableApiLevel) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
+    <ItemGroup>
+      <_ProjectsToPack Include="Microsoft.Android.Runtime.proj" AdditionalProperties="AndroidApiLevel=$(AndroidLatestUnstableApiLevel);AndroidRID=android-arm" />
+      <_ProjectsToPack Include="Microsoft.Android.Runtime.proj" AdditionalProperties="AndroidApiLevel=$(AndroidLatestUnstableApiLevel);AndroidRID=android-arm64" />
+      <_ProjectsToPack Include="Microsoft.Android.Runtime.proj" AdditionalProperties="AndroidApiLevel=$(AndroidLatestUnstableApiLevel);AndroidRID=android-x86" />
+      <_ProjectsToPack Include="Microsoft.Android.Runtime.proj" AdditionalProperties="AndroidApiLevel=$(AndroidLatestUnstableApiLevel);AndroidRID=android-x64" />
+      <_ProjectsToPack Include="Microsoft.Android.Ref.proj"     AdditionalProperties="AndroidApiLevel=$(AndroidLatestUnstableApiLevel)" />
+    </ItemGroup>
   </Target>
 
   <Target Name="CreateAllPacks"
       DependsOnTargets="DeleteExtractedWorkloadPacks;_SetGlobalProperties;GetXAVersionInfo;_CleanNuGetDirectory;_CreatePreviewPacks;_CreateDefaultRefPack">
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm   &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidRID=android-arm64 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x86   &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:AndroidRID=android-x64   &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:HostOS=Linux   &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Linux' " />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:HostOS=Darwin  &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' == 'Darwin' " />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') -p:HostOS=Windows &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" Condition=" '$(HostOS)' != 'Linux' " /> <!-- Windows pack should be built both Windows and macOS -->
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Android.proj&quot;" />
-    <Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_GlobalProperties, ' ') &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj&quot;" />
+    <ItemGroup>
+      <_ProjectsToPack Include="Microsoft.Android.Runtime.proj" AdditionalProperties="AndroidRID=android-arm" />
+      <_ProjectsToPack Include="Microsoft.Android.Runtime.proj" AdditionalProperties="AndroidRID=android-arm64" />
+      <_ProjectsToPack Include="Microsoft.Android.Runtime.proj" AdditionalProperties="AndroidRID=android-x86" />
+      <_ProjectsToPack Include="Microsoft.Android.Runtime.proj" AdditionalProperties="AndroidRID=android-x64" />
+      <_ProjectsToPack Include="Microsoft.Android.Ref.proj" />
+      <_ProjectsToPack Include="Microsoft.Android.Sdk.proj" AdditionalProperties="HostOS=Linux" Condition=" '$(HostOS)' == 'Linux' " />
+      <_ProjectsToPack Include="Microsoft.Android.Sdk.proj" AdditionalProperties="HostOS=Darwin" Condition=" '$(HostOS)' == 'Darwin' " />
+      <_ProjectsToPack Include="Microsoft.Android.Sdk.proj" AdditionalProperties="HostOS=Windows" Condition=" '$(HostOS)' != 'Linux' " /> <!-- Windows pack should be built both Windows and macOS -->
+      <_ProjectsToPack Include="Microsoft.NET.Sdk.Android.proj" />
+      <_ProjectsToPack Include="$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj" />
+    </ItemGroup>
+    <MSBuild
+        Projects="@(_ProjectsToPack)"
+        Targets="Restore;Pack"
+        Properties="@(_GlobalProperties)"
+        BuildInParallel="$(BuildInParallel)"
+    />
     <ReplaceFileContents
         SourceFile="vs-workload.in.props"
         DestinationFile="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\vs-workload.props"
diff --git a/src/Microsoft.Android.Templates/Microsoft.Android.Templates.csproj b/src/Microsoft.Android.Templates/Microsoft.Android.Templates.csproj
index f821e7233e4..fdba0cbd536 100644
--- a/src/Microsoft.Android.Templates/Microsoft.Android.Templates.csproj
+++ b/src/Microsoft.Android.Templates/Microsoft.Android.Templates.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.Build.NoTargets">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>