Separating in-progress .NET Core support work from production

odedniv · Sep 19, 2017 · 8edff46 · 8edff46
1 parent 52202f2
commit 8edff46
Show file tree

Hide file tree

Showing 16 changed files with 271 additions and 15 deletions.
diff --git a/dotnet/WebDriver.NET.sln b/dotnet/WebDriver.NET.sln
@@ -29,8 +29,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver.Opera.Tests", "te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Selenium.WebDriverBackedSelenium.Tests", "test\webdriverbackedselenium\Selenium.WebDriverBackedSelenium.Tests.csproj", "{7760D121-0C45-4083-83FD-3171F0CF9BF5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.NetCore", "src\webdriver\WebDriver.NetCore.csproj", "{9FD2D4BD-33D8-4728-AD61-B4E88436F6DC}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDriver", "src\webdriver\WebDriver.csproj", "{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}"
 EndProject
 Global
@@ -91,10 +89,6 @@ Global
 		{7760D121-0C45-4083-83FD-3171F0CF9BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7760D121-0C45-4083-83FD-3171F0CF9BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7760D121-0C45-4083-83FD-3171F0CF9BF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9FD2D4BD-33D8-4728-AD61-B4E88436F6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FD2D4BD-33D8-4728-AD61-B4E88436F6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9FD2D4BD-33D8-4728-AD61-B4E88436F6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9FD2D4BD-33D8-4728-AD61-B4E88436F6DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EA31F748-5E32-476D-AB6D-FEA245B4AF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/dotnet/WebDriver.NetCore.sln b/dotnet/WebDriver.NetCore.sln
@@ -0,0 +1,43 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.12
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.NetCore", "src\webdriver\WebDriver.NetCore.csproj", "{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriverBackedSelenium.NetCore", "src\webdriverbackedselenium\WebDriverBackedSelenium.NetCore.csproj", "{55FB5C5F-AB40-4475-A40C-AE9EA8ED84C3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Support.NetCore", "src\support\WebDriver.Support.NetCore.csproj", "{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDriver.Common.Tests.NetCore", "test\common\WebDriver.Common.Tests.NetCore.csproj", "{1869A2D9-3782-41E4-84DD-EB1A5E971C93}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55FB5C5F-AB40-4475-A40C-AE9EA8ED84C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55FB5C5F-AB40-4475-A40C-AE9EA8ED84C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55FB5C5F-AB40-4475-A40C-AE9EA8ED84C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55FB5C5F-AB40-4475-A40C-AE9EA8ED84C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1869A2D9-3782-41E4-84DD-EB1A5E971C93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1869A2D9-3782-41E4-84DD-EB1A5E971C93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1869A2D9-3782-41E4-84DD-EB1A5E971C93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1869A2D9-3782-41E4-84DD-EB1A5E971C93}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {35671DC1-25B5-4FD5-B5D9-919C3E4A503C}
+	EndGlobalSection
+EndGlobal
diff --git a/dotnet/src/support/PageObjects/DefaultElementLocator.cs b/dotnet/src/support/PageObjects/DefaultElementLocator.cs
@@ -1,4 +1,4 @@
-// <copyright file="DefaultElementLocator.cs" company="WebDriver Committers">
+// <copyright file="DefaultElementLocator.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -16,6 +16,7 @@
 // limitations under the License.
 // </copyright>
 
+#if !NETSTANDARD2_0
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -99,3 +100,4 @@ public ReadOnlyCollection<IWebElement> LocateElements(IEnumerable<By> bys)
         }
     }
 }
+#endif
diff --git a/dotnet/src/support/PageObjects/DefaultPageObjectMemberDecorator.cs b/dotnet/src/support/PageObjects/DefaultPageObjectMemberDecorator.cs
@@ -1,4 +1,4 @@
-// <copyright file="DefaultPageObjectMemberDecorator.cs" company="WebDriver Committers">
+// <copyright file="DefaultPageObjectMemberDecorator.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -16,6 +16,7 @@
 // limitations under the License.
 // </copyright>
 
+#if !NETSTANDARD2_0
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -225,3 +226,4 @@ private static Type CreateTypeForASingleElement()
         }
     }
 }
+#endif
diff --git a/dotnet/src/support/PageObjects/PageFactory.cs b/dotnet/src/support/PageObjects/PageFactory.cs
@@ -1,4 +1,4 @@
-// <copyright file="PageFactory.cs" company="WebDriver Committers">
+// <copyright file="PageFactory.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -16,6 +16,7 @@
 // limitations under the License.
 // </copyright>
 
+#if !NETSTANDARD2_0
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -222,3 +223,4 @@ public static void InitElements(object page, IElementLocator locator, IPageObjec
         }
     }
 }
+#endif
diff --git a/dotnet/src/support/PageObjects/RetryingElementLocator.cs b/dotnet/src/support/PageObjects/RetryingElementLocator.cs
@@ -1,4 +1,4 @@
-// <copyright file="RetryingElementLocator.cs" company="WebDriver Committers">
+// <copyright file="RetryingElementLocator.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -16,6 +16,7 @@
 // limitations under the License.
 // </copyright>
 
+#if !NETSTANDARD2_0
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -155,3 +156,4 @@ public ReadOnlyCollection<IWebElement> LocateElements(IEnumerable<By> bys)
         }
     }
 }
+#endif
diff --git a/dotnet/src/support/PageObjects/WebDriverObjectProxy.cs b/dotnet/src/support/PageObjects/WebDriverObjectProxy.cs
@@ -1,4 +1,4 @@
-// <copyright file="WebDriverObjectProxy.cs" company="WebDriver Committers">
+// <copyright file="WebDriverObjectProxy.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -16,6 +16,7 @@
 // limitations under the License.
 // </copyright>
 
+#if !NETSTANDARD2_0
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -92,3 +93,4 @@ protected static ReturnMessage InvokeMethod(IMethodCallMessage msg, object repre
         }
     }
 }
+#endif
diff --git a/dotnet/src/support/PageObjects/WebElementListProxy.cs b/dotnet/src/support/PageObjects/WebElementListProxy.cs
@@ -1,4 +1,4 @@
-// <copyright file="WebElementListProxy.cs" company="WebDriver Committers">
+// <copyright file="WebElementListProxy.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -16,6 +16,7 @@
 // limitations under the License.
 // </copyright>
 
+#if !NETSTANDARD2_0
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -92,3 +93,4 @@ public override IMessage Invoke(IMessage msg)
         }
     }
 }
+#endif
diff --git a/dotnet/src/support/PageObjects/WebElementProxy.cs b/dotnet/src/support/PageObjects/WebElementProxy.cs
@@ -1,4 +1,4 @@
-// <copyright file="WebElementProxy.cs" company="WebDriver Committers">
+// <copyright file="WebElementProxy.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -16,6 +16,7 @@
 // limitations under the License.
 // </copyright>
 
+#if !NETSTANDARD2_0
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -104,3 +105,4 @@ public override IMessage Invoke(IMessage msg)
         }
     }
 }
+#endif
diff --git a/dotnet/src/support/WebDriver.Support.NetCore.csproj b/dotnet/src/support/WebDriver.Support.NetCore.csproj
@@ -0,0 +1,75 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net45;net40;net35</TargetFrameworks>
+    <AssemblyName>WebDriver.Support</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <RootNamespace>OpenQA.Selenium.Support</RootNamespace>
+    <BuildSystem>visual-studio</BuildSystem>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\..\..\build\cli\Release\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\..\..\build\cli\Debug\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <FrameworkPathOverride Condition="'$(TargetFramework)'=='net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net35|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Release\net35\WebDriver.Support.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net35|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Debug\net35\WebDriver.Support.xml</DocumentationFile>
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net40|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Release\net40\WebDriver.Support.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net40|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Debug\net40\WebDriver.Support.xml</DocumentationFile>
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Release\net45\WebDriver.Support.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Debug\net45\WebDriver.Support.xml</DocumentationFile>
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Release\netstandard2.0\WebDriver.Support.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Debug\netstandard2.0\WebDriver.Support.xml</DocumentationFile>
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="obj\**" />
+    <EmbeddedResource Remove="obj\**" />
+    <None Remove="obj\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="build.desc" />
+    <None Remove="Settings.StyleCop" />
+    <None Remove="WebDriver.Support.ruleset" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\webdriver\WebDriver.NetCore.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/dotnet/src/webdriver/WebDriver.NetCore.csproj b/dotnet/src/webdriver/WebDriver.NetCore.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netstandard2.0;net45;net40;net35</TargetFrameworks>
     <AssemblyName>WebDriver</AssemblyName>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <RootNamespace>OpenQA.Selenium</RootNamespace>
     <BuildSystem>visual-studio</BuildSystem>
   </PropertyGroup>
 
@@ -72,7 +73,11 @@
     <None Remove="WebDriver.ruleset" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  </ItemGroup>
+
+  <!--ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\third_party\dotnet\json-net-10.0r2\netstandard1.3\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -121,7 +126,7 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-  </ItemGroup>
+  </ItemGroup-->
 
   <ItemGroup>
     <Folder Include="Properties\" />

diff --git a/dotnet/src/webdriverbackedselenium/WebDriverBackedSelenium.NetCore.csproj b/dotnet/src/webdriverbackedselenium/WebDriverBackedSelenium.NetCore.csproj
@@ -0,0 +1,79 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net45;net40;net35</TargetFrameworks>
+    <AssemblyName>Selenium.WebDriverBackedSelenium</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <RootNamespace>Selenium</RootNamespace>
+    <BuildSystem>visual-studio</BuildSystem>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\..\..\build\cli\Release\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\..\..\build\cli\Debug\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <FrameworkPathOverride Condition="'$(TargetFramework)'=='net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net35|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Release\net35\Selenium.WebDriverBackedSelenium.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net35|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Debug\net35\Selenium.WebDriverBackedSelenium.xml</DocumentationFile>
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net40|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Release\net40\Selenium.WebDriverBackedSelenium.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net40|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Debug\net40\Selenium.WebDriverBackedSelenium.xml</DocumentationFile>
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Release\net45\Selenium.WebDriverBackedSelenium.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Debug\net45\Selenium.WebDriverBackedSelenium.xml</DocumentationFile>
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Release\netstandard2.0\Selenium.WebDriverBackedSelenium.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
+    <DocumentationFile>..\..\..\build\cli\Debug\netstandard2.0\Selenium.WebDriverBackedSelenium.xml</DocumentationFile>
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="obj\**" />
+    <Compile Remove="obj_core\**" />
+    <EmbeddedResource Remove="obj\**" />
+    <EmbeddedResource Remove="obj_core\**" />
+    <None Remove="obj\**" />
+    <None Remove="obj_core\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="BUCK" />
+    <None Remove="build.desc" />
+    <None Remove="Selenium.WebDriverBackedSelenium.nuspec" />
+    <None Remove="Settings.StyleCop" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\webdriver\WebDriver.NetCore.csproj" />
+  </ItemGroup>
+
+</Project>