Skip to content

Commit e2e3ea4

Browse files
jimevansjimevans
committed
Updating .NET projects to use Visual Studio 2017
Also updating to more recent Json.NET and StyleCop analyzers.
1 parent fa7d32f commit e2e3ea4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+42256
-9672
lines changed

‎dotnet/WebDriver.NET.sln

Lines changed: 72 additions & 104 deletions
Large diffs are not rendered by default.

‎dotnet/src/support/WebDriver.Support.csproj

Lines changed: 28 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,23 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.30729</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{A9779443-E254-47E9-B733-8AC6D3662CA6}</ProjectGuid>
7+
<ProjectGuid>{3568C959-D714-46C7-B2FE-97BA9482E1E0}</ProjectGuid>
98
<OutputType>Library</OutputType>
109
<AppDesignerFolder>Properties</AppDesignerFolder>
1110
<RootNamespace>OpenQA.Selenium.Support</RootNamespace>
1211
<AssemblyName>WebDriver.Support</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1413
<FileAlignment>512</FileAlignment>
15-
<FileUpgradeFlags>
16-
</FileUpgradeFlags>
17-
<OldToolsVersion>3.5</OldToolsVersion>
18-
<UpgradeBackupLocation />
19-
<PublishUrl>publish\</PublishUrl>
20-
<Install>true</Install>
21-
<InstallFrom>Disk</InstallFrom>
22-
<UpdateEnabled>false</UpdateEnabled>
23-
<UpdateMode>Foreground</UpdateMode>
24-
<UpdateInterval>7</UpdateInterval>
25-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
26-
<UpdatePeriodically>false</UpdatePeriodically>
27-
<UpdateRequired>false</UpdateRequired>
28-
<MapFileExtensions>true</MapFileExtensions>
29-
<ApplicationRevision>0</ApplicationRevision>
30-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
31-
<IsWebBootstrapper>false</IsWebBootstrapper>
32-
<UseApplicationTrust>false</UseApplicationTrust>
33-
<BootstrapperEnabled>true</BootstrapperEnabled>
34-
<TargetFrameworkProfile />
3514
</PropertyGroup>
3615
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3716
<DebugSymbols>true</DebugSymbols>
3817
<DebugType>full</DebugType>
3918
<Optimize>false</Optimize>
4019
<OutputPath>..\..\..\build\cli\Debug\</OutputPath>
41-
<DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
20+
<DefineConstants>DEBUG;TRACE</DefineConstants>
4221
<ErrorReport>prompt</ErrorReport>
4322
<WarningLevel>4</WarningLevel>
4423
<DocumentationFile>..\..\..\build\cli\Debug\WebDriver.Support.xml</DocumentationFile>
@@ -54,20 +33,17 @@
5433
<DocumentationFile>..\..\..\build\cli\Release\WebDriver.Support.xml</DocumentationFile>
5534
<CodeAnalysisRuleSet>WebDriver.Support.ruleset</CodeAnalysisRuleSet>
5635
</PropertyGroup>
57-
<PropertyGroup>
58-
<SignAssembly>false</SignAssembly>
59-
</PropertyGroup>
60-
<PropertyGroup>
61-
<AssemblyOriginatorKeyFile>..\..\..\WebDriver.snk</AssemblyOriginatorKeyFile>
62-
</PropertyGroup>
63-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
64-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
65-
Other similar extension points exist, see Microsoft.Common.targets.
66-
<Target Name="BeforeBuild">
67-
</Target>
68-
<Target Name="AfterBuild">
69-
</Target>
70-
-->
36+
<ItemGroup>
37+
<Reference Include="System" />
38+
<Reference Include="System.Core" />
39+
<Reference Include="System.Drawing" />
40+
<Reference Include="System.Xml.Linq" />
41+
<Reference Include="System.Data.DataSetExtensions" />
42+
<Reference Include="Microsoft.CSharp" />
43+
<Reference Include="System.Data" />
44+
<Reference Include="System.Net.Http" />
45+
<Reference Include="System.Xml" />
46+
</ItemGroup>
7147
<ItemGroup>
7248
<Compile Include="Events\EventFiringWebDriver.cs" />
7349
<Compile Include="Events\FindElementEventArgs.cs" />
@@ -80,80 +56,45 @@
8056
<Compile Include="PageObjects\ByAll.cs" />
8157
<Compile Include="PageObjects\ByChained.cs" />
8258
<Compile Include="PageObjects\ByFactory.cs" />
83-
<Compile Include="PageObjects\CacheLookupAttribute.cs" />
8459
<Compile Include="PageObjects\ByIdOrName.cs" />
85-
<Compile Include="PageObjects\FindsByAllAttribute.cs" />
86-
<Compile Include="PageObjects\RetryingElementLocator.cs" />
60+
<Compile Include="PageObjects\CacheLookupAttribute.cs" />
8761
<Compile Include="PageObjects\DefaultElementLocator.cs" />
8862
<Compile Include="PageObjects\DefaultPageObjectMemberDecorator.cs" />
89-
<Compile Include="PageObjects\IElementLocator.cs" />
90-
<Compile Include="PageObjects\IPageObjectMemberDecorator.cs" />
63+
<Compile Include="PageObjects\FindsByAllAttribute.cs" />
9164
<Compile Include="PageObjects\FindsByAttribute.cs" />
9265
<Compile Include="PageObjects\FindsBySequenceAttribute.cs" />
9366
<Compile Include="PageObjects\How.cs" />
67+
<Compile Include="PageObjects\IElementLocator.cs" />
68+
<Compile Include="PageObjects\IPageObjectMemberDecorator.cs" />
9469
<Compile Include="PageObjects\PageFactory.cs" />
70+
<Compile Include="PageObjects\RetryingElementLocator.cs" />
9571
<Compile Include="PageObjects\WebDriverObjectProxy.cs" />
9672
<Compile Include="PageObjects\WebElementListProxy.cs" />
9773
<Compile Include="PageObjects\WebElementProxy.cs" />
9874
<Compile Include="Properties\AssemblyInfo.cs" />
9975
<Compile Include="UI\DefaultWait{T}.cs" />
100-
<Compile Include="UI\ExpectedConditions.cs">
101-
<SubType>Code</SubType>
102-
</Compile>
76+
<Compile Include="UI\ExpectedConditions.cs" />
10377
<Compile Include="UI\IClock.cs" />
10478
<Compile Include="UI\ILoadableComponent.cs" />
10579
<Compile Include="UI\IWait{T}.cs" />
106-
<Compile Include="UI\LoadableComponent{T}.cs" />
10780
<Compile Include="UI\LoadableComponentException.cs" />
81+
<Compile Include="UI\LoadableComponent{T}.cs" />
10882
<Compile Include="UI\PopupWindowFinder.cs" />
10983
<Compile Include="UI\SelectElement.cs" />
11084
<Compile Include="UI\SlowLoadableComponent{T}.cs" />
11185
<Compile Include="UI\SystemClock.cs" />
11286
<Compile Include="UI\UnexpectedTagNameException.cs" />
11387
<Compile Include="UI\WebDriverWait.cs" />
11488
</ItemGroup>
115-
<PropertyGroup>
116-
<PostBuildEvent>
117-
</PostBuildEvent>
118-
</PropertyGroup>
11989
<ItemGroup>
120-
<Reference Include="System" />
121-
<Reference Include="System.Core">
122-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
123-
</Reference>
124-
<Reference Include="System.Data" />
125-
<Reference Include="System.Drawing" />
126-
<Reference Include="System.Xml" />
90+
<Analyzer Include="..\..\..\third_party\dotnet\stylecop\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
91+
<Analyzer Include="..\..\..\third_party\dotnet\stylecop\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
12792
</ItemGroup>
12893
<ItemGroup>
129-
<ProjectReference Include="..\WebDriver\WebDriver.csproj">
130-
<Project>{83C13931-B27C-425C-AAF0-5F96EEA4F173}</Project>
94+
<ProjectReference Include="..\webdriver\WebDriver.csproj">
95+
<Project>{ea31f748-5e32-476d-ab6d-fea245b4af1e}</Project>
13196
<Name>WebDriver</Name>
13297
</ProjectReference>
13398
</ItemGroup>
134-
<ItemGroup>
135-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
136-
<Visible>False</Visible>
137-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
138-
<Install>false</Install>
139-
</BootstrapperPackage>
140-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
141-
<Visible>False</Visible>
142-
<ProductName>.NET Framework 3.5 SP1</ProductName>
143-
<Install>true</Install>
144-
</BootstrapperPackage>
145-
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
146-
<Visible>False</Visible>
147-
<ProductName>Windows Installer 3.1</ProductName>
148-
<Install>true</Install>
149-
</BootstrapperPackage>
150-
</ItemGroup>
151-
<ItemGroup>
152-
<None Include="WebDriver.Support.ruleset" />
153-
</ItemGroup>
154-
<ItemGroup>
155-
<Analyzer Include="..\..\..\third_party\dotnet\stylecop\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
156-
<Analyzer Include="..\..\..\third_party\dotnet\stylecop\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
157-
<Analyzer Include="..\..\..\third_party\dotnet\stylecop\StyleCop.Analyzers.1.0.0-rc3\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
158-
</ItemGroup>
99+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
159100
</Project>

0 commit comments

Comments
 (0)