Skip to content

Commit 8fe5a92

Browse files
jimevansjimevans
committed
Updating .NET bindings .NET Core/.NET Standard support
1 parent 2c5e69d commit 8fe5a92

File tree

2 files changed

+140
-20
lines changed

2 files changed

+140
-20
lines changed

‎dotnet/WebDriver.NET.sln

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.3
4+
VisualStudioVersion = 15.0.26730.12
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver", "src\webdriver\WebDriver.csproj", "{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}"
7-
EndProject
86
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Support", "src\support\WebDriver.Support.csproj", "{3568C959-D714-46C7-B2FE-97BA9482E1E0}"
97
EndProject
108
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Selenium.WebDriverBackedSelenium", "src\webdriverbackedselenium\Selenium.WebDriverBackedSelenium.csproj", "{A7E35A79-9321-4DE8-8EC8-E5026CB71A08}"
@@ -31,18 +29,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Opera.Tests", "te
3129
EndProject
3230
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Selenium.WebDriverBackedSelenium.Tests", "test\webdriverbackedselenium\Selenium.WebDriverBackedSelenium.Tests.csproj", "{7760D121-0C45-4083-83FD-3171F0CF9BF5}"
3331
EndProject
34-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.NetCore", "src\webdriver\WebDriver.NetCore.csproj", "{08E3D8AB-CB2B-4DC5-9008-1AB20104E989}"
32+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.NetCore", "src\webdriver\WebDriver.NetCore.csproj", "{9FD2D4BD-33D8-4728-AD61-B4E88436F6DC}"
33+
EndProject
34+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver", "src\webdriver\WebDriver.csproj", "{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}"
3535
EndProject
3636
Global
3737
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3838
Debug|Any CPU = Debug|Any CPU
3939
Release|Any CPU = Release|Any CPU
4040
EndGlobalSection
4141
GlobalSection(ProjectConfigurationPlatforms) = postSolution
42-
{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}.Release|Any CPU.Build.0 = Release|Any CPU
4642
{3568C959-D714-46C7-B2FE-97BA9482E1E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4743
{3568C959-D714-46C7-B2FE-97BA9482E1E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
4844
{3568C959-D714-46C7-B2FE-97BA9482E1E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -95,10 +91,14 @@ Global
9591
{7760D121-0C45-4083-83FD-3171F0CF9BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
9692
{7760D121-0C45-4083-83FD-3171F0CF9BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
9793
{7760D121-0C45-4083-83FD-3171F0CF9BF5}.Release|Any CPU.Build.0 = Release|Any CPU
98-
{08E3D8AB-CB2B-4DC5-9008-1AB20104E989}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99-
{08E3D8AB-CB2B-4DC5-9008-1AB20104E989}.Debug|Any CPU.Build.0 = Debug|Any CPU
100-
{08E3D8AB-CB2B-4DC5-9008-1AB20104E989}.Release|Any CPU.ActiveCfg = Release|Any CPU
101-
{08E3D8AB-CB2B-4DC5-9008-1AB20104E989}.Release|Any CPU.Build.0 = Release|Any CPU
94+
{9FD2D4BD-33D8-4728-AD61-B4E88436F6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95+
{9FD2D4BD-33D8-4728-AD61-B4E88436F6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
96+
{9FD2D4BD-33D8-4728-AD61-B4E88436F6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
97+
{9FD2D4BD-33D8-4728-AD61-B4E88436F6DC}.Release|Any CPU.Build.0 = Release|Any CPU
98+
{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99+
{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
100+
{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
101+
{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}.Release|Any CPU.Build.0 = Release|Any CPU
102102
EndGlobalSection
103103
GlobalSection(SolutionProperties) = preSolution
104104
HideSolutionNode = FALSE

‎dotnet/src/webdriver/WebDriver.NetCore.csproj

+128-8
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,160 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
5-
<AssemblyName>WebDriver.Net.Core</AssemblyName>
4+
<TargetFrameworks>netstandard2.0;net45;net40;net35</TargetFrameworks>
5+
<AssemblyName>WebDriver</AssemblyName>
6+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7+
<BuildSystem>visual-studio</BuildSystem>
8+
</PropertyGroup>
9+
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
11+
<OutputPath>..\..\..\build\cli\Release\</OutputPath>
612
</PropertyGroup>
713

814
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
915
<OutputPath>..\..\..\build\cli\Debug\</OutputPath>
1016
</PropertyGroup>
1117

12-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
13-
<OutputPath>..\..\..\build\cli\Release\</OutputPath>
18+
<PropertyGroup>
19+
<FrameworkPathOverride Condition="'$(TargetFramework)'=='net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
20+
</PropertyGroup>
21+
22+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net35|AnyCPU'">
23+
<DocumentationFile>..\..\..\build\cli\Release\net35\WebDriver.xml</DocumentationFile>
24+
</PropertyGroup>
25+
26+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net35|AnyCPU'">
27+
<DocumentationFile>..\..\..\build\cli\Debug\net35\WebDriver.xml</DocumentationFile>
28+
<WarningLevel>0</WarningLevel>
29+
</PropertyGroup>
30+
31+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net40|AnyCPU'">
32+
<DocumentationFile>..\..\..\build\cli\Release\net40\WebDriver.xml</DocumentationFile>
33+
</PropertyGroup>
34+
35+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net40|AnyCPU'">
36+
<DocumentationFile>..\..\..\build\cli\Debug\net40\WebDriver.xml</DocumentationFile>
37+
<WarningLevel>0</WarningLevel>
38+
</PropertyGroup>
39+
40+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
41+
<DocumentationFile>..\..\..\build\cli\Release\net45\WebDriver.xml</DocumentationFile>
42+
</PropertyGroup>
43+
44+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
45+
<DocumentationFile>..\..\..\build\cli\Debug\net45\WebDriver.xml</DocumentationFile>
46+
<WarningLevel>0</WarningLevel>
47+
</PropertyGroup>
48+
49+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
50+
<DocumentationFile>..\..\..\build\cli\Release\netstandard2.0\WebDriver.xml</DocumentationFile>
51+
</PropertyGroup>
52+
53+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
54+
<DocumentationFile>..\..\..\build\cli\Debug\netstandard2.0\WebDriver.xml</DocumentationFile>
55+
<WarningLevel>0</WarningLevel>
1456
</PropertyGroup>
1557

1658
<ItemGroup>
17-
<Compile Remove="Properties\AssemblyInfo.cs" />
59+
<Compile Remove="obj\**" />
60+
<Compile Remove="obj_core\**" />
61+
<EmbeddedResource Remove="obj\**" />
62+
<EmbeddedResource Remove="obj_core\**" />
63+
<None Remove="obj\**" />
64+
<None Remove="obj_core\**" />
1865
</ItemGroup>
1966

2067
<ItemGroup>
2168
<None Remove="BUCK" />
2269
<None Remove="build.desc" />
2370
<None Remove="Settings.StyleCop" />
71+
<None Remove="WebDriver.nuspec" />
2472
<None Remove="WebDriver.ruleset" />
2573
</ItemGroup>
2674

27-
<ItemGroup>
75+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
76+
<Reference Include="ImageSharp">
77+
<HintPath>..\..\..\third_party\dotnet\imagesharp-1.0.0-alpha9-00194\netstandard1.3\ImageSharp.dll</HintPath>
78+
</Reference>
2879
<Reference Include="Newtonsoft.Json">
2980
<HintPath>..\..\..\third_party\dotnet\json-net-10.0r2\netstandard1.3\Newtonsoft.Json.dll</HintPath>
3081
</Reference>
31-
<Reference Include="ImageSharp">
32-
<HintPath>..\..\..\third_party\dotnet\imagesharp-1.0.0-alpha9-00182\netstandard1.3\ImageSharp.dll</HintPath>
82+
</ItemGroup>
83+
84+
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
85+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
86+
<SpecificVersion>False</SpecificVersion>
87+
<HintPath>..\..\..\third_party\dotnet\json-net-10.0r2\net45\Newtonsoft.Json.dll</HintPath>
3388
</Reference>
89+
<Reference Include="System" />
90+
<Reference Include="System.Core" />
91+
<Reference Include="System.Drawing" />
92+
<Reference Include="System.Xml.Linq" />
93+
<Reference Include="System.Data.DataSetExtensions" />
94+
<Reference Include="Microsoft.CSharp" />
95+
<Reference Include="System.Data" />
96+
<Reference Include="System.Net.Http" />
97+
<Reference Include="System.Xml" />
98+
</ItemGroup>
99+
100+
<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
101+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
102+
<SpecificVersion>False</SpecificVersion>
103+
<HintPath>..\..\..\third_party\dotnet\json-net-10.0r2\net40\Newtonsoft.Json.dll</HintPath>
104+
</Reference>
105+
<Reference Include="System" />
106+
<Reference Include="System.Core" />
107+
<Reference Include="System.Drawing" />
108+
<Reference Include="System.Xml.Linq" />
109+
<Reference Include="System.Data.DataSetExtensions" />
110+
<Reference Include="Microsoft.CSharp" />
111+
<Reference Include="System.Data" />
112+
<Reference Include="System.Xml" />
113+
</ItemGroup>
114+
115+
<ItemGroup Condition="'$(TargetFramework)' == 'net35'">
116+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
117+
<SpecificVersion>False</SpecificVersion>
118+
<HintPath>..\..\..\third_party\dotnet\json-net-10.0r2\net35\Newtonsoft.Json.dll</HintPath>
119+
</Reference>
120+
<Reference Include="System" />
121+
<Reference Include="System.Core" />
122+
<Reference Include="System.Drawing" />
123+
<Reference Include="System.Xml.Linq" />
124+
<Reference Include="System.Data.DataSetExtensions" />
125+
<Reference Include="System.Data" />
126+
<Reference Include="System.Xml" />
34127
</ItemGroup>
35128

36129
<ItemGroup>
37130
<Folder Include="Properties\" />
38131
</ItemGroup>
39132

133+
<ItemGroup Condition="'$(BuildSystem)' == 'buck'">
134+
<EmbeddedResource Include="$(MSBuildProjectDirectory)\..\..\..\buck-out\gen\javascript\firefox-driver\webdriver\webdriver.xpi">
135+
<Visible>False</Visible>
136+
<LogicalName>WebDriver.FirefoxExt.zip</LogicalName>
137+
</EmbeddedResource>
138+
<EmbeddedResource Include="$(MSBuildProjectDirectory)\..\..\..\buck-out\gen\javascript\firefox-driver\webdriver_prefs">
139+
<Visible>False</Visible>
140+
<LogicalName>WebDriver.FirefoxPreferences</LogicalName>
141+
</EmbeddedResource>
142+
<EmbeddedResource Include="$(MSBuildProjectDirectory)\..\..\..\buck-out\gen\javascript\webdriver\atoms\getAttribute.js">
143+
<Visible>False</Visible>
144+
<LogicalName>getAttribute.js</LogicalName>
145+
</EmbeddedResource>
146+
<EmbeddedResource Include="$(MSBuildProjectDirectory)\..\..\..\buck-out\gen\javascript\atoms\fragments\is-displayed.js">
147+
<Visible>False</Visible>
148+
<LogicalName>isDisplayed.js</LogicalName>
149+
</EmbeddedResource>
150+
<EmbeddedResource Include="$(MSBuildProjectDirectory)\..\..\..\buck-out\gen\cpp\prebuilt\i386\x_ignore_nofocus.so">
151+
<Visible>False</Visible>
152+
<LogicalName>WebDriver.FirefoxNoFocus.x86.dll</LogicalName>
153+
</EmbeddedResource>
154+
<EmbeddedResource Include="$(MSBuildProjectDirectory)\..\..\..\buck-out\gen\cpp\prebuilt\amd64\x_ignore_nofocus.so">
155+
<Visible>False</Visible>
156+
<LogicalName>WebDriver.FirefoxNoFocus.x64.dll</LogicalName>
157+
</EmbeddedResource>
158+
</ItemGroup>
159+
40160
</Project>

0 commit comments

Comments
 (0)