Skip to content

Commit 4f3d680

Browse files
ZeegaanNikolaj Geisle
and
Nikolaj Geisle
authoredMay 6, 2022
V10: Build warnings in Web.Website (#12332)
* add new rule to globalconfig * Fix warnings in Web.Website * Fix more warnings in Web.Website * Fix more build warnings in Web.Website * Fix more warnings in Web.Website * Fix tests * Fix proper constructor call * Fix not being able to run project * Fix Obsolete method Co-authored-by: Nikolaj Geisle <[email protected]>
1 parent b648177 commit 4f3d680

File tree

47 files changed

+3304
-3226
lines changed

Some content is hidden

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

47 files changed

+3304
-3226
lines changed
 

‎.globalconfig

+3-2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ dotnet_analyzer_diagnostic.category-StyleCop.CSharp.LayoutRules.severity = sugge
5050

5151
dotnet_diagnostic.SA1636.severity = none # SA1636: File header copyright text should match
5252
dotnet_diagnostic.SA1101.severity = none # PrefixLocalCallsWithThis - stylecop appears to be ignoring dotnet_style_qualification_for_*
53+
dotnet_diagnostic.SA1309.severity = none # FieldNamesMustNotBeginWithUnderscore
5354

5455
dotnet_diagnostic.SA1503.severity = warning # BracesMustNotBeOmitted
5556
dotnet_diagnostic.SA1117.severity = warning # ParametersMustBeOnSameLineOrSeparateLines
@@ -70,13 +71,13 @@ dotnet_diagnostic.SA1132.severity = warning # DoNotCombineFields
7071
dotnet_diagnostic.SA1134.severity = warning # AttributesMustNotShareLine
7172
dotnet_diagnostic.SA1106.severity = warning # CodeMustNotContainEmptyStatements
7273
dotnet_diagnostic.SA1312.severity = warning # VariableNamesMustBeginWithLowerCaseLetter
73-
dotnet_diagnostic.SA1303.severity = warning # ConstFieldNamesMustBeginWithUpperCaseLetter
7474
dotnet_diagnostic.SA1310.severity = warning # FieldNamesMustNotContainUnderscore
75+
dotnet_diagnostic.SA1303.severity = warning # ConstFieldNamesMustBeginWithUpperCaseLetter
7576
dotnet_diagnostic.SA1130.severity = warning # UseLambdaSyntax
7677
dotnet_diagnostic.SA1405.severity = warning # DebugAssertMustProvideMessageText
7778
dotnet_diagnostic.SA1205.severity = warning # PartialElementsMustDeclareAccess
7879
dotnet_diagnostic.SA1306.severity = warning # FieldNamesMustBeginWithLowerCaseLetter
7980
dotnet_diagnostic.SA1209.severity = warning # UsingAliasDirectivesMustBePlacedAfterOtherUsingDirectives
8081
dotnet_diagnostic.SA1216.severity = warning # UsingStaticDirectivesMustBePlacedAtTheCorrectLocation
8182
dotnet_diagnostic.SA1133.severity = warning # DoNotCombineAttributes
82-
dotnet_diagnostic.SA1135.severity = warning # UsingDirectivesMustBeQualified
83+
dotnet_diagnostic.SA1135.severity = warning # UsingDirectivesMustBeQualified

‎src/Umbraco.Web.UI/Composers/ControllersAsServicesComposer.cs

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
using System;
2-
using System.Linq;
31
using Microsoft.AspNetCore.Mvc.Controllers;
4-
using Microsoft.Extensions.DependencyInjection;
52
using Microsoft.Extensions.DependencyInjection.Extensions;
3+
using Microsoft.Extensions.Options;
64
using Umbraco.Cms.Core.Composing;
5+
using Umbraco.Cms.Core.Configuration.Models;
76
using Umbraco.Cms.Core.DependencyInjection;
7+
using Umbraco.Cms.Core.Web;
8+
using Umbraco.Cms.Web.Website.Controllers;
9+
using Umbraco.Extensions;
10+
using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
811

912
namespace Umbraco.Cms.Web.UI.Composers
1013
{
@@ -55,6 +58,7 @@ public static IMvcBuilder AddControllersAsServicesWithoutChangingActivator(this
5558
builder.Services.TryAddTransient(controller, controller);
5659
}
5760

61+
builder.Services.AddUnique<RenderNoContentController>(x => new RenderNoContentController(x.GetService<IUmbracoContextAccessor>()!, x.GetService<IOptionsSnapshot<GlobalSettings>>()!, x.GetService<IHostingEnvironment>()!));
5862
return builder;
5963
}
6064
}

0 commit comments

Comments
 (0)