Merge remote-tracking branch 'origin/main' into dotnet-msbuild-tests

Make.config

@@ -35,7 +35,7 @@ $(TOP)/Make.config.inc: $(TOP)/Make.config $(TOP)/mk/mono.mk
 
 include $(TOP)/Make.versions
 
-APIDIFF_REFERENCES=https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/d16-7/64004ee259c7ae9f046436ee82a29db0a45f49fb/76/package/bundle.zip
+APIDIFF_REFERENCES=https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/xcode12/5bcf5b877d2101a21f97b93d5c912273d804110d/238/package/bundle.zip
 
 PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 
@@ -111,9 +111,9 @@ WATCHOS_NUGET_VERSION_NO_METADATA=$(WATCHOS_NUGET_VERSION)-$(NUGET_PRERELEASE_ID
 WATCHOS_NUGET_VERSION_FULL=$(WATCHOS_NUGET_VERSION_NO_METADATA)+$(NUGET_BUILD_METADATA)
 
 # Xcode version should have both a major and a minor version (even if the minor version is 0)
-XCODE_VERSION=11.6
-XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_11.6.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_11.6.0.app/Contents/Developer
+XCODE_VERSION=12.0
+XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_12.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_12.0.0.app/Contents/Developer
 XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist)
 
 # Mono version embedded in XI/XM (NEEDED_MONO_VERSION/BRANCH) are specified in mk/mono.mk
@@ -139,12 +139,12 @@ MIN_CMAKE_URL=https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.dmg
 MIN_CMAKE_VERSION=2.8.8
 
 # ObjectiveSharpie min/max versions
-MIN_SHARPIE_VERSION=3.5.37
+MIN_SHARPIE_VERSION=3.5.38
 MAX_SHARPIE_VERSION=3.5.99
-MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/ab6c85e9-be56-4946-9c0d-b0f91c331ceb/0c66b78f532a6a488c98f4219d82be49/objectivesharpie-3.5.37.pkg
+MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/83e81fcc-39cd-4c2d-b906-ea635f424aaa/2cd8d79588fbb61fa0f4594c85cccfe6/objectivesharpie-3.5.38.pkg
 
 # Minimum OSX versions for building XI/XM
-MIN_OSX_BUILD_VERSION=10.15.2
+MIN_OSX_BUILD_VERSION=10.15.4
 # Minimum OSX version for executing XI/XM tooling.
 MIN_OSX_VERSION_FOR_IOS=10.11
 MIN_OSX_VERSION_FOR_MAC=10.11
@@ -168,7 +168,7 @@ MIN_IOS_SDK_VERSION=7.0
 MIN_OSX_SDK_VERSION=10.9
 MIN_WATCHOS_SDK_VERSION=2.0
 MIN_WATCHOS64_32_SDK_VERSION=5.1
-MIN_WATCH_OS_VERSION=1.0
+MIN_WATCH_OS_VERSION=2.0
 MIN_TVOS_SDK_VERSION=9.0
 
 # The min simulator version available in the Xcode we're using
@@ -181,7 +181,7 @@ MIN_TVOS_SIMULATOR_VERSION=10.2
 EXTRA_SIMULATORS=com.apple.pkg.iPhoneSimulatorSDK10_3 com.apple.pkg.AppleTVSimulatorSDK10_2 com.apple.pkg.WatchSimulatorSDK3_2
 
 INCLUDE_IOS=1
-INCLUDE_MAC=1
+#INCLUDE_MAC=1
 INCLUDE_WATCH=1
 INCLUDE_TVOS=1
 INCLUDE_DEVICE=1

Make.versions

@@ -48,8 +48,8 @@
 #   line changed in git).
 #
 
-IOS_PACKAGE_VERSION=13.23.0.$(IOS_COMMIT_DISTANCE)
-MAC_PACKAGE_VERSION=6.23.0.$(MAC_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=14.7.0.$(IOS_COMMIT_DISTANCE)
+MAC_PACKAGE_VERSION=6.99.0.$(MAC_COMMIT_DISTANCE)
 
 #
 # ** NuGet package version numbers **
@@ -66,7 +66,7 @@ MAC_PACKAGE_VERSION=6.23.0.$(MAC_COMMIT_DISTANCE)
 # WARNING: Do **not** use versions higher than the available Xcode SDK or else we will have issues with mtouch (See https://github.com/xamarin/xamarin-macios/issues/7705)
 # When bumping the major macOS version in MACOS_NUGET_VERSION also update the macOS version where we execute on bots in jenkins/Jenkinsfile (in the 'node' element)
 
-IOS_NUGET_VERSION=13.6.100
-TVOS_NUGET_VERSION=13.4.100
-WATCHOS_NUGET_VERSION=6.2.100
+IOS_NUGET_VERSION=14.0.100
+TVOS_NUGET_VERSION=14.0.100
+WATCHOS_NUGET_VERSION=7.0.100
 MACOS_NUGET_VERSION=10.15.100

Makefile

@@ -18,6 +18,8 @@ world: check-system
 
 .PHONY: check-system
 check-system:
+ifdef INCLUDE_MAC
+ifdef INCLUDE_IOS
 	@if [[ "x$(IOS_COMMIT_DISTANCE)" != "x$(MAC_COMMIT_DISTANCE)" ]]; then \
 		echo "$(COLOR_RED)*** The commit distance for Xamarin.iOS ($(IOS_COMMIT_DISTANCE)) and Xamarin.Mac ($(MAC_COMMIT_DISTANCE)) are different.$(COLOR_CLEAR)"; \
 		echo "$(COLOR_RED)*** To fix this problem, bump the revision (the third number) for both $(COLOR_GRAY)IOS_PACKAGE_NUMBER$(COLOR_RED) and $(COLOR_GRAY)MAC_PACKAGE_NUMBER$(COLOR_RED) in Make.versions.$(COLOR_CLEAR)"; \
@@ -29,6 +31,8 @@ check-system:
 		echo "$(COLOR_RED)*** Once fixed, you need to commit the changes for them to pass this check.$(COLOR_CLEAR)"; \
 		exit 1; \
 	fi
+endif
+endif
 	@./system-dependencies.sh
 	@echo "Building the packages:"
 	@echo "    Xamarin.iOS $(IOS_PACKAGE_VERSION)"

Versions-ios.plist.in

@@ -40,6 +40,7 @@
 			<string>13.4</string>
 			<string>13.5</string>
 			<string>13.6</string>
+			<string>14.0</string>
 		</array>
 		<key>tvOS</key>
 		<array>
@@ -63,10 +64,10 @@
 			<string>13.2</string>
 			<string>13.3</string>
 			<string>13.4</string>
+			<string>14.0</string>
 		</array>
 		<key>watchOS</key>
 		<array>
-			<string>1.0</string>
 			<string>2.0</string>
 			<string>2.1</string>
 			<string>2.2</string>
@@ -84,6 +85,7 @@
 			<string>6.0</string>
 			<string>6.1</string>
 			<string>6.2</string>
+			<string>7.0</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

Versions-mac.plist.in

@@ -17,6 +17,8 @@
 			<string>10.13</string>
 			<string>10.14</string>
 			<string>10.15</string>
+			<!-- <string>10.16</string> --> <!-- Reverted by Xcode 12 GM -->
+			<!-- <string>11.0</string> -->
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets

@@ -77,6 +77,7 @@
                             RuntimePackNamePatterns="Microsoft.$(_PlatformName).Runtime.**RID**"
                             RuntimePackRuntimeIdentifiers="$(_RuntimePackRuntimeIdentifiers)"
                             Profile="$(_PlatformName)"
+                            IsTrimmable="true"
                             />
   </ItemGroup>
 

dotnet/targets/Xamarin.Shared.Sdk.targets

@@ -383,7 +383,7 @@
 	<Target Name="_UpdateDynamicLibraryId" DependsOnTargets="_ComputeVariables" Inputs="@(_MonoLibrary)" Outputs="@(_MonoLibrary -> '$(_IntermediateNativeLibraryDir)%(Filename)%(Extension)')">
 		<!-- install_name_tool modifies the file in-place, so copy it first to a temporary directory before we fix it -->
 		<Copy SourceFiles="%(_MonoLibrary.FullPath)" DestinationFolder="$(_IntermediateNativeLibraryDir)" />
-		<Exec Command="install_name_tool -id @executable_path/%(_MonoLibrary.Filename)%(_MonoLibrary.Extension) $(_IntermediateNativeLibraryDir)%(_MonoLibrary.Filename)%(_MonoLibrary.Extension)" />
+		<Exec Command="xcrun install_name_tool -id @executable_path/%(_MonoLibrary.Filename)%(_MonoLibrary.Extension) $(_IntermediateNativeLibraryDir)%(_MonoLibrary.Filename)%(_MonoLibrary.Extension)" EnvironmentVariables="DEVELOPER_DIR=$(_SdkDevPath)" />
 		<!-- Update our item groups -->
 		<ItemGroup>
 			<_MonoLibraryFixed Include="@(_MonoLibrary -> '$(_IntermediateNativeLibraryDir)%(Filename)%(Extension)')" />

jenkins/Jenkinsfile

@@ -434,8 +434,8 @@ def abortExecutingBuilds ()
 }
 
 timestamps {
-    def mainMacOSVersion = 15
-    node ("xamarin-macios && macos-10.${mainMacOSVersion}") {
+    def mainMacOSVersion = "10.15"
+    node ("xamarin-macios && macos-${mainMacOSVersion}") {
         try {
             timeout (time: 15, unit: 'HOURS') {
                 // Hard-code a workspace, since branch-based and PR-based
@@ -884,23 +884,22 @@ timestamps {
                                         def lastOS = sh (returnStdout: true, script: "grep ^MACOS_NUGET_VERSION= '${workspace}/xamarin-macios/Make.versions' | sed -e 's/.*=//' -e 's/.[0-9]*\$//'").trim ().split ("\\.")[1].toInteger ()
                                         def macOSes = []
                                         def excludedOSes = []
-                                        for (os = firstOS; os <= lastOS; os++)
-                                            macOSes.add (os)
                                         // If any macOS version needs to be excluded manually, it can be done like this (in this case to remove macOS 10.14):
                                         // Any macOS versions excluded like this still get a entry in the Jenkins UI, making it explicit that the OS version was skipped.
-                                        //     excludedOSes.add (14)
+                                        //     excludedOSes.add ("10.14")
+                                        excludedOSes.add ("11.0") // We have a bot labelled as 10.16 (and we're running there)
                                         // Have in mind that the value in the list is only the minor part of the macOS version number.
                                         for (i = 0; i < macOSes.size (); i++) {
                                             def os = macOSes [i];
                                             def macOS = "${os}" // Need to bind the label variable before the closure
                                             def excluded = false
-                                            def nodeText = "XM tests on 10.${macOS}"
+                                            def nodeText = "XM tests on ${macOS}"
                                             if (indexOfElement (excludedOSes, os) >= 0) {
                                                 excluded = true
-                                                nodeText = "ℹ️ XM tests not executed on 10.${macOS} ℹ️"
+                                                nodeText = "ℹ️ XM tests not executed on ${macOS} ℹ️"
                                             } else if (os == mainMacOSVersion) {
                                                 excluded = true
-                                                nodeText = "ℹ️ XM tests not executed on a separate 10.${macOS} bot because they're already executed as a part of the main test run ℹ️"
+                                                nodeText = "ℹ️ XM tests not executed on a separate ${macOS} bot because they're already executed as a part of the main test run ℹ️"
                                             }
                                             builders [nodeText] = {
                                                 try {
@@ -916,8 +915,8 @@ timestamps {
                                                         }
                                                     }
                                                 } catch (err) {
-                                                    currentStage = "Running XM tests on '10.${macOS}'"
-                                                    def msg = "Xamarin.Mac tests on 10.${macOS} failed: " + err.getMessage ();
+                                                    currentStage = "Running XM tests on '${macOS}'"
+                                                    def msg = "Xamarin.Mac tests on ${macOS} failed: " + err.getMessage ();
                                                     appendFileComment ("🔥 [${msg}](${env.RUN_DISPLAY_URL}) 🔥\n")
                                                     failedStages.add (currentStage)
                                                     throw err

jenkins/list-macos-platforms.csharp

@@ -0,0 +1,28 @@
+#!/usr/bin/env /Library/Frameworks/Mono.framework/Commands/csharp
+
+using System.IO;
+using System.Text;
+using System.Xml;
+
+var args = Environment.GetCommandLineArgs ();
+var expectedArgumentCount = 1;
+if (args.Length != expectedArgumentCount + 2 /* 2 default arguments (executable + script) + 'expectedArgumentCount' arguments we're interested in */) {
+	// first arg is "/Library/Frameworks/Mono.framework/Versions/4.8.0/lib/mono/4.5/csharp.exe"
+	// second arg the script itself
+	// then comes the ones we care about
+	Console.WriteLine ($"Need {expectedArgumentCount} arguments, got {args.Length - 2}");
+	Environment.Exit (1);
+	return;
+}
+
+var plistPath = args [2];
+var doc = new XmlDocument ();
+doc.Load (plistPath);
+var nodes = doc.SelectNodes ($"/plist/dict/key[text()='KnownVersions']/following-sibling::dict[1]/key[text()='macOS']/following-sibling::array[1]/string");
+
+var sb = new StringBuilder ();
+foreach (XmlNode n in nodes)
+	sb.Append ($"{n.InnerText} ");
+Console.WriteLine (sb);
+
+Environment.Exit (0);

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 := ab4c99c9059656110b8f5cab8c4fb07f7f2f5bb9
+NEEDED_MACCORE_VERSION := d1f2dfa9a9189a77c7b6acc1f00c4a45ada6b2d4
 NEEDED_MACCORE_BRANCH := main
 
 MACCORE_DIRECTORY := maccore

msbuild/Makefile

@@ -325,9 +325,12 @@ DOTNET_TARGETS += \
 	$(foreach target,$(DOTNET_WATCHOS_FILES)      ,$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Sdk/tools/msbuild/watchOS/$(notdir $(target)))       \
 
 # macOS
+ifdef INCLUDE_MAC
 DOTNET_TARGETS += \
 	$(foreach target,$(DOTNET_MACOS_FILES)        ,$(DOTNET_DESTDIR)/$(MACOS_NUGET).Sdk/tools/msbuild/macOS/$(notdir $(target)))           \
 
+endif
+
 DOTNET_DIRECTORIES += \
 	$(DOTNET_DESTDIR)/$(IOS_NUGET).Sdk/tools/msbuild/iOS \
 	$(DOTNET_DESTDIR)/$(TVOS_NUGET).Sdk/tools/msbuild/iOS \

msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Common.targets

@@ -481,33 +481,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
 		</CompileSceneKitAssets>
 	</Target>
 
-	<Target Name="_CompileInterfaceDefinitions" DependsOnTargets="_DetectAppManifest;_DetectSdkLocations;_GetMinimumOSVersion;_CoreCompileInterfaceDefinitions" />
-
-	<Target Name="_CoreCompileInterfaceDefinitions">
-		<IBTool
-			Condition="'$(IsMacEnabled)' == 'true'"
-			SessionId="$(BuildSessionId)"
-			ToolExe="$(IBToolExe)"
-			ToolPath="$(IBToolPath)"
-			AppManifest="$(_AppManifest)"
-			EnableOnDemandResources="false"
-			InterfaceDefinitions="@(InterfaceDefinition)"
-			IntermediateOutputPath="$(IntermediateOutputPath)"
-			MinimumOSVersion="$(_MinimumOSVersion)"
-			SdkPlatform="MacOSX"
-			ProjectDir="$(MSBuildProjectDirectory)"
-			ResourcePrefix="$(_ResourcePrefix)"
-			SdkDevPath="$(_SdkDevPath)"
-			SdkBinPath="$(_SdkBinPath)"
-			SdkUsrPath="$(_SdkUsrPath)"
-			SdkRoot="$(_SdkRoot)"
-			SdkVersion="$(_SdkVersion)">
-			<Output TaskParameter="OutputManifests" ItemName="FileWrites" />
-			<Output TaskParameter="BundleResources" ItemName="FileWrites" />
-			<Output TaskParameter="BundleResources" ItemName="_BundleResourceWithLogicalName" />
-		</IBTool>
-	</Target>
-
 	<Target Name="_CreatePkgInfo" DependsOnTargets="_GenerateBundleName" Outputs="$(_AppBundlePath)Contents\PkgInfo">
 		<CreatePkgInfo SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" OutputPath="$(_AppBundlePath)Contents\PkgInfo" />
 

msbuild/Xamarin.Shared/Xamarin.Shared.targets

@@ -284,6 +284,64 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		</CompileEntitlements>
 	</Target>
 
+	<Target Name="_CompileInterfaceDefinitions" DependsOnTargets="_DetectAppManifest;_DetectSdkLocations;_ComputeTargetArchitectures;_BeforeCoreCompileInterfaceDefinitions;_ReadCoreCompileInterfaceDefinitions;_CoreCompileInterfaceDefinitions" />
+
+	<Target Name="_BeforeCoreCompileInterfaceDefinitions"
+		Inputs="@(InterfaceDefinition)"
+		Outputs="$(_IBToolCache)">
+
+		<!-- If any InterfaceDefinition is newer than the generated items list, we delete them so that the _CoreCompileInterfaceDefinitions 
+		     target runs again and updates those lists for the next run
+		-->
+		<Delete Files="$(_IBToolCache)" />
+	</Target>
+
+	<Target Name="_ReadCoreCompileInterfaceDefinitions"	DependsOnTargets="_BeforeCoreCompileInterfaceDefinitions">
+		<!-- If _BeforeCoreCompileInterfaceDefinitions did not delete the generated items lists from _CoreCompileInterfaceDefinitions, then we read them
+		     since that target won't run and we need to the output items that are cached in those files which includes full metadata -->
+		<ReadItemsFromFile File="$(_IBToolCache)" Condition="Exists('$(_IBToolCache)')">
+			<Output TaskParameter="Items" ItemName="_BundleResourceWithLogicalName" />
+		</ReadItemsFromFile>
+	</Target>
+
+	<Target Name="_CoreCompileInterfaceDefinitions"
+		Inputs="@(InterfaceDefinition)"
+		Outputs="$(_IBToolCache)"
+		DependsOnTargets="_BeforeCoreCompileInterfaceDefinitions;_GetMinimumOSVersion">
+
+		<IBTool
+			SessionId="$(BuildSessionId)"
+			Condition="'$(IsMacEnabled)' == 'true'"
+			ToolExe="$(IBToolExe)"
+			ToolPath="$(IBToolPath)"
+			AppManifest="$(_AppManifest)"
+			EnableOnDemandResources="$(EnableOnDemandResources)"
+			InterfaceDefinitions="@(InterfaceDefinition)"
+			IntermediateOutputPath="$(DeviceSpecificIntermediateOutputPath)"
+			MinimumOSVersion="$(_MinimumOSVersion)"
+			IsWatchApp="$(IsWatchApp)"
+			IsWatch2App="$(IsWatch2App)"
+			ProjectDir="$(MSBuildProjectDirectory)"
+			ResourcePrefix="$(_ResourcePrefix)"
+			SdkDevPath="$(_SdkDevPath)"
+			SdkBinPath="$(_SdkBinPath)"
+			SdkUsrPath="$(_SdkUsrPath)"
+			SdkRoot="$(_SdkRoot)"
+			SdkPlatform="$(_SdkPlatform)"
+			SdkVersion="$(_SdkVersion)">
+			<Output TaskParameter="BundleResources" ItemName="_BundleResourceWithLogicalName" />
+
+			<!-- Local items to be persisted to items files -->
+			<Output TaskParameter="BundleResources" ItemName="_IBTool_BundleResources" />
+		</IBTool>
+
+		<!-- Cached the generated outputs items for incremental build support -->
+		<WriteItemsToFile Items="@(_IBTool_BundleResources)" ItemName="_BundleResourceWithLogicalName" File="$(_IBToolCache)" Overwrite="true" IncludeMetadata="true" />
+		<ItemGroup>
+			<FileWrites Include="$(_IBToolCache)" />
+		</ItemGroup>
+	</Target>
+
 	<Target Name="_ComputeTargetArchitectures" DependsOnTargets="_ComputeTargetFrameworkMoniker">
 		<!--
 			For now, this target is mostly for Xamarin.iOS, but in order to