Merge branch 'main' into dev/mcumming/merge-mtouch-dialog

Author: mcumming

Make.config

@@ -500,8 +500,10 @@ MACOS_X64_SWIFTFLAGS=$(MACOS_COMMON_SWIFTFLAGS) -target x86_64-apple-macos$(MIN_
 # things in other places if they absolutely must.
 MONO_PATH=$(TOP)/external/mono
 XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
+MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog
+API_TOOLS_PATH=$(TOP)/external/api-tools
 MACCORE_PATH=$(TOP)/../maccore
-
+ADR_PATH=$(TOP)/../macios-adr
 
 MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
 SYSTEM_MCS=$(MONO_PREFIX)/bin/mcs

mk/xamarin-reset.sh

@@ -9,10 +9,13 @@ if [[ $DEPENDENCY_MODULE =~ git@github.com ]]; then
 	# git@ url
 	DEPENDENCY_REMOTE=${DEPENDENCY_MODULE/git@github.com:/}
 	DEPENDENCY_REMOTE=${DEPENDENCY_REMOTE%%/*}
-else
+elif [[ $DEPENDENCY_MODULE =~ https://github.com ]]; then
 	# https:// url
 	DEPENDENCY_REMOTE=${DEPENDENCY_MODULE/https:\/\/github.com\//}
 	DEPENDENCY_REMOTE=${DEPENDENCY_REMOTE%%/*}
+elif [[ $DEPENDENCY_MODULE =~ devdiv@dev.azure.com ]]; then
+	DEPENDENCY_REMOTE=${DEPENDENCY_MODULE/https:\/\/devdiv@dev.azure.com\/devdiv\/}
+	DEPENDENCY_REMOTE=${DEPENDENCY_REMOTE%%/_git*}
 fi
 
 if test -d "$DEPENDENCY_PATH"; then

mk/xamarin.mk

@@ -7,13 +7,22 @@ MONO_BRANCH    := $(shell cd $(MONO_PATH) 2> /dev/null && git symbolic-ref --sho
 endif
 
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := 4ebacfa6fcb3737c9fcdd516501fc95582928fbe
+NEEDED_MACCORE_VERSION := 5805eb9adacd8f2aeb2852ffbc78b24fb4a43866
 NEEDED_MACCORE_BRANCH := main
 
 MACCORE_DIRECTORY := maccore
 MACCORE_MODULE    := git@github.com:xamarin/maccore.git
 MACCORE_VERSION   := $(shell cd $(MACCORE_PATH) 2> /dev/null && git rev-parse HEAD 2> /dev/null)
 MACCORE_BRANCH    := $(shell cd $(MACCORE_PATH) 2> /dev/null && git symbolic-ref --short HEAD 2> /dev/null)
+
+
+NEEDED_ADR_VERSION := d466eac70a9b1bba94c18c63e34e590c66f6d044
+NEEDED_ADR_BRANCH := main
+
+ADR_DIRECTORY := macios-adr
+ADR_MODULE    := https://devdiv@dev.azure.com/devdiv/DevDiv/_git/macios-adr
+ADR_VERSION   := $(shell cd $(ADR_PATH) 2> /dev/null && git rev-parse HEAD 2> /dev/null)
+ADR_BRANCH    := $(shell cd $(ADR_PATH) 2> /dev/null && git symbolic-ref --short HEAD 2> /dev/null)
 endif
 
 # Available versions can be seen here:
@@ -103,5 +112,10 @@ $(MACCORE_PATH):
 	$(Q) git clone --recursive $(MACCORE_MODULE) $(MACCORE_PATH)
 	$(Q) $(MAKE) reset-maccore
 
+$(ADR_PATH):
+	$(Q) git clone --recursive $(ADR_MODULE) $(ADR_PATH)
+	$(Q) $(MAKE) reset-adr
+
 $(eval $(call CheckVersionTemplate,maccore,MACCORE))
+$(eval $(call CheckVersionTemplate,macios-adr,ADR))
 endif

src/Makefile

@@ -408,16 +408,16 @@ $(DOTNET_DESTDIR)/$($(2)_NUGET_REF_NAME)/ref/$(DOTNET_TFM)/Microsoft.$(1).xml: $
 
 $($(2)_DOTNET_BUILD_DIR)/doc/Microsoft.$(1).xml: $($(2)_DOTNET_BUILD_DIR)/ref/Microsoft.$(1).xml $($(2)_DOTNET_BUILD_DIR)/ref/Microsoft.$(1).dll build/.build-adr-stamp | $($(2)_DOTNET_BUILD_DIR)/doc
 ifdef ENABLE_XAMARIN
-	$(Q) $(MAKE) run -C $(MACCORE_PATH)/tools/apple-doc-reader ASSEMBLY="$(abspath $($(2)_DOTNET_BUILD_DIR)/ref/Microsoft.$(1).dll)" INPUT="$(abspath $($(2)_DOTNET_BUILD_DIR)/ref/Microsoft.$(1).xml)" OUTPUT="$(abspath $$@)"
+	$(Q) $(MAKE) run -C $(ADR_PATH) ASSEMBLY="$(abspath $($(2)_DOTNET_BUILD_DIR)/ref/Microsoft.$(1).dll)" INPUT="$(abspath $($(2)_DOTNET_BUILD_DIR)/ref/Microsoft.$(1).xml)" OUTPUT="$(abspath $$@)"
 else
 	$$(Q) $$(CP) $($(2)_DOTNET_BUILD_DIR)/ref/Microsoft.$(1).xml $$@
 endif
 endef
 
 build/.build-adr-stamp:
 ifdef ENABLE_XAMARIN
-	$(Q) $(MAKE) build -C $(MACCORE_PATH)/tools/apple-doc-reader
-	$(Q) $(MAKE) create -C $(MACCORE_PATH)/tools/apple-doc-reader
+	$(Q) $(MAKE) build -C $(ADR_PATH)
+	$(Q) $(MAKE) create -C $(ADR_PATH)
 endif
 	$(Q) touch $@
 

tests/monotouch-test/SystemConfiguration/NetworkReachabilityTest.cs

@@ -31,6 +31,7 @@ public void CtorNameAddress ()
 				NetworkReachabilityFlags flags;
 
 				Assert.IsTrue (nr.TryGetFlags (out flags));
+				flags &= ~NetworkReachabilityFlags.TransientConnection; // Remove the TransientConnection flag if it's set
 				Assert.That (flags, Is.EqualTo (NetworkReachabilityFlags.Reachable), "Reachable");
 			}
 		}

tests/rgen/Makefile

@@ -17,6 +17,6 @@ build-generator-tests:
 run-generator-tests:
 	$(Q) $(DOTNET) test Microsoft.Macios.Generator.Tests/Microsoft.Macios.Generator.Tests.csproj $(TEST_FILTER)
 
-build-all: build-bindings-analyzer-tests build-generator-tests
+build build-all: build-bindings-analyzer-tests build-generator-tests
 
 run-tests run test: run-bindings-analyzer-tests run-generator-tests

tools/devops/automation/build-pipeline.yml

@@ -150,6 +150,11 @@ resources:
       ref: refs/heads/main
       endpoint: xamarin
 
+    - repository: macios-adr
+      type: git
+      name: macios-adr
+      ref: refs/heads/main
+
     - repository: CustomPipelineTemplates
       type: git
       name: 1ESPipelineTemplates/MicroBuildTemplate
@@ -220,6 +225,7 @@ extends:
         exclude:
           - repository: yaml-templates
           - repository: sdk-insertions
+          - repository: macios-adr # macios-adr has it's own build pipeline and should not be included in the source analysis
     stages:
       - template: templates/main-stage.yml
         parameters:

tools/devops/automation/build-pull-request.yml

@@ -141,6 +141,11 @@ resources:
     ref: refs/heads/main
     endpoint: xamarin
 
+  - repository: macios-adr
+    type: git
+    name: macios-adr
+    ref: refs/heads/main
+
   - repository: CustomPipelineTemplates
     type: git
     name: 1ESPipelineTemplates/MicroBuildTemplate
@@ -205,6 +210,7 @@ extends:
         exclude:
         - repository: yaml-templates
         - repository: sdk-insertions
+        - repository: macios-adr # macios-adr has it's own build pipeline and should not be included in the source analysis
     stages:
     - template: templates/main-stage.yml
       parameters:

tools/devops/automation/run-post-ci-build-vs-insertion.yml

@@ -76,6 +76,7 @@ extends:
         exclude:
           - repository: yaml-templates
           - repository: sdk-insertions
+          - repository: macios-adr # macios-adr has it's own build pipeline and should not be included in the source analysis
     stages:
       - template: templates/release/vs-insertion-prep.yml
         parameters:

tools/devops/automation/templates/common/checkout.yml

@@ -35,6 +35,12 @@ steps:
   persistCredentials: true  # hugely important, else there are some scripts that check a single file from maccore that will fail
   fetchTags: false
 
+- checkout: macios-adr
+  clean: true
+  fetchDepth: 0
+  persistCredentials: true
+  fetchTags: false
+
 - checkout: yaml-templates
   clean: true
   fetchTags: false