diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel index 0da022c4b72d1..4dff09a9bfb2a 100644 --- a/dotnet/src/webdriver/BUILD.bazel +++ b/dotnet/src/webdriver/BUILD.bazel @@ -40,6 +40,7 @@ csharp_library( "IE/*.cs", "Interactions/*.cs", "Internal/*.cs", + "Properties/*.cs", "Remote/**/*.cs", "Safari/*.cs", "Support/*.cs", @@ -60,9 +61,6 @@ csharp_library( ], visibility = ["//visibility:public"], deps = [ - "@identitymodel.abstractions//:Microsoft.IdentityModel.Abstractions", - "@identitymodel.logging//:Microsoft.IdentityModel.Logging", - "@identitymodel.tokens//:Microsoft.IdentityModel.Tokens", "@json.net//:Newtonsoft.Json", "@system.drawing.common//:System.Drawing.Common", ], @@ -80,6 +78,7 @@ csharp_library( "IE/*.cs", "Interactions/*.cs", "Internal/*.cs", + "Properties/*.cs", "Remote/**/*.cs", "Safari/*.cs", "Support/*.cs", @@ -101,9 +100,6 @@ csharp_library( ], visibility = ["//visibility:public"], deps = [ - "@identitymodel.abstractions//:Microsoft.IdentityModel.Abstractions", - "@identitymodel.logging//:Microsoft.IdentityModel.Logging", - "@identitymodel.tokens//:Microsoft.IdentityModel.Tokens", "@json.net//:Newtonsoft.Json", "@system.drawing.common//:System.Drawing.Common", ], diff --git a/dotnet/src/webdriver/Properties/AssemblyInfo.cs b/dotnet/src/webdriver/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000000..d80031fbf396d --- /dev/null +++ b/dotnet/src/webdriver/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly:InternalsVisibleTo("WebDriver.Common.Tests")] diff --git a/dotnet/test/common/VirtualAuthn/VirtualAuthenticatorTest.cs b/dotnet/test/common/VirtualAuthn/VirtualAuthenticatorTest.cs index c0573eb59241a..a5c707aa46f6b 100644 --- a/dotnet/test/common/VirtualAuthn/VirtualAuthenticatorTest.cs +++ b/dotnet/test/common/VirtualAuthn/VirtualAuthenticatorTest.cs @@ -3,8 +3,8 @@ using System.Collections.ObjectModel; using System.Linq; using OpenQA.Selenium.Environment; +using OpenQA.Selenium.Internal; using NUnit.Framework; -using Microsoft.IdentityModel.Tokens; using static OpenQA.Selenium.VirtualAuth.VirtualAuthenticatorOptions; @@ -207,9 +207,8 @@ public void ShouldAddNonResidentCredentialWhenAuthenticatorUsesU2FProtocol() { CreateRKDisabledU2FAuthenticator(); - /** - * A pkcs#8 encoded unencrypted EC256 private key as a base64url string. - */ + + // A pkcs#8 encoded unencrypted EC256 private key as a base64url string. string base64EncodedEC256PK = "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg8_zMDQDYAxlU-Q" + "hk1Dwkf0v18GZca1DMF3SaJ9HPdmShRANCAASNYX5lyVCOZLzFZzrIKmeZ2jwU" @@ -272,9 +271,7 @@ public void AddResidentCredentialNotSupportedWhenAuthenticatorUsesU2FProtocol() // Add a resident credential using the testing API. CreateRKEnabledU2FAuthenticator(); - /** - * A pkcs#8 encoded unencrypted EC256 private key as a base64url string. - */ + // A pkcs#8 encoded unencrypted EC256 private key as a base64url string. string base64EncodedEC256PK = "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg8_zMDQDYAxlU-Q" + "hk1Dwkf0v18GZca1DMF3SaJ9HPdmShRANCAASNYX5lyVCOZLzFZzrIKmeZ2jwU" @@ -475,4 +472,4 @@ public void testSetUserVerified() Assert.True(error.StartsWith("NotAllowedError")); } } -} +} \ No newline at end of file diff --git a/dotnet/test/common/WebDriver.Common.Tests.csproj b/dotnet/test/common/WebDriver.Common.Tests.csproj index 46f0097bcdbe6..c759d2f2acb93 100644 --- a/dotnet/test/common/WebDriver.Common.Tests.csproj +++ b/dotnet/test/common/WebDriver.Common.Tests.csproj @@ -30,7 +30,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/dotnet/workspace.bzl b/dotnet/workspace.bzl index 3e8ebc2ca8bed..3db0838875b2a 100644 --- a/dotnet/workspace.bzl +++ b/dotnet/workspace.bzl @@ -11,24 +11,6 @@ def selenium_register_dotnet(): native.register_toolchains("//third_party/dotnet/ilmerge:all") - import_nuget_package( - name = "identitymodel.tokens", - file = "third_party/dotnet/nuget/packages/microsoft.identitymodel.tokens.6.19.0.nupkg", - sha256 = "9ef0cd1a0f36716e20a39a7d612292c1ea0b1a6f196395db0c7552518ac0f0bd", - ) - - import_nuget_package( - name = "identitymodel.logging", - file = "third_party/dotnet/nuget/packages/microsoft.identitymodel.logging.6.19.0.nupkg", - sha256 = "0f0c738bf4ce27c5b4f6a441ce067a888b3e3b2a6783517b5d8caa46eec4516a", - ) - - import_nuget_package( - name = "identitymodel.abstractions", - file = "third_party/dotnet/nuget/packages/microsoft.identitymodel.abstractions.6.19.0.nupkg", - sha256 = "eaa7f4995eb68edf7b6d1586a3a35027f6f9252ab82cb1478cec347a42895ee0", - ) - import_nuget_package( name = "json.net", file = "third_party/dotnet/nuget/packages/newtonsoft.json.13.0.1.nupkg",