Skip to content

Commit 3dda1d3

Browse files
devlooped-botkzu
devlooped-bot
authored and
kzu
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Hide osmfeula.txt from package visibility devlooped/oss@a1f5d11 - Refactor GitHub Actions workflows to use unified PR_TOKEN for authentication and add skip PR creation warning devlooped/oss@7c1c6e6 - Add OpenTelemetry patterns to dependabot config devlooped/oss@387f061 - Add new entries to .gitignore file devlooped/oss@c76f0cc
1 parent bfb5a6f commit 3dda1d3

7 files changed

Lines changed: 41 additions & 20 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ updates:
3232
Web:
3333
patterns:
3434
- "Microsoft.AspNetCore*"
35+
OpenTelemetry:
36+
patterns:
37+
- "OpenTelemetry*"
3538
Tests:
3639
patterns:
3740
- "Microsoft.NET.Test*"

‎.github/workflows/dotnet-env.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
jobs:
1111
which-dotnet:
1212
runs-on: ubuntu-latest
13+
env:
14+
PR_TOKEN: ${{ secrets.DEVLOOPED_TOKEN || secrets.GH_TOKEN }}
1315
permissions:
1416
contents: write
1517
pull-requests: write
@@ -20,18 +22,19 @@ jobs:
2022
with:
2123
name: ${{ secrets.BOT_NAME }}
2224
email: ${{ secrets.BOT_EMAIL }}
23-
gh_token: ${{ secrets.GH_TOKEN }}
25+
gh_token: ${{ env.PR_TOKEN }}
2426
github_token: ${{ secrets.GITHUB_TOKEN }}
2527

2628
- name: 🤘 checkout
2729
uses: actions/checkout@v4
2830
with:
29-
token: ${{ env.GH_TOKEN }}
31+
token: ${{ env.PR_TOKEN || github.token }}
3032

3133
- name: 🤌 dotnet
3234
uses: devlooped/actions-which-dotnet@v1
3335

3436
- name: ✍ pull request
37+
if: env.PR_TOKEN != ''
3538
uses: peter-evans/create-pull-request@v7
3639
with:
3740
base: main
@@ -41,4 +44,9 @@ jobs:
4144
title: "⚙ Update dotnet versions"
4245
body: "Update dotnet versions"
4346
commit-message: "Update dotnet versions"
44-
token: ${{ env.GH_TOKEN }}
47+
token: ${{ env.PR_TOKEN }}
48+
49+
- name: ⚠️ skip pull request
50+
if: env.PR_TOKEN == ''
51+
shell: bash
52+
run: echo "::warning::Skipping PR creation because neither DEVLOOPED_TOKEN nor GH_TOKEN is configured. GITHUB_TOKEN cannot create pull requests in this repository."

‎.github/workflows/includes.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ on:
1212
jobs:
1313
includes:
1414
runs-on: ubuntu-latest
15+
env:
16+
PR_TOKEN: ${{ secrets.DEVLOOPED_TOKEN || secrets.GH_TOKEN }}
1517
permissions:
1618
contents: write
1719
pull-requests: write
@@ -21,13 +23,13 @@ jobs:
2123
with:
2224
name: ${{ secrets.BOT_NAME }}
2325
email: ${{ secrets.BOT_EMAIL }}
24-
gh_token: ${{ secrets.GH_TOKEN }}
26+
gh_token: ${{ env.PR_TOKEN }}
2527
github_token: ${{ secrets.GITHUB_TOKEN }}
2628

2729
- name: 🤘 checkout
2830
uses: actions/checkout@v4
2931
with:
30-
token: ${{ env.GH_TOKEN }}
32+
token: ${{ env.PR_TOKEN || github.token }}
3133

3234
- name: +Mᐁ includes
3335
uses: devlooped/actions-includes@v1
@@ -50,6 +52,7 @@ jobs:
5052
((get-content -raw $file) -replace '\$product\$',$product).trim() | set-content $file
5153
5254
- name: ✍ pull request
55+
if: env.PR_TOKEN != ''
5356
uses: peter-evans/create-pull-request@v8
5457
with:
5558
add-paths: |
@@ -64,4 +67,9 @@ jobs:
6467
commit-message: +Mᐁ includes
6568
title: +Mᐁ includes
6669
body: +Mᐁ includes
67-
token: ${{ env.GH_TOKEN }}
70+
token: ${{ env.PR_TOKEN }}
71+
72+
- name: ⚠️ skip pull request
73+
if: env.PR_TOKEN == ''
74+
shell: bash
75+
run: echo "::warning::Skipping PR creation because neither DEVLOOPED_TOKEN nor GH_TOKEN is configured. GITHUB_TOKEN cannot create pull requests in this repository."

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
bin
22
obj
3+
out
34
artifacts
45
pack
56
TestResults
@@ -12,6 +13,7 @@ BenchmarkDotNet.Artifacts
1213
.idea
1314
local.settings.json
1415
.env
16+
.next
1517
*.local
1618

1719
*.suo
@@ -26,6 +28,7 @@ local.settings.json
2628
*.binlog
2729
*.zip
2830
__azurite*.*
31+
AzuriteConfig
2932
__*__
3033

3134
.nuget

‎.netconfig‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
[file ".github/dependabot.yml"]
2424
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
25-
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
25+
etag = a1aaba1440e5ee2a7b7f93fc0fb004d4e1d4d9780350c753f7c429e37241345a
2626
weak
27-
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
27+
sha = 387f0616b2c56adc4f33f2858da818f7e0d92ef3
2828

2929
[file ".github/workflows/build.yml"]
3030
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
@@ -34,9 +34,9 @@
3434

3535
[file ".gitignore"]
3636
url = https://github.com/devlooped/oss/blob/main/.gitignore
37-
etag = 20a8b49d57024abbd85aac5b0020c30e5eb68e0384b2761e93727c8780c4a991
37+
etag = 09b499201361a59fad0036e925f4008cdd7bdc6723ba37ff18cc509e6024b2bf
3838
weak
39-
sha = a225b7a9f609f26bcc24e0d84f663387be251a7d
39+
sha = c76f0cc3e225e39e79420587d94852e12cdcb32a
4040

4141
[file "Directory.Build.rsp"]
4242
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -56,9 +56,9 @@
5656
sha = 0683ee777d7d878d4bf013d7deea352685135a05
5757
[file "src/Directory.Build.props"]
5858
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
59-
etag = bd05f9f240823c0ac79ddfefe654061550c36f82dd94fa513b82900e92686a5f
59+
etag = b2b90c6d617db9712cc8be2031b767d3ba951015717984f52b4872cc39f93e72
6060
weak
61-
sha = dd13ed3334135c30dcb1e3b2295dc7622de298d9
61+
sha = a1f5d11d1821959a141567ed24f9ea43205edd13
6262

6363
[file "src/Directory.Build.targets"]
6464
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
@@ -105,9 +105,9 @@
105105
weak
106106
[file ".github/workflows/includes.yml"]
107107
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
108-
sha = 06628725a6303bb8c4cf3076a384fc982a91bc0b
108+
sha = 7c1c6e615b5785e0ac9db33cb17343d6c1de16ff
109109

110-
etag = 478f91d4126230e57cc601382da1ba23f9daa054645b4af89800d8dd862e64fd
110+
etag = 5e6a10be141ee629201bfad01eae09b5c36a67f541ec7ab411ae400b5d73de1d
111111
weak
112112
[file ".github/release.yml"]
113113
url = https://github.com/devlooped/oss/blob/main/.github/release.yml
@@ -154,6 +154,6 @@
154154
weak
155155
[file ".github/workflows/dotnet-env.yml"]
156156
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-env.yml
157-
sha = 77e83f238196d2723640abef0c7b6f43994f9747
158-
etag = fcb9759a96966df40dcd24906fd328ddec05953b7e747a6bb8d0d1e4c3865274
157+
sha = 7c1c6e615b5785e0ac9db33cb17343d6c1de16ff
158+
etag = 68c1e28f475ff9d05f985bf53a51fce6e64b24a8b75bd8e47119ff57309281f1
159159
weak

‎readme.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,11 +411,10 @@ prefix to add or remove workloads respectively, for example.
411411
[![domischell](https://avatars.githubusercontent.com/u/66068846?u=0a5c5e2e7d90f15ea657bc660f175605935c5bea&v=4&s=39 "domischell")](https://github.com/DominicSchell)
412412
[![Adrian Alonso](https://avatars.githubusercontent.com/u/2027083?u=129cf516d99f5cb2fd0f4a0787a069f3446b7522&v=4&s=39 "Adrian Alonso")](https://github.com/adalon)
413413
[![torutek](https://avatars.githubusercontent.com/u/33917059?v=4&s=39 "torutek")](https://github.com/torutek)
414-
[![mccaffers](https://avatars.githubusercontent.com/u/16667079?u=110034edf51097a5ee82cb6a94ae5483568e3469&v=4&s=39 "mccaffers")](https://github.com/mccaffers)
414+
[![Ryan McCaffery](https://avatars.githubusercontent.com/u/16667079?u=c0daa64bb5c1b572130e05ae2b6f609ecc912d4d&v=4&s=39 "Ryan McCaffery")](https://github.com/mccaffers)
415415
[![Seika Logiciel](https://avatars.githubusercontent.com/u/2564602?v=4&s=39 "Seika Logiciel")](https://github.com/SeikaLogiciel)
416416
[![Andrew Grant](https://avatars.githubusercontent.com/devlooped-user?s=39 "Andrew Grant")](https://github.com/wizardness)
417-
[![Lars](https://avatars.githubusercontent.com/u/1727124?v=4&s=39 "Lars")](https://github.com/latonz)
418-
[![prime167](https://avatars.githubusercontent.com/u/3722845?v=4&s=39 "prime167")](https://github.com/prime167)
417+
[![eska-gmbh](https://avatars.githubusercontent.com/devlooped-team?s=39 "eska-gmbh")](https://github.com/eska-gmbh)
419418

420419

421420
<!-- sponsors.md -->

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
</ItemGroup>
168168

169169
<ItemGroup Label="OSMF" Condition="Exists('$(MSBuildThisFileDirectory)..\osmfeula.txt')">
170-
<Content Include="$(MSBuildThisFileDirectory)..\osmfeula.txt" Link="osmfeula.txt" Pack="true" PackagePath="OSMFEULA.txt" />
170+
<Content Include="$(MSBuildThisFileDirectory)..\osmfeula.txt" Link="osmfeula.txt" Pack="true" PackagePath="OSMFEULA.txt" Visible="false" />
171171
</ItemGroup>
172172

173173
<Import Project="Directory.props" Condition="Exists('Directory.props')"/>

0 commit comments

Comments
 (0)