Skip to content

Commit 73907f3

Browse files
kevinkuszykkevinkuszyk
committed
Merge branch 'Mvc4'
2 parents 249642f + 6079a89 commit 73907f3

Some content is hidden

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

47 files changed

+358
-62
lines changed

‎FluentAssertionsMvc.sln‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio 2010
44
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc3", "src\FluentAssertions.Mvc3\FluentAssertions.Mvc3.csproj", "{53589F79-0908-409A-8366-3E18DC637600}"
55
EndProject
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc3.Tests", "tests\FluentAssertions.Mvc3.Tests\FluentAssertions.Mvc3.Tests.csproj", "{3CB00FF9-3DC2-460F-82E8-EBFB6339247D}"
@@ -9,6 +9,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "tests\test\test.csp
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc3.Samples", "samples\FluentAssertions.Mvc3.Samples\FluentAssertions.Mvc3.Samples.csproj", "{95B0CEBD-D9B8-4C41-A918-B13317A9AC16}"
1111
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc4", "src\FluentAssertions.Mvc4\FluentAssertions.Mvc4.csproj", "{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc4.Tests", "tests\FluentAssertions.Mvc4.Tests\FluentAssertions.Mvc4.Tests.csproj", "{B9F72C07-90A8-4A15-815B-7618530CA889}"
15+
EndProject
16+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc3", "Mvc3", "{4E91D524-3DC0-4E08-82FE-6FDAEB89212B}"
17+
EndProject
18+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc4", "Mvc4", "{34E084BA-3DFA-4042-9B30-5C14831901B4}"
19+
EndProject
1220
Global
1321
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1422
Debug|Any CPU = Debug|Any CPU
@@ -56,8 +64,35 @@ Global
5664
{95B0CEBD-D9B8-4C41-A918-B13317A9AC16}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
5765
{95B0CEBD-D9B8-4C41-A918-B13317A9AC16}.Release|Mixed Platforms.Build.0 = Release|Any CPU
5866
{95B0CEBD-D9B8-4C41-A918-B13317A9AC16}.Release|x86.ActiveCfg = Release|Any CPU
67+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
69+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
70+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
71+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}.Debug|x86.ActiveCfg = Debug|Any CPU
72+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
75+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
76+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}.Release|x86.ActiveCfg = Release|Any CPU
77+
{B9F72C07-90A8-4A15-815B-7618530CA889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78+
{B9F72C07-90A8-4A15-815B-7618530CA889}.Debug|Any CPU.Build.0 = Debug|Any CPU
79+
{B9F72C07-90A8-4A15-815B-7618530CA889}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
80+
{B9F72C07-90A8-4A15-815B-7618530CA889}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
81+
{B9F72C07-90A8-4A15-815B-7618530CA889}.Debug|x86.ActiveCfg = Debug|Any CPU
82+
{B9F72C07-90A8-4A15-815B-7618530CA889}.Release|Any CPU.ActiveCfg = Release|Any CPU
83+
{B9F72C07-90A8-4A15-815B-7618530CA889}.Release|Any CPU.Build.0 = Release|Any CPU
84+
{B9F72C07-90A8-4A15-815B-7618530CA889}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
85+
{B9F72C07-90A8-4A15-815B-7618530CA889}.Release|Mixed Platforms.Build.0 = Release|Any CPU
86+
{B9F72C07-90A8-4A15-815B-7618530CA889}.Release|x86.ActiveCfg = Release|Any CPU
5987
EndGlobalSection
6088
GlobalSection(SolutionProperties) = preSolution
6189
HideSolutionNode = FALSE
6290
EndGlobalSection
91+
GlobalSection(NestedProjects) = preSolution
92+
{53589F79-0908-409A-8366-3E18DC637600} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
93+
{3CB00FF9-3DC2-460F-82E8-EBFB6339247D} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
94+
{95B0CEBD-D9B8-4C41-A918-B13317A9AC16} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
95+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD} = {34E084BA-3DFA-4042-9B30-5C14831901B4}
96+
{B9F72C07-90A8-4A15-815B-7618530CA889} = {34E084BA-3DFA-4042-9B30-5C14831901B4}
97+
EndGlobalSection
6398
EndGlobal

‎packages/repositories.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22
<repositories>
33
<repository path="..\samples\FluentAssertions.Mvc3.Samples\packages.config" />
44
<repository path="..\src\FluentAssertions.Mvc3\packages.config" />
5+
<repository path="..\src\FluentAssertions.Mvc4\packages.config" />
56
<repository path="..\tests\FluentAssertions.Mvc3.Tests\packages.config" />
7+
<repository path="..\tests\FluentAssertions.Mvc4.Tests\packages.config" />
68
</repositories>

‎samples/FluentAssertions.Mvc3.Samples/Controllers/ProductController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Web.Mvc;
22

3-
namespace FluentAssertions.Mvc3.Samples.Controllers
3+
namespace FluentAssertions.Mvc.Samples.Controllers
44
{
55
public class ProductController : Controller
66
{

‎samples/FluentAssertions.Mvc3.Samples/Global.asax‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<%@ Application Codebehind="Global.asax.cs" Inherits="FluentAssertions.Mvc3.Samples.MvcApplication" Language="C#" %>
1+
<%@ Application Codebehind="Global.asax.cs" Inherits="FluentAssertions.Mvc.Samples.MvcApplication" Language="C#" %>

‎samples/FluentAssertions.Mvc3.Samples/Global.asax.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Web.Mvc;
66
using System.Web.Routing;
77

8-
namespace FluentAssertions.Mvc3.Samples
8+
namespace FluentAssertions.Mvc.Samples
99
{
1010
// Note: For instructions on enabling IIS6 or IIS7 classic mode,
1111
// visit http://go.microsoft.com/?LinkId=9394801

‎samples/FluentAssertions.Mvc3.Samples/Models/ProductViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
namespace FluentAssertions.Mvc3.Samples.Models
2+
namespace FluentAssertions.Mvc.Samples.Models
33
{
44
public class ProductViewModel
55
{

‎samples/FluentAssertions.Mvc3.Samples/Services/IProductService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
2-
using FluentAssertions.Mvc3.Samples.Models;
2+
using FluentAssertions.Mvc.Samples.Models;
33

4-
namespace FluentAssertions.Mvc3.Samples.Services
4+
namespace FluentAssertions.Mvc.Samples.Services
55
{
66
public interface IProductService
77
{

‎samples/FluentAssertions.Mvc3.Samples/Services/ProductService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
2-
using FluentAssertions.Mvc3.Samples.Models;
2+
using FluentAssertions.Mvc.Samples.Models;
33

4-
namespace FluentAssertions.Mvc3.Samples.Services
4+
namespace FluentAssertions.Mvc.Samples.Services
55
{
66
public class ProductService : IProductService
77
{

‎samples/FluentAssertions.Mvc3.Samples/Tests/ProductController_Tests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using FluentAssertions.Mvc3.Samples.Controllers;
1+
using FluentAssertions.Mvc.Samples.Controllers;
22
using NUnit.Framework;
33

4-
namespace FluentAssertions.Mvc3.Samples.Tests
4+
namespace FluentAssertions.Mvc.Samples.Tests
55
{
66
[TestFixture]
77
public class ProductController_Tests

‎samples/FluentAssertions.Mvc3.Samples/Tests/Route_Tests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Web.Routing;
22
using NUnit.Framework;
33

4-
namespace FluentAssertions.Mvc3.Samples.Tests
4+
namespace FluentAssertions.Mvc.Samples.Tests
55
{
66
[TestFixture]
77
public class Route_Tests

0 commit comments

Comments
 (0)