Adding platform configuration to run .NET tests in .NET Core 2.0

SeleniumHQ · Feb 16, 2018 · de5fc0a · de5fc0a
1 parent e1da661
commit de5fc0a
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 13 deletions.
diff --git a/dotnet/test/chrome/WebDriver.Chrome.Tests.csproj b/dotnet/test/chrome/WebDriver.Chrome.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>WebDriver.Chrome.Tests</AssemblyName>
   </PropertyGroup>
 

diff --git a/dotnet/test/common/WebDriver.Common.Tests.csproj b/dotnet/test/common/WebDriver.Common.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>WebDriver.Common.Tests</AssemblyName>
     <RootNamespace>OpenQA.Selenium</RootNamespace>
   </PropertyGroup>
@@ -52,4 +52,8 @@
     </None>
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="for %%G in (net45 netcoreapp2.0) do (&#xD;&#xA;  if exist &quot;$(ProjectDir)..\..\..\build\cpp\Win32\$(ConfigurationName)\IEDriverServer.exe&quot; (&#xD;&#xA;    echo Found IE 32-bit native binary, copying from Win32 build target $(ProjectDir)..\..\..\build\cpp\Win32\$(ConfigurationName)\IEDriverServer.exe&#xD;&#xA;    copy /y &quot;$(ProjectDir)..\..\..\build\cpp\Win32\$(ConfigurationName)\IEDriverServer.exe&quot; &quot;$(TargetDir)..\%%G&quot; &gt; NUL&#xD;&#xA;  ) else (&#xD;&#xA;    echo Missing IE 32-bit native binary, copying from Win32 prebuilt location $(ProjectDir)..\..\..\cpp\prebuilt\Win32\Release\IEDriverServer.exe&#xD;&#xA;    copy /y &quot;$(ProjectDir)..\..\..\cpp\prebuilt\Win32\Release\IEDriverServer.exe&quot; &quot;$(TargetDir)..\%%G&quot; &gt; NUL&#xD;&#xA;  )&#xD;&#xA;&#xD;&#xA;  if exist &quot;$(ProjectDir)..\..\..\buck-out\gen\javascript\firefox-driver\webdriver\webdriver.xpi&quot; (&#xD;&#xA;    echo Copying Firefox extension from $(ProjectDir)..\..\..\buck-out\gen\javascript\firefox-driver\webdriver\webdriver.xpi&#xD;&#xA;    copy /y &quot;$(ProjectDir)..\..\..\buck-out\gen\javascript\firefox-driver\webdriver\webdriver.xpi&quot; &quot;$(TargetDir)..\%%G&quot; &gt; NUL&#xD;&#xA;  ) else (&#xD;&#xA;    echo WARN: No Firefox extension found at $(ProjectDir)..\..\..\buck-out\gen\javascript\firefox-driver\webdriver\webdriver.xpi&#xD;&#xA;  )&#xD;&#xA;&#xD;&#xA;  echo Copying Firefox preferences file from $(ProjectDir)..\..\..\javascript\firefox-driver\webdriver.json&#xD;&#xA;  copy /y &quot;$(ProjectDir)..\..\..\javascript\firefox-driver\webdriver.json&quot; &quot;$(TargetDir)..\%%G&quot; &gt; NUL&#xD;&#xA;&#xD;&#xA;  if not exist &quot;$(TargetDir)..\%%G\getAttribute.js&quot; (&#xD;&#xA;    if not exist &quot;$(ProjectDir)..\..\..\buck-out\gen\javascript\webdriver\atoms\get-attribute.js&quot; (&#xD;&#xA;      echo Building getAttribute atom&#xD;&#xA;      pushd &quot;$(ProjectDir)..\..\..&quot;&#xD;&#xA;      call &quot;go.bat&quot; //javascript/webdriver/atoms:get-attribute&#xD;&#xA;      popd&#xD;&#xA;    )&#xD;&#xA;    echo Copying getAttribute atom&#xD;&#xA;    copy /y &quot;$(ProjectDir)..\..\..\buck-out\gen\javascript\webdriver\atoms\get-attribute.js&quot; &quot;$(TargetDir)..\%%G\getAttribute.js&quot; &gt; NUL&#xD;&#xA;  ) else (&#xD;&#xA;    echo Found getAttribute atom at $(TargetDir)..\%%G\getAttribute.js.&#xD;&#xA;  )&#xD;&#xA;&#xD;&#xA;  if not exist &quot;$(TargetDir)..\%%G\isDisplayed.js&quot; (&#xD;&#xA;    if not exist  &quot;$(ProjectDir)..\..\..\buck-out\gen\javascript\atoms\fragments\is-displayed.js&quot; (&#xD;&#xA;      echo Building isDisplayed atom&#xD;&#xA;      pushd &quot;$(ProjectDir)..\..\..&quot;&#xD;&#xA;      call &quot;go.bat&quot; //javascript/atoms/fragments:is-displayed&#xD;&#xA;      popd&#xD;&#xA;    )&#xD;&#xA;    echo Copying isDisplayed atom&#xD;&#xA;    copy /y &quot;$(ProjectDir)..\..\..\buck-out\gen\javascript\atoms\fragments\is-displayed.js&quot; &quot;$(TargetDir)..\%%G\isDisplayed.js&quot; &gt; NUL&#xD;&#xA;  ) else (&#xD;&#xA;    echo Found isDisplayed atom at $(TargetDir)..\%%G\getAttribute.js.&#xD;&#xA;  )&#xD;&#xA;)" />
+  </Target>
+
 </Project>
diff --git a/dotnet/test/common/appconfig.json b/dotnet/test/common/appconfig.json
@@ -1,6 +1,6 @@
 {
-  "DriverServiceLocation":  "",
-  "ActiveDriverConfig": "Chrome",
+  "DriverServiceLocation":  "C:\\Projects\\webdriver\\build\\cli\\Debug\\netcoreapp2.0",
+  "ActiveDriverConfig": "Remote",
   "ActiveWebsiteConfig": "Default",
   "WebsiteConfigs": {
     "Default": {

diff --git a/dotnet/test/edge/WebDriver.Edge.Tests.csproj b/dotnet/test/edge/WebDriver.Edge.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>WebDriver.Edge.Tests</AssemblyName>
   </PropertyGroup>
 

diff --git a/dotnet/test/firefox/WebDriver.Firefox.Tests.csproj b/dotnet/test/firefox/WebDriver.Firefox.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>WebDriver.Firefox.Tests</AssemblyName>
   </PropertyGroup>
 

diff --git a/dotnet/test/ie/WebDriver.IE.Tests.csproj b/dotnet/test/ie/WebDriver.IE.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>WebDriver.IE.Tests</AssemblyName>
     <RootNamespace>OpenQA.Selenium.IE</RootNamespace>
   </PropertyGroup>

diff --git a/dotnet/test/opera/WebDriver.Opera.Tests.csproj b/dotnet/test/opera/WebDriver.Opera.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>WebDriver.Opera.Tests</AssemblyName>
   </PropertyGroup>
 

diff --git a/dotnet/test/phantomjs/WebDriver.PhantomJS.Tests.csproj b/dotnet/test/phantomjs/WebDriver.PhantomJS.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>WebDriver.PhantomJS.Tests</AssemblyName>
   </PropertyGroup>
 

diff --git a/dotnet/test/remote/WebDriver.Remote.Tests.csproj b/dotnet/test/remote/WebDriver.Remote.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>WebDriver.Remote.Tests</AssemblyName>
   </PropertyGroup>
 

diff --git a/dotnet/test/safari/WebDriver.Safari.Tests.csproj b/dotnet/test/safari/WebDriver.Safari.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>WebDriver.Safari.Tests</AssemblyName>
   </PropertyGroup>
 

diff --git a/dotnet/test/support/WebDriver.Support.Tests.csproj b/dotnet/test/support/WebDriver.Support.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>WebDriver.Support.Tests</AssemblyName>
   </PropertyGroup>
 

diff --git a/dotnet/test/webdriverbackedselenium/Selenium.WebDriverBackedSelenium.Tests.csproj b/dotnet/test/webdriverbackedselenium/Selenium.WebDriverBackedSelenium.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>Selenium.WebDriverBackedSelenium.Tests</AssemblyName>
   </PropertyGroup>