Skip to content

Commit 9c821f0

Browse files
kevinkuszykkevinkuszyk
authored
Merge pull request #5 from rodion73/master
Update to FluentAssertions 5 and netcore 2.
2 parents a08eea7 + d6e9498 commit 9c821f0

19 files changed

+319
-210
lines changed

‎.vscode/launch.json‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
// Use IntelliSense to find out which attributes exist for C# debugging
3+
// Use hover for the description of the existing attributes
4+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": ".NET Core Launch (web)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "${workspaceFolder}/samples/FluentAssertions.AspNetCore.Mvc.Sample/bin/Debug/netcoreapp2.0/FluentAssertions.AspNetCore.Mvc.Sample.dll",
14+
"args": [],
15+
"cwd": "${workspaceFolder}/samples/FluentAssertions.AspNetCore.Mvc.Sample",
16+
"stopAtEntry": false,
17+
"internalConsoleOptions": "openOnSessionStart",
18+
"launchBrowser": {
19+
"enabled": true,
20+
"args": "${auto-detect-url}",
21+
"windows": {
22+
"command": "cmd.exe",
23+
"args": "/C start ${auto-detect-url}"
24+
},
25+
"osx": {
26+
"command": "open"
27+
},
28+
"linux": {
29+
"command": "xdg-open"
30+
}
31+
},
32+
"env": {
33+
"ASPNETCORE_ENVIRONMENT": "Development"
34+
},
35+
"sourceFileMap": {
36+
"/Views": "${workspaceFolder}/Views"
37+
}
38+
},
39+
{
40+
"name": ".NET Core Attach",
41+
"type": "coreclr",
42+
"request": "attach",
43+
"processId": "${command:pickProcess}"
44+
}
45+
,]
46+
}

‎.vscode/tasks.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "process",
8+
"args": [
9+
"build",
10+
"${workspaceFolder}/samples/FluentAssertions.AspNetCore.Mvc.Sample/FluentAssertions.AspNetCore.Mvc.Sample.csproj"
11+
],
12+
"problemMatcher": "$msCompile"
13+
}
14+
]
15+
}

‎FluentAssertions.AspNetCore.Mvc.sln‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A4C33565
1616
EndProject
1717
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc", "src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj", "{EA71D220-089E-4CB1-B187-D9BB4DFD8624}"
1818
EndProject
19-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Tests", "tests\FluentAssertions.AspNetCore.Mvc.Tests\FluentAssertions.AspNetCore.Mvc.Tests.csproj", "{5DD9D1EB-F3CB-48AA-862C-269A01225810}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Tests", "tests\FluentAssertions.AspNetCore.Mvc.Tests\FluentAssertions.AspNetCore.Mvc.Tests.csproj", "{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}"
2020
EndProject
21-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Sample", "samples\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj", "{6DCC13DB-3226-4529-ADAA-10BB04A9F397}"
21+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.AspNetCore.Mvc.Sample.Tests", "samples\FluentAssertions.AspNetCore.Mvc.Sample.Tests\FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj", "{BCFB2639-D0CC-4E81-B431-8CB37F66480F}"
2222
EndProject
23-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Sample.Tests", "samples\FluentAssertions.AspNetCore.Mvc.Sample.Tests\FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj", "{FE001B08-AD54-4694-AEE6-410824DE6A46}"
23+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.AspNetCore.Mvc.Sample", "samples\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj", "{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}"
2424
EndProject
2525
Global
2626
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -44,51 +44,51 @@ Global
4444
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|Mixed Platforms.Build.0 = Release|Any CPU
4545
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.ActiveCfg = Release|Any CPU
4646
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.Build.0 = Release|Any CPU
47-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Any CPU.Build.0 = Debug|Any CPU
49-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
50-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
51-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|x86.ActiveCfg = Debug|Any CPU
52-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|x86.Build.0 = Debug|Any CPU
53-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Any CPU.ActiveCfg = Release|Any CPU
54-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Any CPU.Build.0 = Release|Any CPU
55-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
56-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Mixed Platforms.Build.0 = Release|Any CPU
57-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|x86.ActiveCfg = Release|Any CPU
58-
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|x86.Build.0 = Release|Any CPU
59-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Any CPU.Build.0 = Debug|Any CPU
61-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
62-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
63-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|x86.ActiveCfg = Debug|Any CPU
64-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|x86.Build.0 = Debug|Any CPU
65-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Any CPU.ActiveCfg = Release|Any CPU
66-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Any CPU.Build.0 = Release|Any CPU
67-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
68-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Mixed Platforms.Build.0 = Release|Any CPU
69-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|x86.ActiveCfg = Release|Any CPU
70-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|x86.Build.0 = Release|Any CPU
71-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Any CPU.Build.0 = Debug|Any CPU
73-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
74-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
75-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|x86.ActiveCfg = Debug|Any CPU
76-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|x86.Build.0 = Debug|Any CPU
77-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Any CPU.ActiveCfg = Release|Any CPU
78-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Any CPU.Build.0 = Release|Any CPU
79-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
80-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Mixed Platforms.Build.0 = Release|Any CPU
81-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|x86.ActiveCfg = Release|Any CPU
82-
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|x86.Build.0 = Release|Any CPU
47+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|Any CPU.Build.0 = Debug|Any CPU
49+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
50+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
51+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|x86.ActiveCfg = Debug|Any CPU
52+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|x86.Build.0 = Debug|Any CPU
53+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|Any CPU.ActiveCfg = Release|Any CPU
54+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|Any CPU.Build.0 = Release|Any CPU
55+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
56+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|Mixed Platforms.Build.0 = Release|Any CPU
57+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|x86.ActiveCfg = Release|Any CPU
58+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|x86.Build.0 = Release|Any CPU
59+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|Any CPU.Build.0 = Debug|Any CPU
61+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
62+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
63+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|x86.ActiveCfg = Debug|Any CPU
64+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|x86.Build.0 = Debug|Any CPU
65+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|Any CPU.ActiveCfg = Release|Any CPU
66+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|Any CPU.Build.0 = Release|Any CPU
67+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
68+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
69+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|x86.ActiveCfg = Release|Any CPU
70+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|x86.Build.0 = Release|Any CPU
71+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|Any CPU.Build.0 = Debug|Any CPU
73+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
74+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
75+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|x86.ActiveCfg = Debug|Any CPU
76+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|x86.Build.0 = Debug|Any CPU
77+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|Any CPU.ActiveCfg = Release|Any CPU
78+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|Any CPU.Build.0 = Release|Any CPU
79+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
80+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|Mixed Platforms.Build.0 = Release|Any CPU
81+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|x86.ActiveCfg = Release|Any CPU
82+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|x86.Build.0 = Release|Any CPU
8383
EndGlobalSection
8484
GlobalSection(SolutionProperties) = preSolution
8585
HideSolutionNode = FALSE
8686
EndGlobalSection
8787
GlobalSection(NestedProjects) = preSolution
8888
{EA71D220-089E-4CB1-B187-D9BB4DFD8624} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
89-
{5DD9D1EB-F3CB-48AA-862C-269A01225810} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
90-
{6DCC13DB-3226-4529-ADAA-10BB04A9F397} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
91-
{FE001B08-AD54-4694-AEE6-410824DE6A46} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
89+
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
90+
{BCFB2639-D0CC-4E81-B431-8CB37F66480F} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
91+
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
9292
EndGlobalSection
9393
GlobalSection(ExtensibilityGlobals) = postSolution
9494
SolutionGuid = {D1CB0506-FC11-4EA6-A715-DF5845427FE7}

‎samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>0.7.0</VersionPrefix>
5-
<TargetFramework>netcoreapp1.0</TargetFramework>
6-
<AssemblyName>FluentAssertions.AspNetCore.Mvc.Sample.Tests</AssemblyName>
7-
<PackageId>FluentAssertions.AspNetCore.Mvc.Sample.Tests</PackageId>
8-
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
9-
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
10-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
11-
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
12-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
13-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
6+
<IsPackable>false</IsPackable>
157
</PropertyGroup>
168

179
<ItemGroup>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
19-
<PackageReference Include="xunit" Version="2.2.0" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
11+
<PackageReference Include="xunit" Version="2.3.1" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
13+
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
2114
</ItemGroup>
2215

2316
<ItemGroup>
17+
<ProjectReference Include="..\..\samples\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj" />
2418
<ProjectReference Include="..\..\src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj" />
25-
<ProjectReference Include="..\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj" />
2619
</ItemGroup>
2720

2821
</Project>

‎samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/HomeController_Tests.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using FluentAssertions.AspNetCore.Mvc.Sample.Controllers;
2+
using Xunit;
3+
4+
namespace FluentAssertions.AspNetCore.Mvc.Sample.Tests
5+
{
6+
public class HomeController_Tests
7+
{
8+
#region Public Methods
9+
10+
[Fact]
11+
public void Index_ShouldReturnDefaultView()
12+
{
13+
var controller = new HomeController();
14+
controller.Index().Should()
15+
.BeViewResult().WithDefaultViewName();
16+
}
17+
18+
#endregion Public Methods
19+
}
20+
}

‎samples/FluentAssertions.AspNetCore.Mvc.Sample/FluentAssertions.AspNetCore.Mvc.Sample.csproj‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
23
<PropertyGroup>
3-
<TargetFramework>netcoreapp1.0</TargetFramework>
4-
<PreserveCompilationContext>true</PreserveCompilationContext>
5-
<AssemblyName>FluentAssertions.AspNetCore.Mvc.Sample</AssemblyName>
6-
<OutputType>Exe</OutputType>
7-
<PackageId>FluentAssertions.AspNetCore.Mvc.Sample</PackageId>
8-
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
9-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
105
</PropertyGroup>
116

127
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.3" />
14-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
15-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.3" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
17-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" />
18-
</ItemGroup>
19-
20-
<ItemGroup>
21-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />
8+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
229
</ItemGroup>
2310

2411
</Project>

0 commit comments

Comments
 (0)