Skip to content

Commit 6a8f6c6

Browse files
nvborisenkonvborisenko
authored
[dotnet] Help .NET Framework copy selenium manager to output (#16228)
1 parent fb3ba7e commit 6a8f6c6

File tree

7 files changed

+23
-22
lines changed

7 files changed

+23
-22
lines changed

‎dotnet/src/webdriver/BUILD.bazel‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,14 @@ copy_file(
168168
)
169169

170170
copy_file(
171-
name = "assets-nuget-build-netstandard20-targets",
172-
src = "//dotnet/src/webdriver/assets:nuget/build/netstandard2.0/Selenium.WebDriver.targets",
171+
name = "assets-nuget-build-targets",
172+
src = "//dotnet/src/webdriver/assets:nuget/build/Selenium.WebDriver.targets",
173173
out = "Selenium.WebDriver.targets",
174174
)
175175

176176
copy_file(
177-
name = "assets-nuget-buildtransitive-netstandard20-targets",
178-
src = "//dotnet/src/webdriver/assets:nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets",
177+
name = "assets-nuget-buildtransitive-targets",
178+
src = "//dotnet/src/webdriver/assets:nuget/buildTransitive/Selenium.WebDriver.targets",
179179
out = "transitiveSelenium.WebDriver.targets",
180180
)
181181

@@ -208,8 +208,8 @@ nuget_pack(
208208
"//common/manager:selenium-manager-macos": "manager/macos/selenium-manager",
209209
"//common/manager:selenium-manager-windows": "manager/windows/selenium-manager.exe",
210210
":assets-nuget-readme": "README.md",
211-
":assets-nuget-build-netstandard20-targets": "build/netstandard2.0/Selenium.WebDriver.targets",
212-
":assets-nuget-buildtransitive-netstandard20-targets": "buildTransitive/netstandard2.0/Selenium.WebDriver.targets",
211+
":assets-nuget-build-targets": "build/Selenium.WebDriver.targets",
212+
":assets-nuget-buildtransitive-targets": "buildTransitive/Selenium.WebDriver.targets",
213213
},
214214
id = "Selenium.WebDriver",
215215
libs = {
@@ -234,8 +234,8 @@ nuget_pack(
234234
"//common/manager:selenium-manager-macos": "manager/macos/selenium-manager",
235235
"//common/manager:selenium-manager-windows": "manager/windows/selenium-manager.exe",
236236
":assets-nuget-readme": "README.md",
237-
":assets-nuget-build-netstandard20-targets": "build/netstandard2.0/Selenium.WebDriver.StrongNamed.targets",
238-
":assets-nuget-buildtransitive-netstandard20-targets": "buildTransitive/netstandard2.0/Selenium.WebDriver.StrongNamed.targets",
237+
":assets-nuget-build-targets": "build/Selenium.WebDriver.StrongNamed.targets",
238+
":assets-nuget-buildtransitive-targets": "buildTransitive/Selenium.WebDriver.StrongNamed.targets",
239239
},
240240
id = "Selenium.WebDriver.StrongNamed",
241241
libs = {

‎dotnet/src/webdriver/Selenium.WebDriver.StrongNamed.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<file src="lib/net8.0/WebDriver.StrongNamed.pdb" target="lib/net8.0/WebDriver.StrongNamed.pdb" />
4444
<file src="lib/net8.0/WebDriver.StrongNamed.xml" target="lib/net8.0/WebDriver.StrongNamed.xml" />
4545

46-
<file src="build/netstandard2.0/Selenium.WebDriver.StrongNamed.targets" target="build/netstandard2.0/Selenium.WebDriver.StrongNamed.targets"/>
47-
<file src="buildTransitive/netstandard2.0/Selenium.WebDriver.StrongNamed.targets" target="buildTransitive/netstandard2.0/Selenium.WebDriver.StrongNamed.targets"/>
46+
<file src="build/Selenium.WebDriver.StrongNamed.targets" target="build/Selenium.WebDriver.StrongNamed.targets"/>
47+
<file src="buildTransitive/Selenium.WebDriver.StrongNamed.targets" target="buildTransitive/Selenium.WebDriver.StrongNamed.targets"/>
4848

4949
<file src="manager/linux/selenium-manager" target="runtimes/linux/native/selenium-manager" />
5050
<file src="manager/macos/selenium-manager" target="runtimes/osx/native/selenium-manager" />

‎dotnet/src/webdriver/Selenium.WebDriver.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
</ItemGroup>
6262

6363
<ItemGroup>
64-
<None Include="assets\nuget\build\netstandard2.0\Selenium.WebDriver.targets" Pack="true" PackagePath="build\netstandard2.0\" />
65-
<None Include="assets\nuget\buildTransitive\netstandard2.0\Selenium.WebDriver.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\" />
64+
<None Include="assets\nuget\build\Selenium.WebDriver.targets" Pack="true" PackagePath="build\" />
65+
<None Include="assets\nuget\buildTransitive\Selenium.WebDriver.targets" Pack="true" PackagePath="buildTransitive\" />
6666
</ItemGroup>
6767

6868
<Target Name="GenerateSeleniumManagerBinaries" BeforeTargets="BeforeBuild">

‎dotnet/src/webdriver/Selenium.WebDriver.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<file src="lib/net8.0/WebDriver.pdb" target="lib/net8.0/WebDriver.pdb" />
4444
<file src="lib/net8.0/WebDriver.xml" target="lib/net8.0/WebDriver.xml" />
4545

46-
<file src="build/netstandard2.0/Selenium.WebDriver.targets" target="build/netstandard2.0/Selenium.WebDriver.targets"/>
47-
<file src="buildTransitive/netstandard2.0/Selenium.WebDriver.targets" target="buildTransitive/netstandard2.0/Selenium.WebDriver.targets"/>
46+
<file src="build/Selenium.WebDriver.targets" target="build/Selenium.WebDriver.targets"/>
47+
<file src="buildTransitive/Selenium.WebDriver.targets" target="buildTransitive/Selenium.WebDriver.targets"/>
4848

4949
<file src="manager/linux/selenium-manager" target="runtimes/linux/native/selenium-manager" />
5050
<file src="manager/macos/selenium-manager" target="runtimes/osx/native/selenium-manager" />

‎dotnet/src/webdriver/assets/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
exports_files([
22
"nuget/README.md",
3-
"nuget/build/netstandard2.0/Selenium.WebDriver.targets",
4-
"nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets",
3+
"nuget/build/Selenium.WebDriver.targets",
4+
"nuget/buildTransitive/Selenium.WebDriver.targets",
55
])

‎dotnet/src/webdriver/assets/nuget/build/netstandard2.0/Selenium.WebDriver.targets‎ renamed to ‎dotnet/src/webdriver/assets/nuget/build/Selenium.WebDriver.targets‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4-
<!-- Legacy packages.config support -->
5-
<ItemGroup Condition="'$(UsingMicrosoftNETSdk)' != 'true'">
6-
<Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win\native\selenium-manager.exe">
4+
<!-- Only run if the consumer did NOT set a RID (so NuGet won't select runtimes assets),
5+
and only for .NET Framework projects where this problem is common. -->
6+
<ItemGroup Condition="'$(RuntimeIdentifier)' == '' and '$(RuntimeIdentifiers)' == '' and '$(TargetFrameworkIdentifier)' == '.NETFramework'">
7+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win\native\selenium-manager.exe">
78
<Link>runtimes\win\native\%(Filename)%(Extension)</Link>
89
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
910
<Visible>False</Visible>
1011
<Pack>false</Pack>
1112
</Content>
1213

13-
<Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux\native\selenium-manager">
14+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\linux\native\selenium-manager">
1415
<Link>runtimes\linux\native\%(Filename)%(Extension)</Link>
1516
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1617
<Visible>False</Visible>
1718
<Pack>false</Pack>
1819
</Content>
1920

20-
<Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\selenium-manager">
21+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\osx\native\selenium-manager">
2122
<Link>runtimes\osx\native\%(Filename)%(Extension)</Link>
2223
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2324
<Visible>False</Visible>

‎dotnet/src/webdriver/assets/nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets‎ renamed to ‎dotnet/src/webdriver/assets/nuget/buildTransitive/Selenium.WebDriver.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildThisFileDirectory)..\..\build\netstandard2.0\Selenium.WebDriver.targets"/>
3+
<Import Project="$(MSBuildThisFileDirectory)..\build\Selenium.WebDriver.targets"/>
44
</Project>

0 commit comments

Comments
 (0)