diff --git a/dotnet/test/remote/BUILD.bazel b/dotnet/test/remote/BUILD.bazel index 750de342e00c6..4248415df2870 100644 --- a/dotnet/test/remote/BUILD.bazel +++ b/dotnet/test/remote/BUILD.bazel @@ -3,7 +3,13 @@ load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package") dotnet_nunit_test_suite( name = "remote", size = "large", - srcs = glob(["**/*.cs"]), + srcs = glob( + ["**/*.cs"], + exclude = [ + "bin/**", + "obj/**", + ], + ), out = "WebDriver.Remote.Tests", browsers = ["remote"], data = [ @@ -11,7 +17,7 @@ dotnet_nunit_test_suite( ], flaky = True, project_sdk = "web", - target_frameworks = ["net8.0"], + target_frameworks = ["net10.0"], deps = [ "//dotnet/src/webdriver:webdriver-net8.0", "//dotnet/test/testing.webserver", diff --git a/dotnet/test/remote/Selenium.WebDriver.Remote.Tests.csproj b/dotnet/test/remote/Selenium.WebDriver.Remote.Tests.csproj index 79fdb0f42cf71..460a9fd6af7bd 100644 --- a/dotnet/test/remote/Selenium.WebDriver.Remote.Tests.csproj +++ b/dotnet/test/remote/Selenium.WebDriver.Remote.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 WebDriver.Remote.Tests diff --git a/dotnet/test/support/BUILD.bazel b/dotnet/test/support/BUILD.bazel index 8d14af1c92633..a29948a74d55b 100644 --- a/dotnet/test/support/BUILD.bazel +++ b/dotnet/test/support/BUILD.bazel @@ -3,7 +3,13 @@ load("//dotnet:defs.bzl", "dotnet_nunit_test_suite", "nuget_package") dotnet_nunit_test_suite( name = "support", size = "large", - srcs = glob(["**/*.cs"]), + srcs = glob( + ["**/*.cs"], + exclude = [ + "bin/**", + "obj/**", + ], + ), browsers = [ "firefox", ], @@ -11,7 +17,7 @@ dotnet_nunit_test_suite( "//dotnet/test/webdriver:test-data", ], project_sdk = "web", - target_frameworks = ["net8.0"], + target_frameworks = ["net10.0"], deps = [ "//dotnet/src/support", "//dotnet/src/webdriver:webdriver-net8.0", diff --git a/dotnet/test/support/Selenium.WebDriver.Support.Tests.csproj b/dotnet/test/support/Selenium.WebDriver.Support.Tests.csproj index b5546e6a0bce0..1d2b78be5319c 100644 --- a/dotnet/test/support/Selenium.WebDriver.Support.Tests.csproj +++ b/dotnet/test/support/Selenium.WebDriver.Support.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 WebDriver.Support.Tests OpenQA.Selenium.Support.Tests diff --git a/dotnet/test/testing.webserver/BUILD.bazel b/dotnet/test/testing.webserver/BUILD.bazel index efb1d5b61a358..563c18ff01513 100644 --- a/dotnet/test/testing.webserver/BUILD.bazel +++ b/dotnet/test/testing.webserver/BUILD.bazel @@ -3,7 +3,13 @@ load("//dotnet:defs.bzl", "csharp_library") csharp_library( name = "testing.webserver", testonly = True, - srcs = glob(["**/*.cs"]), + srcs = glob( + ["**/*.cs"], + exclude = [ + "bin/**", + "obj/**", + ], + ), out = "Testing.WebServer", data = [ "//common/src/web", @@ -11,7 +17,7 @@ csharp_library( nullable = "enable", project_sdk = "web", run_analyzers = False, - target_frameworks = ["net8.0"], + target_frameworks = ["net10.0"], visibility = [ "//dotnet/test:__subpackages__", ], diff --git a/dotnet/test/testing.webserver/Selenium.Testing.WebServer.csproj b/dotnet/test/testing.webserver/Selenium.Testing.WebServer.csproj index 99aaf96fd6708..3d7ee1504d294 100644 --- a/dotnet/test/testing.webserver/Selenium.Testing.WebServer.csproj +++ b/dotnet/test/testing.webserver/Selenium.Testing.WebServer.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 Testing.WebServer OpenQA.Selenium.Testing.WebServer enable diff --git a/dotnet/test/webdriver/BUILD.bazel b/dotnet/test/webdriver/BUILD.bazel index 735af168a2cb9..979a2f8df1062 100644 --- a/dotnet/test/webdriver/BUILD.bazel +++ b/dotnet/test/webdriver/BUILD.bazel @@ -23,7 +23,13 @@ filegroup( dotnet_nunit_test_suite( name = "webdriver", size = "small", - srcs = glob(["**/*.cs"]), + srcs = glob( + ["**/*.cs"], + exclude = [ + "bin/**", + "obj/**", + ], + ), out = "WebDriver.Tests", browsers = [ # The first browser in this list is assumed to be the one that should @@ -38,7 +44,7 @@ dotnet_nunit_test_suite( ":test-data", ], project_sdk = "web", - target_frameworks = ["net8.0"], + target_frameworks = ["net10.0"], visibility = ["//dotnet/test:__subpackages__"], deps = [ "//dotnet/src/webdriver:webdriver-net8.0", diff --git a/dotnet/test/webdriver/Infrastructure/IgnoreTargetAttribute.cs b/dotnet/test/webdriver/Infrastructure/IgnoreTargetAttribute.cs index e20e63ffc2ff1..12228e9b0fe39 100644 --- a/dotnet/test/webdriver/Infrastructure/IgnoreTargetAttribute.cs +++ b/dotnet/test/webdriver/Infrastructure/IgnoreTargetAttribute.cs @@ -78,8 +78,8 @@ private static bool IgnoreTestForPlatform(string platformToIgnore) private static string CurrentPlatform() { -#if NET8_0 - return "net8"; +#if NET10_0 + return "net10"; #else #error Update IgnoreTargetAttribute.CurrentPlatform to the current TFM #endif diff --git a/dotnet/test/webdriver/Selenium.WebDriver.Tests.csproj b/dotnet/test/webdriver/Selenium.WebDriver.Tests.csproj index 20a80804aa44d..c73c24b69d084 100644 --- a/dotnet/test/webdriver/Selenium.WebDriver.Tests.csproj +++ b/dotnet/test/webdriver/Selenium.WebDriver.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 WebDriver.Tests OpenQA.Selenium.Tests diff --git a/dotnet/test/webdriver/TakesScreenshotTests.cs b/dotnet/test/webdriver/TakesScreenshotTests.cs index 083e15396cac2..b9ec5560c1e87 100644 --- a/dotnet/test/webdriver/TakesScreenshotTests.cs +++ b/dotnet/test/webdriver/TakesScreenshotTests.cs @@ -85,7 +85,7 @@ public void GetScreenshotAsBinary() [IgnoreBrowser(Browser.Firefox, "Not working properly in RBE, works locally with pinned browsers")] public void ShouldCaptureScreenshotOfCurrentViewport() { -#if NET8_0 +#if NET10_0 Assert.Ignore("Skipping test: this framework can not process colors."); #endif @@ -114,7 +114,7 @@ public void ShouldCaptureScreenshotOfCurrentViewport() [IgnoreBrowser(Browser.Edge, "Color comparisons fail on Edge")] public void ShouldTakeScreenshotsOfAnElement() { -#if NET8_0 +#if NET10_0 Assert.Ignore("Skipping test: this framework can not process colors."); #endif @@ -142,7 +142,7 @@ public void ShouldTakeScreenshotsOfAnElement() [IgnoreBrowser(Browser.Edge, "Color comparisons fail on Edge")] public void ShouldCaptureScreenshotAtFramePage() { -#if NET8_0 +#if NET10_0 Assert.Ignore("Skipping test: this framework can not process colors."); #endif @@ -186,7 +186,7 @@ public void ShouldCaptureScreenshotAtFramePage() [IgnoreBrowser(Browser.Edge, "Color comparisons fail on Edge")] public void ShouldCaptureScreenshotAtIFramePage() { -#if NET8_0 +#if NET10_0 Assert.Ignore("Skipping test: this framework can not process colors."); #endif @@ -228,7 +228,7 @@ public void ShouldCaptureScreenshotAtIFramePage() [IgnoreBrowser(Browser.Edge, "Color comparisons fail on Edge")] public void ShouldCaptureScreenshotAtFramePageAfterSwitching() { -#if NET8_0 +#if NET10_0 Assert.Ignore("Skipping test: this framework can not process colors."); #endif @@ -268,7 +268,7 @@ public void ShouldCaptureScreenshotAtFramePageAfterSwitching() [IgnoreBrowser(Browser.Edge, "Color comparisons fail on Edge")] public void ShouldCaptureScreenshotAtIFramePageAfterSwitching() { -#if NET6_0 || NET8_0 +#if NET10_0 Assert.Ignore("Skipping test: this framework can not process colors."); #endif @@ -343,7 +343,7 @@ private HashSet ScanActualColors(Screenshot screenshot, int stepX, int s { HashSet colors = new HashSet(); -#if !NET8_0 +#if !NET10_0 try { Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray)); @@ -377,7 +377,7 @@ private Color GetPixelColor(Screenshot screenshot, int x, int y) { Color pixelColor = Color.Black; -#if !NET8_0 +#if !NET10_0 Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray)); Bitmap bitmap = new Bitmap(image); pixelColor = bitmap.GetPixel(1, 1);