Merge branch 'main' into xcode13.0-coreimage-b1-b3

CODEOWNERS

@@ -14,14 +14,14 @@
 
 /mk @rolfbjarne
 
-/msbuild @emaf @rolfbjarne
+/msbuild @emaf @rolfbjarne @chamons
 
 /runtime @rolfbjarne
 
 /src/AddressBook @dalexsoto
 /src/addressbook.cs @dalexsoto
-/src/AppKit @dalexsoto
-/src/appkit.cs @dalexsoto
+/src/AppKit @chamons @dalexsoto
+/src/appkit.cs @chamons @dalexsoto
 /src/ARKit
 /src/arkit.cs
 /src/AudioToolbox @dalexsoto
@@ -78,9 +78,9 @@
 /src/eventkit.cs @dalexsoto @spouliot
 /src/ExternalAccessory @dalexsoto @spouliot
 /src/externalaccessory.cs @dalexsoto @spouliot
-/src/Foundation @spouliot @rolfbjarne
+/src/Foundation @spouliot @rolfbjarne @chamons
 /src/Foundation/NSUrl* @mandel-macaque
-/src/foundation.cs @spouliot @rolfbjarne
+/src/foundation.cs @spouliot @rolfbjarne @chamons
 /src/GameController @spouliot
 /src/gamecontroller.cs @spouliot
 /src/GameKit
@@ -100,10 +100,10 @@
 /src/identitylookupui.cs @dalexsoto
 /src/ituneslibrary.cs @mandel-macaque
 /src/iTunesLibrary @mandel-macaque
-/src/ImageIO @spouliot
-/src/imageio.cs @spouliot
-/src/ImageKit @spouliot
-/src/imagekit.cs @spouliot
+/src/ImageIO @spouliot @chamons
+/src/imageio.cs @spouliot @chamons
+/src/ImageKit @chamons
+/src/imagekit.cs @chamons
 /src/Intents @dalexsoto
 /src/intents.cs @dalexsoto
 /src/IntentsUI @dalexsoto
@@ -155,8 +155,8 @@
 /src/quicklook.cs @spouliot
 /src/ReplayKit @dalexsoto @spouliot
 /src/replaykit.cs @dalexsoto @spouliot
-/src/SafariServices @spouliot
-/src/safariservices.cs @spouliot
+/src/SafariServices @chamons @spouliot
+/src/safariservices.cs @chamons @spouliot
 /src/SceneKit @dalexsoto
 /src/scenekit.cs @dalexsoto
 /src/Security @dalexsoto @spouliot
@@ -184,22 +184,22 @@
 /src/watchconnectivity.cs @spouliot @rolfbjarne
 /src/WatchKit @spouliot @rolf
 /src/watchkit.cs @spouliot @rolf
-/src/WebKit @spouliot
-/src/webkit.cs @spouliot
+/src/WebKit @chamons
+/src/webkit.cs @chamons
 /src/WKWebKit @spouliot
 /src/wkwebkit.cs @spouliot
 
 /tests/xharness @rolfbjarne @mandel-macaque
 /tests/xtro-sharpie @spouliot
-/tests/mmptest @rolfbjarne 
-/tests/common/mac @rolfbjarne 
+/tests/mmptest @rolfbjarne @chamons
+/tests/common/mac @rolfbjarne @chamons
 /tests/bcl-tests @mandel-macaque
 
-/tools/common @rolfbjarne @spouliot
+/tools/common @rolfbjarne @chamons @spouliot
 /tools/common/StaticRegistrar.cs @rolfbjarne
 /tools/tools/devops/device-tests @mandel-macaque @whitneyschmidt
 /tools/linker @spouliot
-/tools/mmp @rolfbjarne 
+/tools/mmp @chamons
 /tools/mtouch @spouliot @rolfbjarne
 
 configure @rolfbjarne

dotnet/Makefile

@@ -137,6 +137,8 @@ $(DOTNET_NUPKG_DIR)/vs-workload.props: Workloads/vs-workload.template.props
 		$(foreach platform,$(DOTNET_PLATFORMS_UPPERCASE),-e "s/@$(platform)_WORKLOAD_VERSION@/$($(platform)_NUGET_VERSION).$($(platform)_NUGET_COMMIT_DISTANCE)/g") \
 		-e "s/@PACK_VERSION_LONG@/$(IOS_NUGET_VERSION_NO_METADATA)/g" \
 		-e "s/@PACK_VERSION_SHORT@/$(IOS_NUGET_VERSION).$(IOS_NUGET_COMMIT_DISTANCE)/g" \
+		-e "s/@MACOS_PACK_VERSION_LONG@/$(MACOS_NUGET_VERSION_NO_METADATA)/g" \
+		-e "s/@MACOS_PACK_VERSION_SHORT@/$(MACOS_NUGET_VERSION).$(MACOS_NUGET_COMMIT_DISTANCE)/g" \
 		$< > $@.tmp
 	$(Q) mv $@.tmp $@
 

dotnet/SingleProject.md

@@ -10,17 +10,24 @@ For our Apple platforms this means we're mapping the following MSBuild
 properties to Info.plist keys (this mapping will only take place if the
 Info.plist in the project doesn't already contain entries for these keys):
 
-| MSBuild Property    | Info.plist key             | Notes                                     |
-| --------------------|----------------------------|-------------------------------------------|
-| ApplicationId       | CFBundleIdentifier         |                                           |
-| ApplicationTitle    | CFBundleDisplayName        |                                           |
-| ApplicationVersion  | CFBundleVersion            |                                           |
-| AppleShortVersion   | CFBundleShortVersionString | Defaults to ApplicationVersion when blank |
+| MSBuild Property          | Info.plist key             | Notes                                     |
+| --------------------------|----------------------------|-------------------------------------------|
+| ApplicationId             | CFBundleIdentifier         |                                           |
+| ApplicationTitle          | CFBundleDisplayName        |                                           |
+| ApplicationVersion        | CFBundleVersion            |                                           |
+| ApplicationDisplayVersion | CFBundleShortVersionString | Defaults to ApplicationVersion when blank |
 
 This is only enabled if the `GenerateApplicationManifest` is set to `true`
 (which is the default for `.NET 6`, and not for "legacy"
 Xamarin.iOS/Xamarin.Mac)
 
+Additionally, `$(ApplicationDisplayVersion)` will overwrite the value for `$(Version)`,
+so the following properties will be set with the same value:
+
+* `$(AssemblyVersion)`
+* `$(FileVersion)`
+* `$(InformationalVersion)`
+
 Ref: [Issue #10473][2]
 
 [1]: https://github.com/xamarin/xamarin-android/blob/40cedfa89c2660479fcb5e2482d2463fbcad1d04/Documentation/guides/OneDotNetSingleProject.md

dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/.template.config/template.json

@@ -31,10 +31,10 @@
     },
     "minOSVersion": {
       "type": "parameter",
-      "description": "Overrides LSMinimumSystemVersion in the Info.plist",
+      "description": "Overrides SupportedOSPlatformVersion in the project file",
       "replaces": "minOSVersion",
       "datatype": "string",
-      "defaultValue": "10.15.1"
+      "defaultValue": "14.2"
     }
   },
   "defaultName": "MacCatalystApp1"

dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/Info.plist

@@ -10,8 +10,6 @@
     <string>1.0</string>
     <key>CFBundleVersion</key>
     <string>1.0</string>
-    <key>LSMinimumSystemVersion</key>
-        <string>minOSVersion</string>
     <key>UIDeviceFamily</key>
     <array>
         <integer>2</integer>

dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/MacCatalystApp1.csproj

@@ -6,5 +6,6 @@
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
+    <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
   </PropertyGroup>
 </Project>

dotnet/Templates/Microsoft.iOS.Templates/ios/.template.config/template.json

@@ -31,7 +31,7 @@
       },
       "minOSVersion": {
         "type": "parameter",
-        "description": "Overrides MinimumOSVersion in the Info.plist",
+        "description": "Overrides SupportedOSPlatformVersion in the project file",
         "replaces": "minOSVersion",
         "datatype": "string",
         "defaultValue": "11.2"

dotnet/Templates/Microsoft.iOS.Templates/ios/Info.plist

@@ -12,8 +12,6 @@
     <string>1.0</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
-    <key>MinimumOSVersion</key>
-        <string>minOSVersion</string>
     <key>UIDeviceFamily</key>
     <array>
         <!--#if((deviceFamily == "iphone") || (deviceFamily == "universal"))

dotnet/Templates/Microsoft.iOS.Templates/ios/iOSApp1.csproj

@@ -5,5 +5,6 @@
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
+    <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
   </PropertyGroup>
 </Project>

dotnet/Templates/Microsoft.macOS.Templates/macos/.template.config/template.json

@@ -31,7 +31,7 @@
       },
       "minOSVersion": {
         "type": "parameter",
-        "description": "Overrides LSMinimumSystemVersion in the Info.plist",
+        "description": "Overrides SupportedOSPlatformVersion in the project file",
         "replaces": "minOSVersion",
         "datatype": "string",
         "defaultValue": "10.14"

dotnet/Templates/Microsoft.macOS.Templates/macos/Info.plist

@@ -10,8 +10,6 @@
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>minOSVersion</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleInfoDictionaryVersion</key>

dotnet/Templates/Microsoft.macOS.Templates/macos/macOSApp1.csproj

@@ -5,5 +5,6 @@
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
+    <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
   </PropertyGroup>
 </Project>

dotnet/Templates/Microsoft.tvOS.Templates/tvos/.template.config/template.json

@@ -31,7 +31,7 @@
     },
     "minOSVersion": {
       "type": "parameter",
-      "description": "Overrides MinimumOSVersion in the Info.plist",
+      "description": "Overrides SupportedOSPlatformVersion in the project file",
       "replaces": "minOSVersion",
       "datatype": "string",
       "defaultValue": "11.2"

dotnet/Templates/Microsoft.tvOS.Templates/tvos/Info.plist

@@ -10,8 +10,6 @@
     <string>1.0</string>
     <key>CFBundleVersion</key>
     <string>1.0</string>
-    <key>MinimumOSVersion</key>
-        <string>minOSVersion</string>
     <key>UIDeviceFamily</key>
     <array>
         <integer>3</integer>

dotnet/Templates/Microsoft.tvOS.Templates/tvos/tvOSApp1.csproj

@@ -5,5 +5,6 @@
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
+    <SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
   </PropertyGroup>
 </Project>

dotnet/Workloads/vs-workload.template.props

@@ -9,12 +9,25 @@
     <ShortNames Include="@PACK_VERSION_LONG@">
       <Replacement>@PACK_VERSION_SHORT@</Replacement>
     </ShortNames>
+    <ShortNames Include="@MACOS_PACK_VERSION_LONG@">
+      <Replacement>@MACOS_PACK_VERSION_SHORT@</Replacement>
+    </ShortNames>
     <ShortNames Include="Microsoft.MacCatalyst.Runtime.maccatalyst">
       <Replacement>Microsoft.MacCatalyst.Runtime</Replacement>
     </ShortNames>
+    <ShortNames Include="Microsoft.NET.Sdk.MacCatalyst.Manifest">
+      <Replacement>Microsoft.MacCatalyst.Manifest</Replacement>
+    </ShortNames>
+    <ShortNames Include="Microsoft.tvOS.Runtime.tvossimulator">
+      <Replacement>Microsoft.tvOS.Runtime</Replacement>
+    </ShortNames>
     <ComponentResources Include="ios" Version="@IOS_WORKLOAD_VERSION@" Category=".NET" Title=".NET SDK for iOS" Description=".NET SDK Workload for building iOS applications."/>
     <ComponentResources Include="maccatalyst" Version="@MACCATALYST_WORKLOAD_VERSION@" Category=".NET" Title=".NET SDK for Mac Catalyst" Description=".NET SDK Workload for building macOS applications with Mac Catalyst."/>
+    <ComponentResources Include="macos" Version="@MACOS_WORKLOAD_VERSION@" Category=".NET" Title=".NET SDK for macOS" Description=".NET SDK Workload for building macOS applications."/>
+    <ComponentResources Include="tvos" Version="@TVOS_WORKLOAD_VERSION@" Category=".NET" Title=".NET SDK for tvOS" Description=".NET SDK Workload for building tvOS applications."/>
     <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.iOS.Manifest*.nupkg" Version="@IOS_WORKLOAD_VERSION@" />
     <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.MacCatalyst.Manifest*.nupkg" Version="@MACCATALYST_WORKLOAD_VERSION@" />
+    <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.macOS.Manifest*.nupkg" Version="@MACOS_WORKLOAD_VERSION@" />
+    <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.tvOS.Manifest*.nupkg" Version="@TVOS_WORKLOAD_VERSION@" />
   </ItemGroup>
 </Project>

dotnet/targets/Xamarin.Shared.Sdk.props

@@ -51,4 +51,15 @@
 		<_RuntimeIdentifierUsesAppHost>false</_RuntimeIdentifierUsesAppHost>
 		<UseAppHost>false</UseAppHost>
 	</PropertyGroup>
+
+	<!--
+		Enable LLVM by default for mobile release builds.
+
+		At this point we don't necessarily know yet whether we're building for device or simulator,
+		but the MtouchUseLlvm value is ignored when using the simulator, so it doesn't matter
+		if we set it in all cases.
+	-->
+	<PropertyGroup Condition="'$(MtouchUseLlvm)' == '' And '$(Configuration)' == 'Release' And ('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS')">
+		<MtouchUseLlvm>true</MtouchUseLlvm>
+	</PropertyGroup>
 </Project>

dotnet/targets/Xamarin.Shared.Sdk.targets

@@ -4,6 +4,7 @@
 	<PropertyGroup>
 		<!-- Use single-project MSBuild properties to generate the application manifest by default -->
 		<GenerateApplicationManifest Condition="'$(GenerateApplicationManifest)' == ''">true</GenerateApplicationManifest>
+		<Version Condition="'$(GenerateApplicationManifest)' == 'true' and '$(ApplicationDisplayVersion)' != ''">$(ApplicationDisplayVersion)</Version>
 	</PropertyGroup>
 
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.CompileNativeCode" AssemblyFile="$(_XamarinTaskAssembly)" />

eng/Version.Details.xml

@@ -1,12 +1,12 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.2.21425.12">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.2.21456.8">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>49485bd6125f6cd23c75e0af463c44c3ea0d6278</Sha>
+      <Sha>b238cfad7138873efd5a8b731a6b523a141d4ac5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21419.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21452.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>5851f6d62fedd9eb2edea9712c9764ca2ad6ab60</Sha>
+      <Sha>8a5c446a84922bddccfcfc6d3cb5c117dc3babd4</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -1,8 +1,8 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.2.21425.12</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21419.1</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.2.21456.8</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21452.4</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
   </PropertyGroup>
 </Project>

msbuild/Makefile

@@ -479,7 +479,9 @@ MSBUILD_PRODUCTS += $(DOTNET_TARGETS)
 DOTNET_IOS_WINDOWS_OUTPUT_FILES =                                \
 	$(foreach dll,$(IOS_WINDOWS_TASK_ASSEMBLIES),$(dll).*)       \
 	$(foreach dll,$(IOS_WINDOWS_DEPENDENCIES),$(dll).*)          \
+	iSign.Core.pdb                                               \
 	System.Diagnostics.Tracer.pdb                                \
+	Xamarin.iOS.Windows.Client.pdb                               \
 	Broker.zip                                                   \
 	Build.zip                                                    \
 	Xamarin.PreBuilt.iOS.app.zip

msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx

@@ -1308,4 +1308,13 @@
             {0}: the path to the compiler
         </comment>
     </data>
+
+    <data name="E7082" xml:space="preserve">
+        <value>The {0} value in the Info.plist ({1}) does not match the SupportedOSPlatformVersion value in the project file ({2}).</value>
+        <comment>
+            {0}: the name of a value from the Info.plist file the message talks about (either 'MinimumOSVersion' or 'LSMinimumSystemVersion').
+            {1}: the value from the Info.plist.
+            {2}: the value from the project file.
+        </comment>
+    </data>
 </root>