Skip to content

Commit ce6a30e

Browse files
jimevansjimevans
committed
Finalizing .NET language bindings build with Buck
1 parent 6598a95 commit ce6a30e

File tree

26 files changed

+92
-932
lines changed

26 files changed

+92
-932
lines changed

‎Directory.Build.props

-5
This file was deleted.

‎dotnet/SELENIUM_DOTNET_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
SE_VERSION = '3.5.3'
2-
2+
ASSEMBLY_VERSION = '3.5.3.0'

‎dotnet/build.desc

-26
This file was deleted.

‎dotnet/src/support/BUCK

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
genrule(
44
name = 'net35',
55
srcs = [ 'WebDriver.Support.csproj' ],
6-
cmd = 'dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:BuildSystem=buck',
6+
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),
77
out = 'net35'
88
)
99

1010
genrule(
1111
name = 'net40',
1212
srcs = [ 'WebDriver.Support.csproj' ],
13-
cmd = 'dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:BuildSystem=buck',
13+
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),
1414
out = 'net40'
1515
)
1616

1717
genrule(
1818
name = 'net45',
1919
srcs = [ 'WebDriver.Support.csproj' ],
20-
cmd = 'dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:BuildSystem=buck',
20+
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),
2121
out = 'net45'
2222
)
2323

2424
genrule(
2525
name = 'netstandard2.0',
2626
srcs = [ 'WebDriver.Support.csproj' ],
27-
cmd = 'dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:BuildSystem=buck',
27+
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),
2828
out = 'netstandard2.0'
2929
)
3030

@@ -62,28 +62,28 @@ genrule(
6262
genrule(
6363
name = 'net35_strongnamed',
6464
srcs = [ 'WebDriver.Support.csproj' ],
65-
cmd = 'dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
65+
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),
6666
out = 'net35'
6767
)
6868

6969
genrule(
7070
name = 'net40_strongnamed',
7171
srcs = [ 'WebDriver.Support.csproj' ],
72-
cmd = 'dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
72+
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),
7373
out = 'net40'
7474
)
7575

7676
genrule(
7777
name = 'net45_strongnamed',
7878
srcs = [ 'WebDriver.Support.csproj' ],
79-
cmd = 'dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
79+
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),
8080
out = 'net45'
8181
)
8282

8383
genrule(
8484
name = 'netstandard2.0_strongnamed',
8585
srcs = [ 'WebDriver.Support.csproj' ],
86-
cmd = 'dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$(location //dotnet:keyfile) /p:BuildSystem=buck',
86+
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),
8787
out = 'netstandard2.0'
8888
)
8989

‎dotnet/src/support/Properties/AssemblyInfo.cs

-54
This file was deleted.

‎dotnet/src/support/WebDriver.Support.csproj

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFrameworks>net45;net40;net35;netstandard2.0</TargetFrameworks>
55
<AssemblyName>WebDriver.Support</AssemblyName>
6-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
76
<RootNamespace>OpenQA.Selenium.Support</RootNamespace>
87
<BuildSystem>visual-studio</BuildSystem>
98
</PropertyGroup>
@@ -18,6 +17,15 @@
1817

1918
<PropertyGroup>
2019
<FrameworkPathOverride Condition="'$(TargetFramework)'=='net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
20+
<AssemblyTitle>Selenium WebDriver Support</AssemblyTitle>
21+
<Description>Selenium WebDriver .NET Bindings support classes</Description>
22+
<Company>Selenium Committers</Company>
23+
<Copyright>Copyright © Software Freedom Conservancy 2017</Copyright>
24+
<Product>Selenium</Product>
25+
<Version>3</Version>
26+
<PackageId>Selenium.Support</PackageId>
27+
<AssemblyVersion>3.0.0.0</AssemblyVersion>
28+
<FileVersion>3.0.0.0</FileVersion>
2129
</PropertyGroup>
2230

2331
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net35|AnyCPU'">

‎dotnet/src/support/build.desc

-75
This file was deleted.

‎dotnet/src/webdriver/BUCK

+48-16
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,45 @@ include_defs('//dotnet/SELENIUM_DOTNET_VERSION')
33
genrule(
44
name = 'net35',
55
srcs = [ 'WebDriver.csproj' ],
6-
cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework net35 --output %OUT% /p:BuildSystem=buck',
7-
out = 'net35'
6+
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),
7+
out = 'net35',
8+
visibility = [
9+
'//dotnet/src/webdriverbackedselenium:net35',
10+
'//dotnet/src/support:net35'
11+
]
812
)
913

1014
genrule(
1115
name = 'net40',
1216
srcs = [ 'WebDriver.csproj' ],
13-
cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework net40 --output %OUT% /p:BuildSystem=buck',
14-
out = 'net40'
17+
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),
18+
out = 'net40',
19+
visibility = [
20+
'//dotnet/src/webdriverbackedselenium:net40',
21+
'//dotnet/src/support:net40'
22+
]
1523
)
1624

1725
genrule(
1826
name = 'net45',
1927
srcs = [ 'WebDriver.csproj' ],
20-
cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework net45 --output %OUT% /p:BuildSystem=buck',
21-
out = 'net45'
28+
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),
29+
out = 'net45',
30+
visibility = [
31+
'//dotnet/src/webdriverbackedselenium:net45',
32+
'//dotnet/src/support:net45'
33+
]
2234
)
2335

2436
genrule(
2537
name = 'netstandard2.0',
2638
srcs = [ 'WebDriver.csproj' ],
27-
cmd = 'echo "$(location :webdriver_deps)" && dotnet build %SRCS% --configuration Release --framework netstandard2.0 --output %OUT% /p:BuildSystem=buck',
28-
out = 'netstandard2.0'
39+
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),
40+
out = 'netstandard2.0',
41+
visibility = [
42+
'//dotnet/src/webdriverbackedselenium:netstandard2.0',
43+
'//dotnet/src/support:netstandard2.0'
44+
]
2945
)
3046

3147
genrule(
@@ -60,29 +76,45 @@ genrule(
6076
genrule(
6177
name = 'net35_strongnamed',
6278
srcs = [ 'WebDriver.csproj' ],
63-
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',
64-
out = 'net35'
79+
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),
80+
out = 'net35',
81+
visibility = [
82+
'//dotnet/src/webdriverbackedselenium:net35_strongnamed',
83+
'//dotnet/src/support:net35_strongnamed'
84+
]
6585
)
6686

6787
genrule(
6888
name = 'net40_strongnamed',
6989
srcs = [ 'WebDriver.csproj' ],
70-
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',
71-
out = 'net40'
90+
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),
91+
out = 'net40',
92+
visibility = [
93+
'//dotnet/src/webdriverbackedselenium:net40_strongnamed',
94+
'//dotnet/src/support:net40_strongnamed'
95+
]
7296
)
7397

7498
genrule(
7599
name = 'net45_strongnamed',
76100
srcs = [ 'WebDriver.csproj' ],
77-
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',
78-
out = 'net45'
101+
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),
102+
out = 'net45',
103+
visibility = [
104+
'//dotnet/src/webdriverbackedselenium:net45_strongnamed',
105+
'//dotnet/src/support:net45_strongnamed'
106+
]
79107
)
80108

81109
genrule(
82110
name = 'netstandard2.0_strongnamed',
83111
srcs = [ 'WebDriver.csproj' ],
84-
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',
85-
out = 'netstandard2.0'
112+
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),
113+
out = 'netstandard2.0',
114+
visibility = [
115+
'//dotnet/src/webdriverbackedselenium:netstandard2.0_strongnamed',
116+
'//dotnet/src/support:netstandard2.0_strongnamed'
117+
]
86118
)
87119

88120
genrule(

0 commit comments

Comments
 (0)