Fix Merge

dotnet · Jun 29, 2024 · 3594aeb · 3594aeb
1 parent 9ae3331
commit 3594aeb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake
@@ -190,7 +190,7 @@ Task("dotnet-samples")
                 Error(errMsg);
                 throw new Exception(errMsg);
             }
-            projectsToBuild = "./src/Controls/tests/TestCases/Controls.TestCases.App.csproj";
+            projectsToBuild = "./src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj";
             properties["_UseNativeAot"] = "true";
         }
         else

diff --git a/...ntrols/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewIsEnabled.cs b/...ntrols/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewIsEnabled.cs
@@ -22,6 +22,7 @@ public ScrollViewIsEnabledTests(TestDevice device)
 
 		public override string Issue => "ScrollView set to disabled will still allow scrolling";
 
+#if WINDOWS || ANDROID
 		// ScrollViewInitiallyEnabled (src\Compatibility\ControlGallery\src\Issues.Shared\ScrollViewIsEnabled.cs)
 		[Test]
 		[FailsOnIOS("This test is failing, likely due to product issue")]
@@ -119,5 +120,6 @@ public void ScrollViewInitiallyNotEnabledThenEnabled()
 
 			this.Back();
 		}
+#endif
 	}
 }