Skip to content

Commit 4927e59

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Add static usings to allow unprefixed ThrowXxxx devlooped/oss@6dfe21f - Update to checkout@v4 devlooped/oss@5fb1723 - Add compatibility for non-SDK projects without InitializeSourceControlInformation target devlooped/oss@6e96c59 - Cleanup build and publish to use VersionLabel devlooped/oss@14deaea - Set Version from VersionLabel if it's a refs/tags/ devlooped/oss@57653a2 - Update dotnet-file.yml with fix to create pull request action devlooped/oss@11a331d - Don't add random wait on manual dotnet-file runs devlooped/oss@7afe350 - Improve default value for GenerateDocumentationFile devlooped/oss@b76de49 - Automatically use the new terminal logger if possible devlooped/oss@27a5c9a - Update publish.yml to include prereleased publish devlooped/oss@d793e7a - Allow choosing build configuration on dispatch devlooped/oss@fef4635 - Remove shared community files from ignores devlooped/oss@65f89e0 - Don't attempt to push to nuget.org without a key devlooped/oss@d11c4dc - Push also to sleet if configured devlooped/oss@40ee833 - Bump create-pr dependency to avoid error with existing PRs devlooped/oss@11a8757 - Only commit markdown files when resolving includes devlooped/oss@2c10a83 - Add common sponsors metadata to assemblies devlooped/oss@0789bf0 - Update assembly metadata format for Funding.GitHub devlooped/oss@5801de0 - SponsorLink metadata will be opt-in only by analyzer projects devlooped/oss@c618ea8
1 parent 714d162 commit 4927e59

File tree

12 files changed

+82
-109
lines changed

12 files changed

+82
-109
lines changed

‎.github/workflows/build.yml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,31 @@
44
name: build
55
on:
66
workflow_dispatch:
7+
inputs:
8+
configuration:
9+
type: choice
10+
description: Configuration
11+
options:
12+
- Release
13+
- Debug
714
push:
815
branches: [ main, dev, 'dev/*', 'feature/*', 'rel/*' ]
916
paths-ignore:
1017
- changelog.md
11-
- code-of-conduct.md
12-
- security.md
13-
- support.md
1418
- readme.md
1519
pull_request:
1620
types: [opened, synchronize, reopened]
1721

1822
env:
1923
DOTNET_NOLOGO: true
20-
VersionPrefix: 42.42.${{ github.run_number }}
21-
VersionLabel: ${{ github.ref }}
2224
PackOnBuild: true
2325
GeneratePackageOnBuild: true
26+
VersionPrefix: 42.42.${{ github.run_number }}
27+
VersionLabel: ${{ github.ref }}
2428
GH_TOKEN: ${{ secrets.GH_TOKEN }}
25-
29+
MSBUILDTERMINALLOGGER: auto
30+
Configuration: ${{ github.event.inputs.configuration || 'Release' }}
31+
2632
defaults:
2733
run:
2834
shell: bash
@@ -34,7 +40,7 @@ jobs:
3440
matrix: ${{ steps.lookup.outputs.matrix }}
3541
steps:
3642
- name: 🤘 checkout
37-
uses: actions/checkout@v2
43+
uses: actions/checkout@v4
3844

3945
- name: 🔎 lookup
4046
id: lookup
@@ -53,7 +59,7 @@ jobs:
5359
os: ${{ fromJSON(needs.os-matrix.outputs.matrix) }}
5460
steps:
5561
- name: 🤘 checkout
56-
uses: actions/checkout@v2
62+
uses: actions/checkout@v4
5763
with:
5864
submodules: recursive
5965
fetch-depth: 0
@@ -90,7 +96,7 @@ jobs:
9096
runs-on: ubuntu-latest
9197
steps:
9298
- name: 🤘 checkout
93-
uses: actions/checkout@v2
99+
uses: actions/checkout@v4
94100
with:
95101
submodules: recursive
96102
fetch-depth: 0

‎.github/workflows/changelog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
github_token: ${{ secrets.GITHUB_TOKEN }}
1818

1919
- name: 🤘 checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323
ref: main

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ jobs:
2424
github_token: ${{ secrets.GITHUB_TOKEN }}
2525

2626
- name: 🤘 checkout
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@v4
2828
with:
2929
fetch-depth: 0
3030
ref: main
3131
token: ${{ env.GH_TOKEN }}
3232

3333
- name: ⌛ rate
3434
shell: pwsh
35+
if: github.event_name != 'workflow_dispatch'
3536
run: |
3637
# add random sleep since we run on fixed schedule
3738
sleep (get-random -max 60)
@@ -70,7 +71,7 @@ jobs:
7071
validate: false
7172

7273
- name: ✍ pull request
73-
uses: peter-evans/create-pull-request@v4
74+
uses: peter-evans/create-pull-request@v6
7475
with:
7576
base: main
7677
branch: dotnet-file-sync

‎.github/workflows/includes.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ jobs:
2121
github_token: ${{ secrets.GITHUB_TOKEN }}
2222

2323
- name: 🤘 checkout
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525
with:
2626
token: ${{ env.GH_TOKEN }}
2727

2828
- name: +Mᐁ includes
2929
uses: devlooped/actions-includes@v1
3030

3131
- name: ✍ pull request
32-
uses: peter-evans/create-pull-request@v4
32+
uses: peter-evans/create-pull-request@v6
3333
with:
34+
add-paths: '**/*.md'
3435
base: main
3536
branch: markdown-includes
3637
delete-branch: true

‎.github/workflows/publish.yml‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,29 @@
55
name: publish
66
on:
77
release:
8-
types: [released]
8+
types: [prereleased, released]
99

1010
env:
1111
DOTNET_NOLOGO: true
1212
Configuration: Release
1313
PackOnBuild: true
1414
GeneratePackageOnBuild: true
15+
VersionLabel: ${{ github.ref }}
1516
GH_TOKEN: ${{ secrets.GH_TOKEN }}
16-
17+
MSBUILDTERMINALLOGGER: auto
18+
1719
jobs:
1820
publish:
1921
runs-on: ubuntu-latest
2022
steps:
2123
- name: 🤘 checkout
22-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2325
with:
2426
submodules: recursive
2527
fetch-depth: 0
2628

2729
- name: 🙏 build
28-
run: dotnet build -m:1 -p:version=${GITHUB_REF#refs/*/v} -bl:build.binlog
30+
run: dotnet build -m:1 -bl:build.binlog
2931

3032
- name: 🧪 test
3133
uses: ./.github/workflows/test
@@ -38,4 +40,15 @@ jobs:
3840
path: '*.binlog'
3941

4042
- name: 🚀 nuget
43+
env:
44+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
45+
if: env.NUGET_API_KEY != ''
4146
run: dotnet nuget push ./bin/**/*.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}} --skip-duplicate
47+
48+
- name: 🚀 sleet
49+
env:
50+
SLEET_CONNECTION: ${{ secrets.SLEET_CONNECTION }}
51+
if: env.SLEET_CONNECTION != ''
52+
run: |
53+
dotnet tool install -g --version 4.0.18 sleet
54+
sleet push bin --config none -f --verbose -p "SLEET_FEED_CONTAINER=nuget" -p "SLEET_FEED_CONNECTIONSTRING=${{ secrets.SLEET_CONNECTION }}" -p "SLEET_FEED_TYPE=azure" || echo "No packages found"

‎.github/workflows/sponsor.yml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎.netconfig‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,28 +41,28 @@
4141
weak
4242
[file ".github/workflows/build.yml"]
4343
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
44-
sha = 97ebd189e44da857e53e4d98af2727dd9dcb0740
45-
etag = f02775f5cdf8ba06238500e56bc25ca1e0aa329db4931f230c45bd1d7de1696d
44+
sha = 65f89e06ed7b2ac33ed3b729adc865b7076840d8
45+
etag = 20ef46203325f5b3d06a991f8b38c24bcea49fd74d39062a62003448e2dd8b0a
4646
weak
4747
[file ".github/workflows/changelog.yml"]
4848
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml
49-
sha = a4b66eb5f4dfb9704502f19f59ba33cb4855188c
50-
etag = 54c0b571648b1055beb3ddac180b34e93a9869b9f0277de306901b2c1dbe0b2c
49+
sha = 5fb172362c767bef7c36478f1a6bdc264723f8f9
50+
etag = ad1efa56d6024ee1add2bcda81a7e4e38d0e9069473c6ff70374d5ce06af1f5a
5151
weak
5252
[file ".github/workflows/dotnet-file.yml"]
5353
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
54-
sha = f08c3f28e46e28eb31e70846d65e57aa9553ce56
55-
etag = 567444486383d032c1c5fbc538f07e860f92b1d08c66ac6ffb1db64ca539251c
54+
sha = 7afe350f7e80a230e922db026d4e1198ba15cae1
55+
etag = 65e9794df6caff779eb989c8f71ddf4d4109b24a75af79e4f8d0fe6ba7bd9702
5656
weak
5757
[file ".github/workflows/includes.yml"]
5858
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
59-
sha = ac753b791d03997eb655efb26ae141b51addd1c0
60-
etag = fcd94a08ac9ebc0e8351deac4e7f085cf8ef67816cc50006e068f44166096eb8
59+
sha = 5fb172362c767bef7c36478f1a6bdc264723f8f9
60+
etag = e5ee22e115c925fb85ec931cda3ac811fcc453c03904554fa3f573935b221d34
6161
weak
6262
[file ".github/workflows/publish.yml"]
6363
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
64-
sha = 97ebd189e44da857e53e4d98af2727dd9dcb0740
65-
etag = 04a0796e61476765c0a233806e85fb3f461d7cf099a14c91e6c5abcab938062f
64+
sha = 40ee833a83d843c242914599e2635ca9a05aa837
65+
etag = 105db682c332b2bb0873e60a7d2da45b00fe7d83da0f0e7dbf9a84bc5be77c25
6666
weak
6767
[file ".github/workflows/test/action.yml"]
6868
url = https://github.com/devlooped/oss/blob/main/.github/workflows/test/action.yml
@@ -76,8 +76,8 @@
7676
weak
7777
[file "Directory.Build.rsp"]
7878
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
79-
sha = ae25fae9d7daf0cb47d537ba870914aa3052f0c9
80-
etag = 6a6c6e1d3895df953abf14c82b0899e3eea75cdcd679f6212dcfea15183d73d6
79+
sha = a75b141696469a08a5690fed9433d41cfbac1077
80+
etag = 4ca5cb069b08db5de966e081e2c4b96e3b6a030680d98f1d9ae5f3305e87bfc3
8181
weak
8282
[file "_config.yml"]
8383
url = https://github.com/devlooped/oss/blob/main/_config.yml
@@ -96,24 +96,19 @@
9696
weak
9797
[file "src/Directory.Build.props"]
9898
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
99-
sha = b1d14c6379e5820eb2c30e08bedbdf6e9c8e8cb2
100-
etag = 33cd19e0f599f444c320406da3452e9e84d28c3bb13c09e9190d9d2e7f129545
99+
sha = b76de49afb376aa48eb172963ed70663b59b31d3
100+
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
101101
weak
102102
[file "src/Directory.Build.targets"]
103103
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
104-
sha = 1bf1eacc7ac3920d52c8e7045bfa34abc7c05302
105-
etag = 7cb1421f00d9f6f4c00f0ca98e485dcadb927cfa6b3f0b5d4fb212525d2ce9c0
104+
sha = 33a20db26e47589769284817b271ce67ea9ccfd8
105+
etag = 1a3a0151b5771ee97ed8351254ff4c18a0ff568e0df5c33c6830f069bfbb067b
106106
weak
107107
[file "src/kzu.snk"]
108108
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk
109109
sha = 0683ee777d7d878d4bf013d7deea352685135a05
110110
etag = b8d789b5b6bea017cdcc8badcea888ad78de3e34298efca922054e9fb0e7b6b9
111111
weak
112-
[file "src/nuget.config"]
113-
url = https://github.com/devlooped/oss/blob/main/src/nuget.config
114-
sha = b2fa09bd9db6de89e37a8ba6705b5659e435dafd
115-
etag = eb2d09e546aa1e11c0b464d9ed6ab2d3c028a1d86c3ac40a318053625fb72819
116-
weak
117112
[file ".github/workflows/combine-prs.yml"]
118113
url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml
119114
sha = c1610886eba42cb250e3894aed40c0a258cd383d
@@ -129,8 +124,3 @@
129124
sha = 055a8b7c94b74ae139cce919d60b83976d2a9942
130125
etag = ddb17acb5872e9e69a76f9dec0ca590f25382caa2ccf750df058dcabb674db2b
131126
weak
132-
[file ".github/workflows/sponsor.yml"]
133-
url = https://github.com/devlooped/oss/blob/main/.github/workflows/sponsor.yml
134-
sha = 8990ebb36199046e0b8098bad9e46dcef739c56e
135-
etag = e1dc114d2e8b57d50649989d32dbf0c9080ec77da3738a4cc79e9256d6ca5d3e
136-
weak

‎Directory.Build.rsp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
-nr:false
33
-m:1
44
-v:m
5-
-clp:Summary;ForceNoAlign
5+
-clp:Summary;ForceNoAlign
6+
-l:trx

‎readme.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,12 @@ respectively.
271271
[![Kori Francis](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/kfrancis.png "Kori Francis")](https://github.com/kfrancis)
272272
[![Toni Wenzel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/twenzel.png "Toni Wenzel")](https://github.com/twenzel)
273273
[![Giorgi Dalakishvili](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Giorgi.png "Giorgi Dalakishvili")](https://github.com/Giorgi)
274-
[![Mike James](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/MikeCodesDotNET.png "Mike James")](https://github.com/MikeCodesDotNET)
274+
[![Uno Platform](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/unoplatform.png "Uno Platform")](https://github.com/unoplatform)
275275
[![Dan Siegel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/dansiegel.png "Dan Siegel")](https://github.com/dansiegel)
276276
[![Reuben Swartz](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/rbnswartz.png "Reuben Swartz")](https://github.com/rbnswartz)
277277
[![Jacob Foshee](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jfoshee.png "Jacob Foshee")](https://github.com/jfoshee)
278278
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Mrxx99.png "")](https://github.com/Mrxx99)
279279
[![Eric Johnson](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/eajhnsn1.png "Eric Johnson")](https://github.com/eajhnsn1)
280-
[![Norman Mackay](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/mackayn.png "Norman Mackay")](https://github.com/mackayn)
281-
[![Certify The Web](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/certifytheweb.png "Certify The Web")](https://github.com/certifytheweb)
282280
[![Ix Technologies B.V.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/IxTechnologies.png "Ix Technologies B.V.")](https://github.com/IxTechnologies)
283281
[![David JENNI](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/davidjenni.png "David JENNI")](https://github.com/davidjenni)
284282
[![Jonathan ](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Jonathan-Hickey.png "Jonathan ")](https://github.com/Jonathan-Hickey)
@@ -288,14 +286,14 @@ respectively.
288286
[![Seann Alexander](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/seanalexander.png "Seann Alexander")](https://github.com/seanalexander)
289287
[![Tino Hager](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/tinohager.png "Tino Hager")](https://github.com/tinohager)
290288
[![Mark Seemann](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/ploeh.png "Mark Seemann")](https://github.com/ploeh)
291-
[![Angelo Belchior](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/angelobelchior.png "Angelo Belchior")](https://github.com/angelobelchior)
292289
[![Ken Bonny](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/KenBonny.png "Ken Bonny")](https://github.com/KenBonny)
293290
[![Simon Cropp](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/SimonCropp.png "Simon Cropp")](https://github.com/SimonCropp)
294291
[![agileworks-eu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/agileworks-eu.png "agileworks-eu")](https://github.com/agileworks-eu)
295292
[![sorahex](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/sorahex.png "sorahex")](https://github.com/sorahex)
296293
[![Zheyu Shen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/arsdragonfly.png "Zheyu Shen")](https://github.com/arsdragonfly)
297294
[![Vezel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/vezel-dev.png "Vezel")](https://github.com/vezel-dev)
298-
[![Georg Jung](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/georg-jung.png "Georg Jung")](https://github.com/georg-jung)
295+
[![ChilliCream](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/ChilliCream.png "ChilliCream")](https://github.com/ChilliCream)
296+
[![4OTC](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/4OTC.png "4OTC")](https://github.com/4OTC)
299297
300298

301299
<!-- sponsors.md -->

‎src/Directory.Build.props‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646

4747
<PropertyGroup Label="Build">
4848
<Configuration Condition="'$(Configuration)' == '' and $(CI)">Release</Configuration>
49-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
50-
<GenerateDocumentationFile Condition="$(MSBuildProjectName.Contains('Tests'))">false</GenerateDocumentationFile>
5149
<LangVersion>Latest</LangVersion>
5250

5351
<!-- See https://docs.microsoft.com/en-us/dotnet/standard/assembly/reference-assemblies -->
@@ -118,6 +116,8 @@
118116

119117
<PropertyGroup Label="Version" Condition="$(VersionLabel) != ''">
120118
<_VersionLabel>$(VersionLabel.Replace('refs/heads/', ''))</_VersionLabel>
119+
<_VersionLabel>$(_VersionLabel.Replace('refs/tags/v', ''))</_VersionLabel>
120+
121121
<!-- For PRs, we just need a fixed package version numbered after the PR # itself, so remove the commits # at the end -->
122122
<_VersionLabel Condition="$(_VersionLabel.Contains('refs/pull/'))">$(VersionLabel.TrimEnd('.0123456789'))</_VersionLabel>
123123
<!-- Next replace the prefix for simply 'pr', so we end up with 'pr99/merge' by default -->
@@ -128,7 +128,9 @@
128128
<_VersionLabel>$(_VersionLabel.Replace('/', '-'))</_VersionLabel>
129129

130130
<!-- Set sanitized version to the actual version suffix used in build/pack -->
131-
<VersionSuffix>$(_VersionLabel)</VersionSuffix>
131+
<VersionSuffix Condition="!$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</VersionSuffix>
132+
<!-- Special case for tags, the label is actually the version. Backs compat since passed-in value overrides MSBuild-set one -->
133+
<Version Condition="$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</Version>
132134
</PropertyGroup>
133135

134136
<ItemGroup Label="ThisAssembly.Project">
@@ -142,6 +144,16 @@
142144
<ProjectProperty Include="PublicKeyToken" />
143145
</ItemGroup>
144146

147+
<ItemGroup Label="Throw">
148+
<Using Include="System.ArgumentException" Static="true" />
149+
<Using Include="System.ArgumentOutOfRangeException" Static="true" />
150+
<Using Include="System.ArgumentNullException" Static="true" />
151+
</ItemGroup>
152+
145153
<Import Project="Directory.props" Condition="Exists('Directory.props')"/>
146154
<Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
155+
156+
<!-- Implemented by SDK in .targets, guaranteeing it's overwritten. Added here since we add a DependsOnTargets to it.
157+
Covers backwards compatiblity with non-SDK projects. -->
158+
<Target Name="InitializeSourceControlInformation" />
147159
</Project>

0 commit comments

Comments
 (0)