Skip to content

Commit fb08a71

Browse files
renklapperrenklapper
authored
Merge pull request #4 from renklapper/feature/upgrade_sample_movies_project
Upgrade sample movies project
2 parents 9cd7d80 + 36c4ca9 commit fb08a71

103 files changed

Lines changed: 46316 additions & 32082 deletions

File tree

Some content is hidden

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

‎src/Samples/Movies/TestStack.Seleno.Samples.Movies.FunctionalTests/TestStack.Seleno.Samples.Movies.FunctionalTests.csproj‎

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\..\..\packages\NUnit.3.11.0\build\NUnit.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,9 +11,12 @@
1011
<AppDesignerFolder>Properties</AppDesignerFolder>
1112
<RootNamespace>TestStack.Seleno.Samples.Movies.FunctionalTests</RootNamespace>
1213
<AssemblyName>TestStack.Seleno.Samples.Movies.FunctionalTests</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14+
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
1415
<FileAlignment>512</FileAlignment>
1516
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
17+
<TargetFrameworkProfile />
18+
<NuGetPackageImportStamp>
19+
</NuGetPackageImportStamp>
1620
</PropertyGroup>
1721
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1822
<DebugSymbols>true</DebugSymbols>
@@ -22,6 +26,7 @@
2226
<DefineConstants>DEBUG;TRACE</DefineConstants>
2327
<ErrorReport>prompt</ErrorReport>
2428
<WarningLevel>4</WarningLevel>
29+
<Prefer32Bit>false</Prefer32Bit>
2530
</PropertyGroup>
2631
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2732
<DebugType>pdbonly</DebugType>
@@ -30,71 +35,58 @@
3035
<DefineConstants>TRACE</DefineConstants>
3136
<ErrorReport>prompt</ErrorReport>
3237
<WarningLevel>4</WarningLevel>
38+
<Prefer32Bit>false</Prefer32Bit>
3339
</PropertyGroup>
3440
<ItemGroup>
35-
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
36-
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\..\..\packages\Castle.Core.3.3.3\lib\net40-client\Castle.Core.dll</HintPath>
41+
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
42+
<HintPath>..\..\..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
3843
</Reference>
39-
<Reference Include="FluentAssertions, Version=3.3.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.dll</HintPath>
42-
</Reference>
43-
<Reference Include="FluentAssertions.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
44-
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.Core.dll</HintPath>
44+
<Reference Include="FluentAssertions, Version=5.6.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
45+
<HintPath>..\..\..\packages\FluentAssertions.5.6.0\lib\net47\FluentAssertions.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4848
<Private>True</Private>
4949
<HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
5050
</Reference>
51-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
52-
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
51+
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
52+
<HintPath>..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
5453
</Reference>
5554
<Reference Include="System" />
55+
<Reference Include="System.Configuration" />
5656
<Reference Include="System.Core" />
5757
<Reference Include="System.Drawing" />
58-
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<SpecificVersion>False</SpecificVersion>
60-
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
58+
<Reference Include="System.Runtime.Serialization" />
59+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
6161
</Reference>
62-
<Reference Include="System.Web.Mvc, Version=3.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<SpecificVersion>False</SpecificVersion>
64-
<HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.3.0.50813.1\lib\net40\System.Web.Mvc.dll</HintPath>
62+
<Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
6564
</Reference>
66-
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
65+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66+
<HintPath>..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
6967
</Reference>
70-
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
68+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69+
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
7370
</Reference>
74-
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
71+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
7773
</Reference>
78-
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
74+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
8176
</Reference>
8277
<Reference Include="System.Xml.Linq" />
8378
<Reference Include="System.Data.DataSetExtensions" />
8479
<Reference Include="Microsoft.CSharp" />
8580
<Reference Include="System.Data" />
8681
<Reference Include="System.Xml" />
87-
<Reference Include="TestStack.BDDfy, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
88-
<HintPath>..\..\..\packages\TestStack.BDDfy.4.2.0\lib\net40\TestStack.BDDfy.dll</HintPath>
89-
<Private>True</Private>
82+
<Reference Include="TestStack.BDDfy, Version=4.3.2.0, Culture=neutral, processorArchitecture=MSIL">
83+
<HintPath>..\..\..\packages\TestStack.BDDfy.4.3.2\lib\net40\TestStack.BDDfy.dll</HintPath>
9084
</Reference>
91-
<Reference Include="WebDriver, Version=2.53.0.0, Culture=neutral, processorArchitecture=MSIL">
92-
<HintPath>..\..\..\packages\Selenium.WebDriver.2.53.0\lib\net40\WebDriver.dll</HintPath>
93-
<Private>True</Private>
85+
<Reference Include="WebDriver, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
86+
<HintPath>..\..\..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll</HintPath>
9487
</Reference>
95-
<Reference Include="WebDriver.Support, Version=2.53.0.0, Culture=neutral, processorArchitecture=MSIL">
96-
<HintPath>..\..\..\packages\Selenium.Support.2.53.0\lib\net40\WebDriver.Support.dll</HintPath>
97-
<Private>True</Private>
88+
<Reference Include="WebDriver.Support, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
89+
<HintPath>..\..\..\packages\Selenium.Support.3.141.0\lib\net45\WebDriver.Support.dll</HintPath>
9890
</Reference>
9991
</ItemGroup>
10092
<ItemGroup>
@@ -132,6 +124,12 @@
132124
</ProjectReference>
133125
</ItemGroup>
134126
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
127+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
128+
<PropertyGroup>
129+
<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>
130+
</PropertyGroup>
131+
<Error Condition="!Exists('..\..\..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\NUnit.3.11.0\build\NUnit.props'))" />
132+
</Target>
135133
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
136134
Other similar extension points exist, see Microsoft.Common.targets.
137135
<Target Name="BeforeBuild">

‎src/Samples/Movies/TestStack.Seleno.Samples.Movies.FunctionalTests/app.config‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.1" newVersion="3.0.0.1" />
11+
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
1216
</dependentAssembly>
1317
</assemblyBinding>
1418
</runtime>
15-
</configuration>
19+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup></configuration>

‎src/Samples/Movies/TestStack.Seleno.Samples.Movies.FunctionalTests/packages.config‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="3.3.3" targetFramework="net40" />
4-
<package id="FluentAssertions" version="3.3.0" targetFramework="net40" />
5-
<package id="Microsoft.AspNet.Mvc" version="3.0.50813.1" targetFramework="net40" />
6-
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net40" />
7-
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" />
3+
<package id="Castle.Core" version="4.3.1" targetFramework="net471" />
4+
<package id="FluentAssertions" version="5.6.0" targetFramework="net471" />
5+
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net471" />
6+
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net471" />
7+
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net471" />
88
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
9-
<package id="NUnit" version="2.6.4" targetFramework="net40" />
10-
<package id="Selenium.Support" version="2.53.0" targetFramework="net40" />
11-
<package id="Selenium.WebDriver" version="2.53.0" targetFramework="net40" />
12-
<package id="TestStack.BDDfy" version="4.2.0" targetFramework="net40" />
9+
<package id="NUnit" version="3.11.0" targetFramework="net471" />
10+
<package id="Selenium.Support" version="3.141.0" targetFramework="net471" />
11+
<package id="Selenium.WebDriver" version="3.141.0" targetFramework="net471" />
12+
<package id="TestStack.BDDfy" version="4.3.2" targetFramework="net471" />
1313
</packages>

‎src/Samples/Movies/TestStack.Seleno.Samples.Movies/Bootstrap/AutoMapperBootstrapper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static class AutoMapperBootstrapper
99
{
1010
public static void Configure()
1111
{
12-
Mapper.CreateMap<Movie, MovieListViewModel>();
12+
Mapper.Initialize(cfg => { cfg.CreateMap<Movie, MovieListViewModel>(); });
1313
Mapper.AssertConfigurationIsValid();
1414
}
1515
}

0 commit comments

Comments
 (0)