Skip to content

Commit 1248807

Browse files
kevinkuszykkevinkuszyk
authored
Merge pull request #2 from shealey/master
Update Test Tooling to Officially Supported Framework
2 parents bb927e9 + c557211 commit 1248807

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

+310
-570
lines changed

‎Contributors.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Kevin Kuszyk
33
Jeff Sharp
44
James Nail
55
Jamie Humphries
6+
Stuart Healey

‎FluentAssertions.AspNetCore.Mvc.sln

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.8
4+
VisualStudioVersion = 15.0.26730.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4E91D524-3DC0-4E08-82FE-6FDAEB89212B}"
77
EndProject
@@ -18,11 +18,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A4C33565
1818
EndProject
1919
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc", "src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj", "{EA71D220-089E-4CB1-B187-D9BB4DFD8624}"
2020
EndProject
21-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Tests", "tests\FluentAssertions.AspNetCore.Mvc.Tests\FluentAssertions.AspNetCore.Mvc.Tests.csproj", "{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}"
21+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.AspNetCore.Mvc.Tests", "tests\FluentAssertions.AspNetCore.Mvc.Tests\FluentAssertions.AspNetCore.Mvc.Tests.csproj", "{5DD9D1EB-F3CB-48AA-862C-269A01225810}"
2222
EndProject
23-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Sample", "samples\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj", "{8156D339-E8DE-4A68-8828-9DA927D2949D}"
23+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.AspNetCore.Mvc.Sample", "samples\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj", "{6DCC13DB-3226-4529-ADAA-10BB04A9F397}"
2424
EndProject
25-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Sample.Tests", "samples\FluentAssertions.AspNetCore.Mvc.Sample.Tests\FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj", "{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}"
25+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.AspNetCore.Mvc.Sample.Tests", "samples\FluentAssertions.AspNetCore.Mvc.Sample.Tests\FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj", "{FE001B08-AD54-4694-AEE6-410824DE6A46}"
2626
EndProject
2727
Global
2828
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -46,51 +46,51 @@ Global
4646
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|Mixed Platforms.Build.0 = Release|Any CPU
4747
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.ActiveCfg = Release|Any CPU
4848
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.Build.0 = Release|Any CPU
49-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
52-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
53-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|x86.ActiveCfg = Debug|Any CPU
54-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|x86.Build.0 = Debug|Any CPU
55-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Any CPU.Build.0 = Release|Any CPU
57-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
58-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
59-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|x86.ActiveCfg = Release|Any CPU
60-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|x86.Build.0 = Release|Any CPU
61-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Any CPU.Build.0 = Debug|Any CPU
63-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
64-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
65-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|x86.ActiveCfg = Debug|Any CPU
66-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|x86.Build.0 = Debug|Any CPU
67-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Any CPU.ActiveCfg = Release|Any CPU
68-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Any CPU.Build.0 = Release|Any CPU
69-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
70-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
71-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|x86.ActiveCfg = Release|Any CPU
72-
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|x86.Build.0 = Release|Any CPU
73-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
75-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
76-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
77-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|x86.ActiveCfg = Debug|Any CPU
78-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|x86.Build.0 = Debug|Any CPU
79-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
80-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Any CPU.Build.0 = Release|Any CPU
81-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
82-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
83-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|x86.ActiveCfg = Release|Any CPU
84-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|x86.Build.0 = Release|Any CPU
49+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
52+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
53+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|x86.ActiveCfg = Debug|Any CPU
54+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|x86.Build.0 = Debug|Any CPU
55+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
58+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Mixed Platforms.Build.0 = Release|Any CPU
59+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|x86.ActiveCfg = Release|Any CPU
60+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|x86.Build.0 = Release|Any CPU
61+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Any CPU.Build.0 = Debug|Any CPU
63+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
64+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
65+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|x86.ActiveCfg = Debug|Any CPU
66+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|x86.Build.0 = Debug|Any CPU
67+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Any CPU.ActiveCfg = Release|Any CPU
68+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Any CPU.Build.0 = Release|Any CPU
69+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
70+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Mixed Platforms.Build.0 = Release|Any CPU
71+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|x86.ActiveCfg = Release|Any CPU
72+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|x86.Build.0 = Release|Any CPU
73+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Any CPU.Build.0 = Debug|Any CPU
75+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
76+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
77+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|x86.ActiveCfg = Debug|Any CPU
78+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|x86.Build.0 = Debug|Any CPU
79+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Any CPU.ActiveCfg = Release|Any CPU
80+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Any CPU.Build.0 = Release|Any CPU
81+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
82+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Mixed Platforms.Build.0 = Release|Any CPU
83+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|x86.ActiveCfg = Release|Any CPU
84+
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|x86.Build.0 = Release|Any CPU
8585
EndGlobalSection
8686
GlobalSection(SolutionProperties) = preSolution
8787
HideSolutionNode = FALSE
8888
EndGlobalSection
8989
GlobalSection(NestedProjects) = preSolution
9090
{EA71D220-089E-4CB1-B187-D9BB4DFD8624} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
91-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
92-
{8156D339-E8DE-4A68-8828-9DA927D2949D} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
93-
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
91+
{5DD9D1EB-F3CB-48AA-862C-269A01225810} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
92+
{6DCC13DB-3226-4529-ADAA-10BB04A9F397} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
93+
{FE001B08-AD54-4694-AEE6-410824DE6A46} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
9494
EndGlobalSection
9595
GlobalSection(ExtensibilityGlobals) = postSolution
9696
SolutionGuid = {D1CB0506-FC11-4EA6-A715-DF5845427FE7}

‎appveyor.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
version: 1.0.{build}
22

3+
environment:
4+
CLI_VERSION: Latest
5+
36
image: Visual Studio 2017
47

58
configuration: Release
69

710
before_build:
8-
- cmd: nuget restore
11+
- cmd: dotnet restore
912

1013
build:
11-
verbosity: minimal
14+
verbosity: minimal
15+
16+
test_script:
17+
- cmd: dotnet test samples\FluentAssertions.AspNetCore.Mvc.Sample.Tests\FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj
18+
- cmd: dotnet test tests\FluentAssertions.AspNetCore.Mvc.Tests\FluentAssertions.AspNetCore.Mvc.Tests.csproj

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<ProjectReference Include="..\..\src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj" />
19-
<ProjectReference Include="..\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj" />
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" />
2021
</ItemGroup>
2122

2223
<ItemGroup>
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
24-
<PackageReference Include="NUnit" Version="3.8.1" />
25-
<PackageReference Include="dotnet-test-nunit" Version="3.4.0-beta-1" />
24+
<ProjectReference Include="..\..\src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj" />
25+
<ProjectReference Include="..\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj" />
2626
</ItemGroup>
2727

2828
</Project>

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
using FluentAssertions.AspNetCore.Mvc.Sample.Controllers;
2-
using NUnit.Framework;
1+
using FluentAssertions.AspNetCore.Mvc.Sample.Controllers;
2+
using Xunit;
33

44
namespace FluentAssertions.AspNetCore.Mvc.Sample.Tests
55
{
6-
[TestFixture]
76
public class ProductController_Tests
87
{
9-
[Test]
10-
public void List_ShouldReturnView()
11-
{
8+
[Fact]
9+
public void List_ShouldReturnView()
10+
{
1211
var controller = new ProductController();
13-
controller.List().Should()
12+
controller.List().Should()
1413
.BeViewResult()
1514
.WithViewName("Index");
16-
}
15+
}
1716
}
18-
}
17+
}

‎samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎samples/FluentAssertions.AspNetCore.Mvc.Sample/Controllers/ProductController.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
using Microsoft.AspNetCore.Mvc;
6-
7-
// For more information on enabling MVC for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860
1+
using Microsoft.AspNetCore.Mvc;
82

93
namespace FluentAssertions.AspNetCore.Mvc.Sample.Controllers
104
{

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

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
32
<PropertyGroup>
43
<TargetFramework>netcoreapp1.0</TargetFramework>
54
<PreserveCompilationContext>true</PreserveCompilationContext>
@@ -11,34 +10,15 @@
1110
</PropertyGroup>
1211

1312
<ItemGroup>
14-
<None Update="wwwroot\**\*;Views\**\*;Areas\**\Views">
15-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
16-
</None>
17-
</ItemGroup>
18-
19-
<ItemGroup>
20-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="1.0.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.2" />
13+
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.3" />
2214
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
23-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
24-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
25-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.2" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
28-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
29-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
15+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.3" />
3016
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
31-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.0.2" />
3217
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" />
3318
</ItemGroup>
3419

35-
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
36-
<Exec Command="bower install" />
37-
<Exec Command="dotnet bundle" />
38-
</Target>
39-
4020
<ItemGroup>
41-
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
21+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />
4222
</ItemGroup>
4323

4424
</Project>

‎samples/FluentAssertions.AspNetCore.Mvc.Sample/Models/ProductViewModel.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
6-
namespace FluentAssertions.AspNetCore.Mvc.Sample.Models
1+
namespace FluentAssertions.AspNetCore.Mvc.Sample.Models
72
{
83
public class ProductViewModel
94
{

0 commit comments

Comments
 (0)