Skip to content

Commit ab87034

Browse files
nul800sebastiaannul800sebastiaan
committed
Merge branch 'v9/dev' into v9/contrib
# Conflicts: # src/Umbraco.Web.UI.Client/src/less/pages/login.less
2 parents 06f2408 + 791e4f9 commit ab87034

File tree

136 files changed

+3742
-1123
lines changed

Some content is hidden

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

136 files changed

+3742
-1123
lines changed

‎.editorconfig

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -306,48 +306,6 @@ dotnet_naming_rule.other_public_protected_fields_disallowed_rule.symbols
306306
dotnet_naming_rule.other_public_protected_fields_disallowed_rule.style = disallowed_style
307307
dotnet_naming_rule.other_public_protected_fields_disallowed_rule.severity = error
308308

309-
##########################################
310-
# StyleCop Field Naming Rules
311-
# Naming rules for fields follow the StyleCop analyzers
312-
# This does not override any rules using disallowed_style above
313-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers
314-
##########################################
315-
316-
# All constant fields must be PascalCase
317-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1303.md
318-
dotnet_naming_symbols.stylecop_constant_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected, private
319-
dotnet_naming_symbols.stylecop_constant_fields_group.required_modifiers = const
320-
dotnet_naming_symbols.stylecop_constant_fields_group.applicable_kinds = field
321-
dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.symbols = stylecop_constant_fields_group
322-
dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.style = pascal_case_style
323-
dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.severity = warning
324-
325-
# All static readonly fields must be PascalCase
326-
# Ajusted to ignore private fields.
327-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1311.md
328-
dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected
329-
dotnet_naming_symbols.stylecop_static_readonly_fields_group.required_modifiers = static, readonly
330-
dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_kinds = field
331-
dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.symbols = stylecop_static_readonly_fields_group
332-
dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.style = pascal_case_style
333-
dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.severity = warning
334-
335-
# No non-private instance fields are allowed
336-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1401.md
337-
dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected
338-
dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_kinds = field
339-
dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.symbols = stylecop_fields_must_be_private_group
340-
dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.style = disallowed_style
341-
dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.severity = error
342-
343-
# Local variables must be camelCase
344-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1312.md
345-
dotnet_naming_symbols.stylecop_local_fields_group.applicable_accessibilities = local
346-
dotnet_naming_symbols.stylecop_local_fields_group.applicable_kinds = local
347-
dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.symbols = stylecop_local_fields_group
348-
dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.style = camel_case_style
349-
dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.severity = silent
350-
351309
# This rule should never fire. However, it's included for at least two purposes:
352310
# First, it helps to understand, reason about, and root-case certain types of issues, such as bugs in .editorconfig parsers.
353311
# Second, it helps to raise immediate awareness if a new field type is added (as occurred recently in C#).
@@ -357,7 +315,6 @@ dotnet_naming_rule.sanity_check_uncovered_field_case_rule.symbols = sanity_chec
357315
dotnet_naming_rule.sanity_check_uncovered_field_case_rule.style = internal_error_style
358316
dotnet_naming_rule.sanity_check_uncovered_field_case_rule.severity = error
359317

360-
361318
##########################################
362319
# Other Naming Rules
363320
##########################################

‎.globalconfig

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
is_global = true
2+
3+
##########################################
4+
# StyleCopAnalyzers Settings
5+
##########################################
6+
7+
# All constant fields must be PascalCase
8+
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1303.md
9+
dotnet_naming_symbols.stylecop_constant_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected, private
10+
dotnet_naming_symbols.stylecop_constant_fields_group.required_modifiers = const
11+
dotnet_naming_symbols.stylecop_constant_fields_group.applicable_kinds = field
12+
dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.symbols = stylecop_constant_fields_group
13+
dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.style = pascal_case_style
14+
15+
# All static readonly fields must be PascalCase
16+
# Ajusted to ignore private fields.
17+
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1311.md
18+
dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected
19+
dotnet_naming_symbols.stylecop_static_readonly_fields_group.required_modifiers = static, readonly
20+
dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_kinds = field
21+
dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.symbols = stylecop_static_readonly_fields_group
22+
dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.style = pascal_case_style
23+
24+
# No non-private instance fields are allowed
25+
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1401.md
26+
dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected
27+
dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_kinds = field
28+
dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.symbols = stylecop_fields_must_be_private_group
29+
dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.style = disallowed_style
30+
31+
# Local variables must be camelCase
32+
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1312.md
33+
dotnet_naming_symbols.stylecop_local_fields_group.applicable_accessibilities = local
34+
dotnet_naming_symbols.stylecop_local_fields_group.applicable_kinds = local
35+
dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.symbols = stylecop_local_fields_group
36+
dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.style = camel_case_style
37+
38+
##########################################
39+
# StyleCopAnalyzers rule severity
40+
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers
41+
##########################################
42+
43+
dotnet_analyzer_diagnostic.category-StyleCop.CSharp.DocumentationRules.severity = suggestion
44+
dotnet_analyzer_diagnostic.category-StyleCop.CSharp.ReadabilityRules.severity = suggestion
45+
dotnet_analyzer_diagnostic.category-StyleCop.CSharp.NamingRules.severity = suggestion
46+
dotnet_analyzer_diagnostic.category-StyleCop.CSharp.SpacingRules.severity = suggestion
47+
dotnet_analyzer_diagnostic.category-StyleCop.CSharp.OrderingRules.severity = suggestion
48+
dotnet_analyzer_diagnostic.category-StyleCop.CSharp.MaintainabilityRules.severity = suggestion
49+
dotnet_analyzer_diagnostic.category-StyleCop.CSharp.LayoutRules.severity = suggestion
50+
51+
dotnet_diagnostic.SA1636.severity = none # SA1636: File header copyright text should match
52+
dotnet_diagnostic.SA1101.severity = none # PrefixLocalCallsWithThis - stylecop appears to be ignoring dotnet_style_qualification_for_*
53+
54+
dotnet_diagnostic.SA1503.severity = warning # BracesMustNotBeOmitted
55+
dotnet_diagnostic.SA1117.severity = warning # ParametersMustBeOnSameLineOrSeparateLines
56+
dotnet_diagnostic.SA1116.severity = warning # SplitParametersMustStartOnLineAfterDeclaration
57+
dotnet_diagnostic.SA1122.severity = warning # UseStringEmptyForEmptyStrings
58+
dotnet_diagnostic.SA1028.severity = warning # CodeMustNotContainTrailingWhitespace
59+
dotnet_diagnostic.SA1500.severity = warning # BracesForMultiLineStatementsMustNotShareLine
60+
dotnet_diagnostic.SA1401.severity = warning # FieldsMustBePrivate
61+
dotnet_diagnostic.SA1519.severity = warning # BracesMustNotBeOmittedFromMultiLineChildStatement
62+
dotnet_diagnostic.SA1111.severity = warning # ClosingParenthesisMustBeOnLineOfLastParameter
63+
dotnet_diagnostic.SA1520.severity = warning # UseBracesConsistently
64+
dotnet_diagnostic.SA1407.severity = warning # ArithmeticExpressionsMustDeclarePrecedence
65+
dotnet_diagnostic.SA1400.severity = warning # AccessModifierMustBeDeclared
66+
dotnet_diagnostic.SA1119.severity = warning # StatementMustNotUseUnnecessaryParenthesis
67+
dotnet_diagnostic.SA1649.severity = warning # FileNameMustMatchTypeName
68+
dotnet_diagnostic.SA1121.severity = warning # UseBuiltInTypeAlias
69+
dotnet_diagnostic.SA1132.severity = warning # DoNotCombineFields
70+
dotnet_diagnostic.SA1134.severity = warning # AttributesMustNotShareLine
71+
dotnet_diagnostic.SA1106.severity = warning # CodeMustNotContainEmptyStatements
72+
dotnet_diagnostic.SA1312.severity = warning # VariableNamesMustBeginWithLowerCaseLetter
73+
dotnet_diagnostic.SA1303.severity = warning # ConstFieldNamesMustBeginWithUpperCaseLetter
74+
dotnet_diagnostic.SA1310.severity = warning # FieldNamesMustNotContainUnderscore
75+
dotnet_diagnostic.SA1130.severity = warning # UseLambdaSyntax
76+
dotnet_diagnostic.SA1405.severity = warning # DebugAssertMustProvideMessageText
77+
dotnet_diagnostic.SA1205.severity = warning # PartialElementsMustDeclareAccess
78+
dotnet_diagnostic.SA1306.severity = warning # FieldNamesMustBeginWithLowerCaseLetter
79+
dotnet_diagnostic.SA1209.severity = warning # UsingAliasDirectivesMustBePlacedAfterOtherUsingDirectives
80+
dotnet_diagnostic.SA1216.severity = warning # UsingStaticDirectivesMustBePlacedAtTheCorrectLocation
81+
dotnet_diagnostic.SA1133.severity = warning # DoNotCombineAttributes
82+
dotnet_diagnostic.SA1135.severity = warning # UsingDirectivesMustBeQualified

‎Directory.Build.props

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
<Project>
33
<!-- Package references and additional files which are consumed by all projects -->
44
<ItemGroup>
5-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" IsImplicitlyDefined="true" />
6-
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
5+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" IsImplicitlyDefined="true" />
76
</ItemGroup>
8-
9-
<!-- Specify rule set for all projects -->
10-
<PropertyGroup>
11-
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)codeanalysis.ruleset</CodeAnalysisRuleSet>
12-
</PropertyGroup>
137
</Project>

‎build/templates/UmbracoPackage/.template.config/template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"version": {
2525
"type": "parameter",
2626
"datatype": "string",
27-
"defaultValue": "9.3.0-rc",
27+
"defaultValue": "9.4.0-rc",
2828
"description": "The version of Umbraco to load using NuGet",
2929
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
3030
},

‎build/templates/UmbracoProject/.template.config/template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"version": {
5858
"type": "parameter",
5959
"datatype": "string",
60-
"defaultValue": "9.3.0-rc",
60+
"defaultValue": "9.4.0-rc",
6161
"description": "The version of Umbraco to load using NuGet",
6262
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
6363
},

‎build/templates/UmbracoProject/UmbracoProject.csproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@
1212
</ItemGroup>
1313

1414
<!-- Force windows to use ICU. Otherwise Windows 10 2019H1+ will do it, but older windows 10 and most if not all winodws servers will run NLS -->
15-
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
16-
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />
17-
<RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2" />
15+
<ItemGroup>
16+
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />
17+
18+
<RuntimeHostConfigurationOption
19+
Condition="$(RuntimeIdentifier.StartsWith('linux')) Or $(RuntimeIdentifier.StartsWith('win')) Or ('$(RuntimeIdentifier)' == '' And !$([MSBuild]::IsOSPlatform('osx')))"
20+
Include="System.Globalization.AppLocalIcu"
21+
Value="68.2.0.9" />
1822
</ItemGroup>
1923

2024
<Import Project="..\PackageTestSiteName\build\PackageTestSiteName.targets" Condition="'$(PackageTestSiteName)' != ''" />

‎codeanalysis.ruleset

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

‎src/Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
44

55
<PropertyGroup>
6-
<Version>9.3.0</Version>
7-
<AssemblyVersion>9.3.0</AssemblyVersion>
8-
<InformationalVersion>9.3.0-rc</InformationalVersion>
9-
<FileVersion>9.3.0</FileVersion>
6+
<Version>9.4.0</Version>
7+
<AssemblyVersion>9.4.0</AssemblyVersion>
8+
<InformationalVersion>9.4.0-rc</InformationalVersion>
9+
<FileVersion>9.4.0</FileVersion>
1010
<LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
1111
<NeutralLanguage>en-US</NeutralLanguage>
1212
<Company>Umbraco CMS</Company>

‎src/JsonSchema/AppSettings.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) Umbraco.
22
// See LICENSE for more details.
33

4+
using Umbraco.Cms.Core.Configuration;
45
using Umbraco.Cms.Core.Configuration.Models;
56
using Umbraco.Deploy.Core.Configuration.DeployConfiguration;
67
using Umbraco.Deploy.Core.Configuration.DeployProjectConfiguration;
@@ -88,6 +89,8 @@ public class CmsDefinition
8889
public LegacyPasswordMigrationSettings LegacyPasswordMigration { get; set; }
8990

9091
public ContentDashboardSettings ContentDashboard { get; set; }
92+
93+
public HelpPageSettings HelpPage { get; set; }
9194
}
9295

9396
/// <summary>

‎src/Umbraco.Core/Configuration/Models/ContentDashboardSettings.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.ComponentModel;
2+
using Umbraco.Cms.Core.Configuration.Models;
23

3-
namespace Umbraco.Cms.Core.Configuration.Models
4+
namespace Umbraco.Cms.Core.Configuration
45
{
56
/// <summary>
67
/// Typed configuration options for content dashboard settings.

0 commit comments

Comments
 (0)