diff --git a/src/.editorconfig b/src/.editorconfig index bb59b63e..99a756c1 100644 --- a/src/.editorconfig +++ b/src/.editorconfig @@ -134,21 +134,23 @@ csharp_new_line_before_finally = true csharp_new_line_before_members_in_object_initializers = true csharp_new_line_before_members_in_anonymous_types = true resharper_wrap_before_first_type_parameter_constraint = true -resharper_wrap_extends_list_style = chop_always +resharper_wrap_extends_list_style = chop_always resharper_wrap_after_dot_in_method_calls = false resharper_wrap_before_binary_pattern_op = false resharper_wrap_object_and_collection_initializer_style = chop_always resharper_place_simple_initializer_on_single_line = false -# space -resharper_space_around_lambda_arrow = true - dotnet_style_require_accessibility_modifiers = never:error resharper_place_type_constraints_on_same_line = false resharper_blank_lines_inside_namespace = 0 resharper_blank_lines_after_file_scoped_namespace_directive = 1 resharper_blank_lines_inside_type = 0 +insert_final_newline = false +resharper_place_attribute_on_same_line = false +resharper_space_around_lambda_arrow = true +resharper_place_constructor_initializer_on_same_line = false + #braces https://www.jetbrains.com/help/resharper/EditorConfig_CSHARP_CSharpCodeStylePageImplSchema.html#Braces resharper_braces_for_ifelse = required resharper_braces_for_foreach = required @@ -159,11 +161,12 @@ resharper_braces_for_fixed = required resharper_braces_for_for = required # Xml files -[*.{xml,config,nuspec,resx,vsixmanifest,csproj,targets,props}] +[*.{xml,config,nuspec,resx,vsixmanifest,csproj,targets,props,fsproj}] indent_size = 2 # https://www.jetbrains.com/help/resharper/EditorConfig_XML_XmlCodeStylePageSchema.html#resharper_xml_blank_line_after_pi resharper_blank_line_after_pi = false resharper_space_before_self_closing = true +ij_xml_space_inside_empty_tag = true [*.json] indent_size = 2 \ No newline at end of file diff --git a/src/NServiceBus.MicrosoftLogging/NServiceBus.MicrosoftLogging.csproj b/src/NServiceBus.MicrosoftLogging/NServiceBus.MicrosoftLogging.csproj index 4c59b982..2500bcd1 100644 --- a/src/NServiceBus.MicrosoftLogging/NServiceBus.MicrosoftLogging.csproj +++ b/src/NServiceBus.MicrosoftLogging/NServiceBus.MicrosoftLogging.csproj @@ -4,7 +4,7 @@ net48;net7.0 - + diff --git a/src/Shared.sln.DotSettings b/src/Shared.sln.DotSettings index 38d0d527..f2dd1f39 100644 --- a/src/Shared.sln.DotSettings +++ b/src/Shared.sln.DotSettings @@ -27,6 +27,7 @@ ERROR ERROR ERROR + ERROR ERROR ERROR ERROR @@ -36,12 +37,15 @@ ERROR ERROR DO_NOT_SHOW + DO_NOT_SHOW ERROR ERROR ERROR ERROR ERROR ERROR + ERROR + ERROR ERROR ERROR ERROR @@ -118,6 +122,8 @@ ERROR DO_NOT_SHOW ECMAScript 2016 + False + False <?xml version="1.0" encoding="utf-16"?><Profile name="c# Cleanup"><AspOptimizeRegisterDirectives>True</AspOptimizeRegisterDirectives><CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeCodeBodyStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" /><CssAlphabetizeProperties>True</CssAlphabetizeProperties><JSStringLiteralQuotesDescriptor>True</JSStringLiteralQuotesDescriptor><CorrectVariableKindsDescriptor>True</CorrectVariableKindsDescriptor><VariablesToInnerScopesDescriptor>True</VariablesToInnerScopesDescriptor><StringToTemplatesDescriptor>True</StringToTemplatesDescriptor><JsInsertSemicolon>True</JsInsertSemicolon><RemoveRedundantQualifiersTs>True</RemoveRedundantQualifiersTs><OptimizeImportsTs>True</OptimizeImportsTs><OptimizeReferenceCommentsTs>True</OptimizeReferenceCommentsTs><PublicModifierStyleTs>True</PublicModifierStyleTs><ExplicitAnyTs>True</ExplicitAnyTs><TypeAnnotationStyleTs>True</TypeAnnotationStyleTs><RelativePathStyleTs>True</RelativePathStyleTs><AsInsteadOfCastTs>True</AsInsteadOfCastTs><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><CssReformatCode>True</CssReformatCode><JsReformatCode>True</JsReformatCode><JsFormatDocComments>True</JsFormatDocComments><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><FormatAttributeQuoteDescriptor>True</FormatAttributeQuoteDescriptor><HtmlReformatCode>True</HtmlReformatCode><XAMLCollapseEmptyTags>False</XAMLCollapseEmptyTags><IDEA_SETTINGS>&lt;profile version="1.0"&gt; &lt;option name="myName" value="c# Cleanup" /&gt; &lt;/profile&gt;</IDEA_SETTINGS><RIDER_SETTINGS>&lt;profile&gt; @@ -148,7 +154,10 @@ NEVER NEVER False + True + CHOP_ALWAYS False + CHOP_ALWAYS False False RemoveIndent diff --git a/src/global.json b/src/global.json index 1f98ce1a..b8219f86 100644 --- a/src/global.json +++ b/src/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "8.0.101", "allowPrerelease": true, "rollForward": "latestFeature" }