Merge branch 'xcode14' into DeviceDiscoveryExtension-xcode14

DOWNLOADS.md

@@ -2,6 +2,7 @@
 
 | Date | Version | Package | Release Notes |
 |------|---------|---------|---------------|
+|2022/08/09|15.12.0.2|[xamarin.ios-15.12.0.2.pkg](https://download.visualstudio.microsoft.com/download/pr/e81e04d3-768a-4310-9c9b-f32e8ba00eaa/0e27caf0877adb5c6fe6d634d26da40a/xamarin.ios-15.12.0.2.pkg)||
 |2022/06/14|15.10.0.5|[xamarin.ios-15.10.0.5.pkg](https://download.visualstudio.microsoft.com/download/pr/09e9572f-1c2a-4d79-a1e8-5469de9410e8/3c7be8df7e8249f2c3142e4c10ae5523/xamarin.ios-15.10.0.5.pkg)||
 |2022/05/23|15.10.0.1|[xamarin.ios-15.10.0.1.pkg](https://download.visualstudio.microsoft.com/download/pr/afed6f32-67b3-4684-b0a4-e2b74d751bce/efaa7d62658b8285baafc2d6fc8f930a/xamarin.ios-15.10.0.1.pkg)||
 |2022/04/12|15.8.0.3|[xamarin.ios-15.8.0.3.pkg](https://download.visualstudio.microsoft.com/download/pr/d4e328bd-3f10-41f1-9b22-6bc556d1ffc2/4b781228697bd21157454ac6a956205b/xamarin.ios-15.8.0.3.pkg)||
@@ -167,6 +168,7 @@
 
 | Date | Version | Package | Release Notes |
 |------|---------|---------|---------------|
+|2022/08/09|8.12.0.2|[xamarin.mac-8.12.0.2.pkg](https://download.visualstudio.microsoft.com/download/pr/e81e04d3-768a-4310-9c9b-f32e8ba00eaa/bcff5cca8701bc5871b8892fd32fb3e6/xamarin.mac-8.12.0.2.pkg)||
 |2022/06/14|8.10.0.5|[xamarin.mac-8.10.0.5.pkg](https://download.visualstudio.microsoft.com/download/pr/09e9572f-1c2a-4d79-a1e8-5469de9410e8/f4ee484851ac275ccd51fcee70451fb0/xamarin.mac-8.10.0.5.pkg)||
 |2022/05/23|8.10.0.1|[xamarin.mac-8.10.0.1.pkg](https://download.visualstudio.microsoft.com/download/pr/afed6f32-67b3-4684-b0a4-e2b74d751bce/7a6059ca429d778d1e1a3525a337eb66/xamarin.mac-8.10.0.1.pkg)||
 |2022/04/12|8.8.0.3|[xamarin.mac-8.8.0.3.pkg](https://download.visualstudio.microsoft.com/download/pr/d4e328bd-3f10-41f1-9b22-6bc556d1ffc2/778eeb3d773a776c97efbfa84b6fefd8/xamarin.mac-8.8.0.3.pkg)||

Make.config

@@ -36,12 +36,12 @@ $(TOP)/Make.config.inc: $(TOP)/Make.config $(TOP)/mk/mono.mk
 
 include $(TOP)/Make.versions
 
-APIDIFF_REFERENCES_iOS=https://bosstoragemirror.blob.core.windows.net/wrench/d17-2/568bdb24e9d53ac9b8c96512b1591165031a7f98/6003154/package/bundle.zip
-APIDIFF_REFERENCES_Mac=https://bosstoragemirror.blob.core.windows.net/wrench/d17-2/568bdb24e9d53ac9b8c96512b1591165031a7f98/6003154/package/bundle.zip
-APIDIFF_REFERENCES_DOTNET_iOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/ce10c913a2921673b0caedcd268778b46d52c392/6131168/package/bundle.zip
-APIDIFF_REFERENCES_DOTNET_tvOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/ce10c913a2921673b0caedcd268778b46d52c392/6131168/package/bundle.zip
-APIDIFF_REFERENCES_DOTNET_macOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/ce10c913a2921673b0caedcd268778b46d52c392/6131168/package/bundle.zip
-APIDIFF_REFERENCES_DOTNET_MacCatalyst=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/ce10c913a2921673b0caedcd268778b46d52c392/6131168/package/bundle.zip
+APIDIFF_REFERENCES_iOS=https://bosstoragemirror.blob.core.windows.net/wrench/d17-3/87f98a75edaa6757fd6ff5170d297615830fb41b/6466144/package/bundle.zip
+APIDIFF_REFERENCES_Mac=https://bosstoragemirror.blob.core.windows.net/wrench/d17-3/87f98a75edaa6757fd6ff5170d297615830fb41b/6466144/package/bundle.zip
+APIDIFF_REFERENCES_DOTNET_iOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.4xx/e45c10c68e85a6c6bb10542dff5fcaac3f8dade3/6506533/package/bundle.zip
+APIDIFF_REFERENCES_DOTNET_tvOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.4xx/e45c10c68e85a6c6bb10542dff5fcaac3f8dade3/6506533/package/bundle.zip
+APIDIFF_REFERENCES_DOTNET_macOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.4xx/e45c10c68e85a6c6bb10542dff5fcaac3f8dade3/6506533/package/bundle.zip
+APIDIFF_REFERENCES_DOTNET_MacCatalyst=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.4xx/e45c10c68e85a6c6bb10542dff5fcaac3f8dade3/6506533/package/bundle.zip
 
 PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 
@@ -194,14 +194,17 @@ MACCATALYST_NUGET_VERSION_FULL=$(MACCATALYST_NUGET_VERSION_NO_METADATA)+$(NUGET_
 
 # Xcode version should have both a major and a minor version (even if the minor version is 0)
 XCODE_VERSION=14.0
-XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_14_beta_5.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_14.0.0-beta5.app/Contents/Developer
+XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_14_beta_6.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_14.0.0-beta6.app/Contents/Developer
 XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist 2>/dev/null || echo "    $(shell tput setaf 1 2>/dev/null)The required Xcode ($(XCODE_VERSION)) is not installed in $(basename $(basename $(XCODE_DEVELOPER_ROOT)))$(shell tput sgr0 2>/dev/null)" >&2)
 
 # Tell both Xcode and our build logic which Xcode we're using.
 export DEVELOPER_DIR=$(XCODE_DEVELOPER_ROOT)
 export MD_APPLE_SDK_ROOT=$(abspath $(XCODE_DEVELOPER_ROOT)/../..)
 
+# We don't need to be told there are workload updates
+export DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE=true
+
 # Mono version embedded in XI/XM (NEEDED_MONO_VERSION/BRANCH) are specified in mk/mono.mk
 include $(TOP)/mk/mono.mk
 MONO_HASH := $(NEEDED_MONO_VERSION)

NuGet.config

@@ -10,11 +10,12 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
+    <add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-pub-dotnet-runtime-00f82ac" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-00f82acf/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-531f715" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />

configure

@@ -60,9 +60,23 @@ echo "# Configure arguments: $*" >> $CONFIGURED_FILE
 
 while test "x$1" != x; do
     case $1 in
+    --disable-all-platforms)
+        echo "INCLUDE_MAC=" >> $CONFIGURED_FILE
+        echo "INCLUDE_IOS=" >> $CONFIGURED_FILE
+        echo "INCLUDE_TVOS=" >> $CONFIGURED_FILE
+        echo "INCLUDE_WATCH=" >> $CONFIGURED_FILE
+        echo "INCLUDE_MACCATALYST=" >> $CONFIGURED_FILE
+        echo "Disabled all platforms"
+        shift
+        ;;
     --disable-mac)
         echo "INCLUDE_MAC=" >> $CONFIGURED_FILE
-        echo "Mac Build disabled (partially)"
+        echo "Mac Build disabled"
+        shift
+        ;;
+    --enable-mac)
+        echo "INCLUDE_MAC=1" >> $CONFIGURED_FILE
+        echo "Mac Build enabled"
         shift
         ;;
     --disable-ios-device)
@@ -71,9 +85,42 @@ while test "x$1" != x; do
         ;;
     --disable-ios)
         echo "INCLUDE_IOS=" >> $CONFIGURED_FILE
-        echo "INCLUDE_WATCH=" >> $CONFIGURED_FILE
+        echo "iOS Build disabled"
+        shift
+        ;;
+    --enable-ios)
+        echo "INCLUDE_IOS=1" >> $CONFIGURED_FILE
+        echo "iOS Build enabled"
+        shift
+        ;;
+    --disable-tvos)
         echo "INCLUDE_TVOS=" >> $CONFIGURED_FILE
-        echo "iOS Build disabled (partially)"
+        echo "tvOS Build disabled"
+        shift
+        ;;
+    --enable-tvos)
+        echo "INCLUDE_TVOS=1" >> $CONFIGURED_FILE
+        echo "tvOS Build enabled"
+        shift
+        ;;
+    --disable-watchos)
+        echo "INCLUDE_WATCH=" >> $CONFIGURED_FILE
+        echo "watchOS Build disabled"
+        shift
+        ;;
+    --enable-watchos)
+        echo "INCLUDE_WATCH=1" >> $CONFIGURED_FILE
+        echo "watchOS Build enabled"
+        shift
+        ;;
+    --disable-maccatalyst)
+        echo "INCLUDE_MACCATALYST=" >> $CONFIGURED_FILE
+        echo "Mac Catalyst Build disabled"
+        shift
+        ;;
+    --enable-maccatalyst)
+        echo "INCLUDE_MACCATALYST=1" >> $CONFIGURED_FILE
+        echo "Mac Catalyst Build enabled"
         shift
         ;;
     --disable-strip)

dotnet/targets/Xamarin.Shared.Sdk.Publish.targets

@@ -2,8 +2,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<Target Name="_PrePublish">
 		<PropertyGroup>
-			<BuildIpa Condition="'$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS'">true</BuildIpa>
-			<CreatePackage Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'">true</CreatePackage>
+			<BuildIpa Condition="'$(BuildIpa)' == '' And ('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS')">true</BuildIpa>
+			<CreatePackage Condition="'$(CreatePackage)' == '' And ('$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst')">true</CreatePackage>
 
 			<!-- Put packages in the publish directory unless asked to do otherwise -->
 			<IpaPackageDir Condition="'$(IpaPackageDir)' == '' And '$(IpaPackagePath)' == ''">$(PublishDir)</IpaPackageDir>
@@ -29,7 +29,7 @@
 		/>
 	</Target>
 	<Target Name="Publish" DependsOnTargets="_PrePublish;Build">
-		<Message Importance="high" Text="Created the package: $(IpaPackagePath)" Condition="'$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS'" />
-		<Message Importance="high" Text="Created the package: $(PkgPackagePath)" Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'" />
+		<Message Importance="high" Text="Created the package: $(IpaPackagePath)" Condition="'$(BuildIpa)' == 'true' And ('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS')" />
+		<Message Importance="high" Text="Created the package: $(PkgPackagePath)" Condition="'$(CreatePackage)' == 'true' And ('$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst')" />
 	</Target>
 </Project>

eng/Version.Details.xml

@@ -8,18 +8,18 @@
       <Uri>https://github.com/dotnet/linker</Uri>
       <Sha>28db36b95cf83c8e2ad11e67a2ad0de301b4cad6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.8">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>00f82acfe45b217bed2c7071828939a9f271253f</Sha>
+      <Sha>531f715f281e7a6456375635c02b6dd301d95996</Sha>
     </Dependency>
     <!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
       <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.9" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
+      <Sha>3f6c45a2580cd9387b643163de8136a9691764c8</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -5,8 +5,8 @@
     <MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22219.3</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
     <MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>6.0.8</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>6.0.9</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>6.0.9</MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
   </PropertyGroup>
 </Project>

msbuild/Makefile

@@ -3,6 +3,19 @@ TOP = ..
 include $(TOP)/Make.config
 include $(TOP)/mk/rules.mk
 
+ifdef INCLUDE_IOS
+BUILD_IOS=1
+endif
+ifdef INCLUDE_TVOS
+BUILD_IOS=1
+endif
+ifdef INCLUDE_WATCH
+BUILD_IOS=1
+endif
+ifdef INCLUDE_MACCATALYST
+BUILD_IOS=1
+endif
+
 #
 # To add a new MSBuild assembly, add the base name to the corresponding [IOS|MAC|WATCH]_[BINDING]_TASK_ASSEMBLIES variable.
 #
@@ -90,13 +103,14 @@ IOS_PRODUCTS =
 all-ios: $(IOS_PRODUCTS)
 symlinks-ios: $(IOS_SYMLINKS)
 
-ifdef INCLUDE_IOS
+ifdef BUILD_IOS
 MSBUILD_PRODUCTS += all-ios
-MSBUILD_DIRECTORIES += $(IOS_DIRECTORIES)
 MSBUILD_SYMLINKS += symlinks-ios
 MSBUILD_TASK_ASSEMBLIES += $(IOS_TASK_ASSEMBLIES) $(IOS_WINDOWS_TASK_ASSEMBLIES)
+MSBUILD_DIRECTORIES += $(IOS_DIRECTORIES)
 endif
 
+
 ##
 ## MacCatalyst definitions
 ##

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ArchiveTaskBase.cs

@@ -42,7 +42,6 @@ public abstract class ArchiveTaskBase : XamarinTask
 
 		public string SolutionPath { get; set; }
 
-		[Required]
 		public string SigningKey { get; set; }
 
 		public ITaskItem [] WatchAppReferences { get; set; }
@@ -205,7 +204,8 @@ public override bool Execute ()
 				if (icons.Count > 0)
 					props.Add ("IconPaths", icons);
 
-				props.Add ("SigningIdentity", SigningKey);
+				if (!string.IsNullOrEmpty (SigningKey))
+					props.Add ("SigningIdentity", SigningKey);
 
 				arInfo.Add ("ApplicationProperties", props);
 				arInfo.Add ("ArchiveVersion", new PNumber (2));

msbuild/Xamarin.MacDev.Tasks/Tasks/Archive.cs

@@ -1,16 +1,20 @@
 using Microsoft.Build.Framework;
 using Xamarin.Messaging.Build.Client;
+using Xamarin.iOS.Tasks;
 
 namespace Xamarin.MacDev.Tasks
 {
 	public class Archive : ArchiveTaskBase, ICancelableTask
 	{
 		public override bool Execute ()
 		{
-			if (ShouldExecuteRemotely ())
-				return new TaskRunner (SessionId, BuildEngine4).RunAsync (this).Result;
+			if (!ShouldExecuteRemotely ())
+				return base.Execute ();
+
+			if (AppExtensionReferences != null) 
+				TaskItemFixer.ReplaceItemSpecsWithBuildServerPath (AppExtensionReferences, SessionId);
 
-			return base.Execute ();
+			return new TaskRunner (SessionId, BuildEngine4).RunAsync (this).Result;
 		}
 
 		public void Cancel ()

msbuild/Xamarin.iOS.Tasks/Tasks/DetectSigningIdentity.cs → msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSigningIdentity.cs

@@ -5,7 +5,7 @@
 using Xamarin.MacDev.Tasks;
 using Xamarin.Messaging.Build.Client;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
 	public class DetectSigningIdentity : DetectSigningIdentityTaskBase, ITaskCallback, ICancelableTask
 	{

msbuild/Xamarin.Shared/Xamarin.Shared.props

@@ -120,12 +120,22 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 
 		<!-- Other variables that are used in code signing / packaging, but that are by default empty (so no need for any logic): -->
 		<!-- CodesignProvision: the name of the provisioning profile to use when signing the bundle -->
-		<!-- CodesignEntitlements: the path to the Entitlements.plist to use when signing the bundle -->
 		<!-- CodesignExtraArgs: any extra arguments to pass to 'codesign' -->
 		<!-- PackageSigningKey: the certificate used to sign packages (.pkg). Applicable to macOS and Mac Catalyst -->
 		<!-- PackagingExtraArgs: any extra arguments passed to the productbuild tool when creating packages (.pkg). Applicable to macOS and Mac Catalyst -->
 		<!-- ProductDefinition: the product definition template (plist) used when creating the product definition to pass to the product build tool when creating packages (.pkg). Applicable to mcOS and Mac Catalyst -->
 
+		<!-- CodesignEntitlements: the path to the Entitlements.plist to use when signing the bundle
+			If:
+			* We're building for .NET, and
+			* There's an Entitlements.plist file in the root project directory, and
+			* The CodesignEntitlements property is empty, and
+			* The EnableDefaultCodesignEntitlements property is not false
+
+			Then we'll automatically set the CodesignEntitlements property to "Entitlements.plist"
+		-->
+		<CodesignEntitlements Condition="'$(UsingAppleNETSdk)' == 'true' And '$(CodesignEntitlements)' == '' And Exists('Entitlements.plist') And '$(EnableDefaultCodesignEntitlements)' != 'false'">Entitlements.plist</CodesignEntitlements>
+
 		<!-- _RequireProvisioningProfile -->
 		<!-- Default: false -->
 		<!-- macOS: true if a provisioning profile is used -->
@@ -180,7 +190,7 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 
 		<!-- If we should create a .pkg or not (only relevant for macOS / Mac Catalyst) -->
 		<!-- The equivalent property for the other platforms is 'BuildIpa' -->
-		<CreatePackage Condition="'$(CreatePackage)' == ''">false</CreatePackage>
+		<CreatePackage Condition="'$(CreatePackage)' == '' And '$(UsingAppleNETSdk)' != 'true'">false</CreatePackage>
 
 		<!-- If the .pkg should be signed or not. Applicable to macOS and Mac Catalyst. Defaults to false. -->
 		<EnablePackageSigning Condition="'$(EnablePackageSigning)' == ''">false</EnablePackageSigning>