Skip to content

Commit 4026bc8

Browse files
committed
Merge branch 'preview-version-3.0' of github.com:ivaylokenov/MyTested.AspNetCore.Mvc into preview-version-3.0
2 parents aade147 + 7d19036 commit 4026bc8

File tree

85 files changed

+67
-36111
lines changed

Some content is hidden

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

85 files changed

+67
-36111
lines changed

MyTested.AspNetCore.Mvc.sln

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autofac.NoContainerBuilder.
167167
EndProject
168168
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyTested.AspNetCore.Mvc.Configuration.Test", "test\MyTested.AspNetCore.Mvc.Configuration.Test\MyTested.AspNetCore.Mvc.Configuration.Test.csproj", "{FFC31FCA-7DA5-44CA-A731-780510AEF4C0}"
169169
EndProject
170-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FullFramework.Web", "samples\FullFramework\FullFramework.Web\FullFramework.Web.csproj", "{95956892-757D-4314-9B19-D082E05E71D1}"
171-
EndProject
172-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FullFramework", "FullFramework", "{AD86F882-B9E4-4AC4-B949-83F611BB6A92}"
173-
EndProject
174-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FullFramework.Test", "samples\FullFramework\FullFramework.Test\FullFramework.Test.csproj", "{D139944F-2FE7-46E4-B702-E9F05A5408FB}"
175-
EndProject
176-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FullFramework.AssemblyInit.Test", "samples\FullFramework\FullFramework.AssemblyInit.Test\FullFramework.AssemblyInit.Test.csproj", "{9BD386E2-10BF-420D-81A4-79435149F43B}"
177-
EndProject
178170
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autofac.AssemblyInit.Test", "samples\Autofac\Autofac.AssemblyInit.Test\Autofac.AssemblyInit.Test.csproj", "{1306269D-D300-4BB2-BF21-CB02C6746D2D}"
179171
EndProject
180172
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configuration", "Configuration", "{7BEC9808-8650-4322-BCC6-1D7D91B53678}"
@@ -531,18 +523,6 @@ Global
531523
{FFC31FCA-7DA5-44CA-A731-780510AEF4C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
532524
{FFC31FCA-7DA5-44CA-A731-780510AEF4C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
533525
{FFC31FCA-7DA5-44CA-A731-780510AEF4C0}.Release|Any CPU.Build.0 = Release|Any CPU
534-
{95956892-757D-4314-9B19-D082E05E71D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
535-
{95956892-757D-4314-9B19-D082E05E71D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
536-
{95956892-757D-4314-9B19-D082E05E71D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
537-
{95956892-757D-4314-9B19-D082E05E71D1}.Release|Any CPU.Build.0 = Release|Any CPU
538-
{D139944F-2FE7-46E4-B702-E9F05A5408FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
539-
{D139944F-2FE7-46E4-B702-E9F05A5408FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
540-
{D139944F-2FE7-46E4-B702-E9F05A5408FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
541-
{D139944F-2FE7-46E4-B702-E9F05A5408FB}.Release|Any CPU.Build.0 = Release|Any CPU
542-
{9BD386E2-10BF-420D-81A4-79435149F43B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
543-
{9BD386E2-10BF-420D-81A4-79435149F43B}.Debug|Any CPU.Build.0 = Debug|Any CPU
544-
{9BD386E2-10BF-420D-81A4-79435149F43B}.Release|Any CPU.ActiveCfg = Release|Any CPU
545-
{9BD386E2-10BF-420D-81A4-79435149F43B}.Release|Any CPU.Build.0 = Release|Any CPU
546526
{1306269D-D300-4BB2-BF21-CB02C6746D2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
547527
{1306269D-D300-4BB2-BF21-CB02C6746D2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
548528
{1306269D-D300-4BB2-BF21-CB02C6746D2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -747,10 +727,6 @@ Global
747727
{B96ABB0F-6997-486F-AD72-4E039026F8D6} = {B360A756-DCBE-48F4-9456-636172435724}
748728
{B839F29C-9F70-43F7-A128-39B2213366F4} = {B360A756-DCBE-48F4-9456-636172435724}
749729
{FFC31FCA-7DA5-44CA-A731-780510AEF4C0} = {D140FA14-A6C2-4279-8A41-35BC55279DA8}
750-
{95956892-757D-4314-9B19-D082E05E71D1} = {AD86F882-B9E4-4AC4-B949-83F611BB6A92}
751-
{AD86F882-B9E4-4AC4-B949-83F611BB6A92} = {88CC5098-E49F-4AA4-B964-1C2BF4ECA3C3}
752-
{D139944F-2FE7-46E4-B702-E9F05A5408FB} = {AD86F882-B9E4-4AC4-B949-83F611BB6A92}
753-
{9BD386E2-10BF-420D-81A4-79435149F43B} = {AD86F882-B9E4-4AC4-B949-83F611BB6A92}
754730
{1306269D-D300-4BB2-BF21-CB02C6746D2D} = {B360A756-DCBE-48F4-9456-636172435724}
755731
{7BEC9808-8650-4322-BCC6-1D7D91B53678} = {88CC5098-E49F-4AA4-B964-1C2BF4ECA3C3}
756732
{41D54FAD-53BB-48AE-8D1D-10AB382321B8} = {7BEC9808-8650-4322-BCC6-1D7D91B53678}

samples/Blog/Blog.Web/Infrastructure/ApplicationBuilderExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public static IApplicationBuilder UseMvcWithAreas(this IApplicationBuilder app)
2727
name: "areas",
2828
pattern: "{area:exists}/{controller=Home}/{action=Index}/{id?}"
2929
);
30+
31+
routes.MapRazorPages();
3032
});
3133

3234
public static async Task<IApplicationBuilder> SeedDataAsync(this IApplicationBuilder app)

samples/Blog/Blog.Web/Startup.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ public void ConfigureServices(IServiceCollection services)
6161
.AddTransient<IDateTimeProvider, DateTimeProvider>();
6262

6363
services
64-
.AddMvc(options => options
64+
.AddControllersWithViews(options => options
6565
.AddAutoValidateAntiforgeryToken())
6666
.SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
67+
68+
services.AddRazorPages();
6769
}
6870

6971
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

samples/FullFramework/FullFramework.AssemblyInit.Test/FullFramework.AssemblyInit.Test.csproj

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

samples/FullFramework/FullFramework.AssemblyInit.Test/HomeControllerTest.cs

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

samples/FullFramework/FullFramework.AssemblyInit.Test/Mocks/DataServiceMocks.cs

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

samples/FullFramework/FullFramework.AssemblyInit.Test/TestInit.cs

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

samples/FullFramework/FullFramework.Test/FullFramework.Test.csproj

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

samples/FullFramework/FullFramework.Test/HomeControllerTest.cs

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

samples/FullFramework/FullFramework.Test/Mocks/DataServiceMock.cs

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

0 commit comments

Comments
 (0)