Merge branch 'main' into fix-4734-ios

.config/dotnet-tools.json

@@ -14,17 +14,17 @@
         "pwsh"
       ]
     },
-    "microsoft.dotnet.xharness.cli": {
-      "version": "8.0.0-prerelease.23370.1",
-      "commands": [
-        "xharness"
-      ]
-    },
     "api-tools": {
       "version": "1.3.5",
       "commands": [
         "api-tools"
       ]
+    },
+    "microsoft.dotnet.xharness.cli": {
+      "version": "8.0.0-prerelease.23407.2",
+      "commands": [
+        "xharness"
+      ]
     }
   }
 }

.github/CODEOWNERS

@@ -1,42 +1,10 @@
-# Tizen
+*       @dotnet/dotnet-maui-reviewers
+
+# Tizen (this probably doesn't work since these do not have write access
 **/Tizen @rookiejava @myroot @shyunmin @sung-su @JoonghyunCho
 *.tizen.cs @rookiejava @myroot @shyunmin @sung-su @JoonghyunCho
 *.Tizen.cs @rookiejava @myroot @shyunmin @sung-su @JoonghyunCho
 
-# GTK
-/Xamarin.Forms.ControlGallery.GTK/ @jsuarezruiz
-/Stubs/Xamarin.Forms.Platform.GTK/ @jsuarezruiz
-/Xamarin.Forms.Platform.GTK/ @jsuarezruiz
-/Xamarin.Forms.Maps.GTK/ @jsuarezruiz
-/EmbeddingTestBeds/Embedding.GTK/ @jsuarezruiz
-/PagesGallery/PagesGallery.GTK/ @jsuarezruiz
-/Xamarin.Forms.Core/PlatformConfiguration/GTKSpecific @jsuarezruiz
-
-# WPF
-/Xamarin.Forms.ControlGallery.WPF/ @mohachouch
-/Stubs/Xamarin.Forms.Platform.WPF/ @mohachouch
-/Xamarin.Forms.Platform.WPF/ @mohachouch
-/Xamarin.Forms.Maps.WPF/ @mohachouch
-/EmbeddingTestBeds/Embedding.WPF/ @mohachouch
-/PagesGallery/PagesGallery.WPF/ @mohachouch
-/Xamarin.Forms.Core/PlatformConfiguration/WPFSpecific @mohachouch
-
-# macOS
-/Xamarin.Forms.ControlGallery.macOS/ @rmarinho
-/Stubs/Xamarin.Forms.Platform.macOS/ @rmarinho
-/Xamarin.Forms.Platform.macOS/ @rmarinho
-/Xamarin.Forms.Maps.macOS/ @rmarinho
-/EmbeddingTestBeds/Embedding.macOS/ @rmarinho
-/PagesGallery/PagesGallery.macOS/ @rmarinho
-/Xamarin.Forms.Core/PlatformConfiguration/macOSSpecific @rmarinho
-
-# XAML
-/Xamarin.Forms.Xaml/ @StephaneDelcroix
-/Xamarin.Forms.Build.Tasks/ @StephaneDelcroix
-
-# Core
-/Xamarin.Forms.Core/ @StephaneDelcroix
-
 # Blazor Desktop
 /src/BlazorWebView/                                     @dotnet/dotnet-maui-blazor-eng
 /src/Templates/src/templates/maui-blazor/               @dotnet/dotnet-maui-blazor-eng

.github/DEVELOPMENT.md

@@ -190,10 +190,12 @@ public static int foo = 2130771968;
 
 # Advanced Scenarios
 
-### Compile using a local `bin\dotnet`
+### Compile using a local `bin\dotnet` via `dotnet-local.*`
 
 This method will use the .NET and workload versions that are specific to the branch you are on, which is a good way to ensure compatibility.
 
+Use `dotnet-local.cmd` on Windows or `dotnet-local.sh` on Unix to ensure that `PATH` is set consistently.
+
 #### Cake
 
 You can run a `Cake` target to bootstrap .NET SDK in `bin\dotnet` and launch Visual Studio:

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -44,28 +44,43 @@ body:
       label: Version with bug
       description: In what version do you see this issue? Run `dotnet workload list` to find your version.
       options:
+        - 7.0.92
+        - 7.0.86
+        - 7.0.81
+        - 7.0.59
         - 7.0.49
         - 7.0.52
         - 7.0.58
-        - 7.0.59
-        - 7.0.81
-        - 7.0.86
-        - 7.0.92
-        - 8.0.0-preview.1.7762
-        - 8.0.0-preview.2.7871
-        - 8.0.0-preview.3.8149
-        - 8.0.0-preview.4.8333
-        - 8.0.0-preview.5.8529
+        - 8.0.0-preview.7.8842
         - 8.0.0-preview.6.8686
+        - 8.0.0-preview.5.8529
+        - 8.0.0-preview.4.8333
+        - 8.0.0-preview.3.8149
+        - 8.0.0-preview.2.7871
+        - 8.0.0-preview.1.7762
         - Unknown/Other
     validations:
       required: true
+  - type: dropdown
+    id: is-regression
+    attributes:
+      label: Is this a regression from previous behavior? 
+      description: In other words, did this work before an update or migration and now does not?
+      multiple: true
+      options:
+        - Yes, this used to work in .NET MAUI
+        - Yes, this used to work in Xamarin.Forms
+        - No, this is something new
+        - Not sure, did not test other versions
+    validations:
+      required: true
   - type: dropdown
     id: version-that-worked
     attributes:
       label: Last version that worked well
-      description: Is there a version on which this _did_ work? If yes, which one? If no or unknown, please select `Unknown/Other`.  Run `dotnet workload list` to find your version.
+      description: If you answered yes, there a version on which this _did_ work, which one? If no or unknown, please select `Unknown/Other`.  Run `dotnet workload list` to find your version.
       options:
+        - Unknown/Other
         - 6.0
         - 7.0.49
         - 7.0.52
@@ -80,7 +95,7 @@ body:
         - 8.0.0-preview.4.8333
         - 8.0.0-preview.5.8529
         - 8.0.0-preview.6.8686
-        - Unknown/Other
+        - 8.0.0-preview.7.8842
     validations:
       required: true
   - type: dropdown

.gitignore

@@ -372,4 +372,7 @@ FodyWeavers.xsd
 local.properties
 
 # Directory Build overrides for local setups
-Directory.Build.Override.props
+Directory.Build.Override.props
+
+# Only the "snapshots" directory should be added to Git, not the "snapshots-diff" directory
+snapshots-diff/

dotnet-local.cmd

@@ -0,0 +1,9 @@
+@echo off
+SET ROOT=%~dp0
+IF EXIST "%ROOT%\bin\dotnet\dotnet.exe" (
+    SET DOTNET_ROOT=%ROOT%\bin\dotnet
+    SET PATH=%DOTNET_ROOT%;%PATH%
+    call "%ROOT%\bin\dotnet\dotnet.exe" %*
+) ELSE (
+    echo "You must build MAUI first. Please see '.github/DEVELOPMENT.md' for details."
+)

dotnet-local.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+ROOT="$(dirname "${BASH_SOURCE}")"
+FULLROOT="$(cd "${ROOT}"; pwd)"
+
+if [[ ! -x "${ROOT}/bin/dotnet/dotnet" ]] ; then
+    echo 'You must build MAUI first. Please see `.github/DEVELOPMENT.md` for details.' 1>&2
+    exit 1
+fi
+
+export DOTNET_ROOT="${FULLROOT}/bin/dotnet"
+export PATH="${DOTNET_ROOT}:${PATH}"
+exec "${ROOT}/bin/dotnet/dotnet" "$@"

eng/AndroidX.targets

@@ -42,7 +42,7 @@
     />
     <PackageReference
         Update="Xamarin.AndroidX.RecyclerView"
-        Version="1.3.0.3"
+        Version="1.3.1"
     />
     <PackageReference
         Update="Xamarin.Build.Download"

eng/Version.Details.xml

@@ -51,17 +51,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23370.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23407.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>915e9ec9a3ab13c70da8286ddb9a5c238a22d98e</Sha>
+      <Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23370.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23407.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>915e9ec9a3ab13c70da8286ddb9a5c238a22d98e</Sha>
+      <Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23370.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23407.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>915e9ec9a3ab13c70da8286ddb9a5c238a22d98e</Sha>
+      <Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>

eng/Versions.props

@@ -26,17 +26,17 @@
     <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
     <MicrosoftGraphicsWin2DPackageVersion>1.0.5.1</MicrosoftGraphicsWin2DPackageVersion>
     <!-- Everything else -->
-    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.9</MicrosoftAspNetCoreAuthorizationPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>7.0.9</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
-    <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>7.0.9</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
-    <MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>7.0.9</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
+    <MicrosoftAspNetCoreAuthorizationPackageVersion>7.0.10</MicrosoftAspNetCoreAuthorizationPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>7.0.10</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>7.0.10</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
+    <MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>7.0.10</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
     <MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
     <MicrosoftAspNetCoreComponentsFormsPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsFormsPackageVersion>
     <MicrosoftAspNetCoreComponentsPackageVersion>7.0.1</MicrosoftAspNetCoreComponentsPackageVersion>
-    <MicrosoftAspNetCoreComponentsWebPackageVersion>7.0.9</MicrosoftAspNetCoreComponentsWebPackageVersion>
-    <MicrosoftAspNetCoreComponentsWebViewPackageVersion>7.0.9</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
+    <MicrosoftAspNetCoreComponentsWebPackageVersion>7.0.10</MicrosoftAspNetCoreComponentsWebPackageVersion>
+    <MicrosoftAspNetCoreComponentsWebViewPackageVersion>7.0.10</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
     <MicrosoftAspNetCoreMetadataPackageVersion>7.0.1</MicrosoftAspNetCoreMetadataPackageVersion>
-    <MicrosoftJSInteropPackageVersion>7.0.9</MicrosoftJSInteropPackageVersion>
+    <MicrosoftJSInteropPackageVersion>7.0.10</MicrosoftJSInteropPackageVersion>
     <!-- Other packages -->
     <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
@@ -68,9 +68,9 @@
     <_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
     <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23370.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23370.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23370.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23407.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23407.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23407.2</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>

eng/automation/SignList.xml

@@ -7,6 +7,9 @@
     <FirstParty Include="Microsoft.AspNetCore.Components.WebView.*.dll" />
     <FirstParty Include="Microsoft.Extensions*.dll" />
     <FirstParty Include="System.CodeDom.dll" />
+    <FirstParty Include="Microsoft.Bcl.AsyncInterfaces.dll" />
+    <FirstParty Include="System.Text.Json.dll" />
+    <FirstParty Include="System.Text.Encodings.Web.dll" />
 
     <!-- SkiaSharp -->
     <FirstParty Include="SkiaSharp*.dll" />
@@ -44,15 +47,12 @@
     <Skip Include="NuGet.*.dll" />
     <Skip Include="Mono.*.dll" />
     <Skip Include="Microsoft.Build.*.dll" />
-    <Skip Include="Microsoft.Bcl.AsyncInterfaces.dll" />
     <Skip Include="System.Buffers.dll" />
     <Skip Include="System.IO.UnmanagedMemoryStream.dll" />
     <Skip Include="System.Memory.dll" />
     <Skip Include="System.Numerics.Vectors.dll" />
     <Skip Include="System.ObjectModel.dll" />
     <Skip Include="System.Runtime.CompilerServices.Unsafe.dll" />
-    <Skip Include="System.Text.Json.dll" />
-    <Skip Include="System.Text.Encodings.Web.dll" />
   </ItemGroup>
 
 </Project>

eng/cake/dotnet.cake

@@ -240,20 +240,24 @@ Task("dotnet-pack-maui")
     .WithCriteria(RunPackTarget())
     .Does(() =>
     {
-        //We are passing a nuget folder with nuget locations
-        if(!string.IsNullOrEmpty(nugetSource))
+        // We are passing a nuget folder with nuget locations
+        if (!string.IsNullOrEmpty(nugetSource))
         {
             EnsureDirectoryExists(nugetSource);
             var originalNuget = File("./NuGet.config");
             ReplaceTextInFiles(
                 originalNuget,
-                 $"<!-- <add key=\"local\" value=\"artifacts\" /> -->",
+                $"<!-- <add key=\"local\" value=\"artifacts\" /> -->",
                 $"<add key=\"local\" value=\"{nugetSource}\" />");
         }
-        DotNetTool("pwsh", new DotNetToolSettings
+
+        var sln = "./Microsoft.Maui.Packages.slnf";
+        if (!IsRunningOnWindows())
+            sln = "./Microsoft.Maui.Packages-mac.slnf";
+
+        RunMSBuildWithDotNet(sln, target: "Pack", properties: new Dictionary<string, string>
         {
-            DiagnosticOutput = true,
-            ArgumentCustomization = args => args.Append($"-NoProfile ./eng/package.ps1 -configuration \"{configuration}\"")
+            { "SymbolPackageFormat", "snupkg" }
         });
     });
 

eng/devices/android.cake

@@ -373,7 +373,7 @@ RunTarget(TARGET);
 void SetupAppPackageNameAndResult()
 {
    if (string.IsNullOrEmpty(TEST_APP)) {
-		if (string.IsNullOrEmpty(TEST_APP_PROJECT.FullPath))
+   		if (string.IsNullOrEmpty(TEST_APP_PROJECT.FullPath))
 			throw new Exception("If no app was specified, an app must be provided.");
 
 		var binFolder = TEST_APP_PROJECT.GetDirectory().Combine("bin");
@@ -384,7 +384,13 @@ void SetupAppPackageNameAndResult()
 			TEST_APP = apps.FirstOrDefault().FullPath;
 		} else {
 			apps = GetFiles(binDir + "/*.apk");
-			TEST_APP = apps.First().FullPath;
+			if (apps.Any()) {
+				TEST_APP = apps.First().FullPath;
+			}
+			else {
+				Error("Error: Couldn't find .apk file");
+				throw new Exception("Error: Couldn't find .apk file");
+			}
 		}
 	}
 	if (string.IsNullOrEmpty(TEST_APP_PACKAGE_NAME)) {

eng/devices/ios.cake

@@ -6,7 +6,7 @@
 
 string TARGET = Argument("target", "Test");
 
-const string defaultVersion = "16.2";
+const string defaultVersion = "16.4";
 const string dotnetVersion = "net7.0";
 // required
 FilePath PROJECT = Argument("project", EnvironmentVariable("IOS_TEST_PROJECT") ?? "");
@@ -166,12 +166,26 @@ Task("Test")
 		DeleteFiles(Directory(TEST_RESULTS).Path.Combine("*.*").FullPath);
 	}
 
+	var XCODE_PATH =  Argument("xcode_path", "");
+
+	if (String.IsNullOrEmpty(XCODE_PATH) && IsCIBuild())
+		XCODE_PATH = "/Applications/Xcode_14.3.0.app";
+		
+	string xcode_args = "";
+	if (!String.IsNullOrEmpty(XCODE_PATH))
+	{
+		xcode_args = $"--xcode=\"{XCODE_PATH}\" ";
+	}
+
+	Information("XCODE PATH: {0}", XCODE_PATH);
+
 	var settings = new DotNetToolSettings {
 		DiagnosticOutput = true,
 		ArgumentCustomization = args => args.Append("run xharness apple test " +
 		$"--app=\"{TEST_APP}\" " +
 		$"--targets=\"{TEST_DEVICE}\" " +
 		$"--output-directory=\"{TEST_RESULTS}\" " +
+		xcode_args +
 		$"--verbosity=\"Debug\" ")
 	};