Finalizing .NET language bindings build with Buck

odedniv · Sep 19, 2017 · ce6a30e · ce6a30e
1 parent 6598a95
commit ce6a30e
Show file tree

Hide file tree

Showing 26 changed files with 92 additions and 932 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/dotnet/SELENIUM_DOTNET_VERSION b/dotnet/SELENIUM_DOTNET_VERSION
@@ -1,2 +1,2 @@
 SE_VERSION = '3.5.3'
-
+ASSEMBLY_VERSION = '3.5.3.0'
diff --git a/dotnet/build.desc b/dotnet/build.desc
diff --git a/dotnet/src/support/BUCK b/dotnet/src/support/BUCK
@@ -3,28 +3,28 @@
 genrule(
   name = 'net35',
   srcs = [ 'WebDriver.Support.csproj' ],
-  cmd = 'dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:BuildSystem=buck',
+  cmd = "echo '$(location //dotnet/src/webdriver:net35)' && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
   out = 'net35'
 )
 
 genrule(
   name = 'net40',
   srcs = [ 'WebDriver.Support.csproj' ],
-  cmd = 'dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:BuildSystem=buck',
+  cmd = "echo '$(location //dotnet/src/webdriver:net40)' && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
   out = 'net40'
 )
 
 genrule(
   name = 'net45',
   srcs = [ 'WebDriver.Support.csproj' ],
-  cmd = 'dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:BuildSystem=buck',
+  cmd = "echo '$(location //dotnet/src/webdriver:net45)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
   out = 'net45'
 )
 
 genrule(
   name = 'netstandard2.0',
   srcs = [ 'WebDriver.Support.csproj' ],
-  cmd = 'dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:BuildSystem=buck',
+  cmd = "echo '$(location //dotnet/src/webdriver:netstandard2.0)' && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
   out = 'netstandard2.0'
 )
 
@@ -62,28 +62,28 @@ genrule(
 genrule(
   name = 'net35_strongnamed',
   srcs = [ 'WebDriver.Support.csproj' ],
-  cmd = 'dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
+  cmd = "echo '$(location //dotnet/src/webdriver:net35_strongnamed)' && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
   out = 'net35'
 )
 
 genrule(
   name = 'net40_strongnamed',
   srcs = [ 'WebDriver.Support.csproj' ],
-  cmd = 'dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
+  cmd = "echo '$(location //dotnet/src/webdriver:net40_strongnamed)' && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
   out = 'net40'
 )
 
 genrule(
   name = 'net45_strongnamed',
   srcs = [ 'WebDriver.Support.csproj' ],
-  cmd = 'dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
+  cmd = "echo '$(location //dotnet/src/webdriver:net45_strongnamed)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
   out = 'net45'
 )
 
 genrule(
   name = 'netstandard2.0_strongnamed',
   srcs = [ 'WebDriver.Support.csproj' ],
-  cmd = 'dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
+  cmd = "echo '$(location //dotnet/src/webdriver:netstandard2.0_strongnamed)' && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
   out = 'netstandard2.0'
 )
 

diff --git a/dotnet/src/support/Properties/AssemblyInfo.cs b/dotnet/src/support/Properties/AssemblyInfo.cs
diff --git a/dotnet/src/support/WebDriver.Support.csproj b/dotnet/src/support/WebDriver.Support.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>net45;net40;net35;netstandard2.0</TargetFrameworks>
     <AssemblyName>WebDriver.Support</AssemblyName>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>OpenQA.Selenium.Support</RootNamespace>
     <BuildSystem>visual-studio</BuildSystem>
   </PropertyGroup>
@@ -18,6 +17,15 @@
 
   <PropertyGroup>
     <FrameworkPathOverride Condition="'$(TargetFramework)'=='net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
+    <AssemblyTitle>Selenium WebDriver Support</AssemblyTitle>
+    <Description>Selenium WebDriver .NET Bindings support classes</Description>
+    <Company>Selenium Committers</Company>
+    <Copyright>Copyright © Software Freedom Conservancy 2017</Copyright>
+    <Product>Selenium</Product>
+    <Version>3</Version>
+    <PackageId>Selenium.Support</PackageId>
+    <AssemblyVersion>3.0.0.0</AssemblyVersion>
+    <FileVersion>3.0.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net35|AnyCPU'">

diff --git a/dotnet/src/support/build.desc b/dotnet/src/support/build.desc
diff --git a/dotnet/src/webdriver/BUCK b/dotnet/src/webdriver/BUCK
@@ -3,29 +3,45 @@ include_defs('//dotnet/SELENIUM_DOTNET_VERSION')
 genrule(
   name = 'net35',
   srcs = [ 'WebDriver.csproj' ],
-  cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:BuildSystem=buck',
-  out = 'net35'
+  cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
+  out = 'net35',
+  visibility = [
+    '//dotnet/src/webdriverbackedselenium:net35',
+    '//dotnet/src/support:net35'
+  ]
 )
 
 genrule(
   name = 'net40',
   srcs = [ 'WebDriver.csproj' ],
-  cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:BuildSystem=buck',
-  out = 'net40'
+  cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
+  out = 'net40',
+  visibility = [
+    '//dotnet/src/webdriverbackedselenium:net40',
+    '//dotnet/src/support:net40'
+  ]
 )
 
 genrule(
   name = 'net45',
   srcs = [ 'WebDriver.csproj' ],
-  cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:BuildSystem=buck',
-  out = 'net45'
+  cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
+  out = 'net45',
+  visibility = [
+    '//dotnet/src/webdriverbackedselenium:net45',
+    '//dotnet/src/support:net45'
+  ]
 )
 
 genrule(
   name = 'netstandard2.0',
   srcs = [ 'WebDriver.csproj' ],
-  cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:BuildSystem=buck',
-  out = 'netstandard2.0'
+  cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
+  out = 'netstandard2.0',
+  visibility = [
+    '//dotnet/src/webdriverbackedselenium:netstandard2.0',
+    '//dotnet/src/support:netstandard2.0'
+  ]
 )
 
 genrule(
@@ -60,29 +76,45 @@ genrule(
 genrule(
   name = 'net35_strongnamed',
   srcs = [ 'WebDriver.csproj' ],
-  cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
-  out = 'net35'
+  cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
+  out = 'net35',
+  visibility = [
+    '//dotnet/src/webdriverbackedselenium:net35_strongnamed',
+    '//dotnet/src/support:net35_strongnamed'
+  ]
 )
 
 genrule(
   name = 'net40_strongnamed',
   srcs = [ 'WebDriver.csproj' ],
-  cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
-  out = 'net40'
+  cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
+  out = 'net40',
+  visibility = [
+    '//dotnet/src/webdriverbackedselenium:net40_strongnamed',
+    '//dotnet/src/support:net40_strongnamed'
+  ]
 )
 
 genrule(
   name = 'net45_strongnamed',
   srcs = [ 'WebDriver.csproj' ],
-  cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
-  out = 'net45'
+  cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
+  out = 'net45',
+  visibility = [
+    '//dotnet/src/webdriverbackedselenium:net45_strongnamed',
+    '//dotnet/src/support:net45_strongnamed'
+  ]
 )
 
 genrule(
   name = 'netstandard2.0_strongnamed',
   srcs = [ 'WebDriver.csproj' ],
-  cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
-  out = 'netstandard2.0'
+  cmd = "echo '$(location :webdriver_deps)' && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:Version={} /p:AssemblyVersion={} /p:FileVersion={} /p:BuildSystem=buck".format(SE_VERSION, ASSEMBLY_VERSION, ASSEMBLY_VERSION),
+  out = 'netstandard2.0',
+  visibility = [
+    '//dotnet/src/webdriverbackedselenium:netstandard2.0_strongnamed',
+    '//dotnet/src/support:netstandard2.0_strongnamed'
+  ]
 )
 
 genrule(