diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 11c5d7dd..17ca3e26 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -32,6 +32,9 @@ updates: Web: patterns: - "Microsoft.AspNetCore*" + OpenTelemetry: + patterns: + - "OpenTelemetry*" Tests: patterns: - "Microsoft.NET.Test*" diff --git a/.github/workflows/dotnet-env.yml b/.github/workflows/dotnet-env.yml index a76d0fd8..1206d10f 100644 --- a/.github/workflows/dotnet-env.yml +++ b/.github/workflows/dotnet-env.yml @@ -10,6 +10,8 @@ on: jobs: which-dotnet: runs-on: ubuntu-latest + env: + PR_TOKEN: ${{ secrets.DEVLOOPED_TOKEN || secrets.GH_TOKEN }} permissions: contents: write pull-requests: write @@ -20,18 +22,19 @@ jobs: with: name: ${{ secrets.BOT_NAME }} email: ${{ secrets.BOT_EMAIL }} - gh_token: ${{ secrets.GH_TOKEN }} + gh_token: ${{ env.PR_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }} - name: 🤘 checkout uses: actions/checkout@v4 with: - token: ${{ env.GH_TOKEN }} + token: ${{ env.PR_TOKEN || github.token }} - name: 🤌 dotnet uses: devlooped/actions-which-dotnet@v1 - name: ✍ pull request + if: env.PR_TOKEN != '' uses: peter-evans/create-pull-request@v7 with: base: main @@ -41,4 +44,9 @@ jobs: title: "⚙ Update dotnet versions" body: "Update dotnet versions" commit-message: "Update dotnet versions" - token: ${{ env.GH_TOKEN }} \ No newline at end of file + token: ${{ env.PR_TOKEN }} + + - name: ⚠️ skip pull request + if: env.PR_TOKEN == '' + shell: bash + run: echo "::warning::Skipping PR creation because neither DEVLOOPED_TOKEN nor GH_TOKEN is configured. GITHUB_TOKEN cannot create pull requests in this repository." diff --git a/.github/workflows/includes.yml b/.github/workflows/includes.yml index fc6dbebf..8fd66901 100644 --- a/.github/workflows/includes.yml +++ b/.github/workflows/includes.yml @@ -12,6 +12,8 @@ on: jobs: includes: runs-on: ubuntu-latest + env: + PR_TOKEN: ${{ secrets.DEVLOOPED_TOKEN || secrets.GH_TOKEN }} permissions: contents: write pull-requests: write @@ -21,13 +23,13 @@ jobs: with: name: ${{ secrets.BOT_NAME }} email: ${{ secrets.BOT_EMAIL }} - gh_token: ${{ secrets.GH_TOKEN }} + gh_token: ${{ env.PR_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }} - name: 🤘 checkout uses: actions/checkout@v4 with: - token: ${{ env.GH_TOKEN }} + token: ${{ env.PR_TOKEN || github.token }} - name: +Mᐁ includes uses: devlooped/actions-includes@v1 @@ -50,6 +52,7 @@ jobs: ((get-content -raw $file) -replace '\$product\$',$product).trim() | set-content $file - name: ✍ pull request + if: env.PR_TOKEN != '' uses: peter-evans/create-pull-request@v8 with: add-paths: | @@ -64,4 +67,9 @@ jobs: commit-message: +Mᐁ includes title: +Mᐁ includes body: +Mᐁ includes - token: ${{ env.GH_TOKEN }} + token: ${{ env.PR_TOKEN }} + + - name: ⚠️ skip pull request + if: env.PR_TOKEN == '' + shell: bash + run: echo "::warning::Skipping PR creation because neither DEVLOOPED_TOKEN nor GH_TOKEN is configured. GITHUB_TOKEN cannot create pull requests in this repository." diff --git a/.gitignore b/.gitignore index dfe1fe0b..edfe7a5c 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ local.settings.json *.binlog *.zip __azurite*.* +AzuriteConfig __*__ .nuget diff --git a/.netconfig b/.netconfig index c30219eb..060ea261 100644 --- a/.netconfig +++ b/.netconfig @@ -25,9 +25,9 @@ sha = 4a9aa321c4982b83c185cf8dffed181ff84667d5 [file ".github/dependabot.yml"] url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml - etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618 + etag = a1aaba1440e5ee2a7b7f93fc0fb004d4e1d4d9780350c753f7c429e37241345a weak - sha = e733294084fb3e75d517a2e961e87df8faae7dc6 + sha = 387f0616b2c56adc4f33f2858da818f7e0d92ef3 [file ".github/workflows/build.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml etag = 851af098748f7cfa5bc3cfd4cc404a6de930532b59ceb2b3b535282c41226f3a @@ -35,9 +35,9 @@ sha = 5da103cfbc1c4f9b5f59cfa698d2afbd744a7525 [file ".gitignore"] url = https://github.com/devlooped/oss/blob/main/.gitignore - etag = 20a8b49d57024abbd85aac5b0020c30e5eb68e0384b2761e93727c8780c4a991 + etag = 69c38c664debe4cbb8b68a87bacb1c93d0ac9757635c31a42292317f05484728 weak - sha = a225b7a9f609f26bcc24e0d84f663387be251a7d + sha = 12c18e78c4bbab118b798d04344e5a5253216841 [file "license.txt"] url = https://github.com/devlooped/oss/blob/main/license.txt etag = 2c6335b37e4ae05eea7c01f5d0c9d82b49c488f868a8b5ba7bff7c6ff01f3994 @@ -45,9 +45,9 @@ sha = 0683ee777d7d878d4bf013d7deea352685135a05 [file "src/Directory.Build.props"] url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props - etag = bd05f9f240823c0ac79ddfefe654061550c36f82dd94fa513b82900e92686a5f + etag = b2b90c6d617db9712cc8be2031b767d3ba951015717984f52b4872cc39f93e72 weak - sha = dd13ed3334135c30dcb1e3b2295dc7622de298d9 + sha = a1f5d11d1821959a141567ed24f9ea43205edd13 [file "src/Directory.Build.targets"] url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets etag = 907682e5632a2ba430357e6e042a4ca33cb8c94a3a215d3091aa03f5958a4877 @@ -109,8 +109,8 @@ weak [file ".github/workflows/includes.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml - sha = 06628725a6303bb8c4cf3076a384fc982a91bc0b - etag = 478f91d4126230e57cc601382da1ba23f9daa054645b4af89800d8dd862e64fd + sha = 7c1c6e615b5785e0ac9db33cb17343d6c1de16ff + etag = 5e6a10be141ee629201bfad01eae09b5c36a67f541ec7ab411ae400b5d73de1d weak [file ".github/workflows/combine-prs.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml @@ -137,8 +137,8 @@ weak [file ".github/workflows/dotnet-env.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-env.yml - sha = 77e83f238196d2723640abef0c7b6f43994f9747 - etag = fcb9759a96966df40dcd24906fd328ddec05953b7e747a6bb8d0d1e4c3865274 + sha = 7c1c6e615b5785e0ac9db33cb17343d6c1de16ff + etag = 68c1e28f475ff9d05f985bf53a51fce6e64b24a8b75bd8e47119ff57309281f1 weak [file "osmfeula.txt"] url = https://github.com/devlooped/.github/blob/main/osmfeula.txt diff --git a/readme.md b/readme.md index 9688335e..212ec4fe 100644 --- a/readme.md +++ b/readme.md @@ -600,8 +600,7 @@ The versioning scheme for packages is: [![mccaffers](https://avatars.githubusercontent.com/u/16667079?u=110034edf51097a5ee82cb6a94ae5483568e3469&v=4&s=39 "mccaffers")](https://github.com/mccaffers) [![Seika Logiciel](https://avatars.githubusercontent.com/u/2564602?v=4&s=39 "Seika Logiciel")](https://github.com/SeikaLogiciel) [![Andrew Grant](https://avatars.githubusercontent.com/devlooped-user?s=39 "Andrew Grant")](https://github.com/wizardness) -[![Lars](https://avatars.githubusercontent.com/u/1727124?v=4&s=39 "Lars")](https://github.com/latonz) -[![prime167](https://avatars.githubusercontent.com/u/3722845?v=4&s=39 "prime167")](https://github.com/prime167) +[![eska-gmbh](https://avatars.githubusercontent.com/devlooped-team?s=39 "eska-gmbh")](https://github.com/eska-gmbh) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 91e383a2..91ba1a59 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -167,7 +167,7 @@ - +