From 5a79df71617dcecaf78091d972eaaa1e075cf976 Mon Sep 17 00:00:00 2001 From: devlooped-bot Date: Sat, 25 Mar 2023 00:04:38 +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 - Update .editorconfig https://github.com/devlooped/oss/commit/2981836 - Ignore test analyzer rules recursively. https://github.com/devlooped/oss/commit/fd5b554 - Use a better CI version number https://github.com/devlooped/oss/commit/1ec6385 - Don't run analyzers/codefixers in format https://github.com/devlooped/oss/commit/543f7da - Fix action repo name https://github.com/devlooped/oss/commit/ac753b7 - Update .gitignore with JetBrains private folder https://github.com/devlooped/oss/commit/9dff0bd - Only override VersionPrefix if it has no value https://github.com/devlooped/oss/commit/28a27ba - Allow extending build with local-only files https://github.com/devlooped/oss/commit/6ae80a1 --- .editorconfig | 2 +- .github/workflows/build.yml | 10 +++++++--- .github/workflows/includes.yml | 2 +- .gitignore | 1 + .netconfig | 24 ++++++++++++------------ src/Directory.Build.props | 3 ++- src/Directory.Build.targets | 5 +++-- 7 files changed, 27 insertions(+), 20 deletions(-) diff --git a/.editorconfig b/.editorconfig index d8bd600..5916dd0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -103,4 +103,4 @@ dotnet_diagnostic.xUnit1013.severity = none dotnet_analyzer_diagnostic.category-Style.severity = none # VSTHRD200: Use "Async" suffix for async methods -dotnet_diagnostic.VSTHRD200.severity = none \ No newline at end of file +dotnet_diagnostic.VSTHRD200.severity = none diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0781a30..37a8e33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,8 @@ on: env: DOTNET_NOLOGO: true + VersionPrefix: 42.42.${{ github.run_number }} + VersionLabel: ${{ github.ref }} defaults: run: @@ -54,7 +56,7 @@ jobs: fetch-depth: 0 - name: 🙏 build - run: dotnet build -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER" + run: dotnet build -m:1 - name: ⚙ GNU grep if: matrix.os == 'macOS-latest' @@ -66,7 +68,7 @@ jobs: uses: ./.github/workflows/test - name: 📦 pack - run: dotnet pack -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER" + run: dotnet pack -m:1 # Only push CI package to sleet feed if building on ubuntu (fastest) - name: 🚀 sleet @@ -88,4 +90,6 @@ jobs: fetch-depth: 0 - name: ✓ ensure format - run: dotnet format --verify-no-changes -v:diag --exclude ~/.nuget + run: | + dotnet format whitespace --verify-no-changes -v:diag --exclude ~/.nuget + dotnet format style --verify-no-changes -v:diag --exclude ~/.nuget 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..3dad73d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ pack TestResults .vs .vscode +.idea *.suo *.sdf diff --git a/.netconfig b/.netconfig index 7e10d09..73e9d6c 100644 --- a/.netconfig +++ b/.netconfig @@ -14,8 +14,8 @@ skip [file ".editorconfig"] url = https://github.com/devlooped/oss/blob/main/.editorconfig - sha = 448cf45a26e068fe5d7164ea48d1dc8bf620df46 - etag = 897634b9ba05c00e8ef35b24533d31bc43a5299be5a64e240109ba4c00fcad15 + sha = fd5b554bf3538a3c92a0b49e395c8ad2e8429158 + etag = bf02d1679442e5169d03304164b8e9407997ac3132145831a91ba61fc8b50687 weak [file ".gitattributes"] url = https://github.com/devlooped/oss/blob/main/.gitattributes @@ -34,8 +34,8 @@ weak [file ".github/workflows/build.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml - sha = 7e3288c3c7746354edc2836e4fb71f11e17db83c - etag = bea8f881a2c7a02de70a201806edb432f7185d39df762f76efdefe392ea019a5 + sha = 543f7daf1e8a63ea0dc599ae0494df7d1a90caa4 + etag = 6abaf57f2624bc65517b8cc7b8a4b7e34542cf26f2ebcd1935a15a2a075c8733 weak [file ".github/workflows/changelog.config"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.config @@ -59,8 +59,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/publish.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml @@ -77,8 +77,8 @@ weak [file ".gitignore"] url = https://github.com/devlooped/oss/blob/main/.gitignore - sha = c78868eba59a3e04602434684f9eac241fef13fb - etag = 1c1705a3f0ed65e33c9133996ebaa100aa445a8b968b2904ad48fef938702006 + sha = 9dff0bde290185226986f512c75fa0434bc9fe3f + etag = 7b3f23aa88e3ed628f03677a5b0fc4587c404bd0ef97dcf9650917a48316d51c weak [file "Directory.Build.rsp"] url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp @@ -102,13 +102,13 @@ weak [file "src/Directory.Build.props"] url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props - sha = ef8e7fa7593ded91d871d30eeebd0dc79f679159 - etag = 1d5ec6bdb8b12c13635a11364dcfe54aefb82cc171f332a8d536aa35476222d5 + 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 = 6ae80a175a8f926ac5d9ffb0f6afd55d85cc9320 + etag = a890e3c9574327c4885f386756cba483c0f8fb2446554e4badcb6ab5b0eecfd0 weak [file "src/nuget.config"] url = https://github.com/devlooped/oss/blob/main/src/nuget.config diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 028c354..6b9a668 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -112,7 +112,7 @@ after the fixed prefix. This allows dogfooding a branch build. The suffix is sanitized and optionally turned into --> - 42.42.42 + 42.42.42 @@ -142,4 +142,5 @@ + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index a13b68f..708c456 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -98,7 +98,7 @@ - + @@ -159,5 +159,6 @@ + - + \ No newline at end of file