Merge pull request #42 from yashaka/develop

Develop
yashaka · Jul 19, 2018 · 2849f6b · 2849f6b
2 parents 1de7755 + f0735fd
commit 2849f6b
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 62 deletions.
diff --git a/NSelene/NSelene.csproj b/NSelene/NSelene.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -31,11 +31,11 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
-    <Reference Include="WebDriver">
-      <HintPath>..\packages\Selenium.WebDriver.3.12.0\lib\net45\WebDriver.dll</HintPath>
+    <Reference Include="WebDriver, Version=3.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.WebDriver.3.13.1\lib\net45\WebDriver.dll</HintPath>
     </Reference>
-    <Reference Include="WebDriver.Support">
-      <HintPath>..\packages\Selenium.Support.3.12.0\lib\net45\WebDriver.Support.dll</HintPath>
+    <Reference Include="WebDriver.Support, Version=3.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.Support.3.13.1\lib\net45\WebDriver.Support.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/NSelene/packages.config b/NSelene/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Selenium.Support" version="3.12.0" targetFramework="net45" />
-  <package id="Selenium.WebDriver" version="3.12.0" targetFramework="net45" />
+  <package id="Selenium.Support" version="3.13.1" targetFramework="net45" />
+  <package id="Selenium.WebDriver" version="3.13.1" targetFramework="net45" />
 </packages>
diff --git a/NSeleneExamples/NSeleneExamples.csproj b/NSeleneExamples/NSeleneExamples.csproj
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +10,8 @@
     <AssemblyName>NSeleneExamples</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ReleaseVersion>0.0.0.7</ReleaseVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,22 +32,19 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="System" />
     <Reference Include="System.Drawing" />
-    <Reference Include="WebDriver">
-      <HintPath>..\packages\Selenium.WebDriver.3.12.0\lib\net45\WebDriver.dll</HintPath>
+    <Reference Include="WebDriver, Version=3.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.WebDriver.3.13.1\lib\net45\WebDriver.dll</HintPath>
     </Reference>
-    <Reference Include="WebDriver.Support">
-      <HintPath>..\packages\Selenium.Support.3.12.0\lib\net45\WebDriver.Support.dll</HintPath>
+    <Reference Include="WebDriver.Support, Version=3.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.Support.3.13.1\lib\net45\WebDriver.Support.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NSelene\NSelene.csproj">
       <Project>{C9C40CB0-17E2-4264-B216-1202A97BE857}</Project>
@@ -74,26 +74,12 @@
     <Compile Include="TodoMVC\WithWidgets\Pages\Tasks.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="TodoMVC\WithPages\" />
-    <Folder Include="TodoMVC\Straightforward\" />
-    <Folder Include="TodoMVC\WithPages\Pages\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\Before\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\After\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\Before\Core\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\Before\Pages\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\AfterPlusPlus\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\AfterPlusPlus\Pages\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\After\core\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\After\pages\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\AfterPlus\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\AfterPlus\pages\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\AfterPlusAlternativeStyleOfPageFields\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\AfterPlusAlternativeStyleOfPageFields\pages\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\AfterPlusAlternativeStyleOfNaming\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\AfterPlusAlternativeStyleOfNaming\core\" />
-    <Folder Include="TodoMVC\IntegratedToSeleniumBasedFramework\AfterPlusAlternativeStyleOfNaming\pages\" />
-    <Folder Include="TodoMVC\WithWidgets\" />
-    <Folder Include="TodoMVC\WithWidgets\Pages\" />
+    <None Include="packages.config" />
   </ItemGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
+  </Target>
 </Project>
diff --git a/NSeleneExamples/TodoMVC/IntegratedToSeleniumBasedFramework/After/TodoMVCTests.cs b/NSeleneExamples/TodoMVC/IntegratedToSeleniumBasedFramework/After/TodoMVCTests.cs
@@ -11,7 +11,7 @@ public class TestTodoMVC
     {
         static IWebDriver driver = new ChromeDriver();
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TearDown()
         {
             driver.Quit();

diff --git a/NSeleneExamples/TodoMVC/IntegratedToSeleniumBasedFramework/AfterPlus/TodoMVCTests.cs b/NSeleneExamples/TodoMVC/IntegratedToSeleniumBasedFramework/AfterPlus/TodoMVCTests.cs
@@ -11,7 +11,7 @@ public class TestTodoMVC
     {
         static IWebDriver driver = new ChromeDriver();
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TearDown()
         {
             driver.Quit();

diff --git a/...oMVC/IntegratedToSeleniumBasedFramework/AfterPlusAlternativeStyleOfNaming/TodoMVCTests.cs b/...oMVC/IntegratedToSeleniumBasedFramework/AfterPlusAlternativeStyleOfNaming/TodoMVCTests.cs
@@ -11,7 +11,7 @@ public class TestTodoMVC
     {
         static IWebDriver driver = new ChromeDriver();
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TearDown()
         {
             driver.Quit();

diff --git a/NSeleneExamples/TodoMVC/IntegratedToSeleniumBasedFramework/Before/TodoMVCTests.cs b/NSeleneExamples/TodoMVC/IntegratedToSeleniumBasedFramework/Before/TodoMVCTests.cs
@@ -11,7 +11,7 @@ public class TestTodoMVC
     {
         static IWebDriver driver = new ChromeDriver();
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TearDown()
         {
             driver.Quit();

diff --git a/NSeleneExamples/packages.config b/NSeleneExamples/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
-  <package id="Selenium.Support" version="3.12.0" targetFramework="net45" />
-  <package id="Selenium.WebDriver" version="3.12.0" targetFramework="net45" />
+  <package id="NUnit" version="3.10.1" targetFramework="net45" />
+  <package id="Selenium.Support" version="3.13.1" targetFramework="net45" />
+  <package id="Selenium.WebDriver" version="3.13.1" targetFramework="net45" />
 </packages>
diff --git a/NSeleneTests/NSeleneTests.csproj b/NSeleneTests/NSeleneTests.csproj
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +10,8 @@
     <AssemblyName>NSeleneTests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ReleaseVersion>0.0.0.7</ReleaseVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,16 +32,16 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="WebDriver">
-      <HintPath>..\packages\Selenium.WebDriver.3.12.0\lib\net45\WebDriver.dll</HintPath>
+    <Reference Include="WebDriver, Version=3.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.WebDriver.3.13.1\lib\net45\WebDriver.dll</HintPath>
     </Reference>
-    <Reference Include="WebDriver.Support">
-      <HintPath>..\packages\Selenium.Support.3.12.0\lib\net45\WebDriver.Support.dll</HintPath>
+    <Reference Include="WebDriver.Support, Version=3.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.Support.3.13.1\lib\net45\WebDriver.Support.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -60,9 +63,6 @@
     <Compile Include="SeleniumInteroperability\NSeleneBehaviorForIWebElementAndWebElementsCollectionTests.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NSelene\NSelene.csproj">
       <Project>{C9C40CB0-17E2-4264-B216-1202A97BE857}</Project>
@@ -73,6 +73,12 @@
     <Content Include="Resources\empty.html" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="SeleniumInteroperability\" />
+    <None Include="packages.config" />
   </ItemGroup>
-</Project>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
+  </Target>
+</Project>
diff --git a/NSeleneTests/packages.config b/NSeleneTests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.4.1" targetFramework="net45" />
-  <package id="Selenium.Support" version="3.12.0" targetFramework="net45" />
-  <package id="Selenium.WebDriver" version="3.12.0" targetFramework="net45" />
+  <package id="NUnit" version="3.10.1" targetFramework="net45" />
+  <package id="Selenium.Support" version="3.13.1" targetFramework="net45" />
+  <package id="Selenium.WebDriver" version="3.13.1" targetFramework="net45" />
 </packages>