Merge branch 'main' into Xcode13-UserNotifications-beta2

dotnet/Makefile

@@ -18,6 +18,7 @@ $(1)_NUGET_TARGETS = \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/data/UnixFilePermissions.xml \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/Sdk/AutoImport.props \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/Sdk/Sdk.props \
+	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Microsoft.$(1).Sdk.ImplicitNamespaceImports.props \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Microsoft.$(1).Sdk.SupportedTargetPlatforms.props \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Microsoft.$(1).Sdk.DefaultItems.props \
 	$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Microsoft.$(1).Sdk.props \
@@ -355,8 +356,9 @@ $(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(eval $(call CreateMsi,$(platfor
 export DOTNETSDK_WORKLOAD_MANIFEST_ROOTS:=$(abspath ./Workloads)
 
 .stamp-install-workloads: Makefile Workloads/NuGet.config $(WORKLOAD_TARGETS) $(RUNTIME_PACKS) $(REF_PACKS) $(SDK_PACKS) $(TEMPLATE_PACKS) $(WORKLOAD_PACKS)
+	@# The microsoft.net.sdk.maui workload has a reference to the microsoft-ios-sdk-full workload, which has been renamed, so 'dotnet workload install' fails. Just remove the maui workload, we don't need it here.
+	$(Q) rm -Rf $(DOTNET6_DIR)/sdk-manifests/6.0.100/microsoft.net.sdk.maui
 	$(Q) cd Workloads && $(DOTNET6) workload install --skip-manifest-update \
-		microsoft-net-runtime-ios microsoft-net-runtime-tvos microsoft-net-runtime-maccatalyst \
 		$(foreach platform,$(DOTNET_PLATFORMS),$(shell echo $(platform) | tr A-Z a-z))
 	$(Q) touch $@
 

dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/AppDelegate.cs

@@ -1,5 +1,3 @@
-using Foundation;
-using UIKit;
 
 namespace MacCatalystApp1 {
 	[Register ("AppDelegate")]

dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/Main.cs

@@ -1,5 +1,3 @@
-using UIKit;
-
 using MacCatalystApp1;
 
 // This is the main entry point of the application.

dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/SceneDelegate.cs

@@ -1,5 +1,3 @@
-using Foundation;
-using UIKit;
 
 namespace MacCatalystApp1 {
 	[Register ("SceneDelegate")]

dotnet/Templates/Microsoft.iOS.Templates/ios-controller/Controller1.cs

@@ -1,5 +1,3 @@
-using Foundation;
-using UIKit;
 
 namespace iOSApp1 {
 	[Register ("Controller1")]

dotnet/Templates/Microsoft.iOS.Templates/ios/AppDelegate.cs

@@ -1,5 +1,3 @@
-using Foundation;
-using UIKit;
 
 namespace iOSApp1 {
 	[Register ("AppDelegate")]

dotnet/Templates/Microsoft.iOS.Templates/ios/Main.cs

@@ -1,5 +1,3 @@
-using UIKit;
-
 using iOSApp1;
 
 // This is the main entry point of the application.

dotnet/Templates/Microsoft.iOS.Templates/ios/SceneDelegate.cs

@@ -1,5 +1,3 @@
-using Foundation;
-using UIKit;
 
 namespace iOSApp1 {
 	[Register ("SceneDelegate")]

dotnet/Templates/Microsoft.macOS.Templates/macos/AppDelegate.cs

@@ -1,5 +1,3 @@
-using AppKit;
-using Foundation;
 
 namespace macOSApp1 {
 	[Register ("AppDelegate")]

dotnet/Templates/Microsoft.macOS.Templates/macos/Main.cs

@@ -1,5 +1,3 @@
-using AppKit;
-
 using macOSApp1;
 
 // This is the main entry point of the application.

dotnet/Templates/Microsoft.macOS.Templates/macos/ViewController.cs

@@ -1,4 +1,3 @@
-using System;
 
 using AppKit;
 using Foundation;

dotnet/Templates/Microsoft.tvOS.Templates/tvos/AppDelegate.cs

@@ -1,5 +1,3 @@
-using Foundation;
-using UIKit;
 
 namespace tvOSApp1 {
 	[Register ("AppDelegate")]

dotnet/Templates/Microsoft.tvOS.Templates/tvos/Main.cs

@@ -1,5 +1,3 @@
-using UIKit;
-
 using tvOSApp1;
 
 // This is the main entry point of the application.

dotnet/Templates/Microsoft.tvOS.Templates/tvos/ViewController.cs

@@ -1,5 +1,3 @@
-using System;
-using UIKit;
 
 namespace tvOSApp1 {
 	public partial class ViewController : UIViewController {

dotnet/targets/Microsoft.MacCatalyst.Sdk.ImplicitNamespaceImports.props

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	This file contains implicit namespace imports
+
+	*** WARNING ***
+
+	This file is imported by AutoImport.props, and will be imported by all
+	projects using Microsoft.NET.Sdk.  All Item includes in this file *MUST*
+	be hidden behind a TargetPlatformIdentifier based condition.
+
+	This file can also not define any properties. However, due to the
+	order MSBuild evaluates properties, it's possible to use properties
+	defined in our .targets files in conditions in ItemGroups in this
+	file.
+
+	*** WARNING ***
+
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<!-- There's a master switch, DisableImplicitNamespaceImports, which, if set, will prevent all implicit namespace imports - this is done automatically, we don't have to check DisableImplicitNamespaceImports here -->
+	<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'MacCatalyst' And '$(DisableImplicitNamespaceImports_MacCatalyst)' != 'true'">
+		<Import Include="CoreGraphics" />
+		<Import Include="Foundation" />
+		<Import Include="UIKit" />
+	</ItemGroup>
+</Project>

dotnet/targets/Microsoft.iOS.Sdk.ImplicitNamespaceImports.props

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	This file contains implicit namespace imports
+
+	*** WARNING ***
+
+	This file is imported by AutoImport.props, and will be imported by all
+	projects using Microsoft.NET.Sdk.  All Item includes in this file *MUST*
+	be hidden behind a TargetPlatformIdentifier based condition.
+
+	This file can also not define any properties. However, due to the
+	order MSBuild evaluates properties, it's possible to use properties
+	defined in our .targets files in conditions in ItemGroups in this
+	file.
+
+	*** WARNING ***
+
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<!-- There's a master switch, DisableImplicitNamespaceImports, which, if set, will prevent all implicit namespace imports - this is done automatically, we don't have to check DisableImplicitNamespaceImports here -->
+	<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'iOS' And '$(DisableImplicitNamespaceImports_iOS)' != 'true'">
+		<Import Include="CoreGraphics" />
+		<Import Include="Foundation" />
+		<Import Include="UIKit" />
+	</ItemGroup>
+</Project>

dotnet/targets/Microsoft.macOS.Sdk.ImplicitNamespaceImports.props

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	This file contains implicit namespace imports
+
+	*** WARNING ***
+
+	This file is imported by AutoImport.props, and will be imported by all
+	projects using Microsoft.NET.Sdk.  All Item includes in this file *MUST*
+	be hidden behind a TargetPlatformIdentifier based condition.
+
+	This file can also not define any properties. However, due to the
+	order MSBuild evaluates properties, it's possible to use properties
+	defined in our .targets files in conditions in ItemGroups in this
+	file.
+
+	*** WARNING ***
+
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<!-- There's a master switch, DisableImplicitNamespaceImports, which, if set, will prevent all implicit namespace imports - this is done automatically, we don't have to check DisableImplicitNamespaceImports here -->
+	<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'macOS' And '$(DisableImplicitNamespaceImports_macOS)' != 'true'">
+		<Import Include="AppKit" />
+		<Import Include="CoreGraphics" />
+		<Import Include="Foundation" />
+	</ItemGroup>
+</Project>

dotnet/targets/Microsoft.tvOS.Sdk.ImplicitNamespaceImports.props

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	This file contains implicit namespace imports
+
+	*** WARNING ***
+
+	This file is imported by AutoImport.props, and will be imported by all
+	projects using Microsoft.NET.Sdk.  All Item includes in this file *MUST*
+	be hidden behind a TargetPlatformIdentifier based condition.
+
+	This file can also not define any properties. However, due to the
+	order MSBuild evaluates properties, it's possible to use properties
+	defined in our .targets files in conditions in ItemGroups in this
+	file.
+
+	*** WARNING ***
+
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<!-- There's a master switch, DisableImplicitNamespaceImports, which, if set, will prevent all implicit namespace imports - this is done automatically, we don't have to check DisableImplicitNamespaceImports here -->
+	<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'tvOS' And '$(DisableImplicitNamespaceImports_tvOS)' != 'true'">
+		<Import Include="CoreGraphics" />
+		<Import Include="Foundation" />
+		<Import Include="UIKit" />
+	</ItemGroup>
+</Project>

dotnet/targets/Xamarin.Shared.Sdk.props

@@ -6,6 +6,9 @@
 	<!-- This contains the OS versions we support for target platform -->
 	<Import Project="Microsoft.$(_PlatformName).Sdk.SupportedTargetPlatforms.props" />
 
+	<!-- This contains support for implicit namespace imports -->
+	<Import Project="Microsoft.$(_PlatformName).Sdk.ImplicitNamespaceImports.props" />
+
 	<Import Project="Xamarin.Shared.Sdk.TargetFrameworkInference.props" />
 
 	<PropertyGroup>

eng/Version.Details.xml

@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.1.21370.12">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.1.21372.2">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>d7279fc09fcfb108c5fb97fa290dbbb11c4c441b</Sha>
+      <Sha>b162253a7b5e4adab3c26a52b207ae957d353a3f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21370.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/mono/linker</Uri>

eng/Versions.props

@@ -1,7 +1,7 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.1.21370.12</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.1.21372.2</MicrosoftDotnetSdkInternalPackageVersion>
     <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21370.1</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
   </PropertyGroup>

src/AppKit/Compat.cs

@@ -40,4 +40,13 @@ public virtual void SetTextLists (NSTextList[] array)
 		}
 #endif
 	}
+
+#if !XAMCORE_4_0
+	public static class NSFileTypeForHFSTypeCode
+	{
+		public static readonly string ComputerIcon = "root";
+		public static readonly string DesktopIcon = "desk";
+		public static readonly string FinderIcon = "FNDR";
+	}
+#endif
 }

src/AppKit/Enums.cs

@@ -2096,15 +2096,6 @@ public enum NSPopUpArrowPosition : ulong {
 		Bottom
 	}
 
-#if !XAMCORE_4_0
-	public static class NSFileTypeForHFSTypeCode
-	{
-		public static readonly string ComputerIcon = "root";
-		public static readonly string DesktopIcon = "desk";
-		public static readonly string FinderIcon = "FNDR";
-	}
-#endif
-
 	// FileType 4cc values to use with NSFileTypeForHFSTypeCode.
 	public enum HfsTypeCode : uint
 	{

src/AppKit/NSAccessibility.cs

@@ -18,58 +18,6 @@
 
 namespace AppKit
 {
-	[Mac (10,10)]
-	[Native]
-	public enum NSAccessibilityOrientation : long
-	{
-		Unknown = 0,
-		Vertical = 1,
-		Horizontal = 2
-	}
-
-	[Mac (10,10)]
-	[Native]
-	public enum NSAccessibilitySortDirection : long
-	{
-		Unknown = 0,
-		Ascending = 1,
-		Descending = 2
-	}
-
-	[Mac (10,10)]
-	[Native]
-	public enum NSAccessibilityRulerMarkerType : long
-	{
-		Unknown = 0,
-		TabStopLeft = 1,
-		TabStopRight = 2,
-		TabStopCenter = 3,
-		TabStopDecimal = 4,
-		IndentHead = 5,
-		IndentTail = 6,
-		IndentFirstLine = 7
-	}
-
-	[Mac (10,10)]
-	[Native]
-	public enum NSAccessibilityUnits : long
-	{
-		Unknown = 0,
-		Inches = 1,
-		Centimeters = 2,
-		Points = 3,
-		Picas = 4
-	}
-
-	[Mac (10,9)]
-	[Native]
-	public enum NSAccessibilityPriorityLevel : long
-	{
-		Low = 10,
-		Medium = 50,
-		High = 90
-	}
-
 	[Mac (10,10)] // protocol added in 10.10
 	public partial interface INSAccessibility {}