Make sure to fatten the packages (#213)

* Make sure to fatten the packages
* Use a separate powershell script
* Improve the fat packager

Author: mattleibow

.gitignore

@@ -7,6 +7,7 @@ output/
 docs/
 .vs/
 generated/
+tmp/
 **/scriptcs_packages/
 
 *.xam

azure-pipelines.yml

@@ -26,26 +26,8 @@ jobs:
         - 'xamarin.androidbinderator.tool': '0.4.1'
         - 'xamarin.androidx.migration.tool': '1.0.0-preview05'
       postBuildSteps:
-        - script: |
-            # Make a temp folder to move the created nugets to before we fat package them
-            mkdir -p $(Build.SourcesDirectory)/tmp/nuget
-            mkdir -p $(Build.SourcesDirectory)/tmp/output
-            # Move all of the nupkg files from output into the temp folder we just created
-            mv $(Build.SourcesDirectory)/output/*.nupkg $(Build.SourcesDirectory)/tmp/nuget
-            # Move the remaining output bits to a temp location so they don't get overwritten
-            mv $(Build.SourcesDirectory)/output/* $(Build.SourcesDirectory)/tmp/output
-            sh build.sh --script nuget.cake \
-              --localSource=$(Build.SourcesDirectory)/tmp/nuget \
-              --packagesPath=$(Build.SourcesDirectory)/tmp/pkgs \
-              --workingPath=$(Build.SourcesDirectory)/tmp/working \
-              --outputPath=$(Build.SourcesDirectory)/output \
-              --incrementVersion=False \
-              --packLatestOnly=True \
-              --useExplicitVersion=True
-            # Move the other output bits back to the original output folder
-            mv $(Build.SourcesDirectory)/tmp/output/* $(Build.SourcesDirectory)/output
-          displayName: 'NuGet FAT'
-          enabled: false
+        - pwsh: .\fatten.ps1
+          displayName: 'Fatten the NuGet packages'
         # Run some internal auditing on Windows
         - ${{ if and(eq(variables['System.TeamProject'], 'devdiv'), eq(variables['System.JobName'], 'windows')) }}:
           - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0

fatten.ps1

@@ -0,0 +1,22 @@
+# Make a temp folder to move the created nugets to before we fat package them
+mkdir -p ./tmp/nuget
+mkdir -p ./tmp/output
+
+# Move all of the nupkg files from output into the temp folder we just created
+mv ./output/*.nupkg ./tmp/nuget
+
+# Move the remaining output bits to a temp location so they don't get overwritten
+mv ./output/* ./tmp/output
+
+dotnet cake nuget.cake `
+    --localSource=./tmp/nuget `
+    --packagesPath=./tmp/pkgs `
+    --workingPath=./tmp/working `
+    --outputPath=./output `
+    --incrementVersion=False `
+    --packLatestOnly=True `
+    --useExplicitVersion=True `
+    --skipNuspecProcessing=True
+
+# Move the other output bits back to the original output folder
+mv ./tmp/output/* ./output

nuget.cake

@@ -48,7 +48,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#addin nuget:?package=Cake.FileHelpers&version=3.0.0
+#addin nuget:?package=Cake.FileHelpers&version=3.2.1
 #addin nuget:?package=NuGet.Packaging&version=4.7.0&loaddependencies=true
 #addin nuget:?package=NuGet.Protocol&version=4.7.0&loaddependencies=true
 
@@ -100,6 +100,8 @@ var minimumVersion = new Dictionary<string, NuGetVersion> {
 
 var blacklistIdPrefix = new List<string> {
     "xamarin.build.download",
+    "xamarin.android.support.constraint.layout",
+    "xamarin.google.guava",
 };
 
 var seedPackages = new [] {
@@ -203,16 +205,18 @@ VersionRange GetSupportVersionRange(FilePath nuspec)
         // search this nuget for a support version
         version = xmd
             .Descendants(ns + "dependency")
-            .FirstOrDefault(e => e.Attribute("id").Value.ToLower().StartsWith("xamarin.android.support"))
+            .LastOrDefault(e => e.Attribute("id").Value.ToLower().StartsWith("xamarin.android.support"))
             ?.Attribute("version")
             ?.Value;
 
         // if none was found, look in the dependencies
         if (string.IsNullOrEmpty(version)) {
-            foreach (var xdep in xmd.Descendants(ns + "dependency")) {
+            foreach (var xdep in xmd.Descendants(ns + "dependency").Reverse()) {
                 var id = xdep.Attribute("id").Value.ToLower();
                 var range = VersionRange.Parse(xdep.Attribute("version").Value);
                 var depNuspec = $"{packagesPath}/{id}/{range.MinVersion ?? range.MaxVersion}/{id}.nuspec";
+                if (!FileExists(depNuspec))
+                    continue;
                 // if a support version was found, use it, otherwise continue looking
                 var suppRange = GetSupportVersionRange(depNuspec);
                 if (suppRange != null)
@@ -244,7 +248,7 @@ VersionRange GetArchVersionRange(FilePath nuspec)
     if (xid.Value.ToLower().StartsWith("xamarin.android.support")) {
         version = xmd
             .Descendants(ns + "dependency")
-            .First(e => e.Attribute("id").Value.ToLower().StartsWith("xamarin.android.arch"))
+            .Last(e => e.Attribute("id").Value.ToLower().StartsWith("xamarin.android.arch"))
             .Attribute("version")
             .Value;
     } else {
@@ -509,8 +513,9 @@ Task("PrepareWorkingDirectory")
 
         // move the old dependencies into the new groups if they contain a support version
         // if not, then just use the version of the nuspec
-        var xgroups = xdeps.Elements(ns + "group");
-        foreach (var xoldGroup in xgroups) {
+        // only select the last group as the rest will be re-created
+        var xoldGroup = xdeps.Elements(ns + "group").LastOrDefault();
+        if (xoldGroup != null) {
             var xgroupDeps = xoldGroup.Elements(ns + "dependency");
             var firstSupportVersion = xgroupDeps
                 .Where(x => x.Attribute("id").Value.ToLower().StartsWith("xamarin.android.support"))