Skip to content

Commit 686cae0

Browse files
author
Rik Crompton
committed
Updated project to .Net 4.7 in preparation for FluentAssertions v6
1 parent 0034f90 commit 686cae0

39 files changed

+684
-1311
lines changed

Diff for: ‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,8 @@ TestResult.xml
1818
[Pp]ackages/
1919
*.nupkg
2020
/.vs
21+
22+
# ReSharper is a .NET coding add-in
23+
_ReSharper*/
24+
*.[Rr]e[Ss]harper
25+
*.DotSettings.user

Diff for: ‎FluentAssertionsMvc.sln

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2027
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31729.503
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4E91D524-3DC0-4E08-82FE-6FDAEB89212B}"
77
EndProject
@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuspecs", "nuspecs", "{48A7
1414
EndProject
1515
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0C48468D-7CDA-45C7-8B21-0669A567711B}"
1616
ProjectSection(SolutionItems) = preProject
17+
.gitignore = .gitignore
1718
_todo_.txt = _todo_.txt
1819
appveyor.yml = appveyor.yml
1920
Contributors.txt = Contributors.txt

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.accordion.css

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI Accordion 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Accordion#theming
149
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.all.css

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI CSS Framework 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Theming
149
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.autocomplete.css

+5-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI Autocomplete 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
7+
*
128
* http://docs.jquery.com/UI/Autocomplete#theming
139
*/
1410
.ui-autocomplete { position: absolute; cursor: default; }
@@ -17,16 +13,11 @@
1713
* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
1814

1915
/*
20-
* Note: While Microsoft is not the author of this file, Microsoft is
21-
* offering you a license subject to the terms of the Microsoft Software
22-
* License Terms for Microsoft ASP.NET Model View Controller 3.
23-
* Microsoft reserves all other rights. The notices below are provided
24-
* for informational purposes only and are not the license terms under
25-
* which Microsoft distributed this file.
26-
*
2716
* jQuery UI Menu 1.8.11
2817
*
2918
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
19+
* Dual licensed under the MIT or GPL Version 2 licenses.
20+
* http://jquery.org/license
3021
*
3122
* http://docs.jquery.com/UI/Menu#theming
3223
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.button.css

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI Button 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Button#theming
149
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.core.css

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI CSS Framework 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Theming/API
149
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.datepicker.css

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI Datepicker 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Datepicker#theming
149
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.dialog.css

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI Dialog 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Dialog#theming
149
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.progressbar.css

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI Progressbar 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Progressbar#theming
149
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.resizable.css

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI Resizable 1.8.11
103
*
11-
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)]
4+
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Resizable#theming
149
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.selectable.css

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI Selectable 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Selectable#theming
149
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.slider.css

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI Slider 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Slider#theming
149
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.tabs.css

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI Tabs 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Tabs#theming
149
*/

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Content/themes/base/jquery.ui.theme.css

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
/*
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
92
* jQuery UI CSS Framework 1.8.11
103
*
114
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5+
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* http://jquery.org/license
127
*
138
* http://docs.jquery.com/UI/Theming/API
149
*

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/FluentAssertions.Mvc3.Samples.csproj

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>FluentAssertions.Mvc3.Samples</RootNamespace>
1515
<AssemblyName>FluentAssertions.Mvc3.Samples</AssemblyName>
16-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<UseIISExpress>false</UseIISExpress>
1919
<FileUpgradeFlags>
@@ -184,17 +184,15 @@
184184
<ItemGroup>
185185
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
186186
</ItemGroup>
187-
<ItemGroup>
188-
<Content Include="packages.config">
189-
<SubType>Designer</SubType>
190-
</Content>
191-
</ItemGroup>
192187
<ItemGroup>
193188
<ProjectReference Include="..\..\src\FluentAssertions.Mvc3\FluentAssertions.Mvc3.csproj">
194189
<Project>{53589F79-0908-409A-8366-3E18DC637600}</Project>
195190
<Name>FluentAssertions.Mvc3</Name>
196191
</ProjectReference>
197192
</ItemGroup>
193+
<ItemGroup>
194+
<None Include="packages.config" />
195+
</ItemGroup>
198196
<PropertyGroup>
199197
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
200198
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Scripts/jquery-1.5.1.js

+15-24
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
/*!
2-
* Note: While Microsoft is not the author of this file, Microsoft is
3-
* offering you a license subject to the terms of the Microsoft Software
4-
* License Terms for Microsoft ASP.NET Model View Controller 3.
5-
* Microsoft reserves all other rights. The notices below are provided
6-
* for informational purposes only and are not the license terms under
7-
* which Microsoft distributed this file.
8-
*
9-
* jQuery JavaScript Library v1.5.1
10-
* http://jquery.com/
11-
* Copyright 2011, John Resig
12-
*
13-
* Includes Sizzle.js
14-
* http://sizzlejs.com/
15-
* Copyright 2011, The Dojo Foundation
16-
*
17-
* Date: Thu Nov 11 19:04:53 2010 -0500
18-
*/
2+
* jQuery JavaScript Library v1.5.1
3+
* http://jquery.com/
4+
*
5+
* Copyright 2011, John Resig
6+
* Dual licensed under the MIT or GPL Version 2 licenses.
7+
* http://jquery.org/license
8+
*
9+
* Includes Sizzle.js
10+
* http://sizzlejs.com/
11+
* Copyright 2011, The Dojo Foundation
12+
* Released under the MIT, BSD, and GPL Licenses.
13+
*
14+
* Date: Wed Feb 23 13:55:29 2011 -0500
15+
*/
1916
(function( window, undefined ) {
2017

2118
// Use the correct document accordingly with window argument (sandbox)
@@ -3298,15 +3295,9 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
32983295

32993296

33003297
/*!
3301-
* Note: While Microsoft is not the author of this file, Microsoft is
3302-
* offering you a license subject to the terms of the Microsoft Software
3303-
* License Terms for Microsoft ASP.NET Model View Controller 3.
3304-
* Microsoft reserves all other rights. The notices below are provided
3305-
* for informational purposes only and are not the license terms under
3306-
* which Microsoft distributed this file.
3307-
*
33083298
* Sizzle CSS Selector Engine
33093299
* Copyright 2011, The Dojo Foundation
3300+
* Released under the MIT, BSD, and GPL Licenses.
33103301
* More information: http://sizzlejs.com/
33113302
*/
33123303
(function(){

Diff for: ‎samples/FluentAssertions.Mvc3.Samples/Scripts/jquery-1.5.1.min.js

+14-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)