diff --git a/dotnet/WebDriver.NET.sln b/dotnet/WebDriver.NET.sln index 2da2226adf3c0..ba42464cee7ee 100644 --- 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 new file mode 100644 index 0000000000000..d001f6c871cfa --- /dev/null +++ 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 index 01fc14342a93d..60b8537134a7b 100644 --- a/dotnet/src/support/PageObjects/DefaultElementLocator.cs +++ b/dotnet/src/support/PageObjects/DefaultElementLocator.cs @@ -1,4 +1,4 @@ -// +// // 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. // +#if !NETSTANDARD2_0 using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -99,3 +100,4 @@ public ReadOnlyCollection LocateElements(IEnumerable bys) } } } +#endif diff --git a/dotnet/src/support/PageObjects/DefaultPageObjectMemberDecorator.cs b/dotnet/src/support/PageObjects/DefaultPageObjectMemberDecorator.cs index 61465b189b83d..ffdd03d6a3c3b 100644 --- a/dotnet/src/support/PageObjects/DefaultPageObjectMemberDecorator.cs +++ b/dotnet/src/support/PageObjects/DefaultPageObjectMemberDecorator.cs @@ -1,4 +1,4 @@ -// +// // 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. // +#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 index 6bab7203fb9ed..e15a2eb09a37e 100644 --- a/dotnet/src/support/PageObjects/PageFactory.cs +++ b/dotnet/src/support/PageObjects/PageFactory.cs @@ -1,4 +1,4 @@ -// +// // 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. // +#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 index 5001f0246f72a..bd3a529f5cc4e 100644 --- a/dotnet/src/support/PageObjects/RetryingElementLocator.cs +++ b/dotnet/src/support/PageObjects/RetryingElementLocator.cs @@ -1,4 +1,4 @@ -// +// // 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. // +#if !NETSTANDARD2_0 using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -155,3 +156,4 @@ public ReadOnlyCollection LocateElements(IEnumerable bys) } } } +#endif diff --git a/dotnet/src/support/PageObjects/WebDriverObjectProxy.cs b/dotnet/src/support/PageObjects/WebDriverObjectProxy.cs index a794971f3fcb2..c3b220ddb6d2d 100644 --- a/dotnet/src/support/PageObjects/WebDriverObjectProxy.cs +++ b/dotnet/src/support/PageObjects/WebDriverObjectProxy.cs @@ -1,4 +1,4 @@ -// +// // 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. // +#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 index 136a97536d56c..90f833d393bd8 100644 --- a/dotnet/src/support/PageObjects/WebElementListProxy.cs +++ b/dotnet/src/support/PageObjects/WebElementListProxy.cs @@ -1,4 +1,4 @@ -// +// // 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. // +#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 index 764aecd8738c1..f275584add153 100644 --- a/dotnet/src/support/PageObjects/WebElementProxy.cs +++ b/dotnet/src/support/PageObjects/WebElementProxy.cs @@ -1,4 +1,4 @@ -// +// // 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. // +#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 new file mode 100644 index 0000000000000..ebca881a62de8 --- /dev/null +++ b/dotnet/src/support/WebDriver.Support.NetCore.csproj @@ -0,0 +1,75 @@ + + + + netstandard2.0;net45;net40;net35 + WebDriver.Support + false + OpenQA.Selenium.Support + visual-studio + + + + ..\..\..\build\cli\Release\ + + + + ..\..\..\build\cli\Debug\ + + + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client + + + + ..\..\..\build\cli\Release\net35\WebDriver.Support.xml + + + + ..\..\..\build\cli\Debug\net35\WebDriver.Support.xml + 0 + + + + ..\..\..\build\cli\Release\net40\WebDriver.Support.xml + + + + ..\..\..\build\cli\Debug\net40\WebDriver.Support.xml + 0 + + + + ..\..\..\build\cli\Release\net45\WebDriver.Support.xml + + + + ..\..\..\build\cli\Debug\net45\WebDriver.Support.xml + 0 + + + + ..\..\..\build\cli\Release\netstandard2.0\WebDriver.Support.xml + + + + ..\..\..\build\cli\Debug\netstandard2.0\WebDriver.Support.xml + 0 + + + + + + + + + + + + + + + + + + + diff --git a/dotnet/src/webdriver/WebDriver.NetCore.csproj b/dotnet/src/webdriver/WebDriver.NetCore.csproj index faea5bc79d713..6b6d812a07fbf 100644 --- a/dotnet/src/webdriver/WebDriver.NetCore.csproj +++ b/dotnet/src/webdriver/WebDriver.NetCore.csproj @@ -4,6 +4,7 @@ netstandard2.0;net45;net40;net35 WebDriver false + OpenQA.Selenium visual-studio @@ -72,7 +73,11 @@ - + + + + + diff --git a/dotnet/src/webdriverbackedselenium/WebDriverBackedSelenium.NetCore.csproj b/dotnet/src/webdriverbackedselenium/WebDriverBackedSelenium.NetCore.csproj new file mode 100644 index 0000000000000..0f273451b2938 --- /dev/null +++ b/dotnet/src/webdriverbackedselenium/WebDriverBackedSelenium.NetCore.csproj @@ -0,0 +1,79 @@ + + + + netstandard2.0;net45;net40;net35 + Selenium.WebDriverBackedSelenium + false + Selenium + visual-studio + + + + ..\..\..\build\cli\Release\ + + + + ..\..\..\build\cli\Debug\ + + + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client + + + + ..\..\..\build\cli\Release\net35\Selenium.WebDriverBackedSelenium.xml + + + + ..\..\..\build\cli\Debug\net35\Selenium.WebDriverBackedSelenium.xml + 0 + + + + ..\..\..\build\cli\Release\net40\Selenium.WebDriverBackedSelenium.xml + + + + ..\..\..\build\cli\Debug\net40\Selenium.WebDriverBackedSelenium.xml + 0 + + + + ..\..\..\build\cli\Release\net45\Selenium.WebDriverBackedSelenium.xml + + + + ..\..\..\build\cli\Debug\net45\Selenium.WebDriverBackedSelenium.xml + 0 + + + + ..\..\..\build\cli\Release\netstandard2.0\Selenium.WebDriverBackedSelenium.xml + + + + ..\..\..\build\cli\Debug\netstandard2.0\Selenium.WebDriverBackedSelenium.xml + 0 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dotnet/test/common/WebDriver.Common.Tests.NetCore.csproj b/dotnet/test/common/WebDriver.Common.Tests.NetCore.csproj new file mode 100644 index 0000000000000..286de345edcaf --- /dev/null +++ b/dotnet/test/common/WebDriver.Common.Tests.NetCore.csproj @@ -0,0 +1,46 @@ + + + + netcoreapp2.0 + WebDriver.Common.Tests + WebDriver.Common.Tests + + + + ..\..\..\build\cli\Release\ + + + + ..\..\..\build\cli\Debug\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/third_party/dotnet/nuget/packages/newtonsoft.json.10.0.3.nupkg b/third_party/dotnet/nuget/packages/newtonsoft.json.10.0.3.nupkg new file mode 100644 index 0000000000000..4e1ee111b0e82 Binary files /dev/null and b/third_party/dotnet/nuget/packages/newtonsoft.json.10.0.3.nupkg differ diff --git a/third_party/dotnet/nuget/packages/nmock3.3.5.44.nupkg b/third_party/dotnet/nuget/packages/nmock3.3.5.44.nupkg new file mode 100644 index 0000000000000..680b713cec839 Binary files /dev/null and b/third_party/dotnet/nuget/packages/nmock3.3.5.44.nupkg differ diff --git a/third_party/dotnet/nuget/packages/nunit.3.8.1.nupkg b/third_party/dotnet/nuget/packages/nunit.3.8.1.nupkg new file mode 100644 index 0000000000000..bfd36c92aa143 Binary files /dev/null and b/third_party/dotnet/nuget/packages/nunit.3.8.1.nupkg differ