From 74a2053c1f3fdec90d45346153a06aba9de44ada Mon Sep 17 00:00:00 2001 From: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> Date: Thu, 21 Aug 2025 15:30:36 +0300 Subject: [PATCH 1/3] [dotnet] Help old .net framework copy selenium manager to output --- .../nuget/build/netstandard2.0/Selenium.WebDriver.targets | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets b/dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets index 7849cc953d08b..d469e0d7950e3 100644 --- a/dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets +++ b/dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets @@ -1,8 +1,9 @@ - - + + runtimes\win\native\%(Filename)%(Extension) PreserveNewest From 63d7e0cc87b7f99e3ac144c69e173d2ce8587288 Mon Sep 17 00:00:00 2001 From: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> Date: Thu, 21 Aug 2025 16:12:36 +0300 Subject: [PATCH 2/3] And check RuntimeIdentifiers --- .../nuget/build/netstandard2.0/Selenium.WebDriver.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets b/dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets index d469e0d7950e3..d187244165620 100644 --- a/dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets +++ b/dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets @@ -3,7 +3,7 @@ - + runtimes\win\native\%(Filename)%(Extension) PreserveNewest From 6f19349ae3c1efe01742b7a52b591dfd6b930288 Mon Sep 17 00:00:00 2001 From: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> Date: Fri, 22 Aug 2025 16:09:11 +0300 Subject: [PATCH 3/3] Pack assets targets on top invariant level --- dotnet/src/webdriver/BUILD.bazel | 16 ++++++++-------- .../Selenium.WebDriver.StrongNamed.nuspec | 4 ++-- dotnet/src/webdriver/Selenium.WebDriver.csproj | 4 ++-- dotnet/src/webdriver/Selenium.WebDriver.nuspec | 4 ++-- dotnet/src/webdriver/assets/BUILD.bazel | 4 ++-- .../Selenium.WebDriver.targets | 6 +++--- .../Selenium.WebDriver.targets | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) rename dotnet/src/webdriver/assets/nuget/build/{netstandard2.0 => }/Selenium.WebDriver.targets (78%) rename dotnet/src/webdriver/assets/nuget/buildTransitive/{netstandard2.0 => }/Selenium.WebDriver.targets (54%) diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel index 10f0e3a38569f..7eb83adc81ec4 100644 --- a/dotnet/src/webdriver/BUILD.bazel +++ b/dotnet/src/webdriver/BUILD.bazel @@ -168,14 +168,14 @@ copy_file( ) copy_file( - name = "assets-nuget-build-netstandard20-targets", - src = "//dotnet/src/webdriver/assets:nuget/build/netstandard2.0/Selenium.WebDriver.targets", + name = "assets-nuget-build-targets", + src = "//dotnet/src/webdriver/assets:nuget/build/Selenium.WebDriver.targets", out = "Selenium.WebDriver.targets", ) copy_file( - name = "assets-nuget-buildtransitive-netstandard20-targets", - src = "//dotnet/src/webdriver/assets:nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets", + name = "assets-nuget-buildtransitive-targets", + src = "//dotnet/src/webdriver/assets:nuget/buildTransitive/Selenium.WebDriver.targets", out = "transitiveSelenium.WebDriver.targets", ) @@ -208,8 +208,8 @@ nuget_pack( "//common/manager:selenium-manager-macos": "manager/macos/selenium-manager", "//common/manager:selenium-manager-windows": "manager/windows/selenium-manager.exe", ":assets-nuget-readme": "README.md", - ":assets-nuget-build-netstandard20-targets": "build/netstandard2.0/Selenium.WebDriver.targets", - ":assets-nuget-buildtransitive-netstandard20-targets": "buildTransitive/netstandard2.0/Selenium.WebDriver.targets", + ":assets-nuget-build-targets": "build/Selenium.WebDriver.targets", + ":assets-nuget-buildtransitive-targets": "buildTransitive/Selenium.WebDriver.targets", }, id = "Selenium.WebDriver", libs = { @@ -234,8 +234,8 @@ nuget_pack( "//common/manager:selenium-manager-macos": "manager/macos/selenium-manager", "//common/manager:selenium-manager-windows": "manager/windows/selenium-manager.exe", ":assets-nuget-readme": "README.md", - ":assets-nuget-build-netstandard20-targets": "build/netstandard2.0/Selenium.WebDriver.StrongNamed.targets", - ":assets-nuget-buildtransitive-netstandard20-targets": "buildTransitive/netstandard2.0/Selenium.WebDriver.StrongNamed.targets", + ":assets-nuget-build-targets": "build/Selenium.WebDriver.StrongNamed.targets", + ":assets-nuget-buildtransitive-targets": "buildTransitive/Selenium.WebDriver.StrongNamed.targets", }, id = "Selenium.WebDriver.StrongNamed", libs = { diff --git a/dotnet/src/webdriver/Selenium.WebDriver.StrongNamed.nuspec b/dotnet/src/webdriver/Selenium.WebDriver.StrongNamed.nuspec index 4e47a5f564c16..da214b86c7ac5 100644 --- a/dotnet/src/webdriver/Selenium.WebDriver.StrongNamed.nuspec +++ b/dotnet/src/webdriver/Selenium.WebDriver.StrongNamed.nuspec @@ -43,8 +43,8 @@ - - + + diff --git a/dotnet/src/webdriver/Selenium.WebDriver.csproj b/dotnet/src/webdriver/Selenium.WebDriver.csproj index 03bf75bfa34b7..69b2b398e3532 100644 --- a/dotnet/src/webdriver/Selenium.WebDriver.csproj +++ b/dotnet/src/webdriver/Selenium.WebDriver.csproj @@ -61,8 +61,8 @@ - - + + diff --git a/dotnet/src/webdriver/Selenium.WebDriver.nuspec b/dotnet/src/webdriver/Selenium.WebDriver.nuspec index 0371c66fca21f..c65490c944cef 100644 --- a/dotnet/src/webdriver/Selenium.WebDriver.nuspec +++ b/dotnet/src/webdriver/Selenium.WebDriver.nuspec @@ -43,8 +43,8 @@ - - + + diff --git a/dotnet/src/webdriver/assets/BUILD.bazel b/dotnet/src/webdriver/assets/BUILD.bazel index 1ff6eb45ae72b..a72d6f97da643 100644 --- a/dotnet/src/webdriver/assets/BUILD.bazel +++ b/dotnet/src/webdriver/assets/BUILD.bazel @@ -1,5 +1,5 @@ exports_files([ "nuget/README.md", - "nuget/build/netstandard2.0/Selenium.WebDriver.targets", - "nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets", + "nuget/build/Selenium.WebDriver.targets", + "nuget/buildTransitive/Selenium.WebDriver.targets", ]) diff --git a/dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets b/dotnet/src/webdriver/assets/nuget/build/Selenium.WebDriver.targets similarity index 78% rename from dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets rename to dotnet/src/webdriver/assets/nuget/build/Selenium.WebDriver.targets index d187244165620..2686604da1ef2 100644 --- a/dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets +++ b/dotnet/src/webdriver/assets/nuget/build/Selenium.WebDriver.targets @@ -4,21 +4,21 @@ - + runtimes\win\native\%(Filename)%(Extension) PreserveNewest False false - + runtimes\linux\native\%(Filename)%(Extension) PreserveNewest False false - + runtimes\osx\native\%(Filename)%(Extension) PreserveNewest False diff --git a/dotnet/src/webdriver/assets/nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets b/dotnet/src/webdriver/assets/nuget/buildTransitive/Selenium.WebDriver.targets similarity index 54% rename from dotnet/src/webdriver/assets/nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets rename to dotnet/src/webdriver/assets/nuget/buildTransitive/Selenium.WebDriver.targets index d9c6483161ca3..877a684d233d1 100644 --- a/dotnet/src/webdriver/assets/nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets +++ b/dotnet/src/webdriver/assets/nuget/buildTransitive/Selenium.WebDriver.targets @@ -1,4 +1,4 @@ - +