From e3c72a1b2c42982993a566a60bb810d30642c79c Mon Sep 17 00:00:00 2001 From: devlooped-bot Date: Wed, 20 Sep 2023 00:21:31 +0000 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20files=20with=20dotn?= =?UTF-8?q?et-file=20sync=20#=20devlooped/oss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Allow extending build with local-only files https://github.com/devlooped/oss/commit/6ae80a1 - When using EnableRexCodeGenerator, this should Just Work https://github.com/devlooped/oss/commit/c7235d7 - Enable VSCode/Razor compat when using resxcode generator https://github.com/devlooped/oss/commit/1514d15 - Append missing trailing path to directory for icon/readme https://github.com/devlooped/oss/commit/5cec43d - Update .editorconfig https://github.com/devlooped/oss/commit/2981836 - Fix action repo name https://github.com/devlooped/oss/commit/ac753b7 - Ignore test analyzer rules recursively. https://github.com/devlooped/oss/commit/fd5b554 - Ignore primary ctor parameter in tests, usually used for testoutput helper https://github.com/devlooped/oss/commit/c779d3d - Update dependabot.yml with some default groupings https://github.com/devlooped/oss/commit/cba10bb - Add System.IdentityModel group https://github.com/devlooped/oss/commit/e7d18ae - Add MS.IdentityModel to identity group https://github.com/devlooped/oss/commit/14d1868 - Exclude System.IdentityModel from System group https://github.com/devlooped/oss/commit/35ca3f3 - Update .gitignore with JetBrains private folder https://github.com/devlooped/oss/commit/9dff0bd - Ignore app root folder too https://github.com/devlooped/oss/commit/b87a8a7 - Add .sass-cache to ignores https://github.com/devlooped/oss/commit/d65f9c7 - Move .sass-cache down alongside other jekyll folders https://github.com/devlooped/oss/commit/551d4e0 - Ignore azure functions local settings https://github.com/devlooped/oss/commit/4bd7025 --- .editorconfig | 14 +++++++++++++- .github/dependabot.yml | 31 +++++++++++++++++++++++++++++++ .github/workflows/includes.yml | 2 +- .gitignore | 4 ++++ .netconfig | 24 ++++++++++++------------ src/Directory.Build.props | 1 + src/Directory.Build.targets | 19 +++++++++++++++++-- 7 files changed, 79 insertions(+), 16 deletions(-) diff --git a/.editorconfig b/.editorconfig index 26a8ca5..4cab270 100644 --- a/.editorconfig +++ b/.editorconfig @@ -58,6 +58,12 @@ dotnet_style_require_accessibility_modifiers = omit_if_default:error dotnet_diagnostic.IDE0040.severity = error [*.cs] +# Top-level files are definitely OK +csharp_using_directive_placement = outside_namespace:silent +csharp_style_namespace_declarations = block_scoped:silent +csharp_prefer_simple_using_statement = true:suggestion +csharp_prefer_braces = true:silent + # Prefer "var" everywhere csharp_style_var_for_built_in_types = true:suggestion csharp_style_var_when_type_is_apparent = true:suggestion @@ -89,9 +95,15 @@ csharp_new_line_before_members_in_object_initializers = true csharp_new_line_before_members_in_anonymous_types = true # Test settings -[**/*Tests*/*{.cs,.vb}] +[**/*Tests*/**{.cs,.vb}] # xUnit1013: Public method should be marked as test. Allows using records as test classes dotnet_diagnostic.xUnit1013.severity = none +# CS9113: Parameter is unread (usually, ITestOutputHelper) +dotnet_diagnostic.CS9113.severity = none + +# Default severity for analyzer diagnostics with category 'Style' +dotnet_analyzer_diagnostic.category-Style.severity = none + # VSTHRD200: Use "Async" suffix for async methods dotnet_diagnostic.VSTHRD200.severity = none diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f551596..ed06dbe 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,3 +7,34 @@ updates: directory: / schedule: interval: daily + groups: + Azure: + patterns: + - "Azure*" + - "Microsoft.Azure*" + Identity: + patterns: + - "System.IdentityModel*" + - "Microsoft.IdentityModel*" + System: + patterns: + - "System*" + exclude-patterns: + - "System.IdentityModel*" + Extensions: + patterns: + - "Microsoft.Extensions*" + Web: + patterns: + - "Microsoft.AspNetCore*" + Tests: + patterns: + - "Microsoft.NET.Tests*" + - "xunit*" + - "coverlet*" + ThisAssembly: + patterns: + - "ThisAssembly*" + ProtoBuf: + patterns: + - "protobuf-*" diff --git a/.github/workflows/includes.yml b/.github/workflows/includes.yml index b806653..bb1a90b 100644 --- a/.github/workflows/includes.yml +++ b/.github/workflows/includes.yml @@ -26,7 +26,7 @@ jobs: token: ${{ env.GH_TOKEN }} - name: +Mᐁ includes - uses: devlooped/actions-include@v1 + uses: devlooped/actions-includes@v1 - name: ✍ pull request uses: peter-evans/create-pull-request@v4 diff --git a/.gitignore b/.gitignore index 242945b..a438e35 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,13 @@ bin +app obj artifacts pack TestResults .vs .vscode +.idea +local.settings.json *.suo *.sdf @@ -29,5 +32,6 @@ node_modules _site .jekyll-metadata .jekyll-cache +.sass-cache Gemfile.lock package-lock.json diff --git a/.netconfig b/.netconfig index 44a31f1..e07e993 100644 --- a/.netconfig +++ b/.netconfig @@ -26,8 +26,8 @@ skip [file ".editorconfig"] url = https://github.com/devlooped/oss/blob/main/.editorconfig - sha = 448cf45a26e068fe5d7164ea48d1dc8bf620df46 - etag = 897634b9ba05c00e8ef35b24533d31bc43a5299be5a64e240109ba4c00fcad15 + sha = c779d3d4e468358106dea03e93ba2cd35bb01ecb + etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59 weak [file ".gitattributes"] url = https://github.com/devlooped/oss/blob/main/.gitattributes @@ -36,8 +36,8 @@ weak [file ".github/dependabot.yml"] url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml - sha = 4f070a477b4162a280f02722ae666376ae4fcc71 - etag = 35f2134fff3b0235ff8dac8618a76198c8ef533ad2f29628bbb435cd1134d638 + sha = 35ca3f3405452465058d89005f8a88a65847c377 + etag = f8080f8f04d87529e90d9a66751d304a7141196fb9734aa2d110784e52e66898 weak [file ".github/workflows/changelog.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml @@ -59,8 +59,8 @@ weak [file ".gitignore"] url = https://github.com/devlooped/oss/blob/main/.gitignore - sha = c78868eba59a3e04602434684f9eac241fef13fb - etag = 1c1705a3f0ed65e33c9133996ebaa100aa445a8b968b2904ad48fef938702006 + sha = 4bd702593c10df189cd4a0f6e6fb72e55de02198 + etag = f11dcc8c057bd2f526aa9c7090c9568d1656fafaaedc6719da42a00283018ffa weak [file "Directory.Build.rsp"] url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp @@ -84,13 +84,13 @@ weak [file "src/Directory.Build.props"] url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props - sha = 28a27ba9594b5df731460864038593f568f6d64e - etag = a5cfa7374ce9141e98426583688be558d08a35b1c9be0c8150e7c4a0a5cfde1b + sha = 6ae80a175a8f926ac5d9ffb0f6afd55d85cc9320 + etag = 69d4b16c14d5047b3ed812dbf556b0b8d77deb86f73af04b9bd3640220056fa8 weak [file "src/Directory.Build.targets"] url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets - sha = 96b67734de9897ae5fb99f3b87c7042e6ccd218b - etag = a495854b35fb101774cdfd2b2c2875ed3dd85ada5d04cbdd3b7a90c9afdbe36f + sha = 5cec43dd514aeb9050ea2ccbc546f7afa428c5b5 + etag = 8e0f43f00e0c29b408d4ce5c821b44a9bf7dbc8d4917895cfc39f2964d839bf6 weak [file "src/kzu.snk"] url = https://github.com/devlooped/oss/blob/main/src/kzu.snk @@ -104,8 +104,8 @@ weak [file ".github/workflows/includes.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml - sha = f08c3f28e46e28eb31e70846d65e57aa9553ce56 - etag = 884175b3f80b39edc1a23c6a34d58aa3c481432d4f20938f9a834dd918ef283d + sha = ac753b791d03997eb655efb26ae141b51addd1c0 + etag = fcd94a08ac9ebc0e8351deac4e7f085cf8ef67816cc50006e068f44166096eb8 weak [file ".github/workflows/combine-prs.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml diff --git a/src/Directory.Build.props b/src/Directory.Build.props index c056da4..6b9a668 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -142,4 +142,5 @@ + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 6150d00..248c2b7 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -40,11 +40,11 @@ + Condition="Exists('$(MSBuildThisFileDirectory)icon.png') and !Exists('$(MSBuildProjectDirectory)\icon.png')" /> + Condition="Exists('$(MSBuildThisFileDirectory)readme.md') and !Exists('$(MSBuildProjectDirectory)\readme.md')" /> + PrepareResources;$(CoreCompileDependsOn) + + + + + MSBuild:Compile + $(IntermediateOutputPath)\$([MSBuild]::ValueOrDefault('%(RelativeDir)', '').Replace('\', '.').Replace('/', '.'))%(Filename).g$(DefaultLanguageSourceExtension) + $(Language) + $(RootNamespace) + $(RootNamespace).$([MSBuild]::ValueOrDefault('%(RelativeDir)', '').Replace('\', '.').Replace('/', '.').TrimEnd('.')) + %(Filename) + @@ -159,5 +173,6 @@ +