From 18c976669d230f92ddc154f55781d517bb7c02e7 Mon Sep 17 00:00:00 2001 From: Philip Shishov Date: Sat, 9 Jan 2021 13:43:53 +0100 Subject: [PATCH 01/19] Upgrade TargetFramework to net5.0 and VersionPrefix Update AspNetCore nugets to 5.0.0/5.0.1 --- ...ested.AspNetCore.Mvc.NewtonsoftJson.csproj | 6 +- .../MyTested.AspNetCore.Mvc.Versioning.csproj | 4 +- .../ApplicationParts.Controllers.csproj | 4 +- .../ApplicationParts.Models.csproj | 4 +- .../ApplicationParts.Services.csproj | 2 +- .../ApplicationParts.Test.csproj | 2 +- .../ApplicationParts.Web.csproj | 55 ++++++++------- .../Autofac.AssemblyInit.Test.csproj | 2 +- .../Autofac.NoContainerBuilder.Test.csproj | 2 +- .../Autofac.NoContainerBuilder.Web.csproj | 2 +- .../Autofac/Autofac.Test/Autofac.Test.csproj | 2 +- .../Autofac/Autofac.Web/Autofac.Web.csproj | 2 +- .../Blog.Controllers/Blog.Controllers.csproj | 2 +- samples/Blog/Blog.Data/Blog.Data.csproj | 6 +- .../Blog/Blog.Services/Blog.Services.csproj | 2 +- samples/Blog/Blog.Test/Blog.Test.csproj | 2 +- samples/Blog/Blog.Web/Blog.Web.csproj | 8 +-- samples/Configuration/Common/Common.csproj | 2 +- .../Test.DifferentEnvironment.csproj | 2 +- .../Test.ExplicitNoStartupType.csproj | 2 +- .../Test.MissingStartupType.csproj | 2 +- .../Test.MultipleEntryPoints.csproj | 2 +- .../Test.NoAsync/Test.NoAsync.csproj | 2 +- .../Test.NoStartupType.csproj | 2 +- .../Test.WrongStartupType.csproj | 2 +- .../Test.WrongTestAssembly.csproj | 2 +- .../Test.WrongWebAssembly.csproj | 2 +- .../WebApplication.Controllers.csproj | 2 +- .../WebApplication/WebApplication.csproj | 2 +- samples/Lite/Lite.Test/Lite.Test.csproj | 2 +- samples/Lite/Lite.Web/Lite.Web.csproj | 16 ++--- .../MusicStore.Test/MusicStore.Test.csproj | 2 +- .../MusicStore.Web/MusicStore.Web.csproj | 20 +++--- .../NoStartup.Components.csproj | 2 +- .../NoStartup.Controllers.csproj | 2 +- .../NoStartup.Test/NoStartup.Test.csproj | 2 +- .../WebStartup.Test/WebStartup.Test.csproj | 2 +- .../WebStartup.Web/WebStartup.Web.csproj | 2 +- ...yTested.AspNetCore.Mvc.Abstractions.csproj | 12 ++-- ...ested.AspNetCore.Mvc.Authentication.csproj | 4 +- .../MyTested.AspNetCore.Mvc.Caching.csproj | 6 +- ...Tested.AspNetCore.Mvc.Configuration.csproj | 69 +++++++++---------- ...tCore.Mvc.Controllers.ActionResults.csproj | 4 +- ...pNetCore.Mvc.Controllers.Attributes.csproj | 4 +- ...Mvc.Controllers.Views.ActionResults.csproj | 4 +- ...ed.AspNetCore.Mvc.Controllers.Views.csproj | 4 +- ...MyTested.AspNetCore.Mvc.Controllers.csproj | 4 +- .../MyTested.AspNetCore.Mvc.Core.csproj | 4 +- ...sted.AspNetCore.Mvc.DataAnnotations.csproj | 4 +- ....AspNetCore.Mvc.DependencyInjection.csproj | 4 +- ....AspNetCore.Mvc.EntityFrameworkCore.csproj | 8 +-- .../MyTested.AspNetCore.Mvc.Helpers.csproj | 4 +- .../MyTested.AspNetCore.Mvc.Http.csproj | 4 +- .../MyTested.AspNetCore.Mvc.Licensing.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Lite.csproj | 4 +- .../MyTested.AspNetCore.Mvc.ModelState.csproj | 4 +- .../MyTested.AspNetCore.Mvc.Models.csproj | 4 +- .../MyTested.AspNetCore.Mvc.Options.csproj | 4 +- .../MyTested.AspNetCore.Mvc.Pipeline.csproj | 4 +- .../MyTested.AspNetCore.Mvc.Routing.csproj | 4 +- .../MyTested.AspNetCore.Mvc.Session.csproj | 4 +- .../MyTested.AspNetCore.Mvc.TempData.csproj | 4 +- .../MyTested.AspNetCore.Mvc.Universe.csproj | 4 +- ...tCore.Mvc.ViewComponents.Attributes.csproj | 4 +- ...pNetCore.Mvc.ViewComponents.Results.csproj | 4 +- ...ested.AspNetCore.Mvc.ViewComponents.csproj | 4 +- .../MyTested.AspNetCore.Mvc.ViewData.csproj | 4 +- ...yTested.AspNetCore.Mvc.ViewFeatures.csproj | 4 +- .../MyTested.AspNetCore.Mvc.csproj | 4 +- ...ed.AspNetCore.Mvc.Abstractions.Test.csproj | 2 +- ....AspNetCore.Mvc.Authentication.Test.csproj | 2 +- ...yTested.AspNetCore.Mvc.Caching.Test.csproj | 2 +- ...d.AspNetCore.Mvc.Configuration.Test.csproj | 2 +- ....Mvc.Controllers.ActionResults.Test.csproj | 2 +- ...ore.Mvc.Controllers.Attributes.Test.csproj | 2 +- ...ted.AspNetCore.Mvc.Controllers.Test.csproj | 2 +- ...ontrollers.Views.ActionResults.Test.csproj | 2 +- ...pNetCore.Mvc.Controllers.Views.Test.csproj | 2 +- ...AspNetCore.Mvc.DataAnnotations.Test.csproj | 2 +- ...etCore.Mvc.DependencyInjection.Test.csproj | 2 +- ...etCore.Mvc.EntityFrameworkCore.Test.csproj | 4 +- ...yTested.AspNetCore.Mvc.Helpers.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Http.Test.csproj | 2 +- ...ested.AspNetCore.Mvc.Licensing.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Lite.Test.csproj | 2 +- ...sted.AspNetCore.Mvc.ModelState.Test.csproj | 2 +- ...MyTested.AspNetCore.Mvc.Models.Test.csproj | 2 +- ....AspNetCore.Mvc.NewtonsoftJson.Test.csproj | 2 +- ...yTested.AspNetCore.Mvc.Options.Test.csproj | 4 +- ...Tested.AspNetCore.Mvc.Pipeline.Test.csproj | 2 +- ...yTested.AspNetCore.Mvc.Routing.Test.csproj | 2 +- ...yTested.AspNetCore.Mvc.Session.Test.csproj | 2 +- ...Tested.AspNetCore.Mvc.TempData.Test.csproj | 2 +- ...MyTested.AspNetCore.Mvc.Test.Setups.csproj | 4 +- .../MyTested.AspNetCore.Mvc.Test.csproj | 2 +- ...Tested.AspNetCore.Mvc.Universe.Test.csproj | 4 +- ...sted.AspNetCore.Mvc.Versioning.Test.csproj | 2 +- ....Mvc.ViewComponents.Attributes.Test.csproj | 2 +- ...ore.Mvc.ViewComponents.Results.Test.csproj | 2 +- ....AspNetCore.Mvc.ViewComponents.Test.csproj | 2 +- ...Tested.AspNetCore.Mvc.ViewData.Test.csproj | 2 +- ...ed.AspNetCore.Mvc.ViewFeatures.Test.csproj | 2 +- 102 files changed, 229 insertions(+), 227 deletions(-) diff --git a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj index 2c81603e2..57a1633a6 100644 --- a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC Newtonsoft JSON components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.NewtonsoftJson - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true @@ -29,7 +29,7 @@ - + diff --git a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj index c107deb88..924710e19 100644 --- a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC versioning components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Versioning - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj b/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj index 4eb9f50f7..6ab607976 100644 --- a/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj +++ b/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 ApplicationParts.Controllers ApplicationParts.Controllers false @@ -17,7 +17,7 @@ - + diff --git a/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj b/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj index c5a04a6d8..b0c48493a 100644 --- a/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj +++ b/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 ApplicationParts.Models ApplicationParts.Models false @@ -16,7 +16,7 @@ - + diff --git a/samples/ApplicationParts/ApplicationParts.Services/ApplicationParts.Services.csproj b/samples/ApplicationParts/ApplicationParts.Services/ApplicationParts.Services.csproj index ed1e1b7b4..4c20099ff 100644 --- a/samples/ApplicationParts/ApplicationParts.Services/ApplicationParts.Services.csproj +++ b/samples/ApplicationParts/ApplicationParts.Services/ApplicationParts.Services.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 ApplicationParts.Services ApplicationParts.Services false diff --git a/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj b/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj index e7618d04d..911b3a326 100644 --- a/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj +++ b/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj b/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj index 921dc05a0..e9c6d6f2e 100644 --- a/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj +++ b/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj @@ -1,33 +1,36 @@  - - netcoreapp3.1 - ApplicationParts.Web - aspnet-ApplicationParts.Web-c273a372-79ef-490d-b0e1-a7fb8f2dacc7 - true - + + net5.0 + ApplicationParts.Web + aspnet-ApplicationParts.Web-c273a372-79ef-490d-b0e1-a7fb8f2dacc7 + true + - - - PreserveNewest - - + + + PreserveNewest + + - - - + + + - - - - - - - - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + diff --git a/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj b/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj index dc24cfba1..2e2ac535e 100644 --- a/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj +++ b/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj b/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj index 835227f71..29d3b877e 100644 --- a/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj +++ b/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj b/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj index 214c6dc8f..1b520c7df 100644 --- a/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj +++ b/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 InProcess true diff --git a/samples/Autofac/Autofac.Test/Autofac.Test.csproj b/samples/Autofac/Autofac.Test/Autofac.Test.csproj index 5139ebf26..7b8e48bfa 100644 --- a/samples/Autofac/Autofac.Test/Autofac.Test.csproj +++ b/samples/Autofac/Autofac.Test/Autofac.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Autofac/Autofac.Web/Autofac.Web.csproj b/samples/Autofac/Autofac.Web/Autofac.Web.csproj index 3420e4a64..ff61050d4 100644 --- a/samples/Autofac/Autofac.Web/Autofac.Web.csproj +++ b/samples/Autofac/Autofac.Web/Autofac.Web.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 InProcess true diff --git a/samples/Blog/Blog.Controllers/Blog.Controllers.csproj b/samples/Blog/Blog.Controllers/Blog.Controllers.csproj index 3c191a662..50a9e3273 100644 --- a/samples/Blog/Blog.Controllers/Blog.Controllers.csproj +++ b/samples/Blog/Blog.Controllers/Blog.Controllers.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true false diff --git a/samples/Blog/Blog.Data/Blog.Data.csproj b/samples/Blog/Blog.Data/Blog.Data.csproj index fa21dddaf..2a4a8efeb 100644 --- a/samples/Blog/Blog.Data/Blog.Data.csproj +++ b/samples/Blog/Blog.Data/Blog.Data.csproj @@ -1,14 +1,14 @@  - netcoreapp3.1 + net5.0 true false - - + + diff --git a/samples/Blog/Blog.Services/Blog.Services.csproj b/samples/Blog/Blog.Services/Blog.Services.csproj index e090bf6af..9b5488fc2 100644 --- a/samples/Blog/Blog.Services/Blog.Services.csproj +++ b/samples/Blog/Blog.Services/Blog.Services.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true false diff --git a/samples/Blog/Blog.Test/Blog.Test.csproj b/samples/Blog/Blog.Test/Blog.Test.csproj index 0f23d3de8..399f50930 100644 --- a/samples/Blog/Blog.Test/Blog.Test.csproj +++ b/samples/Blog/Blog.Test/Blog.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Blog/Blog.Web/Blog.Web.csproj b/samples/Blog/Blog.Web/Blog.Web.csproj index 5b930bc8d..cd3df840f 100644 --- a/samples/Blog/Blog.Web/Blog.Web.csproj +++ b/samples/Blog/Blog.Web/Blog.Web.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 aspnet-Blog.Web-6757ED6F-7F48-4961-917B-ADA8F5DEAFB4 InProcess true @@ -9,9 +9,9 @@ - - - + + + diff --git a/samples/Configuration/Common/Common.csproj b/samples/Configuration/Common/Common.csproj index f3cc0c8fb..d34f807fb 100644 --- a/samples/Configuration/Common/Common.csproj +++ b/samples/Configuration/Common/Common.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 true false false diff --git a/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj b/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj index d2d111be5..bb5f50165 100644 --- a/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj +++ b/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj b/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj index 338a21075..b2edf6be7 100644 --- a/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj +++ b/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj b/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj index 1010142a8..1c3494bf3 100644 --- a/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj +++ b/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj b/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj index 7ab1da26b..f4a4da5f2 100644 --- a/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj +++ b/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 true diff --git a/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj b/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj index a90c6b076..84d270973 100644 --- a/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj +++ b/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj b/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj index 338a21075..b2edf6be7 100644 --- a/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj +++ b/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj b/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj index 338a21075..b2edf6be7 100644 --- a/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj +++ b/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj b/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj index 338a21075..b2edf6be7 100644 --- a/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj +++ b/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj b/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj index 338a21075..b2edf6be7 100644 --- a/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj +++ b/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Configuration/WebApplication.Controllers/WebApplication.Controllers.csproj b/samples/Configuration/WebApplication.Controllers/WebApplication.Controllers.csproj index 53d4616c7..143c96e7e 100644 --- a/samples/Configuration/WebApplication.Controllers/WebApplication.Controllers.csproj +++ b/samples/Configuration/WebApplication.Controllers/WebApplication.Controllers.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true false diff --git a/samples/Configuration/WebApplication/WebApplication.csproj b/samples/Configuration/WebApplication/WebApplication.csproj index 672f058b1..d7fed3161 100644 --- a/samples/Configuration/WebApplication/WebApplication.csproj +++ b/samples/Configuration/WebApplication/WebApplication.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 InProcess true diff --git a/samples/Lite/Lite.Test/Lite.Test.csproj b/samples/Lite/Lite.Test/Lite.Test.csproj index 93f0f2177..3fa4c292a 100644 --- a/samples/Lite/Lite.Test/Lite.Test.csproj +++ b/samples/Lite/Lite.Test/Lite.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/Lite/Lite.Web/Lite.Web.csproj b/samples/Lite/Lite.Web/Lite.Web.csproj index 2a8ef74d5..bed36b4a7 100644 --- a/samples/Lite/Lite.Web/Lite.Web.csproj +++ b/samples/Lite/Lite.Web/Lite.Web.csproj @@ -1,18 +1,18 @@  - netcoreapp3.1 + net5.0 true - - - - - - - + + + + + + + diff --git a/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj b/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj index 9b081bdcf..3769024a9 100644 --- a/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj +++ b/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj b/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj index f518afac5..742733f98 100644 --- a/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj +++ b/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 aspnet-MusicStore.Web-B1796332-CD47-4D99-85BC-7F98EA978F33 InProcess MusicStore @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/samples/NoStartup/NoStartup.Components/NoStartup.Components.csproj b/samples/NoStartup/NoStartup.Components/NoStartup.Components.csproj index 38e122c6b..32537286c 100644 --- a/samples/NoStartup/NoStartup.Components/NoStartup.Components.csproj +++ b/samples/NoStartup/NoStartup.Components/NoStartup.Components.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true false diff --git a/samples/NoStartup/NoStartup.Controllers/NoStartup.Controllers.csproj b/samples/NoStartup/NoStartup.Controllers/NoStartup.Controllers.csproj index d2312e879..e3d30cc32 100644 --- a/samples/NoStartup/NoStartup.Controllers/NoStartup.Controllers.csproj +++ b/samples/NoStartup/NoStartup.Controllers/NoStartup.Controllers.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true false diff --git a/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj b/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj index 63778d56d..3a6fd106e 100644 --- a/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj +++ b/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj b/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj index f971de011..2cbfca564 100644 --- a/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj +++ b/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true diff --git a/samples/WebStartup/WebStartup.Web/WebStartup.Web.csproj b/samples/WebStartup/WebStartup.Web/WebStartup.Web.csproj index 8758685e3..dd644cc60 100644 --- a/samples/WebStartup/WebStartup.Web/WebStartup.Web.csproj +++ b/samples/WebStartup/WebStartup.Web/WebStartup.Web.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 InProcess true diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj index e181be653..b528de9f5 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC common abstractions and interfaces. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Abstractions - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true @@ -35,10 +35,10 @@ - - - - + + + + diff --git a/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj b/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj index 3a3c21894..425ba77fd 100644 --- a/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj +++ b/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC authentication components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Authentication - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj index 7364080cc..b5dd305d2 100644 --- a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj +++ b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC caching components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Caching - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true @@ -33,7 +33,7 @@ - + diff --git a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj index 2c1df08f7..3e7b59ffd 100644 --- a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj +++ b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj @@ -1,40 +1,39 @@  - - My Tested ASP.NET Core MVC configuration components. - 2015-2019 Ivaylo Kenov - MyTested.AspNetCore.Mvc.Configuration - 3.1.1 - Ivaylo Kenov - netcoreapp3.1 - $(NoWarn);CS1591 - true - true - MyTested.AspNetCore.Mvc.Configuration - ../../tools/Key.snk - true - true - MyTested.AspNetCore.Mvc.Configuration - aspnetcore;aspnetcoremvc;testing;unit;tests;fluent;testing;framework;asp;net;core;mvc;test;mymvc;mytested - nuget-logo.png - https://mytestedasp.net/ - LICENSE - true - git - https://github.com/ivaylokenov/MyTested.AspNetCore.Mvc - false - MyTested.AspNetCore.Mvc - true - snupkg - + + My Tested ASP.NET Core MVC configuration components. + 2015-2019 Ivaylo Kenov + MyTested.AspNetCore.Mvc.Configuration + 5.0.1 + Ivaylo Kenov + net5.0 + $(NoWarn);CS1591 + true + true + MyTested.AspNetCore.Mvc.Configuration + ../../tools/Key.snk + true + true + MyTested.AspNetCore.Mvc.Configuration + aspnetcore;aspnetcoremvc;testing;unit;tests;fluent;testing;framework;asp;net;core;mvc;test;mymvc;mytested + nuget-logo.png + https://mytestedasp.net/ + LICENSE + true + git + https://github.com/ivaylokenov/MyTested.AspNetCore.Mvc + false + MyTested.AspNetCore.Mvc + true + snupkg + - - - - - - - - + + + + + + + diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj index 0bb951ea8..d0b2b0fb9 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC controller action result components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.ActionResults - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj index a9391b4ce..a03b22515 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC controller attribute components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Attributes - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj index f953a17f7..c5e8419a2 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC controller view action result components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj index 4e6db37d9..8e243039f 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC controller view assertion methods. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Views - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj b/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj index b32c66715..a93fc33f6 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC controller components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj b/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj index 98e13fb9d..11ee29890 100644 --- a/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj +++ b/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC core components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Core - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj b/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj index cc168b877..e289c2059 100644 --- a/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC data annotations components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.DataAnnotations - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj b/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj index 0efc62cdf..c8cd8efb1 100644 --- a/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj +++ b/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC dependency injection components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.DependencyInjection - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj index ee227a902..f49345e05 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC Entity Framework Core components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.EntityFrameworkCore - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true @@ -33,8 +33,8 @@ - - + + diff --git a/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj b/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj index c0303c77e..d9eedf7fd 100644 --- a/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj +++ b/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC helper components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Helpers - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj b/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj index faff7289b..f59e36f3d 100644 --- a/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj +++ b/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC HTTP components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Http - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj index cbf2888ea..f1a2c8723 100644 --- a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj +++ b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC licensing components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Licensing - 3.1.1 + 5.0.1 Ivaylo Kenov netstandard2.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj b/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj index 6f1d524e3..493309ccb 100644 --- a/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj +++ b/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Lite - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj b/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj index 60ef32dd2..2b06c0d1b 100644 --- a/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj +++ b/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC model state components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ModelState - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj b/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj index 4d27d52be..289ec931c 100644 --- a/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj +++ b/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC model components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Models - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj b/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj index 48695ce76..e095311dc 100644 --- a/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj +++ b/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC configuration options components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Options - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj b/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj index 1a95c3dee..513d85808 100644 --- a/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj +++ b/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC pipeline components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Pipeline - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj b/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj index c3a8c746b..6fc12ce1b 100644 --- a/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj +++ b/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC routing components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Routing - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj b/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj index 266a74e37..7dba5acd2 100644 --- a/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj +++ b/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC session middleware components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Session - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj b/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj index ba8efae6f..224b360bd 100644 --- a/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj +++ b/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC temporary data components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.TempData - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj b/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj index 4c291f3c6..ee098dbb4 100644 --- a/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj +++ b/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Universe - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj index 60aa5a8ca..87812e1da 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC view component attribute assertion methods. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents.Attributes - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj index 3c6005abf..eca89953c 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC view component result assertion methods. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents.Results - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj index 7b7aa3409..67e4e1a4a 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC view components assertion methods. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj b/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj index a591091a3..b5bca99d0 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC view data components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewData - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj b/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj index bfbeeae73..2308f086b 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC view features components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewFeatures - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj b/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj index 8cc672f9f..a450c1e53 100644 --- a/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj +++ b/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc - 3.1.1 + 5.0.1 Ivaylo Kenov - netcoreapp3.1 + net5.0 $(NoWarn);CS1591 true true diff --git a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj index a3bd4fc18..6c535c1e9 100644 --- a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj b/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj index 797b4a2f5..459728302 100644 --- a/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj b/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj index ee5d27b4b..6142c35ad 100644 --- a/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj b/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj index e524c0ba2..822d2ba87 100644 --- a/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj index 8b2e1d90c..0ed6b338e 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj index ca29a74fd..4e79b9708 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj index b4cfb0dc3..1810fb3a1 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj index 4a7dac27f..eae6be5f3 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj index 90c9fab5a..b45aceee9 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk true diff --git a/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj b/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj index 0acfb0b16..cbfbf36e8 100644 --- a/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj b/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj index 978e1868f..949a49f42 100644 --- a/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj index 36c60ec0d..7d483a37c 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk @@ -32,7 +32,7 @@ - + diff --git a/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj b/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj index d465955fd..a29a0aada 100644 --- a/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj b/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj index 5c7a1109d..19a6f133b 100644 --- a/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj b/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj index 1e47bea05..9a44b4d81 100644 --- a/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true true MyTested.AspNetCore.Mvc.Licensing.Test diff --git a/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj b/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj index 1763b56a7..1fc527442 100644 --- a/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj b/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj index 6fef10719..58254a87c 100644 --- a/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj b/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj index d689a686a..da25378ae 100644 --- a/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj index cd6225393..1bbfae117 100644 --- a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj b/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj index 2f2c9e609..2dcdfaf86 100644 --- a/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk @@ -31,7 +31,7 @@ - + diff --git a/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj b/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj index 26a7b6984..9fbf025a6 100644 --- a/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj b/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj index ebab264fc..c6a0d1927 100644 --- a/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj b/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj index dd6c26606..f62c7fb24 100644 --- a/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj b/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj index 49d75c3a1..403a1a5bb 100644 --- a/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj b/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj index 1d03b18c4..ec736ccfd 100644 --- a/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj +++ b/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 MyTested.AspNetCore.Mvc.Test.Setups true ../../tools/Key.snk @@ -18,7 +18,7 @@ - + diff --git a/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj b/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj index 3b0ebfba1..fd4dca84f 100644 --- a/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj b/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj index 5a7c530ce..ab597f998 100644 --- a/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk @@ -29,7 +29,7 @@ - + diff --git a/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj b/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj index b14023ccc..789197817 100644 --- a/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj index 7c1846e8c..313fdfd2e 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj index 3dbf09f71..40b84b064 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj index 122a2a7a9..92056bb9e 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj index 1c14429d0..17ef0e865 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj index 0ca1cee3d..ebbf62a4b 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk From f2a0bc790078ff18efd987a19e9ecafc6f5861c8 Mon Sep 17 00:00:00 2001 From: Philip Shishov Date: Sat, 9 Jan 2021 13:47:11 +0100 Subject: [PATCH 02/19] 1. app.UseDatabaseErrorPage -> services.AddDatabaseDeveloperPageExceptionFilter 2. Add Microsoft.Extensions.Configuration for AddInMemoryCollection extension 3. Add #pragma warning disable EF1001 // Internal EF Core API usage to ServicesTests 4. Update MigratorMock GenerateScript 5. Change throw ex to throw for Re-throwing caught exception changes stack information Successful build --- .../ApplicationParts.Web/Startup.cs | 2 +- samples/Blog/Blog.Web/Startup.cs | 2 +- samples/MusicStore/MusicStore.Web/Startup.cs | 4 ++-- .../Utilities/ExposedObject.cs | 2 +- .../ConfigurationBuilderExtensions.cs | 7 ++++--- .../MyTested.AspNetCore.Mvc.Configuration.csproj | 1 + .../Internal/EntityFrameworkCore/MigratorMock.cs | 15 ++++++++------- .../ScopedInMemoryOptionsExtension.cs | 4 ++-- .../ServicesTests.cs | 5 +++-- .../ServicesTests.cs | 5 +++-- 10 files changed, 26 insertions(+), 21 deletions(-) diff --git a/samples/ApplicationParts/ApplicationParts.Web/Startup.cs b/samples/ApplicationParts/ApplicationParts.Web/Startup.cs index b403f35eb..b1d037f43 100644 --- a/samples/ApplicationParts/ApplicationParts.Web/Startup.cs +++ b/samples/ApplicationParts/ApplicationParts.Web/Startup.cs @@ -48,6 +48,7 @@ public void ConfigureServices(IServiceCollection services) services.AddTransient(); services.AddTransient(); + services.AddDatabaseDeveloperPageExceptionFilter(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env) @@ -55,7 +56,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseDatabaseErrorPage(); } else { diff --git a/samples/Blog/Blog.Web/Startup.cs b/samples/Blog/Blog.Web/Startup.cs index b784c74be..a65ba8bbf 100644 --- a/samples/Blog/Blog.Web/Startup.cs +++ b/samples/Blog/Blog.Web/Startup.cs @@ -66,6 +66,7 @@ public void ConfigureServices(IServiceCollection services) .SetCompatibilityVersion(CompatibilityVersion.Version_3_0); services.AddRazorPages(); + services.AddDatabaseDeveloperPageExceptionFilter(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env) @@ -73,7 +74,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseDatabaseErrorPage(); } else { diff --git a/samples/MusicStore/MusicStore.Web/Startup.cs b/samples/MusicStore/MusicStore.Web/Startup.cs index 2f849cafd..8d54a7d9d 100644 --- a/samples/MusicStore/MusicStore.Web/Startup.cs +++ b/samples/MusicStore/MusicStore.Web/Startup.cs @@ -116,6 +116,8 @@ public void ConfigureServices(IServiceCollection services) options.ClientId = "000000004012C08A"; options.ClientSecret = "GaMQ2hCnqAC6EcDLnXsAeBVIJOLmeutL"; }); + + services.AddDatabaseDeveloperPageExceptionFilter(); } //This method is invoked when ASPNETCORE_ENVIRONMENT is 'Development' or is not defined @@ -129,8 +131,6 @@ public void ConfigureDevelopment(IApplicationBuilder app, ILoggerFactory loggerF // During development use the ErrorPage middleware to display error information in the browser app.UseDeveloperExceptionPage(); - app.UseDatabaseErrorPage(); - Configure(app); } diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExposedObject.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExposedObject.cs index acb7fcf06..2c483ef8f 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExposedObject.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExposedObject.cs @@ -100,7 +100,7 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o throw ex.InnerException; } - throw ex; + throw; } return true; diff --git a/src/MyTested.AspNetCore.Mvc.Configuration/ConfigurationBuilderExtensions.cs b/src/MyTested.AspNetCore.Mvc.Configuration/ConfigurationBuilderExtensions.cs index eb1e42b79..82940affe 100644 --- a/src/MyTested.AspNetCore.Mvc.Configuration/ConfigurationBuilderExtensions.cs +++ b/src/MyTested.AspNetCore.Mvc.Configuration/ConfigurationBuilderExtensions.cs @@ -1,8 +1,9 @@ namespace MyTested.AspNetCore.Mvc { - using System.Collections.Generic; - using Microsoft.Extensions.Configuration; - + using System.Collections.Generic; + + using Microsoft.Extensions.Configuration; + public static class ConfigurationBuilderExtensions { /// diff --git a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj index 3e7b59ffd..ee7835610 100644 --- a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj +++ b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj @@ -29,6 +29,7 @@ + diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/MigratorMock.cs b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/MigratorMock.cs index e6e850a28..0b898229d 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/MigratorMock.cs +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/MigratorMock.cs @@ -5,13 +5,14 @@ using Microsoft.EntityFrameworkCore.Migrations; public class MigratorMock : IMigrator - { - public string GenerateScript( - string fromMigration = null, - string toMigration = null, - bool idempotent = false) - => string.Empty; - + { + public string GenerateScript( + string fromMigration = null, + string toMigration = null, + MigrationsSqlGenerationOptions options = + MigrationsSqlGenerationOptions.Default) + => string.Empty; + public void Migrate(string targetMigration = null) { // intentionally left empty diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/ScopedInMemoryOptionsExtension.cs b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/ScopedInMemoryOptionsExtension.cs index 12a885408..914422544 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/ScopedInMemoryOptionsExtension.cs +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/ScopedInMemoryOptionsExtension.cs @@ -6,8 +6,8 @@ using Microsoft.Extensions.DependencyInjection; #pragma warning disable EF1001 // Internal EF Core API usage. - public class ScopedInMemoryOptionsExtension : InMemoryOptionsExtension -#pragma warning restore EF1001 // Internal EF Core API usage. + public class ScopedInMemoryOptionsExtension : InMemoryOptionsExtension + //#pragma warning restore EF1001 // Internal EF Core API usage. { public override void ApplyServices(IServiceCollection services) => services diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs index f83d1fb80..12a03f593 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs @@ -8,8 +8,9 @@ using Microsoft.Extensions.DependencyInjection; using Setups; using Setups.Common; - using Xunit; - + using Xunit; + +#pragma warning disable EF1001 // Internal EF Core API usage. public class ServicesTests { [Fact] diff --git a/test/MyTested.AspNetCore.Mvc.Universe.Test/ServicesTests.cs b/test/MyTested.AspNetCore.Mvc.Universe.Test/ServicesTests.cs index f3d8df095..4ccacd068 100644 --- a/test/MyTested.AspNetCore.Mvc.Universe.Test/ServicesTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Universe.Test/ServicesTests.cs @@ -21,8 +21,9 @@ using Microsoft.Extensions.Options; using Setups; using Setups.Common; - using Xunit; - + using Xunit; + +#pragma warning disable EF1001 // Internal EF Core API usage. public class ServicesTests { [Fact] From a7205f68a234926169f6f253fd3800a34aa751d2 Mon Sep 17 00:00:00 2001 From: Philip Shishov Date: Sat, 9 Jan 2021 14:17:59 +0100 Subject: [PATCH 03/19] Update netstandard2.0 to 2.1 --- .../WebApplication.Services/WebApplication.Services.csproj | 2 +- samples/NoStartup/NoStartup.Services/NoStartup.Services.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Licensing.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/Configuration/WebApplication.Services/WebApplication.Services.csproj b/samples/Configuration/WebApplication.Services/WebApplication.Services.csproj index 4175b493d..f7acee11e 100644 --- a/samples/Configuration/WebApplication.Services/WebApplication.Services.csproj +++ b/samples/Configuration/WebApplication.Services/WebApplication.Services.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.1 true false diff --git a/samples/NoStartup/NoStartup.Services/NoStartup.Services.csproj b/samples/NoStartup/NoStartup.Services/NoStartup.Services.csproj index dc7a038cb..ce3fe07e8 100644 --- a/samples/NoStartup/NoStartup.Services/NoStartup.Services.csproj +++ b/samples/NoStartup/NoStartup.Services/NoStartup.Services.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.1 $(NoWarn);CS1591 true false diff --git a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj index f1a2c8723..4d2a1f3db 100644 --- a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj +++ b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj @@ -6,7 +6,7 @@ MyTested.AspNetCore.Mvc.Licensing 5.0.1 Ivaylo Kenov - netstandard2.0 + netstandard2.1 $(NoWarn);CS1591 true true From dafbd0e564324d8df8a0223ee822d6622b393009 Mon Sep 17 00:00:00 2001 From: Ivaylo Kenov Date: Fri, 9 Jul 2021 09:45:26 +0300 Subject: [PATCH 04/19] Updated version prefix to 5.0.0 --- .../MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Versioning.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Abstractions.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Authentication.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Caching.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Configuration.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj | 2 +- ...Tested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Controllers.Views.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Controllers.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Core.csproj | 2 +- .../MyTested.AspNetCore.Mvc.DataAnnotations.csproj | 2 +- .../MyTested.AspNetCore.Mvc.DependencyInjection.csproj | 2 +- .../MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Helpers.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Http.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Licensing.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Lite.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ModelState.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Models.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Options.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Pipeline.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Routing.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Session.csproj | 2 +- .../MyTested.AspNetCore.Mvc.TempData.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Universe.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewComponents.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewData.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewFeatures.csproj | 2 +- src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj index 57a1633a6..6e9045cdc 100644 --- a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC Newtonsoft JSON components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.NewtonsoftJson - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj index 924710e19..027122eda 100644 --- a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC versioning components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Versioning - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj index b528de9f5..af0dc12af 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC common abstractions and interfaces. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Abstractions - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj b/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj index 425ba77fd..dafa4de74 100644 --- a/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj +++ b/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC authentication components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Authentication - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj index b5dd305d2..313807969 100644 --- a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj +++ b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC caching components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Caching - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj index ee7835610..e64b5205a 100644 --- a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj +++ b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC configuration components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Configuration - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj index d0b2b0fb9..03347d96a 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC controller action result components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.ActionResults - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj index a03b22515..e29af2da8 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC controller attribute components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Attributes - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj index c5e8419a2..faeeb891c 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC controller view action result components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj index 8e243039f..c0b0b5380 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC controller view assertion methods. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Views - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj b/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj index a93fc33f6..df22cc5c1 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC controller components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj b/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj index 11ee29890..dbc3cf591 100644 --- a/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj +++ b/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC core components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Core - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj b/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj index e289c2059..9fa907416 100644 --- a/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC data annotations components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.DataAnnotations - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj b/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj index c8cd8efb1..8446805c2 100644 --- a/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj +++ b/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC dependency injection components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.DependencyInjection - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj index f49345e05..5d2e3241f 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC Entity Framework Core components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.EntityFrameworkCore - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj b/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj index d9eedf7fd..b92f98ce3 100644 --- a/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj +++ b/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC helper components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Helpers - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj b/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj index f59e36f3d..994fe8fb3 100644 --- a/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj +++ b/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC HTTP components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Http - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj index 4d2a1f3db..116a02e80 100644 --- a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj +++ b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC licensing components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Licensing - 5.0.1 + 5.0.0 Ivaylo Kenov netstandard2.1 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj b/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj index 493309ccb..bdbc57284 100644 --- a/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj +++ b/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Lite - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj b/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj index 2b06c0d1b..15d3f9bb6 100644 --- a/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj +++ b/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC model state components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ModelState - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj b/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj index 289ec931c..f63a892ee 100644 --- a/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj +++ b/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC model components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Models - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj b/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj index e095311dc..c04422994 100644 --- a/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj +++ b/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC configuration options components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Options - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj b/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj index 513d85808..a7d28d782 100644 --- a/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj +++ b/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC pipeline components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Pipeline - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj b/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj index 6fc12ce1b..0c7517b97 100644 --- a/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj +++ b/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC routing components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Routing - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj b/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj index 7dba5acd2..9be0e5a71 100644 --- a/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj +++ b/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC session middleware components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Session - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj b/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj index 224b360bd..2bfd9698c 100644 --- a/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj +++ b/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC temporary data components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.TempData - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj b/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj index ee098dbb4..f3a4eea27 100644 --- a/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj +++ b/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.Universe - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj index 87812e1da..3eccdc317 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC view component attribute assertion methods. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents.Attributes - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj index eca89953c..188c8612e 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC view component result assertion methods. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents.Results - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj index 67e4e1a4a..74fb41f82 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC view components assertion methods. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj b/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj index b5bca99d0..4622d2a2b 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC view data components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewData - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj b/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj index 2308f086b..2fc5aae75 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC view features components. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewFeatures - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 diff --git a/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj b/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj index a450c1e53..91a9a05c8 100644 --- a/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj +++ b/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj @@ -4,7 +4,7 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. 2015-2019 Ivaylo Kenov MyTested.AspNetCore.Mvc - 5.0.1 + 5.0.0 Ivaylo Kenov net5.0 $(NoWarn);CS1591 From 7824f5a559fb5cef7a0d5cef45e5d1a1ddeb7853 Mon Sep 17 00:00:00 2001 From: Ivaylo Kenov Date: Fri, 9 Jul 2021 11:19:27 +0300 Subject: [PATCH 05/19] Fixed all failing tests after updating ASP.NET Core to version 5.0 --- .../Application/TestApplicationStartupLoader.cs | 3 ++- .../Internal/TestFramework.cs | 4 ++-- .../Utilities/ExposedObject.cs | 12 ++++++++---- .../JsonTests/JsonSerializerTestBuilderTests.cs | 2 +- .../PluginsTests/ViewDataTestPluginTests.cs | 3 ++- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplicationStartupLoader.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplicationStartupLoader.cs index 72ece3df5..0352457bb 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplicationStartupLoader.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplicationStartupLoader.cs @@ -116,7 +116,8 @@ private static void PrepareStartup(IServiceCollection serviceCollection) startupMethods = startupLoader.LoadMethods( serviceCollection.BuildServiceProviderFromFactory(), StartupType, - TestWebServer.Environment.EnvironmentName); + TestWebServer.Environment.EnvironmentName, + null); if (typeof(IStartup).GetTypeInfo().IsAssignableFrom(StartupType.GetTypeInfo())) { diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs index 72d5a88da..4be7725af 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs @@ -7,8 +7,8 @@ public static class TestFramework { public const string TestFrameworkName = "MyTested.AspNetCore.Mvc"; - public const string ReleaseDate = "2019-12-12"; - public const string VersionPrefix = "3.1"; + public const string ReleaseDate = "2021-07-01"; + public const string VersionPrefix = "5.0"; internal static void EnsureCorrectVersion(DependencyContext dependencyContext) { diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExposedObject.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExposedObject.cs index 2c483ef8f..6cc42bd8a 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExposedObject.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExposedObject.cs @@ -79,18 +79,22 @@ public override bool TryGetMember(GetMemberBinder binder, out object result) return base.TryGetMember(binder, out result); } - public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result) + public override bool TryInvokeMember(InvokeMemberBinder binder, object[] arguments, out object result) { - args = args + arguments = arguments .Select(a => Unwrap(a)) .ToArray(); - var method = this.type.GetMethod(binder.Name, args.Select(a => a.GetType()).ToArray()); + var argumentsTypes = arguments + .Select(a => a?.GetType() ?? typeof(object)) + .ToArray(); + + var method = this.type.GetMethod(binder.Name, argumentsTypes); try { result = method - .Invoke(this.instance, args) + .Invoke(this.instance, arguments) .Exposed(); } catch (Exception ex) diff --git a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/BuildersTests/ActionResultsTests/JsonTests/JsonSerializerTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/BuildersTests/ActionResultsTests/JsonTests/JsonSerializerTestBuilderTests.cs index 4dd73c15a..deb96cb43 100644 --- a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/BuildersTests/ActionResultsTests/JsonTests/JsonSerializerTestBuilderTests.cs +++ b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/BuildersTests/ActionResultsTests/JsonTests/JsonSerializerTestBuilderTests.cs @@ -109,7 +109,7 @@ public void WithCultureShouldThrowExceptionWithIncorrectValue() .WithJsonSerializerSettings(s => s.WithCulture(CultureInfo.GetCultureInfo("en-US")))); }, - "When calling JsonWithSettingsAction action in MvcController expected JSON result serializer settings to have 'English (United States)' culture, but in fact found 'Invariant Language (Invariant Country)'."); + "When calling JsonWithSettingsAction action in MvcController expected JSON result serializer settings to have 'English (United States)' culture, but in fact found 'Unknown language'."); } [Fact] diff --git a/test/MyTested.AspNetCore.Mvc.ViewData.Test/PluginsTests/ViewDataTestPluginTests.cs b/test/MyTested.AspNetCore.Mvc.ViewData.Test/PluginsTests/ViewDataTestPluginTests.cs index 7edf237ff..1cc72eddb 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewData.Test/PluginsTests/ViewDataTestPluginTests.cs +++ b/test/MyTested.AspNetCore.Mvc.ViewData.Test/PluginsTests/ViewDataTestPluginTests.cs @@ -33,6 +33,7 @@ public void ShouldInvokeMethodOfTypeVoidWithValidServiceCollection() testPlugin.DefaultServiceRegistrationDelegate(serviceCollection); - Assert.True(serviceCollection.Count == 157); } + Assert.True(serviceCollection.Count == 160); + } } } From c3eef39c5db7af131afd201a5440f615d8e5eb37 Mon Sep 17 00:00:00 2001 From: Ivaylo Kenov Date: Fri, 9 Jul 2021 11:49:42 +0300 Subject: [PATCH 06/19] Updated all packages to their latest stable version --- ...MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Versioning.csproj | 2 +- .../ApplicationParts.Controllers.csproj | 2 +- .../ApplicationParts.Models.csproj | 2 +- .../ApplicationParts.Test.csproj | 6 +++--- .../ApplicationParts.Web.csproj | 8 ++++---- .../ApplicationParts.Web/Startup.cs | 1 + .../Autofac.AssemblyInit.Test.csproj | 6 +++--- .../Autofac.NoContainerBuilder.Test.csproj | 7 +++++-- .../Autofac.NoContainerBuilder.Web.csproj | 2 +- samples/Autofac/Autofac.Test/Autofac.Test.csproj | 7 +++++-- samples/Autofac/Autofac.Web/Autofac.Web.csproj | 2 +- samples/Blog/Blog.Data/Blog.Data.csproj | 4 ++-- samples/Blog/Blog.Services/Blog.Services.csproj | 2 +- samples/Blog/Blog.Test/Blog.Test.csproj | 11 +++++++---- samples/Blog/Blog.Web/Blog.Web.csproj | 8 ++++---- samples/Configuration/Common/Common.csproj | 7 +++++-- .../Test.DifferentEnvironment.csproj | 7 +++++-- .../Test.ExplicitNoStartupType.csproj | 7 +++++-- .../Test.MissingStartupType.csproj | 7 +++++-- .../Test.MultipleEntryPoints.csproj | 7 +++++-- .../Test.NoAsync/Test.NoAsync.csproj | 7 +++++-- .../Test.NoStartupType/Test.NoStartupType.csproj | 7 +++++-- .../Test.WrongStartupType.csproj | 7 +++++-- .../Test.WrongTestAssembly.csproj | 7 +++++-- .../Test.WrongWebAssembly.csproj | 7 +++++-- samples/Lite/Lite.Test/Lite.Test.csproj | 9 ++++++--- .../MusicStore.Test/MusicStore.Test.csproj | 7 +++++-- .../MusicStore.Web/MusicStore.Web.csproj | 16 ++++++++-------- .../NoStartup.Test/NoStartup.Test.csproj | 6 +++--- .../WebStartup.Test/WebStartup.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.Abstractions.csproj | 2 +- ...ted.AspNetCore.Mvc.EntityFrameworkCore.csproj | 4 ++-- ...ested.AspNetCore.Mvc.Abstractions.Test.csproj | 7 +++++-- ...ted.AspNetCore.Mvc.Authentication.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.Caching.Test.csproj | 7 +++++-- ...sted.AspNetCore.Mvc.Configuration.Test.csproj | 7 +++++-- ...ore.Mvc.Controllers.ActionResults.Test.csproj | 7 +++++-- ...etCore.Mvc.Controllers.Attributes.Test.csproj | 7 +++++-- ...Tested.AspNetCore.Mvc.Controllers.Test.csproj | 7 +++++-- ...c.Controllers.Views.ActionResults.Test.csproj | 7 +++++-- ....AspNetCore.Mvc.Controllers.Views.Test.csproj | 7 +++++-- ...ed.AspNetCore.Mvc.DataAnnotations.Test.csproj | 7 +++++-- ...spNetCore.Mvc.DependencyInjection.Test.csproj | 7 +++++-- ...spNetCore.Mvc.EntityFrameworkCore.Test.csproj | 9 ++++++--- .../MyTested.AspNetCore.Mvc.Helpers.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.Http.Test.csproj | 7 +++++-- ...MyTested.AspNetCore.Mvc.Licensing.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.Lite.Test.csproj | 7 +++++-- ...yTested.AspNetCore.Mvc.ModelState.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.Models.Test.csproj | 7 +++++-- ...ted.AspNetCore.Mvc.NewtonsoftJson.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.Options.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.Pipeline.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.Routing.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.Session.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.TempData.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.Test.Setups.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.Universe.Test.csproj | 9 ++++++--- ...yTested.AspNetCore.Mvc.Versioning.Test.csproj | 7 +++++-- ...ore.Mvc.ViewComponents.Attributes.Test.csproj | 7 +++++-- ...etCore.Mvc.ViewComponents.Results.Test.csproj | 7 +++++-- ...ted.AspNetCore.Mvc.ViewComponents.Test.csproj | 7 +++++-- .../MyTested.AspNetCore.Mvc.ViewData.Test.csproj | 7 +++++-- ...ested.AspNetCore.Mvc.ViewFeatures.Test.csproj | 7 +++++-- 66 files changed, 284 insertions(+), 139 deletions(-) diff --git a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj index 6e9045cdc..9c2bb3035 100644 --- a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj @@ -29,7 +29,7 @@ - + diff --git a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj index 027122eda..83786fc71 100644 --- a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj @@ -29,7 +29,7 @@ - + diff --git a/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj b/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj index 6ab607976..f9b483523 100644 --- a/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj +++ b/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj b/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj index b0c48493a..11578fda2 100644 --- a/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj +++ b/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj @@ -16,7 +16,7 @@ - + diff --git a/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj b/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj index 911b3a326..d9de1169e 100644 --- a/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj +++ b/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj b/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj index e9c6d6f2e..ec00b2d4c 100644 --- a/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj +++ b/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj @@ -18,10 +18,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/samples/ApplicationParts/ApplicationParts.Web/Startup.cs b/samples/ApplicationParts/ApplicationParts.Web/Startup.cs index b1d037f43..7e2cf534d 100644 --- a/samples/ApplicationParts/ApplicationParts.Web/Startup.cs +++ b/samples/ApplicationParts/ApplicationParts.Web/Startup.cs @@ -48,6 +48,7 @@ public void ConfigureServices(IServiceCollection services) services.AddTransient(); services.AddTransient(); + services.AddDatabaseDeveloperPageExceptionFilter(); } diff --git a/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj b/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj index 0d8525c0d..77b737e4d 100644 --- a/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj +++ b/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj b/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj index 29d3b877e..82277d2ad 100644 --- a/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj +++ b/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj b/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj index 465391f35..c8ad5e41b 100644 --- a/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj +++ b/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj @@ -8,7 +8,7 @@ - + diff --git a/samples/Autofac/Autofac.Test/Autofac.Test.csproj b/samples/Autofac/Autofac.Test/Autofac.Test.csproj index 7b8e48bfa..8ee74e213 100644 --- a/samples/Autofac/Autofac.Test/Autofac.Test.csproj +++ b/samples/Autofac/Autofac.Test/Autofac.Test.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Autofac/Autofac.Web/Autofac.Web.csproj b/samples/Autofac/Autofac.Web/Autofac.Web.csproj index ff61050d4..e1be01749 100644 --- a/samples/Autofac/Autofac.Web/Autofac.Web.csproj +++ b/samples/Autofac/Autofac.Web/Autofac.Web.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/Blog/Blog.Data/Blog.Data.csproj b/samples/Blog/Blog.Data/Blog.Data.csproj index 2a4a8efeb..f5b76ffa9 100644 --- a/samples/Blog/Blog.Data/Blog.Data.csproj +++ b/samples/Blog/Blog.Data/Blog.Data.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/samples/Blog/Blog.Services/Blog.Services.csproj b/samples/Blog/Blog.Services/Blog.Services.csproj index 9b5488fc2..e4ff40a8c 100644 --- a/samples/Blog/Blog.Services/Blog.Services.csproj +++ b/samples/Blog/Blog.Services/Blog.Services.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/Blog/Blog.Test/Blog.Test.csproj b/samples/Blog/Blog.Test/Blog.Test.csproj index 399f50930..d59c49780 100644 --- a/samples/Blog/Blog.Test/Blog.Test.csproj +++ b/samples/Blog/Blog.Test/Blog.Test.csproj @@ -12,11 +12,14 @@ - - - + + + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Blog/Blog.Web/Blog.Web.csproj b/samples/Blog/Blog.Web/Blog.Web.csproj index cd3df840f..760dd0d8b 100644 --- a/samples/Blog/Blog.Web/Blog.Web.csproj +++ b/samples/Blog/Blog.Web/Blog.Web.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/samples/Configuration/Common/Common.csproj b/samples/Configuration/Common/Common.csproj index d34f807fb..2ad321c59 100644 --- a/samples/Configuration/Common/Common.csproj +++ b/samples/Configuration/Common/Common.csproj @@ -8,9 +8,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj b/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj index bb5f50165..988e802a8 100644 --- a/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj +++ b/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj b/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj index b2edf6be7..e20995d04 100644 --- a/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj +++ b/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj b/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj index 1c3494bf3..20260d261 100644 --- a/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj +++ b/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj b/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj index f4a4da5f2..e02287f99 100644 --- a/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj +++ b/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj b/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj index 84d270973..30743c1a0 100644 --- a/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj +++ b/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj b/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj index b2edf6be7..e20995d04 100644 --- a/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj +++ b/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj b/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj index b2edf6be7..e20995d04 100644 --- a/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj +++ b/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj b/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj index b2edf6be7..e20995d04 100644 --- a/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj +++ b/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj b/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj index b2edf6be7..e20995d04 100644 --- a/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj +++ b/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/Lite/Lite.Test/Lite.Test.csproj b/samples/Lite/Lite.Test/Lite.Test.csproj index 3fa4c292a..38d833b54 100644 --- a/samples/Lite/Lite.Test/Lite.Test.csproj +++ b/samples/Lite/Lite.Test/Lite.Test.csproj @@ -11,10 +11,13 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + diff --git a/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj b/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj index 3769024a9..ec8e48972 100644 --- a/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj +++ b/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj b/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj index 742733f98..beb511a73 100644 --- a/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj +++ b/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + diff --git a/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj b/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj index 3a6fd106e..1a0065282 100644 --- a/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj +++ b/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj @@ -24,9 +24,9 @@ - - - + + + \ No newline at end of file diff --git a/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj b/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj index 2cbfca564..dfbb81139 100644 --- a/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj +++ b/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj @@ -6,9 +6,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj index af0dc12af..7098a292c 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj @@ -38,7 +38,7 @@ - + diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj index 5d2e3241f..cc568f5f8 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj @@ -33,8 +33,8 @@ - - + + diff --git a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj index 6c535c1e9..027d46d7a 100644 --- a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj @@ -26,8 +26,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj b/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj index 459728302..8053abb3e 100644 --- a/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj @@ -28,8 +28,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj b/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj index 6142c35ad..45c9fc022 100644 --- a/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj @@ -29,8 +29,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj b/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj index 822d2ba87..d10610647 100644 --- a/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj @@ -19,9 +19,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + \ No newline at end of file diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj index 0ed6b338e..f10f6a66b 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj @@ -27,8 +27,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj index 4e79b9708..21179a262 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj @@ -15,9 +15,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj index 1810fb3a1..67da9ee9a 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj @@ -26,8 +26,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj index eae6be5f3..e532d39cb 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj @@ -27,8 +27,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj index b45aceee9..894255a73 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj @@ -26,8 +26,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj b/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj index cbfbf36e8..9e4998caf 100644 --- a/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj @@ -26,8 +26,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj b/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj index 949a49f42..8303eff18 100644 --- a/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj @@ -29,8 +29,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj index 7d483a37c..a7528543c 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj @@ -29,10 +29,13 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + diff --git a/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj b/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj index a29a0aada..cdefb6702 100644 --- a/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj @@ -26,8 +26,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj b/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj index 19a6f133b..c0e862461 100644 --- a/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj @@ -28,8 +28,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj b/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj index 9a44b4d81..0df0fa60c 100644 --- a/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj @@ -26,8 +26,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj b/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj index 1fc527442..f7107f453 100644 --- a/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj @@ -26,8 +26,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj b/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj index 58254a87c..2cf2d64a3 100644 --- a/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj @@ -29,8 +29,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj b/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj index da25378ae..9051e335f 100644 --- a/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj @@ -27,8 +27,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj index 1bbfae117..60d52a21c 100644 --- a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj @@ -27,8 +27,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj b/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj index 2dcdfaf86..4ae949e0b 100644 --- a/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj @@ -28,8 +28,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj b/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj index 9fbf025a6..e880d3599 100644 --- a/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj @@ -29,8 +29,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj b/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj index c6a0d1927..de6afd8a9 100644 --- a/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj @@ -29,8 +29,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj b/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj index f62c7fb24..5332aa9d3 100644 --- a/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj @@ -29,8 +29,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj b/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj index 403a1a5bb..6949c3ea6 100644 --- a/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj @@ -29,8 +29,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj b/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj index ec736ccfd..53c6301e2 100644 --- a/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj +++ b/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj @@ -18,7 +18,7 @@ - + diff --git a/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj b/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj index fd4dca84f..027cdbd54 100644 --- a/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj @@ -25,8 +25,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj b/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj index ab597f998..9c4450320 100644 --- a/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj @@ -26,10 +26,13 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + diff --git a/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj b/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj index 789197817..acf5f92cf 100644 --- a/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj @@ -23,8 +23,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj index 313fdfd2e..d411940d3 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj @@ -26,9 +26,12 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj index 40b84b064..a6bd656fd 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj @@ -27,8 +27,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj index 92056bb9e..b236b3c20 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj @@ -27,8 +27,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj index 17ef0e865..ddc521d61 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj @@ -28,8 +28,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj index ebbf62a4b..daa824f34 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj @@ -26,8 +26,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + From 545ae35c68b9b943bc8cfad696a88f283b390cdc Mon Sep 17 00:00:00 2001 From: Ivaylo Kenov Date: Fri, 9 Jul 2021 14:13:44 +0300 Subject: [PATCH 07/19] Fixed various styling errors --- .../ConfigurationBuilderExtensions.cs | 43 +- .../ScopedInMemoryOptionsExtension.cs | 4 +- .../ServicesTests.cs | 231 ++--- .../ServicesTests.cs | 849 +++++++++--------- 4 files changed, 564 insertions(+), 563 deletions(-) diff --git a/src/MyTested.AspNetCore.Mvc.Configuration/ConfigurationBuilderExtensions.cs b/src/MyTested.AspNetCore.Mvc.Configuration/ConfigurationBuilderExtensions.cs index 82940affe..e0355c46a 100644 --- a/src/MyTested.AspNetCore.Mvc.Configuration/ConfigurationBuilderExtensions.cs +++ b/src/MyTested.AspNetCore.Mvc.Configuration/ConfigurationBuilderExtensions.cs @@ -1,25 +1,24 @@ -namespace MyTested.AspNetCore.Mvc -{ +namespace MyTested.AspNetCore.Mvc +{ using System.Collections.Generic; - using Microsoft.Extensions.Configuration; - public static class ConfigurationBuilderExtensions - { - /// - /// Adds the provided key-value pair to the configuration builder. - /// - /// The to add to. - /// The configuration key to add. - /// The configuration value to add. - /// The same . - public static IConfigurationBuilder Add( - this IConfigurationBuilder configurationBuilder, - string key, - string value) - => configurationBuilder.AddInMemoryCollection(new[] - { - new KeyValuePair(key, value) - }); - } -} + public static class ConfigurationBuilderExtensions + { + /// + /// Adds the provided key-value pair to the configuration builder. + /// + /// The to add to. + /// The configuration key to add. + /// The configuration value to add. + /// The same . + public static IConfigurationBuilder Add( + this IConfigurationBuilder configurationBuilder, + string key, + string value) + => configurationBuilder.AddInMemoryCollection(new[] + { + new KeyValuePair(key, value) + }); + } +} diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/ScopedInMemoryOptionsExtension.cs b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/ScopedInMemoryOptionsExtension.cs index 914422544..b1db9d52f 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/ScopedInMemoryOptionsExtension.cs +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/ScopedInMemoryOptionsExtension.cs @@ -7,7 +7,6 @@ #pragma warning disable EF1001 // Internal EF Core API usage. public class ScopedInMemoryOptionsExtension : InMemoryOptionsExtension - //#pragma warning restore EF1001 // Internal EF Core API usage. { public override void ApplyServices(IServiceCollection services) => services @@ -15,5 +14,6 @@ public override void ApplyServices(IServiceCollection services) .ReplaceLifetime(ServiceLifetime.Scoped) .ReplaceLifetime(ServiceLifetime.Scoped) .ReplaceLifetime(ServiceLifetime.Scoped); - } + } +#pragma warning restore EF1001 // Internal EF Core API usage. } diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs index 12a03f593..3341f2f32 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs @@ -1,117 +1,118 @@ -namespace MyTested.AspNetCore.Mvc.Test -{ - using System.Linq; - using Internal.EntityFrameworkCore; - using Microsoft.EntityFrameworkCore; - using Microsoft.EntityFrameworkCore.Infrastructure; - using Microsoft.EntityFrameworkCore.InMemory.Infrastructure.Internal; - using Microsoft.Extensions.DependencyInjection; - using Setups; - using Setups.Common; +namespace MyTested.AspNetCore.Mvc.Test +{ + using System.Linq; + using Internal.EntityFrameworkCore; + using Microsoft.EntityFrameworkCore; + using Microsoft.EntityFrameworkCore.Infrastructure; + using Microsoft.EntityFrameworkCore.InMemory.Infrastructure.Internal; + using Microsoft.Extensions.DependencyInjection; + using Setups; + using Setups.Common; using Xunit; -#pragma warning disable EF1001 // Internal EF Core API usage. - public class ServicesTests - { - [Fact] - public void ReplaceDbContextShouldReplaceNonInMemoryDatabaseWithInMemoryScopedOne() - { - var services = new ServiceCollection(); - - this.AddDbContextWithSqlServer(services); - - services.ReplaceDbContext(); - - this.AssertCorrectDbContextAndOptions(services); - } - - [Fact] - public void ReplaceDbContextShouldReplaceInMemoryDatabaseWithInMemoryScopedOne() - { - var services = new ServiceCollection(); - - services.AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); - - services.ReplaceDbContext(); - - this.AssertCorrectDbContextAndOptions(services); - } - - [Fact] - public void ReplaceDbContextShouldNotAddDbContextIfMissing() - { - var services = new ServiceCollection(); - - services.ReplaceDbContext(); - - var serviceProvider = services.BuildServiceProvider(); - - Assert.Null(serviceProvider.GetService()); - } - - [Fact] - public void ReplaceDbContextShouldReplaceMultipleDbContextTypes() - { - var services = new ServiceCollection(); - - this.AddDbContextWithSqlServer(services); - this.AddDbContextWithSqlServer(services); - - services.ReplaceDbContext(); - - this.AssertCorrectDbContextAndOptions(services); - this.AssertCorrectDbContextAndOptions(services); - } - - [Fact] - public void CallingMigrateShouldNotThrowExceptionWithInMemoryDatabase() - { - var services = new ServiceCollection(); - - this.AddDbContextWithSqlServer(services); - - services.ReplaceDbContext(); - - services.BuildServiceProvider().GetRequiredService().Database.Migrate(); - } - - private void AddDbContextWithSqlServer(IServiceCollection services) - => this.AddDbContextWithSqlServer(services); - - private void AddDbContextWithSqlServer(IServiceCollection services) - where TDbContext : DbContext - => services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); - - private void AssertCorrectDbContextAndOptions(IServiceCollection services) - => this.AssertCorrectDbContextAndOptions(services); - - private void AssertCorrectDbContextAndOptions(IServiceCollection services) - where TDbContext : DbContext - { - var serviceProvider = services.BuildServiceProvider(); - - var dbContextService = services.FirstOrDefault(s => s.ServiceType == typeof(TDbContext)); - - Assert.NotNull(dbContextService); - Assert.Equal(ServiceLifetime.Scoped, dbContextService.Lifetime); - - var customDbContext = serviceProvider.GetService(); - - Assert.NotNull(customDbContext); - - var dbContextOptions = serviceProvider.GetService>(); - - Assert.NotNull(dbContextOptions); - Assert.Equal(3, dbContextOptions.Extensions.Count()); - - var coreOptionsExtension = dbContextOptions.FindExtension(); - var inMemoryOptionsExtension = dbContextOptions.FindExtension(); - var scopedInMemoryOptionsExtension = dbContextOptions.FindExtension(); - - Assert.NotNull(coreOptionsExtension); - Assert.NotNull(inMemoryOptionsExtension); - Assert.NotNull(scopedInMemoryOptionsExtension); - } - } -} + public class ServicesTests + { + [Fact] + public void ReplaceDbContextShouldReplaceNonInMemoryDatabaseWithInMemoryScopedOne() + { + var services = new ServiceCollection(); + + this.AddDbContextWithSqlServer(services); + + services.ReplaceDbContext(); + + this.AssertCorrectDbContextAndOptions(services); + } + + [Fact] + public void ReplaceDbContextShouldReplaceInMemoryDatabaseWithInMemoryScopedOne() + { + var services = new ServiceCollection(); + + services.AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); + + services.ReplaceDbContext(); + + this.AssertCorrectDbContextAndOptions(services); + } + + [Fact] + public void ReplaceDbContextShouldNotAddDbContextIfMissing() + { + var services = new ServiceCollection(); + + services.ReplaceDbContext(); + + var serviceProvider = services.BuildServiceProvider(); + + Assert.Null(serviceProvider.GetService()); + } + + [Fact] + public void ReplaceDbContextShouldReplaceMultipleDbContextTypes() + { + var services = new ServiceCollection(); + + this.AddDbContextWithSqlServer(services); + this.AddDbContextWithSqlServer(services); + + services.ReplaceDbContext(); + + this.AssertCorrectDbContextAndOptions(services); + this.AssertCorrectDbContextAndOptions(services); + } + + [Fact] + public void CallingMigrateShouldNotThrowExceptionWithInMemoryDatabase() + { + var services = new ServiceCollection(); + + this.AddDbContextWithSqlServer(services); + + services.ReplaceDbContext(); + + services.BuildServiceProvider().GetRequiredService().Database.Migrate(); + } + + private void AddDbContextWithSqlServer(IServiceCollection services) + => this.AddDbContextWithSqlServer(services); + + private void AddDbContextWithSqlServer(IServiceCollection services) + where TDbContext : DbContext + => services.AddDbContext(options => + options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + + private void AssertCorrectDbContextAndOptions(IServiceCollection services) + => this.AssertCorrectDbContextAndOptions(services); + + private void AssertCorrectDbContextAndOptions(IServiceCollection services) + where TDbContext : DbContext + { + var serviceProvider = services.BuildServiceProvider(); + + var dbContextService = services.FirstOrDefault(s => s.ServiceType == typeof(TDbContext)); + + Assert.NotNull(dbContextService); + Assert.Equal(ServiceLifetime.Scoped, dbContextService.Lifetime); + + var customDbContext = serviceProvider.GetService(); + + Assert.NotNull(customDbContext); + + var dbContextOptions = serviceProvider.GetService>(); + + Assert.NotNull(dbContextOptions); + Assert.Equal(3, dbContextOptions.Extensions.Count()); + +#pragma warning disable EF1001 // Internal EF Core API usage. + var coreOptionsExtension = dbContextOptions.FindExtension(); + var inMemoryOptionsExtension = dbContextOptions.FindExtension(); + var scopedInMemoryOptionsExtension = dbContextOptions.FindExtension(); +#pragma warning restore EF1001 // Internal EF Core API usage. + + Assert.NotNull(coreOptionsExtension); + Assert.NotNull(inMemoryOptionsExtension); + Assert.NotNull(scopedInMemoryOptionsExtension); + } + } +} diff --git a/test/MyTested.AspNetCore.Mvc.Universe.Test/ServicesTests.cs b/test/MyTested.AspNetCore.Mvc.Universe.Test/ServicesTests.cs index 4ccacd068..37e95c194 100644 --- a/test/MyTested.AspNetCore.Mvc.Universe.Test/ServicesTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Universe.Test/ServicesTests.cs @@ -1,426 +1,427 @@ -namespace MyTested.AspNetCore.Mvc.Test -{ - using System; - using System.Linq; - using Internal; - using Internal.Caching; - using Internal.Contracts; - using Internal.EntityFrameworkCore; - using Internal.Formatters; - using Internal.Routing; - using Internal.Services; - using Internal.Session; - using Microsoft.AspNetCore.Mvc; - using Microsoft.AspNetCore.Mvc.ViewFeatures; - using Microsoft.AspNetCore.Session; - using Microsoft.EntityFrameworkCore; - using Microsoft.EntityFrameworkCore.Infrastructure; - using Microsoft.EntityFrameworkCore.InMemory.Infrastructure.Internal; - using Microsoft.Extensions.Caching.Memory; - using Microsoft.Extensions.DependencyInjection; - using Microsoft.Extensions.Options; - using Setups; - using Setups.Common; +namespace MyTested.AspNetCore.Mvc.Test +{ + using System; + using System.Linq; + using Internal; + using Internal.Caching; + using Internal.Contracts; + using Internal.EntityFrameworkCore; + using Internal.Formatters; + using Internal.Routing; + using Internal.Services; + using Internal.Session; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.ViewFeatures; + using Microsoft.AspNetCore.Session; + using Microsoft.EntityFrameworkCore; + using Microsoft.EntityFrameworkCore.Infrastructure; + using Microsoft.EntityFrameworkCore.InMemory.Infrastructure.Internal; + using Microsoft.Extensions.Caching.Memory; + using Microsoft.Extensions.DependencyInjection; + using Microsoft.Extensions.Options; + using Setups; + using Setups.Common; using Xunit; -#pragma warning disable EF1001 // Internal EF Core API usage. - public class ServicesTests - { - [Fact] - public void AddMvcUniverseTestingShouldReplaceDefaultMemoryCacheWithMockedVersion() - { - var services = new ServiceCollection(); - - services.AddMvc(); - var defaultMemoryCache = services.BuildServiceProvider().GetService(); - - services.AddMvcUniverseTesting(); - var mockMemoryCache = services.BuildServiceProvider().GetService(); - - Assert.NotNull(defaultMemoryCache); - Assert.NotNull(mockMemoryCache); - Assert.NotSame(mockMemoryCache, defaultMemoryCache); - Assert.IsAssignableFrom(defaultMemoryCache); - Assert.IsAssignableFrom(mockMemoryCache); - Assert.IsAssignableFrom(mockMemoryCache); - Assert.Contains(services, s => s.ServiceType == typeof(IMemoryCache) && s.Lifetime == ServiceLifetime.Transient); - } - - [Fact] - public void AddMvcUniverseTestingWithoutMemoryCacheShouldAddMockedVersion() - { - var services = new ServiceCollection(); - - services.AddMvc(); - services.Remove(); - - var defaultMemoryCache = services.BuildServiceProvider().GetService(); - - services.AddMvcUniverseTesting(); - var mockMemoryCache = services.BuildServiceProvider().GetService(); - - Assert.Null(defaultMemoryCache); - Assert.NotNull(mockMemoryCache); - Assert.IsAssignableFrom(mockMemoryCache); - Assert.IsAssignableFrom(mockMemoryCache); - Assert.Contains(services, s => s.ServiceType == typeof(IMemoryCache) && s.Lifetime == ServiceLifetime.Transient); - } - - [Fact] - public void AddMvcUniverseTestingShouldOverrideDefaultMemoryCacheWithMockedVersion() - { - MyApplication - .StartsFrom() - .WithServices(services => - { - services.AddMvcUniverseTesting(); - }); - - var memoryCache = TestServiceProvider.GetService(); - - Assert.NotNull(memoryCache); - Assert.IsAssignableFrom(memoryCache); - - MyApplication.StartsFrom(); - } - - [Fact] - public void AddMvcUniverseTestingShouldReplaceCustomSessionStoreWithMockedVersion() - { - var services = new ServiceCollection(); - - services.AddMvc(); - services.AddTransient(); - - var customSessionStore = services.BuildServiceProvider().GetService(); - - services.AddMvcUniverseTesting(); - var mockSessionStore= services.BuildServiceProvider().GetService(); - - Assert.NotNull(customSessionStore); - Assert.NotNull(mockSessionStore); - Assert.NotSame(mockSessionStore, customSessionStore); - Assert.IsAssignableFrom(customSessionStore); - Assert.IsAssignableFrom(mockSessionStore); - Assert.IsAssignableFrom(mockSessionStore); - } - - [Fact] - public void AddMvcUniverseTestingWithoutSessionStoreShouldAddMockedVersion() - { - var services = new ServiceCollection(); - - services.AddMvc(); - var defaultSessionStore = services.BuildServiceProvider().GetService(); - - services.AddMvcUniverseTesting(); - var mockSessionStore = services.BuildServiceProvider().GetService(); - - Assert.Null(defaultSessionStore); - Assert.NotNull(mockSessionStore); - Assert.IsAssignableFrom(mockSessionStore); - Assert.IsAssignableFrom(mockSessionStore); - } - - [Fact] - public void AddMvcUniverseTestingShouldOverrideNullSessionStoreWithMockedVersion() - { - MyApplication - .StartsFrom() - .WithServices(services => - { - services.AddMvcUniverseTesting(); - }); - - var sessionStore = TestServiceProvider.GetService(); - - Assert.NotNull(sessionStore); - Assert.IsAssignableFrom(sessionStore); - - MyApplication.StartsFrom(); - } - - [Fact] - public void AddMvcUniverseTestingShouldReplaceNonInMemoryDatabaseWithInMemoryScopedOne() - { - var services = new ServiceCollection(); - - services.AddMvc(); - services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); - - services.AddMvcUniverseTesting(); - - var serviceProvider = services.BuildServiceProvider(); - - var dbContextService = services.FirstOrDefault(s => s.ServiceType == typeof(CustomDbContext)); - - Assert.NotNull(dbContextService); - Assert.Equal(ServiceLifetime.Scoped, dbContextService.Lifetime); - - var customDbContext = serviceProvider.GetService(); - - Assert.NotNull(customDbContext); - - var dbContextOptions = serviceProvider.GetService>(); - - Assert.NotNull(dbContextOptions); - Assert.Equal(3, dbContextOptions.Extensions.Count()); - - var coreOptionsExtension = dbContextOptions.FindExtension(); - var inMemoryOptionsExtension = dbContextOptions.FindExtension(); - var scopedInMemoryOptionsExtension = dbContextOptions.FindExtension(); - - Assert.NotNull(coreOptionsExtension); - Assert.NotNull(inMemoryOptionsExtension); - Assert.NotNull(scopedInMemoryOptionsExtension); - } - - [Fact] - public void AddMvcUniverseTestingShouldReplaceOptionsWithScopedOnes() - { - var services = new ServiceCollection(); - - services.AddMvc(); - - Assert.Contains(services, s => s.ServiceType == typeof(IOptions<>) && s.Lifetime == ServiceLifetime.Singleton); - - services.AddMvcUniverseTesting(); - - Assert.Contains(services, s => s.ServiceType == typeof(IOptions<>) && s.Lifetime == ServiceLifetime.Scoped); - } - - [Fact] - public void AddMvcUniverseTestingShouldAddStringInputFormatter() - { - MyApplication.StartsFrom(); - - var builtInOptions = TestServiceProvider.GetService>(); - builtInOptions.Value.InputFormatters.RemoveType(); - - Assert.NotNull(builtInOptions); - Assert.True(builtInOptions.Value.InputFormatters.Count == 1); - Assert.DoesNotContain(typeof(StringInputFormatter), builtInOptions.Value.InputFormatters.Select(f => f.GetType())); - - MyApplication.StartsFrom() - .WithServices(services => services.AddMvcUniverseTesting()); - - builtInOptions = TestServiceProvider.GetService>(); - - Assert.NotNull(builtInOptions); - Assert.True(builtInOptions.Value.InputFormatters.Count == 2); - Assert.Contains(typeof(StringInputFormatter), builtInOptions.Value.InputFormatters.Select(f => f.GetType())); - } - - [Fact] - public void AddMvcUniverseTestingWithStringInputFormatterShouldNotOverrideIt() - { - var inputFormatter = new StringInputFormatter(); - - MyApplication.StartsFrom() - .WithServices(services => - { - services.Configure(options => - { - options.InputFormatters.Add(inputFormatter); - }); - - services.AddMvcUniverseTesting(); - }); - - var builtInOptions = TestServiceProvider.GetService>(); - - Assert.NotNull(builtInOptions); - Assert.True(builtInOptions.Value.InputFormatters.Count == 2); - Assert.Contains(typeof(StringInputFormatter), builtInOptions.Value.InputFormatters.Select(f => f.GetType())); - Assert.Same(inputFormatter, builtInOptions.Value.InputFormatters.FirstOrDefault(f => f.GetType() == typeof(StringInputFormatter))); - } - - [Fact] - public void AddMvcUniverseTestingShouldReplaceTempDataProviderWithMockedVersion() - { - MyApplication.StartsFrom() - .WithServices(services => - { - services.Replace(ServiceLifetime.Scoped); - }); - - var tempDataPovider = TestServiceProvider.GetService(); - - Assert.NotNull(tempDataPovider); - Assert.True(typeof(CustomTempDataProvider) == tempDataPovider.GetType()); - - MyApplication.StartsFrom() - .WithServices(services => - { - services.AddMvcUniverseTesting(); - }); - - tempDataPovider = TestServiceProvider.GetService(); - - Assert.NotNull(tempDataPovider); - Assert.True(typeof(TempDataProviderMock) == tempDataPovider.GetType()); - } - - [Fact] - public void AddMvcUniverseTestingWithoutTempDataProviderShouldAddMockedVersion() - { - var services = new ServiceCollection(); - - services.AddMvc(); - services.Remove(); - - var defaultTempDataProvider = services.BuildServiceProvider().GetService(); - - services.AddMvcUniverseTesting(); - var mockTempDataProvider = services.BuildServiceProvider().GetService(); - - Assert.Null(defaultTempDataProvider); - Assert.NotNull(mockTempDataProvider); - Assert.IsAssignableFrom(mockTempDataProvider); - Assert.IsAssignableFrom(mockTempDataProvider); - } - - [Fact] - public void AddMvcUniverseTestingShouldAddViewComponentTesting() - { - var services = new ServiceCollection(); - - services.AddMvc(); - - var viewComponentPropertyActivator = services.BuildServiceProvider().GetService(); - var viewComponentDescriptorCache = services.BuildServiceProvider().GetService(); - - Assert.Null(viewComponentPropertyActivator); - Assert.Null(viewComponentDescriptorCache); - - services.AddMvcUniverseTesting(); - - viewComponentPropertyActivator = services.BuildServiceProvider().GetService(); - viewComponentDescriptorCache = services.BuildServiceProvider().GetService(); - - Assert.NotNull(viewComponentPropertyActivator); - Assert.NotNull(viewComponentDescriptorCache); - - Assert.Contains(services, s => s.ServiceType == typeof(IViewComponentPropertyActivator) && s.Lifetime == ServiceLifetime.Singleton); - Assert.Contains(services, s => s.ServiceType == typeof(IViewComponentDescriptorCache) && s.Lifetime == ServiceLifetime.Singleton); - - Assert.IsAssignableFrom(viewComponentPropertyActivator); - Assert.IsAssignableFrom(viewComponentDescriptorCache); - } - - [Fact] - public void AddMvcUniverseTestingShouldAddControllersTestingServices() - { - var services = new ServiceCollection(); - - services.AddMvc(); - - var validControllersCache = services.BuildServiceProvider().GetService(); - - Assert.Null(validControllersCache); - - services.AddMvcUniverseTesting(); - validControllersCache = services.BuildServiceProvider().GetService(); - - Assert.NotNull(validControllersCache); - Assert.IsAssignableFrom(validControllersCache); - Assert.Contains(services, s => s.ServiceType == typeof(IValidControllersCache) && s.Lifetime == ServiceLifetime.Singleton); - } - - [Fact] - public void AddMvcUniverseTestingShouldAddControllersTestingServicesAndConfigureConventions() - { - MyApplication.StartsFrom(); - - var mvcOptions = TestServiceProvider.GetService>(); - - Assert.NotNull(mvcOptions); - Assert.NotEmpty(mvcOptions.Value.Conventions); - Assert.True(mvcOptions.Value.Conventions.Count == 1); - - MyApplication.StartsFrom() - .WithServices(services => - { - services.AddMvcUniverseTesting(); - }); - - var validControllersCache = TestServiceProvider.GetService(); - - Assert.NotNull(validControllersCache); - Assert.IsAssignableFrom(validControllersCache); - - mvcOptions = TestServiceProvider.GetService>(); - - Assert.NotNull(mvcOptions); - Assert.NotEmpty(mvcOptions.Value.Conventions); - Assert.True(mvcOptions.Value.Conventions.Count == 2); - } - - [Fact] - public void AddMvcUniverseTestingShouldAddRoutingTestingServices() - { - var services = new ServiceCollection(); - - services.AddMvc(); - - var routingServices = services.BuildServiceProvider().GetService(); - - Assert.Null(routingServices); - - services.AddMvcUniverseTesting(); - routingServices = services.BuildServiceProvider().GetService(); - - Assert.NotNull(routingServices); - Assert.IsAssignableFrom(routingServices); - Assert.Contains(services, s => s.ServiceType == typeof(IRoutingServices) && s.Lifetime == ServiceLifetime.Singleton); - } - - [Fact] - public void AddMvcUniverseTestingWithRoutingTestingServicesShouldNotOverrideThem() - { - IRoutingServices routingServices = new RoutingServices(); - - var services = new ServiceCollection(); - - services.AddMvc(); - services.AddSingleton(typeof(IRoutingServices), routingServices); - - Assert.NotNull(services.BuildServiceProvider().GetService()); - - services.AddMvcUniverseTesting(); - var actualRoutingServices = services.BuildServiceProvider().GetService(); - - Assert.NotNull(routingServices); - Assert.IsAssignableFrom(routingServices); - Assert.Same(routingServices, actualRoutingServices); - } - - [Fact] - public void AddMvcUniverseTestingShouldAddRoutingTestingServicesAndDisableEndPointRouting() - { - MyApplication.StartsFrom() - .WithServices(services => - { - services.AddMvcUniverseTesting(); - }); - - var mvcOptions = TestServiceProvider.GetService>(); - - Assert.True(mvcOptions.Value.EnableEndpointRouting); - } - - [Fact] - public void WithoutServiceCollectionShouldThrowException() - { - IServiceCollection services = null; - - Test.AssertException( - () => - { - services.AddMvcUniverseTesting(); - }, - "serviceCollection cannot be null."); - } - } -} + public class ServicesTests + { + [Fact] + public void AddMvcUniverseTestingShouldReplaceDefaultMemoryCacheWithMockedVersion() + { + var services = new ServiceCollection(); + + services.AddMvc(); + var defaultMemoryCache = services.BuildServiceProvider().GetService(); + + services.AddMvcUniverseTesting(); + var mockMemoryCache = services.BuildServiceProvider().GetService(); + + Assert.NotNull(defaultMemoryCache); + Assert.NotNull(mockMemoryCache); + Assert.NotSame(mockMemoryCache, defaultMemoryCache); + Assert.IsAssignableFrom(defaultMemoryCache); + Assert.IsAssignableFrom(mockMemoryCache); + Assert.IsAssignableFrom(mockMemoryCache); + Assert.Contains(services, s => s.ServiceType == typeof(IMemoryCache) && s.Lifetime == ServiceLifetime.Transient); + } + + [Fact] + public void AddMvcUniverseTestingWithoutMemoryCacheShouldAddMockedVersion() + { + var services = new ServiceCollection(); + + services.AddMvc(); + services.Remove(); + + var defaultMemoryCache = services.BuildServiceProvider().GetService(); + + services.AddMvcUniverseTesting(); + var mockMemoryCache = services.BuildServiceProvider().GetService(); + + Assert.Null(defaultMemoryCache); + Assert.NotNull(mockMemoryCache); + Assert.IsAssignableFrom(mockMemoryCache); + Assert.IsAssignableFrom(mockMemoryCache); + Assert.Contains(services, s => s.ServiceType == typeof(IMemoryCache) && s.Lifetime == ServiceLifetime.Transient); + } + + [Fact] + public void AddMvcUniverseTestingShouldOverrideDefaultMemoryCacheWithMockedVersion() + { + MyApplication + .StartsFrom() + .WithServices(services => + { + services.AddMvcUniverseTesting(); + }); + + var memoryCache = TestServiceProvider.GetService(); + + Assert.NotNull(memoryCache); + Assert.IsAssignableFrom(memoryCache); + + MyApplication.StartsFrom(); + } + + [Fact] + public void AddMvcUniverseTestingShouldReplaceCustomSessionStoreWithMockedVersion() + { + var services = new ServiceCollection(); + + services.AddMvc(); + services.AddTransient(); + + var customSessionStore = services.BuildServiceProvider().GetService(); + + services.AddMvcUniverseTesting(); + var mockSessionStore= services.BuildServiceProvider().GetService(); + + Assert.NotNull(customSessionStore); + Assert.NotNull(mockSessionStore); + Assert.NotSame(mockSessionStore, customSessionStore); + Assert.IsAssignableFrom(customSessionStore); + Assert.IsAssignableFrom(mockSessionStore); + Assert.IsAssignableFrom(mockSessionStore); + } + + [Fact] + public void AddMvcUniverseTestingWithoutSessionStoreShouldAddMockedVersion() + { + var services = new ServiceCollection(); + + services.AddMvc(); + var defaultSessionStore = services.BuildServiceProvider().GetService(); + + services.AddMvcUniverseTesting(); + var mockSessionStore = services.BuildServiceProvider().GetService(); + + Assert.Null(defaultSessionStore); + Assert.NotNull(mockSessionStore); + Assert.IsAssignableFrom(mockSessionStore); + Assert.IsAssignableFrom(mockSessionStore); + } + + [Fact] + public void AddMvcUniverseTestingShouldOverrideNullSessionStoreWithMockedVersion() + { + MyApplication + .StartsFrom() + .WithServices(services => + { + services.AddMvcUniverseTesting(); + }); + + var sessionStore = TestServiceProvider.GetService(); + + Assert.NotNull(sessionStore); + Assert.IsAssignableFrom(sessionStore); + + MyApplication.StartsFrom(); + } + + [Fact] + public void AddMvcUniverseTestingShouldReplaceNonInMemoryDatabaseWithInMemoryScopedOne() + { + var services = new ServiceCollection(); + + services.AddMvc(); + services.AddDbContext(options => + options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + + services.AddMvcUniverseTesting(); + + var serviceProvider = services.BuildServiceProvider(); + + var dbContextService = services.FirstOrDefault(s => s.ServiceType == typeof(CustomDbContext)); + + Assert.NotNull(dbContextService); + Assert.Equal(ServiceLifetime.Scoped, dbContextService.Lifetime); + + var customDbContext = serviceProvider.GetService(); + + Assert.NotNull(customDbContext); + + var dbContextOptions = serviceProvider.GetService>(); + + Assert.NotNull(dbContextOptions); + Assert.Equal(3, dbContextOptions.Extensions.Count()); + +#pragma warning disable EF1001 // Internal EF Core API usage. + var coreOptionsExtension = dbContextOptions.FindExtension(); + var inMemoryOptionsExtension = dbContextOptions.FindExtension(); + var scopedInMemoryOptionsExtension = dbContextOptions.FindExtension(); +#pragma warning restore EF1001 // Internal EF Core API usage. + + Assert.NotNull(coreOptionsExtension); + Assert.NotNull(inMemoryOptionsExtension); + Assert.NotNull(scopedInMemoryOptionsExtension); + } + + [Fact] + public void AddMvcUniverseTestingShouldReplaceOptionsWithScopedOnes() + { + var services = new ServiceCollection(); + + services.AddMvc(); + + Assert.Contains(services, s => s.ServiceType == typeof(IOptions<>) && s.Lifetime == ServiceLifetime.Singleton); + + services.AddMvcUniverseTesting(); + + Assert.Contains(services, s => s.ServiceType == typeof(IOptions<>) && s.Lifetime == ServiceLifetime.Scoped); + } + + [Fact] + public void AddMvcUniverseTestingShouldAddStringInputFormatter() + { + MyApplication.StartsFrom(); + + var builtInOptions = TestServiceProvider.GetService>(); + builtInOptions.Value.InputFormatters.RemoveType(); + + Assert.NotNull(builtInOptions); + Assert.True(builtInOptions.Value.InputFormatters.Count == 1); + Assert.DoesNotContain(typeof(StringInputFormatter), builtInOptions.Value.InputFormatters.Select(f => f.GetType())); + + MyApplication.StartsFrom() + .WithServices(services => services.AddMvcUniverseTesting()); + + builtInOptions = TestServiceProvider.GetService>(); + + Assert.NotNull(builtInOptions); + Assert.True(builtInOptions.Value.InputFormatters.Count == 2); + Assert.Contains(typeof(StringInputFormatter), builtInOptions.Value.InputFormatters.Select(f => f.GetType())); + } + + [Fact] + public void AddMvcUniverseTestingWithStringInputFormatterShouldNotOverrideIt() + { + var inputFormatter = new StringInputFormatter(); + + MyApplication.StartsFrom() + .WithServices(services => + { + services.Configure(options => + { + options.InputFormatters.Add(inputFormatter); + }); + + services.AddMvcUniverseTesting(); + }); + + var builtInOptions = TestServiceProvider.GetService>(); + + Assert.NotNull(builtInOptions); + Assert.True(builtInOptions.Value.InputFormatters.Count == 2); + Assert.Contains(typeof(StringInputFormatter), builtInOptions.Value.InputFormatters.Select(f => f.GetType())); + Assert.Same(inputFormatter, builtInOptions.Value.InputFormatters.FirstOrDefault(f => f.GetType() == typeof(StringInputFormatter))); + } + + [Fact] + public void AddMvcUniverseTestingShouldReplaceTempDataProviderWithMockedVersion() + { + MyApplication.StartsFrom() + .WithServices(services => + { + services.Replace(ServiceLifetime.Scoped); + }); + + var tempDataPovider = TestServiceProvider.GetService(); + + Assert.NotNull(tempDataPovider); + Assert.True(typeof(CustomTempDataProvider) == tempDataPovider.GetType()); + + MyApplication.StartsFrom() + .WithServices(services => + { + services.AddMvcUniverseTesting(); + }); + + tempDataPovider = TestServiceProvider.GetService(); + + Assert.NotNull(tempDataPovider); + Assert.True(typeof(TempDataProviderMock) == tempDataPovider.GetType()); + } + + [Fact] + public void AddMvcUniverseTestingWithoutTempDataProviderShouldAddMockedVersion() + { + var services = new ServiceCollection(); + + services.AddMvc(); + services.Remove(); + + var defaultTempDataProvider = services.BuildServiceProvider().GetService(); + + services.AddMvcUniverseTesting(); + var mockTempDataProvider = services.BuildServiceProvider().GetService(); + + Assert.Null(defaultTempDataProvider); + Assert.NotNull(mockTempDataProvider); + Assert.IsAssignableFrom(mockTempDataProvider); + Assert.IsAssignableFrom(mockTempDataProvider); + } + + [Fact] + public void AddMvcUniverseTestingShouldAddViewComponentTesting() + { + var services = new ServiceCollection(); + + services.AddMvc(); + + var viewComponentPropertyActivator = services.BuildServiceProvider().GetService(); + var viewComponentDescriptorCache = services.BuildServiceProvider().GetService(); + + Assert.Null(viewComponentPropertyActivator); + Assert.Null(viewComponentDescriptorCache); + + services.AddMvcUniverseTesting(); + + viewComponentPropertyActivator = services.BuildServiceProvider().GetService(); + viewComponentDescriptorCache = services.BuildServiceProvider().GetService(); + + Assert.NotNull(viewComponentPropertyActivator); + Assert.NotNull(viewComponentDescriptorCache); + + Assert.Contains(services, s => s.ServiceType == typeof(IViewComponentPropertyActivator) && s.Lifetime == ServiceLifetime.Singleton); + Assert.Contains(services, s => s.ServiceType == typeof(IViewComponentDescriptorCache) && s.Lifetime == ServiceLifetime.Singleton); + + Assert.IsAssignableFrom(viewComponentPropertyActivator); + Assert.IsAssignableFrom(viewComponentDescriptorCache); + } + + [Fact] + public void AddMvcUniverseTestingShouldAddControllersTestingServices() + { + var services = new ServiceCollection(); + + services.AddMvc(); + + var validControllersCache = services.BuildServiceProvider().GetService(); + + Assert.Null(validControllersCache); + + services.AddMvcUniverseTesting(); + validControllersCache = services.BuildServiceProvider().GetService(); + + Assert.NotNull(validControllersCache); + Assert.IsAssignableFrom(validControllersCache); + Assert.Contains(services, s => s.ServiceType == typeof(IValidControllersCache) && s.Lifetime == ServiceLifetime.Singleton); + } + + [Fact] + public void AddMvcUniverseTestingShouldAddControllersTestingServicesAndConfigureConventions() + { + MyApplication.StartsFrom(); + + var mvcOptions = TestServiceProvider.GetService>(); + + Assert.NotNull(mvcOptions); + Assert.NotEmpty(mvcOptions.Value.Conventions); + Assert.True(mvcOptions.Value.Conventions.Count == 1); + + MyApplication.StartsFrom() + .WithServices(services => + { + services.AddMvcUniverseTesting(); + }); + + var validControllersCache = TestServiceProvider.GetService(); + + Assert.NotNull(validControllersCache); + Assert.IsAssignableFrom(validControllersCache); + + mvcOptions = TestServiceProvider.GetService>(); + + Assert.NotNull(mvcOptions); + Assert.NotEmpty(mvcOptions.Value.Conventions); + Assert.True(mvcOptions.Value.Conventions.Count == 2); + } + + [Fact] + public void AddMvcUniverseTestingShouldAddRoutingTestingServices() + { + var services = new ServiceCollection(); + + services.AddMvc(); + + var routingServices = services.BuildServiceProvider().GetService(); + + Assert.Null(routingServices); + + services.AddMvcUniverseTesting(); + routingServices = services.BuildServiceProvider().GetService(); + + Assert.NotNull(routingServices); + Assert.IsAssignableFrom(routingServices); + Assert.Contains(services, s => s.ServiceType == typeof(IRoutingServices) && s.Lifetime == ServiceLifetime.Singleton); + } + + [Fact] + public void AddMvcUniverseTestingWithRoutingTestingServicesShouldNotOverrideThem() + { + IRoutingServices routingServices = new RoutingServices(); + + var services = new ServiceCollection(); + + services.AddMvc(); + services.AddSingleton(typeof(IRoutingServices), routingServices); + + Assert.NotNull(services.BuildServiceProvider().GetService()); + + services.AddMvcUniverseTesting(); + var actualRoutingServices = services.BuildServiceProvider().GetService(); + + Assert.NotNull(routingServices); + Assert.IsAssignableFrom(routingServices); + Assert.Same(routingServices, actualRoutingServices); + } + + [Fact] + public void AddMvcUniverseTestingShouldAddRoutingTestingServicesAndDisableEndPointRouting() + { + MyApplication.StartsFrom() + .WithServices(services => + { + services.AddMvcUniverseTesting(); + }); + + var mvcOptions = TestServiceProvider.GetService>(); + + Assert.True(mvcOptions.Value.EnableEndpointRouting); + } + + [Fact] + public void WithoutServiceCollectionShouldThrowException() + { + IServiceCollection services = null; + + Test.AssertException( + () => + { + services.AddMvcUniverseTesting(); + }, + "serviceCollection cannot be null."); + } + } +} From bf42979bca5cb0d83bdabfb255f0d2f9376f2dd4 Mon Sep 17 00:00:00 2001 From: Ivaylo Kenov Date: Mon, 12 Jul 2021 11:40:42 +0300 Subject: [PATCH 08/19] Added a value provider for pipeline tests - one which ignores the value during route assertion but uses it within the action call (closes #385) --- .../From.cs | 5 +- .../Utilities/ExpressionParser.cs | 6 +- .../With.cs | 22 ++- .../WhichControllerInstanceBuilderTests.cs | 131 ++++++++++++++++++ .../RoutingTests/RouteTestBuilderTests.cs | 18 +++ .../Routing/HomeController.cs | 11 ++ 6 files changed, 186 insertions(+), 7 deletions(-) diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/From.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/From.cs index fdb593a3a..441471c17 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/From.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/From.cs @@ -8,10 +8,7 @@ /// public static class From { - static From() - { - TestApplication.TryInitialize(); - } + static From() => TestApplication.TryInitialize(); /// /// Indicates that a argument should be resolved from the application in a method call lambda expression. diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExpressionParser.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExpressionParser.cs index 751137734..4715e602d 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExpressionParser.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExpressionParser.cs @@ -83,6 +83,8 @@ public static object ResolveExpressionValue(Expression expression) // These expressions types should be ignored and can be skipped: // - c => c.Action(With.No()) // - c => c.Action(With.Any()) + // - c => c.Action(With.Value(value)) + // - c => c.Action(With.IgnoredRouteValue(value)) // - c => c.Action(From.Services()) var expressionArgumentAsMethodCall = (MethodCallExpression)expression; var expressionMethodDeclaringType = expressionArgumentAsMethodCall.Method.DeclaringType; @@ -92,7 +94,9 @@ public static object ResolveExpressionValue(Expression expression) var expressionArgumentMethodName = expressionArgumentAsMethodCall.Method.Name; if (expressionMethodDeclaringType == TypeOfWith - && expressionArgumentMethodName == nameof(With.Any)) + && (expressionArgumentMethodName == nameof(With.Any) + || expressionArgumentMethodName == nameof(With.Value) + || expressionArgumentMethodName == nameof(With.IgnoredRouteValue))) { return IgnoredExpressionArgument; } diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/With.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/With.cs index e3355f422..269874f9f 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/With.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/With.cs @@ -24,7 +24,7 @@ public static TParameter Empty() => new TParameter(); /// - /// Indicates that a argument should not be considered in method call lambda expression. + /// Indicates that an argument should not be considered in method call lambda expression. /// /// Type of parameter. /// Default value of the parameter. @@ -32,12 +32,30 @@ public static TParameter No() => default(TParameter); /// - /// Indicates that a argument should not be considered in method call lambda expression. + /// Indicates that an argument should not be considered in method call lambda expression. /// /// Type of parameter. /// Default value of the parameter. /// Using this method in route testing will indicate that the route value should be ignored during the test. public static TParameter Any() => default(TParameter); + + /// + /// Indicates that a argument should not be considered during a route test but used in the actual action call. This method is the same as + /// + /// Type of parameter. + /// The provided value. + /// Using this method in pipeline testing will indicate that the route value should be ignored during the route test but used during the action execution. + public static TParameter Value(TParameter value) + => value; + + /// + /// Indicates that a argument should not be considered during a route test but used in the actual action call. This method is the same as . + /// + /// Type of parameter. + /// The provided value. + /// Using this method in pipeline testing will indicate that the route value should be ignored during the route test but used during the action execution. + public static TParameter IgnoredRouteValue(TParameter value) + => value; } } diff --git a/test/MyTested.AspNetCore.Mvc.Pipeline.Test/BuildersTests/PipelineTests/WhichControllerInstanceBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.Pipeline.Test/BuildersTests/PipelineTests/WhichControllerInstanceBuilderTests.cs index 41f7fdc36..fd722cc57 100644 --- a/test/MyTested.AspNetCore.Mvc.Pipeline.Test/BuildersTests/PipelineTests/WhichControllerInstanceBuilderTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Pipeline.Test/BuildersTests/PipelineTests/WhichControllerInstanceBuilderTests.cs @@ -1,5 +1,6 @@ namespace MyTested.AspNetCore.Mvc.Test.BuildersTests.PipelineTests { + using System.Threading; using Exceptions; using Microsoft.Extensions.DependencyInjection; using Setups; @@ -62,6 +63,136 @@ public void WhichShouldResolveCorrectEmptyAsyncAction() .ShouldReturnEmpty(); } + [Fact] + public void WhichShouldResolveCorrectActionWithIgnoredRouteValue() + { + MyPipeline + .Configuration() + .ShouldMap("/Home/Contact/1") + .To(c => c.Contact(With.Value(2))) + .Which() + .ShouldReturn() + .Ok(ok => ok + .Passing(result => result + .Value + .Equals(2))); + } + + [Fact] + public void WhichShouldResolveCorrectActionWithIgnoredRouteValueLongName() + { + MyPipeline + .Configuration() + .ShouldMap("/Home/Contact/1") + .To(c => c.Contact(With.IgnoredRouteValue(2))) + .Which() + .ShouldReturn() + .Ok(ok => ok + .Passing(result => result + .Value + .Equals(2))); + } + + [Fact] + public void WhichShouldResolveCorrectActionWithIgnoredCancellationTokenCancelled() + { + MyPipeline + .Configuration() + .ShouldMap("/Home/CancelledTask/1") + .To(c => c.CancelledTask(1, With.Value(new CancellationToken(true)))) + .Which() + .ShouldReturn() + .Ok(ok => ok + .Passing(result => result + .Value + .Equals("Cancelled with id: 1"))); + } + + [Fact] + public void WhichShouldResolveCorrectActionWithIgnoredCancellationTokenLongNameCancelled() + { + MyPipeline + .Configuration() + .ShouldMap("/Home/CancelledTask/1") + .To(c => c.CancelledTask(1, With.IgnoredRouteValue(new CancellationToken(true)))) + .Which() + .ShouldReturn() + .Ok(ok => ok + .Passing(result => result + .Value + .Equals("Cancelled with id: 1"))); + } + + [Fact] + public void WhichShouldResolveCorrectActionWithIgnoredCancellationToken() + { + MyPipeline + .Configuration() + .ShouldMap("/Home/CancelledTask/1") + .To(c => c.CancelledTask(1, With.Value(new CancellationToken(false)))) + .Which() + .ShouldReturn() + .Ok(ok => ok + .Passing(result => result + .Value + .Equals(1))); + } + + [Fact] + public void WhichShouldResolveCorrectActionWithIgnoredCancellationTokenLongName() + { + MyPipeline + .Configuration() + .ShouldMap("/Home/CancelledTask/1") + .To(c => c.CancelledTask(1, With.IgnoredRouteValue(new CancellationToken(false)))) + .Which() + .ShouldReturn() + .Ok(ok => ok + .Passing(result => result + .Value + .Equals(1))); + } + + [Fact] + public void WhichShouldResolveCorrectActionValuesWithIgnoredCancellationToken() + { + Test.AssertException( + () => + { + MyPipeline + .Configuration() + .ShouldMap("/Home/CancelledTask/1") + .To(c => c.CancelledTask(2, With.Value(new CancellationToken(false)))) + .Which() + .ShouldReturn() + .Ok(ok => ok + .Passing(result => result + .Value + .Equals(2))); + }, + "Expected route '/Home/CancelledTask/1' to contain route value with 'id' key and the provided value but the value was different. Expected a value of '2', but in fact it was '1'."); + } + + [Fact] + public void WhichShouldResolveCorrectActionValuesWithIgnoredCancellationTokenLongName() + { + Test.AssertException( + () => + { + MyPipeline + .Configuration() + .ShouldMap("/Home/CancelledTask/1") + .To(c => c.CancelledTask(2, With.IgnoredRouteValue(new CancellationToken(false)))) + .Which() + .ShouldReturn() + .Ok(ok => ok + .Passing(result => result + .Value + .Equals(2))); + }, + "Expected route '/Home/CancelledTask/1' to contain route value with 'id' key and the provided value but the value was different. Expected a value of '2', but in fact it was '1'."); + } + [Fact] public void WhichShouldResolveCorrectAsyncActionWithSetup() { diff --git a/test/MyTested.AspNetCore.Mvc.Routing.Test/BuildersTests/RoutingTests/RouteTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.Routing.Test/BuildersTests/RoutingTests/RouteTestBuilderTests.cs index a12fceb3f..5241d29c7 100644 --- a/test/MyTested.AspNetCore.Mvc.Routing.Test/BuildersTests/RoutingTests/RouteTestBuilderTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Routing.Test/BuildersTests/RoutingTests/RouteTestBuilderTests.cs @@ -431,6 +431,24 @@ public void ToShouldResolveCorrectlyWithIgnoredParameter() .To(c => c.Contact(With.Any())); } + [Fact] + public void ToShouldResolveCorrectlyWithIgnoredParameterButActualValue() + { + MyRouting + .Configuration() + .ShouldMap("/Home/Contact/1") + .To(c => c.Contact(With.Value(2))); + } + + [Fact] + public void ToShouldResolveCorrectlyWithIgnoredParameterButActualValueLongName() + { + MyRouting + .Configuration() + .ShouldMap("/Home/Contact/1") + .To(c => c.Contact(With.IgnoredRouteValue(2))); + } + [Fact] public void ToShouldResolveCorrectControllerAndActionWithNoModel() { diff --git a/test/MyTested.AspNetCore.Mvc.Test.Setups/Routing/HomeController.cs b/test/MyTested.AspNetCore.Mvc.Test.Setups/Routing/HomeController.cs index e8f082916..49e5ef48c 100644 --- a/test/MyTested.AspNetCore.Mvc.Test.Setups/Routing/HomeController.cs +++ b/test/MyTested.AspNetCore.Mvc.Test.Setups/Routing/HomeController.cs @@ -1,6 +1,7 @@ namespace MyTested.AspNetCore.Mvc.Test.Setups.Routing { using System; + using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -21,5 +22,15 @@ public IActionResult FailingAction() public void Empty() { } public async Task EmptyTask() => await Task.CompletedTask; + + public async Task CancelledTask(int id, CancellationToken cancellationToken) + { + if (cancellationToken.IsCancellationRequested) + { + return await Task.FromResult(Ok($"Cancelled with id: {id}")); + } + + return await Task.FromResult(Ok(id)); + } } } From a569575993092f59124588641032a316a573e6a8 Mon Sep 17 00:00:00 2001 From: Ivaylo Kenov Date: Tue, 13 Jul 2021 18:32:33 +0300 Subject: [PATCH 09/19] DbContext can now be registered and used through an interface during tests (closes #379) --- .../Internal/Services/TestServiceProvider.cs | 3 + .../Contracts/Data/IWithDbContextBuilder.cs | 8 +- .../Data/IWithDbContextTestBuilder.cs | 8 +- .../Data/IWithoutDbContextBuilder.cs | 14 +- .../Builders/Data/WithDbContextBuilder.cs | 14 +- .../Builders/Data/WithDbContextTestBuilder.cs | 36 ++-- .../Builders/Data/WithoutDbContextBuilder.cs | 37 ++-- ...ttpTestContextEntityFrameworkExtensions.cs | 16 +- ...CollectionEntityFrameworkCoreExtensions.cs | 18 +- .../DataAnnotationsTestPluginTests.cs | 3 - .../ShouldHaveDbContextTests.cs | 178 +++++++++++++-- .../ControllerBuilderTests.cs | 202 ++++++++++++++++-- .../ShouldHaveDbContextTests.cs | 114 +++++++++- .../ViewComponentBuilderTests.cs | 108 ++++++++++ .../EntityFrameworkCoreTestPluginTests.cs | 3 - .../ServicesTests.cs | 48 ++++- .../Setups/Common/CustomDbContext.cs | 2 +- .../Setups/Common/ICustomDbContext.cs | 9 + .../Setups/Common/IInvalidDbContext.cs | 9 + .../Setups/Common/InvalidDbContext.cs | 9 + .../Setups/Controllers/DbContextController.cs | 5 +- .../InterfaceDbContextController.cs | 41 ++++ .../PluginsTests/LiteTestPluginTests.cs | 3 - .../PluginsTests/ModelStateTestPluginTests.cs | 3 - .../PluginsTests/OptionsTestPluginTests.cs | 3 - 25 files changed, 759 insertions(+), 135 deletions(-) create mode 100644 test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/ICustomDbContext.cs create mode 100644 test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/IInvalidDbContext.cs create mode 100644 test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/InvalidDbContext.cs create mode 100644 test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Controllers/InterfaceDbContextController.cs diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Services/TestServiceProvider.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Services/TestServiceProvider.cs index a97ea3060..e63a391b6 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Services/TestServiceProvider.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Services/TestServiceProvider.cs @@ -87,6 +87,9 @@ public static TInstance TryGetService() public static void SaveServiceLifetime(Type serviceType, ServiceLifetime lifetime) => ServiceLifetimes[serviceType] = lifetime; + public static void SaveServiceLifetime(ServiceLifetime lifetime) + => SaveServiceLifetime(typeof(TService), lifetime); + public static ServiceLifetime GetServiceLifetime(Type serviceType) => ServiceLifetimes.ContainsKey(serviceType) ? ServiceLifetimes[serviceType] diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithDbContextBuilder.cs b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithDbContextBuilder.cs index 7eeb2e150..b1155a4fc 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithDbContextBuilder.cs +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithDbContextBuilder.cs @@ -23,7 +23,7 @@ public interface IWithDbContextBuilder /// Initial values to add to the provided . /// The same builder. IAndWithDbContextBuilder WithEntities(IEnumerable entities) - where TDbContext : DbContext; + where TDbContext : class; /// /// Sets initial values to the registered . @@ -39,7 +39,7 @@ IAndWithDbContextBuilder WithEntities(IEnumerable entities) /// Initial values to add to the provided . /// The same builder. IAndWithDbContextBuilder WithEntities(params object[] entities) - where TDbContext : DbContext; + where TDbContext : class; /// /// Sets initial values to the registered . @@ -55,7 +55,7 @@ IAndWithDbContextBuilder WithEntities(params object[] entities) /// Action setting the . /// The same builder. IAndWithDbContextBuilder WithEntities(Action dbContextSetup) - where TDbContext : DbContext; + where TDbContext : class; /// /// Sets initial values to the provided entity. @@ -74,7 +74,7 @@ IAndWithDbContextBuilder WithSet(Action> entitySetup) /// Action setting the entity. /// The same builder. IAndWithDbContextBuilder WithSet(Action> entitySetup) - where TDbContext : DbContext + where TDbContext : class where TEntity : class; } } diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithDbContextTestBuilder.cs b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithDbContextTestBuilder.cs index 924dda8f3..542e7a066 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithDbContextTestBuilder.cs +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithDbContextTestBuilder.cs @@ -28,7 +28,7 @@ public interface IWithDbContextTestBuilder /// Type of . /// Action containing all assertions for the entities. IAndWithDbContextTestBuilder WithEntities(Action assertions) - where TDbContext : DbContext; + where TDbContext : class; /// /// Tests whether entities pass the given predicate. @@ -36,7 +36,7 @@ IAndWithDbContextTestBuilder WithEntities(Action asserti /// Type of . /// Predicate testing the entities. IAndWithDbContextTestBuilder WithEntities(Func predicate) - where TDbContext : DbContext; + where TDbContext : class; /// /// Tests whether entity passes the given assertions. @@ -61,7 +61,7 @@ IAndWithDbContextTestBuilder WithSet(Func, bool> predica /// Type of entity set. /// Action containing all assertions for the entity set. IAndWithDbContextTestBuilder WithSet(Action> assertions) - where TDbContext : DbContext + where TDbContext : class where TEntity : class; /// @@ -71,7 +71,7 @@ IAndWithDbContextTestBuilder WithSet(Action> /// Type of entity set. /// Predicate testing the entity set. IAndWithDbContextTestBuilder WithSet(Func, bool> predicate) - where TDbContext : DbContext + where TDbContext : class where TEntity : class; } } diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithoutDbContextBuilder.cs b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithoutDbContextBuilder.cs index 0163ae3bc..d0dde77d9 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithoutDbContextBuilder.cs +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Contracts/Data/IWithoutDbContextBuilder.cs @@ -23,7 +23,7 @@ IAndWithoutDbContextBuilder WithoutEntityByKey(object key) /// Primary key of entity to remove from the registered . /// The same builder. IAndWithoutDbContextBuilder WithoutEntityByKey(object key) - where TDbContext : DbContext; + where TDbContext : class; /// /// Remove entities by providing their primary keys from the registered . @@ -42,7 +42,7 @@ IAndWithoutDbContextBuilder WithoutEntitiesByKeys(IEnumerable k /// Primary keys for entities to remove from the registered . /// The same builder. IAndWithoutDbContextBuilder WithoutEntitiesByKeys(IEnumerable keys) - where TDbContext : DbContext; + where TDbContext : class; /// /// Remove entity from the registered . @@ -58,7 +58,7 @@ IAndWithoutDbContextBuilder WithoutEntitiesByKeys(IEnumerab /// Entity to remove from the registered . /// The same builder. IAndWithoutDbContextBuilder WithoutEntity(object entity) - where TDbContext : DbContext; + where TDbContext : class; /// /// Remove values from the registered . @@ -74,7 +74,7 @@ IAndWithoutDbContextBuilder WithoutEntity(object entity) /// Values to remove from the registered . /// The same builder. IAndWithoutDbContextBuilder WithoutEntities(IEnumerable entities) - where TDbContext : DbContext; + where TDbContext : class; /// /// Remove values from the registered . @@ -90,7 +90,7 @@ IAndWithoutDbContextBuilder WithoutEntities(IEnumerable enti /// Values to remove from the provided . /// The same builder. IAndWithoutDbContextBuilder WithoutEntities(params object[] entities) - where TDbContext : DbContext; + where TDbContext : class; /// /// Remove values from the registered . @@ -106,7 +106,7 @@ IAndWithoutDbContextBuilder WithoutEntities(params object[] entities /// Action setting the . /// The same builder. IAndWithoutDbContextBuilder WithoutEntities(Action dbContextSetup) - where TDbContext : DbContext; + where TDbContext : class; /// /// Remove values from the provided entity. @@ -125,7 +125,7 @@ IAndWithoutDbContextBuilder WithoutSet(Action> entitySet /// Action setting the entity. /// The same builder. IAndWithoutDbContextBuilder WithoutSet(Action> entitySetup) - where TDbContext : DbContext + where TDbContext : class where TEntity : class; /// diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithDbContextBuilder.cs b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithDbContextBuilder.cs index 29bff5265..5e30ee3c8 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithDbContextBuilder.cs +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithDbContextBuilder.cs @@ -29,8 +29,8 @@ public IAndWithDbContextBuilder WithEntities(IEnumerable entities) /// public IAndWithDbContextBuilder WithEntities(IEnumerable entities) - where TDbContext : DbContext - => this.WithEntities(dbContext => dbContext.AddRange(entities)); + where TDbContext : class + => this.WithEntities(dbContext => (dbContext as DbContext).AddRange(entities)); /// public IAndWithDbContextBuilder WithEntities(params object[] entities) @@ -38,7 +38,7 @@ public IAndWithDbContextBuilder WithEntities(params object[] entities) /// public IAndWithDbContextBuilder WithEntities(params object[] entities) - where TDbContext : DbContext + where TDbContext : class => this.WithEntities(entities.AsEnumerable()); /// @@ -47,13 +47,13 @@ public IAndWithDbContextBuilder WithEntities(Action dbContextSetup) /// public IAndWithDbContextBuilder WithEntities(Action dbContextSetup) - where TDbContext : DbContext + where TDbContext : class { CommonValidator.CheckForNullReference(dbContextSetup, nameof(dbContextSetup)); var dbContext = this.TestContext.GetDbContext(); dbContextSetup(dbContext); - dbContext.SaveChanges(); + (dbContext as DbContext).SaveChanges(); return this; } @@ -65,12 +65,12 @@ public IAndWithDbContextBuilder WithSet(Action> entitySe /// public IAndWithDbContextBuilder WithSet(Action> entitySetup) - where TDbContext : DbContext + where TDbContext : class where TEntity : class { CommonValidator.CheckForNullReference(entitySetup, nameof(entitySetup)); - var dbContext = this.TestContext.GetDbContext(); + var dbContext = this.TestContext.GetBaseDbContext(); entitySetup(dbContext.Set()); dbContext.SaveChanges(); diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithDbContextTestBuilder.cs b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithDbContextTestBuilder.cs index 7d3b23205..7c1742ecf 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithDbContextTestBuilder.cs +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithDbContextTestBuilder.cs @@ -24,19 +24,15 @@ public WithDbContextTestBuilder(ComponentTestContext testContext) } /// - public IAndWithDbContextTestBuilder WithEntities(Action assertions) - { - return this.WithEntities(assertions); - } + public IAndWithDbContextTestBuilder WithEntities(Action assertions) + => this.WithEntities(assertions); /// - public IAndWithDbContextTestBuilder WithEntities(Func predicate) - { - return this.WithEntities(predicate); - } + public IAndWithDbContextTestBuilder WithEntities(Func predicate) + => this.WithEntities(predicate); /// - public IAndWithDbContextTestBuilder WithEntities(Func predicate) where TDbContext : DbContext + public IAndWithDbContextTestBuilder WithEntities(Func predicate) where TDbContext : class { CommonValidator.CheckForNullReference(predicate, nameof(predicate)); @@ -52,7 +48,7 @@ public IAndWithDbContextTestBuilder WithEntities(Func - public IAndWithDbContextTestBuilder WithEntities(Action assertions) where TDbContext : DbContext + public IAndWithDbContextTestBuilder WithEntities(Action assertions) where TDbContext : class { CommonValidator.CheckForNullReference(assertions, nameof(assertions)); @@ -63,38 +59,34 @@ public IAndWithDbContextTestBuilder WithEntities(Action /// public IAndWithDbContextTestBuilder WithSet(Action> assertions) - where TEntity : class - { - return this.WithSet(assertions); - } + where TEntity : class + => this.WithSet(assertions); /// public IAndWithDbContextTestBuilder WithSet(Func, bool> predicate) - where TEntity : class - { - return this.WithSet(predicate); - } + where TEntity : class + => this.WithSet(predicate); /// public IAndWithDbContextTestBuilder WithSet(Action> assertions) - where TDbContext : DbContext + where TDbContext : class where TEntity : class { CommonValidator.CheckForNullReference(assertions, nameof(assertions)); - assertions(this.TestContext.GetDbContext().Set()); + assertions(this.TestContext.GetBaseDbContext().Set()); return this; } /// public IAndWithDbContextTestBuilder WithSet(Func, bool> predicate) - where TDbContext : DbContext + where TDbContext : class where TEntity : class { CommonValidator.CheckForNullReference(predicate, nameof(predicate)); - if (!predicate(this.TestContext.GetDbContext().Set())) + if (!predicate(this.TestContext.GetBaseDbContext().Set())) { throw new DataProviderAssertionException(string.Format( "{0} the {1} set of {2} to pass the given predicate, but it failed.", diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithoutDbContextBuilder.cs b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithoutDbContextBuilder.cs index 1330d1043..f0ccce730 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithoutDbContextBuilder.cs +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Builders/Data/WithoutDbContextBuilder.cs @@ -30,13 +30,15 @@ public IAndWithoutDbContextBuilder WithoutEntityByKey(object key) /// public IAndWithoutDbContextBuilder WithoutEntityByKey(object key) - where TDbContext : DbContext + where TDbContext : class { - var dbContext = this.TestContext.GetDbContext(); + var dbContext = this.TestContext.GetBaseDbContext(); var entity = dbContext.Find(typeof(TEntity), key); if (entity == null) + { return this; + } dbContext.Remove(entity); dbContext.SaveChanges(); @@ -51,17 +53,18 @@ public IAndWithoutDbContextBuilder WithoutEntitiesByKeys(IEnumerable public IAndWithoutDbContextBuilder WithoutEntitiesByKeys(IEnumerable keys) - where TDbContext : DbContext + where TDbContext : class { - var dbContext = this.TestContext.GetDbContext(); + var dbContext = this.TestContext.GetBaseDbContext(); - var entityType = typeof(TEntity); var entities = keys - .Select(key => dbContext.Find(entityType, key)) + .Select(key => dbContext.Find(typeof(TEntity), key)) .Where(entity => entity != null); if (entities.Any() == false) + { return this; + } dbContext.RemoveRange(entities); dbContext.SaveChanges(); @@ -75,7 +78,7 @@ public IAndWithoutDbContextBuilder WithoutEntity(object entity) /// public IAndWithoutDbContextBuilder WithoutEntity(object entity) - where TDbContext : DbContext + where TDbContext : class => this.WithoutEntities(entity); /// @@ -84,8 +87,8 @@ public IAndWithoutDbContextBuilder WithoutEntities(IEnumerable entities) /// public IAndWithoutDbContextBuilder WithoutEntities(IEnumerable entities) - where TDbContext : DbContext - => this.WithoutEntities(dbContext => dbContext.RemoveRange(entities)); + where TDbContext : class + => this.WithoutEntities(dbContext => (dbContext as DbContext).RemoveRange(entities)); /// public IAndWithoutDbContextBuilder WithoutEntities(params object[] entities) @@ -93,7 +96,7 @@ public IAndWithoutDbContextBuilder WithoutEntities(params object[] entities) /// public IAndWithoutDbContextBuilder WithoutEntities(params object[] entities) - where TDbContext : DbContext + where TDbContext : class => this.WithoutEntities(entities.AsEnumerable()); /// @@ -105,20 +108,21 @@ public IAndWithoutDbContextBuilder WithoutAllEntities() => this.WithoutEntities(dbContext => dbContext.Database.EnsureDeleted()); /// - public IAndWithoutDbContextBuilder WithoutEntities(Action dbContextSetup) where TDbContext : DbContext + public IAndWithoutDbContextBuilder WithoutEntities(Action dbContextSetup) where TDbContext : class { CommonValidator.CheckForNullReference(dbContextSetup, nameof(dbContextSetup)); var dbContext = this.TestContext.GetDbContext(); + dbContextSetup(dbContext); try { - dbContext.SaveChanges(); + (dbContext as DbContext).SaveChanges(); } catch (DbUpdateConcurrencyException) { - // Intentional silent fail, when deleting entities that does not exist in the database or have been already deleted. + // Intentional silent fail, when deleting entities that do not exist in the database or have been already deleted. } return this; @@ -131,12 +135,13 @@ public IAndWithoutDbContextBuilder WithoutSet(Action> en /// public IAndWithoutDbContextBuilder WithoutSet(Action> entitySetup) - where TDbContext : DbContext + where TDbContext : class where TEntity : class { CommonValidator.CheckForNullReference(entitySetup, nameof(entitySetup)); - var dbContext = this.TestContext.GetDbContext(); + var dbContext = this.TestContext.GetBaseDbContext(); + entitySetup(dbContext.Set()); try @@ -145,7 +150,7 @@ public IAndWithoutDbContextBuilder WithoutSet(Action(this HttpTestContext httpTestC if (dbContextServices.Length > 1) { - throw new InvalidOperationException($"Multiple services of type {typeof(TDbContext).ToFriendlyTypeName()} are registered in the test service provider. You should specify the DbContext class explicitly by calling '.WithData(data => data.WithEntities(dbContextSetupAction)'."); + throw new InvalidOperationException($"Multiple services of type {typeof(TDbContext).ToFriendlyTypeName()} are registered in the test service provider. You should specify the {nameof(DbContext)} class explicitly by calling '.WithData(data => data.WithEntities(dbContextSetupAction)'."); } ServiceValidator.ValidateScopedServiceLifetime(nameof(GetDbContext)); - return dbContextServices.First(); + var dbContext = dbContextServices.First(); + + if (dbContext is not DbContext) + { + throw new InvalidOperationException($"The provided service {typeof(TDbContext).ToFriendlyTypeName()} is not an instance of {nameof(DbContext)}. The resolved implementation is {dbContext.GetType().ToFriendlyTypeName()}."); + } + + return dbContext; } + + public static DbContext GetBaseDbContext(this HttpTestContext httpTestContext) + where TDbContext : class + => httpTestContext.GetDbContext() as DbContext; } } diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/ServiceCollectionEntityFrameworkCoreExtensions.cs b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/ServiceCollectionEntityFrameworkCoreExtensions.cs index 55d94fda6..30f249eed 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/ServiceCollectionEntityFrameworkCoreExtensions.cs +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/ServiceCollectionEntityFrameworkCoreExtensions.cs @@ -59,7 +59,7 @@ public static IServiceCollection ReplaceDbContext(this IServiceCollection servic } AddScopedDatabaseMethodInfo - .MakeGenericMethod(existingDbContextService.ImplementationType) + .MakeGenericMethod(existingDbContextService.ServiceType, existingDbContextService.ImplementationType) .Invoke(null, new object[] { serviceCollection }); }); @@ -68,11 +68,19 @@ public static IServiceCollection ReplaceDbContext(this IServiceCollection servic return serviceCollection; } - private static void AddScopedDatabase(IServiceCollection serviceCollection) - where TDbContext : DbContext + private static void AddScopedDatabase(IServiceCollection serviceCollection) + where TDbContextImplementation : DbContext, TDbContextService { - serviceCollection.AddScoped(s => s.GetRequiredService()); - serviceCollection.AddDbContext(opts => + serviceCollection.AddScoped(s => s.GetRequiredService() as DbContext); + + if (typeof(TDbContextService) != typeof(TDbContextImplementation)) + { + serviceCollection.AddScoped(s => s.GetRequiredService() as TDbContextImplementation); + + TestServiceProvider.SaveServiceLifetime(ServiceLifetime.Scoped); + } + + serviceCollection.AddDbContext(opts => { opts.UseInMemoryDatabase(Guid.NewGuid().ToString()); diff --git a/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/PluginsTests/DataAnnotationsTestPluginTests.cs b/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/PluginsTests/DataAnnotationsTestPluginTests.cs index be672e3c9..b7d657852 100644 --- a/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/PluginsTests/DataAnnotationsTestPluginTests.cs +++ b/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/PluginsTests/DataAnnotationsTestPluginTests.cs @@ -34,9 +34,6 @@ public void ShouldInvokeMethodOfTypeVoidWithValidServiceCollection() testPlugin.DefaultServiceRegistrationDelegate(serviceCollection); - var methodReturnType = testPlugin.DefaultServiceRegistrationDelegate.Method.ReturnType.Name; - - Assert.True(methodReturnType == "Void"); Assert.Contains(serviceCollection, s => s.ServiceType == typeof(IValidationAttributeAdapterProvider)); } } diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ActionsTests/ShouldHaveTests/ShouldHaveDbContextTests.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ActionsTests/ShouldHaveTests/ShouldHaveDbContextTests.cs index 4aad5b0fa..6f536d940 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ActionsTests/ShouldHaveTests/ShouldHaveDbContextTests.cs +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ActionsTests/ShouldHaveTests/ShouldHaveDbContextTests.cs @@ -1,5 +1,6 @@ namespace MyTested.AspNetCore.Mvc.Test.BuildersTests.ActionsTests.ShouldHaveTests { + using System; using Exceptions; using Microsoft.Extensions.DependencyInjection; using Microsoft.EntityFrameworkCore; @@ -15,19 +16,50 @@ public void DbContextShouldNotThrowExceptionWithCorrectAssertions() { MyApplication .StartsFrom() - .WithServices(services => - { - services.AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); - }); + .WithServices(services => services + .AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName))); + + MyController + .Instance() + .Calling(c => c.Create(new CustomModel { Id = 1, Name = "Test" })) + .ShouldHave() + .Data(dbContext => dbContext + .WithEntities(db => + { + Assert.NotNull(db.Models.FirstOrDefaultAsync(m => m.Id == 1)); + })) + .AndAlso() + .ShouldReturn() + .Ok(); + + MyApplication.StartsFrom(); + } + + [Fact] + public void DbContextShouldNotThrowExceptionWithCorrectAssertionsThroughInterface() + { + MyApplication + .StartsFrom() + .WithServices(services => services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName))); MyController .Instance() .Calling(c => c.Create(new CustomModel { Id = 1, Name = "Test" })) .ShouldHave() .Data(dbContext => dbContext + .WithEntities(db => + { + Assert.NotNull(db.Models.FirstOrDefaultAsync(m => m.Id == 1)); + }) .WithEntities(db => { Assert.NotNull(db.Models.FirstOrDefaultAsync(m => m.Id == 1)); + }) + .WithEntities(db => + { + Assert.NotNull(db.Set().FirstOrDefaultAsync(m => m.Id == 1)); })) .AndAlso() .ShouldReturn() @@ -35,16 +67,15 @@ public void DbContextShouldNotThrowExceptionWithCorrectAssertions() MyApplication.StartsFrom(); } - + [Fact] public void DbContextShouldNotThrowExceptionWithCorrectPredicate() { MyApplication .StartsFrom() - .WithServices(services => - { - services.AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); - }); + .WithServices(services => services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName))); MyController .Instance() @@ -60,15 +91,72 @@ public void DbContextShouldNotThrowExceptionWithCorrectPredicate() } [Fact] - public void DbContextShouldThrowExceptionWithIncorrectPredicate() + public void DbContextShouldNotThrowExceptionWithCorrectPredicateThroughInterface() + { + MyApplication + .StartsFrom() + .WithServices(services => services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName))); + + MyController + .Instance() + .Calling(c => c.Create(new CustomModel { Id = 1, Name = "Test" })) + .ShouldHave() + .Data(dbContext => dbContext + .WithEntities(db => db.Models.FirstOrDefaultAsync(m => m.Id == 1) != null) + .WithEntities(db => db.Models.FirstOrDefaultAsync(m => m.Id == 1) != null) + .WithEntities(db => db.Set().FirstOrDefaultAsync(m => m.Id == 1) != null)) + .AndAlso() + .ShouldReturn() + .Ok(); + + MyApplication.StartsFrom(); + } + + [Fact] + public void DbContextShouldThrowExceptionWithCorrectPredicateThroughInvalidInterface() { MyApplication .StartsFrom() .WithServices(services => { - services.AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); + services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); + + services.AddScoped(); }); + Test.AssertException(() => + { + MyController + .Instance() + .Calling(c => c.Create(new CustomModel { Id = 1, Name = "Test" })) + .ShouldHave() + .Data(dbContext => dbContext + .WithEntities(db => db.Models.FirstOrDefaultAsync(m => m.Id == 1) != null) + .WithEntities(db => db.Models.FirstOrDefaultAsync(m => m.Id == 1) != null) + .WithEntities(db => db.Set().FirstOrDefaultAsync(m => m.Id == 1) != null) + .WithEntities(db => db.Models.FirstOrDefaultAsync(m => m.Id == 1) != null)) + .AndAlso() + .ShouldReturn() + .Ok(); + }, + "The provided service IInvalidDbContext is not an instance of DbContext. The resolved implementation is InvalidDbContext."); + + MyApplication.StartsFrom(); + } + + [Fact] + public void DbContextShouldThrowExceptionWithIncorrectPredicate() + { + MyApplication + .StartsFrom() + .WithServices(services => services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName))); + MyController .Instance() .Calling(c => c.Create(new CustomModel { Id = 1, Name = "Test" })) @@ -101,10 +189,9 @@ public void DbContextWithSetShouldNotThrowExceptionWithCorrectAssertions() { MyApplication .StartsFrom() - .WithServices(services => - { - services.AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); - }); + .WithServices(services => services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName))); MyController .Instance() @@ -122,15 +209,39 @@ public void DbContextWithSetShouldNotThrowExceptionWithCorrectAssertions() MyApplication.StartsFrom(); } + [Fact] + public void DbContextWithSetShouldNotThrowExceptionWithCorrectAssertionsThroughInterface() + { + MyApplication + .StartsFrom() + .WithServices(services => services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName))); + + MyController + .Instance() + .Calling(c => c.Create(new CustomModel { Id = 1, Name = "Test" })) + .ShouldHave() + .Data(dbContext => dbContext + .WithSet(set => + { + Assert.NotNull(set.FirstOrDefaultAsync(m => m.Id == 1)); + })) + .AndAlso() + .ShouldReturn() + .Ok(); + + MyApplication.StartsFrom(); + } + [Fact] public void DbContextWithSetShouldNotThrowExceptionWithCorrectPredicate() { MyApplication .StartsFrom() - .WithServices(services => - { - services.AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); - }); + .WithServices(services => services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName))); MyController .Instance() @@ -145,15 +256,36 @@ public void DbContextWithSetShouldNotThrowExceptionWithCorrectPredicate() MyApplication.StartsFrom(); } + [Fact] + public void DbContextWithSetShouldNotThrowExceptionWithCorrectPredicateThroughInterface() + { + MyApplication + .StartsFrom() + .WithServices(services => services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName))); + + MyController + .Instance() + .Calling(c => c.Create(new CustomModel { Id = 1, Name = "Test" })) + .ShouldHave() + .Data(dbContext => dbContext + .WithSet(set => set.FirstOrDefaultAsync(m => m.Id == 1) != null)) + .AndAlso() + .ShouldReturn() + .Ok(); + + MyApplication.StartsFrom(); + } + [Fact] public void DbContextWithSetShouldThrowExceptionWithIncorrectPredicate() { MyApplication .StartsFrom() - .WithServices(services => - { - services.AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); - }); + .WithServices(services => services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName))); MyController .Instance() diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ControllersTests/ControllerBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ControllersTests/ControllerBuilderTests.cs index cb9dc115e..6a17d393f 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ControllersTests/ControllerBuilderTests.cs +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ControllersTests/ControllerBuilderTests.cs @@ -12,6 +12,9 @@ public class ControllerBuilderTests { + private const string TestConnectionString = "Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;"; + private const string AnotherConnectionString = "Server=(localdb)\\MSSQLLocalDB;Database=AnotherTestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;"; + [Fact] public void WithDataShouldSetupDbContext() { @@ -19,8 +22,9 @@ public void WithDataShouldSetupDbContext() .StartsFrom() .WithServices(services => { - services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + services + .AddDbContext(options => options + .UseSqlServer(TestConnectionString)); }); MyController @@ -46,8 +50,9 @@ public void WithEntitiesShouldSetupDbContext() .StartsFrom() .WithServices(services => { - services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + services + .AddDbContext(options => options + .UseSqlServer(TestConnectionString)); }); MyController @@ -139,6 +144,107 @@ public void WithEntitiesShouldSetupDbContext() MyApplication.StartsFrom(); } + [Fact] + public void WithEntitiesShouldSetupDbContextThroughInterface() + { + MyApplication + .StartsFrom() + .WithServices(services => + { + services + .AddDbContext(options => options + .UseSqlServer(TestConnectionString)); + }); + + MyController + .Instance() + .WithData(data => data + .WithEntities(db => db + .Models.Add(new CustomModel + { + Id = 1, + Name = "Test" + }))) + .Calling(c => c.Get(1)) + .ShouldReturn() + .Ok(ok => ok + .WithModelOfType() + .Passing(m => m.Name == "Test")); + + MyController + .Instance() + .WithData(data => data + .WithEntities(db => db.Add(new CustomModel + { + Id = 1, + Name = "Test" + }))) + .Calling(c => c.Get(1)) + .ShouldReturn() + .Ok(ok => ok + .WithModelOfType() + .Passing(m => m.Name == "Test")); + + MyController + .Instance() + .WithData(data => data + .WithEntities( + new CustomModel + { + Id = 1, + Name = "Test 1" + }, + new CustomModel + { + Id = 2, + Name = "Test 2" + })) + .Calling(c => c.Get(1)) + .ShouldReturn() + .Ok(ok => ok + .WithModelOfType() + .Passing(m => m.Name == "Test 1")); + + MyController + .Instance() + .WithData(data => data + .WithEntities(db => db + .Models.Add(new CustomModel + { + Id = 2, + Name = "Test" + }))) + .Calling(c => c.Get(1)) + .ShouldReturn() + .NotFound(); + + MyController + .Instance() + .WithData(data => data + .WithEntities( + new CustomModel + { + Id = 2, + Name = "Test 2" + }, + new CustomModel + { + Id = 3, + Name = "Test 3" + })) + .Calling(c => c.Get(1)) + .ShouldReturn() + .NotFound(); + + MyController + .Instance() + .Calling(c => c.Get(1)) + .ShouldReturn() + .NotFound(); + + MyApplication.StartsFrom(); + } + [Fact] public void WithSetShouldSetupDbContext() { @@ -146,8 +252,9 @@ public void WithSetShouldSetupDbContext() .StartsFrom() .WithServices(services => { - services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + services + .AddDbContext(options => options + .UseSqlServer(TestConnectionString)); }); MyController @@ -187,6 +294,55 @@ public void WithSetShouldSetupDbContext() MyApplication.StartsFrom(); } + [Fact] + public void WithSetShouldSetupDbContextThroughInterface() + { + MyApplication + .StartsFrom() + .WithServices(services => + { + services + .AddDbContext(options => options + .UseSqlServer(TestConnectionString)); + }); + + MyController + .Instance() + .WithData(data => data + .WithSet(set => set + .Add(new CustomModel + { + Id = 1, + Name = "Test" + }))) + .Calling(c => c.Get(1)) + .ShouldReturn() + .Ok(ok => ok + .WithModelOfType() + .Passing(m => m.Name == "Test")); + + MyController + .Instance() + .WithData(data => data + .WithSet(set => set + .Add(new CustomModel + { + Id = 2, + Name = "Test" + }))) + .Calling(c => c.Get(1)) + .ShouldReturn() + .NotFound(); + + MyController + .Instance() + .Calling(c => c.Get(1)) + .ShouldReturn() + .NotFound(); + + MyApplication.StartsFrom(); + } + [Fact] public void WithEntitiesShouldSetupMultipleDbContext() { @@ -194,11 +350,13 @@ public void WithEntitiesShouldSetupMultipleDbContext() .StartsFrom() .WithServices(services => { - services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + services + .AddDbContext(options => options + .UseSqlServer(TestConnectionString)); - services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=AnotherTestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + services + .AddDbContext(options => options + .UseSqlServer(AnotherConnectionString)); }); var modelName = "Test"; @@ -297,11 +455,13 @@ public void WithSetShouldSetupMultipleDbContext() .StartsFrom() .WithServices(services => { - services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + services + .AddDbContext(options => options + .UseSqlServer(TestConnectionString)); - services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=AnotherTestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + services + .AddDbContext(options => options + .UseSqlServer(AnotherConnectionString)); }); var modelName = "Test"; @@ -373,11 +533,13 @@ public void WithDataThrowCorrectExceptionWhenMultipleDbContextsAreRegisteredAndD .StartsFrom() .WithServices(services => { - services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + services + .AddDbContext(options => options + .UseSqlServer(TestConnectionString)); - services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=AnotherTestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + services + .AddDbContext(options => options + .UseSqlServer(AnotherConnectionString)); }); Test.AssertException(() => @@ -494,8 +656,8 @@ public void WithoutDataThrowsExceptionWhenNullIsProvided() () => { MyApplication - .StartsFrom() - .WithServices(services => services.AddDbContext()); + .StartsFrom() + .WithServices(services => services.AddDbContext()); var model = new CustomModel { diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/InvocationsTests/ShouldHaveTests/ShouldHaveDbContextTests.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/InvocationsTests/ShouldHaveTests/ShouldHaveDbContextTests.cs index 289f9b444..adf465f51 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/InvocationsTests/ShouldHaveTests/ShouldHaveDbContextTests.cs +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/InvocationsTests/ShouldHaveTests/ShouldHaveDbContextTests.cs @@ -17,7 +17,9 @@ public void DbContextShouldNotThrowExceptionWithCorrectAssertions() .StartsFrom() .WithServices(services => { - services.AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); + services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); }); MyViewComponent @@ -35,6 +37,41 @@ public void DbContextShouldNotThrowExceptionWithCorrectAssertions() MyApplication.StartsFrom(); } + [Fact] + public void DbContextShouldNotThrowExceptionWithCorrectAssertionsThroughInterface() + { + MyApplication + .StartsFrom() + .WithServices(services => + { + services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); + }); + + MyViewComponent + .InvokedWith(c => c.Invoke(new CustomModel { Id = 1, Name = "Test" })) + .ShouldHave() + .Data(dbContext => dbContext + .WithEntities(db => + { + Assert.NotNull(db.Models.FirstOrDefaultAsync(m => m.Id == 1)); + }) + .WithEntities(db => + { + Assert.NotNull(db.Models.FirstOrDefaultAsync(m => m.Id == 1)); + }) + .WithEntities(db => + { + Assert.NotNull(db.Set().FirstOrDefaultAsync(m => m.Id == 1)); + })) + .AndAlso() + .ShouldReturn() + .View(); + + MyApplication.StartsFrom(); + } + [Fact] public void DbContextShouldNotThrowExceptionWithCorrectPredicate() { @@ -42,7 +79,9 @@ public void DbContextShouldNotThrowExceptionWithCorrectPredicate() .StartsFrom() .WithServices(services => { - services.AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); + services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); }); MyViewComponent @@ -57,6 +96,32 @@ public void DbContextShouldNotThrowExceptionWithCorrectPredicate() MyApplication.StartsFrom(); } + [Fact] + public void DbContextShouldNotThrowExceptionWithCorrectPredicateThroughInterface() + { + MyApplication + .StartsFrom() + .WithServices(services => + { + services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); + }); + + MyViewComponent + .InvokedWith(c => c.Invoke(new CustomModel { Id = 1, Name = "Test" })) + .ShouldHave() + .Data(dbContext => dbContext + .WithEntities(db => db.Models.FirstOrDefaultAsync(m => m.Id == 1) != null) + .WithEntities(db => db.Models.FirstOrDefaultAsync(m => m.Id == 1) != null) + .WithEntities(db => db.Set().FirstOrDefaultAsync(m => m.Id == 1) != null)) + .AndAlso() + .ShouldReturn() + .View(); + + MyApplication.StartsFrom(); + } + [Fact] public void DbContextShouldThrowExceptionWithIncorrectPredicate() { @@ -64,7 +129,9 @@ public void DbContextShouldThrowExceptionWithIncorrectPredicate() .StartsFrom() .WithServices(services => { - services.AddDbContext(options => options.UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); + services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); }); MyViewComponent @@ -91,5 +158,46 @@ public void DbContextShouldThrowExceptionWithIncorrectPredicate() MyApplication.StartsFrom(); } + + [Fact] + public void DbContextShouldThrowExceptionWithIncorrectPredicateThroughInterface() + { + MyApplication + .StartsFrom() + .WithServices(services => + { + services + .AddDbContext(options => options + .UseInMemoryDatabase(TestObjectFactory.TestDatabaseName)); + }); + + MyViewComponent + .InvokedWith(c => c.Invoke(new CustomModel { Id = 1, Name = "Test" })) + .ShouldHave() + .Data(dbContext => dbContext + .WithEntities(db => db.Models.FirstOrDefaultAsync(m => m.Id == 1) != null) + .WithEntities(db => db.Models.FirstOrDefaultAsync(m => m.Id == 1) != null) + .WithEntities(db => db.Set().FirstOrDefaultAsync(m => m.Id == 1) != null)) + .AndAlso() + .ShouldReturn() + .View(); + + Test.AssertException(() => + { + MyViewComponent + .InvokedWith(c => c.Invoke(new CustomModel { Id = 2, Name = "Test" })) + .ShouldHave() + .Data(dbContext => dbContext + .WithEntities(db => db.Models.FirstOrDefaultAsync(m => m.Id == 1) == null) + .WithEntities(db => db.Models.FirstOrDefaultAsync(m => m.Id == 1) == null) + .WithEntities(db => db.Set().FirstOrDefaultAsync(m => m.Id == 1) == null)) + .AndAlso() + .ShouldReturn() + .View(); + }, + "When invoking CreateDataComponent expected the ICustomDbContext entities to pass the given predicate, but it failed."); + + MyApplication.StartsFrom(); + } } } diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ViewComponentsTests/ViewComponentBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ViewComponentsTests/ViewComponentBuilderTests.cs index 3cb8d708b..ec1ae579e 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ViewComponentsTests/ViewComponentBuilderTests.cs +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/BuildersTests/ViewComponentsTests/ViewComponentBuilderTests.cs @@ -70,6 +70,67 @@ public void WithEntitiesShouldSetupDbContext() MyApplication.StartsFrom(); } + [Fact] + public void WithEntitiesShouldSetupDbContextThroughInterface() + { + MyApplication + .StartsFrom() + .WithServices(services => + { + services.AddDbContext(options => + options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + }); + + MyViewComponent + .Instance() + .WithData(data => data + .WithEntities(db => db + .Models.Add(new CustomModel + { + Id = 1, + Name = "Test" + }))) + .InvokedWith(c => c.Invoke(1)) + .ShouldReturn() + .View(view => view + .WithModelOfType() + .Passing(m => m.Name == "Test")); + + MyViewComponent + .Instance() + .WithData(data => data + .WithEntities(db => db.Add(new CustomModel + { + Id = 1, + Name = "Test" + }))) + .InvokedWith(c => c.Invoke(1)) + .ShouldReturn() + .View(view => view + .WithModelOfType() + .Passing(m => m.Name == "Test")); + + MyViewComponent + .Instance() + .WithData(data => data + .WithEntities(db => db + .Models.Add(new CustomModel + { + Id = 2, + Name = "Test" + }))) + .InvokedWith(c => c.Invoke(1)) + .ShouldReturn() + .Content("Invalid"); + + MyViewComponent + .InvokedWith(c => c.Invoke(1)) + .ShouldReturn() + .Content("Invalid"); + + MyApplication.StartsFrom(); + } + [Fact] public void WithSetShouldSetupDbContext() { @@ -116,5 +177,52 @@ public void WithSetShouldSetupDbContext() MyApplication.StartsFrom(); } + + [Fact] + public void WithSetShouldSetupDbContextThroughInterface() + { + MyApplication + .StartsFrom() + .WithServices(services => + { + services.AddDbContext(options => + options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + }); + + MyViewComponent + .Instance() + .WithData(data => data + .WithSet(set => set + .Add(new CustomModel + { + Id = 1, + Name = "Test" + }))) + .InvokedWith(c => c.Invoke(1)) + .ShouldReturn() + .View(view => view + .WithModelOfType() + .Passing(m => m.Name == "Test")); + + MyViewComponent + .Instance() + .WithData(data => data + .WithSet(set => set + .Add(new CustomModel + { + Id = 2, + Name = "Test" + }))) + .InvokedWith(c => c.Invoke(1)) + .ShouldReturn() + .Content("Invalid"); + + MyViewComponent + .InvokedWith(c => c.Invoke(1)) + .ShouldReturn() + .Content("Invalid"); + + MyApplication.StartsFrom(); + } } } diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/PluginsTests/EntityFrameworkCoreTestPluginTests.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/PluginsTests/EntityFrameworkCoreTestPluginTests.cs index 09291b927..f2498aa86 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/PluginsTests/EntityFrameworkCoreTestPluginTests.cs +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/PluginsTests/EntityFrameworkCoreTestPluginTests.cs @@ -27,9 +27,6 @@ public void ShouldInvokeMethodOfTypeVoidWithValidServiceCollection() testPlugin.ServiceRegistrationDelegate(serviceCollection); - var methodReturnType = testPlugin.ServiceRegistrationDelegate.Method.ReturnType.Name; - - Assert.True(methodReturnType == "Void"); Assert.Contains(serviceCollection, s => s.ServiceType == typeof(DbContextOptions)); } } diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs index 3341f2f32..44472c0a5 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs @@ -12,6 +12,8 @@ public class ServicesTests { + private const string TestConnectionString = "Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;"; + [Fact] public void ReplaceDbContextShouldReplaceNonInMemoryDatabaseWithInMemoryScopedOne() { @@ -62,6 +64,49 @@ public void ReplaceDbContextShouldReplaceMultipleDbContextTypes() this.AssertCorrectDbContextAndOptions(services); } + [Fact] + public void ReplaceDbContextWithInterfaceShouldReplaceDbContextCorrectly() + { + var services = new ServiceCollection(); + + services.AddDbContext(options => options.UseSqlServer(TestConnectionString)); + + services.ReplaceDbContext(); + + var baseDbContextService = services.FirstOrDefault(s => s.ServiceType == typeof(DbContext)); + var classDbContextService = services.FirstOrDefault(s => s.ServiceType == typeof(CustomDbContext)); + var interfaceDbContextService = services.FirstOrDefault(s => s.ServiceType == typeof(ICustomDbContext)); + + Assert.NotNull(baseDbContextService); + Assert.NotNull(classDbContextService); + Assert.NotNull(interfaceDbContextService); + + Assert.Equal(ServiceLifetime.Scoped, baseDbContextService.Lifetime); + Assert.Equal(ServiceLifetime.Scoped, classDbContextService.Lifetime); + Assert.Equal(ServiceLifetime.Scoped, interfaceDbContextService.Lifetime); + + var serviceProvider = services.BuildServiceProvider(); + + var baseDbContext = serviceProvider.GetService(); + var classDbContext = serviceProvider.GetService(); + var interfaceDbContext = serviceProvider.GetService(); + + Assert.NotNull(baseDbContext); + Assert.NotNull(classDbContext); + Assert.NotNull(interfaceDbContext); + + baseDbContext.Add(new CustomModel()); + baseDbContext.SaveChanges(); + + baseDbContext = serviceProvider.GetService(); + classDbContext = serviceProvider.GetService(); + interfaceDbContext = serviceProvider.GetService(); + + Assert.Single(baseDbContext.Set()); + Assert.Single(classDbContext.Models); + Assert.Single(interfaceDbContext.Models); + } + [Fact] public void CallingMigrateShouldNotThrowExceptionWithInMemoryDatabase() { @@ -79,8 +124,7 @@ private void AddDbContextWithSqlServer(IServiceCollection services) private void AddDbContextWithSqlServer(IServiceCollection services) where TDbContext : DbContext - => services.AddDbContext(options => - options.UseSqlServer("Server=(localdb)\\MSSQLLocalDB;Database=TestDb;Trusted_Connection=True;MultipleActiveResultSets=true;Connect Timeout=30;")); + => services.AddDbContext(options => options.UseSqlServer(TestConnectionString)); private void AssertCorrectDbContextAndOptions(IServiceCollection services) => this.AssertCorrectDbContextAndOptions(services); diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/CustomDbContext.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/CustomDbContext.cs index a28084244..28dd0ab2c 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/CustomDbContext.cs +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/CustomDbContext.cs @@ -2,7 +2,7 @@ { using Microsoft.EntityFrameworkCore; - public class CustomDbContext : DbContext + public class CustomDbContext : DbContext, ICustomDbContext { public CustomDbContext(DbContextOptions options) : base(options) diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/ICustomDbContext.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/ICustomDbContext.cs new file mode 100644 index 000000000..08cf5a185 --- /dev/null +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/ICustomDbContext.cs @@ -0,0 +1,9 @@ +namespace MyTested.AspNetCore.Mvc.Test.Setups.Common +{ + using Microsoft.EntityFrameworkCore; + + public interface ICustomDbContext + { + DbSet Models { get; set; } + } +} diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/IInvalidDbContext.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/IInvalidDbContext.cs new file mode 100644 index 000000000..8b738fb5f --- /dev/null +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/IInvalidDbContext.cs @@ -0,0 +1,9 @@ +namespace MyTested.AspNetCore.Mvc.Test.Setups.Common +{ + using Microsoft.EntityFrameworkCore; + + public interface IInvalidDbContext + { + DbSet Models { get; set; } + } +} diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/InvalidDbContext.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/InvalidDbContext.cs new file mode 100644 index 000000000..6776b0195 --- /dev/null +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Common/InvalidDbContext.cs @@ -0,0 +1,9 @@ +namespace MyTested.AspNetCore.Mvc.Test.Setups.Common +{ + using Microsoft.EntityFrameworkCore; + + public class InvalidDbContext : IInvalidDbContext + { + public DbSet Models { get; set; } + } +} diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Controllers/DbContextController.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Controllers/DbContextController.cs index 5b05a450d..35d5213d2 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Controllers/DbContextController.cs +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Controllers/DbContextController.cs @@ -8,10 +8,7 @@ public class DbContextController : Controller { private readonly CustomDbContext data; - public DbContextController(CustomDbContext data) - { - this.data = data; - } + public DbContextController(CustomDbContext data) => this.data = data; public IActionResult Create(CustomModel model) { diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Controllers/InterfaceDbContextController.cs b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Controllers/InterfaceDbContextController.cs new file mode 100644 index 000000000..183a76fde --- /dev/null +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/Setups/Controllers/InterfaceDbContextController.cs @@ -0,0 +1,41 @@ +namespace MyTested.AspNetCore.Mvc.Test.Setups.Controllers +{ + using System.Linq; + using Common; + using Microsoft.AspNetCore.Mvc; + + public class InterfaceDbContextController : Controller + { + private readonly ICustomDbContext data; + + public InterfaceDbContextController(ICustomDbContext data) => this.data = data; + + public IActionResult Create(CustomModel model) + { + this.data.Models.Add(model); + return this.Ok(); + } + + public IActionResult Get(int id) + { + var model = this.data.Models.FirstOrDefault(m => m.Id == id); + if (model == null) + { + return this.NotFound(); + } + + return this.Ok(model); + } + + public IActionResult GetAll() + { + var models = this.data.Models; + if (models == null || !models.Any()) + { + return this.NotFound(); + } + + return this.Ok(models.ToList()); + } + } +} diff --git a/test/MyTested.AspNetCore.Mvc.Lite.Test/PluginsTests/LiteTestPluginTests.cs b/test/MyTested.AspNetCore.Mvc.Lite.Test/PluginsTests/LiteTestPluginTests.cs index 63fdc5811..dd972a4eb 100644 --- a/test/MyTested.AspNetCore.Mvc.Lite.Test/PluginsTests/LiteTestPluginTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Lite.Test/PluginsTests/LiteTestPluginTests.cs @@ -34,9 +34,6 @@ public void ShouldInvokeMethodOfTypeVoidWithValidServiceCollection() testPlugin.DefaultServiceRegistrationDelegate(serviceCollection); - var methodReturnType = testPlugin.DefaultServiceRegistrationDelegate.Method.ReturnType.Name; - - Assert.True(methodReturnType == "Void"); Assert.Contains(serviceCollection, s => s.ServiceType == typeof(CorsAuthorizationFilter)); } } diff --git a/test/MyTested.AspNetCore.Mvc.ModelState.Test/PluginsTests/ModelStateTestPluginTests.cs b/test/MyTested.AspNetCore.Mvc.ModelState.Test/PluginsTests/ModelStateTestPluginTests.cs index e718351a2..b945dad6a 100644 --- a/test/MyTested.AspNetCore.Mvc.ModelState.Test/PluginsTests/ModelStateTestPluginTests.cs +++ b/test/MyTested.AspNetCore.Mvc.ModelState.Test/PluginsTests/ModelStateTestPluginTests.cs @@ -34,9 +34,6 @@ public void ShouldInvokeMethodOfTypeVoidWithValidServiceCollection() testPlugin.DefaultServiceRegistrationDelegate(serviceCollection); - var methodReturnType = testPlugin.DefaultServiceRegistrationDelegate.Method.ReturnType.Name; - - Assert.True(methodReturnType == "Void"); Assert.Contains(serviceCollection, s => s.ServiceType == typeof(IValidationAttributeAdapterProvider)); } } diff --git a/test/MyTested.AspNetCore.Mvc.Options.Test/PluginsTests/OptionsTestPluginTests.cs b/test/MyTested.AspNetCore.Mvc.Options.Test/PluginsTests/OptionsTestPluginTests.cs index cf0d515f9..a1d8c3bad 100644 --- a/test/MyTested.AspNetCore.Mvc.Options.Test/PluginsTests/OptionsTestPluginTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Options.Test/PluginsTests/OptionsTestPluginTests.cs @@ -24,9 +24,6 @@ public void ShouldInvokeMethodOfTypeVoidWithValidServiceCollection() testPlugin.ServiceRegistrationDelegate(serviceCollection); - var methodReturnType = testPlugin.ServiceRegistrationDelegate.Method.ReturnType.Name; - - Assert.True(methodReturnType == "Void"); Assert.Contains(serviceCollection, s => s.ServiceType == typeof(IOptions<>)); } } From ab16a0f1434f5a0e3bed36e64588da0bf6b1cdeb Mon Sep 17 00:00:00 2001 From: Ivaylo Kenov Date: Thu, 29 Jul 2021 17:19:17 +0300 Subject: [PATCH 10/19] Added built-in support for Razor runtime compilation (closes #377, closes #386) --- LICENSE | 2 +- MyTested.AspNetCore.Mvc.sln | 16 ++++- ...ested.AspNetCore.Mvc.NewtonsoftJson.csproj | 4 +- .../Internal/Razor/ChangeTokenMock.cs | 16 +++++ .../TestActionDescriptorChangeProvider.cs | 10 +++ ...etCore.Mvc.Razor.RuntimeCompilation.csproj | 44 +++++++++++++ .../RazorRuntimeCompilationTestPlugin.cs | 17 +++++ ...ectionRazorRuntimeCompilationExtensions.cs | 24 +++++++ .../MyTested.AspNetCore.Mvc.Versioning.csproj | 2 +- .../ApplicationParts.Controllers.csproj | 2 +- .../ApplicationParts.Models.csproj | 2 +- .../ApplicationParts.Web.csproj | 8 +-- .../Properties/launchSettings.json | 27 ++++++++ samples/Blog/Blog.Data/Blog.Data.csproj | 4 +- samples/Blog/Blog.Web/Blog.Web.csproj | 5 +- samples/Blog/Blog.Web/Startup.cs | 2 +- ...mon.csproj => AdditionalEntryPoint.csproj} | 0 .../HomeControllerTest.cs | 1 - .../Test.MultipleEntryPoints.csproj | 2 +- .../Configuration/WebApplication/Startup.cs | 2 +- .../MusicStore.Web/MusicStore.Web.csproj | 16 ++--- .../Internal/Application/TestApplication.cs | 2 +- .../Application/TestApplicationServices.cs | 62 +++++++++++-------- ...yTested.AspNetCore.Mvc.Abstractions.csproj | 4 +- ...ested.AspNetCore.Mvc.Authentication.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Caching.csproj | 2 +- ...Tested.AspNetCore.Mvc.Configuration.csproj | 2 +- ...tCore.Mvc.Controllers.ActionResults.csproj | 2 +- ...pNetCore.Mvc.Controllers.Attributes.csproj | 2 +- ...Mvc.Controllers.Views.ActionResults.csproj | 2 +- ...ed.AspNetCore.Mvc.Controllers.Views.csproj | 2 +- ...MyTested.AspNetCore.Mvc.Controllers.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Core.csproj | 2 +- ...sted.AspNetCore.Mvc.DataAnnotations.csproj | 2 +- ....AspNetCore.Mvc.DependencyInjection.csproj | 2 +- ....AspNetCore.Mvc.EntityFrameworkCore.csproj | 6 +- .../MyTested.AspNetCore.Mvc.Helpers.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Http.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Licensing.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Lite.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ModelState.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Models.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Options.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Pipeline.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Routing.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Session.csproj | 2 +- .../MyTested.AspNetCore.Mvc.TempData.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Universe.csproj | 4 +- ...tCore.Mvc.ViewComponents.Attributes.csproj | 2 +- ...pNetCore.Mvc.ViewComponents.Results.csproj | 2 +- ...ested.AspNetCore.Mvc.ViewComponents.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewData.csproj | 2 +- ...yTested.AspNetCore.Mvc.ViewFeatures.csproj | 2 +- .../MyTested.AspNetCore.Mvc.csproj | 2 +- .../ServicesTests.cs | 31 +++++++--- ...etCore.Mvc.EntityFrameworkCore.Test.csproj | 2 +- .../ControllerTestBuilderTests.cs | 17 +++++ ...e.Mvc.Razor.RuntimeCompilation.Test.csproj | 33 ++++++++++ .../Properties/AssemblyInfo.cs | 11 ++++ .../TestStartup.cs | 18 ++++++ ...MyTested.AspNetCore.Mvc.Test.Setups.csproj | 2 +- .../Startups/StartupWithException.cs | 18 ++++++ ...Tested.AspNetCore.Mvc.Universe.Test.csproj | 2 +- 63 files changed, 376 insertions(+), 98 deletions(-) create mode 100644 plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Internal/Razor/ChangeTokenMock.cs create mode 100644 plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Internal/Razor/TestActionDescriptorChangeProvider.cs create mode 100644 plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj create mode 100644 plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Plugins/RazorRuntimeCompilationTestPlugin.cs create mode 100644 plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/ServiceCollectionRazorRuntimeCompilationExtensions.cs create mode 100644 samples/Autofac/Autofac.NoContainerBuilder.Web/Properties/launchSettings.json rename samples/Configuration/Common/{Common.csproj => AdditionalEntryPoint.csproj} (100%) create mode 100644 test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/BuildersTests/ControllersTests/ControllerTestBuilderTests.cs create mode 100644 test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj create mode 100644 test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/Properties/AssemblyInfo.cs create mode 100644 test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestStartup.cs create mode 100644 test/MyTested.AspNetCore.Mvc.Test.Setups/Startups/StartupWithException.cs diff --git a/LICENSE b/LICENSE index 72ea3accd..84c95cdab 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ MyTested.AspNetCore.Mvc -Code by Ivaylo Kenov. Copyright (c) 2015-2019 Ivaylo Kenov. +Code by Ivaylo Kenov. Copyright (c) 2015-2021 Ivaylo Kenov. =============================================================================== This program is free software: you can redistribute it and/or modify it diff --git a/MyTested.AspNetCore.Mvc.sln b/MyTested.AspNetCore.Mvc.sln index 640155690..c020ce122 100644 --- a/MyTested.AspNetCore.Mvc.sln +++ b/MyTested.AspNetCore.Mvc.sln @@ -229,12 +229,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplication", "samples\C EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.MultipleEntryPoints", "samples\Configuration\Test.MultipleEntryPoints\Test.MultipleEntryPoints.csproj", "{840C7C04-90CC-4F0F-BDF9-0D97D399BA3F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "samples\Configuration\Common\Common.csproj", "{AC971EBF-48A1-47C1-B61F-CF97FCE4F48C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdditionalEntryPoint", "samples\Configuration\Common\AdditionalEntryPoint.csproj", "{AC971EBF-48A1-47C1-B61F-CF97FCE4F48C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyTested.AspNetCore.Mvc.Versioning", "plugins\MyTested.AspNetCore.Mvc.Versioning\MyTested.AspNetCore.Mvc.Versioning.csproj", "{3529E0FC-4D63-4828-A3DC-ACE7B6243A73}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyTested.AspNetCore.Mvc.Versioning.Test", "test\MyTested.AspNetCore.Mvc.Versioning.Test\MyTested.AspNetCore.Mvc.Versioning.Test.csproj", "{6541FC98-C8B1-48CF-A3A5-7028B19455E8}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation", "plugins\MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation\MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj", "{A9353C8C-3EF6-4677-B4D3-8BEB350AC0B0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test", "test\MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test\MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj", "{A40A442E-E39B-4EA5-839A-3893AD66A700}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -657,6 +661,14 @@ Global {6541FC98-C8B1-48CF-A3A5-7028B19455E8}.Debug|Any CPU.Build.0 = Debug|Any CPU {6541FC98-C8B1-48CF-A3A5-7028B19455E8}.Release|Any CPU.ActiveCfg = Release|Any CPU {6541FC98-C8B1-48CF-A3A5-7028B19455E8}.Release|Any CPU.Build.0 = Release|Any CPU + {A9353C8C-3EF6-4677-B4D3-8BEB350AC0B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A9353C8C-3EF6-4677-B4D3-8BEB350AC0B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A9353C8C-3EF6-4677-B4D3-8BEB350AC0B0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A9353C8C-3EF6-4677-B4D3-8BEB350AC0B0}.Release|Any CPU.Build.0 = Release|Any CPU + {A40A442E-E39B-4EA5-839A-3893AD66A700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A40A442E-E39B-4EA5-839A-3893AD66A700}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A40A442E-E39B-4EA5-839A-3893AD66A700}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A40A442E-E39B-4EA5-839A-3893AD66A700}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -774,6 +786,8 @@ Global {AC971EBF-48A1-47C1-B61F-CF97FCE4F48C} = {7BEC9808-8650-4322-BCC6-1D7D91B53678} {3529E0FC-4D63-4828-A3DC-ACE7B6243A73} = {EF386110-3D7B-4BDF-B403-8DC2AB8CF7BB} {6541FC98-C8B1-48CF-A3A5-7028B19455E8} = {D140FA14-A6C2-4279-8A41-35BC55279DA8} + {A9353C8C-3EF6-4677-B4D3-8BEB350AC0B0} = {EF386110-3D7B-4BDF-B403-8DC2AB8CF7BB} + {A40A442E-E39B-4EA5-839A-3893AD66A700} = {D140FA14-A6C2-4279-8A41-35BC55279DA8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {99A2DEDD-5195-4EE6-A546-B1CA54C5539F} diff --git a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj index 9c2bb3035..abc3280e3 100644 --- a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC Newtonsoft JSON components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.NewtonsoftJson 5.0.0 Ivaylo Kenov @@ -29,7 +29,7 @@ - + diff --git a/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Internal/Razor/ChangeTokenMock.cs b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Internal/Razor/ChangeTokenMock.cs new file mode 100644 index 000000000..fa68e543f --- /dev/null +++ b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Internal/Razor/ChangeTokenMock.cs @@ -0,0 +1,16 @@ +namespace MyTested.AspNetCore.Mvc.Internal.Razor +{ + using Microsoft.Extensions.Primitives; + using System; + + public class ChangeTokenMock : IChangeToken + { + public static ChangeTokenMock Instance => new ChangeTokenMock(); + + public bool ActiveChangeCallbacks => false; + + public bool HasChanged => false; + + public IDisposable RegisterChangeCallback(Action callback, object state) => DisposableMock.Instance; + } +} diff --git a/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Internal/Razor/TestActionDescriptorChangeProvider.cs b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Internal/Razor/TestActionDescriptorChangeProvider.cs new file mode 100644 index 000000000..5d4920eb3 --- /dev/null +++ b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Internal/Razor/TestActionDescriptorChangeProvider.cs @@ -0,0 +1,10 @@ +namespace MyTested.AspNetCore.Mvc.Internal.Razor +{ + using Microsoft.AspNetCore.Mvc.Infrastructure; + using Microsoft.Extensions.Primitives; + + public class TestActionDescriptorChangeProvider : IActionDescriptorChangeProvider + { + public IChangeToken GetChangeToken() => ChangeTokenMock.Instance; + } +} diff --git a/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj new file mode 100644 index 000000000..f1aa5cc8f --- /dev/null +++ b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj @@ -0,0 +1,44 @@ + + + + My Tested ASP.NET Core MVC razor runtime compilation components. + 2015-2021 Ivaylo Kenov + MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation + 5.0.0 + Ivaylo Kenov + net5.0 + $(NoWarn);CS1591 + true + true + MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation + ../../tools/Key.snk + true + true + MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation + aspnetcore;aspnetcoremvc;testing;unit;tests;fluent;testing;framework;asp;net;core;mvc;test;mymvc;mytested + nuget-logo.png + https://mytestedasp.net/ + LICENSE + true + git + https://github.com/ivaylokenov/MyTested.AspNetCore.Mvc + false + MyTested.AspNetCore.Mvc + true + snupkg + + + + + + + + + + + + + + + + diff --git a/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Plugins/RazorRuntimeCompilationTestPlugin.cs b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Plugins/RazorRuntimeCompilationTestPlugin.cs new file mode 100644 index 000000000..9dae1dbb8 --- /dev/null +++ b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/Plugins/RazorRuntimeCompilationTestPlugin.cs @@ -0,0 +1,17 @@ +namespace MyTested.AspNetCore.Mvc.Plugins +{ + using System; + using Microsoft.AspNetCore.Mvc.Infrastructure; + using Microsoft.Extensions.DependencyInjection; + + public class RazorRuntimeCompilationTestPlugin : IServiceRegistrationPlugin + { + private readonly Type defaultActionDescriptorChangeProviderServiceType = typeof(IActionDescriptorChangeProvider); + + public Func ServiceSelectorPredicate + => serviceDescriptor => serviceDescriptor.ServiceType == this.defaultActionDescriptorChangeProviderServiceType; + + public Action ServiceRegistrationDelegate + => serviceCollection => serviceCollection.ReplaceRazorRuntimeCompilation(); + } +} diff --git a/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/ServiceCollectionRazorRuntimeCompilationExtensions.cs b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/ServiceCollectionRazorRuntimeCompilationExtensions.cs new file mode 100644 index 000000000..384ed7b4d --- /dev/null +++ b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/ServiceCollectionRazorRuntimeCompilationExtensions.cs @@ -0,0 +1,24 @@ +namespace MyTested.AspNetCore.Mvc +{ + using Microsoft.AspNetCore.Mvc.Abstractions; + using Microsoft.AspNetCore.Mvc.Infrastructure; + using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; + using Microsoft.Extensions.DependencyInjection; + using MyTested.AspNetCore.Mvc.Internal.Razor; + + /// + /// Contains Razor runtime compilation extension methods for . + /// + public static class ServiceCollectionRazorRuntimeCompilationExtensions + { + /// + /// Replaces the default with a mocked implementation.. + /// + /// Instance of type. + /// The same . + public static IServiceCollection ReplaceRazorRuntimeCompilation(this IServiceCollection serviceCollection) + => serviceCollection + .Remove() + .ReplaceSingleton(); + } +} diff --git a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj index 83786fc71..e273d2316 100644 --- a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC versioning components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Versioning 5.0.0 Ivaylo Kenov diff --git a/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj b/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj index f9b483523..16cd932ef 100644 --- a/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj +++ b/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj b/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj index 11578fda2..458902dae 100644 --- a/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj +++ b/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj @@ -16,7 +16,7 @@ - + diff --git a/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj b/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj index ec00b2d4c..1a08490ba 100644 --- a/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj +++ b/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj @@ -18,10 +18,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/samples/Autofac/Autofac.NoContainerBuilder.Web/Properties/launchSettings.json b/samples/Autofac/Autofac.NoContainerBuilder.Web/Properties/launchSettings.json new file mode 100644 index 000000000..6decd48c3 --- /dev/null +++ b/samples/Autofac/Autofac.NoContainerBuilder.Web/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:56390/", + "sslPort": 44332 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Autofac.NoContainerBuilder.Web": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:5001;http://localhost:5000" + } + } +} \ No newline at end of file diff --git a/samples/Blog/Blog.Data/Blog.Data.csproj b/samples/Blog/Blog.Data/Blog.Data.csproj index f5b76ffa9..aaae74965 100644 --- a/samples/Blog/Blog.Data/Blog.Data.csproj +++ b/samples/Blog/Blog.Data/Blog.Data.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/samples/Blog/Blog.Web/Blog.Web.csproj b/samples/Blog/Blog.Web/Blog.Web.csproj index 760dd0d8b..cbcda18f0 100644 --- a/samples/Blog/Blog.Web/Blog.Web.csproj +++ b/samples/Blog/Blog.Web/Blog.Web.csproj @@ -9,8 +9,9 @@ - - + + + diff --git a/samples/Blog/Blog.Web/Startup.cs b/samples/Blog/Blog.Web/Startup.cs index a65ba8bbf..7af0fdb44 100644 --- a/samples/Blog/Blog.Web/Startup.cs +++ b/samples/Blog/Blog.Web/Startup.cs @@ -63,7 +63,7 @@ public void ConfigureServices(IServiceCollection services) services .AddControllersWithViews(options => options .AddAutoValidateAntiforgeryToken()) - .SetCompatibilityVersion(CompatibilityVersion.Version_3_0); + .AddRazorRuntimeCompilation(); services.AddRazorPages(); services.AddDatabaseDeveloperPageExceptionFilter(); diff --git a/samples/Configuration/Common/Common.csproj b/samples/Configuration/Common/AdditionalEntryPoint.csproj similarity index 100% rename from samples/Configuration/Common/Common.csproj rename to samples/Configuration/Common/AdditionalEntryPoint.csproj diff --git a/samples/Configuration/Test.MultipleEntryPoints/HomeControllerTest.cs b/samples/Configuration/Test.MultipleEntryPoints/HomeControllerTest.cs index 31175f4e8..16c93a05a 100644 --- a/samples/Configuration/Test.MultipleEntryPoints/HomeControllerTest.cs +++ b/samples/Configuration/Test.MultipleEntryPoints/HomeControllerTest.cs @@ -19,7 +19,6 @@ public void MultipleEntryPointsShouldThrowCorrectException() }); Assert.Equal("Web application WebApplication could not be loaded in the application part manager by convention. You need to set it manually by providing your web project's name in the test configuration's 'General:WebAssemblyName' section ('testsettings.json' file by default).", exception.Message); - } } } diff --git a/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj b/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj index e02287f99..abb77d5e5 100644 --- a/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj +++ b/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj @@ -16,7 +16,7 @@ - + diff --git a/samples/Configuration/WebApplication/Startup.cs b/samples/Configuration/WebApplication/Startup.cs index bfbc9c1d9..2ab124df8 100644 --- a/samples/Configuration/WebApplication/Startup.cs +++ b/samples/Configuration/WebApplication/Startup.cs @@ -15,7 +15,7 @@ public Startup(IConfiguration configuration) => this.Configuration = configuration; public IConfiguration Configuration { get; } - + public void ConfigureServices(IServiceCollection services) { services.Configure(options => diff --git a/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj b/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj index beb511a73..47d328249 100644 --- a/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj +++ b/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs index 0fc2c5519..c14c0b34b 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs @@ -31,7 +31,7 @@ public static void TryInitialize() { return; } - + var generalConfiguration = ServerTestConfiguration.General; if (StartupType == null && generalConfiguration.AutomaticStartup) diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplicationServices.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplicationServices.cs index d926695d4..829212dcc 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplicationServices.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplicationServices.cs @@ -39,40 +39,52 @@ public static IServiceProvider RoutingServices private static void PrepareServices(IServiceCollection serviceCollection) { - var knownServicesReplaced = false; - - if (startupMethods?.ConfigureServicesDelegate != null) + try { - var startupServiceProvider = PrepareStartupServices(serviceCollection); - var hasTestMarkerService = ValidateTestServices(startupServiceProvider); + var knownServicesReplaced = false; - if (hasTestMarkerService) + if (startupMethods?.ConfigureServicesDelegate != null) { - knownServicesReplaced = true; - serviceProvider = startupServiceProvider; + var startupServiceProvider = PrepareStartupServices(serviceCollection); + var hasTestMarkerService = ValidateTestServices(startupServiceProvider); + + if (hasTestMarkerService) + { + knownServicesReplaced = true; + serviceProvider = startupServiceProvider; + } } - } - else - { - // Server additional services delegate is never invoked because Startup is null. - TestWebServer.AdditionalServices?.Invoke(serviceCollection); + else + { + // Server additional services delegate is never invoked because Startup is null. + TestWebServer.AdditionalServices?.Invoke(serviceCollection); - PrepareDefaultServices(serviceCollection); - } + PrepareDefaultServices(serviceCollection); + } - if (!knownServicesReplaced) - { - AdditionalServices?.Invoke(serviceCollection); + if (!knownServicesReplaced) + { + AdditionalServices?.Invoke(serviceCollection); - TryReplaceKnownServices(serviceCollection); - } + TryReplaceKnownServices(serviceCollection); + } + + serviceProvider ??= serviceCollection.BuildServiceProviderFromFactory(); - serviceProvider ??= serviceCollection.BuildServiceProviderFromFactory(); + PrepareRoutingServices(knownServicesReplaced); + EnsureApplicationParts(serviceProvider); - PrepareRoutingServices(knownServicesReplaced); - EnsureApplicationParts(serviceProvider); + PluginsContainer.InitializationPlugins.ForEach(plugin => plugin.InitializationDelegate(serviceProvider)); + } + catch (Exception exception) + { + if (exception is InvalidOperationException) + { + throw; + } - PluginsContainer.InitializationPlugins.ForEach(plugin => plugin.InitializationDelegate(serviceProvider)); + throw new InvalidOperationException($"Test application could not be initialized. You may need to create a custom mock for one of your registered services. If you are having difficulties debugging this error, open an issue at https://github.com/ivaylokenov/MyTested.AspNetCore.Mvc/issues. Provide your Startup classes and this exception message: '{exception.Message}'."); + } } private static bool ValidateTestServices(IServiceProvider startupServiceProvider) @@ -113,7 +125,7 @@ private static IServiceProvider PrepareStartupServices(IServiceCollection servic } catch (InvalidOperationException exception) { - throw new InvalidOperationException($"{exception.Message} Services could not be configured. If your web project is registering services outside of the Startup class (during the WebHost configuration in the Program.cs file for example), you should provide them to the test framework too by calling 'IsRunningOn(server => server.WithServices(servicesAction))'. Since this method should be called only once per test project, you may invoke it in the static constructor of your {TestWebServer.Environment.EnvironmentName}Startup class or if your test runner supports it - in the test assembly initialization."); + throw new InvalidOperationException($"An exception with the following message was thrown during initialization: '{exception.Message}'. Services could not be configured. If your web project is registering services outside of the Startup class (during the WebHost configuration in the Program.cs file for example), you should provide them to the test framework too by calling 'IsRunningOn(server => server.WithServices(servicesAction))'. Since this method should be called only once per test project, you may invoke it in the static constructor of your {TestWebServer.Environment.EnvironmentName}Startup class or if your test runner supports it - in the test assembly initialization."); } } diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj index 7098a292c..20408c4d9 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC common abstractions and interfaces. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Abstractions 5.0.0 Ivaylo Kenov @@ -38,7 +38,7 @@ - + diff --git a/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj b/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj index dafa4de74..81d53844d 100644 --- a/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj +++ b/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC authentication components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Authentication 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj index 313807969..85cd8fc27 100644 --- a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj +++ b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC caching components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Caching 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj index e64b5205a..ac24617ee 100644 --- a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj +++ b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC configuration components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Configuration 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj index 03347d96a..b0dc66720 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC controller action result components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.ActionResults 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj index e29af2da8..9eb45d518 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC controller attribute components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Attributes 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj index faeeb891c..a625af0a9 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC controller view action result components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj index c0b0b5380..eaa97070a 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC controller view assertion methods. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Views 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj b/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj index df22cc5c1..bf16ad128 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC controller components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj b/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj index dbc3cf591..4562e54f8 100644 --- a/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj +++ b/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC core components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Core 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj b/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj index 9fa907416..c13c253a1 100644 --- a/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC data annotations components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.DataAnnotations 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj b/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj index 8446805c2..031587141 100644 --- a/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj +++ b/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC dependency injection components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.DependencyInjection 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj index cc568f5f8..cab5a3a6d 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC Entity Framework Core components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.EntityFrameworkCore 5.0.0 Ivaylo Kenov @@ -33,8 +33,8 @@ - - + + diff --git a/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj b/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj index b92f98ce3..4745c661f 100644 --- a/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj +++ b/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC helper components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Helpers 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj b/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj index 994fe8fb3..adbc49202 100644 --- a/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj +++ b/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC HTTP components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Http 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj index 116a02e80..598fb4f7e 100644 --- a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj +++ b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC licensing components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Licensing 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj b/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj index bdbc57284..ae317ba44 100644 --- a/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj +++ b/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Lite 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj b/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj index 15d3f9bb6..6fff6fa6e 100644 --- a/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj +++ b/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC model state components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ModelState 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj b/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj index f63a892ee..f3de73b12 100644 --- a/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj +++ b/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC model components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Models 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj b/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj index c04422994..525287eff 100644 --- a/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj +++ b/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC configuration options components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Options 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj b/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj index a7d28d782..b36d65d03 100644 --- a/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj +++ b/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC pipeline components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Pipeline 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj b/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj index 0c7517b97..293619f5f 100644 --- a/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj +++ b/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC routing components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Routing 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj b/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj index 9be0e5a71..1db2eacaa 100644 --- a/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj +++ b/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC session middleware components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Session 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj b/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj index 2bfd9698c..461809974 100644 --- a/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj +++ b/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC temporary data components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.TempData 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj b/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj index f3a4eea27..73e57a7e6 100644 --- a/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj +++ b/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Universe 5.0.0 Ivaylo Kenov @@ -34,6 +34,8 @@ + + diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj index 3eccdc317..8f69b34ab 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC view component attribute assertion methods. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents.Attributes 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj index 188c8612e..f82953c75 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC view component result assertion methods. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents.Results 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj index 74fb41f82..2397bd89c 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC view components assertion methods. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj b/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj index 4622d2a2b..bbafc9c53 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC view data components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewData 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj b/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj index 2fc5aae75..f21f12542 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC view features components. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewFeatures 5.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj b/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj index 91a9a05c8..b437766d9 100644 --- a/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj +++ b/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. - 2015-2019 Ivaylo Kenov + 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc 5.0.0 Ivaylo Kenov diff --git a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs index f3b142d7f..374498955 100644 --- a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs @@ -34,6 +34,21 @@ public class ServicesTests { + [Fact] + public void ExceptionDuringStartupServiceRegistrationShouldThrowProperErrorMessage() + { + Test.AssertException( + () => + { + MyApplication.StartsFrom(); + + TestServiceProvider.GetService(WebFramework.Internals.MvcMarkerService); + }, + "Test application could not be initialized. You may need to create a custom mock for one of your registered services. If you are having difficulties debugging this error, open an issue at https://github.com/ivaylokenov/MyTested.AspNetCore.Mvc/issues. Provide your Startup classes and this exception message: 'Exception during service registration.'."); + + MyApplication.StartsFrom(); + } + [Fact] public void UsesDefaultServicesShouldPopulateDefaultServices() { @@ -235,7 +250,7 @@ public void IsUsingShouldRecreateServicesEveryTimeItIsInvoked() } [Fact] - public void DefaultConfigShouldSetMvc() + public void DefaultConfigurationShouldSetMvc() { MyApplication.StartsFrom(); @@ -245,7 +260,7 @@ public void DefaultConfigShouldSetMvc() } [Fact] - public void DefaultConfigShouldSetDefaultRoutes() + public void DefaultConfigurationShouldSetDefaultRoutes() { MyApplication.StartsFrom(); @@ -256,7 +271,7 @@ public void DefaultConfigShouldSetDefaultRoutes() } [Fact] - public void DefaultConfigAndAdditionalServicesShouldWorkCorrectly() + public void DefaultConfigurationAndAdditionalServicesShouldWorkCorrectly() { MyApplication .StartsFrom() @@ -273,7 +288,7 @@ public void DefaultConfigAndAdditionalServicesShouldWorkCorrectly() } [Fact] - public void DefaultConfigAndAdditionalApplicationShouldWorkCorrectly() + public void DefaultConfigurationAndAdditionalApplicationShouldWorkCorrectly() { var set = false; @@ -289,7 +304,7 @@ public void DefaultConfigAndAdditionalApplicationShouldWorkCorrectly() } [Fact] - public void DefaultConfigAndAdditionalRoutesShouldSetOnlyThem() + public void DefaultConfigurationAndAdditionalRoutesShouldSetOnlyThem() { MyApplication .StartsFrom() @@ -307,7 +322,7 @@ public void DefaultConfigAndAdditionalRoutesShouldSetOnlyThem() } [Fact] - public void DefaultConfigAndAdditionalRoutesShouldSetOnlyThemWithoutEndpoints() + public void DefaultConfigurationAndAdditionalRoutesShouldSetOnlyThemWithoutEndpoints() { MyApplication .StartsFrom() @@ -707,7 +722,7 @@ public void ConfigureContainerWithNoServerServicesShouldThrowCorrectExceptionMes // This call ensures services are loaded (uses lazy loading). var setupServices = TestApplication.Services; }, - "No service for type 'Microsoft.Extensions.DependencyInjection.IServiceProviderFactory`1[MyTested.AspNetCore.Mvc.Test.Setups.Common.CustomContainer]' has been registered. Services could not be configured. If your web project is registering services outside of the Startup class (during the WebHost configuration in the Program.cs file for example), you should provide them to the test framework too by calling 'IsRunningOn(server => server.WithServices(servicesAction))'. Since this method should be called only once per test project, you may invoke it in the static constructor of your TestStartup class or if your test runner supports it - in the test assembly initialization."); + "An exception with the following message was thrown during initialization: 'No service for type 'Microsoft.Extensions.DependencyInjection.IServiceProviderFactory`1[MyTested.AspNetCore.Mvc.Test.Setups.Common.CustomContainer]' has been registered.'. Services could not be configured. If your web project is registering services outside of the Startup class (during the WebHost configuration in the Program.cs file for example), you should provide them to the test framework too by calling 'IsRunningOn(server => server.WithServices(servicesAction))'. Since this method should be called only once per test project, you may invoke it in the static constructor of your TestStartup class or if your test runner supports it - in the test assembly initialization."); MyApplication.StartsFrom(); } @@ -857,6 +872,6 @@ public void StartupFiltersShouldBeRegisteredAndConsidered() Assert.True(sameStartupFilter.Registered); MyApplication.StartsFrom(); - } + } } } diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj index a7528543c..22c7f72a1 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj @@ -35,7 +35,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/BuildersTests/ControllersTests/ControllerTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/BuildersTests/ControllersTests/ControllerTestBuilderTests.cs new file mode 100644 index 000000000..939e7c737 --- /dev/null +++ b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/BuildersTests/ControllersTests/ControllerTestBuilderTests.cs @@ -0,0 +1,17 @@ +namespace MyTested.AspNetCore.Mvc.Test.BuildersTests.ControllersTests +{ + using Setups.Controllers; + using Xunit; + + public class ControllerTestBuilderTests + { + [Fact] + public void ControllerAssertionShouldWorkCorrectlyWithRazorRuntimeCompilation() + { + MyController + .Calling(c => c.DefaultView()) + .ShouldReturn() + .View(); + } + } +} diff --git a/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj new file mode 100644 index 000000000..a3fb3dcbb --- /dev/null +++ b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj @@ -0,0 +1,33 @@ + + + + net5.0 + true + MyTested.AspNetCore.Mvc.Test + ../../tools/Key.snk + true + true + MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test + true + false + true + MyTested.AspNetCore.Mvc.Test + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + diff --git a/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/Properties/AssemblyInfo.cs b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..30543f164 --- /dev/null +++ b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/Properties/AssemblyInfo.cs @@ -0,0 +1,11 @@ +using System.Reflection; +using System.Runtime.InteropServices; +using Microsoft.AspNetCore.Mvc.ApplicationParts; +using Xunit; + +[assembly: ApplicationPart("MyTested.AspNetCore.Mvc.Test.Setups")] + +[assembly: AssemblyProduct("MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test")] +[assembly: ComVisible(false)] + +[assembly: CollectionBehavior(DisableTestParallelization = true)] diff --git a/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestStartup.cs b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestStartup.cs new file mode 100644 index 000000000..3b3eb3ad1 --- /dev/null +++ b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestStartup.cs @@ -0,0 +1,18 @@ +namespace MyTested.AspNetCore.Mvc.Test +{ + using Microsoft.Extensions.DependencyInjection; + using Setups; + + public class TestStartup : DefaultStartup + { + public override void ConfigureServices(IServiceCollection services) + { + services + .AddControllersWithViews() + .AddRazorRuntimeCompilation(); + + services + .AddRazorPages(); + } + } +} diff --git a/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj b/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj index 53c6301e2..80634845f 100644 --- a/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj +++ b/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj @@ -18,7 +18,7 @@ - + diff --git a/test/MyTested.AspNetCore.Mvc.Test.Setups/Startups/StartupWithException.cs b/test/MyTested.AspNetCore.Mvc.Test.Setups/Startups/StartupWithException.cs new file mode 100644 index 000000000..86ebba413 --- /dev/null +++ b/test/MyTested.AspNetCore.Mvc.Test.Setups/Startups/StartupWithException.cs @@ -0,0 +1,18 @@ +namespace MyTested.AspNetCore.Mvc.Test.Setups.Startups +{ + using System; + using Microsoft.AspNetCore.Builder; + using Microsoft.Extensions.DependencyInjection; + + public class StartupWithException + { + public virtual void ConfigureServices(IServiceCollection services) + => throw new Exception("Exception during service registration."); + + public virtual void Configure(IApplicationBuilder app) + => app + .UseRouting() + .UseEndpoints(endpoints => endpoints + .MapDefaultControllerRoute()); + } +} diff --git a/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj b/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj index 9c4450320..6ee629426 100644 --- a/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj @@ -32,7 +32,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + From 948cba8072c10ad61758a41a21ca16397f6fe3d9 Mon Sep 17 00:00:00 2001 From: Ivaylo Kenov Date: Thu, 29 Jul 2021 17:55:44 +0300 Subject: [PATCH 11/19] Removed licensing validation with a quick and dirty solution --- .../Builders/Base/BaseTestBuilder.cs | 4 +- .../Internal/Application/TestApplication.cs | 15 +- .../Internal/PluginsContainer.cs | 10 +- ...yTested.AspNetCore.Mvc.Abstractions.csproj | 1 - .../LicenseValidatorTests.cs | 848 +++++++++--------- .../MyTestedMvcLicensingTests.cs | 246 ++--- .../TestCounterTests.cs | 642 ++++++------- .../Internal/FreeLicenseTests.cs | 58 +- 8 files changed, 911 insertions(+), 913 deletions(-) diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Base/BaseTestBuilder.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Base/BaseTestBuilder.cs index 4a119a2b7..7775d2b7f 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Base/BaseTestBuilder.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Base/BaseTestBuilder.cs @@ -2,7 +2,7 @@ { using Contracts.Base; using Internal.TestContexts; - using Licensing; + // using Licensing; using Microsoft.AspNetCore.Http; using Utilities.Validators; @@ -19,7 +19,7 @@ public abstract class BaseTestBuilder : IBaseTestBuilder /// containing data about the currently executed assertion chain. protected BaseTestBuilder(HttpTestContext testContext) { - TestCounter.IncrementAndValidate(); + // TestCounter.IncrementAndValidate(); this.TestContext = testContext; } diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs index c14c0b34b..7a502a10c 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Application/TestApplication.cs @@ -1,9 +1,8 @@ namespace MyTested.AspNetCore.Mvc.Internal.Application { using System; - using System.Globalization; using Configuration; - using Licensing; + // using Licensing; using Microsoft.AspNetCore.Builder; using Server; using Services; @@ -67,11 +66,11 @@ private static void Initialize() ValidateStartup(); - TestCounter.SetLicenseData( - ServerTestConfiguration.Global.Licenses, - DateTime.UtcNow, - DateTime.ParseExact(TestFramework.ReleaseDate, "yyyy-MM-dd", CultureInfo.InvariantCulture), - TestWebServer.TestAssemblyName); + //TestCounter.SetLicenseData( + // ServerTestConfiguration.Global.Licenses, + // DateTime.UtcNow, + // DateTime.ParseExact(TestFramework.ReleaseDate, "yyyy-MM-dd", CultureInfo.InvariantCulture), + // TestWebServer.TestAssemblyName); PluginsContainer.LoadPlugins(TestWebServer.GetDependencyContext()); @@ -112,7 +111,7 @@ private static void Reset() AdditionalRouting = null; TestServiceProvider.Current = null; TestServiceProvider.ClearServiceLifetimes(); - LicenseValidator.ClearLicenseDetails(); + // LicenseValidator.ClearLicenseDetails(); PluginsContainer.Reset(); } } diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/PluginsContainer.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/PluginsContainer.cs index a961a17b1..f60fb9a97 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/PluginsContainer.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/PluginsContainer.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; - using Licensing; + // using Licensing; using Microsoft.DotNet.PlatformAbstractions; using Microsoft.Extensions.DependencyModel; using Plugins; @@ -37,10 +37,10 @@ public static void LoadPlugins(DependencyContext dependencyContext) .Where(l => l.Name.StartsWith(testFrameworkName)) .ToArray(); - if (testFrameworkAssemblies.Length == 7 && testFrameworkAssemblies.Any(t => t.Name == $"{testFrameworkName}.Lite")) - { - TestCounter.SkipValidation = true; - } + //if (testFrameworkAssemblies.Length == 7 && testFrameworkAssemblies.Any(t => t.Name == $"{testFrameworkName}.Lite")) + //{ + // TestCounter.SkipValidation = true; + //} var plugins = testFrameworkAssemblies .Select(l => Assembly diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj index 20408c4d9..e508ca98f 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj @@ -30,7 +30,6 @@ - diff --git a/test/MyTested.AspNetCore.Mvc.Licensing.Test/LicenseValidatorTests.cs b/test/MyTested.AspNetCore.Mvc.Licensing.Test/LicenseValidatorTests.cs index 1c18376e2..78cbba236 100644 --- a/test/MyTested.AspNetCore.Mvc.Licensing.Test/LicenseValidatorTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Licensing.Test/LicenseValidatorTests.cs @@ -1,426 +1,426 @@ -namespace MyTested.AspNetCore.Mvc.Licensing.Test -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Security.Cryptography; - using Licensing; - using Mvc.Test.Setups; - using Xunit; - - public class LicenseValidatorTests - { - [Fact] - public void NullLicenseCollectionShouldThrowException() - { - Test.AssertException( - () => - { - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(null, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); - }, - "No license provided"); - } +//namespace MyTested.AspNetCore.Mvc.Licensing.Test +//{ +// using System; +// using System.Collections.Generic; +// using System.Linq; +// using System.Security.Cryptography; +// using Licensing; +// using Mvc.Test.Setups; +// using Xunit; + +// public class LicenseValidatorTests +// { +// [Fact] +// public void NullLicenseCollectionShouldThrowException() +// { +// Test.AssertException( +// () => +// { +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(null, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); +// }, +// "No license provided"); +// } - [Fact] - public void NullLicenseShouldThrowException() - { - Test.AssertException( - () => - { - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new string[] { null }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); - }, - "License and project namespace cannot be null or empty"); - } - - [Fact] - public void NullProjectNamespaceShouldThrowException() - { - Test.AssertException( - () => - { - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { string.Empty }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), null); - }, - "License and project namespace cannot be null or empty"); - } - - [Fact] - public void ValidateShouldThrowExceptionWithIncorrectNumberOfParts() - { - Test.AssertException( - () => - { - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { "1-2-3" }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); - }, - "License text is invalid"); - - Assert.False(LicenseValidator.HasValidLicense); - - Test.AssertException( - () => - { - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { "1" }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); - }, - "License text is invalid"); - - Assert.False(LicenseValidator.HasValidLicense); - } - - [Fact] - public void ValidateShouldThrowExceptionWithInvalidLicenseId() - { - Test.AssertException( - () => - { - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { "test-2" }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); - }, - "License text is invalid"); - - Assert.False(LicenseValidator.HasValidLicense); - } - - [Fact] - public void ValidateShouldThrowExceptionWithInvalidSignatureString() - { - Test.AssertException( - () => - { - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { "1-A" }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); - }, - "License text is invalid"); - - Assert.False(LicenseValidator.HasValidLicense); - } - - [Fact] - public void ValidateShouldThrowExceptionWithInvalidNumberOfLicenseParts() - { - Test.AssertException( - () => - { - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate( - new[] { "1-aIqZBgCHicW6QK8wpk+T6a1WDfgvk1+uUEYkwxnFw+Ucla5Pxmyxyn9JJJcczy3iXet0exCvBMrkFE2PqAkwNd1TnZLt+pxmZaEPlUYwzfVCIpdB2rZAaFmrRToQvqrUv4jHHUyWw9/4C1yntfOUUkcYmFYLuNC4rmqocrv1o7AxOjIwMTYtMDEtMDE6OjpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu" }, - new DateTime(2016, 10, 10), - new DateTime(2016, 10, 10), - string.Empty); - }, - "License details are invalid"); - - Assert.False(LicenseValidator.HasValidLicense); - } - - [Fact] - public void ValidateShouldThrowExceptionWithInvalidSigningData() - { - Test.AssertException( - () => - { - var firstLicense = "1-Lh95BZUyA92DgQ9B8o10CtFX0/Nhykf6upFj8rOIyodNLLc6iMRD3loJVZv00jtkUkdYPHDHAKW4YGqd8ROc3ZXUyrzNmQl67eUQ1BIELx8QfHo2gwPnQgMgdh5tfm+gtNNBvim0dqki2AN6ABwK0Garnd0lU3BAxM2YJ2k/C4oxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu"; - var secondLicense = "2-EEY5vqcJgmhaAR5wJbQc54Oev4z77D8+QLrbbeL3637ip6I7f6F3LqAm/hID8Wmtqs0fNXMKLl+bc6CH+J++keE9gOACejO0QXHa2e2xPpuHDPoKCyaJm2quDwLgzS/KcmlZAzc8H4RzL4rFy8nCEXGfgC83EJyf3L0D+8X1/0kyOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu"; - - var wrongLicense = new List { '1', '-' }; - for (int i = 2; i < 130; i++) - { - wrongLicense.Add(firstLicense[i + 2]); - } - - for (int i = 130; i < secondLicense.Length; i++) - { - wrongLicense.Add(secondLicense[i]); - } - - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { new string(wrongLicense.ToArray()) }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); - }, - "License text does not match signature"); - - Assert.False(LicenseValidator.HasValidLicense); - } - - [Fact] - public void ValidateShouldThrowExceptionWithInvalidLicenseIdMatch() - { - Test.AssertException( - () => - { - var license = "1-Lh95BZUyA92DgQ9B8o10CtFX0/Nhykf6upFj8rOIyodNLLc6iMRD3loJVZv00jtkUkdYPHDHAKW4YGqd8ROc3ZXUyrzNmQl67eUQ1BIELx8QfHo2gwPnQgMgdh5tfm+gtNNBvim0dqki2AN6ABwK0Garnd0lU3BAxM2YJ2k/C4oxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu"; - - var licenseArray = license.ToArray(); - licenseArray[0] = '2'; - - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { new string(licenseArray) }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); - }, - "License ID does not match signature license ID"); - - Assert.False(LicenseValidator.HasValidLicense); - } - - [Fact] - public void ValidateShouldThrowExceptionWithInvalidReleaseDate() - { - Test.AssertException( - () => - { - var license = "1-Lh95BZUyA92DgQ9B8o10CtFX0/Nhykf6upFj8rOIyodNLLc6iMRD3loJVZv00jtkUkdYPHDHAKW4YGqd8ROc3ZXUyrzNmQl67eUQ1BIELx8QfHo2gwPnQgMgdh5tfm+gtNNBvim0dqki2AN6ABwK0Garnd0lU3BAxM2YJ2k/C4oxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu"; - - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { license }, new DateTime(2016, 10, 10), new DateTime(2018, 10, 10), string.Empty); - }, - "License is not valid for this version of My Tested ASP.NET Core MVC. License expired on 2017-10-15. This version of My Tested ASP.NET Core MVC was released on 2018-10-10"); - - Assert.False(LicenseValidator.HasValidLicense); - } - - [Fact] - public void ValidateShouldThrowExceptionWithInvalidSubscriptionDate() - { - Test.AssertException( - () => - { - var license = "1-TE6MO5GnjYwR3DcbT8rIXfjk9e0+ZPOb+c27A7pA83aNY4IQNBhgnIf4eUfy0MBvyXYrh9rkLa1hpGnrGu2TMZSoYxeZS07rM7WCqxzd2xXqfzuTAxsO1yNiEo/UwvVZUqz6s3nunKXn1m0b5dbKrsu7hxmWf8P8L2DhCDD09/sxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u"; - - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { license }, new DateTime(2018, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc."); - }, - "License subscription expired on 2017-10-15"); - - Assert.False(LicenseValidator.HasValidLicense); - } - - [Fact] - public void ValidateShouldThrowExceptionWithInvalidNamespace() - { - Test.AssertException( - () => - { - var license = "1-Lh95BZUyA92DgQ9B8o10CtFX0/Nhykf6upFj8rOIyodNLLc6iMRD3loJVZv00jtkUkdYPHDHAKW4YGqd8ROc3ZXUyrzNmQl67eUQ1BIELx8QfHo2gwPnQgMgdh5tfm+gtNNBvim0dqki2AN6ABwK0Garnd0lU3BAxM2YJ2k/C4oxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu"; - - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new []{ license }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.WebApi.Tests"); - }, - "License is not valid for 'MyTested.WebApi.Tests' test project"); - - Assert.False(LicenseValidator.HasValidLicense); - } - - [Fact] - public void ValidateShouldThrowExceptionWithInternalType() - { - Test.AssertException( - () => - { - var license = "1-03rl5Irwh4ZsynriqaencPeH4C+e4JtKFx6CehuklqJ58/N8OEePi19h332aQ5DrYPS3715dVEbbWDxpkOm0e9wge9W / q01AfXEN2ytSGMPF8wEuLX6ZC0Lo698YKWhxQxtq4k6ls3XiHxwYl7XKD8n / rAntd6xY8lJYp8S3QtMxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkludGVybmFsOk15VGVzdGVkLkFzcE5ldENvcmUuTXZjLg=="; - - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new []{ license }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - }, - "License is for internal use only"); - - Assert.False(LicenseValidator.HasValidLicense); - } - - [Fact] - public void ValidateShouldSetValidPerpetualLicense() - { - var licenseDetails = new LicenseDetails - { - Id = 1, - Type = LicenseType.Developer, - User = "admin@mytestedasp.net", - InformationDetails = "MyTested.AspNetCore.Mvc Tests", - ExpiryDate = new DateTime(2017, 10, 15), - NamespacePrefix = "MyTested.AspNetCore.Mvc.", - ExpirationType = ExpirationType.Perpetual - }; - - var license = "1-IRaNRwlovf7moJnDcQCJW8JDq++p8/1hTNsRnBRLDGkd6HidiJ3OEzpFdwmlDacikCv5oRBisRkJ8edjqx1R21VA+SxCgpGHJE2ftOBpV1OBysguNUSIKJyte2heP3xD4tY1BQNh0vcVhXJDcE3qImhodZmi1aXJ19SK5f4JRA8xOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46UGVycGV0dWFs"; - - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new []{ license }, new DateTime(2018, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - Assert.True(LicenseValidator.HasValidLicense); - - var registeredLicense = LicenseValidator.GetLicenseDetails().FirstOrDefault(); - - Assert.NotNull(registeredLicense); - Assert.Equal(licenseDetails.Id, registeredLicense.Id); - Assert.Equal(licenseDetails.Type, registeredLicense.Type); - Assert.Equal(licenseDetails.User, registeredLicense.User); - Assert.Equal(licenseDetails.InformationDetails, registeredLicense.InformationDetails); - Assert.Equal(licenseDetails.ExpiryDate, registeredLicense.ExpiryDate); - Assert.Equal(licenseDetails.NamespacePrefix, registeredLicense.NamespacePrefix); - Assert.Equal(licenseDetails.ExpirationType, registeredLicense.ExpirationType); - } - - [Fact] - public void ValidateShouldSetValidSubscriptionLicense() - { - var licenseDetails = new LicenseDetails - { - Id = 1, - Type = LicenseType.Developer, - User = "admin@mytestedasp.net", - InformationDetails = "MyTested.AspNetCore.Mvc Tests", - ExpiryDate = new DateTime(2017, 10, 15), - NamespacePrefix = "MyTested.AspNetCore.Mvc.", - ExpirationType = ExpirationType.Subscription - }; - - var license = "1-TE6MO5GnjYwR3DcbT8rIXfjk9e0+ZPOb+c27A7pA83aNY4IQNBhgnIf4eUfy0MBvyXYrh9rkLa1hpGnrGu2TMZSoYxeZS07rM7WCqxzd2xXqfzuTAxsO1yNiEo/UwvVZUqz6s3nunKXn1m0b5dbKrsu7hxmWf8P8L2DhCDD09/sxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u"; - - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { license }, new DateTime(2016, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - Assert.True(LicenseValidator.HasValidLicense); - - var registeredLicense = LicenseValidator.GetLicenseDetails().FirstOrDefault(); - - Assert.NotNull(registeredLicense); - Assert.Equal(licenseDetails.Id, registeredLicense.Id); - Assert.Equal(licenseDetails.Type, registeredLicense.Type); - Assert.Equal(licenseDetails.User, registeredLicense.User); - Assert.Equal(licenseDetails.InformationDetails, registeredLicense.InformationDetails); - Assert.Equal(licenseDetails.ExpiryDate, registeredLicense.ExpiryDate); - Assert.Equal(licenseDetails.NamespacePrefix, registeredLicense.NamespacePrefix); - Assert.Equal(licenseDetails.ExpirationType, registeredLicense.ExpirationType); - } - - [Fact] - public void ValidateShouldThrowExceptionIfTwoLicensesAreProvidedAndOneIsInvalid() - { - Test.AssertException( - () => - { - var firstLicense = "1-mKwoA4cwRkRKioJ70fh6WcL5Ty+K2Kn32oftC2KFqw5kimAMYrTeKwOX25e55GcTMy/cB8Ssa/SJmFFq6OUSXpgc7TsG6vNA7jE8lYbpzQcaIumX9tu0Kr2655zUne0GcPP0 + Y6OqLnRnOiq5keErGSyohcfZmzkRXoHAEEXR68xOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkZ1bGw6TXlUZXN0ZWQuQXNwTmV0Q29yZS5NdmMu"; - var secondLicense = "1-03rl5Irwh4ZsynriqaencPeH4C+e4JtKFx6CehuklqJ58/N8OEePi19h332aQ5DrYPS3715dVEbbWDxpkOm0e9wge9W / q01AfXEN2ytSGMPF8wEuLX6ZC0Lo698YKWhxQxtq4k6ls3XiHxwYl7XKD8n / rAntd6xY8lJYp8S3QtMxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkludGVybmFsOk15VGVzdGVkLkFzcE5ldENvcmUuTXZjLg=="; - - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { firstLicense, secondLicense }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - }, - "License is for internal use only"); - - Assert.False(LicenseValidator.HasValidLicense); - } +// [Fact] +// public void NullLicenseShouldThrowException() +// { +// Test.AssertException( +// () => +// { +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new string[] { null }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); +// }, +// "License and project namespace cannot be null or empty"); +// } + +// [Fact] +// public void NullProjectNamespaceShouldThrowException() +// { +// Test.AssertException( +// () => +// { +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { string.Empty }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), null); +// }, +// "License and project namespace cannot be null or empty"); +// } + +// [Fact] +// public void ValidateShouldThrowExceptionWithIncorrectNumberOfParts() +// { +// Test.AssertException( +// () => +// { +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { "1-2-3" }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); +// }, +// "License text is invalid"); + +// Assert.False(LicenseValidator.HasValidLicense); + +// Test.AssertException( +// () => +// { +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { "1" }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); +// }, +// "License text is invalid"); + +// Assert.False(LicenseValidator.HasValidLicense); +// } + +// [Fact] +// public void ValidateShouldThrowExceptionWithInvalidLicenseId() +// { +// Test.AssertException( +// () => +// { +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { "test-2" }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); +// }, +// "License text is invalid"); + +// Assert.False(LicenseValidator.HasValidLicense); +// } + +// [Fact] +// public void ValidateShouldThrowExceptionWithInvalidSignatureString() +// { +// Test.AssertException( +// () => +// { +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { "1-A" }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); +// }, +// "License text is invalid"); + +// Assert.False(LicenseValidator.HasValidLicense); +// } + +// [Fact] +// public void ValidateShouldThrowExceptionWithInvalidNumberOfLicenseParts() +// { +// Test.AssertException( +// () => +// { +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate( +// new[] { "1-aIqZBgCHicW6QK8wpk+T6a1WDfgvk1+uUEYkwxnFw+Ucla5Pxmyxyn9JJJcczy3iXet0exCvBMrkFE2PqAkwNd1TnZLt+pxmZaEPlUYwzfVCIpdB2rZAaFmrRToQvqrUv4jHHUyWw9/4C1yntfOUUkcYmFYLuNC4rmqocrv1o7AxOjIwMTYtMDEtMDE6OjpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu" }, +// new DateTime(2016, 10, 10), +// new DateTime(2016, 10, 10), +// string.Empty); +// }, +// "License details are invalid"); + +// Assert.False(LicenseValidator.HasValidLicense); +// } + +// [Fact] +// public void ValidateShouldThrowExceptionWithInvalidSigningData() +// { +// Test.AssertException( +// () => +// { +// var firstLicense = "1-Lh95BZUyA92DgQ9B8o10CtFX0/Nhykf6upFj8rOIyodNLLc6iMRD3loJVZv00jtkUkdYPHDHAKW4YGqd8ROc3ZXUyrzNmQl67eUQ1BIELx8QfHo2gwPnQgMgdh5tfm+gtNNBvim0dqki2AN6ABwK0Garnd0lU3BAxM2YJ2k/C4oxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu"; +// var secondLicense = "2-EEY5vqcJgmhaAR5wJbQc54Oev4z77D8+QLrbbeL3637ip6I7f6F3LqAm/hID8Wmtqs0fNXMKLl+bc6CH+J++keE9gOACejO0QXHa2e2xPpuHDPoKCyaJm2quDwLgzS/KcmlZAzc8H4RzL4rFy8nCEXGfgC83EJyf3L0D+8X1/0kyOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu"; + +// var wrongLicense = new List { '1', '-' }; +// for (int i = 2; i < 130; i++) +// { +// wrongLicense.Add(firstLicense[i + 2]); +// } + +// for (int i = 130; i < secondLicense.Length; i++) +// { +// wrongLicense.Add(secondLicense[i]); +// } + +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { new string(wrongLicense.ToArray()) }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); +// }, +// "License text does not match signature"); + +// Assert.False(LicenseValidator.HasValidLicense); +// } + +// [Fact] +// public void ValidateShouldThrowExceptionWithInvalidLicenseIdMatch() +// { +// Test.AssertException( +// () => +// { +// var license = "1-Lh95BZUyA92DgQ9B8o10CtFX0/Nhykf6upFj8rOIyodNLLc6iMRD3loJVZv00jtkUkdYPHDHAKW4YGqd8ROc3ZXUyrzNmQl67eUQ1BIELx8QfHo2gwPnQgMgdh5tfm+gtNNBvim0dqki2AN6ABwK0Garnd0lU3BAxM2YJ2k/C4oxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu"; + +// var licenseArray = license.ToArray(); +// licenseArray[0] = '2'; + +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { new string(licenseArray) }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), string.Empty); +// }, +// "License ID does not match signature license ID"); + +// Assert.False(LicenseValidator.HasValidLicense); +// } + +// [Fact] +// public void ValidateShouldThrowExceptionWithInvalidReleaseDate() +// { +// Test.AssertException( +// () => +// { +// var license = "1-Lh95BZUyA92DgQ9B8o10CtFX0/Nhykf6upFj8rOIyodNLLc6iMRD3loJVZv00jtkUkdYPHDHAKW4YGqd8ROc3ZXUyrzNmQl67eUQ1BIELx8QfHo2gwPnQgMgdh5tfm+gtNNBvim0dqki2AN6ABwK0Garnd0lU3BAxM2YJ2k/C4oxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu"; + +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { license }, new DateTime(2016, 10, 10), new DateTime(2018, 10, 10), string.Empty); +// }, +// "License is not valid for this version of My Tested ASP.NET Core MVC. License expired on 2017-10-15. This version of My Tested ASP.NET Core MVC was released on 2018-10-10"); + +// Assert.False(LicenseValidator.HasValidLicense); +// } + +// [Fact] +// public void ValidateShouldThrowExceptionWithInvalidSubscriptionDate() +// { +// Test.AssertException( +// () => +// { +// var license = "1-TE6MO5GnjYwR3DcbT8rIXfjk9e0+ZPOb+c27A7pA83aNY4IQNBhgnIf4eUfy0MBvyXYrh9rkLa1hpGnrGu2TMZSoYxeZS07rM7WCqxzd2xXqfzuTAxsO1yNiEo/UwvVZUqz6s3nunKXn1m0b5dbKrsu7hxmWf8P8L2DhCDD09/sxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u"; + +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { license }, new DateTime(2018, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc."); +// }, +// "License subscription expired on 2017-10-15"); + +// Assert.False(LicenseValidator.HasValidLicense); +// } + +// [Fact] +// public void ValidateShouldThrowExceptionWithInvalidNamespace() +// { +// Test.AssertException( +// () => +// { +// var license = "1-Lh95BZUyA92DgQ9B8o10CtFX0/Nhykf6upFj8rOIyodNLLc6iMRD3loJVZv00jtkUkdYPHDHAKW4YGqd8ROc3ZXUyrzNmQl67eUQ1BIELx8QfHo2gwPnQgMgdh5tfm+gtNNBvim0dqki2AN6ABwK0Garnd0lU3BAxM2YJ2k/C4oxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpJbnRlcm5hbDpNeVRlc3RlZC5NdmMu"; + +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new []{ license }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.WebApi.Tests"); +// }, +// "License is not valid for 'MyTested.WebApi.Tests' test project"); + +// Assert.False(LicenseValidator.HasValidLicense); +// } + +// [Fact] +// public void ValidateShouldThrowExceptionWithInternalType() +// { +// Test.AssertException( +// () => +// { +// var license = "1-03rl5Irwh4ZsynriqaencPeH4C+e4JtKFx6CehuklqJ58/N8OEePi19h332aQ5DrYPS3715dVEbbWDxpkOm0e9wge9W / q01AfXEN2ytSGMPF8wEuLX6ZC0Lo698YKWhxQxtq4k6ls3XiHxwYl7XKD8n / rAntd6xY8lJYp8S3QtMxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkludGVybmFsOk15VGVzdGVkLkFzcE5ldENvcmUuTXZjLg=="; + +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new []{ license }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); +// }, +// "License is for internal use only"); + +// Assert.False(LicenseValidator.HasValidLicense); +// } + +// [Fact] +// public void ValidateShouldSetValidPerpetualLicense() +// { +// var licenseDetails = new LicenseDetails +// { +// Id = 1, +// Type = LicenseType.Developer, +// User = "admin@mytestedasp.net", +// InformationDetails = "MyTested.AspNetCore.Mvc Tests", +// ExpiryDate = new DateTime(2017, 10, 15), +// NamespacePrefix = "MyTested.AspNetCore.Mvc.", +// ExpirationType = ExpirationType.Perpetual +// }; + +// var license = "1-IRaNRwlovf7moJnDcQCJW8JDq++p8/1hTNsRnBRLDGkd6HidiJ3OEzpFdwmlDacikCv5oRBisRkJ8edjqx1R21VA+SxCgpGHJE2ftOBpV1OBysguNUSIKJyte2heP3xD4tY1BQNh0vcVhXJDcE3qImhodZmi1aXJ19SK5f4JRA8xOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46UGVycGV0dWFs"; + +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new []{ license }, new DateTime(2018, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// Assert.True(LicenseValidator.HasValidLicense); + +// var registeredLicense = LicenseValidator.GetLicenseDetails().FirstOrDefault(); + +// Assert.NotNull(registeredLicense); +// Assert.Equal(licenseDetails.Id, registeredLicense.Id); +// Assert.Equal(licenseDetails.Type, registeredLicense.Type); +// Assert.Equal(licenseDetails.User, registeredLicense.User); +// Assert.Equal(licenseDetails.InformationDetails, registeredLicense.InformationDetails); +// Assert.Equal(licenseDetails.ExpiryDate, registeredLicense.ExpiryDate); +// Assert.Equal(licenseDetails.NamespacePrefix, registeredLicense.NamespacePrefix); +// Assert.Equal(licenseDetails.ExpirationType, registeredLicense.ExpirationType); +// } + +// [Fact] +// public void ValidateShouldSetValidSubscriptionLicense() +// { +// var licenseDetails = new LicenseDetails +// { +// Id = 1, +// Type = LicenseType.Developer, +// User = "admin@mytestedasp.net", +// InformationDetails = "MyTested.AspNetCore.Mvc Tests", +// ExpiryDate = new DateTime(2017, 10, 15), +// NamespacePrefix = "MyTested.AspNetCore.Mvc.", +// ExpirationType = ExpirationType.Subscription +// }; + +// var license = "1-TE6MO5GnjYwR3DcbT8rIXfjk9e0+ZPOb+c27A7pA83aNY4IQNBhgnIf4eUfy0MBvyXYrh9rkLa1hpGnrGu2TMZSoYxeZS07rM7WCqxzd2xXqfzuTAxsO1yNiEo/UwvVZUqz6s3nunKXn1m0b5dbKrsu7hxmWf8P8L2DhCDD09/sxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u"; + +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { license }, new DateTime(2016, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// Assert.True(LicenseValidator.HasValidLicense); + +// var registeredLicense = LicenseValidator.GetLicenseDetails().FirstOrDefault(); + +// Assert.NotNull(registeredLicense); +// Assert.Equal(licenseDetails.Id, registeredLicense.Id); +// Assert.Equal(licenseDetails.Type, registeredLicense.Type); +// Assert.Equal(licenseDetails.User, registeredLicense.User); +// Assert.Equal(licenseDetails.InformationDetails, registeredLicense.InformationDetails); +// Assert.Equal(licenseDetails.ExpiryDate, registeredLicense.ExpiryDate); +// Assert.Equal(licenseDetails.NamespacePrefix, registeredLicense.NamespacePrefix); +// Assert.Equal(licenseDetails.ExpirationType, registeredLicense.ExpirationType); +// } + +// [Fact] +// public void ValidateShouldThrowExceptionIfTwoLicensesAreProvidedAndOneIsInvalid() +// { +// Test.AssertException( +// () => +// { +// var firstLicense = "1-mKwoA4cwRkRKioJ70fh6WcL5Ty+K2Kn32oftC2KFqw5kimAMYrTeKwOX25e55GcTMy/cB8Ssa/SJmFFq6OUSXpgc7TsG6vNA7jE8lYbpzQcaIumX9tu0Kr2655zUne0GcPP0 + Y6OqLnRnOiq5keErGSyohcfZmzkRXoHAEEXR68xOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkZ1bGw6TXlUZXN0ZWQuQXNwTmV0Q29yZS5NdmMu"; +// var secondLicense = "1-03rl5Irwh4ZsynriqaencPeH4C+e4JtKFx6CehuklqJ58/N8OEePi19h332aQ5DrYPS3715dVEbbWDxpkOm0e9wge9W / q01AfXEN2ytSGMPF8wEuLX6ZC0Lo698YKWhxQxtq4k6ls3XiHxwYl7XKD8n / rAntd6xY8lJYp8S3QtMxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkludGVybmFsOk15VGVzdGVkLkFzcE5ldENvcmUuTXZjLg=="; + +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { firstLicense, secondLicense }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); +// }, +// "License is for internal use only"); + +// Assert.False(LicenseValidator.HasValidLicense); +// } - [Fact] - public void ValidateShouldSetValidLicenses() - { - // Legacy license. - var firstLicenseDetails = new LicenseDetails - { - Id = 1, - Type = LicenseType.Developer, - User = "admin@mytestedasp.net", - InformationDetails = "MyTested.AspNetCore.Mvc Tests", - ExpiryDate = new DateTime(2017, 10, 15), - NamespacePrefix = "MyTested.AspNetCore.Mvc." - }; - - // Perpetual license. - var secondLicenseDetails = new LicenseDetails - { - Id = 2, - Type = LicenseType.Developer, - User = "admin@mytestedasp.net", - InformationDetails = "MyTested.AspNetCore.Mvc Tests", - ExpiryDate = new DateTime(2017, 10, 15), - NamespacePrefix = "MyTested.AspNetCore.Mvc.", - ExpirationType = ExpirationType.Perpetual - }; - - // Subscription license. - var thirdLicenseDetails = new LicenseDetails - { - Id = 3, - Type = LicenseType.Developer, - User = "admin@mytestedasp.net", - InformationDetails = "MyTested.AspNetCore.Mvc Tests", - ExpiryDate = new DateTime(2017, 10, 15), - NamespacePrefix = "MyTested.AspNetCore.Mvc.", - ExpirationType = ExpirationType.Subscription - }; - - var firstLicense = "1-rXDHzH/rR8IN83Qmtpyf8vsAd4cPfSd/roXjngSxf12fuEY5+nk/evBTOD3xcOQSrEQLte3BcpH/RxIxDaSmZU11zV4jafnJ4N0u+yfNmTvRhVAtGuVCPj1UgYva64QK5fsPbOXBXq1c9+ccfWoWuB7nuRPaJvUlv/dcHQAy3cUxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy4="; - var secondLicense = "2-LRJiOgmTuD8r3kD2XWziWyBJ2UTk7bxCsWkEaSuJ4cMcFnvyCkMB1mqVeVVIOOZxiXlS5bmlDKDwtFzCKGckzbSmij1wdHVmbBHIGCw1bRU2IBTMIWrLzHgOXXEGE7GsQhOxzcivVgg6gc7UBYtolvX+9TtwTQLR50eYEgaEd/AyOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46UGVycGV0dWFs"; - var thirdLicense = "3-uBS/3IdYWKeMNBd2Gnvb6VKisq/wcNmGfayo+I5nCH33G2pBHCMO+EerVymQA6yiPUz2kcf/ioo0nh3BwmhWDSPNyt/7Fhoie8zKdbNTLc3ZUTISUZzVYRbbAYv6Bngb6vPjnqMvlXiAGxXC8algqaKEG47j7vVUV24DgfGgHO4zOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u"; - - LicenseValidator.ClearLicenseDetails(); - LicenseValidator.Validate(new[] { firstLicense, secondLicense, thirdLicense }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - Assert.True(LicenseValidator.HasValidLicense); - - var registeredFirstLicense = LicenseValidator.GetLicenseDetails().FirstOrDefault(); - var registeredSecondLicense = LicenseValidator.GetLicenseDetails().ElementAt(1); - var registeredThirdLicense = LicenseValidator.GetLicenseDetails().LastOrDefault(); - - Assert.NotNull(registeredFirstLicense); - Assert.Equal(firstLicenseDetails.Id, registeredFirstLicense.Id); - Assert.Equal(firstLicenseDetails.Type, registeredFirstLicense.Type); - Assert.Equal(firstLicenseDetails.User, registeredFirstLicense.User); - Assert.Equal(firstLicenseDetails.InformationDetails, registeredFirstLicense.InformationDetails); - Assert.Equal(firstLicenseDetails.ExpiryDate, registeredFirstLicense.ExpiryDate); - Assert.Equal(firstLicenseDetails.NamespacePrefix, registeredFirstLicense.NamespacePrefix); - - Assert.NotNull(registeredSecondLicense); - Assert.Equal(secondLicenseDetails.Id, registeredSecondLicense.Id); - Assert.Equal(secondLicenseDetails.Type, registeredSecondLicense.Type); - Assert.Equal(secondLicenseDetails.User, registeredSecondLicense.User); - Assert.Equal(secondLicenseDetails.InformationDetails, registeredSecondLicense.InformationDetails); - Assert.Equal(secondLicenseDetails.ExpiryDate, registeredSecondLicense.ExpiryDate); - Assert.Equal(secondLicenseDetails.NamespacePrefix, registeredSecondLicense.NamespacePrefix); - - Assert.NotNull(registeredThirdLicense); - Assert.Equal(thirdLicenseDetails.Id, registeredThirdLicense.Id); - Assert.Equal(thirdLicenseDetails.Type, registeredThirdLicense.Type); - Assert.Equal(thirdLicenseDetails.User, registeredThirdLicense.User); - Assert.Equal(thirdLicenseDetails.InformationDetails, registeredThirdLicense.InformationDetails); - Assert.Equal(thirdLicenseDetails.ExpiryDate, registeredThirdLicense.ExpiryDate); - Assert.Equal(thirdLicenseDetails.NamespacePrefix, registeredThirdLicense.NamespacePrefix); - } - - [Fact] - public void PublicKeyShouldNotBeEnoughToForgeLicense() - { - var licenseDetails = new LicenseDetails - { - Id = 1, - Type = LicenseType.Developer, - User = "admin@mytestedasp.net", - InformationDetails = "MyTested.AspNetCore.Mvc Tests", - ExpiryDate = new DateTime(2017, 10, 15), - NamespacePrefix = "MyTested.AspNetCore.Mvc." - }; - - var licenseDetailsAsBytes = licenseDetails.GetSignificateData(); - - var cryptoProvider = new RSACryptoServiceProvider(1024) - { - PersistKeyInCsp = false - }; - - cryptoProvider.ImportCspBlob(Convert.FromBase64String("BgIAAACkAABSU0ExAAQAAAEAAQD5Hv5iOBm7GKs7GRQBwlYlbNsJZOL8PfX+rQuKK+tO4JquMo0ScaQiz4duyfjp1/dsrNAsRnRoDfIvaL75YYezaEaoRXldI83CjDPU92chrLUkaQdFtY1XyiBt6lJREkD6LBSRSJD9Z9Aeaqssl8fbaJpTk5wppIImhEvHrJ3F6g==")); - - Exception caughtException = null; - - try - { - cryptoProvider.SignData(licenseDetailsAsBytes, SHA1.Create()); - } - catch (Exception ex) - { - caughtException = ex; - } - - Assert.NotNull(caughtException); - Assert.IsAssignableFrom(caughtException); - } - } -} +// [Fact] +// public void ValidateShouldSetValidLicenses() +// { +// // Legacy license. +// var firstLicenseDetails = new LicenseDetails +// { +// Id = 1, +// Type = LicenseType.Developer, +// User = "admin@mytestedasp.net", +// InformationDetails = "MyTested.AspNetCore.Mvc Tests", +// ExpiryDate = new DateTime(2017, 10, 15), +// NamespacePrefix = "MyTested.AspNetCore.Mvc." +// }; + +// // Perpetual license. +// var secondLicenseDetails = new LicenseDetails +// { +// Id = 2, +// Type = LicenseType.Developer, +// User = "admin@mytestedasp.net", +// InformationDetails = "MyTested.AspNetCore.Mvc Tests", +// ExpiryDate = new DateTime(2017, 10, 15), +// NamespacePrefix = "MyTested.AspNetCore.Mvc.", +// ExpirationType = ExpirationType.Perpetual +// }; + +// // Subscription license. +// var thirdLicenseDetails = new LicenseDetails +// { +// Id = 3, +// Type = LicenseType.Developer, +// User = "admin@mytestedasp.net", +// InformationDetails = "MyTested.AspNetCore.Mvc Tests", +// ExpiryDate = new DateTime(2017, 10, 15), +// NamespacePrefix = "MyTested.AspNetCore.Mvc.", +// ExpirationType = ExpirationType.Subscription +// }; + +// var firstLicense = "1-rXDHzH/rR8IN83Qmtpyf8vsAd4cPfSd/roXjngSxf12fuEY5+nk/evBTOD3xcOQSrEQLte3BcpH/RxIxDaSmZU11zV4jafnJ4N0u+yfNmTvRhVAtGuVCPj1UgYva64QK5fsPbOXBXq1c9+ccfWoWuB7nuRPaJvUlv/dcHQAy3cUxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy4="; +// var secondLicense = "2-LRJiOgmTuD8r3kD2XWziWyBJ2UTk7bxCsWkEaSuJ4cMcFnvyCkMB1mqVeVVIOOZxiXlS5bmlDKDwtFzCKGckzbSmij1wdHVmbBHIGCw1bRU2IBTMIWrLzHgOXXEGE7GsQhOxzcivVgg6gc7UBYtolvX+9TtwTQLR50eYEgaEd/AyOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46UGVycGV0dWFs"; +// var thirdLicense = "3-uBS/3IdYWKeMNBd2Gnvb6VKisq/wcNmGfayo+I5nCH33G2pBHCMO+EerVymQA6yiPUz2kcf/ioo0nh3BwmhWDSPNyt/7Fhoie8zKdbNTLc3ZUTISUZzVYRbbAYv6Bngb6vPjnqMvlXiAGxXC8algqaKEG47j7vVUV24DgfGgHO4zOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u"; + +// LicenseValidator.ClearLicenseDetails(); +// LicenseValidator.Validate(new[] { firstLicense, secondLicense, thirdLicense }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// Assert.True(LicenseValidator.HasValidLicense); + +// var registeredFirstLicense = LicenseValidator.GetLicenseDetails().FirstOrDefault(); +// var registeredSecondLicense = LicenseValidator.GetLicenseDetails().ElementAt(1); +// var registeredThirdLicense = LicenseValidator.GetLicenseDetails().LastOrDefault(); + +// Assert.NotNull(registeredFirstLicense); +// Assert.Equal(firstLicenseDetails.Id, registeredFirstLicense.Id); +// Assert.Equal(firstLicenseDetails.Type, registeredFirstLicense.Type); +// Assert.Equal(firstLicenseDetails.User, registeredFirstLicense.User); +// Assert.Equal(firstLicenseDetails.InformationDetails, registeredFirstLicense.InformationDetails); +// Assert.Equal(firstLicenseDetails.ExpiryDate, registeredFirstLicense.ExpiryDate); +// Assert.Equal(firstLicenseDetails.NamespacePrefix, registeredFirstLicense.NamespacePrefix); + +// Assert.NotNull(registeredSecondLicense); +// Assert.Equal(secondLicenseDetails.Id, registeredSecondLicense.Id); +// Assert.Equal(secondLicenseDetails.Type, registeredSecondLicense.Type); +// Assert.Equal(secondLicenseDetails.User, registeredSecondLicense.User); +// Assert.Equal(secondLicenseDetails.InformationDetails, registeredSecondLicense.InformationDetails); +// Assert.Equal(secondLicenseDetails.ExpiryDate, registeredSecondLicense.ExpiryDate); +// Assert.Equal(secondLicenseDetails.NamespacePrefix, registeredSecondLicense.NamespacePrefix); + +// Assert.NotNull(registeredThirdLicense); +// Assert.Equal(thirdLicenseDetails.Id, registeredThirdLicense.Id); +// Assert.Equal(thirdLicenseDetails.Type, registeredThirdLicense.Type); +// Assert.Equal(thirdLicenseDetails.User, registeredThirdLicense.User); +// Assert.Equal(thirdLicenseDetails.InformationDetails, registeredThirdLicense.InformationDetails); +// Assert.Equal(thirdLicenseDetails.ExpiryDate, registeredThirdLicense.ExpiryDate); +// Assert.Equal(thirdLicenseDetails.NamespacePrefix, registeredThirdLicense.NamespacePrefix); +// } + +// [Fact] +// public void PublicKeyShouldNotBeEnoughToForgeLicense() +// { +// var licenseDetails = new LicenseDetails +// { +// Id = 1, +// Type = LicenseType.Developer, +// User = "admin@mytestedasp.net", +// InformationDetails = "MyTested.AspNetCore.Mvc Tests", +// ExpiryDate = new DateTime(2017, 10, 15), +// NamespacePrefix = "MyTested.AspNetCore.Mvc." +// }; + +// var licenseDetailsAsBytes = licenseDetails.GetSignificateData(); + +// var cryptoProvider = new RSACryptoServiceProvider(1024) +// { +// PersistKeyInCsp = false +// }; + +// cryptoProvider.ImportCspBlob(Convert.FromBase64String("BgIAAACkAABSU0ExAAQAAAEAAQD5Hv5iOBm7GKs7GRQBwlYlbNsJZOL8PfX+rQuKK+tO4JquMo0ScaQiz4duyfjp1/dsrNAsRnRoDfIvaL75YYezaEaoRXldI83CjDPU92chrLUkaQdFtY1XyiBt6lJREkD6LBSRSJD9Z9Aeaqssl8fbaJpTk5wppIImhEvHrJ3F6g==")); + +// Exception caughtException = null; + +// try +// { +// cryptoProvider.SignData(licenseDetailsAsBytes, SHA1.Create()); +// } +// catch (Exception ex) +// { +// caughtException = ex; +// } + +// Assert.NotNull(caughtException); +// Assert.IsAssignableFrom(caughtException); +// } +// } +//} diff --git a/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTestedMvcLicensingTests.cs b/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTestedMvcLicensingTests.cs index 75b71c1de..7c104e9b6 100644 --- a/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTestedMvcLicensingTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTestedMvcLicensingTests.cs @@ -1,125 +1,125 @@ -namespace MyTested.AspNetCore.Mvc.Licensing.Test -{ - using System; - using System.Collections.Generic; - using System.Threading.Tasks; - using Licensing; - using Microsoft.Extensions.Configuration; - using Mvc.Test.Setups; - using Mvc.Test.Setups.Controllers; - using Xunit; - - public class MyTestedMvcLicensingTests - { - [Fact] - public void WithNoLicenseExceptionShouldBeThrown() - { - MyApplication - .StartsFrom() - .WithConfiguration(configuration => configuration - .Add("License", null)) - .WithTestAssembly(this); - - LicenseValidator.ClearLicenseDetails(); - TestCounter.SetLicenseData(null, DateTime.MinValue, DateTime.MinValue, "MyTested.AspNetCore.Mvc.Tests"); - - Task.Run(async () => - { - var tasks = new List(); - - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - MyController - .Instance() - .Calling(c => c.OkResultAction()) - .ShouldReturn() - .Ok(); - })); - } - - await Assert.ThrowsAsync(async () => await Task.WhenAll(tasks)); - }) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); +//namespace MyTested.AspNetCore.Mvc.Licensing.Test +//{ +// using System; +// using System.Collections.Generic; +// using System.Threading.Tasks; +// using Licensing; +// using Microsoft.Extensions.Configuration; +// using Mvc.Test.Setups; +// using Mvc.Test.Setups.Controllers; +// using Xunit; + +// public class MyTestedMvcLicensingTests +// { +// [Fact] +// public void WithNoLicenseExceptionShouldBeThrown() +// { +// MyApplication +// .StartsFrom() +// .WithConfiguration(configuration => configuration +// .Add("License", null)) +// .WithTestAssembly(this); + +// LicenseValidator.ClearLicenseDetails(); +// TestCounter.SetLicenseData(null, DateTime.MinValue, DateTime.MinValue, "MyTested.AspNetCore.Mvc.Tests"); + +// Task.Run(async () => +// { +// var tasks = new List(); + +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// MyController +// .Instance() +// .Calling(c => c.OkResultAction()) +// .ShouldReturn() +// .Ok(); +// })); +// } + +// await Assert.ThrowsAsync(async () => await Task.WhenAll(tasks)); +// }) +// .ConfigureAwait(false) +// .GetAwaiter() +// .GetResult(); - MyApplication.StartsFrom(); - } - - [Fact] - public void WithLicenseNoExceptionShouldBeThrown() - { - MyApplication - .StartsFrom() - .WithConfiguration(configuration => configuration - .Add("License", "1-1pKwrILvp8I6UEGplN/RvjVeUW8DX0G5V2UhskQUmOd46C5rO9Nb+FcWf/xqBaYljRtCydmSqvmv37PFvMD7PUrXI0lyDcvRKoCJywthqp0wqrjvfmJOWcsH4AHaPdWZXIAG2NP77A7EwhjbNvzQ6tR6HovSFv2S5qcJWB0Ht/4xOjIwOTktMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u")) - .WithTestAssembly(this); - - LicenseValidator.ClearLicenseDetails(); - TestCounter.SetLicenseData(null, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - Task.Run(async () => - { - var tasks = new List(); - - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - MyController - .Instance() - .Calling(c => c.OkResultAction()) - .ShouldReturn() - .Ok(); - })); - } - - await Task.WhenAll(tasks); - }) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); - - MyApplication.StartsFrom(); - } - - [Fact] - public void WithMultipleLicensesNoExceptionShouldBeThrown() - { - MyApplication - .StartsFrom() - .WithConfiguration(config => config - .AddJsonFile("multilicenseconfig.json")) - .WithTestAssembly(this); - - LicenseValidator.ClearLicenseDetails(); - TestCounter.SetLicenseData(null, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); +// MyApplication.StartsFrom(); +// } + +// [Fact] +// public void WithLicenseNoExceptionShouldBeThrown() +// { +// MyApplication +// .StartsFrom() +// .WithConfiguration(configuration => configuration +// .Add("License", "1-1pKwrILvp8I6UEGplN/RvjVeUW8DX0G5V2UhskQUmOd46C5rO9Nb+FcWf/xqBaYljRtCydmSqvmv37PFvMD7PUrXI0lyDcvRKoCJywthqp0wqrjvfmJOWcsH4AHaPdWZXIAG2NP77A7EwhjbNvzQ6tR6HovSFv2S5qcJWB0Ht/4xOjIwOTktMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u")) +// .WithTestAssembly(this); + +// LicenseValidator.ClearLicenseDetails(); +// TestCounter.SetLicenseData(null, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// Task.Run(async () => +// { +// var tasks = new List(); + +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// MyController +// .Instance() +// .Calling(c => c.OkResultAction()) +// .ShouldReturn() +// .Ok(); +// })); +// } + +// await Task.WhenAll(tasks); +// }) +// .ConfigureAwait(false) +// .GetAwaiter() +// .GetResult(); + +// MyApplication.StartsFrom(); +// } + +// [Fact] +// public void WithMultipleLicensesNoExceptionShouldBeThrown() +// { +// MyApplication +// .StartsFrom() +// .WithConfiguration(config => config +// .AddJsonFile("multilicenseconfig.json")) +// .WithTestAssembly(this); + +// LicenseValidator.ClearLicenseDetails(); +// TestCounter.SetLicenseData(null, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - Task.Run(async () => - { - var tasks = new List(); - - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - MyController - .Instance() - .Calling(c => c.OkResultAction()) - .ShouldReturn() - .Ok(); - })); - } - - await Task.WhenAll(tasks); - }) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); - - MyApplication.StartsFrom(); - } - } -} +// Task.Run(async () => +// { +// var tasks = new List(); + +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// MyController +// .Instance() +// .Calling(c => c.OkResultAction()) +// .ShouldReturn() +// .Ok(); +// })); +// } + +// await Task.WhenAll(tasks); +// }) +// .ConfigureAwait(false) +// .GetAwaiter() +// .GetResult(); + +// MyApplication.StartsFrom(); +// } +// } +//} diff --git a/test/MyTested.AspNetCore.Mvc.Licensing.Test/TestCounterTests.cs b/test/MyTested.AspNetCore.Mvc.Licensing.Test/TestCounterTests.cs index 42310d1f2..30c82fd15 100644 --- a/test/MyTested.AspNetCore.Mvc.Licensing.Test/TestCounterTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Licensing.Test/TestCounterTests.cs @@ -1,321 +1,321 @@ -namespace MyTested.AspNetCore.Mvc.Licensing.Test -{ - using System; - using System.Collections.Generic; - using System.Threading.Tasks; - using Licensing; - using Xunit; - - public class TestCounterTests - { - [Fact] - public void IncrementAndValidateShouldThrowExceptionWithNullLicense() - { - Exception caughtException = null; - - Task.Run(async () => - { - LicenseValidator.ClearLicenseDetails(); - TestCounter.SetLicenseData(null, new DateTime(2018, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - var tasks = new List(); - - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - TestCounter.IncrementAndValidate(); - })); - } - - try - { - await Task.WhenAll(tasks); - } - catch (Exception ex) - { - caughtException = ex; - } - }) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); - - Assert.NotNull(caughtException); - Assert.IsAssignableFrom(caughtException); - Assert.Equal("The free-quota limit of 100 assertions per test project has been reached. Please visit https://mytestedasp.net/core/mvc#pricing to request a free license or upgrade to a commercial one.", caughtException.Message); - } - - [Fact] - public void IncrementAndValidateShouldThrowExceptionWithNoLicense() - { - Exception caughtException = null; - - Task.Run(async () => - { - LicenseValidator.ClearLicenseDetails(); - TestCounter.SetLicenseData(new string[0], new DateTime(2018, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - var tasks = new List(); - - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - TestCounter.IncrementAndValidate(); - })); - } - - try - { - await Task.WhenAll(tasks); - } - catch (Exception ex) - { - caughtException = ex; - } - }) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); - - Assert.NotNull(caughtException); - Assert.IsAssignableFrom(caughtException); - Assert.Equal("The free-quota limit of 100 assertions per test project has been reached. Please visit https://mytestedasp.net/core/mvc#pricing to request a free license or upgrade to a commercial one.", caughtException.Message); - } - - [Fact] - public void IncrementAndValidateShouldThrowExceptionWithInvalidLegacyLicense() - { - Exception caughtException = null; - - Task.Run(async () => - { - var license = "1-0WUoGNBmCpgJ+ktp3BObsUjsaX5XKc4Ed4LoeJBUPgTacqG2wUw9iKAMG4jdDIaiU+AnoTvrXwwLuvfvn57oukhw6HwTqp8hJ2I0vmNZFisQGyD4sjTDlKCBaOXJwXzifCIty2UuGUeo3KNqKoM+5MF1D0i/kEg/LKztnAN312gxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpGdWxsOk15VGVzdGVkLk12Yy4="; - - LicenseValidator.ClearLicenseDetails(); - TestCounter.SetLicenseData(new[] { license }, new DateTime(2018, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - var tasks = new List(); - - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - TestCounter.IncrementAndValidate(); - })); - } - - try - { - await Task.WhenAll(tasks); - } - catch (Exception ex) - { - caughtException = ex; - } - }) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); - - Assert.NotNull(caughtException); - Assert.IsAssignableFrom(caughtException); - Assert.Equal("You have invalid license: 'License is not valid for this version of My Tested ASP.NET Core MVC. License expired on 2017-10-15. This version of My Tested ASP.NET Core MVC was released on 2018-10-10'. The free-quota limit of 100 assertions per test project has been reached. Please visit https://mytestedasp.net/core/mvc#pricing to request a free license or upgrade to a commercial one.", caughtException.Message); - } - - [Fact] - public void IncrementAndValidateShouldNotThrowExceptionWithValidLegacyLicense() - { - Exception caughtException = null; - - Task.Run(async () => - { - var license = "1-rXDHzH/rR8IN83Qmtpyf8vsAd4cPfSd/roXjngSxf12fuEY5+nk/evBTOD3xcOQSrEQLte3BcpH/RxIxDaSmZU11zV4jafnJ4N0u+yfNmTvRhVAtGuVCPj1UgYva64QK5fsPbOXBXq1c9+ccfWoWuB7nuRPaJvUlv/dcHQAy3cUxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy4="; - - LicenseValidator.ClearLicenseDetails(); - TestCounter.SetLicenseData(new[] { license }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - var tasks = new List(); - - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - TestCounter.IncrementAndValidate(); - })); - } - - try - { - await Task.WhenAll(tasks); - } - catch (Exception ex) - { - caughtException = ex; - } - }) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); - - Assert.Null(caughtException); - } - - [Fact] - public void IncrementAndValidateShouldThrowExceptionWithInvalidPerpetualLicense() - { - Exception caughtException = null; - - Task.Run(async () => - { - var license = "1-IRaNRwlovf7moJnDcQCJW8JDq++p8/1hTNsRnBRLDGkd6HidiJ3OEzpFdwmlDacikCv5oRBisRkJ8edjqx1R21VA+SxCgpGHJE2ftOBpV1OBysguNUSIKJyte2heP3xD4tY1BQNh0vcVhXJDcE3qImhodZmi1aXJ19SK5f4JRA8xOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46UGVycGV0dWFs"; - - LicenseValidator.ClearLicenseDetails(); - TestCounter.SetLicenseData(new[] { license }, new DateTime(2016, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - var tasks = new List(); - - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - TestCounter.IncrementAndValidate(); - })); - } - - try - { - await Task.WhenAll(tasks); - } - catch (Exception ex) - { - caughtException = ex; - } - }) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); - - Assert.NotNull(caughtException); - Assert.IsAssignableFrom(caughtException); - Assert.Equal("You have invalid license: 'License is not valid for this version of My Tested ASP.NET Core MVC. License expired on 2017-10-15. This version of My Tested ASP.NET Core MVC was released on 2018-10-10'. The free-quota limit of 100 assertions per test project has been reached. Please visit https://mytestedasp.net/core/mvc#pricing to request a free license or upgrade to a commercial one.", caughtException.Message); - } - - [Fact] - public void IncrementAndValidateShouldNotThrowExceptionWithValidPerpetualLicense() - { - Exception caughtException = null; - - Task.Run(async () => - { - var license = "1-IRaNRwlovf7moJnDcQCJW8JDq++p8/1hTNsRnBRLDGkd6HidiJ3OEzpFdwmlDacikCv5oRBisRkJ8edjqx1R21VA+SxCgpGHJE2ftOBpV1OBysguNUSIKJyte2heP3xD4tY1BQNh0vcVhXJDcE3qImhodZmi1aXJ19SK5f4JRA8xOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46UGVycGV0dWFs"; - - LicenseValidator.ClearLicenseDetails(); - TestCounter.SetLicenseData(new[] { license }, new DateTime(2018, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - var tasks = new List(); - - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - TestCounter.IncrementAndValidate(); - })); - } - - try - { - await Task.WhenAll(tasks); - } - catch (Exception ex) - { - caughtException = ex; - } - }) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); - - Assert.Null(caughtException); - } - - [Fact] - public void IncrementAndValidateShouldThrowExceptionWithInvalidSubscriptionLicense() - { - Exception caughtException = null; - - Task.Run(async () => - { - var license = "1-TE6MO5GnjYwR3DcbT8rIXfjk9e0+ZPOb+c27A7pA83aNY4IQNBhgnIf4eUfy0MBvyXYrh9rkLa1hpGnrGu2TMZSoYxeZS07rM7WCqxzd2xXqfzuTAxsO1yNiEo/UwvVZUqz6s3nunKXn1m0b5dbKrsu7hxmWf8P8L2DhCDD09/sxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u"; - - LicenseValidator.ClearLicenseDetails(); - TestCounter.SetLicenseData(new[] { license }, new DateTime(2018, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - var tasks = new List(); - - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - TestCounter.IncrementAndValidate(); - })); - } - - try - { - await Task.WhenAll(tasks); - } - catch (Exception ex) - { - caughtException = ex; - } - }) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); - - Assert.NotNull(caughtException); - Assert.IsAssignableFrom(caughtException); - Assert.Equal("You have invalid license: 'License subscription expired on 2017-10-15'. The free-quota limit of 100 assertions per test project has been reached. Please visit https://mytestedasp.net/core/mvc#pricing to request a free license or upgrade to a commercial one.", caughtException.Message); - } - - [Fact] - public void IncrementAndValidateShouldNotThrowExceptionWithValidSubscriptionLicense() - { - Exception caughtException = null; - - Task.Run(async () => - { - var license = "1-TE6MO5GnjYwR3DcbT8rIXfjk9e0+ZPOb+c27A7pA83aNY4IQNBhgnIf4eUfy0MBvyXYrh9rkLa1hpGnrGu2TMZSoYxeZS07rM7WCqxzd2xXqfzuTAxsO1yNiEo/UwvVZUqz6s3nunKXn1m0b5dbKrsu7hxmWf8P8L2DhCDD09/sxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u"; - - LicenseValidator.ClearLicenseDetails(); - TestCounter.SetLicenseData(new[] { license }, new DateTime(2016, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); - - var tasks = new List(); - - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - TestCounter.IncrementAndValidate(); - })); - } - - try - { - await Task.WhenAll(tasks); - } - catch (Exception ex) - { - caughtException = ex; - } - }) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); - - Assert.Null(caughtException); - } - } -} +//namespace MyTested.AspNetCore.Mvc.Licensing.Test +//{ +// using System; +// using System.Collections.Generic; +// using System.Threading.Tasks; +// using Licensing; +// using Xunit; + +// public class TestCounterTests +// { +// [Fact] +// public void IncrementAndValidateShouldThrowExceptionWithNullLicense() +// { +// Exception caughtException = null; + +// Task.Run(async () => +// { +// LicenseValidator.ClearLicenseDetails(); +// TestCounter.SetLicenseData(null, new DateTime(2018, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// var tasks = new List(); + +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// TestCounter.IncrementAndValidate(); +// })); +// } + +// try +// { +// await Task.WhenAll(tasks); +// } +// catch (Exception ex) +// { +// caughtException = ex; +// } +// }) +// .ConfigureAwait(false) +// .GetAwaiter() +// .GetResult(); + +// Assert.NotNull(caughtException); +// Assert.IsAssignableFrom(caughtException); +// Assert.Equal("The free-quota limit of 100 assertions per test project has been reached. Please visit https://mytestedasp.net/core/mvc#pricing to request a free license or upgrade to a commercial one.", caughtException.Message); +// } + +// [Fact] +// public void IncrementAndValidateShouldThrowExceptionWithNoLicense() +// { +// Exception caughtException = null; + +// Task.Run(async () => +// { +// LicenseValidator.ClearLicenseDetails(); +// TestCounter.SetLicenseData(new string[0], new DateTime(2018, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// var tasks = new List(); + +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// TestCounter.IncrementAndValidate(); +// })); +// } + +// try +// { +// await Task.WhenAll(tasks); +// } +// catch (Exception ex) +// { +// caughtException = ex; +// } +// }) +// .ConfigureAwait(false) +// .GetAwaiter() +// .GetResult(); + +// Assert.NotNull(caughtException); +// Assert.IsAssignableFrom(caughtException); +// Assert.Equal("The free-quota limit of 100 assertions per test project has been reached. Please visit https://mytestedasp.net/core/mvc#pricing to request a free license or upgrade to a commercial one.", caughtException.Message); +// } + +// [Fact] +// public void IncrementAndValidateShouldThrowExceptionWithInvalidLegacyLicense() +// { +// Exception caughtException = null; + +// Task.Run(async () => +// { +// var license = "1-0WUoGNBmCpgJ+ktp3BObsUjsaX5XKc4Ed4LoeJBUPgTacqG2wUw9iKAMG4jdDIaiU+AnoTvrXwwLuvfvn57oukhw6HwTqp8hJ2I0vmNZFisQGyD4sjTDlKCBaOXJwXzifCIty2UuGUeo3KNqKoM+5MF1D0i/kEg/LKztnAN312gxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLk12YyBUZXN0czpGdWxsOk15VGVzdGVkLk12Yy4="; + +// LicenseValidator.ClearLicenseDetails(); +// TestCounter.SetLicenseData(new[] { license }, new DateTime(2018, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// var tasks = new List(); + +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// TestCounter.IncrementAndValidate(); +// })); +// } + +// try +// { +// await Task.WhenAll(tasks); +// } +// catch (Exception ex) +// { +// caughtException = ex; +// } +// }) +// .ConfigureAwait(false) +// .GetAwaiter() +// .GetResult(); + +// Assert.NotNull(caughtException); +// Assert.IsAssignableFrom(caughtException); +// Assert.Equal("You have invalid license: 'License is not valid for this version of My Tested ASP.NET Core MVC. License expired on 2017-10-15. This version of My Tested ASP.NET Core MVC was released on 2018-10-10'. The free-quota limit of 100 assertions per test project has been reached. Please visit https://mytestedasp.net/core/mvc#pricing to request a free license or upgrade to a commercial one.", caughtException.Message); +// } + +// [Fact] +// public void IncrementAndValidateShouldNotThrowExceptionWithValidLegacyLicense() +// { +// Exception caughtException = null; + +// Task.Run(async () => +// { +// var license = "1-rXDHzH/rR8IN83Qmtpyf8vsAd4cPfSd/roXjngSxf12fuEY5+nk/evBTOD3xcOQSrEQLte3BcpH/RxIxDaSmZU11zV4jafnJ4N0u+yfNmTvRhVAtGuVCPj1UgYva64QK5fsPbOXBXq1c9+ccfWoWuB7nuRPaJvUlv/dcHQAy3cUxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy4="; + +// LicenseValidator.ClearLicenseDetails(); +// TestCounter.SetLicenseData(new[] { license }, new DateTime(2016, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// var tasks = new List(); + +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// TestCounter.IncrementAndValidate(); +// })); +// } + +// try +// { +// await Task.WhenAll(tasks); +// } +// catch (Exception ex) +// { +// caughtException = ex; +// } +// }) +// .ConfigureAwait(false) +// .GetAwaiter() +// .GetResult(); + +// Assert.Null(caughtException); +// } + +// [Fact] +// public void IncrementAndValidateShouldThrowExceptionWithInvalidPerpetualLicense() +// { +// Exception caughtException = null; + +// Task.Run(async () => +// { +// var license = "1-IRaNRwlovf7moJnDcQCJW8JDq++p8/1hTNsRnBRLDGkd6HidiJ3OEzpFdwmlDacikCv5oRBisRkJ8edjqx1R21VA+SxCgpGHJE2ftOBpV1OBysguNUSIKJyte2heP3xD4tY1BQNh0vcVhXJDcE3qImhodZmi1aXJ19SK5f4JRA8xOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46UGVycGV0dWFs"; + +// LicenseValidator.ClearLicenseDetails(); +// TestCounter.SetLicenseData(new[] { license }, new DateTime(2016, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// var tasks = new List(); + +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// TestCounter.IncrementAndValidate(); +// })); +// } + +// try +// { +// await Task.WhenAll(tasks); +// } +// catch (Exception ex) +// { +// caughtException = ex; +// } +// }) +// .ConfigureAwait(false) +// .GetAwaiter() +// .GetResult(); + +// Assert.NotNull(caughtException); +// Assert.IsAssignableFrom(caughtException); +// Assert.Equal("You have invalid license: 'License is not valid for this version of My Tested ASP.NET Core MVC. License expired on 2017-10-15. This version of My Tested ASP.NET Core MVC was released on 2018-10-10'. The free-quota limit of 100 assertions per test project has been reached. Please visit https://mytestedasp.net/core/mvc#pricing to request a free license or upgrade to a commercial one.", caughtException.Message); +// } + +// [Fact] +// public void IncrementAndValidateShouldNotThrowExceptionWithValidPerpetualLicense() +// { +// Exception caughtException = null; + +// Task.Run(async () => +// { +// var license = "1-IRaNRwlovf7moJnDcQCJW8JDq++p8/1hTNsRnBRLDGkd6HidiJ3OEzpFdwmlDacikCv5oRBisRkJ8edjqx1R21VA+SxCgpGHJE2ftOBpV1OBysguNUSIKJyte2heP3xD4tY1BQNh0vcVhXJDcE3qImhodZmi1aXJ19SK5f4JRA8xOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46UGVycGV0dWFs"; + +// LicenseValidator.ClearLicenseDetails(); +// TestCounter.SetLicenseData(new[] { license }, new DateTime(2018, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// var tasks = new List(); + +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// TestCounter.IncrementAndValidate(); +// })); +// } + +// try +// { +// await Task.WhenAll(tasks); +// } +// catch (Exception ex) +// { +// caughtException = ex; +// } +// }) +// .ConfigureAwait(false) +// .GetAwaiter() +// .GetResult(); + +// Assert.Null(caughtException); +// } + +// [Fact] +// public void IncrementAndValidateShouldThrowExceptionWithInvalidSubscriptionLicense() +// { +// Exception caughtException = null; + +// Task.Run(async () => +// { +// var license = "1-TE6MO5GnjYwR3DcbT8rIXfjk9e0+ZPOb+c27A7pA83aNY4IQNBhgnIf4eUfy0MBvyXYrh9rkLa1hpGnrGu2TMZSoYxeZS07rM7WCqxzd2xXqfzuTAxsO1yNiEo/UwvVZUqz6s3nunKXn1m0b5dbKrsu7hxmWf8P8L2DhCDD09/sxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u"; + +// LicenseValidator.ClearLicenseDetails(); +// TestCounter.SetLicenseData(new[] { license }, new DateTime(2018, 10, 10), new DateTime(2016, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// var tasks = new List(); + +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// TestCounter.IncrementAndValidate(); +// })); +// } + +// try +// { +// await Task.WhenAll(tasks); +// } +// catch (Exception ex) +// { +// caughtException = ex; +// } +// }) +// .ConfigureAwait(false) +// .GetAwaiter() +// .GetResult(); + +// Assert.NotNull(caughtException); +// Assert.IsAssignableFrom(caughtException); +// Assert.Equal("You have invalid license: 'License subscription expired on 2017-10-15'. The free-quota limit of 100 assertions per test project has been reached. Please visit https://mytestedasp.net/core/mvc#pricing to request a free license or upgrade to a commercial one.", caughtException.Message); +// } + +// [Fact] +// public void IncrementAndValidateShouldNotThrowExceptionWithValidSubscriptionLicense() +// { +// Exception caughtException = null; + +// Task.Run(async () => +// { +// var license = "1-TE6MO5GnjYwR3DcbT8rIXfjk9e0+ZPOb+c27A7pA83aNY4IQNBhgnIf4eUfy0MBvyXYrh9rkLa1hpGnrGu2TMZSoYxeZS07rM7WCqxzd2xXqfzuTAxsO1yNiEo/UwvVZUqz6s3nunKXn1m0b5dbKrsu7hxmWf8P8L2DhCDD09/sxOjIwMTctMTAtMTU6YWRtaW5AbXl0ZXN0ZWRhc3AubmV0Ok15VGVzdGVkLkFzcE5ldENvcmUuTXZjIFRlc3RzOkRldmVsb3BlcjpNeVRlc3RlZC5Bc3BOZXRDb3JlLk12Yy46U3Vic2NyaXB0aW9u"; + +// LicenseValidator.ClearLicenseDetails(); +// TestCounter.SetLicenseData(new[] { license }, new DateTime(2016, 10, 10), new DateTime(2018, 10, 10), "MyTested.AspNetCore.Mvc.Tests"); + +// var tasks = new List(); + +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// TestCounter.IncrementAndValidate(); +// })); +// } + +// try +// { +// await Task.WhenAll(tasks); +// } +// catch (Exception ex) +// { +// caughtException = ex; +// } +// }) +// .ConfigureAwait(false) +// .GetAwaiter() +// .GetResult(); + +// Assert.Null(caughtException); +// } +// } +//} diff --git a/test/MyTested.AspNetCore.Mvc.Lite.Test/Internal/FreeLicenseTests.cs b/test/MyTested.AspNetCore.Mvc.Lite.Test/Internal/FreeLicenseTests.cs index 4860d0537..81526d75c 100644 --- a/test/MyTested.AspNetCore.Mvc.Lite.Test/Internal/FreeLicenseTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Lite.Test/Internal/FreeLicenseTests.cs @@ -1,32 +1,32 @@ -namespace MyTested.AspNetCore.Mvc.Test.Internal -{ - using Licensing; - using Setups.Controllers; - using System.Collections.Generic; - using System.Threading.Tasks; - using Xunit; +//namespace MyTested.AspNetCore.Mvc.Test.Internal +//{ +// using Licensing; +// using Setups.Controllers; +// using System.Collections.Generic; +// using System.Threading.Tasks; +// using Xunit; - public class FreeLicenseTests - { - [Fact] - public async Task UsingLitePackageWithOtherPluginsShouldRequireLicense() - => await Task.Run(async () => - { - var tasks = new List(); +// public class FreeLicenseTests +// { +// [Fact] +// public async Task UsingLitePackageWithOtherPluginsShouldRequireLicense() +// => await Task.Run(async () => +// { +// var tasks = new List(); - for (int i = 0; i < 200; i++) - { - tasks.Add(Task.Run(() => - { - MyController - .Instance() - .Calling(c => c.OkResultAction()) - .ShouldReturn() - .Ok(); - })); - } +// for (int i = 0; i < 200; i++) +// { +// tasks.Add(Task.Run(() => +// { +// MyController +// .Instance() +// .Calling(c => c.OkResultAction()) +// .ShouldReturn() +// .Ok(); +// })); +// } - await Assert.ThrowsAsync(async () => await Task.WhenAll(tasks)); - }); - } -} +// await Assert.ThrowsAsync(async () => await Task.WhenAll(tasks)); +// }); +// } +//} From 0fbc23c0d3693c2d1f833fe8df0f54492c341b88 Mon Sep 17 00:00:00 2001 From: LetMeSleepAlready <35378209+LetMeSleepAlready@users.noreply.github.com> Date: Sat, 20 Nov 2021 01:36:14 +0100 Subject: [PATCH 12/19] removed language specific dependency on certain tests --- .../ServicesTests.cs | 2 +- .../UtilitiesTests/ReflectionTests.cs | 2 +- .../ShouldHaveTests/ShouldHaveMemoryCacheTests.cs | 7 ++++--- .../ShouldHaveTests/ShouldHaveMemoryCacheTests.cs | 7 ++++--- .../JsonTests/JsonSerializerTestBuilderTests.cs | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs index 374498955..04c3464d7 100644 --- a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/ServicesTests.cs @@ -174,7 +174,7 @@ public void IsUsingWithStartUpClassShouldThrowExceptionWithServiceProviderWhenTe TestServiceProvider.GetService(); }, - "Testing services could not be resolved. If your ConfigureServices method returns an IServiceProvider, you should either change it to return 'void' or manually register the required testing services by calling one of the provided IServiceCollection extension methods in the 'MyTested.AspNetCore.Mvc' namespace."); + "Testing services could not be resolved. If your ConfigureServices method returns an IServiceProvider, you should either change it to return 'void' or manually register the required testing services by calling one of the provided IServiceCollection extension methods in the 'MyTested.AspNetCore.Mvc' namespace. An easy way to do the second option is to add a TestStartup class at the root of your test project and invoke the extension methods there."); MyApplication.StartsFrom(); } diff --git a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/UtilitiesTests/ReflectionTests.cs b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/UtilitiesTests/ReflectionTests.cs index 26e929357..6f9ae53d1 100644 --- a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/UtilitiesTests/ReflectionTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/UtilitiesTests/ReflectionTests.cs @@ -1025,7 +1025,7 @@ public void AreDeeplyEqualShouldReportCorrectlyWithPrimitiveAndStructTypes() Assert.False(Reflection.AreDeeplyEqual(1, "1", out result)); Assert.Equal("Expected a value of Int32 type, but in fact it was String", result.ToString()); Assert.False(Reflection.AreDeeplyEqual(new DateTime(2015, 10, 19), new DateTime(2015, 10, 20), out result)); - Assert.Equal("Difference occurs at 'DateTime.== (Equality Operator)'. Expected a value of '10/19/2015 12:00:00 AM', but in fact it was '10/20/2015 12:00:00 AM'", result.ToString()); + Assert.Equal($"Difference occurs at 'DateTime.== (Equality Operator)'. Expected a value of '{new DateTime(2015, 10, 19)}', but in fact it was '{new DateTime(2015, 10, 20)}'", result.ToString()); } [Fact] diff --git a/test/MyTested.AspNetCore.Mvc.Caching.Test/BuildersTests/ActionsTests/ShouldHaveTests/ShouldHaveMemoryCacheTests.cs b/test/MyTested.AspNetCore.Mvc.Caching.Test/BuildersTests/ActionsTests/ShouldHaveTests/ShouldHaveMemoryCacheTests.cs index d1c0d9973..bfb5175b9 100644 --- a/test/MyTested.AspNetCore.Mvc.Caching.Test/BuildersTests/ActionsTests/ShouldHaveTests/ShouldHaveMemoryCacheTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Caching.Test/BuildersTests/ActionsTests/ShouldHaveTests/ShouldHaveMemoryCacheTests.cs @@ -268,7 +268,8 @@ public void MemoryCacheWithBuilderShouldThrowWithMemoryCacheEntryOptionsAndIncor [Fact] public void MemoryCacheWithBuilderShouldThrowWithMemoryCacheEntryOptionsWithInvalidAbsoluteExpiration() { - var invalidExpirationDate = new DateTime(2017, 1, 1, 1, 1, 1, DateTimeKind.Utc); + var invalidExpirationDate = new DateTimeOffset(new DateTime(2017, 1, 1, 1, 1, 1, DateTimeKind.Utc)); + var actualExpirationDate = new DateTimeOffset(new DateTime(2016, 1, 1, 1, 1, 1, DateTimeKind.Utc)); Test.AssertException( () => @@ -280,7 +281,7 @@ public void MemoryCacheWithBuilderShouldThrowWithMemoryCacheEntryOptionsWithInva .MemoryCache(cache => cache .ContainingEntry("test", "value", new MemoryCacheEntryOptions { - AbsoluteExpiration = new DateTimeOffset(invalidExpirationDate), + AbsoluteExpiration = invalidExpirationDate, AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(1), Priority = CacheItemPriority.High, SlidingExpiration = TimeSpan.FromMinutes(5) @@ -289,7 +290,7 @@ public void MemoryCacheWithBuilderShouldThrowWithMemoryCacheEntryOptionsWithInva .ShouldReturn() .Ok(); }, - "When calling AddMemoryCacheAction action in MvcController expected memory cache to have entry with the given options, but in fact they were different. Difference occurs at 'MemoryCacheEntryOptions.AbsoluteExpiration.== (Equality Operator)'. Expected a value of '1/1/2017 1:01:01 AM +00:00', but in fact it was '1/1/2016 1:01:01 AM +00:00'."); + $"When calling AddMemoryCacheAction action in MvcController expected memory cache to have entry with the given options, but in fact they were different. Difference occurs at 'MemoryCacheEntryOptions.AbsoluteExpiration.== (Equality Operator)'. Expected a value of '{invalidExpirationDate}', but in fact it was '{actualExpirationDate}'."); } [Fact] diff --git a/test/MyTested.AspNetCore.Mvc.Caching.Test/BuildersTests/InvocationsTests/ShouldHaveTests/ShouldHaveMemoryCacheTests.cs b/test/MyTested.AspNetCore.Mvc.Caching.Test/BuildersTests/InvocationsTests/ShouldHaveTests/ShouldHaveMemoryCacheTests.cs index 539c21906..0f79f5959 100644 --- a/test/MyTested.AspNetCore.Mvc.Caching.Test/BuildersTests/InvocationsTests/ShouldHaveTests/ShouldHaveMemoryCacheTests.cs +++ b/test/MyTested.AspNetCore.Mvc.Caching.Test/BuildersTests/InvocationsTests/ShouldHaveTests/ShouldHaveMemoryCacheTests.cs @@ -242,7 +242,8 @@ public void MemoryCacheWithBuilderShouldThrowWithMemoryCacheEntryOptionsAndIncor [Fact] public void MemoryCacheWithBuilderShouldThrowWithMemoryCacheEntryOptionsWithInvalidAbsoluteExpiration() { - var invalidExpirationDate = new DateTime(2017, 1, 1, 1, 1, 1, DateTimeKind.Utc); + var invalidExpirationDate = new DateTimeOffset(new DateTime(2017, 1, 1, 1, 1, 1, DateTimeKind.Utc)); + var actualExpirationDate = new DateTimeOffset(new DateTime(2016, 1, 1, 1, 1, 1, DateTimeKind.Utc)); Test.AssertException( () => @@ -253,7 +254,7 @@ public void MemoryCacheWithBuilderShouldThrowWithMemoryCacheEntryOptionsWithInva .MemoryCache(cache => cache .ContainingEntry("test", "value", new MemoryCacheEntryOptions { - AbsoluteExpiration = new DateTimeOffset(invalidExpirationDate), + AbsoluteExpiration = invalidExpirationDate, AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(1), Priority = CacheItemPriority.High, SlidingExpiration = TimeSpan.FromMinutes(5) @@ -262,7 +263,7 @@ public void MemoryCacheWithBuilderShouldThrowWithMemoryCacheEntryOptionsWithInva .ShouldReturn() .View(); }, - "When invoking MemoryCacheValuesComponent expected memory cache to have entry with the given options, but in fact they were different. Difference occurs at 'MemoryCacheEntryOptions.AbsoluteExpiration.== (Equality Operator)'. Expected a value of '1/1/2017 1:01:01 AM +00:00', but in fact it was '1/1/2016 1:01:01 AM +00:00'."); + $"When invoking MemoryCacheValuesComponent expected memory cache to have entry with the given options, but in fact they were different. Difference occurs at 'MemoryCacheEntryOptions.AbsoluteExpiration.== (Equality Operator)'. Expected a value of '{invalidExpirationDate}', but in fact it was '{actualExpirationDate}'."); } [Fact] diff --git a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/BuildersTests/ActionResultsTests/JsonTests/JsonSerializerTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/BuildersTests/ActionResultsTests/JsonTests/JsonSerializerTestBuilderTests.cs index deb96cb43..ca3d89a1f 100644 --- a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/BuildersTests/ActionResultsTests/JsonTests/JsonSerializerTestBuilderTests.cs +++ b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/BuildersTests/ActionResultsTests/JsonTests/JsonSerializerTestBuilderTests.cs @@ -109,7 +109,7 @@ public void WithCultureShouldThrowExceptionWithIncorrectValue() .WithJsonSerializerSettings(s => s.WithCulture(CultureInfo.GetCultureInfo("en-US")))); }, - "When calling JsonWithSettingsAction action in MvcController expected JSON result serializer settings to have 'English (United States)' culture, but in fact found 'Unknown language'."); + $"When calling JsonWithSettingsAction action in MvcController expected JSON result serializer settings to have '{CultureInfo.GetCultureInfo("en-US").DisplayName}' culture, but in fact found '{CultureInfo.InvariantCulture.DisplayName}'."); } [Fact] From 14fe4747ea2aae3f52e12d24fbd23886a43efd6a Mon Sep 17 00:00:00 2001 From: Kalin Tsenkov Date: Fri, 11 Mar 2022 13:50:56 +0200 Subject: [PATCH 13/19] Upgrade TargetFramework to net6.0 and VersionPrefix to 6.0.0 --- .../MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Versioning.csproj | 4 ++-- .../ApplicationParts.Controllers.csproj | 2 +- .../ApplicationParts.Models/ApplicationParts.Models.csproj | 2 +- .../ApplicationParts.Services.csproj | 2 +- .../ApplicationParts.Test/ApplicationParts.Test.csproj | 2 +- .../ApplicationParts.Web/ApplicationParts.Web.csproj | 2 +- .../Autofac.AssemblyInit.Test.csproj | 2 +- .../Autofac.NoContainerBuilder.Test.csproj | 2 +- .../Autofac.NoContainerBuilder.Web.csproj | 2 +- samples/Autofac/Autofac.NoContainerBuilder.Web/Startup.cs | 2 +- samples/Autofac/Autofac.Test/Autofac.Test.csproj | 2 +- samples/Autofac/Autofac.Web/Autofac.Web.csproj | 2 +- samples/Autofac/Autofac.Web/Startup.cs | 2 +- samples/Blog/Blog.Controllers/Blog.Controllers.csproj | 2 +- samples/Blog/Blog.Data/Blog.Data.csproj | 2 +- samples/Blog/Blog.Services/Blog.Services.csproj | 2 +- samples/Blog/Blog.Test/Blog.Test.csproj | 2 +- samples/Blog/Blog.Web/Blog.Web.csproj | 2 +- samples/Configuration/Common/AdditionalEntryPoint.csproj | 2 +- .../Test.DifferentEnvironment.csproj | 2 +- .../Test.ExplicitNoStartupType.csproj | 2 +- .../Test.MissingStartupType/Test.MissingStartupType.csproj | 2 +- .../Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj | 2 +- samples/Configuration/Test.NoAsync/Test.NoAsync.csproj | 2 +- .../Test.NoStartupType/Test.NoStartupType.csproj | 2 +- .../Test.WrongStartupType/Test.WrongStartupType.csproj | 2 +- .../Test.WrongTestAssembly/Test.WrongTestAssembly.csproj | 2 +- .../Test.WrongWebAssembly/Test.WrongWebAssembly.csproj | 2 +- .../WebApplication.Controllers.csproj | 2 +- .../WebApplication.Services/WebApplication.Services.csproj | 2 +- samples/Configuration/WebApplication/Startup.cs | 2 +- samples/Configuration/WebApplication/WebApplication.csproj | 2 +- samples/Lite/Lite.Test/Lite.Test.csproj | 2 +- samples/Lite/Lite.Web/Lite.Web.csproj | 2 +- samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj | 2 +- samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj | 2 +- .../NoStartup.Components/NoStartup.Components.csproj | 2 +- .../NoStartup.Controllers/NoStartup.Controllers.csproj | 2 +- .../NoStartup/NoStartup.Services/NoStartup.Services.csproj | 2 +- samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj | 2 +- samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj | 2 +- samples/WebStartup/WebStartup.Web/Startup.cs | 2 +- samples/WebStartup/WebStartup.Web/WebStartup.Web.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Abstractions.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Authentication.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Caching.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Configuration.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj | 4 ++-- ...sted.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Controllers.Views.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Controllers.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Core.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.DataAnnotations.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.DependencyInjection.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Helpers.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Http.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Licensing.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Lite.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.ModelState.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Models.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Options.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Pipeline.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Routing.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Session.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.TempData.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Universe.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.ViewComponents.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.ViewData.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.ViewFeatures.csproj | 4 ++-- src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj | 4 ++-- .../MyTested.AspNetCore.Mvc.Abstractions.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Authentication.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Caching.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Configuration.Test.csproj | 2 +- ...ested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj | 2 +- ...MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Controllers.Test.csproj | 2 +- ...AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Helpers.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Http.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Licensing.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Lite.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ModelState.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Models.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Options.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Pipeline.Test.csproj | 2 +- ...Tested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Routing.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Session.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.TempData.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Test.Setups.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Universe.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Versioning.Test.csproj | 2 +- ...ested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj | 2 +- ...MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewData.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj | 2 +- 110 files changed, 144 insertions(+), 144 deletions(-) diff --git a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj index abc3280e3..dfdccc557 100644 --- a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC Newtonsoft JSON components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.NewtonsoftJson - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj index f1aa5cc8f..40f123cf3 100644 --- a/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC razor runtime compilation components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj index e273d2316..95f981935 100644 --- a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC versioning components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Versioning - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj b/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj index 16cd932ef..d525c94ac 100644 --- a/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj +++ b/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 ApplicationParts.Controllers ApplicationParts.Controllers false diff --git a/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj b/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj index 458902dae..48b014074 100644 --- a/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj +++ b/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 ApplicationParts.Models ApplicationParts.Models false diff --git a/samples/ApplicationParts/ApplicationParts.Services/ApplicationParts.Services.csproj b/samples/ApplicationParts/ApplicationParts.Services/ApplicationParts.Services.csproj index 4c20099ff..94fb3d792 100644 --- a/samples/ApplicationParts/ApplicationParts.Services/ApplicationParts.Services.csproj +++ b/samples/ApplicationParts/ApplicationParts.Services/ApplicationParts.Services.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 ApplicationParts.Services ApplicationParts.Services false diff --git a/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj b/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj index d9de1169e..b5a927e4b 100644 --- a/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj +++ b/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj b/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj index 1a08490ba..a5ea4b4c4 100644 --- a/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj +++ b/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 ApplicationParts.Web aspnet-ApplicationParts.Web-c273a372-79ef-490d-b0e1-a7fb8f2dacc7 true diff --git a/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj b/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj index 77b737e4d..1fb2c342b 100644 --- a/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj +++ b/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj b/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj index 82277d2ad..cf6269910 100644 --- a/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj +++ b/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj b/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj index c8ad5e41b..756cf317d 100644 --- a/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj +++ b/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 InProcess true diff --git a/samples/Autofac/Autofac.NoContainerBuilder.Web/Startup.cs b/samples/Autofac/Autofac.NoContainerBuilder.Web/Startup.cs index 03cdc5a3e..0c9a23534 100644 --- a/samples/Autofac/Autofac.NoContainerBuilder.Web/Startup.cs +++ b/samples/Autofac/Autofac.NoContainerBuilder.Web/Startup.cs @@ -29,7 +29,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services) services.AddSingleton(_ => new DateTimeService()); - services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0); + services.AddMvc(); var builder = this.GetContainerBuilder(services); diff --git a/samples/Autofac/Autofac.Test/Autofac.Test.csproj b/samples/Autofac/Autofac.Test/Autofac.Test.csproj index 8ee74e213..8d8d2fc25 100644 --- a/samples/Autofac/Autofac.Test/Autofac.Test.csproj +++ b/samples/Autofac/Autofac.Test/Autofac.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Autofac/Autofac.Web/Autofac.Web.csproj b/samples/Autofac/Autofac.Web/Autofac.Web.csproj index e1be01749..169d67ace 100644 --- a/samples/Autofac/Autofac.Web/Autofac.Web.csproj +++ b/samples/Autofac/Autofac.Web/Autofac.Web.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 InProcess true diff --git a/samples/Autofac/Autofac.Web/Startup.cs b/samples/Autofac/Autofac.Web/Startup.cs index 758ab0efe..7953d5557 100644 --- a/samples/Autofac/Autofac.Web/Startup.cs +++ b/samples/Autofac/Autofac.Web/Startup.cs @@ -27,7 +27,7 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(_ => new DateTimeService()); - services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0); + services.AddMvc(); } public void ConfigureContainer(ContainerBuilder builder) diff --git a/samples/Blog/Blog.Controllers/Blog.Controllers.csproj b/samples/Blog/Blog.Controllers/Blog.Controllers.csproj index 50a9e3273..4633b44a0 100644 --- a/samples/Blog/Blog.Controllers/Blog.Controllers.csproj +++ b/samples/Blog/Blog.Controllers/Blog.Controllers.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true false diff --git a/samples/Blog/Blog.Data/Blog.Data.csproj b/samples/Blog/Blog.Data/Blog.Data.csproj index aaae74965..c268ede25 100644 --- a/samples/Blog/Blog.Data/Blog.Data.csproj +++ b/samples/Blog/Blog.Data/Blog.Data.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true false diff --git a/samples/Blog/Blog.Services/Blog.Services.csproj b/samples/Blog/Blog.Services/Blog.Services.csproj index e4ff40a8c..08d047439 100644 --- a/samples/Blog/Blog.Services/Blog.Services.csproj +++ b/samples/Blog/Blog.Services/Blog.Services.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true false diff --git a/samples/Blog/Blog.Test/Blog.Test.csproj b/samples/Blog/Blog.Test/Blog.Test.csproj index d59c49780..dede65497 100644 --- a/samples/Blog/Blog.Test/Blog.Test.csproj +++ b/samples/Blog/Blog.Test/Blog.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Blog/Blog.Web/Blog.Web.csproj b/samples/Blog/Blog.Web/Blog.Web.csproj index cbcda18f0..6483661d8 100644 --- a/samples/Blog/Blog.Web/Blog.Web.csproj +++ b/samples/Blog/Blog.Web/Blog.Web.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 aspnet-Blog.Web-6757ED6F-7F48-4961-917B-ADA8F5DEAFB4 InProcess true diff --git a/samples/Configuration/Common/AdditionalEntryPoint.csproj b/samples/Configuration/Common/AdditionalEntryPoint.csproj index 2ad321c59..75c73ecc3 100644 --- a/samples/Configuration/Common/AdditionalEntryPoint.csproj +++ b/samples/Configuration/Common/AdditionalEntryPoint.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 true false false diff --git a/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj b/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj index 988e802a8..feae46f25 100644 --- a/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj +++ b/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj b/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj index e20995d04..34d1e1edd 100644 --- a/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj +++ b/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj b/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj index 20260d261..40e7013c1 100644 --- a/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj +++ b/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj b/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj index abb77d5e5..19a98437f 100644 --- a/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj +++ b/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 true diff --git a/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj b/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj index 30743c1a0..ee52a079c 100644 --- a/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj +++ b/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj b/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj index e20995d04..34d1e1edd 100644 --- a/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj +++ b/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj b/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj index e20995d04..34d1e1edd 100644 --- a/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj +++ b/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj b/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj index e20995d04..34d1e1edd 100644 --- a/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj +++ b/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj b/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj index e20995d04..34d1e1edd 100644 --- a/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj +++ b/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Configuration/WebApplication.Controllers/WebApplication.Controllers.csproj b/samples/Configuration/WebApplication.Controllers/WebApplication.Controllers.csproj index 143c96e7e..c4914f672 100644 --- a/samples/Configuration/WebApplication.Controllers/WebApplication.Controllers.csproj +++ b/samples/Configuration/WebApplication.Controllers/WebApplication.Controllers.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true false diff --git a/samples/Configuration/WebApplication.Services/WebApplication.Services.csproj b/samples/Configuration/WebApplication.Services/WebApplication.Services.csproj index f7acee11e..edf64a820 100644 --- a/samples/Configuration/WebApplication.Services/WebApplication.Services.csproj +++ b/samples/Configuration/WebApplication.Services/WebApplication.Services.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net6.0 true false diff --git a/samples/Configuration/WebApplication/Startup.cs b/samples/Configuration/WebApplication/Startup.cs index 2ab124df8..e0a60d0da 100644 --- a/samples/Configuration/WebApplication/Startup.cs +++ b/samples/Configuration/WebApplication/Startup.cs @@ -27,7 +27,7 @@ public void ConfigureServices(IServiceCollection services) services.AddTransient(); services.AddTransient(); - services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0); + services.AddMvc(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env) diff --git a/samples/Configuration/WebApplication/WebApplication.csproj b/samples/Configuration/WebApplication/WebApplication.csproj index d7fed3161..f603b9aed 100644 --- a/samples/Configuration/WebApplication/WebApplication.csproj +++ b/samples/Configuration/WebApplication/WebApplication.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 InProcess true diff --git a/samples/Lite/Lite.Test/Lite.Test.csproj b/samples/Lite/Lite.Test/Lite.Test.csproj index 38d833b54..9dce271cc 100644 --- a/samples/Lite/Lite.Test/Lite.Test.csproj +++ b/samples/Lite/Lite.Test/Lite.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/Lite/Lite.Web/Lite.Web.csproj b/samples/Lite/Lite.Web/Lite.Web.csproj index bed36b4a7..432c7b86b 100644 --- a/samples/Lite/Lite.Web/Lite.Web.csproj +++ b/samples/Lite/Lite.Web/Lite.Web.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj b/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj index ec8e48972..bf64cd6af 100644 --- a/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj +++ b/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj b/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj index 47d328249..cf0b45f6a 100644 --- a/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj +++ b/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 aspnet-MusicStore.Web-B1796332-CD47-4D99-85BC-7F98EA978F33 InProcess MusicStore diff --git a/samples/NoStartup/NoStartup.Components/NoStartup.Components.csproj b/samples/NoStartup/NoStartup.Components/NoStartup.Components.csproj index 32537286c..e80ac369e 100644 --- a/samples/NoStartup/NoStartup.Components/NoStartup.Components.csproj +++ b/samples/NoStartup/NoStartup.Components/NoStartup.Components.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 $(NoWarn);CS1591 true false diff --git a/samples/NoStartup/NoStartup.Controllers/NoStartup.Controllers.csproj b/samples/NoStartup/NoStartup.Controllers/NoStartup.Controllers.csproj index e3d30cc32..7b947a744 100644 --- a/samples/NoStartup/NoStartup.Controllers/NoStartup.Controllers.csproj +++ b/samples/NoStartup/NoStartup.Controllers/NoStartup.Controllers.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 $(NoWarn);CS1591 true false diff --git a/samples/NoStartup/NoStartup.Services/NoStartup.Services.csproj b/samples/NoStartup/NoStartup.Services/NoStartup.Services.csproj index ce3fe07e8..8c72b85bb 100644 --- a/samples/NoStartup/NoStartup.Services/NoStartup.Services.csproj +++ b/samples/NoStartup/NoStartup.Services/NoStartup.Services.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net6.0 $(NoWarn);CS1591 true false diff --git a/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj b/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj index 1a0065282..b3d5ec55c 100644 --- a/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj +++ b/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj b/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj index dfbb81139..674463030 100644 --- a/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj +++ b/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true diff --git a/samples/WebStartup/WebStartup.Web/Startup.cs b/samples/WebStartup/WebStartup.Web/Startup.cs index fae1329de..31fccf350 100644 --- a/samples/WebStartup/WebStartup.Web/Startup.cs +++ b/samples/WebStartup/WebStartup.Web/Startup.cs @@ -25,7 +25,7 @@ public void ConfigureServices(IServiceCollection services) options.MinimumSameSitePolicy = SameSiteMode.None; }); - services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0); + services.AddMvc(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/samples/WebStartup/WebStartup.Web/WebStartup.Web.csproj b/samples/WebStartup/WebStartup.Web/WebStartup.Web.csproj index dd644cc60..f04ed27dd 100644 --- a/samples/WebStartup/WebStartup.Web/WebStartup.Web.csproj +++ b/samples/WebStartup/WebStartup.Web/WebStartup.Web.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 InProcess true diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj index e508ca98f..8bb94bc89 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC common abstractions and interfaces. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Abstractions - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj b/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj index 81d53844d..3b8ecbf93 100644 --- a/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj +++ b/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC authentication components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Authentication - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj index 85cd8fc27..189e422af 100644 --- a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj +++ b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC caching components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Caching - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj index ac24617ee..c54747fe6 100644 --- a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj +++ b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC configuration components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Configuration - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj index b0dc66720..adeeab2ea 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC controller action result components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.ActionResults - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj index 9eb45d518..e9ce8c860 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC controller attribute components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Attributes - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj index a625af0a9..194c7dec2 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC controller view action result components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj index eaa97070a..171f66ade 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC controller view assertion methods. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Views - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj b/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj index bf16ad128..dfb788a24 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC controller components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj b/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj index 4562e54f8..d16c15152 100644 --- a/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj +++ b/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC core components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Core - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj b/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj index c13c253a1..b96b83738 100644 --- a/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC data annotations components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.DataAnnotations - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj b/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj index 031587141..b8c402fe0 100644 --- a/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj +++ b/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC dependency injection components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.DependencyInjection - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj index cab5a3a6d..f32455e88 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC Entity Framework Core components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.EntityFrameworkCore - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj b/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj index 4745c661f..666bd75d2 100644 --- a/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj +++ b/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC helper components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Helpers - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj b/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj index adbc49202..538508590 100644 --- a/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj +++ b/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC HTTP components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Http - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj index 598fb4f7e..85bf19483 100644 --- a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj +++ b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC licensing components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Licensing - 5.0.0 + 6.0.0 Ivaylo Kenov - netstandard2.1 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj b/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj index ae317ba44..007011f83 100644 --- a/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj +++ b/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Lite - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj b/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj index 6fff6fa6e..397cb3d39 100644 --- a/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj +++ b/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC model state components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ModelState - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj b/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj index f3de73b12..3154a2668 100644 --- a/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj +++ b/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC model components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Models - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj b/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj index 525287eff..58ce21732 100644 --- a/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj +++ b/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC configuration options components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Options - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj b/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj index b36d65d03..2ed72726e 100644 --- a/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj +++ b/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC pipeline components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Pipeline - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj b/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj index 293619f5f..2f82f0b96 100644 --- a/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj +++ b/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC routing components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Routing - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj b/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj index 1db2eacaa..24a40e048 100644 --- a/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj +++ b/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC session middleware components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Session - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj b/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj index 461809974..41419a562 100644 --- a/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj +++ b/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC temporary data components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.TempData - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj b/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj index 73e57a7e6..8e8ecc3d5 100644 --- a/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj +++ b/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.Universe - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj index 8f69b34ab..dafd8c047 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC view component attribute assertion methods. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents.Attributes - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj index f82953c75..6b1c707e3 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC view component result assertion methods. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents.Results - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj index 2397bd89c..065b6b377 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC view components assertion methods. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj b/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj index bbafc9c53..bc58cb83a 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC view data components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewData - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj b/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj index f21f12542..2955e93e4 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC view features components. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewFeatures - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj b/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj index b437766d9..358904e3a 100644 --- a/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj +++ b/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj @@ -4,9 +4,9 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. 2015-2021 Ivaylo Kenov MyTested.AspNetCore.Mvc - 5.0.0 + 6.0.0 Ivaylo Kenov - net5.0 + net6.0 $(NoWarn);CS1591 true true diff --git a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj index 027d46d7a..492655a5f 100644 --- a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj b/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj index 8053abb3e..5355bfaa6 100644 --- a/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj b/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj index 45c9fc022..d9fd2b1f1 100644 --- a/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj b/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj index d10610647..1d8dfd6e0 100644 --- a/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj index f10f6a66b..f7f37d781 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj index 21179a262..dbffb9acf 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj index 67da9ee9a..f98c35ff5 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj index e532d39cb..c078690d0 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj index 894255a73..e0855db55 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk true diff --git a/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj b/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj index 9e4998caf..2ef6a9e36 100644 --- a/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj b/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj index 8303eff18..0a1a5b6ca 100644 --- a/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj index 22c7f72a1..1b6836c1e 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj b/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj index cdefb6702..689d08f13 100644 --- a/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj b/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj index c0e862461..6db2a7d31 100644 --- a/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj b/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj index 0df0fa60c..36ac82c8a 100644 --- a/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true true MyTested.AspNetCore.Mvc.Licensing.Test diff --git a/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj b/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj index f7107f453..bab2aaa80 100644 --- a/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj b/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj index 2cf2d64a3..cf68fc106 100644 --- a/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj b/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj index 9051e335f..de45aa57c 100644 --- a/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj index 60d52a21c..89184d280 100644 --- a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj b/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj index 4ae949e0b..be92f4a90 100644 --- a/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj b/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj index e880d3599..0124c66d2 100644 --- a/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj index a3fb3dcbb..03bbdbc7c 100644 --- a/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj b/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj index de6afd8a9..00e81cfe9 100644 --- a/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj b/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj index 5332aa9d3..a98694a7c 100644 --- a/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj b/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj index 6949c3ea6..5993c7670 100644 --- a/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj b/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj index 80634845f..17761cc5a 100644 --- a/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj +++ b/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 MyTested.AspNetCore.Mvc.Test.Setups true ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj b/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj index 027cdbd54..c3fadb896 100644 --- a/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj b/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj index 6ee629426..30793348c 100644 --- a/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj b/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj index acf5f92cf..a3c0c8a99 100644 --- a/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj index d411940d3..ad32f20b0 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj index a6bd656fd..618bcb783 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj index b236b3c20..9bf48aa72 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj index ddc521d61..f5652932b 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk diff --git a/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj index daa824f34..276ed6858 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 true MyTested.AspNetCore.Mvc.Test ../../tools/Key.snk From 8c8ed958e5695bb0e8683ac1c8ffb3b8e8c504ed Mon Sep 17 00:00:00 2001 From: Kalin Tsenkov Date: Fri, 11 Mar 2022 13:59:57 +0200 Subject: [PATCH 14/19] Updated all packages to their latest stable version and improved NewtonsoftJsonOutputFormatter constructor --- ...ested.AspNetCore.Mvc.NewtonsoftJson.csproj | 2 +- ...etCore.Mvc.Razor.RuntimeCompilation.csproj | 2 +- .../ApplicationParts.Controllers.csproj | 2 +- .../ApplicationParts.Models.csproj | 2 +- .../ApplicationParts.Test.csproj | 4 ++-- .../ApplicationParts.Web.csproj | 20 +++++++++---------- .../Autofac.AssemblyInit.Test.csproj | 6 +++--- .../Autofac.NoContainerBuilder.Test.csproj | 2 +- .../Autofac.NoContainerBuilder.Web.csproj | 2 +- .../Autofac/Autofac.Test/Autofac.Test.csproj | 2 +- .../Autofac/Autofac.Web/Autofac.Web.csproj | 2 +- samples/Blog/Blog.Data/Blog.Data.csproj | 4 ++-- .../Blog/Blog.Services/Blog.Services.csproj | 2 +- samples/Blog/Blog.Test/Blog.Test.csproj | 4 ++-- samples/Blog/Blog.Web/Blog.Web.csproj | 10 +++++----- .../Common/AdditionalEntryPoint.csproj | 2 +- .../Test.DifferentEnvironment.csproj | 2 +- .../Test.ExplicitNoStartupType.csproj | 2 +- .../Test.MissingStartupType.csproj | 2 +- .../Test.MultipleEntryPoints.csproj | 2 +- .../Test.NoAsync/Test.NoAsync.csproj | 2 +- .../Test.NoStartupType.csproj | 2 +- .../Test.WrongStartupType.csproj | 2 +- .../Test.WrongTestAssembly.csproj | 2 +- .../Test.WrongWebAssembly.csproj | 2 +- samples/Lite/Lite.Test/Lite.Test.csproj | 4 ++-- samples/Lite/Lite.Web/Lite.Web.csproj | 14 ++++++------- .../MusicStore.Test/MusicStore.Test.csproj | 2 +- .../MusicStore.Web/MusicStore.Web.csproj | 18 ++++++++--------- .../NoStartup.Test/NoStartup.Test.csproj | 6 +++--- .../WebStartup.Test/WebStartup.Test.csproj | 2 +- ...yTested.AspNetCore.Mvc.Abstractions.csproj | 6 +++--- .../MyTested.AspNetCore.Mvc.Caching.csproj | 2 +- ...Tested.AspNetCore.Mvc.Configuration.csproj | 4 ++-- ....AspNetCore.Mvc.EntityFrameworkCore.csproj | 4 ++-- ...ed.AspNetCore.Mvc.Abstractions.Test.csproj | 2 +- ....AspNetCore.Mvc.Authentication.Test.csproj | 2 +- ...yTested.AspNetCore.Mvc.Caching.Test.csproj | 2 +- ...d.AspNetCore.Mvc.Configuration.Test.csproj | 2 +- ....Mvc.Controllers.ActionResults.Test.csproj | 2 +- ...ore.Mvc.Controllers.Attributes.Test.csproj | 2 +- ...ted.AspNetCore.Mvc.Controllers.Test.csproj | 2 +- ...ontrollers.Views.ActionResults.Test.csproj | 2 +- ...pNetCore.Mvc.Controllers.Views.Test.csproj | 2 +- ...AspNetCore.Mvc.DataAnnotations.Test.csproj | 2 +- ...etCore.Mvc.DependencyInjection.Test.csproj | 2 +- ...etCore.Mvc.EntityFrameworkCore.Test.csproj | 4 ++-- ...yTested.AspNetCore.Mvc.Helpers.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Http.Test.csproj | 2 +- ...ested.AspNetCore.Mvc.Licensing.Test.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Lite.Test.csproj | 2 +- ...sted.AspNetCore.Mvc.ModelState.Test.csproj | 2 +- ...MyTested.AspNetCore.Mvc.Models.Test.csproj | 2 +- ....AspNetCore.Mvc.NewtonsoftJson.Test.csproj | 2 +- ...yTested.AspNetCore.Mvc.Options.Test.csproj | 4 ++-- ...Tested.AspNetCore.Mvc.Pipeline.Test.csproj | 2 +- ...e.Mvc.Razor.RuntimeCompilation.Test.csproj | 2 +- ...yTested.AspNetCore.Mvc.Routing.Test.csproj | 2 +- ...yTested.AspNetCore.Mvc.Session.Test.csproj | 2 +- ...Tested.AspNetCore.Mvc.TempData.Test.csproj | 2 +- ...MyTested.AspNetCore.Mvc.Test.Setups.csproj | 2 +- .../TestObjectFactory.cs | 3 ++- .../MyTested.AspNetCore.Mvc.Test.csproj | 2 +- ...Tested.AspNetCore.Mvc.Universe.Test.csproj | 4 ++-- ...sted.AspNetCore.Mvc.Versioning.Test.csproj | 2 +- ....Mvc.ViewComponents.Attributes.Test.csproj | 2 +- ...ore.Mvc.ViewComponents.Results.Test.csproj | 2 +- ....AspNetCore.Mvc.ViewComponents.Test.csproj | 2 +- ...Tested.AspNetCore.Mvc.ViewData.Test.csproj | 2 +- ...ed.AspNetCore.Mvc.ViewFeatures.Test.csproj | 2 +- 70 files changed, 113 insertions(+), 112 deletions(-) diff --git a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj index dfdccc557..8fa7002c4 100644 --- a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj @@ -29,7 +29,7 @@ - + diff --git a/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj index 40f123cf3..5ee5ca1f4 100644 --- a/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj @@ -29,7 +29,7 @@ - + diff --git a/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj b/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj index d525c94ac..6db75368d 100644 --- a/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj +++ b/samples/ApplicationParts/ApplicationParts.Controllers/ApplicationParts.Controllers.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj b/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj index 48b014074..299297dbb 100644 --- a/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj +++ b/samples/ApplicationParts/ApplicationParts.Models/ApplicationParts.Models.csproj @@ -16,7 +16,7 @@ - + diff --git a/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj b/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj index b5a927e4b..a43174241 100644 --- a/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj +++ b/samples/ApplicationParts/ApplicationParts.Test/ApplicationParts.Test.csproj @@ -15,9 +15,9 @@ - + - + diff --git a/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj b/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj index a5ea4b4c4..93599f3bf 100644 --- a/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj +++ b/samples/ApplicationParts/ApplicationParts.Web/ApplicationParts.Web.csproj @@ -18,19 +18,19 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + diff --git a/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj b/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj index 1fb2c342b..021dac762 100644 --- a/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj +++ b/samples/Autofac/Autofac.AssemblyInit.Test/Autofac.AssemblyInit.Test.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj b/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj index cf6269910..82c68eeb4 100644 --- a/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj +++ b/samples/Autofac/Autofac.NoContainerBuilder.Test/Autofac.NoContainerBuilder.Test.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj b/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj index 756cf317d..c73f78261 100644 --- a/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj +++ b/samples/Autofac/Autofac.NoContainerBuilder.Web/Autofac.NoContainerBuilder.Web.csproj @@ -8,7 +8,7 @@ - + diff --git a/samples/Autofac/Autofac.Test/Autofac.Test.csproj b/samples/Autofac/Autofac.Test/Autofac.Test.csproj index 8d8d2fc25..c071d9480 100644 --- a/samples/Autofac/Autofac.Test/Autofac.Test.csproj +++ b/samples/Autofac/Autofac.Test/Autofac.Test.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/Autofac/Autofac.Web/Autofac.Web.csproj b/samples/Autofac/Autofac.Web/Autofac.Web.csproj index 169d67ace..9871917ae 100644 --- a/samples/Autofac/Autofac.Web/Autofac.Web.csproj +++ b/samples/Autofac/Autofac.Web/Autofac.Web.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/Blog/Blog.Data/Blog.Data.csproj b/samples/Blog/Blog.Data/Blog.Data.csproj index c268ede25..edb5bf76c 100644 --- a/samples/Blog/Blog.Data/Blog.Data.csproj +++ b/samples/Blog/Blog.Data/Blog.Data.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/samples/Blog/Blog.Services/Blog.Services.csproj b/samples/Blog/Blog.Services/Blog.Services.csproj index 08d047439..02fb375e4 100644 --- a/samples/Blog/Blog.Services/Blog.Services.csproj +++ b/samples/Blog/Blog.Services/Blog.Services.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/Blog/Blog.Test/Blog.Test.csproj b/samples/Blog/Blog.Test/Blog.Test.csproj index dede65497..b1c1b4e0f 100644 --- a/samples/Blog/Blog.Test/Blog.Test.csproj +++ b/samples/Blog/Blog.Test/Blog.Test.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/samples/Blog/Blog.Web/Blog.Web.csproj b/samples/Blog/Blog.Web/Blog.Web.csproj index 6483661d8..ec2e4882f 100644 --- a/samples/Blog/Blog.Web/Blog.Web.csproj +++ b/samples/Blog/Blog.Web/Blog.Web.csproj @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/samples/Configuration/Common/AdditionalEntryPoint.csproj b/samples/Configuration/Common/AdditionalEntryPoint.csproj index 75c73ecc3..22e7e8d10 100644 --- a/samples/Configuration/Common/AdditionalEntryPoint.csproj +++ b/samples/Configuration/Common/AdditionalEntryPoint.csproj @@ -8,7 +8,7 @@ - + all diff --git a/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj b/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj index feae46f25..d63fdd552 100644 --- a/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj +++ b/samples/Configuration/Test.DifferentEnvironment/Test.DifferentEnvironment.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj b/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj index 34d1e1edd..88c2e9465 100644 --- a/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj +++ b/samples/Configuration/Test.ExplicitNoStartupType/Test.ExplicitNoStartupType.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj b/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj index 40e7013c1..ac1867f74 100644 --- a/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj +++ b/samples/Configuration/Test.MissingStartupType/Test.MissingStartupType.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj b/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj index 19a98437f..3202e145a 100644 --- a/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj +++ b/samples/Configuration/Test.MultipleEntryPoints/Test.MultipleEntryPoints.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj b/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj index ee52a079c..7ef141cbc 100644 --- a/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj +++ b/samples/Configuration/Test.NoAsync/Test.NoAsync.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj b/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj index 34d1e1edd..88c2e9465 100644 --- a/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj +++ b/samples/Configuration/Test.NoStartupType/Test.NoStartupType.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj b/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj index 34d1e1edd..88c2e9465 100644 --- a/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj +++ b/samples/Configuration/Test.WrongStartupType/Test.WrongStartupType.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj b/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj index 34d1e1edd..88c2e9465 100644 --- a/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj +++ b/samples/Configuration/Test.WrongTestAssembly/Test.WrongTestAssembly.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj b/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj index 34d1e1edd..88c2e9465 100644 --- a/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj +++ b/samples/Configuration/Test.WrongWebAssembly/Test.WrongWebAssembly.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/Lite/Lite.Test/Lite.Test.csproj b/samples/Lite/Lite.Test/Lite.Test.csproj index 9dce271cc..a54b37788 100644 --- a/samples/Lite/Lite.Test/Lite.Test.csproj +++ b/samples/Lite/Lite.Test/Lite.Test.csproj @@ -11,13 +11,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/samples/Lite/Lite.Web/Lite.Web.csproj b/samples/Lite/Lite.Web/Lite.Web.csproj index 432c7b86b..9a79b8ce2 100644 --- a/samples/Lite/Lite.Web/Lite.Web.csproj +++ b/samples/Lite/Lite.Web/Lite.Web.csproj @@ -6,13 +6,13 @@ - - - - - - - + + + + + + + diff --git a/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj b/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj index bf64cd6af..c25cbb405 100644 --- a/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj +++ b/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj @@ -6,7 +6,7 @@ - + all diff --git a/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj b/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj index cf0b45f6a..3653fea1a 100644 --- a/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj +++ b/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj b/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj index b3d5ec55c..a81a93c6e 100644 --- a/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj +++ b/samples/NoStartup/NoStartup.Test/NoStartup.Test.csproj @@ -24,9 +24,9 @@ - - - + + + \ No newline at end of file diff --git a/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj b/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj index 674463030..35fb314f3 100644 --- a/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj +++ b/samples/WebStartup/WebStartup.Test/WebStartup.Test.csproj @@ -6,7 +6,7 @@ - + all diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj index 8bb94bc89..0ab073082 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj @@ -35,9 +35,9 @@ - - - + + + diff --git a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj index 189e422af..8d2fefeff 100644 --- a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj +++ b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj index c54747fe6..af311d7d4 100644 --- a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj +++ b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj index f32455e88..6bdbf503a 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj @@ -33,8 +33,8 @@ - - + + diff --git a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj index 492655a5f..fc27b9a39 100644 --- a/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Abstractions.Test/MyTested.AspNetCore.Mvc.Abstractions.Test.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj b/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj index 5355bfaa6..d325354d0 100644 --- a/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Authentication.Test/MyTested.AspNetCore.Mvc.Authentication.Test.csproj @@ -28,7 +28,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj b/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj index d9fd2b1f1..5fa17c92c 100644 --- a/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Caching.Test/MyTested.AspNetCore.Mvc.Caching.Test.csproj @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj b/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj index 1d8dfd6e0..8b1f20afc 100644 --- a/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Configuration.Test/MyTested.AspNetCore.Mvc.Configuration.Test.csproj @@ -19,7 +19,7 @@ - + all diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj index f7f37d781..40d82015b 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test.csproj @@ -27,7 +27,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj index dbffb9acf..fee32ba7f 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test/MyTested.AspNetCore.Mvc.Controllers.Attributes.Test.csproj @@ -15,7 +15,7 @@ - + all diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj index f98c35ff5..8be96d3fb 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Test/MyTested.AspNetCore.Mvc.Controllers.Test.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj index c078690d0..b6090421b 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj @@ -27,7 +27,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj index e0855db55..c806a2f7e 100644 --- a/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/MyTested.AspNetCore.Mvc.Controllers.Views.Test.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj b/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj index 2ef6a9e36..774567b0f 100644 --- a/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.DataAnnotations.Test/MyTested.AspNetCore.Mvc.DataAnnotations.Test.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj b/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj index 0a1a5b6ca..92e277ca3 100644 --- a/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.DependencyInjection.Test/MyTested.AspNetCore.Mvc.DependencyInjection.Test.csproj @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj index 1b6836c1e..9e28b2ab7 100644 --- a/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test.csproj @@ -29,13 +29,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj b/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj index 689d08f13..17bf9a929 100644 --- a/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Helpers.Test/MyTested.AspNetCore.Mvc.Helpers.Test.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj b/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj index 6db2a7d31..f573b8c7a 100644 --- a/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Http.Test/MyTested.AspNetCore.Mvc.Http.Test.csproj @@ -28,7 +28,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj b/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj index 36ac82c8a..c7bae0f70 100644 --- a/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Licensing.Test/MyTested.AspNetCore.Mvc.Licensing.Test.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj b/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj index bab2aaa80..369dcbaed 100644 --- a/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Lite.Test/MyTested.AspNetCore.Mvc.Lite.Test.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj b/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj index cf68fc106..c9f5f4e46 100644 --- a/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ModelState.Test/MyTested.AspNetCore.Mvc.ModelState.Test.csproj @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj b/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj index de45aa57c..a32b249be 100644 --- a/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Models.Test/MyTested.AspNetCore.Mvc.Models.Test.csproj @@ -27,7 +27,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj index 89184d280..c531ad3a9 100644 --- a/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test/MyTested.AspNetCore.Mvc.NewtonsoftJson.Test.csproj @@ -27,7 +27,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj b/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj index be92f4a90..7da00def4 100644 --- a/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Options.Test/MyTested.AspNetCore.Mvc.Options.Test.csproj @@ -28,13 +28,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj b/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj index 0124c66d2..309ec0c19 100644 --- a/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Pipeline.Test/MyTested.AspNetCore.Mvc.Pipeline.Test.csproj @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj index 03bbdbc7c..02a9d323b 100644 --- a/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj @@ -22,7 +22,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj b/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj index 00e81cfe9..611eb5e23 100644 --- a/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Routing.Test/MyTested.AspNetCore.Mvc.Routing.Test.csproj @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj b/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj index a98694a7c..adb59a0cd 100644 --- a/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Session.Test/MyTested.AspNetCore.Mvc.Session.Test.csproj @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj b/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj index 5993c7670..76aaa883b 100644 --- a/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.TempData.Test/MyTested.AspNetCore.Mvc.TempData.Test.csproj @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj b/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj index 17761cc5a..6647ac053 100644 --- a/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj +++ b/test/MyTested.AspNetCore.Mvc.Test.Setups/MyTested.AspNetCore.Mvc.Test.Setups.csproj @@ -18,7 +18,7 @@ - + diff --git a/test/MyTested.AspNetCore.Mvc.Test.Setups/TestObjectFactory.cs b/test/MyTested.AspNetCore.Mvc.Test.Setups/TestObjectFactory.cs index c92ba519e..d2057789d 100644 --- a/test/MyTested.AspNetCore.Mvc.Test.Setups/TestObjectFactory.cs +++ b/test/MyTested.AspNetCore.Mvc.Test.Setups/TestObjectFactory.cs @@ -108,7 +108,8 @@ public static void SetCustomHttpResponseProperties(HttpResponse response) public static IOutputFormatter GetOutputFormatter() => new NewtonsoftJsonOutputFormatter( GetJsonSerializerSettings(), ArrayPool.Create(), - new MvcOptions()); + new MvcOptions(), + new MvcNewtonsoftJsonOptions()); public static Uri GetUri() => new Uri("http://somehost.com/someuri/1?query=Test"); diff --git a/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj b/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj index c3fadb896..a30699ae2 100644 --- a/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Test/MyTested.AspNetCore.Mvc.Test.csproj @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj b/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj index 30793348c..9b9fe1f80 100644 --- a/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Universe.Test/MyTested.AspNetCore.Mvc.Universe.Test.csproj @@ -26,13 +26,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj b/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj index a3c0c8a99..e91b7f960 100644 --- a/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.Versioning.Test/MyTested.AspNetCore.Mvc.Versioning.Test.csproj @@ -23,7 +23,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj index ad32f20b0..ed8d05419 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.Test.csproj @@ -26,7 +26,7 @@ - + all diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj index 618bcb783..b05f7ba64 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test/MyTested.AspNetCore.Mvc.ViewComponents.Results.Test.csproj @@ -27,7 +27,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj index 9bf48aa72..90a3fe80b 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewComponents.Test/MyTested.AspNetCore.Mvc.ViewComponents.Test.csproj @@ -27,7 +27,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj index f5652932b..44ff4c63a 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewData.Test/MyTested.AspNetCore.Mvc.ViewData.Test.csproj @@ -28,7 +28,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj b/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj index 276ed6858..025fcdf3f 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj +++ b/test/MyTested.AspNetCore.Mvc.ViewFeatures.Test/MyTested.AspNetCore.Mvc.ViewFeatures.Test.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 7b09040193acd43a6695a31be430f561e51fb2a3 Mon Sep 17 00:00:00 2001 From: Kalin Tsenkov Date: Fri, 11 Mar 2022 14:06:52 +0200 Subject: [PATCH 15/19] Updated version prefix to 6.0 --- .../Internal/TestFramework.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs index 4be7725af..3b24279f4 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs @@ -7,8 +7,8 @@ public static class TestFramework { public const string TestFrameworkName = "MyTested.AspNetCore.Mvc"; - public const string ReleaseDate = "2021-07-01"; - public const string VersionPrefix = "5.0"; + public const string ReleaseDate = "2022-03-11"; + public const string VersionPrefix = "6.0"; internal static void EnsureCorrectVersion(DependencyContext dependencyContext) { From 7427dcd174ddb5329fdc5519a77adfcf53801923 Mon Sep 17 00:00:00 2001 From: Kalin Tsenkov Date: Wed, 28 Dec 2022 09:58:09 +0200 Subject: [PATCH 16/19] Changed from OptionsManager<> to the new UnnamedOptionsManager<> --- .../Internal/Server/TestWebServer.cs | 3 ++- .../Internal/TestFramework.cs | 2 +- .../ServiceCollectionEntityFrameworkCoreExtensions.cs | 5 +++-- .../Plugins/OptionsTestPlugin.cs | 9 +++++---- .../PluginsTests/ViewDataTestPluginTests.cs | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Server/TestWebServer.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Server/TestWebServer.cs index 472cbdd3f..bf208797a 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Server/TestWebServer.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/Server/TestWebServer.cs @@ -20,7 +20,8 @@ private static IWebHostEnvironment PrepareEnvironment() ApplicationName = ApplicationName, EnvironmentName = ServerTestConfiguration.General.EnvironmentName, ContentRootPath = AppContext.BaseDirectory, - WebRootFileProvider = new NullFileProvider() + WebRootFileProvider = new NullFileProvider(), + ContentRootFileProvider = new NullFileProvider() }; internal static void ResetConfigurationAndAssemblies() diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs index 3b24279f4..4f194b224 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestFramework.cs @@ -7,7 +7,7 @@ public static class TestFramework { public const string TestFrameworkName = "MyTested.AspNetCore.Mvc"; - public const string ReleaseDate = "2022-03-11"; + public const string ReleaseDate = "2022-12-28"; public const string VersionPrefix = "6.0"; internal static void EnsureCorrectVersion(DependencyContext dependencyContext) diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/ServiceCollectionEntityFrameworkCoreExtensions.cs b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/ServiceCollectionEntityFrameworkCoreExtensions.cs index 30f249eed..446bc97ab 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/ServiceCollectionEntityFrameworkCoreExtensions.cs +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/ServiceCollectionEntityFrameworkCoreExtensions.cs @@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.DependencyInjection; + using Microsoft.Extensions.DependencyInjection.Extensions; using Utilities.Extensions; /// @@ -62,7 +63,7 @@ public static IServiceCollection ReplaceDbContext(this IServiceCollection servic .MakeGenericMethod(existingDbContextService.ServiceType, existingDbContextService.ImplementationType) .Invoke(null, new object[] { serviceCollection }); }); - + TestServiceProvider.SaveServiceLifetime(BaseDbContextType, ServiceLifetime.Scoped); return serviceCollection; @@ -75,7 +76,7 @@ private static void AddScopedDatabase s.GetRequiredService() as TDbContextImplementation); + serviceCollection.TryAddScoped(s => s.GetRequiredService() as TDbContextImplementation); TestServiceProvider.SaveServiceLifetime(ServiceLifetime.Scoped); } diff --git a/src/MyTested.AspNetCore.Mvc.Options/Plugins/OptionsTestPlugin.cs b/src/MyTested.AspNetCore.Mvc.Options/Plugins/OptionsTestPlugin.cs index a48f6b4d9..bfd85e93e 100644 --- a/src/MyTested.AspNetCore.Mvc.Options/Plugins/OptionsTestPlugin.cs +++ b/src/MyTested.AspNetCore.Mvc.Options/Plugins/OptionsTestPlugin.cs @@ -6,15 +6,16 @@ public class OptionsTestPlugin : IServiceRegistrationPlugin { + private const string DefaultOptionsImplementationTypeFullName = "Microsoft.Extensions.Options.UnnamedOptionsManager`1"; + private readonly Type defaultOptionsServiceType = typeof(IOptions<>); - private readonly Type defaultOptionsImplementationType = typeof(OptionsManager<>); - + public Func ServiceSelectorPredicate => serviceDescriptor => serviceDescriptor.ServiceType == this.defaultOptionsServiceType && - serviceDescriptor.ImplementationType == this.defaultOptionsImplementationType; + serviceDescriptor.ImplementationType?.FullName == DefaultOptionsImplementationTypeFullName; - public Action ServiceRegistrationDelegate + public Action ServiceRegistrationDelegate => serviceCollection => serviceCollection.ReplaceOptions(); } } diff --git a/test/MyTested.AspNetCore.Mvc.ViewData.Test/PluginsTests/ViewDataTestPluginTests.cs b/test/MyTested.AspNetCore.Mvc.ViewData.Test/PluginsTests/ViewDataTestPluginTests.cs index 1cc72eddb..2bf1f7f26 100644 --- a/test/MyTested.AspNetCore.Mvc.ViewData.Test/PluginsTests/ViewDataTestPluginTests.cs +++ b/test/MyTested.AspNetCore.Mvc.ViewData.Test/PluginsTests/ViewDataTestPluginTests.cs @@ -33,7 +33,7 @@ public void ShouldInvokeMethodOfTypeVoidWithValidServiceCollection() testPlugin.DefaultServiceRegistrationDelegate(serviceCollection); - Assert.True(serviceCollection.Count == 160); + Assert.True(serviceCollection.Count == 165); } } } From d72c1335298d10b0ed5ce0ac0cf6818294bcdfdb Mon Sep 17 00:00:00 2001 From: Kalin Tsenkov Date: Wed, 28 Dec 2022 10:00:48 +0200 Subject: [PATCH 17/19] Changed copyright year --- LICENSE | 2 +- .../MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Versioning.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Abstractions.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Authentication.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Caching.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Configuration.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj | 2 +- ...Tested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Controllers.Views.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Controllers.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Core.csproj | 2 +- .../MyTested.AspNetCore.Mvc.DataAnnotations.csproj | 2 +- .../MyTested.AspNetCore.Mvc.DependencyInjection.csproj | 2 +- .../MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Helpers.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Http.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Licensing.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Lite.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ModelState.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Models.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Options.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Pipeline.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Routing.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Session.csproj | 2 +- .../MyTested.AspNetCore.Mvc.TempData.csproj | 2 +- .../MyTested.AspNetCore.Mvc.Universe.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewComponents.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewData.csproj | 2 +- .../MyTested.AspNetCore.Mvc.ViewFeatures.csproj | 2 +- src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/LICENSE b/LICENSE index 84c95cdab..8a290fe53 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ MyTested.AspNetCore.Mvc -Code by Ivaylo Kenov. Copyright (c) 2015-2021 Ivaylo Kenov. +Code by Ivaylo Kenov. Copyright (c) 2015-2022 Ivaylo Kenov. =============================================================================== This program is free software: you can redistribute it and/or modify it diff --git a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj index 8fa7002c4..16ee2389c 100644 --- a/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.NewtonsoftJson/MyTested.AspNetCore.Mvc.NewtonsoftJson.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC Newtonsoft JSON components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.NewtonsoftJson 6.0.0 Ivaylo Kenov diff --git a/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj index 5ee5ca1f4..2db7d6949 100644 --- a/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation/MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC razor runtime compilation components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Razor.RuntimeCompilation 6.0.0 Ivaylo Kenov diff --git a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj index 95f981935..5be86dda2 100644 --- a/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj +++ b/plugins/MyTested.AspNetCore.Mvc.Versioning/MyTested.AspNetCore.Mvc.Versioning.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC versioning components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Versioning 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj index 0ab073082..5688661c5 100644 --- a/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj +++ b/src/MyTested.AspNetCore.Mvc.Abstractions/MyTested.AspNetCore.Mvc.Abstractions.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC common abstractions and interfaces. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Abstractions 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj b/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj index 3b8ecbf93..523b76aa4 100644 --- a/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj +++ b/src/MyTested.AspNetCore.Mvc.Authentication/MyTested.AspNetCore.Mvc.Authentication.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC authentication components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Authentication 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj index 8d2fefeff..8b21fd262 100644 --- a/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj +++ b/src/MyTested.AspNetCore.Mvc.Caching/MyTested.AspNetCore.Mvc.Caching.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC caching components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Caching 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj index af311d7d4..fbc120481 100644 --- a/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj +++ b/src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC configuration components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Configuration 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj index adeeab2ea..ce5633bcf 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.ActionResults/MyTested.AspNetCore.Mvc.Controllers.ActionResults.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC controller action result components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.ActionResults 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj index e9ce8c860..d23910ea4 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Attributes/MyTested.AspNetCore.Mvc.Controllers.Attributes.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC controller attribute components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Attributes 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj index 194c7dec2..4e5343c84 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC controller view action result components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj b/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj index 171f66ade..ecca9bc60 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers.Views/MyTested.AspNetCore.Mvc.Controllers.Views.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC controller view assertion methods. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers.Views 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj b/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj index dfb788a24..3dde510b3 100644 --- a/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj +++ b/src/MyTested.AspNetCore.Mvc.Controllers/MyTested.AspNetCore.Mvc.Controllers.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC controller components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Controllers 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj b/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj index d16c15152..b1bff3b03 100644 --- a/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj +++ b/src/MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC core components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Core 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj b/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj index b96b83738..e235c85dd 100644 --- a/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/MyTested.AspNetCore.Mvc.DataAnnotations/MyTested.AspNetCore.Mvc.DataAnnotations.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC data annotations components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.DataAnnotations 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj b/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj index b8c402fe0..d99ee37ff 100644 --- a/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj +++ b/src/MyTested.AspNetCore.Mvc.DependencyInjection/MyTested.AspNetCore.Mvc.DependencyInjection.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC dependency injection components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.DependencyInjection 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj index 6bdbf503a..7e577f528 100644 --- a/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj +++ b/src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/MyTested.AspNetCore.Mvc.EntityFrameworkCore.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC Entity Framework Core components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.EntityFrameworkCore 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj b/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj index 666bd75d2..93adfdc4c 100644 --- a/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj +++ b/src/MyTested.AspNetCore.Mvc.Helpers/MyTested.AspNetCore.Mvc.Helpers.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC helper components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Helpers 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj b/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj index 538508590..232234e82 100644 --- a/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj +++ b/src/MyTested.AspNetCore.Mvc.Http/MyTested.AspNetCore.Mvc.Http.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC HTTP components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Http 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj index 85bf19483..936f45a97 100644 --- a/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj +++ b/src/MyTested.AspNetCore.Mvc.Licensing/MyTested.AspNetCore.Mvc.Licensing.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC licensing components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Licensing 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj b/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj index 007011f83..7e135045d 100644 --- a/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj +++ b/src/MyTested.AspNetCore.Mvc.Lite/MyTested.AspNetCore.Mvc.Lite.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Lite 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj b/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj index 397cb3d39..2db8f408a 100644 --- a/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj +++ b/src/MyTested.AspNetCore.Mvc.ModelState/MyTested.AspNetCore.Mvc.ModelState.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC model state components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.ModelState 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj b/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj index 3154a2668..56ce03416 100644 --- a/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj +++ b/src/MyTested.AspNetCore.Mvc.Models/MyTested.AspNetCore.Mvc.Models.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC model components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Models 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj b/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj index 58ce21732..0a808c155 100644 --- a/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj +++ b/src/MyTested.AspNetCore.Mvc.Options/MyTested.AspNetCore.Mvc.Options.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC configuration options components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Options 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj b/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj index 2ed72726e..c47a920f1 100644 --- a/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj +++ b/src/MyTested.AspNetCore.Mvc.Pipeline/MyTested.AspNetCore.Mvc.Pipeline.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC pipeline components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Pipeline 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj b/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj index 2f82f0b96..0632f2a8d 100644 --- a/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj +++ b/src/MyTested.AspNetCore.Mvc.Routing/MyTested.AspNetCore.Mvc.Routing.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC routing components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Routing 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj b/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj index 24a40e048..b3755c45a 100644 --- a/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj +++ b/src/MyTested.AspNetCore.Mvc.Session/MyTested.AspNetCore.Mvc.Session.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC session middleware components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Session 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj b/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj index 41419a562..703940153 100644 --- a/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj +++ b/src/MyTested.AspNetCore.Mvc.TempData/MyTested.AspNetCore.Mvc.TempData.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC temporary data components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.TempData 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj b/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj index 8e8ecc3d5..f504f00c5 100644 --- a/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj +++ b/src/MyTested.AspNetCore.Mvc.Universe/MyTested.AspNetCore.Mvc.Universe.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.Universe 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj index dafd8c047..90d7def14 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents.Attributes/MyTested.AspNetCore.Mvc.ViewComponents.Attributes.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC view component attribute assertion methods. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents.Attributes 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj index 6b1c707e3..41e23de6a 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents.Results/MyTested.AspNetCore.Mvc.ViewComponents.Results.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC view component result assertion methods. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents.Results 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj b/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj index 065b6b377..65abe6aac 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewComponents/MyTested.AspNetCore.Mvc.ViewComponents.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC view components assertion methods. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewComponents 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj b/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj index bc58cb83a..44a283733 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewData/MyTested.AspNetCore.Mvc.ViewData.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC view data components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewData 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj b/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj index 2955e93e4..e7ad356d8 100644 --- a/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/MyTested.AspNetCore.Mvc.ViewFeatures/MyTested.AspNetCore.Mvc.ViewFeatures.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC view features components. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc.ViewFeatures 6.0.0 Ivaylo Kenov diff --git a/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj b/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj index 358904e3a..ec326fbef 100644 --- a/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj +++ b/src/MyTested.AspNetCore.Mvc/MyTested.AspNetCore.Mvc.csproj @@ -2,7 +2,7 @@ My Tested ASP.NET Core MVC is a powerful testing library providing easy fluent interface to test the ASP.NET Core MVC framework. - 2015-2021 Ivaylo Kenov + 2015-2022 Ivaylo Kenov MyTested.AspNetCore.Mvc 6.0.0 Ivaylo Kenov From 7a08270300f123c05331caad0eb08aa6ea58bc6e Mon Sep 17 00:00:00 2001 From: Kalin Tsenkov Date: Wed, 28 Dec 2022 11:24:36 +0200 Subject: [PATCH 18/19] Updated .appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index b3a269bdb..09ea8d934 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,7 +4,7 @@ branches: - master - development - ^version-.*$ -image: Visual Studio 2019 +image: Visual Studio 2022 configuration: Release clone_depth: 1 before_build: From ec7c0bc2317466554d702282c72c6833cb9c5de6 Mon Sep 17 00:00:00 2001 From: Kalin Tsenkov Date: Wed, 28 Dec 2022 11:43:11 +0200 Subject: [PATCH 19/19] Updated .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97c60fd8c..ade94073d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,20 +4,20 @@ git: depth: 10 group: travis_latest sudo: required -dotnet: 3.1 +dotnet: 6.0 solution: MyTested.AspNetCore.Mvc.sln env: global: - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 - - NET_CORE_VERSION: netcoreapp3.1 + - NET_CORE_VERSION: net6.0 matrix: fast_finish: true include: - os: linux dist: xenial - os: osx - dotnet: 3.1.100 + dotnet: 6.0.101 osx_image: xcode11.2 branches: only: