diff --git a/.editorconfig b/.editorconfig index 8b341f12..01df018d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,5 @@ -# Version: 1.5.0 (Using https://semver.org/) -# Updated: 2020-03-09 +# Version: 1.6.2 (Using https://semver.org/) +# Updated: 2020-11-02 # See https://github.com/RehanSaeed/EditorConfig/releases for release notes. # See https://github.com/RehanSaeed/EditorConfig for updates to this file. # See http://EditorConfig.org for more information about .editorconfig files. @@ -63,6 +63,18 @@ end_of_line = lf [Makefile] indent_style = tab +########################################## +# File Header (Uncomment to support file headers) +# https://docs.microsoft.com/visualstudio/ide/reference/add-file-header +########################################## + +# [*.{cs,csx,cake,vb,vbx}] +# file_header_template = \n© PROJECT-AUTHOR\n + +# SA1636: File header copyright text should match +# Justification: .editorconfig supports file headers. If this is changed to a value other than "none", a stylecop.json file will need to added to the project. +# dotnet_diagnostic.SA1636.severity = none + ########################################## # .NET Language Conventions # https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions @@ -84,8 +96,8 @@ dotnet_style_predefined_type_for_member_access = true:warning # Modifier preferences # https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#normalize-modifiers dotnet_style_require_accessibility_modifiers = always:warning -csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async -visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:warning +visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:warning dotnet_style_readonly_field = true:warning # Parentheses preferences # https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#parentheses-preferences @@ -250,7 +262,7 @@ dotnet_naming_style.prefix_type_parameters_with_t_style.required_prefix = T dotnet_naming_style.disallowed_style.capitalization = pascal_case dotnet_naming_style.disallowed_style.required_prefix = ____RULE_VIOLATION____ dotnet_naming_style.disallowed_style.required_suffix = ____RULE_VIOLATION____ -# internal_error_style - This style should never occur... if it does, it's indicates a bug in file or in the parser using the file +# internal_error_style - This style should never occur... if it does, it indicates a bug in file or in the parser using the file dotnet_naming_style.internal_error_style.capitalization = pascal_case dotnet_naming_style.internal_error_style.required_prefix = ____INTERNAL_ERROR____ dotnet_naming_style.internal_error_style.required_suffix = ____INTERNAL_ERROR____ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index acfeeea4..d41ccbb4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,16 +68,7 @@ jobs: run: dotnet nuget add source https://nuget.pkg.github.com/RehanSaeed/index.json --name GitHub --username RehanSaeed --password ${{secrets.GITHUB_TOKEN}} shell: pwsh - name: 'Dotnet NuGet Push' - # Workaround bug when pushing to GitHub Packages. See https://github.com/NuGet/Home/issues/9775 - env: - DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER: 0 - run: | - $count = 0; - do { - ++$count; - dotnet nuget push .\windows-latest\*.nupkg --source GitHub --skip-duplicate; - } - while ($count -lt 1000 -and $LastExitCode -ne 0) + run: dotnet nuget push .\windows-latest\*.nupkg --api-key ${{ github.token }} --source GitHub --skip-duplicate shell: pwsh push-nuget: diff --git a/global.json b/global.json index 5634605b..c7198834 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.402" + "version": "3.1.403" } }