diff --git a/CoreWiki.Application/Articles/Managing/ArticleManagingProfile.cs b/CoreWiki.Application/Articles/Managing/ArticleManagingProfile.cs index 5a39897d..c0f706d4 100644 --- a/CoreWiki.Application/Articles/Managing/ArticleManagingProfile.cs +++ b/CoreWiki.Application/Articles/Managing/ArticleManagingProfile.cs @@ -11,23 +11,23 @@ public ArticleManagingProfile() { CreateMap() .ForMember(d => d.Id, m=> m.Ignore()) - .ForMember(d => d.Version, m => m.UseValue(1)) + .ForMember(d => d.Version, m => m.MapFrom(_ => 1)) .ForMember(d => d.Published, m => m.Ignore()) .ForMember(d => d.Comments, m => m.Ignore()) .ForMember(d => d.History, m => m.Ignore()) - .ForMember(d => d.ViewCount, m => m.UseValue(0)) + .ForMember(d => d.ViewCount, m => m.MapFrom(_ => 0)) .ForMember(d => d.Slug, m => m.Ignore()) ; CreateMap() .ForMember(d => d.Id, m => m.Ignore()) - .ForMember(d => d.Version, m => m.UseValue(1)) + .ForMember(d => d.Version, m => m.MapFrom(_ => 1)) .ForMember(d => d.Published, m => m.Ignore()) .ForMember(d => d.Comments, m => m.Ignore()) .ForMember(d => d.History, m => m.Ignore()) - .ForMember(d => d.ViewCount, m => m.UseValue(0)) + .ForMember(d => d.ViewCount, m => m.MapFrom(_ => 0)) .ForMember(d => d.Topic, m => m.MapFrom(s => Article.SlugToTopic(s.Slug))) - .ForMember(d => d.Content, m => m.UseValue("")); + .ForMember(d => d.Content, m => m.MapFrom(_ => "")); CreateMap(); } diff --git a/CoreWiki.Application/CoreWiki.Application.csproj b/CoreWiki.Application/CoreWiki.Application.csproj index 6d204ce6..bea6bf56 100644 --- a/CoreWiki.Application/CoreWiki.Application.csproj +++ b/CoreWiki.Application/CoreWiki.Application.csproj @@ -1,27 +1,21 @@  - netcoreapp2.1 + netcoreapp3.1 - - + + - - + + - - - System - - - diff --git a/CoreWiki.Core/CoreWiki.Core.csproj b/CoreWiki.Core/CoreWiki.Core.csproj index 40223dd2..d25d46e8 100644 --- a/CoreWiki.Core/CoreWiki.Core.csproj +++ b/CoreWiki.Core/CoreWiki.Core.csproj @@ -6,7 +6,7 @@ - + diff --git a/CoreWiki.Data/CoreWiki.Data.EntityFramework.csproj b/CoreWiki.Data/CoreWiki.Data.EntityFramework.csproj index 19afd7cf..d85629d6 100644 --- a/CoreWiki.Data/CoreWiki.Data.EntityFramework.csproj +++ b/CoreWiki.Data/CoreWiki.Data.EntityFramework.csproj @@ -1,17 +1,17 @@  - netcoreapp2.1 + netcoreapp3.1 true - - - - - - + + + + + + diff --git a/CoreWiki.FirstStart/CoreWiki.FirstStart.csproj b/CoreWiki.FirstStart/CoreWiki.FirstStart.csproj index 98cc3eb2..2524ec26 100644 --- a/CoreWiki.FirstStart/CoreWiki.FirstStart.csproj +++ b/CoreWiki.FirstStart/CoreWiki.FirstStart.csproj @@ -1,14 +1,13 @@  - netcoreapp2.1 + netcoreapp3.1 - - - - + + + diff --git a/CoreWiki.Notifications.Abstractions/CoreWiki.Notifications.Abstractions.csproj b/CoreWiki.Notifications.Abstractions/CoreWiki.Notifications.Abstractions.csproj index 720053a5..bfafc4e5 100644 --- a/CoreWiki.Notifications.Abstractions/CoreWiki.Notifications.Abstractions.csproj +++ b/CoreWiki.Notifications.Abstractions/CoreWiki.Notifications.Abstractions.csproj @@ -5,7 +5,7 @@ - + diff --git a/CoreWiki.Notifications/CoreWiki.Notifications.csproj b/CoreWiki.Notifications/CoreWiki.Notifications.csproj index a7dc385a..4f6faf6e 100644 --- a/CoreWiki.Notifications/CoreWiki.Notifications.csproj +++ b/CoreWiki.Notifications/CoreWiki.Notifications.csproj @@ -1,17 +1,16 @@  - netcoreapp2.1 + netcoreapp3.1 - - - - - - - + + + + + + diff --git a/CoreWiki.Test/CoreWiki.Test.csproj b/CoreWiki.Test/CoreWiki.Test.csproj index 1b815ee5..338c8d36 100644 --- a/CoreWiki.Test/CoreWiki.Test.csproj +++ b/CoreWiki.Test/CoreWiki.Test.csproj @@ -1,19 +1,22 @@  - netcoreapp2.1 + netcoreapp3.1 false - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + diff --git a/CoreWiki/Configuration/Startup/ConfigureMediator.cs b/CoreWiki/Configuration/Startup/ConfigureMediator.cs index 2fc4c3b9..ee75cbea 100644 --- a/CoreWiki/Configuration/Startup/ConfigureMediator.cs +++ b/CoreWiki/Configuration/Startup/ConfigureMediator.cs @@ -12,7 +12,7 @@ public static class ConfigureMediator { public static IServiceCollection AddMediator(this IServiceCollection services) { - services.AddMediatR(); + services.AddMediatR(System.Reflection.Assembly.GetExecutingAssembly()); return services; } } diff --git a/CoreWiki/Configuration/Startup/CoreWikiWebsiteProfile.cs b/CoreWiki/Configuration/Startup/CoreWikiWebsiteProfile.cs index 260be1db..03dcfe29 100644 --- a/CoreWiki/Configuration/Startup/CoreWikiWebsiteProfile.cs +++ b/CoreWiki/Configuration/Startup/CoreWikiWebsiteProfile.cs @@ -39,7 +39,7 @@ public CoreWikiWebsiteProfile() CreateMap(MemberList.Source) - .ForSourceMember(d => d.Slug, m => m.Ignore()); + .ForSourceMember(d => d.Slug, m => m.DoNotValidate()); CreateMap(MemberList.None) .ForMember(d => d.AuthorId, m => m.MapFrom(s => Guid.Parse(s.FindFirstValue(ClaimTypes.NameIdentifier)))) .ForMember(d => d.AuthorName, m => m.MapFrom(s => s.Identity.Name)); diff --git a/CoreWiki/CoreWiki.csproj b/CoreWiki/CoreWiki.csproj index c4f3b3db..c0d431a8 100644 --- a/CoreWiki/CoreWiki.csproj +++ b/CoreWiki/CoreWiki.csproj @@ -1,30 +1,31 @@  - netcoreapp2.1 + netcoreapp3.1 7b1e67c2-befb-4e2e-957d-603f8b2e5491 false true - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/CoreWiki/package-lock.json b/CoreWiki/package-lock.json index b1b22c87..f8ed9b4f 100644 --- a/CoreWiki/package-lock.json +++ b/CoreWiki/package-lock.json @@ -10,9 +10,9 @@ "integrity": "sha512-jt6yi7iZVtkY9Jc6zFo+G2vqL4M81pb3IA3WmnnDt9ci7Asz+mPg4gbZL8pjx0nGFBsG0Bmd7BjU9IQkebqxFA==" }, "bootstrap": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz", - "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==" + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.3.tgz", + "integrity": "sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==" } } } diff --git a/CoreWiki/package.json b/CoreWiki/package.json index 897cd532..63d8faa3 100644 --- a/CoreWiki/package.json +++ b/CoreWiki/package.json @@ -3,8 +3,8 @@ "version": "1.0.0", "description": "", "dependencies": { - "bootstrap": "^4.1.3", - "@fortawesome/fontawesome-free": "^5.2.0" + "@fortawesome/fontawesome-free": "^5.2.0", + "bootstrap": "^4.5.3" }, "devDependencies": {}, "scripts": { diff --git a/global.json b/global.json deleted file mode 100644 index 55e448df..00000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "2.1.403" - } -}