[xcode12.4] Update NuGet feed (#10600)

bump maccore for dependencies updates

New commits in xamarin/maccore:

* xamarin/maccore@722e62d680 Remove dependency on XmlDocSync repo/tools (#2393)
* xamarin/maccore@f3d1b21947 Update NuGet.config to enforce a single feed (#2374)

Diff: 77a7f937d8..722e62d680

* Disable dotnet (and related tests from release branch)

* [xharness] Forcefully disable .NET tests.

* Exclude more .NET stuff.

* Ignore dotnet (if not enabled) for tests

Co-authored-by: Sebastien Pouliot <sebastien.pouliot@microsoft.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>

Makefile

@@ -1,8 +1,12 @@
 TOP=.
-SUBDIRS=builds runtime fsharp src msbuild tools dotnet
+SUBDIRS=builds runtime fsharp src msbuild tools
 include $(TOP)/Make.config
 include $(TOP)/mk/versions.mk
 
+ifdef ENABLE_DOTNET
+SUBDIRS += dotnet
+endif
+
 #
 # Common
 #

NuGet.config

@@ -4,8 +4,14 @@
 		<add key="repositorypath" value="packages" />
 	</config>
 	<packageSources>
-		<add key="Nuget Official" value ="https://www.nuget.org/api/v2/" />
+		<clear />
+		<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
 		<add key="Dotnet arcade" value ="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+		<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
+		<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
 	</packageSources>
+	<disabledPackageSources>
+		<clear />
+	</disabledPackageSources>
 </configuration>
 

jenkins/build.sh

@@ -120,8 +120,8 @@ if test -z "$ENABLE_DEVICE_BUILD"; then
 	CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-ios-device"
 fi
 
-# Enable dotnet bits on the bots
-CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-dotnet --enable-install-source"
+# Disable dotnet bits on the bots (only useful in 'main' right now)
+CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-dotnet --enable-install-source"
 
 echo "Configuring the build with: $CONFIGURE_FLAGS"
 # shellcheck disable=SC2086

mk/xamarin.mk

@@ -7,7 +7,7 @@ MONO_BRANCH    := $(shell cd $(MONO_PATH) 2> /dev/null && git symbolic-ref --sho
 endif
 
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := 77a7f937d8d54b3c7f8eb13602831205fd2a28db
+NEEDED_MACCORE_VERSION := 722e62d68045cb7257043c5969ad31dba4038a28
 NEEDED_MACCORE_BRANCH := d16-8
 
 MACCORE_DIRECTORY := maccore

tests/Makefile

@@ -1,5 +1,9 @@
 TOP = ..
-SUBDIRS=test-libraries dotnet
+SUBDIRS=test-libraries
+
+ifdef ENABLE_DOTNET
+SUBDIRS += dotnet
+endif
 
 # disabled for now: mac-test
 

tests/xharness/Jenkins/TestSelector.cs

@@ -175,7 +175,7 @@ namespace Xharness.Jenkins {
 			SetEnabled (files, macBindingProject, "mac-binding-project", ref jenkins.IncludeMacBindingProject);
 			SetEnabled (files, xtroPrefixes, "xtro", ref jenkins.IncludeXtro);
 			SetEnabled (files, cecilPrefixes, "cecil", ref jenkins.IncludeCecil);
-			SetEnabled (files, dotnetFilenames, "dotnet", ref jenkins.IncludeDotNet);
+			// SetEnabled (files, dotnetFilenames, "dotnet", ref jenkins.IncludeDotNet);
 		}
 
 		void SelectTestsByLabel (int pullRequest)
@@ -234,7 +234,7 @@ namespace Xharness.Jenkins {
 			SetEnabled (labels, "xtro", ref jenkins.IncludeXtro);
 			SetEnabled (labels, "cecil", ref jenkins.IncludeCecil);
 			SetEnabled (labels, "old-simulator", ref jenkins.IncludeOldSimulatorTests);
-			SetEnabled (labels, "dotnet", ref jenkins.IncludeDotNet);
+			// SetEnabled (labels, "dotnet", ref jenkins.IncludeDotNet);
 			SetEnabled (labels, "all", ref jenkins.IncludeAll);
 
 			// enabled by default

tools/devops/automation/templates/build/build.yml

@@ -230,7 +230,7 @@ steps:
       CONFIGURE_FLAGS="--enable-xamarin"
     fi
 
-    CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-dotnet --enable-install-source"
+    CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-dotnet --enable-install-source"
 
     cd $(Build.SourcesDirectory)/xamarin-macios/
     ./configure $CONFIGURE_FLAGS