Skip to content

Commit 5146c77

Browse files
kevinkuszykkevinkuszyk
authored
Merge pull request #31 from kevinkuszyk/aspnet-core-prep
Move shared code into a shared project
2 parents 368a05d + a92b618 commit 5146c77

File tree

46 files changed

+229
-341
lines changed

Some content is hidden

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

46 files changed

+229
-341
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ TestResult.xml
1616
[Tt]est[Rr]esults/
1717
*.gpState
1818
[Pp]ackages/
19-
*.nupkg
19+
*.nupkg
20+
/.vs

‎FluentAssertionsMvc.sln

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.21005.1
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc3", "Mvc3", "{4E91D524-3DC0-4E08-82FE-6FDAEB89212B}"
7-
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc4", "Mvc4", "{34E084BA-3DFA-4042-9B30-5C14831901B4}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4E91D524-3DC0-4E08-82FE-6FDAEB89212B}"
97
EndProject
108
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuspecs", "nuspecs", "{48A7D304-F178-46B0-901E-E060D87B5E07}"
119
ProjectSection(SolutionItems) = preProject
@@ -25,21 +23,35 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc3", "sr
2523
EndProject
2624
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc3.Tests", "tests\FluentAssertions.Mvc3.Tests\FluentAssertions.Mvc3.Tests.csproj", "{3CB00FF9-3DC2-460F-82E8-EBFB6339247D}"
2725
EndProject
28-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "tests\test\test.csproj", "{D29AE253-FEE8-4A54-BFBD-323CAD27F549}"
29-
EndProject
3026
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc3.Samples", "samples\FluentAssertions.Mvc3.Samples\FluentAssertions.Mvc3.Samples.csproj", "{95B0CEBD-D9B8-4C41-A918-B13317A9AC16}"
3127
EndProject
3228
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc4", "src\FluentAssertions.Mvc4\FluentAssertions.Mvc4.csproj", "{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD}"
3329
EndProject
3430
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc4.Tests", "tests\FluentAssertions.Mvc4.Tests\FluentAssertions.Mvc4.Tests.csproj", "{B9F72C07-90A8-4A15-815B-7618530CA889}"
3531
EndProject
36-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc5", "Mvc5", "{466CDF89-8C39-4734-9644-CE16B787EDD1}"
37-
EndProject
3832
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc5", "src\FluentAssertions.Mvc5\FluentAssertions.Mvc5.csproj", "{E5BFF617-46A3-48F7-83AA-BD34376F1AB2}"
3933
EndProject
4034
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.Mvc5.Tests", "tests\FluentAssertions.Mvc5.Tests\FluentAssertions.Mvc5.Tests.csproj", "{650A92FF-8874-41CD-BCDA-BE583F3F2638}"
4135
EndProject
36+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{89B09C65-4F1E-4B5A-AD58-E244113F2C02}"
37+
EndProject
38+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "FluentAssertions.Mvc.Shared", "src\FluentAssertions.Mvc.Shared\FluentAssertions.Mvc.Shared.shproj", "{0E46FC22-EB6A-431E-BFB3-47FBC4FC500F}"
39+
EndProject
40+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "FluentAssertions.Mvc.Tests.Shared", "tests\FluentAssertions.Mvc.Tests.Shared\FluentAssertions.Mvc.Tests.Shared.shproj", "{AEEA0A6D-F5B6-42DB-9AF0-82164ECCA21B}"
41+
EndProject
42+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A4C33565-1E6E-4AE7-8F02-1911DBA00263}"
43+
EndProject
4244
Global
45+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
46+
src\FluentAssertions.Mvc.Shared\FluentAssertions.Mvc.Shared.projitems*{0e46fc22-eb6a-431e-bfb3-47fbc4fc500f}*SharedItemsImports = 13
47+
tests\FluentAssertions.Mvc.Tests.Shared\FluentAssertions.Mvc.Tests.Shared.projitems*{aeea0a6d-f5b6-42db-9af0-82164ecca21b}*SharedItemsImports = 13
48+
tests\FluentAssertions.Mvc.Tests.Shared\FluentAssertions.Mvc.Tests.Shared.projitems*{3cb00ff9-3dc2-460f-82e8-ebfb6339247d}*SharedItemsImports = 4
49+
src\FluentAssertions.Mvc.Shared\FluentAssertions.Mvc.Shared.projitems*{e5bff617-46a3-48f7-83aa-bd34376f1ab2}*SharedItemsImports = 4
50+
tests\FluentAssertions.Mvc.Tests.Shared\FluentAssertions.Mvc.Tests.Shared.projitems*{650a92ff-8874-41cd-bcda-be583f3f2638}*SharedItemsImports = 4
51+
src\FluentAssertions.Mvc.Shared\FluentAssertions.Mvc.Shared.projitems*{b18bfbde-02a0-4db2-afea-e756c177e4ad}*SharedItemsImports = 4
52+
tests\FluentAssertions.Mvc.Tests.Shared\FluentAssertions.Mvc.Tests.Shared.projitems*{b9f72c07-90a8-4a15-815b-7618530ca889}*SharedItemsImports = 4
53+
src\FluentAssertions.Mvc.Shared\FluentAssertions.Mvc.Shared.projitems*{53589f79-0908-409a-8366-3e18dc637600}*SharedItemsImports = 4
54+
EndGlobalSection
4355
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4456
Debug|Any CPU = Debug|Any CPU
4557
Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -67,15 +79,6 @@ Global
6779
{3CB00FF9-3DC2-460F-82E8-EBFB6339247D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
6880
{3CB00FF9-3DC2-460F-82E8-EBFB6339247D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
6981
{3CB00FF9-3DC2-460F-82E8-EBFB6339247D}.Release|x86.ActiveCfg = Release|Any CPU
70-
{D29AE253-FEE8-4A54-BFBD-323CAD27F549}.Debug|Any CPU.ActiveCfg = Debug|x86
71-
{D29AE253-FEE8-4A54-BFBD-323CAD27F549}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
72-
{D29AE253-FEE8-4A54-BFBD-323CAD27F549}.Debug|Mixed Platforms.Build.0 = Debug|x86
73-
{D29AE253-FEE8-4A54-BFBD-323CAD27F549}.Debug|x86.ActiveCfg = Debug|x86
74-
{D29AE253-FEE8-4A54-BFBD-323CAD27F549}.Debug|x86.Build.0 = Debug|x86
75-
{D29AE253-FEE8-4A54-BFBD-323CAD27F549}.Release|Any CPU.ActiveCfg = Release|x86
76-
{D29AE253-FEE8-4A54-BFBD-323CAD27F549}.Release|Mixed Platforms.ActiveCfg = Release|x86
77-
{D29AE253-FEE8-4A54-BFBD-323CAD27F549}.Release|x86.ActiveCfg = Release|x86
78-
{D29AE253-FEE8-4A54-BFBD-323CAD27F549}.Release|x86.Build.0 = Release|x86
7982
{95B0CEBD-D9B8-4C41-A918-B13317A9AC16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8083
{95B0CEBD-D9B8-4C41-A918-B13317A9AC16}.Debug|Any CPU.Build.0 = Debug|Any CPU
8184
{95B0CEBD-D9B8-4C41-A918-B13317A9AC16}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -131,12 +134,14 @@ Global
131134
HideSolutionNode = FALSE
132135
EndGlobalSection
133136
GlobalSection(NestedProjects) = preSolution
134-
{53589F79-0908-409A-8366-3E18DC637600} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
135-
{3CB00FF9-3DC2-460F-82E8-EBFB6339247D} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
137+
{53589F79-0908-409A-8366-3E18DC637600} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
138+
{3CB00FF9-3DC2-460F-82E8-EBFB6339247D} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
136139
{95B0CEBD-D9B8-4C41-A918-B13317A9AC16} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
137-
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD} = {34E084BA-3DFA-4042-9B30-5C14831901B4}
138-
{B9F72C07-90A8-4A15-815B-7618530CA889} = {34E084BA-3DFA-4042-9B30-5C14831901B4}
139-
{E5BFF617-46A3-48F7-83AA-BD34376F1AB2} = {466CDF89-8C39-4734-9644-CE16B787EDD1}
140-
{650A92FF-8874-41CD-BCDA-BE583F3F2638} = {466CDF89-8C39-4734-9644-CE16B787EDD1}
140+
{B18BFBDE-02A0-4DB2-AFEA-E756C177E4AD} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
141+
{B9F72C07-90A8-4A15-815B-7618530CA889} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
142+
{E5BFF617-46A3-48F7-83AA-BD34376F1AB2} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
143+
{650A92FF-8874-41CD-BCDA-BE583F3F2638} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
144+
{0E46FC22-EB6A-431E-BFB3-47FBC4FC500F} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
145+
{AEEA0A6D-F5B6-42DB-9AF0-82164ECCA21B} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
141146
EndGlobalSection
142147
EndGlobal

‎samples/FluentAssertions.Mvc3.Samples/FluentAssertions.Mvc3.Samples.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<IISExpressUseClassicPipelineMode />
3030
<MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
3131
<TargetFrameworkProfile />
32+
<UseGlobalApplicationHostFile />
3233
</PropertyGroup>
3334
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3435
<DebugSymbols>true</DebugSymbols>
@@ -65,9 +66,9 @@
6566
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
6667
<Private>True</Private>
6768
</Reference>
68-
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
69-
<SpecificVersion>False</SpecificVersion>
70-
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
69+
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
70+
<HintPath>..\..\packages\NUnit.3.2.1\lib\net40\nunit.framework.dll</HintPath>
71+
<Private>True</Private>
7172
</Reference>
7273
<Reference Include="System.Data.DataSetExtensions" />
7374
<Reference Include="System.Data.Entity" />

‎samples/FluentAssertions.Mvc3.Samples/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" allowedVersions="(,2)" />
1212
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
1313
<package id="Modernizr" version="1.7" />
14-
<package id="NUnit" version="2.6.3" targetFramework="net40" />
14+
<package id="NUnit" version="3.2.1" targetFramework="net40" />
1515
</packages>

‎src/FluentAssertions.Mvc3/ActionResultAssertions.cs renamed to ‎src/FluentAssertions.Mvc.Shared/ActionResultAssertions.cs

File renamed without changes.

‎src/FluentAssertions.Mvc3/AssertionsExtensions.cs renamed to ‎src/FluentAssertions.Mvc.Shared/AssertionsExtensions.cs

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
using FluentAssertions;
2-
using System;
3-
using System.Web.Mvc;
4-
using FluentAssertions.Mvc;
5-
using System.Web.Routing;
6-
using System.Diagnostics;
7-
8-
namespace FluentAssertions.Mvc
9-
{
10-
/// <summary>
11-
/// Contains extension methods for custom assertions in unit tests.
12-
/// </summary>
13-
[DebuggerNonUserCode]
14-
public static class AssertionsExtensions
15-
{
16-
/// <summary>
17-
/// Returns an <see cref="ActionResultAssertions"/> object that can be used to assert the
18-
/// current <see cref="ActionResult"/>.
19-
/// </summary>
20-
public static ActionResultAssertions Should (this ActionResult actual)
21-
{
22-
return new ActionResultAssertions (actual);
23-
}
24-
25-
/// <summary>
26-
/// Returns an <see cref="RouteDataAssertions"/> object that can be used to assert the
27-
/// current <see cref="RouteData"/>.
28-
/// </summary>
29-
public static RouteDataAssertions Should(this RouteData routeData)
30-
{
31-
return new RouteDataAssertions(routeData);
32-
}
33-
}
34-
}
1+
using FluentAssertions;
2+
using System;
3+
using System.Web.Mvc;
4+
using FluentAssertions.Mvc;
5+
using System.Web.Routing;
6+
using System.Diagnostics;
7+
8+
namespace FluentAssertions.Mvc
9+
{
10+
/// <summary>
11+
/// Contains extension methods for custom assertions in unit tests.
12+
/// </summary>
13+
[DebuggerNonUserCode]
14+
public static class AssertionsExtensions
15+
{
16+
/// <summary>
17+
/// Returns an <see cref="ActionResultAssertions"/> object that can be used to assert the
18+
/// current <see cref="ActionResult"/>.
19+
/// </summary>
20+
public static ActionResultAssertions Should (this ActionResult actual)
21+
{
22+
return new ActionResultAssertions (actual);
23+
}
24+
25+
/// <summary>
26+
/// Returns an <see cref="RouteDataAssertions"/> object that can be used to assert the
27+
/// current <see cref="RouteData"/>.
28+
/// </summary>
29+
public static RouteDataAssertions Should(this RouteData routeData)
30+
{
31+
return new RouteDataAssertions(routeData);
32+
}
33+
}
34+
}

‎src/FluentAssertions.Mvc3/ContentResultAssertions.cs renamed to ‎src/FluentAssertions.Mvc.Shared/ContentResultAssertions.cs

File renamed without changes.

‎src/FluentAssertions.Mvc3/ControllerAssertions.cs renamed to ‎src/FluentAssertions.Mvc.Shared/ControllerAssertions.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
using System;
2-
using System.Diagnostics;
3-
4-
namespace FluentAssertions.Mvc
5-
{
6-
[DebuggerNonUserCode]
7-
public class ControllerAssertions
8-
{
9-
public ControllerAssertions ()
10-
{
11-
}
12-
}
13-
}
14-
1+
using System;
2+
using System.Diagnostics;
3+
4+
namespace FluentAssertions.Mvc
5+
{
6+
[DebuggerNonUserCode]
7+
public class ControllerAssertions
8+
{
9+
public ControllerAssertions ()
10+
{
11+
}
12+
}
13+
}
14+

‎src/FluentAssertions.Mvc3/FailureMessages.Designer.cs renamed to ‎src/FluentAssertions.Mvc.Shared/FailureMessages.Designer.cs

File renamed without changes.

‎src/FluentAssertions.Mvc3/FailureMessages.resx renamed to ‎src/FluentAssertions.Mvc.Shared/FailureMessages.resx

File renamed without changes.

0 commit comments

Comments
 (0)