[dotnet] Bundle smg into nuget package and copy binaries to users output

djun · Oct 31, 2022 · 2e416b8 · 2e416b8
1 parent d83c0ef
commit 2e416b8
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 12 deletions.
diff --git a/common/manager/BUILD.bazel b/common/manager/BUILD.bazel
@@ -26,5 +26,6 @@ exports_files(
         "//java/test/org/openqa/selenium/firefox:__pkg__",
         "//py:__pkg__",
         "//rb:__pkg__",
+        "//dotnet/src/webdriver:__pkg__",
     ],
 )
diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel
@@ -240,6 +240,18 @@ copy_file(
     out = "icon.png",
 )
 
+copy_file(
+    name = "props",
+    src = "build/WebDriver.props",
+    out = "Selenium.WebDriver.props",
+)
+
+copy_file(
+    name = "manager-windows",
+    src = "//common/manager:windows/selenium-manager.exe",
+    out = "manager/windows/selenium-manager.exe",
+)
+
 nuget_package(
     name = "package",
     src = "WebDriver.nuspec",
@@ -253,6 +265,8 @@ nuget_package(
     visibility = ["//visibility:public"],
     deps = [
         ":logo",
+        ":props",
+        ":manager-windows",
         ":net45",
         ":net46",
         ":net47",

diff --git a/dotnet/src/webdriver/WebDriver.csproj b/dotnet/src/webdriver/WebDriver.csproj
@@ -117,10 +117,6 @@
       <Visible>False</Visible>
       <LogicalName>webdriver_prefs.json</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="$(ProjectDir)..\..\..\common\manager\windows\selenium-manager.exe">
-      <Visible>False</Visible>
-      <LogicalName>selenium-manager-windows</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\webdriver\atoms\get-attribute.js">
       <Visible>False</Visible>
       <LogicalName>get-attribute.js</LogicalName>
@@ -144,10 +140,6 @@
       <Visible>False</Visible>
       <LogicalName>webdriver_prefs.json</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="$(ProjectDir)../../../common/manager/windows/selenium-manager.exe">
-      <Visible>False</Visible>
-      <LogicalName>selenium-manager-windows</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="$(ProjectDir)../../../bazel-bin/javascript/webdriver/atoms/get-attribute.js">
       <Visible>False</Visible>
       <LogicalName>get-attribute.js</LogicalName>

diff --git a/dotnet/src/webdriver/WebDriver.nuspec b/dotnet/src/webdriver/WebDriver.nuspec
@@ -45,9 +45,11 @@
     </frameworkAssemblies>
   </metadata>
   <files>
-    <file src="**/WebDriver.dll" target="lib" />
-    <file src="**/WebDriver.pdb" target="lib" />
-    <file src="**/WebDriver.xml" target="lib" />
-    <file src="../icon.png" target="images\" />
+    <file src="**\WebDriver.dll" target="lib" />
+    <file src="**\WebDriver.pdb" target="lib" />
+    <file src="**\WebDriver.xml" target="lib" />
+    <file src="..\icon.png" target="images" />
+    <file src="..\manager\**" target="tools" />
+    <file src="..\Selenium.WebDriver.props" target="build" />
   </files>
 </package>
diff --git a/dotnet/src/webdriver/build/WebDriver.props b/dotnet/src/webdriver/build/WebDriver.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemGroup>
+      <None Include="$(MSBuildThisFileDirectory)..\tools\windows\selenium-manager.exe">
+          <Link>selenium-manager\windows\%(Filename)%(Extension)</Link>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <Visible>False</Visible>
+      </None>
+  </ItemGroup>
+
+</Project>