diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 11c5d7d..17ca3e2 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 a76d0fd..1206d10 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/dotnet-file-core.yml b/.github/workflows/dotnet-file-core.yml index 3475f1a..025e9bb 100644 --- a/.github/workflows/dotnet-file-core.yml +++ b/.github/workflows/dotnet-file-core.yml @@ -80,7 +80,7 @@ jobs: } - name: +Mᐁ includes - uses: devlooped/actions-includes@v1 + uses: devlooped/actions-includes@v2 with: validate: false diff --git a/.github/workflows/includes.yml b/.github/workflows/includes.yml index fc6dbeb..ee446be 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,16 +23,16 @@ 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 + uses: devlooped/actions-includes@v2 - name: 📝 OSMF EULA shell: pwsh @@ -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/.github/workflows/publish.yml b/.github/workflows/publish.yml index 035d811..4fe29c5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,7 @@ env: Configuration: Release PackOnBuild: true GeneratePackageOnBuild: true - VersionLabel: ${{ github.ref }} + VersionLabel: refs/tags/${{ github.event.release.tag_name }} GH_TOKEN: ${{ secrets.GH_TOKEN }} MSBUILDTERMINALLOGGER: auto SLEET_FEED_URL: https://api.nuget.org/v3/index.json @@ -44,6 +44,16 @@ jobs: name: logs path: '*.binlog' + - name: ✅ validate + shell: pwsh + working-directory: bin + run: | + $invalid = Get-ChildItem -File -Filter "*.42.42*.nupkg" + if ($invalid) { + Write-Error "Found dev/local packages with disallowed 42.42* version prefix:`n$($invalid.Name -join "`n")" + exit 1 + } + - name: 🚀 nuget env: NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 99eec76..bd30f7c 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -1,7 +1,7 @@ name: 'triage' on: schedule: - - cron: '42 0 * * *' + - cron: '42 0 1,15 * *' workflow_dispatch: # Manual triggering through the GitHub UI, API, or CLI @@ -104,4 +104,4 @@ jobs: closeDays: ${{ fromJson(inputs.daysBeforeClose || 30) }} closeComment: "This issue has been closed automatically because it needs more information and has not had recent activity.\n\nHappy Coding!" pingDays: 80 - pingComment: "Hey @${assignee}, this issue might need further attention.\n\n@${author}, you can help us out by closing this issue if the problem no longer exists, or adding more information." \ No newline at end of file + pingComment: "Hey @${assignee}, this issue might need further attention.\n\n@${author}, you can help us out by closing this issue if the problem no longer exists, or adding more information." diff --git a/.gitignore b/.gitignore index dfe1fe0..25e70dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,23 @@ bin obj +out artifacts pack +agent-tools +terminals TestResults results BenchmarkDotNet.Artifacts +mcps /app +/temp .vs .vscode .genaiscript .idea local.settings.json .env +.next *.local *.suo @@ -26,6 +32,7 @@ local.settings.json *.binlog *.zip __azurite*.* +AzuriteConfig __*__ .nuget diff --git a/.netconfig b/.netconfig index b6eac26..2bae5ed 100644 --- a/.netconfig +++ b/.netconfig @@ -27,8 +27,8 @@ weak [file ".github/dependabot.yml"] url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml - sha = e733294084fb3e75d517a2e961e87df8faae7dc6 - etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618 + sha = 387f0616b2c56adc4f33f2858da818f7e0d92ef3 + etag = a1aaba1440e5ee2a7b7f93fc0fb004d4e1d4d9780350c753f7c429e37241345a weak [file ".github/release.yml"] url = https://github.com/devlooped/oss/blob/main/.github/release.yml @@ -62,18 +62,18 @@ weak [file ".github/workflows/includes.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml - sha = 06628725a6303bb8c4cf3076a384fc982a91bc0b - etag = 478f91d4126230e57cc601382da1ba23f9daa054645b4af89800d8dd862e64fd + sha = d571412f07b0fb3c40023dc906f64906d7ed2b46 + etag = ab627107749577bb619b024aff93027359b66b4c3f5a85a36b235e428387cd17 weak [file ".github/workflows/publish.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml - sha = 7f5f9ee9f362f7e8f951d618f8f799033550e687 - etag = c60411d1aa4e98e7f69e2d34cbccb8eb7e387ec11f6f8e78ee8d8b92122d7025 + sha = 0ca5fd11125cd10c51b4433a86917c06ff1ae839 + etag = ac46ffdcef820bbc6bd32378aef25ff79713196e0a5696791abb3a804e06e4d8 weak [file ".gitignore"] url = https://github.com/devlooped/oss/blob/main/.gitignore - sha = a225b7a9f609f26bcc24e0d84f663387be251a7d - etag = 20a8b49d57024abbd85aac5b0020c30e5eb68e0384b2761e93727c8780c4a991 + sha = ff61659751374b95c7a8a0477c908a8119f756f0 + etag = e5865f083db45081a7b4eaa518018971b34e6ef93f917ac510dea96d27f792b3 weak [file "_config.yml"] url = https://github.com/devlooped/oss/blob/main/_config.yml @@ -92,13 +92,13 @@ weak [file "src/Directory.Build.props"] url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props - sha = dd13ed3334135c30dcb1e3b2295dc7622de298d9 - etag = bd05f9f240823c0ac79ddfefe654061550c36f82dd94fa513b82900e92686a5f + sha = 6e2438919e108aeb75106dc0737c45f5e55d5f42 + etag = f1d6384abf18d8d891ce5e835a10c73fe029c42151374be96d7e4af43d189c65 weak [file "src/Directory.Build.targets"] url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets - sha = 083a37bd9307ec820bac6ee3c7384083151d36d8 - etag = 907682e5632a2ba430357e6e042a4ca33cb8c94a3a215d3091aa03f5958a4877 + sha = dcd5f0a9a00a5b0c23d41a71dcc66ea41dc5f75d + etag = 2cca66d8a1adbae24dc2efee53a55fa09949242eb35b86c5fd66425da18c6107 weak [file "src/nuget.config"] url = https://github.com/devlooped/oss/blob/main/src/nuget.config @@ -107,13 +107,13 @@ weak [file ".github/workflows/dotnet-file-core.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml - sha = 61a602fc61eedbdae235f01e93657a6219ac2427 - etag = 1de1d7aff26365e25be4abc0c728e10c20df9c4f1adc0cd1f28485c5238883e0 + sha = 6b65b05cf147846fe2f599c0aadf5f6ab0c31ae1 + etag = 6ee585d75bad0724f66bf0b21c32d5498f750b472fba06c5fc31dd2818fce7ea weak [file ".github/workflows/triage.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/triage.yml - sha = 61a602fc61eedbdae235f01e93657a6219ac2427 - etag = 152cd3a559c08da14d1da12a5262ba1d2e0ed6bed6d2eabf5bd209b0c35d8a75 + sha = 5ee8c91c8d9e8c0ee739fe1ec877f36c15a4aff0 + etag = b19dc36058fc7d385cb5795c9e0860c11b9d027c57cb2a5e6a112e692c6884c1 weak [file "readme.tmp.md"] url = https://github.com/devlooped/oss/blob/main/readme.tmp.md @@ -131,6 +131,6 @@ 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 diff --git a/readme.md b/readme.md index e8348e5..f914317 100644 --- a/readme.md +++ b/readme.md @@ -63,7 +63,6 @@ is saved unless a node was cleaned. [![Clarius Org](https://avatars.githubusercontent.com/u/71888636?v=4&s=39 "Clarius Org")](https://github.com/clarius) [![MFB Technologies, Inc.](https://avatars.githubusercontent.com/u/87181630?v=4&s=39 "MFB Technologies, Inc.")](https://github.com/MFB-Technologies-Inc) -[![Khamza Davletov](https://avatars.githubusercontent.com/u/13615108?u=11b0038e255cdf9d1940fbb9ae9d1d57115697ab&v=4&s=39 "Khamza Davletov")](https://github.com/khamza85) [![SandRock](https://avatars.githubusercontent.com/u/321868?u=99e50a714276c43ae820632f1da88cb71632ec97&v=4&s=39 "SandRock")](https://github.com/sandrock) [![DRIVE.NET, Inc.](https://avatars.githubusercontent.com/u/15047123?v=4&s=39 "DRIVE.NET, Inc.")](https://github.com/drivenet) [![Keith Pickford](https://avatars.githubusercontent.com/u/16598898?u=64416b80caf7092a885f60bb31612270bffc9598&v=4&s=39 "Keith Pickford")](https://github.com/Keflon) @@ -84,11 +83,11 @@ is saved unless a node was cleaned. [![domischell](https://avatars.githubusercontent.com/u/66068846?u=0a5c5e2e7d90f15ea657bc660f175605935c5bea&v=4&s=39 "domischell")](https://github.com/DominicSchell) [![Adrian Alonso](https://avatars.githubusercontent.com/u/2027083?u=129cf516d99f5cb2fd0f4a0787a069f3446b7522&v=4&s=39 "Adrian Alonso")](https://github.com/adalon) [![torutek](https://avatars.githubusercontent.com/u/33917059?v=4&s=39 "torutek")](https://github.com/torutek) -[![mccaffers](https://avatars.githubusercontent.com/u/16667079?u=110034edf51097a5ee82cb6a94ae5483568e3469&v=4&s=39 "mccaffers")](https://github.com/mccaffers) +[![Ryan McCaffery](https://avatars.githubusercontent.com/u/16667079?u=c0daa64bb5c1b572130e05ae2b6f609ecc912d4d&v=4&s=39 "Ryan McCaffery")](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) +[![Geodata AS](https://avatars.githubusercontent.com/u/5946299?v=4&s=39 "Geodata AS")](https://github.com/geodata-no) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 91e383a..93a0b1e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -47,6 +47,9 @@ false true + + + false @@ -167,7 +170,7 @@ - + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index a3df56d..bd2b7ca 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -32,6 +32,22 @@ true + + + <_PackageId>$(PackageId) + + $(MSBuildSDKsPath)\..\NuGet.Build.Tasks.Pack.targets + + + + + + + $(_PackageId) + + false + +