[net10.0] Merge main to net10

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -42,11 +42,14 @@ body:
       label: Version with bug
       description: In what version do you see this issue? Run `dotnet workload list` to find your version.
       options:
+        - 10.0.0-preview.6
         - 10.0.0-preview.5
         - 10.0.0-preview.4
         - 10.0.0-preview.3
         - 10.0.0-preview.2
         - 10.0.0-preview.1
+        - 9.0.90 SR9
+        - 9.0.82 SR8.2
         - 9.0.81 SR8.1
         - 9.0.80 SR8
         - 9.0.70 SR7
@@ -122,11 +125,14 @@ body:
         - 9.0.70 SR7
         - 9.0.80 SR8
         - 9.0.81 SR8.1
+        - 9.0.82 SR8.2
+        - 9.0.90 SR9
         - 10.0.0-preview.1
         - 10.0.0-preview.2
         - 10.0.0-preview.3
         - 10.0.0-preview.4
         - 10.0.0-preview.5
+        - 10.0.0-preview.6
     validations:
       required: true
   - type: dropdown

.github/ISSUE_TEMPLATE/config.yml

@@ -3,8 +3,8 @@ contact_links:
   - name: .NET MAUI Community Support
     url: https://learn.microsoft.com/answers/topics/dotnet-maui.html
     about: Please ask and answer questions here.
-  - name: Bug report or feature request for Visual Studio for Windows and Mac
-    url: https://learn.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022
+  - name: Bug report or feature request for Visual Studio
+    url: https://learn.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio
     about: Use Visual Studio's Report a Problem feature for issues and suggestions with Visual Studio tooling
   - name: Bug report or feature request for Visual Studio Code (including C# Dev Kit)
     url: https://github.com/microsoft/vscode-dotnettools/issues

eng/devices/ios.cake

@@ -1,8 +1,8 @@
 #addin nuget:?package=Cake.AppleSimulator&version=0.2.0
 #load "./uitests-shared.cake"
 
-const string DefaultVersion = "18.0";
-const string DefaultTestDevice = $"ios-simulator-64_{DefaultVersion}";
+const string DefaultVersion = "18.4";
+const string DefaultTestDevice = $"ios-simulator-64";
 
 // Required arguments
 string DEFAULT_IOS_PROJECT = "../../src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj";

eng/pipelines/azure-pipelines-internal.yml

@@ -27,28 +27,29 @@ schedules:
     include:
     - main
     - net10.0
-
+    - inflight/current
+
 variables:
-  - template: /eng/common/templates/variables/pool-providers.yml@self 
-  - template: /eng/pipelines/common/variables.yml@self
-  - template: /eng/pipelines/arcade/variables.yml@self
-  - group: DotNetBuilds storage account read tokens
-  - group: AzureDevOps-Artifact-Feeds-Pats
+- template: /eng/common/templates/variables/pool-providers.yml@self
+- template: /eng/pipelines/common/variables.yml@self
+- template: /eng/pipelines/arcade/variables.yml@self
+- group: DotNetBuilds storage account read tokens
+- group: AzureDevOps-Artifact-Feeds-Pats
 
 parameters:
-  - name: VM_IMAGE_HOST
-    type: object
-    default:
-      name: NetCore1ESPool-Internal
-      image: 1es-windows-2022
-      os: windows
+- name: VM_IMAGE_HOST
+  type: object
+  default:
+    name: NetCore1ESPool-Internal
+    image: 1es-windows-2022
+    os: windows
 
 resources:
   repositories:
-    - repository: 1ESPipelineTemplates
-      type: git
-      name: 1ESPipelineTemplates/1ESPipelineTemplates
-      ref: refs/tags/release
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
 
 extends:
   ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
@@ -73,7 +74,7 @@ extends:
       suppression:
         suppressionFile: $(Build.SourcesDirectory)\eng\automation\guardian\source.gdnsuppress
     stages:
-      
+
     - template: /eng/pipelines/arcade/stage-pack.yml@self
       parameters:
         pool: ${{ parameters.VM_IMAGE_HOST }}
@@ -83,18 +84,17 @@ extends:
           sourceIndexBuildCommand: build.cmd -restore -build -ci /bl:$(Build.Arcade.LogsPath)sourceIndexBuild.binlog /p:OfficialBuildId=$(_BuildOfficalId) /p:_SkipUpdateBuildNumber=true
           binlogPath: $(Build.Arcade.LogsPath)sourceIndexBuild.binlog
         prepareSteps:
-          - template: /eng/pipelines/common/provision.yml@self
-            parameters:
-              checkoutDirectory: '$(System.DefaultWorkingDirectory)'
-              skipJdk: false
-              skipAndroidCommonSdks: false
-              skipAndroidPlatformApis: false
-              onlyAndroidPlatformDefaultApis: true
-              skipAndroidEmulatorImages: true
-              skipAndroidCreateAvds: true
-              skipProvisioning: true
-              skipXcode: true
-
+        - template: /eng/pipelines/common/provision.yml@self
+          parameters:
+            checkoutDirectory: '$(System.DefaultWorkingDirectory)'
+            skipJdk: false
+            skipAndroidCommonSdks: false
+            skipAndroidPlatformApis: false
+            onlyAndroidPlatformDefaultApis: true
+            skipAndroidEmulatorImages: true
+            skipAndroidCreateAvds: true
+            skipProvisioning: true
+            skipXcode: true
       # Publish and validation steps. Only run in official builds
     - template: /eng/common/templates-official/post-build/post-build.yml@self
       parameters:

eng/pipelines/common/device-tests-jobs.yml

@@ -1,7 +1,7 @@
 parameters:
   platform: ''
-  pool: { }
-  versions: [ ]
+  pool: {}
+  versions: []
   provisionatorChannel: 'latest'
   skipProvisioning: true
   agentPoolAccessToken: ''
@@ -18,7 +18,7 @@ parameters:
     name: name
     desc: Human Description
     path: /optional/path/to/project.csproj
-    versionsExclude: [ ]
+    versionsExclude: []
     packageid: ''
     configuration: ''
 
@@ -76,6 +76,9 @@ jobs:
             ${{ if contains(version, 'device') }}:
               device: ios-device
               apiVersion: ${{ replace(version, 'device-', '') }}
+            ${{ if contains(version, 'latest') }}:
+              device: ios-simulator-64
+              apiVersion: 18.5
             ${{ else }}:
               device: ios-simulator-64_${{ replace(version, 'simulator-', '') }}
               apiVersion: ${{ replace(version, 'simulator-', '') }}

eng/pipelines/common/ui-tests.yml

@@ -157,7 +157,7 @@ stages:
                     parameters:
                       platform: ios
                       ${{ if eq(version, 'latest') }}:
-                        version: 18.0
+                        version: 18.5
                       ${{ if ne(version, 'latest') }}:
                         version: ${{ version }}
                       path: ${{ project.ios }}
@@ -194,7 +194,7 @@ stages:
                     parameters:
                       platform: ios
                       ${{ if eq(version, 'latest') }}:
-                        version: 18.0
+                        version: 18.5
                       ${{ if ne(version, 'latest') }}:
                         version: ${{ version }}
                       path: ${{ project.ios }}
@@ -232,7 +232,7 @@ stages:
                     parameters:
                       platform: ios
                       ${{ if eq(version, 'latest') }}:
-                        version: 16.4
+                        version: 18.5
                       ${{ if ne(version, 'latest') }}:
                         version: ${{ version }}
                       path: ${{ project.ios }}
@@ -276,7 +276,7 @@ stages:
                       parameters:
                         platform: ios
                         ${{ if eq(version, 'latest') }}:
-                          version: 18.0
+                          version: 18.5
                         ${{ if ne(version, 'latest') }}:
                           version: ${{ version }}
                         path: ${{ project.ios }}
@@ -347,7 +347,7 @@ stages:
                   - template: ui-tests-steps.yml
                     parameters:
                       platform: catalyst
-                      version: "13.1"
+                      version: "15.3"
                       device: mac
                       path: ${{ project.mac }}
                       app: ${{ project.app }}

eng/pipelines/device-tests.yml

@@ -116,14 +116,14 @@ stages:
       targetFrameworkVersion: ${{ targetFrameworkVersion }}
       ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}:
         androidApiLevels: [ 33, 30, 29, 28, 27, 26, 25, 24, 23 ]
-        iosVersions: [ 'simulator-18.0']
+        iosVersions: [ 'latest']
         catalystVersions: [ 'latest' ]
         windowsVersions: ['packaged', 'unpackaged']
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
         skipProvisioning: ${{ or(not(parameters.UseProvisionator), false) }}
       ${{ else }}:
         androidApiLevels: [ 33, 23 ]
-        iosVersions: [ 'simulator-18.0' ]
+        iosVersions: [ 'latest' ]
         catalystVersions: [ 'latest' ]
         windowsVersions: ['packaged', 'unpackaged']
         provisionatorChannel: ${{ parameters.provisionatorChannel }}

eng/pipelines/ui-tests.yml

@@ -150,11 +150,11 @@ stages:
       agentPoolAccessToken: $(AgentPoolAccessToken)
       ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}:
         androidApiLevels: [ 30 ]
-        iosVersions: [ '18.0' ]
+        iosVersions: [ 'latest' ]
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
       ${{ else }}:
         androidApiLevels: [ 30 ]
-        iosVersions: [ '18.0' ]
+        iosVersions: [ 'latest' ]
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
       ${{ if parameters.CompatibilityTests }}:
         runCompatibilityTests: true

src/BlazorWebView/tests/MauiDeviceTests/WebViewHelpers.Windows.cs

@@ -12,16 +12,22 @@ public static async Task WaitForWebViewReady(WebView2 wv2)
 		{
 			CoreWebView2 coreWebView2 = null;
 
-			await Retry(
-				() =>
-				{
-					coreWebView2 = wv2.CoreWebView2;
-					return Task.FromResult(coreWebView2 != null);
-				},
-				timeoutInMS =>
+			// Ensure that the WebView2 runtime is installed and initialized and has a CoreWebView2 instance.
+			if (wv2?.CoreWebView2 == null)
+			{
+				string version = CoreWebView2Environment.GetAvailableBrowserVersionString(null);
+				if (string.IsNullOrEmpty(version))
 				{
-					return Task.FromResult(new Exception($"Waited {timeoutInMS}ms but couldn't get CoreWebView2 to be available."));
-				});
+					throw new InvalidOperationException("WebView2 runtime is not installed.");
+				}
+				await wv2.EnsureCoreWebView2Async();
+			}
+
+			await Retry(() =>
+			{
+				coreWebView2 = wv2.CoreWebView2;
+				return Task.FromResult(coreWebView2 != null);
+			}, createExceptionWithTimeoutMS: (int timeoutInMS) => Task.FromResult(new Exception($"Waited {timeoutInMS}ms but couldn't get CoreWebView2 to be available.")));
 
 			var domLoaded = false;
 			var sem = new SemaphoreSlim(1);

src/Compatibility/Core/src/Android/Cells/ViewCellRenderer.cs

@@ -206,8 +206,7 @@ public void Update(ViewCell cell)
 						c.DisableLayout = false;
 
 					var viewAsLayout = cell.View as Layout;
-					if (viewAsLayout != null)
-						viewAsLayout.ForceLayout();
+					viewAsLayout?.ForceLayout();
 
 					Invalidate();
 

src/Compatibility/Core/src/Android/CollectionView/CarouselViewRenderer.cs

@@ -190,10 +190,7 @@ protected override void UpdateItemSpacing()
 
 			var adapter = GetAdapter();
 
-			if (adapter != null)
-			{
-				adapter.NotifyItemChanged(_oldPosition);
-			}
+			adapter?.NotifyItemChanged(_oldPosition);
 
 			base.UpdateItemSpacing();
 		}

src/Compatibility/Core/src/Android/Renderers/ScrollViewRenderer.cs

@@ -504,8 +504,7 @@ void UpdateOrientation()
 				if (_container.Parent != this)
 				{
 					_container.RemoveFromParent();
-					if (_hScrollView != null)
-						_hScrollView.RemoveFromParent();
+					_hScrollView?.RemoveFromParent();
 					AddView(_container);
 				}
 			}

src/Compatibility/Core/src/Tizen/Forms.cs

@@ -116,14 +116,11 @@ internal static TizenTitleBarVisibility TitleBarVisibility
 		internal static void SendViewInitialized(this VisualElement self, NView nativeView)
 		{
 			EventHandler<ViewInitializedEventArgs> viewInitialized = Forms.ViewInitialized;
-			if (viewInitialized != null)
+			viewInitialized?.Invoke(self, new ViewInitializedEventArgs
 			{
-				viewInitialized.Invoke(self, new ViewInitializedEventArgs
-				{
-					View = self,
-					NativeView = nativeView
-				});
-			}
+				View = self,
+				NativeView = nativeView
+			});
 		}
 
 		public static bool IsInitializedRenderers { get; private set; }

src/Compatibility/Core/src/Tizen/FormsApplication.cs

@@ -53,28 +53,19 @@ protected override void OnPreCreate()
 		protected override void OnTerminate()
 		{
 			base.OnTerminate();
-			if (_platform != null)
-			{
-				_platform.Dispose();
-			}
+			_platform?.Dispose();
 		}
 
 		protected override void OnPause()
 		{
 			base.OnPause();
-			if (_application != null)
-			{
-				_application.SendSleep();
-			}
+			_application?.SendSleep();
 		}
 
 		protected override void OnResume()
 		{
 			base.OnResume();
-			if (_application != null)
-			{
-				_application.SendResume();
-			}
+			_application?.SendResume();
 		}
 
 		[EditorBrowsable(EditorBrowsableState.Never)]

src/Compatibility/Core/src/Tizen/Renderers/VisualElementRenderer.cs

@@ -599,21 +599,15 @@ protected virtual void UpdateOpacity(bool initialize)
 		/// </summary>
 		protected virtual void OnFocused(object sender, EventArgs e)
 		{
-			if (null != Element)
-			{
-				Element.SetValue(VisualElement.IsFocusedPropertyKey, true);
-			}
+			Element?.SetValue(VisualElement.IsFocusedPropertyKey, true);
 		}
 
 		/// <summary>
 		/// Handles unfocus events.
 		/// </summary>
 		protected virtual void OnUnfocused(object sender, EventArgs e)
 		{
-			if (null != Element)
-			{
-				Element.SetValue(VisualElement.IsFocusedPropertyKey, false);
-			}
+			Element?.SetValue(VisualElement.IsFocusedPropertyKey, false);
 		}
 
 		/// <summary>

src/Compatibility/Core/src/Windows/CellControl.cs

@@ -128,10 +128,7 @@ protected FrameworkElement CellContent
 			// Children still need measure called on them
 			global::Windows.Foundation.Size result = base.MeasureOverride(availableSize);
 
-			if (lv != null)
-			{
-				lv.SetValue(MeasuredEstimateProperty, result.Height);
-			}
+			lv?.SetValue(MeasuredEstimateProperty, result.Height);
 
 			SetDefaultSwitchColor();