Merge branch 'main' into dev/mandel/xunit-3-bump-rgen

mandel-macaque · web-flow · commit 742089f26a81 · 2025-09-24T11:38:23.000-04:00
diff --git a/.azuredevops/policies/branchClassification.yml b/.azuredevops/policies/branchClassification.yml
@@ -15,5 +15,6 @@ configuration:
           - net8.0
           - net9.0
           - net10.0
+          - net11.0
           - xcode*
         classification: production
diff --git a/.github/ISSUE_TEMPLATE/01-building-an-application.yml b/.github/ISSUE_TEMPLATE/01-building-an-application.yml
@@ -23,10 +23,11 @@ body:
       description: In what target framework(s) do you see this issue?
       multiple: true
       options:
-      - net8.0-*
-      - net9.0-*
-      - net10.0-*
-      - Other
+        - net8.0-* [unsupported, please update to .NET 9+]
+        - net9.0-*
+        - net10.0-*
+        - net11.0-*
+        - Other
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/02-running-an-application.yml b/.github/ISSUE_TEMPLATE/02-running-an-application.yml
@@ -23,10 +23,11 @@ body:
       description: In what target framework(s) do you see this issue?
       multiple: true
       options:
-      - net8.0-*
-      - net9.0-*
-      - net10.0-*
-      - Other
+        - net8.0-* [unsupported, please update to .NET 9+]
+        - net9.0-*
+        - net10.0-*
+        - net11.0-*
+        - Other
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/03-api.yml b/.github/ISSUE_TEMPLATE/03-api.yml
@@ -33,10 +33,11 @@ body:
       description: In what target framework(s) do you see this issue?
       multiple: true
       options:
-      - net8.0-*
-      - net9.0-*
-      - net10.0-*
-      - Other
+        - net8.0-* [unsupported, please update to .NET 9+]
+        - net9.0-*
+        - net10.0-*
+        - net11.0-*
+        - Other
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/04-bindings.yml b/.github/ISSUE_TEMPLATE/04-bindings.yml
@@ -24,10 +24,11 @@ body:
       description: In what target framework(s) do you see this issue?
       multiple: true
       options:
-      - net8.0-*
-      - net9.0-*
-      - net10.0-*
-      - Other
+        - net8.0-* [unsupported, please update to .NET 9+]
+        - net9.0-*
+        - net10.0-*
+        - net11.0-*
+        - Other
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/05-other.yml b/.github/ISSUE_TEMPLATE/05-other.yml
@@ -23,10 +23,11 @@ body:
       description: In what target framework(s) do you see this issue?
       multiple: true
       options:
-      - net8.0-*
-      - net9.0-*
-      - net10.0-*
-      - Other
+        - net8.0-* [unsupported, please update to .NET 9+]
+        - net9.0-*
+        - net10.0-*
+        - net11.0-*
+        - Other
     validations:
       required: true
   - type: input
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -274,6 +274,7 @@ void DoSomething (Action<bool, NSError> completion);
 
 - `main` - .NET 9 development
 - `net10.0` - .NET 10 development  
+- `net11.0` - .NET 11 development
 - `release/` branches for specific releases
 - Platform-specific branches for Xcode updates
 
diff --git a/Make.versions b/Make.versions
@@ -28,10 +28,10 @@ MACCATALYST_NUGET_OS_VERSION=26.0
 
 # The following are the OS versions we first supported with the current .NET version.
 # These versions must *not* change with minor .NET updates, only major .NET releases.
-IOS_TARGET_PLATFORM_VERSION_LIBRARY=26.0
-TVOS_TARGET_PLATFORM_VERSION_LIBRARY=26.0
-MACOS_TARGET_PLATFORM_VERSION_LIBRARY=26.0
-MACCATALYST_TARGET_PLATFORM_VERSION_LIBRARY=26.0
+IOS_TARGET_PLATFORM_VERSION_LIBRARY=18.0
+TVOS_TARGET_PLATFORM_VERSION_LIBRARY=18.0
+MACOS_TARGET_PLATFORM_VERSION_LIBRARY=15.0
+MACCATALYST_TARGET_PLATFORM_VERSION_LIBRARY=18.0
 
 # In theory we should define the default platform version if it's not specified in the TFM. The default should not change for a given .NET version:
 # * We release support for iOS 14.5 with .NET 6
@@ -110,16 +110,6 @@ SUPPORTED_API_VERSIONS_MACCATALYST=$(DOTNET_TFM)-$(MACCATALYST_NUGET_OS_VERSION)
 
 # Add older versions here!
 
-SUPPORTED_API_VERSIONS_IOS+=net8.0-17.0
-SUPPORTED_API_VERSIONS_TVOS+=net8.0-17.0
-SUPPORTED_API_VERSIONS_MACOS+=net8.0-14.0
-SUPPORTED_API_VERSIONS_MACCATALYST+=net8.0-17.0
-
-SUPPORTED_API_VERSIONS_IOS+=net8.0-18.0
-SUPPORTED_API_VERSIONS_TVOS+=net8.0-18.0
-SUPPORTED_API_VERSIONS_MACOS+=net8.0-15.0
-SUPPORTED_API_VERSIONS_MACCATALYST+=net8.0-18.0
-
 SUPPORTED_API_VERSIONS_IOS+=net9.0-18.0
 SUPPORTED_API_VERSIONS_TVOS+=net9.0-18.0
 SUPPORTED_API_VERSIONS_MACOS+=net9.0-15.0
diff --git a/docs/building-apps/build-items.md b/docs/building-apps/build-items.md
@@ -309,6 +309,27 @@ the `CollectAppManifestsDependsOn` property:
 </Target>
 ```
 
+### SkipCodesignItems
+
+An item group that specifies files or directories in the app bundle that should not be signed.
+
+The purpose is to exclude from signing files and directories that are copied
+manually (for instance through custom MSBuild targets in the project file) to
+the app bundle, and which are already signed.
+
+The path to include is the path to the file or directory relative to the root
+of the app bundle.
+
+Example:
+
+```xml
+<ItemGroup>
+    <SkipCodesignItems Include="Contents/SharedSupport/mysignedlibrary.dylib" />
+</ItemGroup>
+```
+
+Applicable to all platforms.
+
 ## XcodeProject
 
 `<XcodeProject>` can be used to build and consume the outputs
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
@@ -33,8 +33,8 @@ This file should be imported by eng/Versions.props
     <MicrosofttvOSSdknet80_180PackageVersion>18.0.8324</MicrosofttvOSSdknet80_180PackageVersion>
     <MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
     <!-- dotnet/arcade dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25465.2</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25465.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25473.2</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25473.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
     <!-- dotnet/templating dependencies -->
     <MicrosoftTemplateEngineTasksPackageVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksPackageVersion>
     <!-- dotnet/xharness dependencies -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -87,9 +87,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25465.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25473.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>024c562f73f21bfce3ab36f72c20aee30281e212</Sha>
+      <Sha>41e5a0dc1e0007e784118c07b26700220cdc0e63</Sha>
     </Dependency>
     <Dependency Name="Microsoft.TemplateEngine.Tasks" Version="7.0.100-alpha.1.21601.1">
       <Uri>https://github.com/dotnet/templating</Uri>
@@ -99,9 +99,9 @@
       <Uri>https://github.com/dotnet/xharness</Uri>
       <Sha>cbaa911ef1bce4cf92a7e4f7ffa5171eddd1a8fd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25465.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25473.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>024c562f73f21bfce3ab36f72c20aee30281e212</Sha>
+      <Sha>41e5a0dc1e0007e784118c07b26700220cdc0e63</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>
diff --git a/global.json b/global.json
@@ -6,6 +6,6 @@
     "dotnet": "9.0.110-servicing.25418.5"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25465.2"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25473.2"
   }
 }
diff --git a/src/build/dotnet/generator-frameworks.g.cs b/src/build/dotnet/generator-frameworks.g.cs
@@ -351,6 +351,7 @@ partial class Frameworks {
 		"MediaPlayer",
 		"MediaToolbox",
 		"Metal",
+		"MetalFX",
 		"MetalKit",
 		"MetalPerformanceShaders",
 		"MetalPerformanceShadersGraph",
@@ -473,6 +474,7 @@ partial class Frameworks {
 		"Messages",
 		"MessageUI",
 		"Metal",
+		"MetalFX",
 		"MetalKit",
 		"MetalPerformanceShaders",
 		"MetalPerformanceShadersGraph",
diff --git a/src/frameworks.sources b/src/frameworks.sources
@@ -1972,6 +1972,7 @@ COMMON_FRAMEWORKS =         \
 	DeviceCheck             \
 	Foundation              \
 	GameKit                 \
+	MetalFX                 \
 	NaturalLanguage         \
 	Network                 \
 	OSLog                   \
@@ -2049,7 +2050,6 @@ MACOS_FRAMEWORKS =          \
 	MediaPlayer             \
 	MediaToolbox            \
 	Metal                   \
-	MetalFX                 \
 	MetalKit                \
 	MetalPerformanceShaders \
 	MetalPerformanceShadersGraph \
@@ -2171,7 +2171,6 @@ IOS_FRAMEWORKS =         \
 	Messages \
 	MessageUI \
 	Metal \
-	MetalFX \
 	MetalKit \
 	MetalPerformanceShaders \
 	MetalPerformanceShadersGraph \
diff --git a/tests/dotnet/UnitTests/ApplePlatformExtensions.cs b/tests/dotnet/UnitTests/ApplePlatformExtensions.cs
@@ -65,8 +65,9 @@ public void MajorTargetPlatformVersion (ApplePlatform platform)
 		{
 			var vLibrary = Version.Parse (platform.GetDefaultTargetPlatformVersionLibrary ());
 			var vExecutable = Version.Parse (platform.GetDefaultTargetPlatformVersionExecutable ());
-			// We might have to change the assert if we release support for a new major OS version within a .NET releases (this happened for .NET 8)
-			Assert.AreEqual (vExecutable.Major, vLibrary.Major, "The major version must be the same between the default TPV for library and executable projects.");
+			var vExpectedLibraryMajor = platform == ApplePlatform.MacOSX ? 15 : 18;
+			Assert.That (vLibrary.Major, Is.EqualTo (vExpectedLibraryMajor), "vLibrary");
+			Assert.That (vExecutable.Major, Is.EqualTo (26), "vExecutable");
 		}
 	}
 }
diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs
@@ -2104,6 +2104,7 @@ public void BuildNet7_0App (ApplePlatform platform, string runtimeIdentifiers)
 		[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-x64")]
 		public void BuildNet8_0App (ApplePlatform platform, string runtimeIdentifiers)
 		{
+			var tfm = "net8.0";
 			var project = "Net8_0SimpleApp";
 			Configuration.IgnoreIfIgnoredPlatform (platform);
 			Configuration.AssertRuntimeIdentifiersAvailable (platform, runtimeIdentifiers);
@@ -2112,18 +2113,13 @@ public void BuildNet8_0App (ApplePlatform platform, string runtimeIdentifiers)
 			Clean (project_path);
 			var properties = GetDefaultProperties (runtimeIdentifiers);
 
-			var result = DotNet.AssertBuild (project_path, properties);
-			AssertThatLinkerExecuted (result);
-			var infoPlistPath = GetInfoPListPath (platform, appPath);
-			Assert.That (infoPlistPath, Does.Exist, "Info.plist");
-			var infoPlist = PDictionary.FromFile (infoPlistPath)!;
-			Assert.AreEqual ("com.xamarin.mysimpleapp", infoPlist.GetString ("CFBundleIdentifier").Value, "CFBundleIdentifier");
-			Assert.AreEqual ("MySimpleApp", infoPlist.GetString ("CFBundleDisplayName").Value, "CFBundleDisplayName");
-			Assert.AreEqual ("8.0", infoPlist.GetString ("CFBundleVersion").Value, "CFBundleVersion");
-			Assert.AreEqual ("8.0", infoPlist.GetString ("CFBundleShortVersionString").Value, "CFBundleShortVersionString");
-
-			var appExecutable = GetNativeExecutable (platform, appPath);
-			ExecuteWithMagicWordAndAssert (platform, runtimeIdentifiers, appExecutable);
+			var result = DotNet.AssertBuildFailure (project_path, properties);
+			var errors = BinLog.GetBuildLogErrors (result.BinLogPath).ToList ();
+			// Due to an implementation detail in .NET, the same error message is shown twice.
+			var targetFramework = $"{tfm}-{platform.AsString ().ToLowerInvariant ()}";
+			AssertErrorMessages (errors,
+				$"The workload '{targetFramework}' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/maui-support-policy for more information about the support policy.",
+				$"The workload '{targetFramework}' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/maui-support-policy for more information about the support policy.");
 		}
 
 		[Test]
@@ -3168,6 +3164,7 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
 			"/System/Library/Frameworks/MediaPlayer.framework/MediaPlayer",
 			"/System/Library/Frameworks/MediaToolbox.framework/MediaToolbox",
 			"/System/Library/Frameworks/Metal.framework/Metal",
+			"/System/Library/Frameworks/MetalFX.framework/MetalFX",
 			"/System/Library/Frameworks/MetalKit.framework/MetalKit",
 			"/System/Library/Frameworks/MetalPerformanceShaders.framework/MetalPerformanceShaders",
 			"/System/Library/Frameworks/MetalPerformanceShadersGraph.framework/MetalPerformanceShadersGraph",
@@ -3549,6 +3546,7 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
 			"/System/Library/Frameworks/MediaAccessibility.framework/Versions/A/MediaAccessibility",
 			"/System/Library/Frameworks/MediaToolbox.framework/Versions/A/MediaToolbox",
 			"/System/Library/Frameworks/Metal.framework/Versions/A/Metal",
+			"/System/Library/Frameworks/MetalFX.framework/Versions/A/MetalFX",
 			"/System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/MetalPerformanceShaders",
 			"/System/Library/Frameworks/MetalPerformanceShadersGraph.framework/Versions/A/MetalPerformanceShadersGraph",
 			"/System/Library/Frameworks/MetricKit.framework/Versions/A/MetricKit",
diff --git a/tests/dotnet/UnitTests/ZipHelpers.cs b/tests/dotnet/UnitTests/ZipHelpers.cs
@@ -1,4 +1,4 @@
-#define TRACE
+// #define TRACE_ZIP
 
 using System.IO;
 using System.IO.Compression;
@@ -58,7 +58,7 @@ public static List<string> ListInnerZip (string file, string innerZipFileName)
 
 		public static void DumpZipFile (ZipArchive zip, string path)
 		{
-#if TRACE
+#if TRACE_ZIP
 			var entries = zip.Entries;
 			Console.WriteLine ($"Viewing zip archive {path} with {entries.Count} entries:");
 			foreach (var entry in entries) {
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-MetalFX.todo b/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-MetalFX.todo
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/tvOS-MetalFX.todo b/tests/xtro-sharpie/api-annotations-dotnet/tvOS-MetalFX.todo
diff --git a/tools/common/SdkVersions.cs b/tools/common/SdkVersions.cs
diff --git a/tools/devops/automation/run-post-ci-build-vs-insertion.yml b/tools/devops/automation/run-post-ci-build-vs-insertion.yml
diff --git a/tools/devops/automation/templates/main-stage.yml b/tools/devops/automation/templates/main-stage.yml

-Original file line number
+Diff line change
           - net8.0
           - net9.0
           - net10.0
 +          - net11.0
           - xcode*
         classification: production