Revert "[net8.0] Merge main to net8 (#15478)" (#15632)

This reverts commit b965617.
dotnet · Jun 14, 2023 · 9e32b43 · 9e32b43
1 parent b965617
commit 9e32b43
Show file tree

Hide file tree

Showing 262 changed files with 235 additions and 1,264 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "8.0.0-prerelease.23307.1",
+      "version": "8.0.0-prerelease.23272.1",
       "commands": [
         "xharness"
       ]

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug with Comet",
+            "type": "comet",
+            "request": "launch",
+            "preLaunchTask": "comet: Build"
+        },
+        {
+            "name": "Debug with Xamarin",
+            "type": "mono",
+            "request": "attach",
+            "address": "localhost",
+            "port": 10000,  
+            "preLaunchTask": "Run Sample"
+        },
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/docs/design/layout.md b/docs/design/layout.md
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -83,17 +83,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23307.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23272.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>98cbe592ee7494c5813d0e5173bc7a160fbcce70</Sha>
+      <Sha>5d3b745c64e8092c2ce3ce1feca85d87d814f292</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23307.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23272.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>98cbe592ee7494c5813d0e5173bc7a160fbcce70</Sha>
+      <Sha>5d3b745c64e8092c2ce3ce1feca85d87d814f292</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23307.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23272.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>98cbe592ee7494c5813d0e5173bc7a160fbcce70</Sha>
+      <Sha>5d3b745c64e8092c2ce3ce1feca85d87d814f292</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -25,7 +25,7 @@
     <!-- wasdk -->
     <MicrosoftWindowsAppSDKPackageVersion>1.3.230502000</MicrosoftWindowsAppSDKPackageVersion>
     <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
-    <MicrosoftGraphicsWin2DPackageVersion>1.0.5.1</MicrosoftGraphicsWin2DPackageVersion>
+    <MicrosoftGraphicsWin2DPackageVersion>1.0.4</MicrosoftGraphicsWin2DPackageVersion>
     <!-- Everything else -->
     <MicrosoftAspNetCoreAuthorizationPackageVersion>8.0.0-preview.6.23302.1</MicrosoftAspNetCoreAuthorizationPackageVersion>
     <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>8.0.0-preview.6.23302.1</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
@@ -69,9 +69,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.23307.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23307.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23307.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23272.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23272.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23272.1</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>

diff --git a/eng/devices/android.cake b/eng/devices/android.cake
@@ -373,7 +373,7 @@ Task("uitest")
 
 	});
 
-	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_DIR}/appium_android.log");
+	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_ARG}/appium_android.log");
 
 	Information("Run UITests project {0}",PROJECT.FullPath);
 	RunTestWithLocalDotNet(PROJECT.FullPath, CONFIGURATION, noBuild: true);

diff --git a/eng/devices/catalyst.cake b/eng/devices/catalyst.cake
@@ -90,7 +90,7 @@ Task("uitest")
 				//.Append("/tl")
 	});
 
-	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_DIR}/appium_mac.log");
+	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_ARG}/appium_mac.log");
 
 	Information("Run UITests project {0}",PROJECT.FullPath);
 	RunTestWithLocalDotNet(PROJECT.FullPath, CONFIGURATION, noBuild: true);

diff --git a/eng/devices/ios.cake b/eng/devices/ios.cake
@@ -263,7 +263,7 @@ Task("uitest")
 
 	});
 
-	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_DIR}/appium_ios.log");
+	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_ARG}/appium_ios.log");
 
 	Information("Run UITests project {0}",PROJECT.FullPath);
 	RunTestWithLocalDotNet(PROJECT.FullPath, CONFIGURATION, noBuild: true);

diff --git a/eng/devices/windows.cake b/eng/devices/windows.cake
@@ -97,7 +97,7 @@ Task("uitest")
 	});
 
 	SetEnvironmentVariable("WINDOWS_APP_PATH", TEST_APP);
-	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_DIR}/appium_windows.log");
+	SetEnvironmentVariable("APPIUM_LOG_FILE", $"{BINLOG_ARG}/appium_windows.log");
 
 	Information("Run UITests project {0}",PROJECT.FullPath);
 	RunTestWithLocalDotNet(PROJECT.FullPath, CONFIGURATION, toolPath, noBuild: true);

diff --git a/eng/scripts/appium-install.ps1 b/eng/scripts/appium-install.ps1
@@ -1,93 +1,25 @@
-<#
-.SYNOPSIS
-
-Install dependencies for Appium UITests
-
-.DESCRIPTION
-
-This will install or update npm, appium and the following drivers: appium-windows-driver, uiautomator2, xcuitest and mac2
-
-.PARAMETER appiumVersion
-
-The Appium version to install
-
-.PARAMETER windowsDriverVersion
-
-The windows driver version to update or install
-
-.PARAMETER androidDriverVersion
-
-The uiautomator2 driver version to update or install
-
-.PARAMETER iOSDriverVersion
-
-The xcuitest driver version to update or install
-
-.PARAMETER macDriverVersion
-
-The mac2 driver version to update or install
-
-
-.EXAMPLE
-
-PS> .\appium-install.ps1 '2.0.0-beta.61' 2.7.2 2.25.1 4.30.2 1.6.1
-
-This would install or update Appium version 2.0.0-beta.61, the windows driver 2.7.2, the uiautomator2 driver with 2.25.1, the xcuitest driver with 4.30.2 and mac2 driver with 1.6.1
-#>
-
-
-param
-(
-    [string] $appiumVersion = '2.0.0-beta.64',
-    [string] $windowsDriverVersion = '2.7.2',
-    [string] $androidDriverVersion = '2.25.1',
-    [string] $iOSDriverVersion = '4.30.2',
-    [string] $macDriverVersion = '1.6.1'
-)
-
 node -v
 npm install -g npm
 node -v
-npm install -g appium@$appiumVersion
+npm install -g appium@2.0.0-beta.61
 appium -v
 $x = appium driver list --installed --json  | ConvertFrom-Json
-
 if(!$x.windows)
 {
-    appium driver install --source=npm appium-windows-driver@$windowsDriverVersion
-}
-else
-{
-    appium driver uninstall windows
-    appium driver install --source=npm appium-windows-driver@$windowsDriverVersion
+    appium driver install --source=npm appium-windows-driver
 }
 
 if(!$x.uiautomator2)
 {
-    appium driver install uiautomator2@$androidDriverVersion
-}
-else
-{
-    appium driver uninstall uiautomator2
-    appium driver install uiautomator2@$androidDriverVersion
+    appium driver install uiautomator2
 }
 
 if(!$x.xcuitest)
 {
-    appium driver install xcuitest@$iOSDriverVersion
-}
-else
-{
-    appium driver uninstall xcuitest
-    appium driver install xcuitest@$iOSDriverVersion
+    appium driver install xcuitest
 }
 
 if(!$x.mac2)
 {
-    appium driver install mac2@$macDriverVersion
-}
-else
-{
-    appium driver uninstall mac2
-    appium driver install mac2@$macDriverVersion
+    appium driver install mac2
 }
diff --git a/src/Compatibility/Android.AppLinks/src/Compatibility.Android.AppLinks.csproj b/src/Compatibility/Android.AppLinks/src/Compatibility.Android.AppLinks.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Firebase.AppIndexing" Version="120.0.0.12" />
+    <PackageReference Include="Xamarin.Firebase.AppIndexing" Version="120.0.0.11" />
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
   </ItemGroup>
 

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/AddingMultipleItemsListView.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/AddingMultipleItemsListView.cs
@@ -132,7 +132,6 @@ public void AddingMultipleListViewTests1AllElementsPresent()
 		}
 
 		[Test]
-		[FailsOnMauiIOS]
 		public void AddingMultipleListViewTests2AddOneElementToList()
 		{
 			RunningApp.Tap(q => q.Marked("Add One"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla23942.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla23942.xaml.cs
@@ -61,7 +61,6 @@ protected override void OnAppearing()
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Bugzilla23942Test()
 		{
 			RunningApp.WaitForElement(q => q.Marked("success"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla24574.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla24574.cs
@@ -40,7 +40,6 @@ protected override void Init()
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void TapThenDoubleTap()
 		{
 			RunningApp.Screenshot("I am at Issue 24574");

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26233.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26233.cs
@@ -49,7 +49,6 @@ public ItemTemplate()
 
 #if UITEST
 		[Test]
-		[FailsOnMauiIOS]
 		public void DoesntCrashOnNavigatingBackToThePage()
 		{
 			RunningApp.WaitForElement(q => q.Marked("btnPush"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26993.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26993.cs
@@ -97,7 +97,6 @@ protected override void Init()
 #if __MACOS__
 		[Ignore("Webview query is not implemented yet on UITEst desktop")]
 #endif
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Bugzilla26993Test()
 		{
 			RunningApp.Screenshot("I am at BZ26993");

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29128.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29128.cs
@@ -30,7 +30,6 @@ protected override void Init()
 #if UITEST
 		[Test]
 		[Category(UITestCategories.ManualReview)]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Bugzilla29128Test()
 		{
 			RunningApp.WaitForElement(q => q.Marked("SliderId"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29363.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29363.cs
@@ -48,7 +48,6 @@ protected override void Init()
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void PushButton()
 		{
 			RunningApp.Tap(q => q.Marked("Modal Push Pop Test"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31395.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31395.cs
@@ -46,7 +46,6 @@ public class CustomContentView : ContentView
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Bugzilla31395Test()
 		{
 			RunningApp.WaitForElement(q => q.Marked("Switch Main Page"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32040.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32040.cs
@@ -58,7 +58,6 @@ protected override void Init()
 		}
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void TappedWorksForEntryAndSwithCellTest()
 		{
 			RunningApp.Tap(q => q.Marked("blahblah"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32148.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32148.cs
@@ -233,7 +233,6 @@ public ContactItemTemplate()
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Bugzilla32148Test()
 		{
 			RunningApp.WaitForElement(q => q.Marked("Contact0 LastName"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32206.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32206.cs
@@ -23,9 +23,8 @@ protected override void Init()
 			PushAsync(new LandingPage32206());
 		}
 
-#if UITEST && IOS
+#if UITEST && __IOS__
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Bugzilla32206Test()
 		{
 			for (var n = 0; n < 10; n++)

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32462.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32462.cs
@@ -51,7 +51,6 @@ protected override void Init()
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Bugzilla36729Test()
 		{
 			RunningApp.WaitForElement(q => q.Marked("Click!"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32615.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla32615.cs
@@ -60,7 +60,6 @@ protected override void OnAppearing()
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public async Task Bugzilla32615Test()
 		{
 			RunningApp.Tap(q => q.Marked("btnModal"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla33578.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla33578.cs
@@ -80,7 +80,6 @@ protected override void Init()
 
 #if UITEST && __IOS__
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void TableViewEntryCellShowsDefaultKeyboardThenNumericKeyboardAfterScrolling()
 		{
 			RunningApp.ScrollDown();

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla33870.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla33870.cs
@@ -121,7 +121,6 @@ public MenuItem(string name)
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Bugzilla33870Test()
 		{
 			RunningApp.WaitForElement(x => x.Marked(PageContentAutomatedId));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla34007.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla34007.cs
@@ -74,7 +74,6 @@ protected override void Init()
 #if UITEST
 		[Test]
 		[UiTest(typeof(Grid))]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue34007TestFirstElementHasLowestZOrder()
 		{
 			var buttonLocations = RunningApp.WaitForElement(q => q.Marked("Button 0"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla34912.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla34912.cs
@@ -103,7 +103,6 @@ protected override void Init()
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Bugzilla34912Test()
 		{
 			RunningApp.Tap(q => q.Marked("Allen"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35127.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35127.cs
@@ -34,7 +34,6 @@ protected override void Init()
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Issue35127Test()
 		{
 			RunningApp.WaitForElement(q => q.Marked("See me?"));

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35477.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35477.cs
@@ -44,7 +44,6 @@ protected override void Init()
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void TapGestureFiresOnFrame()
 		{
 			RunningApp.WaitForElement("No taps yet");

diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35733.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35733.cs
@@ -57,7 +57,6 @@ async Task ShowLocation(string locationString)
 
 #if UITEST
 		[Test]
-		[Compatibility.UITests.FailsOnMauiIOS]
 		public void Bugzilla35733Test()
 		{
 			RunningApp.WaitForElement(q => q.Marked("btnGo"));
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		[Test]
-    		[FailsOnMauiIOS]
     		public void AddingMultipleListViewTests2AddOneElementToList()
     		{
     			RunningApp.Tap(q => q.Marked("Add One"));
@@ Expand Down @@