From 8912f35adbf7d16086ea3e53c740e4aa4cde430a Mon Sep 17 00:00:00 2001
From: VS MobileTools Engineering Service 2
 <vsmobiletoolsengsvc2@microsoft.com>
Date: Tue, 21 Jun 2022 13:33:28 -0700
Subject: [PATCH] [d17-2] Backport build fixes (#15309)

This is a backport of:

* #15226
* #15227

These are build fixes we need to keep this branch building (which will be nice to have if we branch off release/6.0.5xx from this branch at some point).


Backport of #15264

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
---
 Make.config                                              | 2 +-
 builds/Makefile                                          | 5 ++++-
 .../automation/templates/build/sign-and-notarized.yml    | 2 +-
 tools/devops/automation/templates/common/setup.yml       | 9 ---------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Make.config b/Make.config
index da4563b7639d..ea876dab0895 100644
--- a/Make.config
+++ b/Make.config
@@ -465,7 +465,7 @@ MAC_PACKAGE_DMG_DIRNAME="$(MAC_PACKAGE_TITLE)"
 MAC_PACKAGE_UTI=com.$(MAC_PACKAGE_NAME_LOWER).pkg
 MAC_PACKAGE_INSTALL_LOCATION=$(MAC_FRAMEWORK_VERSIONED_DIR)
 
-TT = $(SYSTEM_DOTNET) t4
+TT = $(SYSTEM_DOTNET) tool restore && $(SYSTEM_DOTNET) t4
 
 PRODUCT_KEY_PATH?=$(TOP)/product.snk
 
diff --git a/builds/Makefile b/builds/Makefile
index c7de6d78c97c..ff3d7c6a62a0 100644
--- a/builds/Makefile
+++ b/builds/Makefile
@@ -143,7 +143,10 @@ endif
 	$(Q) $(CP) ./downloads/microsoft.net.workload.emscripten.manifest-$(TOOLCHAIN_MANIFEST_VERSION_BAND)/$(EMSCRIPTEN_MANIFEST_PACKAGE_VERSION)/data/WorkloadManifest.* ./downloads/dotnet-sdk-$(DOTNET_VERSION)-osx-x64/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.emscripten/
 	$(Q) touch $@
 
-.stamp-install-t4: $(TOP)/.config/dotnet-tools.json
+
+.stamp-install-t4: $(TOP)/.config/dotnet-tools.json .stamp-download-dotnet-packages
+	@# https://github.com/dotnet/sdk/issues/16165
+	$(Q) rm -f ~/.dotnet/toolResolverCache/*/dotnet-t4
 	$(SYSTEM_DOTNET) tool restore
 	$(Q) touch $@
 
diff --git a/tools/devops/automation/templates/build/sign-and-notarized.yml b/tools/devops/automation/templates/build/sign-and-notarized.yml
index b98a1b177975..c9474c349c71 100644
--- a/tools/devops/automation/templates/build/sign-and-notarized.yml
+++ b/tools/devops/automation/templates/build/sign-and-notarized.yml
@@ -141,7 +141,7 @@ steps:
       PACKAGES="$IOS_PKG $MAC_PKG $IOS_DOTNET_PKG $TVOS_DOTNET_PKG $WATCHOS_DOTNET_PKG $MACOS_DOTNET_PKG $MACCATALYST_DOTNET_PKG"
       echo "Packages found at $PACKAGES"
 
-      echo "$PACKAGES" | xargs python $(Build.SourcesDirectory)/release-scripts/sign_and_notarize.py --no_notarization -a "$APP_ID" -i "$INSTALL_ID" -u "$APPLE_ACCOUNT" -p "$APPLE_PASS" -t "$TEAM_ID" -d $(Build.SourcesDirectory)/package/notarized -e "$MAC_ENTITLEMENTS" -k "$KEYCHAIN"
+      echo "$PACKAGES" | xargs python3 $(Build.SourcesDirectory)/release-scripts/sign_and_notarize.py --no_notarization -a "$APP_ID" -i "$INSTALL_ID" -u "$APPLE_ACCOUNT" -p "$APPLE_PASS" -t "$TEAM_ID" -d $(Build.SourcesDirectory)/package/notarized -e "$MAC_ENTITLEMENTS" -k "$KEYCHAIN"
     env:
       PRODUCTSIGN_KEYCHAIN_PASSWORD: ${{ parameters.keyringPass }}
       MAC_ENTITLEMENTS: $(Build.SourcesDirectory)/xamarin-macios/mac-entitlements.plist
diff --git a/tools/devops/automation/templates/common/setup.yml b/tools/devops/automation/templates/common/setup.yml
index 4e3bf5f9344f..aef1510a8991 100644
--- a/tools/devops/automation/templates/common/setup.yml
+++ b/tools/devops/automation/templates/common/setup.yml
@@ -33,15 +33,6 @@ steps:
   displayName: 'Show Environment'
 
 - powershell: |
-    Write-Host "Python version"
-    python --version
-
-    Write-Host "Python location"
-    which python
-
-    Write-Host "Python2 location"
-    which python2
-
     Write-Host "Python3 location"
     which python3