Skip to content

Commit 2b04818

Browse files
authored
Merge pull request #355 - Version 3.1.0
Version 3.1.0
2 parents a8f1116 + a2ee126 commit 2b04818

File tree

637 files changed

+6643
-74362
lines changed

Some content is hidden

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

637 files changed

+6643
-74362
lines changed

.appveyor.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,15 @@ test_script:
1919
- cmd: dotnet test "samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj" --configuration Release --no-build
2020
- cmd: dotnet test "samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj" --configuration Release --no-build
2121
- cmd: dotnet test "samples/Autofac/Autofac.Test/Autofac.Test.csproj" --configuration Release --no-build
22-
- cmd: dotnet test "samples/Configuration/Test.Core.MissingAppPackage/Test.Core.MissingAppPackage.csproj" --configuration Release --no-build
2322
- cmd: dotnet test "samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj" --configuration Release --no-build
2423
- cmd: dotnet test "samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj" --configuration Release --no-build
25-
- cmd: dotnet test "samples/Configuration/Test.FullFramework.NoCompilationContext/Test.FullFramework.NoCompilationContext.csproj" --configuration Release --no-build
2624
- cmd: dotnet test "samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj" --configuration Release --no-build
25+
- cmd: dotnet test "samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj" --configuration Release --no-build
2726
- cmd: dotnet test "samples/Configuration/Test.NoAsync/Test.NoAsync.csproj" --configuration Release --no-build
2827
- cmd: dotnet test "samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj" --configuration Release --no-build
2928
- cmd: dotnet test "samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj" --configuration Release --no-build
3029
- cmd: dotnet test "samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj" --configuration Release --no-build
3130
- cmd: dotnet test "samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj" --configuration Release --no-build
32-
- cmd: dotnet test "samples/FullFramework/FullFramework.AssemblyInit.Test/FullFramework.AssemblyInit.Test.csproj" --configuration Release --no-build
33-
- cmd: dotnet test "samples/FullFramework/FullFramework.Test/FullFramework.Test.csproj" --configuration Release --no-build
3431
- cmd: dotnet test "samples/Lite/Lite.Test/Lite.Test.csproj" --configuration Release --no-build
3532
- cmd: dotnet test "samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj" --configuration Release --no-build
3633
- cmd: dotnet test "samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj" --configuration Release --no-build
@@ -52,7 +49,9 @@ test_script:
5249
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj" --configuration Release --no-build
5350
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj" --configuration Release --no-build
5451
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj" --configuration Release --no-build
52+
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj" --configuration Release --no-build
5553
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj" --configuration Release --no-build
54+
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj" --configuration Release --no-build
5655
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj" --configuration Release --no-build
5756
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj" --configuration Release --no-build
5857
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj" --configuration Release --no-build

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ git:
44
depth: 10
55
group: travis_latest
66
sudo: required
7-
dotnet: 2.2
7+
dotnet: 3.1
88
solution: MyTested.AspNetCore.Mvc.sln
99
env:
1010
global:
1111
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
1212
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
13-
- NET_CORE_VERSION: netcoreapp2.2
13+
- NET_CORE_VERSION: netcoreapp3.1
1414
matrix:
1515
fast_finish: true
1616
include:
1717
- os: linux
1818
dist: xenial
1919
- os: osx
20-
dotnet: 2.2.300
21-
osx_image: xcode10.2
20+
dotnet: 3.1.100
21+
osx_image: xcode11.2
2222
branches:
2323
only:
2424
- master
@@ -31,10 +31,10 @@ script:
3131
- dotnet test "samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj" --configuration Release --framework "$NET_CORE_VERSION"
3232
- dotnet test "samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj" --configuration Release --framework "$NET_CORE_VERSION"
3333
- dotnet test "samples/Autofac/Autofac.Test/Autofac.Test.csproj" --configuration Release --framework "$NET_CORE_VERSION"
34-
- dotnet test "samples/Configuration/Test.Core.MissingAppPackage/Test.Core.MissingAppPackage.csproj" --configuration Release --framework "$NET_CORE_VERSION"
3534
- dotnet test "samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj" --configuration Release --framework "$NET_CORE_VERSION"
3635
- dotnet test "samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj" --configuration Release --framework "$NET_CORE_VERSION"
3736
- dotnet test "samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj" --configuration Release --framework "$NET_CORE_VERSION"
37+
- dotnet test "samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj" --configuration Release --framework "$NET_CORE_VERSION"
3838
- dotnet test "samples/Configuration/Test.NoAsync/Test.NoAsync.csproj" --configuration Release --framework "$NET_CORE_VERSION"
3939
- dotnet test "samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj" --configuration Release --framework "$NET_CORE_VERSION"
4040
- dotnet test "samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj" --configuration Release --framework "$NET_CORE_VERSION"

0 commit comments

Comments
 (0)