Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions dotnet/src/webdriver/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,15 @@ copy_file(
)

copy_file(
name = "assets-nuget-build-targets",
src = "//dotnet/src/webdriver/assets:nuget/build/Selenium.WebDriver.targets",
out = "Selenium.WebDriver.targets",
name = "assets-nuget-build-props",
src = "//dotnet/src/webdriver/assets:nuget/build/Selenium.WebDriver.props",
out = "Selenium.WebDriver.props",
)

copy_file(
name = "assets-nuget-buildtransitive-targets",
src = "//dotnet/src/webdriver/assets:nuget/buildTransitive/Selenium.WebDriver.targets",
out = "transitiveSelenium.WebDriver.targets",
name = "assets-nuget-buildtransitive-props",
src = "//dotnet/src/webdriver/assets:nuget/buildTransitive/Selenium.WebDriver.props",
out = "transitiveSelenium.WebDriver.props",
)

copy_file(
Expand Down Expand Up @@ -268,8 +268,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-targets": "build/Selenium.WebDriver.targets",
":assets-nuget-buildtransitive-targets": "buildTransitive/Selenium.WebDriver.targets",
":assets-nuget-build-props": "build/Selenium.WebDriver.props",
":assets-nuget-buildtransitive-props": "buildTransitive/Selenium.WebDriver.props",
},
id = "Selenium.WebDriver",
libs = {
Expand All @@ -295,8 +295,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-targets": "build/Selenium.WebDriver.StrongNamed.targets",
":assets-nuget-buildtransitive-targets": "buildTransitive/Selenium.WebDriver.StrongNamed.targets",
":assets-nuget-build-props": "build/Selenium.WebDriver.StrongNamed.props",
":assets-nuget-buildtransitive-props": "buildTransitive/Selenium.WebDriver.StrongNamed.props",
},
id = "Selenium.WebDriver.StrongNamed",
libs = {
Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/webdriver/Selenium.WebDriver.StrongNamed.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
<file src="lib/net8.0/WebDriver.StrongNamed.pdb" target="lib/net8.0/WebDriver.StrongNamed.pdb" />
<file src="lib/net8.0/WebDriver.StrongNamed.xml" target="lib/net8.0/WebDriver.StrongNamed.xml" />

<file src="build/Selenium.WebDriver.StrongNamed.targets" target="build/Selenium.WebDriver.StrongNamed.targets"/>
<file src="buildTransitive/Selenium.WebDriver.StrongNamed.targets" target="buildTransitive/Selenium.WebDriver.StrongNamed.targets"/>
<file src="build/Selenium.WebDriver.StrongNamed.props" target="build/Selenium.WebDriver.StrongNamed.props"/>
<file src="buildTransitive/Selenium.WebDriver.StrongNamed.props" target="buildTransitive/Selenium.WebDriver.StrongNamed.props"/>

<file src="manager/linux/selenium-manager" target="runtimes/linux/native/selenium-manager" />
<file src="manager/macos/selenium-manager" target="runtimes/osx/native/selenium-manager" />
Expand Down
10 changes: 5 additions & 5 deletions dotnet/src/webdriver/Selenium.WebDriver.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<None Include="assets\nuget\build\Selenium.WebDriver.targets" Pack="true" PackagePath="build\" />
<None Include="assets\nuget\buildTransitive\Selenium.WebDriver.targets" Pack="true" PackagePath="buildTransitive\" />
</ItemGroup>

<Target Name="GenerateSeleniumManagerBinaries" BeforeTargets="BeforeBuild">
<Exec Command="bazel build //dotnet/src/webdriver:manager-linux //dotnet/src/webdriver:manager-windows //dotnet/src/webdriver:manager-macos" WorkingDirectory="../../.." />
</Target>
Expand All @@ -85,6 +80,11 @@
<Reference Include="System.Net.Http" />
</ItemGroup>

<ItemGroup>
<None Update="assets/nuget/build/Selenium.WebDriver.props" Pack="true" PackagePath="build\" />
<None Update="assets/nuget/buildTransitive/Selenium.WebDriver.props" Pack="true" PackagePath="buildTransitive\" />
</ItemGroup>

<Target Name="GenerateResources" BeforeTargets="CoreCompile">
<Exec Command="bazel build //dotnet/src/webdriver:resource-utilities" WorkingDirectory="../../.." />

Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/webdriver/Selenium.WebDriver.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
<file src="lib/net8.0/WebDriver.pdb" target="lib/net8.0/WebDriver.pdb" />
<file src="lib/net8.0/WebDriver.xml" target="lib/net8.0/WebDriver.xml" />

<file src="build/Selenium.WebDriver.targets" target="build/Selenium.WebDriver.targets"/>
<file src="buildTransitive/Selenium.WebDriver.targets" target="buildTransitive/Selenium.WebDriver.targets"/>
<file src="build/Selenium.WebDriver.props" target="build/Selenium.WebDriver.props"/>
<file src="buildTransitive/Selenium.WebDriver.props" target="buildTransitive/Selenium.WebDriver.props"/>

<file src="manager/linux/selenium-manager" target="runtimes/linux/native/selenium-manager" />
<file src="manager/macos/selenium-manager" target="runtimes/osx/native/selenium-manager" />
Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/webdriver/assets/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
exports_files([
"nuget/README.md",
"nuget/build/Selenium.WebDriver.targets",
"nuget/buildTransitive/Selenium.WebDriver.targets",
"nuget/build/Selenium.WebDriver.props",
"nuget/buildTransitive/Selenium.WebDriver.props",
])
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)..\build\Selenium.WebDriver.targets"/>
<Import Project="$(MSBuildThisFileDirectory)..\build\Selenium.WebDriver.props"/>
Comment thread
nvborisenko marked this conversation as resolved.
</Project>
Loading