Skip to content

Commit 713bbdd

Browse files
jimevansjimevans
committed
JimEvans: Consolidating .NET drivers into a single assembly. Note that WebDriver.Support.dll, Selenium.WebDriverBackedSelenium.dll and ThoughtWorks.Selenium.Core.dll will still continue to be delivered as separate assemblies.
r12373
1 parent 6675b78 commit 713bbdd

File tree

146 files changed

+15338
-526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+15338
-526
lines changed

‎Rakefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,7 @@ task :clean do
211211
Android::Clean.new()
212212
end
213213

214-
task :dotnet => [ "//dotnet:ie", "//dotnet:firefox", "//dotnet:chrome", "//dotnet:android",
215-
"//dotnet:support", "//dotnet:core", "//dotnet:webdriverbackedselenium" ]
214+
task :dotnet => [ "//dotnet", "//dotnet:support", "//dotnet:core", "//dotnet:webdriverbackedselenium" ]
216215

217216
# Generate a C++ Header file for mapping between magic numbers and #defines
218217
# in the C++ code.

‎WebDriver.sln

+16-112
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Selenium.Core", "dotnet\src
4444
EndProject
4545
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Selenium.WebDriverBackedSelenium", "dotnet\src\Selenium.WebDriverBackedSelenium\Selenium.WebDriverBackedSelenium.csproj", "{0EAF6AA9-B712-464B-A11B-FA3CF7577D80}"
4646
EndProject
47-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Chrome", "dotnet\src\WebDriver.Chrome\WebDriver.Chrome.csproj", "{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}"
48-
EndProject
49-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Common", "dotnet\src\WebDriver.Common\WebDriver.Common.csproj", "{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}"
50-
EndProject
51-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Remote.Common", "dotnet\src\WebDriver.Remote.Common\WebDriver.Remote.Common.csproj", "{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}"
52-
EndProject
53-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Remote", "dotnet\src\WebDriver.Remote\WebDriver.Remote.csproj", "{32122F8D-CD64-495A-B9B0-5516FF67C79F}"
54-
EndProject
55-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Firefox", "dotnet\src\WebDriver.Firefox\WebDriver.Firefox.csproj", "{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}"
56-
EndProject
57-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.IE", "dotnet\src\WebDriver.IE\WebDriver.IE.csproj", "{388643B5-2270-4E89-99CC-DA761E4E4AC1}"
58-
EndProject
5947
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Support", "dotnet\src\WebDriver.Support\WebDriver.Support.csproj", "{A9779443-E254-47E9-B733-8AC6D3662CA6}"
6048
EndProject
6149
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Common.Tests", "dotnet\test\WebDriver.Common.Tests\WebDriver.Common.Tests.csproj", "{1580564D-B6B8-4BD8-A120-001E3E8E5BE6}"
@@ -76,10 +64,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Selenium.WebDriverBackedSel
7664
EndProject
7765
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imehandler", "cpp\imehandler\imehandler.vcproj", "{37F9EF6B-F69C-4764-9687-C63C608C476B}"
7866
EndProject
79-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Android", "dotnet\src\WebDriver.Android\WebDriver.Android.csproj", "{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}"
80-
EndProject
8167
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Android.Tests", "dotnet\test\WebDriver.Android.Tests\WebDriver.Android.Tests.csproj", "{3102A61F-3025-482C-9515-9FC239746658}"
8268
EndProject
69+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver", "dotnet\src\WebDriver\WebDriver.csproj", "{83C13931-B27C-425C-AAF0-5F96EEA4F173}"
70+
EndProject
8371
Global
8472
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8573
Debug|.NET = Debug|.NET
@@ -226,90 +214,6 @@ Global
226214
{0EAF6AA9-B712-464B-A11B-FA3CF7577D80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
227215
{0EAF6AA9-B712-464B-A11B-FA3CF7577D80}.Release|Win32.ActiveCfg = Release|Any CPU
228216
{0EAF6AA9-B712-464B-A11B-FA3CF7577D80}.Release|x64.ActiveCfg = Release|Any CPU
229-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Debug|.NET.ActiveCfg = Debug|Any CPU
230-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
231-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Debug|Any CPU.Build.0 = Debug|Any CPU
232-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
233-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
234-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Debug|Win32.ActiveCfg = Debug|Any CPU
235-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Debug|x64.ActiveCfg = Debug|Any CPU
236-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Release|.NET.ActiveCfg = Release|Any CPU
237-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Release|Any CPU.ActiveCfg = Release|Any CPU
238-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Release|Any CPU.Build.0 = Release|Any CPU
239-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
240-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Release|Mixed Platforms.Build.0 = Release|Any CPU
241-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Release|Win32.ActiveCfg = Release|Any CPU
242-
{FC3000BD-6144-46E6-BA7B-1CCE7E85DD27}.Release|x64.ActiveCfg = Release|Any CPU
243-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Debug|.NET.ActiveCfg = Debug|Any CPU
244-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
245-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
246-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
247-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
248-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Debug|Win32.ActiveCfg = Debug|Any CPU
249-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Debug|x64.ActiveCfg = Debug|Any CPU
250-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Release|.NET.ActiveCfg = Release|Any CPU
251-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
252-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Release|Any CPU.Build.0 = Release|Any CPU
253-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
254-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
255-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Release|Win32.ActiveCfg = Release|Any CPU
256-
{ABB9B87F-FEEA-410E-ACBF-26479B8C72B0}.Release|x64.ActiveCfg = Release|Any CPU
257-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Debug|.NET.ActiveCfg = Debug|Any CPU
258-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
259-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Debug|Any CPU.Build.0 = Debug|Any CPU
260-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
261-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
262-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Debug|Win32.ActiveCfg = Debug|Any CPU
263-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Debug|x64.ActiveCfg = Debug|Any CPU
264-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Release|.NET.ActiveCfg = Release|Any CPU
265-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Release|Any CPU.ActiveCfg = Release|Any CPU
266-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Release|Any CPU.Build.0 = Release|Any CPU
267-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
268-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Release|Mixed Platforms.Build.0 = Release|Any CPU
269-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Release|Win32.ActiveCfg = Release|Any CPU
270-
{C2A1DAE4-BB20-4367-8ADC-D32EEA392D17}.Release|x64.ActiveCfg = Release|Any CPU
271-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Debug|.NET.ActiveCfg = Debug|Any CPU
272-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
273-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Debug|Any CPU.Build.0 = Debug|Any CPU
274-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
275-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
276-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Debug|Win32.ActiveCfg = Debug|Any CPU
277-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Debug|x64.ActiveCfg = Debug|Any CPU
278-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Release|.NET.ActiveCfg = Release|Any CPU
279-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Release|Any CPU.ActiveCfg = Release|Any CPU
280-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Release|Any CPU.Build.0 = Release|Any CPU
281-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
282-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
283-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Release|Win32.ActiveCfg = Release|Any CPU
284-
{32122F8D-CD64-495A-B9B0-5516FF67C79F}.Release|x64.ActiveCfg = Release|Any CPU
285-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Debug|.NET.ActiveCfg = Debug|Any CPU
286-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
287-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Debug|Any CPU.Build.0 = Debug|Any CPU
288-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
289-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
290-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Debug|Win32.ActiveCfg = Debug|Any CPU
291-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Debug|x64.ActiveCfg = Debug|Any CPU
292-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Release|.NET.ActiveCfg = Release|Any CPU
293-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Release|Any CPU.ActiveCfg = Release|Any CPU
294-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Release|Any CPU.Build.0 = Release|Any CPU
295-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
296-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Release|Mixed Platforms.Build.0 = Release|Any CPU
297-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Release|Win32.ActiveCfg = Release|Any CPU
298-
{5E7C67A1-1BF2-4A46-8C29-8A6DCF6E4543}.Release|x64.ActiveCfg = Release|Any CPU
299-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Debug|.NET.ActiveCfg = Debug|Any CPU
300-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
301-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
302-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
303-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
304-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Debug|Win32.ActiveCfg = Debug|Any CPU
305-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Debug|x64.ActiveCfg = Debug|Any CPU
306-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Release|.NET.ActiveCfg = Release|Any CPU
307-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
308-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Release|Any CPU.Build.0 = Release|Any CPU
309-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
310-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
311-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Release|Win32.ActiveCfg = Release|Any CPU
312-
{388643B5-2270-4E89-99CC-DA761E4E4AC1}.Release|x64.ActiveCfg = Release|Any CPU
313217
{A9779443-E254-47E9-B733-8AC6D3662CA6}.Debug|.NET.ActiveCfg = Debug|Any CPU
314218
{A9779443-E254-47E9-B733-8AC6D3662CA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
315219
{A9779443-E254-47E9-B733-8AC6D3662CA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -450,20 +354,6 @@ Global
450354
{37F9EF6B-F69C-4764-9687-C63C608C476B}.Release|Win32.ActiveCfg = Release|Win32
451355
{37F9EF6B-F69C-4764-9687-C63C608C476B}.Release|Win32.Build.0 = Release|Win32
452356
{37F9EF6B-F69C-4764-9687-C63C608C476B}.Release|x64.ActiveCfg = Release|Win32
453-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Debug|.NET.ActiveCfg = Debug|Any CPU
454-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
455-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Debug|Any CPU.Build.0 = Debug|Any CPU
456-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
457-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
458-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Debug|Win32.ActiveCfg = Debug|Any CPU
459-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Debug|x64.ActiveCfg = Debug|Any CPU
460-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Release|.NET.ActiveCfg = Release|Any CPU
461-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Release|Any CPU.ActiveCfg = Release|Any CPU
462-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Release|Any CPU.Build.0 = Release|Any CPU
463-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
464-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
465-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Release|Win32.ActiveCfg = Release|Any CPU
466-
{A683CE4A-2EF4-443C-9FEF-2AB033BCA37B}.Release|x64.ActiveCfg = Release|Any CPU
467357
{3102A61F-3025-482C-9515-9FC239746658}.Debug|.NET.ActiveCfg = Debug|Any CPU
468358
{3102A61F-3025-482C-9515-9FC239746658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
469359
{3102A61F-3025-482C-9515-9FC239746658}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -478,6 +368,20 @@ Global
478368
{3102A61F-3025-482C-9515-9FC239746658}.Release|Mixed Platforms.Build.0 = Release|Any CPU
479369
{3102A61F-3025-482C-9515-9FC239746658}.Release|Win32.ActiveCfg = Release|Any CPU
480370
{3102A61F-3025-482C-9515-9FC239746658}.Release|x64.ActiveCfg = Release|Any CPU
371+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Debug|.NET.ActiveCfg = Debug|Any CPU
372+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
373+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Debug|Any CPU.Build.0 = Debug|Any CPU
374+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
375+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
376+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Debug|Win32.ActiveCfg = Debug|Any CPU
377+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Debug|x64.ActiveCfg = Debug|Any CPU
378+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Release|.NET.ActiveCfg = Release|Any CPU
379+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Release|Any CPU.ActiveCfg = Release|Any CPU
380+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Release|Any CPU.Build.0 = Release|Any CPU
381+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
382+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Release|Mixed Platforms.Build.0 = Release|Any CPU
383+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Release|Win32.ActiveCfg = Release|Any CPU
384+
{83C13931-B27C-425C-AAF0-5F96EEA4F173}.Release|x64.ActiveCfg = Release|Any CPU
481385
EndGlobalSection
482386
GlobalSection(SolutionProperties) = preSolution
483387
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)