Skip to content

Commit e70479b

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Fix empty default path for NuGet SDK targets devlooped/oss@c679525 - 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 '/temp' directory to .gitignore devlooped/oss@79631d3 - Fix PackageId default from Pack SDK devlooped/oss@6e24389
1 parent 8832515 commit e70479b

8 files changed

Lines changed: 65 additions & 23 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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
bin
22
obj
3+
out
34
artifacts
45
pack
56
TestResults
67
results
78
BenchmarkDotNet.Artifacts
89
/app
10+
/mcps
11+
/temp
912
.vs
1013
.vscode
1114
.genaiscript
1215
.idea
1316
local.settings.json
1417
.env
18+
.next
1519
*.local
1620

1721
*.suo
@@ -26,6 +30,7 @@ local.settings.json
2630
*.binlog
2731
*.zip
2832
__azurite*.*
33+
AzuriteConfig
2934
__*__
3035

3136
.nuget

‎.netconfig‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
weak
2828
[file ".github/dependabot.yml"]
2929
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
30-
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
30+
sha = 387f0616b2c56adc4f33f2858da818f7e0d92ef3
3131

32-
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
32+
etag = a1aaba1440e5ee2a7b7f93fc0fb004d4e1d4d9780350c753f7c429e37241345a
3333
weak
3434
[file ".github/workflows/dotnet-file.yml"]
3535
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
@@ -49,15 +49,15 @@
4949
weak
5050
[file "src/Directory.Build.props"]
5151
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
52-
sha = dd13ed3334135c30dcb1e3b2295dc7622de298d9
52+
sha = 6e2438919e108aeb75106dc0737c45f5e55d5f42
5353

54-
etag = bd05f9f240823c0ac79ddfefe654061550c36f82dd94fa513b82900e92686a5f
54+
etag = f1d6384abf18d8d891ce5e835a10c73fe029c42151374be96d7e4af43d189c65
5555
weak
5656
[file "src/Directory.Build.targets"]
5757
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
58-
sha = 083a37bd9307ec820bac6ee3c7384083151d36d8
58+
sha = c67952501337303eda0fb8b340cb7606666abd8f
5959

60-
etag = 907682e5632a2ba430357e6e042a4ca33cb8c94a3a215d3091aa03f5958a4877
60+
etag = cb83faed0cc8b930a7b6bdc61bea03a54059858cf04353e55fee94d9e3ae0fad
6161
weak
6262
[file "src/nuget.config"]
6363
url = https://github.com/devlooped/oss/blob/main/src/nuget.config
@@ -99,9 +99,9 @@
9999
skip
100100
[file ".github/workflows/includes.yml"]
101101
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
102-
sha = 06628725a6303bb8c4cf3076a384fc982a91bc0b
102+
sha = 7c1c6e615b5785e0ac9db33cb17343d6c1de16ff
103103

104-
etag = 478f91d4126230e57cc601382da1ba23f9daa054645b4af89800d8dd862e64fd
104+
etag = 5e6a10be141ee629201bfad01eae09b5c36a67f541ec7ab411ae400b5d73de1d
105105
weak
106106
[file ".github/workflows/publish.yml"]
107107
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
@@ -111,9 +111,9 @@
111111
etag = c60411d1aa4e98e7f69e2d34cbccb8eb7e387ec11f6f8e78ee8d8b92122d7025
112112
[file ".gitignore"]
113113
url = https://github.com/devlooped/oss/blob/main/.gitignore
114-
sha = a225b7a9f609f26bcc24e0d84f663387be251a7d
114+
sha = 79631d381bcb4439b2313888a585722adcd1fcbc
115115

116-
etag = 20a8b49d57024abbd85aac5b0020c30e5eb68e0384b2761e93727c8780c4a991
116+
etag = c26776bc8fd1205fb3824e359f1868681e7291105eaa548dae7507200ee670bd
117117
weak
118118
[file "Directory.Build.rsp"]
119119
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -154,8 +154,8 @@
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
160160
[file "osmfeula.txt"]
161161
url = https://github.com/devlooped/.github/blob/main/osmfeula.txt

‎readme.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,6 @@ The versioning scheme for packages is:
494494
<!-- sponsors.md -->
495495
[![Clarius Org](https://avatars.githubusercontent.com/u/71888636?v=4&s=39 "Clarius Org")](https://github.com/clarius)
496496
[![MFB Technologies, Inc.](https://avatars.githubusercontent.com/u/87181630?v=4&s=39 "MFB Technologies, Inc.")](https://github.com/MFB-Technologies-Inc)
497-
[![Khamza Davletov](https://avatars.githubusercontent.com/u/13615108?u=11b0038e255cdf9d1940fbb9ae9d1d57115697ab&v=4&s=39 "Khamza Davletov")](https://github.com/khamza85)
498497
[![SandRock](https://avatars.githubusercontent.com/u/321868?u=99e50a714276c43ae820632f1da88cb71632ec97&v=4&s=39 "SandRock")](https://github.com/sandrock)
499498
[![DRIVE.NET, Inc.](https://avatars.githubusercontent.com/u/15047123?v=4&s=39 "DRIVE.NET, Inc.")](https://github.com/drivenet)
500499
[![Keith Pickford](https://avatars.githubusercontent.com/u/16598898?u=64416b80caf7092a885f60bb31612270bffc9598&v=4&s=39 "Keith Pickford")](https://github.com/Keflon)
@@ -515,11 +514,11 @@ The versioning scheme for packages is:
515514
[![domischell](https://avatars.githubusercontent.com/u/66068846?u=0a5c5e2e7d90f15ea657bc660f175605935c5bea&v=4&s=39 "domischell")](https://github.com/DominicSchell)
516515
[![Adrian Alonso](https://avatars.githubusercontent.com/u/2027083?u=129cf516d99f5cb2fd0f4a0787a069f3446b7522&v=4&s=39 "Adrian Alonso")](https://github.com/adalon)
517516
[![torutek](https://avatars.githubusercontent.com/u/33917059?v=4&s=39 "torutek")](https://github.com/torutek)
518-
[![mccaffers](https://avatars.githubusercontent.com/u/16667079?u=110034edf51097a5ee82cb6a94ae5483568e3469&v=4&s=39 "mccaffers")](https://github.com/mccaffers)
517+
[![Ryan McCaffery](https://avatars.githubusercontent.com/u/16667079?u=c0daa64bb5c1b572130e05ae2b6f609ecc912d4d&v=4&s=39 "Ryan McCaffery")](https://github.com/mccaffers)
519518
[![Seika Logiciel](https://avatars.githubusercontent.com/u/2564602?v=4&s=39 "Seika Logiciel")](https://github.com/SeikaLogiciel)
520519
[![Andrew Grant](https://avatars.githubusercontent.com/devlooped-user?s=39 "Andrew Grant")](https://github.com/wizardness)
521-
[![Lars](https://avatars.githubusercontent.com/u/1727124?v=4&s=39 "Lars")](https://github.com/latonz)
522-
[![prime167](https://avatars.githubusercontent.com/u/3722845?v=4&s=39 "prime167")](https://github.com/prime167)
520+
[![eska-gmbh](https://avatars.githubusercontent.com/devlooped-team?s=39 "eska-gmbh")](https://github.com/eska-gmbh)
521+
[![Geodata AS](https://avatars.githubusercontent.com/u/5946299?v=4&s=39 "Geodata AS")](https://github.com/geodata-no)
523522

524523

525524
<!-- sponsors.md -->

‎src/Directory.Build.props‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
4848
<!-- See https://learn.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#prunepackagereference-specification -->
4949
<RestoreEnablePackagePruning>true</RestoreEnablePackagePruning>
50+
51+
<!-- Needed to improve nuget default for empty PackageId. Workaround for https://github.com/NuGet/Home/issues/14928 -->
52+
<ImportNuGetBuildTasksPackTargetsFromSdk>false</ImportNuGetBuildTasksPackTargetsFromSdk>
5053
</PropertyGroup>
5154

5255
<PropertyGroup Label="Build">
@@ -167,7 +170,7 @@
167170
</ItemGroup>
168171

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

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

‎src/Directory.Build.targets‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,22 @@
3232
<IsPackable Condition="'$(PackageId)' != ''">true</IsPackable>
3333
</PropertyGroup>
3434

35+
<PropertyGroup>
36+
<!-- Save original PackageId to restore post-import -->
37+
<_PackageId>$(PackageId)</_PackageId>
38+
<!-- Since we set ImportNuGetBuildTasksPackTargetsFromSdk=false, the Sdk.targets doesn't even provide the path for this property :/ -->
39+
<NuGetBuildTasksPackTargets Condition="'$(NuGetBuildTasksPackTargets)' == ''">$(MSBuildSDKsPath)\..\NuGet.Build.Tasks.Pack.targets</NuGetBuildTasksPackTargets>
40+
</PropertyGroup>
41+
42+
<Import Project="$(NuGetBuildTasksPackTargets)" Condition="Exists('$(NuGetBuildTasksPackTargets)')"/>
43+
44+
<PropertyGroup>
45+
<!-- Revert the forced PackageId by the NuGet SDK targets for non-packable projects, see https://github.com/NuGet/Home/issues/14928 -->
46+
<PackageId Condition="'$(IsPackable)' == 'false'">$(_PackageId)</PackageId>
47+
<!-- If no PackageId was originally provided, ensure IsPackable is false -->
48+
<IsPackable Condition="'$(_PackageId)' == ''">false</IsPackable>
49+
</PropertyGroup>
50+
3551
<ItemGroup Condition="'$(IsPackable)' == 'true'" Label="NuGet">
3652
<!-- This is compatible with nugetizer and SDK pack -->
3753
<!-- Only difference is we don't copy either to output directory -->

0 commit comments

Comments
 (0)