From bed9e6bd73b02d999b5f09cc560c1da5d17bbd82 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Wed, 9 Jun 2021 18:07:43 -0400
Subject: [PATCH 1/4] Branching for d16-11; Bump $(ProductVersion) to 11.4.0

Xamarin.Android v11.4.0 will be shipped as part of
Visual Studio 2019 16.11 Preview 3 and subsequent releases.

Changes: https://github.com/xamarin/monodroid/compare/76c04cd15eca7afc269a6d26296e9d2db6f79be2...fab2d0b3e5205cb97d03e7a33a367245dbd211aa

  * xamarin/monodroid@fab2d0b3e: Branching for d16-11. (#1209)
---
 .external             | 2 +-
 .gitmodules           | 4 ++--
 Directory.Build.props | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.external b/.external
index 9417d72df09..86b72f444e9 100644
--- a/.external
+++ b/.external
@@ -1,2 +1,2 @@
-xamarin/monodroid:main@76c04cd15eca7afc269a6d26296e9d2db6f79be2
+xamarin/monodroid:d16-11@fab2d0b3e5205cb97d03e7a33a367245dbd211aa
 mono/mono:2020-02@c633fe923832f0c3db3c4e6aa98e5592bf5a06e7
diff --git a/.gitmodules b/.gitmodules
index 83c95bab23b..d9da3b7331c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,7 +13,7 @@
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
     url = https://github.com/xamarin/java.interop.git
-    branch = main
+    branch = d16-11
 [submodule "external/lz4"]
     path = external/lz4
     url = https://github.com/lz4/lz4.git
@@ -46,4 +46,4 @@
 [submodule "external/xamarin-android-tools"]
     path = external/xamarin-android-tools
     url = https://github.com/xamarin/xamarin-android-tools
-    branch = main
+    branch = d16-11
diff --git a/Directory.Build.props b/Directory.Build.props
index 8dc6879b484..9b4506e3f17 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <ProductVersion>11.3.99</ProductVersion>
+    <ProductVersion>11.4.0</ProductVersion>
     <!-- NuGet package version numbers. See Documentation/guides/OneDotNet.md.
          Rules:
          * Major/Minor match Android stable API level, such as 30.0 for API 30.

From 6d29ed87961fe2b07d12f2c7cd439b7159aa3d61 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Thu, 10 Jun 2021 09:22:44 -0400
Subject: [PATCH 2/4] Use macOS d16-10 Designer tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=4855000&view=logs&j=291ea0a5-8698-5441-8000-f7fa1e7709b7&t=6f8f21ba-ac47-54c3-4dfb-6d90f0f1c309

The macOS Designer Tests fail to *build*:

    /Users/runner/work/1/s/UITools/Designer/external/Xamarin.PropertyEditing/Xamarin.PropertyEditing.Mac/Controls/BaseDateTimeEditorControl.cs(2,7):
    error CS0246: The type or namespace name 'AppKit' could not be found (are you missing a using directive or an assembly reference?)
    [/Users/runner/work/1/s/UITools/Designer/external/Xamarin.PropertyEditing/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj]
    …plus 931 other errors…

which is a tad "odd" in that the macS Designer Tests build and run
successfully for both d16-10 and main branches, but not d16-11.

My conjecture is that "something changed" in UITools/d16-11 to break
the macOS build.

Update the "Clone and update UITools" step for
`designer_integration_mac` and explicitly checkout the d16-10 branch.
Let's see if that improves things.
---
 build-tools/automation/azure-pipelines.yaml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 60aa48fa79b..452d2c09369 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -1073,13 +1073,14 @@ stages:
     - powershell: |
         # Use the branch name of the source being built or the PR target branch name. Fall back to 'main' if the branch is unknown.
         $branchPrefix = "/refs/heads/"
-        $branchName = "$(Build.SourceBranch)" -replace $branchPrefix, ""
-        if ("$(Build.Reason)" -eq "PullRequest") {
-            $branchName = "$(System.PullRequest.TargetBranch)" -replace $branchPrefix, ""
-        }
-        if (("$branchName" -ne "main") -and ("$branchName" -notlike "d16*")) {
-            $branchName = "main"
-        }
+        $branchName = "d16-10"
+        # $branchName = "$(Build.SourceBranch)" -replace $branchPrefix, ""
+        # if ("$(Build.Reason)" -eq "PullRequest") {
+        #     $branchName = "$(System.PullRequest.TargetBranch)" -replace $branchPrefix, ""
+        # }
+        # if (("$branchName" -ne "main") -and ("$branchName" -notlike "d16*")) {
+        #     $branchName = "main"
+        # }
         Set-Location -Path $(System.DefaultWorkingDirectory)/UITools
         git checkout $branchName
         git submodule update -q --init --recursive

From 1628d59976582f2166de027533489b58bea0bb4f Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Thu, 10 Jun 2021 11:34:58 -0400
Subject: [PATCH 3/4] Cleanup the d16-11 check for macOS+Designer

---
 build-tools/automation/azure-pipelines.yaml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 452d2c09369..9b0aeaa47c4 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -1073,14 +1073,18 @@ stages:
     - powershell: |
         # Use the branch name of the source being built or the PR target branch name. Fall back to 'main' if the branch is unknown.
         $branchPrefix = "/refs/heads/"
-        $branchName = "d16-10"
-        # $branchName = "$(Build.SourceBranch)" -replace $branchPrefix, ""
-        # if ("$(Build.Reason)" -eq "PullRequest") {
-        #     $branchName = "$(System.PullRequest.TargetBranch)" -replace $branchPrefix, ""
-        # }
-        # if (("$branchName" -ne "main") -and ("$branchName" -notlike "d16*")) {
-        #     $branchName = "main"
-        # }
+        $branchName = "$(Build.SourceBranch)" -replace $branchPrefix, ""
+        if ("$(Build.Reason)" -eq "PullRequest") {
+            $branchName = "$(System.PullRequest.TargetBranch)" -replace $branchPrefix, ""
+        }
+        if (("$branchName" -ne "main") -and ("$branchName" -notlike "d16*")) {
+            $branchName = "main"
+        }
+        if ("$branchName" -eq "d16-11") {
+            # Building UITools/d16-11 on macOS results in 930+ CS0246 errors around AppKit.
+            # Use d16-10 branch instead.
+            $branchName = "d16-10"
+        }
         Set-Location -Path $(System.DefaultWorkingDirectory)/UITools
         git checkout $branchName
         git submodule update -q --init --recursive

From dfe30d8e570107b925ce734cd4ae0211c2069955 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Thu, 10 Jun 2021 15:58:44 -0400
Subject: [PATCH 4/4] Constrain mono to 6.12.0.137.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=4857598&view=logs&j=fb3518d4-6415-56d8-56e7-3e01113bd696&t=339edcd9-c55f-51d5-0409-e3f1c4277c4d
Context: https://discord.com/channels/732297728826277939/732297837953679412/852637194221125683
Context: https://github.com/xamarin/xamarin-android/pull/6014

Looks like xamarin/xamarin-android#6014 attempted to bump to a system
mono, and that bump broke ~everything:

	226) Error : Xamarin.Android.Build.Tests.SingleProjectTest.AndroidManifestProperties
	System.IO.FileNotFoundException : Could not load file or assembly 'Microsoft.NET.StringTools, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' or one of its dependencies. The system cannot find the file specified.
	   at Microsoft.Build.Evaluation.Expander`2.MetadataExpander.ExpandMetadataLeaveEscaped(String expression, IMetadataTable metadata, ExpanderOptions options, IElementLocation elementLocation)
	   at Microsoft.Build.Evaluation.Expander`2.ExpandIntoStringLeaveEscaped(String expression, ExpanderOptions options, IElementLocation elementLocation) in /Users/builder/jenkins/workspace/build-package-osx-mono/2020-02/external/bockbuild/builds/msbuild-15/src/Build/Evaluation/Expander.cs:line 414
	   …

Set `$(MonoRequiredMaximumVersion)` to 6.12.0.137, to *constrain*
which system mono we use.  Hopefully this will "un-bork" CI.
---
 Configuration.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration.props b/Configuration.props
index 8b6f8b0e65b..0e868965d45 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -95,7 +95,7 @@
     <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
     <MonoDarwinPackageUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2020-02/144/b4a385816ed4f1398d0184c38f19f560e868fd80/MonoFramework-MDK-6.12.0.137.macos10.xamarin.universal.pkg</MonoDarwinPackageUrl>
     <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.12.0.137</MonoRequiredMinimumVersion>
-    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">6.12.99</MonoRequiredMaximumVersion>
+    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">6.12.0.137</MonoRequiredMaximumVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' And '$(RunningOnCI)' == 'true' ">False</IgnoreMaxMonoVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
     <LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\mono\sdks\out\android-sources\external\linker\src</LinkerSourceDirectory>