Update MAUI iOS samples to .NET 11 workloads and add CoreCLR interpreter support

eng/Version.Details.xml

@@ -76,21 +76,21 @@
       <Uri>https://github.com/dotnet/android</Uri>
       <Sha>1dcfb6f8779c33b6f768c996495cb90ecd729329</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_18.5" Version="18.5.10824-net10-rc.2">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.1" Version="26.1.10555-ci.net11-0">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>890175615f7762dfbc4f8555007aaf5bb4d75c8f</Sha>
+      <Sha>1ebe913b290f8d1bc0f770eb07fa98b199b61e8f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk.net10.0_15.5" Version="15.5.10824-net10-rc.2">
+    <Dependency Name="Microsoft.macOS.Sdk.net10.0_26.1" Version="26.1.10555-ci.net11-0">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>890175615f7762dfbc4f8555007aaf5bb4d75c8f</Sha>
+      <Sha>1ebe913b290f8d1bc0f770eb07fa98b199b61e8f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk.net10.0_18.5" Version="18.5.10824-net10-rc.2">
+    <Dependency Name="Microsoft.iOS.Sdk.net10.0_26.1" Version="26.1.10555-ci.net11-0">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>890175615f7762dfbc4f8555007aaf5bb4d75c8f</Sha>
+      <Sha>1ebe913b290f8d1bc0f770eb07fa98b199b61e8f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk.net10.0_18.5" Version="18.5.10824-net10-rc.2">
+    <Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.1" Version="26.1.10555-ci.net11-0">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>890175615f7762dfbc4f8555007aaf5bb4d75c8f</Sha>
+      <Sha>1ebe913b290f8d1bc0f770eb07fa98b199b61e8f</Sha>
     </Dependency>
     <!-- Previous .NET iOS version(s) -->
     <!-- This is a subscription of the .NET 9 latest stable versions of our packages -->

eng/performance/maui_scenarios_ios.proj

@@ -11,7 +11,16 @@
     <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' == 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\</PreparePayloadWorkItemBaseDirectory>
     <PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' != 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/</PreparePayloadWorkItemBaseDirectory>
 
-    <NativeAOTCommandProps Condition="'$(RuntimeFlavor)' == 'coreclr'">--nativeaot true</NativeAOTCommandProps>
+    <_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'mono'">/p:UseMonoRuntime=true</_MSBuildArgs>
+    <_MSBuildArgs Condition="'$(RuntimeFlavor)' == 'coreclr'">/p:UseMonoRuntime=false</_MSBuildArgs>
+
+    <!-- Mono FullAOT and CoreCLR R2R are considered as default configurations, so no need for explicit properties -->
+
+    <!-- CoreCLR Interpreter -->
+    <_MSBuildArgs Condition="'$(CodegenType)' == 'Interpreter'">$(_MSBuildArgs);/p:PublishReadyToRun=false</_MSBuildArgs>
+    <!-- CoreCLR NativeAOT -->
+    <_MSBuildArgs Condition="'$(CodegenType)' == 'NativeAOT'">$(_MSBuildArgs);/p:PublishAot=true;/p:PublishAotUsingRuntimePack=true</_MSBuildArgs>
+
   </PropertyGroup>
 
   <Target Name="RemoveDotnetFromCorrelationStaging" BeforeTargets="BeforeTest">
@@ -32,7 +41,8 @@
       <IPAName>NetiOSDefault</IPAName>
       <PackageName>com.companyname.NetiOSDefault</PackageName>
     </MAUIiOSScenario>
-    <MAUIiOSScenario Include="Maui iOS Default Template">
+    <!-- TODO: Enable Maui iOS Default Template once https://github.com/dotnet/performance/issues/5055 is resolved -->
+    <!-- <MAUIiOSScenario Include="Maui iOS Default Template">
       <ScenarioDirectoryName>mauiios</ScenarioDirectoryName>
       <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
       <IPAName>MauiiOSDefault</IPAName>
@@ -43,12 +53,12 @@
       <PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
       <IPAName>MauiBlazoriOSDefault</IPAName>
       <PackageName>net.dot.mauiblazortesting</PackageName>
-    </MAUIiOSScenario>
+    </MAUIiOSScenario> -->
   </ItemGroup>
 
   <ItemGroup>
     <PreparePayloadWorkItem Include="@(MAUIiOSScenario)">
-      <Command>sudo xcode-select -s /Applications/Xcode_26.0.1.app; $(Python) pre.py publish -f $(PERFLAB_Framework)-ios --self-contained -c Release -r ios-arm64 $(NativeAOTCommandProps) --binlog $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)/%(PreparePayloadWorkItem.ScenarioDirectoryName).binlog -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName); cd ../; zip -r %(PreparePayloadWorkItem.ScenarioDirectoryName).zip %(PreparePayloadWorkItem.ScenarioDirectoryName)</Command>
+      <Command>sudo xcode-select -s /Applications/Xcode_26.1.1.app; $(Python) pre.py publish -f $(PERFLAB_Framework)-ios --self-contained -c Release -r ios-arm64 --msbuild=&quot;$(_MSBuildArgs)&quot; --binlog $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)/%(PreparePayloadWorkItem.ScenarioDirectoryName).binlog -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName); cd ../; zip -r %(PreparePayloadWorkItem.ScenarioDirectoryName).zip %(PreparePayloadWorkItem.ScenarioDirectoryName)</Command>
       <WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
     </PreparePayloadWorkItem>
   </ItemGroup>
@@ -94,7 +104,8 @@
           ]]>
         </CustomCommands>
     </XHarnessAppBundleToTest>
-    <XHarnessAppBundleToTest Include="Device Startup - iOS Maui Default Template">
+    <!-- TODO: Enable Device Startup - iOS Maui Default Template once https://github.com/dotnet/performance/issues/5055 is resolved -->
+    <!-- <XHarnessAppBundleToTest Include="Device Startup - iOS Maui Default Template">
       <AppBundlePath>$(ScenariosDir)mauiios.zip</AppBundlePath>
       <WorkItemTimeout>00:15:00</WorkItemTimeout>
       <TestTarget>ios-device</TestTarget>
@@ -113,15 +124,15 @@
             sign MauiiOSDefault.app
 
             # Testing commands
-            $(Python) test.py devicestartup --device-type ios --package-path MauiiOSDefault.app --package-name net.dot.mauitesting --scenario-name "%(Identity)" $(ScenarioArgs)
+            $(Python) test.py devicestartup -1-device-type ios -1-package-path MauiiOSDefault.app -1-package-name net.dot.mauitesting -1-scenario-name "%(Identity)" $(ScenarioArgs)
             ((result=$?))
 
             # Post commands
             $(Python) post.py
             exit $result
           ]]>
         </CustomCommands>
-    </XHarnessAppBundleToTest>
+    </XHarnessAppBundleToTest> -->
     <!-- Now also disabled for normal mono runs. (Reenable for mono and native aot once fixed). Tracking issue: https://github.com/dotnet/performance/issues/3148 -->
     <!-- <XHarnessAppBundleToTest Condition="'$(RuntimeFlavor)' == 'mono'" Include="Device Startup - iOS Maui Blazor Default Template">
       <AppBundlePath>$(ScenariosDir)mauiblazorios.zip</AppBundlePath>

eng/pipelines/sdk-perf-jobs.yml

@@ -507,6 +507,24 @@ jobs:
         ${{ each parameter in parameters.jobParameters }}:
           ${{ parameter.key }}: ${{ parameter.value }}
 
+  # Maui iOS CoreCLR scenario benchmarks
+  - template: /eng/pipelines/templates/build-machine-matrix.yml
+    parameters:
+      jobTemplate: /eng/pipelines/templates/run-scenarios-job.yml
+      buildMachines:
+        - osx-x64-ios-arm64
+      isPublic: false
+      jobParameters:
+        runKind: maui_scenarios_ios
+        projectFileName: maui_scenarios_ios.proj
+        channels:
+          - main
+        runtimeFlavor: coreclr
+        codeGenType: Interpreter
+        additionalJobIdentifier: CoreCLR
+        ${{ each parameter in parameters.jobParameters }}:
+          ${{ parameter.key }}: ${{ parameter.value }}
+
   # Maui iOS Native AOT scenario benchmarks
   - template: /eng/pipelines/templates/build-machine-matrix.yml
     parameters:

scripts/channel_map.py

@@ -22,6 +22,11 @@ class ChannelMap():
             'branch': '10.0',
             'quality': 'daily'
         },
+        'nativeaot11.0': {
+            'tfm': 'nativeaot11.0',
+            'branch': '11.0',
+            'quality': 'daily'
+        },
         '9.0': {
             'tfm': 'net9.0',
             'branch': '9.0',

scripts/dotnet.py

@@ -578,8 +578,9 @@ def get_dotnet_version_from_path(
         sdk = next((f for f in sdks if f.startswith(
             "{}.{}".format(version.major, version.minor + 1))), None)
     if not sdk:
-        if version.major == 9:
-            sdk = next((f for f in sdks if f.startswith("10.0")), None)
+        # Attempt 3: Try to use SDK with major version + 1 (e.g., net9.0 -> SDK 10.0, net10.0 -> SDK 11.0).
+        sdk = next((f for f in sdks if f.startswith(
+            "{}.{}".format(version.major + 1, version.minor))), None)
     if not sdk:
         sdk = next((f for f in sdks if f.startswith(
             "{}.{}".format('6', '0'))), None)

scripts/run_performance_job.py

@@ -1010,9 +1010,10 @@ def publish_dotnet_app_to_payload(payload_dir_name: str, csproj_path: str, self_
 
             # TODO: See if these commands are needed for linux as they were being called before but were failing.
             if args.os_group == "windows" or args.os_group == "osx":
-                RunCommand([*(agent_python.split(" ")), "-m", "pip", "install", "--user", "--upgrade", "pip"]).run()
-                RunCommand([*(agent_python.split(" ")), "-m", "pip", "install", "--user", "urllib3==1.26.19"]).run()
-                RunCommand([*(agent_python.split(" ")), "-m", "pip", "install", "--user", "requests"]).run()
+                break_system_packages = ["--break-system-packages"] if args.os_group == "osx" else []
+                RunCommand([*(agent_python.split(" ")), "-m", "pip", "install", *break_system_packages, "--user", "--upgrade", "pip"]).run()
+                RunCommand([*(agent_python.split(" ")), "-m", "pip", "install", *break_system_packages, "--user", "urllib3==1.26.19"]).run()
+                RunCommand([*(agent_python.split(" ")), "-m", "pip", "install", *break_system_packages, "--user", "requests"]).run()
 
             scenarios_path = os.path.join(args.performance_repo_dir, "src", "scenarios")
             script_path = os.path.join(args.performance_repo_dir, "scripts")

src/scenarios/mauiblazorios/pre.py

@@ -44,7 +44,8 @@
 ''')
 
     # Build the IPA - will use merged NuGet.config
-    precommands.execute(['/p:EnableCodeSigning=false', '/p:ApplicationId=net.dot.mauiblazortesting'])
+    # TODO: Remove /p:TargetsCurrent=true once https://github.com/dotnet/performance/issues/5055 is resolved
+    precommands.execute(['/p:EnableCodeSigning=false', '/p:ApplicationId=net.dot.mauiblazortesting', '/p:TargetsCurrent=true'])
 # NuGet.config is automatically restored after this block
 
 output_dir = const.PUBDIR

src/scenarios/mauiios/pre.py

@@ -28,8 +28,9 @@
                     working_directory=sys.path[0],
                     no_restore=False)
 
-    # Build the IPA - will also use merged NuGet.config
-    precommands.execute(['/p:EnableCodeSigning=false', '/p:ApplicationId=net.dot.mauitesting'])
+     # Build the IPA - will use merged NuGet.config
+     # TODO: Remove /p:TargetsCurrent=true once https://github.com/dotnet/performance/issues/5055 is resolved
+    precommands.execute(['/p:EnableCodeSigning=false', '/p:ApplicationId=net.dot.mauitesting', '/p:TargetsCurrent=true'])
 # NuGet.config is automatically restored after this block
 
 # Remove the aab files as we don't need them, this saves space

src/scenarios/netios/pre.py

@@ -24,8 +24,9 @@
                 working_directory=sys.path[0],
                 no_restore=False)
 
-# Build the APK
-precommands.execute(['/p:EnableCodeSigning=false', '/p:ApplicationId=net.dot.xamarintesting'])
+# Build the IPA - will use merged NuGet.config
+# TODO: Remove /p:TargetsCurrent=true once https://github.com/dotnet/performance/issues/5055 is resolved
+precommands.execute(['/p:EnableCodeSigning=false', '/p:ApplicationId=net.dot.xamarintesting', '/p:TargetsCurrent=true'])
 
 # Remove the aab files as we don't need them, this saves space
 output_dir = const.PUBDIR

src/scenarios/shared/precommands.py

@@ -93,7 +93,6 @@ def __init__(self):
         self.operation = args.operation
         self.framework = args.framework
         self.runtime_identifier = args.runtime
-        self.nativeaot = args.nativeaot
         self.msbuild = args.msbuild
         print(self.msbuild)
         self.msbuildstatic = args.msbuildstatic
@@ -154,10 +153,6 @@ def add_common_arguments(self, parser: ArgumentParser):
                             dest='runtime',
                             metavar='runtime',
                             help='runtime for build or publish - ex: win-x64')
-        parser.add_argument('-n', '--nativeaot',
-                            dest='nativeaot',
-                            metavar='nativeaot',
-                            help='use Native AOT runtime for build or publish')
         parser.add_argument('--msbuild',
                             dest='msbuild',
                             metavar='msbuild',
@@ -211,9 +206,6 @@ def execute(self, build_args: list[str] = []):
                 build_args.append('--self-contained')
             elif self.no_self_contained:
                 build_args.append('--no-self-contained')
-            if self.nativeaot:
-                build_args.append('/p:PublishAot=true')
-                build_args.append('/p:PublishAotUsingRuntimePack=true')
             build_args.append("/p:EnableWindowsTargeting=true")
             self._publish(configuration=self.configuration, runtime_identifier=self.runtime_identifier, framework=self.framework, output=self.output, build_args=build_args)
         if self.operation == CROSSGEN: