Skip to content

Commit 466e09c

Browse files
kalintsenkovkalintsenkov
committed
Resolved conflicts
2 parents d72c133 + 06056f5 commit 466e09c

File tree

106 files changed

+2858
-2770
lines changed

Some content is hidden

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

106 files changed

+2858
-2770
lines changed

‎.appveyor.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ test_script:
2828
- cmd: dotnet test "samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj" --configuration Release --no-build
2929
- cmd: dotnet test "samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj" --configuration Release --no-build
3030
- cmd: dotnet test "samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj" --configuration Release --no-build
31-
- cmd: dotnet test "samples/Lite/Lite.Test/Lite.Test.csproj" --configuration Release --no-build
3231
- cmd: dotnet test "samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj" --configuration Release --no-build
3332
- cmd: dotnet test "samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj" --configuration Release --no-build
3433
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj" --configuration Release --no-build
@@ -45,8 +44,6 @@ test_script:
4544
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj" --configuration Release --no-build
4645
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj" --configuration Release --no-build
4746
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj" --configuration Release --no-build
48-
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj" --configuration Release --no-build
49-
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj" --configuration Release --no-build
5047
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj" --configuration Release --no-build
5148
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj" --configuration Release --no-build
5249
- cmd: dotnet test "test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj" --configuration Release --no-build

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,5 @@ script:
4040
- dotnet test "samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj" --configuration Release --framework "$NET_CORE_VERSION"
4141
- dotnet test "samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj" --configuration Release --framework "$NET_CORE_VERSION"
4242
- dotnet test "samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj" --configuration Release --framework "$NET_CORE_VERSION"
43-
- dotnet test "samples/Lite/Lite.Test/Lite.Test.csproj" --configuration Release --framework "$NET_CORE_VERSION"
4443
- dotnet test "samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj" --configuration Release --framework "$NET_CORE_VERSION"
4544
- dotnet test "samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj" --configuration Release --framework "$NET_CORE_VERSION"

‎BACKERS.md‎

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

0 commit comments

Comments
 (0)