Updating .NET projects to use Visual Studio 2017

Also updating to more recent Json.NET and StyleCop analyzers.
craigfowler · Aug 15, 2017 · e2e3ea4 · e2e3ea4
1 parent fa7d32f
commit e2e3ea4
Show file tree

Hide file tree

Showing 44 changed files with 42,256 additions and 9,672 deletions.
diff --git a/dotnet/WebDriver.NET.sln b/dotnet/WebDriver.NET.sln
diff --git a/dotnet/src/support/WebDriver.Support.csproj b/dotnet/src/support/WebDriver.Support.csproj
@@ -1,44 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A9779443-E254-47E9-B733-8AC6D3662CA6}</ProjectGuid>
+    <ProjectGuid>{3568C959-D714-46C7-B2FE-97BA9482E1E0}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OpenQA.Selenium.Support</RootNamespace>
     <AssemblyName>WebDriver.Support</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\build\cli\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\..\..\build\cli\Debug\WebDriver.Support.xml</DocumentationFile>
@@ -54,20 +33,17 @@
     <DocumentationFile>..\..\..\build\cli\Release\WebDriver.Support.xml</DocumentationFile>
     <CodeAnalysisRuleSet>WebDriver.Support.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\..\WebDriver.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Events\EventFiringWebDriver.cs" />
     <Compile Include="Events\FindElementEventArgs.cs" />
@@ -80,80 +56,45 @@
     <Compile Include="PageObjects\ByAll.cs" />
     <Compile Include="PageObjects\ByChained.cs" />
     <Compile Include="PageObjects\ByFactory.cs" />
-    <Compile Include="PageObjects\CacheLookupAttribute.cs" />
     <Compile Include="PageObjects\ByIdOrName.cs" />
-    <Compile Include="PageObjects\FindsByAllAttribute.cs" />
-    <Compile Include="PageObjects\RetryingElementLocator.cs" />
+    <Compile Include="PageObjects\CacheLookupAttribute.cs" />
     <Compile Include="PageObjects\DefaultElementLocator.cs" />
     <Compile Include="PageObjects\DefaultPageObjectMemberDecorator.cs" />
-    <Compile Include="PageObjects\IElementLocator.cs" />
-    <Compile Include="PageObjects\IPageObjectMemberDecorator.cs" />
+    <Compile Include="PageObjects\FindsByAllAttribute.cs" />
     <Compile Include="PageObjects\FindsByAttribute.cs" />
     <Compile Include="PageObjects\FindsBySequenceAttribute.cs" />
     <Compile Include="PageObjects\How.cs" />
+    <Compile Include="PageObjects\IElementLocator.cs" />
+    <Compile Include="PageObjects\IPageObjectMemberDecorator.cs" />
     <Compile Include="PageObjects\PageFactory.cs" />
+    <Compile Include="PageObjects\RetryingElementLocator.cs" />
     <Compile Include="PageObjects\WebDriverObjectProxy.cs" />
     <Compile Include="PageObjects\WebElementListProxy.cs" />
     <Compile Include="PageObjects\WebElementProxy.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UI\DefaultWait{T}.cs" />
-    <Compile Include="UI\ExpectedConditions.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="UI\ExpectedConditions.cs" />
     <Compile Include="UI\IClock.cs" />
     <Compile Include="UI\ILoadableComponent.cs" />
     <Compile Include="UI\IWait{T}.cs" />
-    <Compile Include="UI\LoadableComponent{T}.cs" />
     <Compile Include="UI\LoadableComponentException.cs" />
+    <Compile Include="UI\LoadableComponent{T}.cs" />
     <Compile Include="UI\PopupWindowFinder.cs" />
     <Compile Include="UI\SelectElement.cs" />
     <Compile Include="UI\SlowLoadableComponent{T}.cs" />
     <Compile Include="UI\SystemClock.cs" />
     <Compile Include="UI\UnexpectedTagNameException.cs" />
     <Compile Include="UI\WebDriverWait.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
+    <Analyzer Include="..\..\..\third_party\dotnet\stylecop\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\..\third_party\dotnet\stylecop\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\WebDriver\WebDriver.csproj">
-      <Project>{83C13931-B27C-425C-AAF0-5F96EEA4F173}</Project>
+    <ProjectReference Include="..\webdriver\WebDriver.csproj">
+      <Project>{ea31f748-5e32-476d-ab6d-fea245b4af1e}</Project>
       <Name>WebDriver</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="WebDriver.Support.ruleset" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\..\third_party\dotnet\stylecop\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\..\..\third_party\dotnet\stylecop\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\..\third_party\dotnet\stylecop\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
-  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>