Skip to content

Update to FluentAssertions 5 and netcore 2. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 26, 2018
Merged

Update to FluentAssertions 5 and netcore 2. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ac75b5
Update to FluentAssertions 5 and netcore 2.
scaropro Mar 23, 2018
f0505c1
Fix AppVeyor PackageTargetFallback error.
scaropro Mar 23, 2018
d6e9498
Add CustomAssertionAttribute.
scaropro Mar 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/samples/FluentAssertions.AspNetCore.Mvc.Sample/bin/Debug/netcoreapp2.0/FluentAssertions.AspNetCore.Mvc.Sample.dll",
"args": [],
"cwd": "${workspaceFolder}/samples/FluentAssertions.AspNetCore.Mvc.Sample",
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart",
"launchBrowser": {
"enabled": true,
"args": "${auto-detect-url}",
"windows": {
"command": "cmd.exe",
"args": "/C start ${auto-detect-url}"
},
"osx": {
"command": "open"
},
"linux": {
"command": "xdg-open"
}
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
}
,]
}
15 changes: 15 additions & 0 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/samples/FluentAssertions.AspNetCore.Mvc.Sample/FluentAssertions.AspNetCore.Mvc.Sample.csproj"
],
"problemMatcher": "$msCompile"
}
]
}
84 changes: 42 additions & 42 deletions FluentAssertions.AspNetCore.Mvc.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A4C33565
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc", "src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj", "{EA71D220-089E-4CB1-B187-D9BB4DFD8624}"
EndProject
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}"
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}"
EndProject
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}"
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}"
EndProject
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}"
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}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -44,51 +44,51 @@ Global
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.ActiveCfg = Release|Any CPU
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.Build.0 = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|x86.ActiveCfg = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|x86.Build.0 = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Any CPU.Build.0 = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|x86.ActiveCfg = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|x86.Build.0 = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|x86.ActiveCfg = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|x86.Build.0 = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Any CPU.Build.0 = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|x86.ActiveCfg = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|x86.Build.0 = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|x86.ActiveCfg = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|x86.Build.0 = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Any CPU.Build.0 = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|x86.ActiveCfg = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|x86.Build.0 = Release|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|x86.ActiveCfg = Debug|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|x86.Build.0 = Debug|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|Any CPU.Build.0 = Release|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|x86.ActiveCfg = Release|Any CPU
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Release|x86.Build.0 = Release|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|x86.ActiveCfg = Debug|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Debug|x86.Build.0 = Debug|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|Any CPU.Build.0 = Release|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|x86.ActiveCfg = Release|Any CPU
{BCFB2639-D0CC-4E81-B431-8CB37F66480F}.Release|x86.Build.0 = Release|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|Any CPU.Build.0 = Debug|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|x86.ActiveCfg = Debug|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Debug|x86.Build.0 = Debug|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|Any CPU.ActiveCfg = Release|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|Any CPU.Build.0 = Release|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|x86.ActiveCfg = Release|Any CPU
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{EA71D220-089E-4CB1-B187-D9BB4DFD8624} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
{5DD9D1EB-F3CB-48AA-862C-269A01225810} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
{6DCC13DB-3226-4529-ADAA-10BB04A9F397} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
{FE001B08-AD54-4694-AEE6-410824DE6A46} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
{BCFB2639-D0CC-4E81-B431-8CB37F66480F} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D1CB0506-FC11-4EA6-A715-DF5845427FE7}
Expand Down
23 changes: 8 additions & 15 deletions ...ssertions.AspNetCore.Mvc.Sample.Tests/FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.7.0</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework>
<AssemblyName>FluentAssertions.AspNetCore.Mvc.Sample.Tests</AssemblyName>
<PackageId>FluentAssertions.AspNetCore.Mvc.Sample.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<TargetFramework>netcoreapp2.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\samples\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj" />
<ProjectReference Include="..\..\src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj" />
<ProjectReference Include="..\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj" />
</ItemGroup>

</Project>
20 changes: 20 additions & 0 deletions samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/HomeController_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using FluentAssertions.AspNetCore.Mvc.Sample.Controllers;
using Xunit;

namespace FluentAssertions.AspNetCore.Mvc.Sample.Tests
{
public class HomeController_Tests
{
#region Public Methods

[Fact]
public void Index_ShouldReturnDefaultView()
{
var controller = new HomeController();
controller.Index().Should()
.BeViewResult().WithDefaultViewName();
}

#endregion Public Methods
}
}
19 changes: 3 additions & 16 deletions samples/FluentAssertions.AspNetCore.Mvc.Sample/FluentAssertions.AspNetCore.Mvc.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>FluentAssertions.AspNetCore.Mvc.Sample</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>FluentAssertions.AspNetCore.Mvc.Sample</PackageId>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" />
</ItemGroup>

<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
</ItemGroup>

</Project>
Loading