Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 5a02243

Browse files
committedMay 25, 2024·
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Add static usings to allow unprefixed ThrowXxxx devlooped/oss@6dfe21f - Fix dependabot group for tests devlooped/oss@49661db - Add compatibility for non-SDK projects without InitializeSourceControlInformation target devlooped/oss@6e96c59 - Make sure build runs before pack devlooped/oss@ede013a - Switch to PackOnBuild=true and remove pack step devlooped/oss@6e7a3ab - Upload binlog artifact on debug runs devlooped/oss@a67ae78 - Set env:gh_token if present as secret devlooped/oss@97ebd18 - Add common sponsors metadata to assemblies devlooped/oss@0789bf0 - Only ignore App folder directly under the root devlooped/oss@02811fa - Update dotnet-file.yml with fix to create pull request action devlooped/oss@11a331d - Bump create-pr dependency to avoid error with existing PRs devlooped/oss@11a8757 - Only commit markdown files when resolving includes devlooped/oss@2c10a83
1 parent e62b7c3 commit 5a02243

10 files changed

+59
-42
lines changed
 

‎.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ updates:
2929
- "Microsoft.AspNetCore*"
3030
Tests:
3131
patterns:
32-
- "Microsoft.NET.Tests*"
32+
- "Microsoft.NET.Test*"
3333
- "xunit*"
3434
- "coverlet*"
3535
ThisAssembly:

‎.github/workflows/build.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ env:
1919
DOTNET_NOLOGO: true
2020
VersionPrefix: 42.42.${{ github.run_number }}
2121
VersionLabel: ${{ github.ref }}
22-
22+
PackOnBuild: true
23+
GeneratePackageOnBuild: true
24+
GH_TOKEN: ${{ secrets.GH_TOKEN }}
25+
2326
defaults:
2427
run:
2528
shell: bash
@@ -67,8 +70,12 @@ jobs:
6770
- name: 🧪 test
6871
uses: ./.github/workflows/test
6972

70-
- name: 📦 pack
71-
run: dotnet pack -m:1 -bl:pack.binlog
73+
- name: 🐛 logs
74+
uses: actions/upload-artifact@v3
75+
if: runner.debug && always()
76+
with:
77+
name: logs
78+
path: '*.binlog'
7279

7380
# Only push CI package to sleet feed if building on ubuntu (fastest)
7481
- name: 🚀 sleet
@@ -79,13 +86,6 @@ jobs:
7986
dotnet tool install -g --version 4.0.18 sleet
8087
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"
8188
82-
- name: 🐛 logs
83-
uses: actions/upload-artifact@v3
84-
if: runner.debug && always()
85-
with:
86-
name: logs
87-
path: '*.binlog'
88-
8989
dotnet-format:
9090
runs-on: ubuntu-latest
9191
steps:

‎.github/workflows/dotnet-file.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
validate: false
7171

7272
- name: ✍ pull request
73-
uses: peter-evans/create-pull-request@v4
73+
uses: peter-evans/create-pull-request@v6
7474
with:
7575
base: main
7676
branch: dotnet-file-sync

‎.github/workflows/includes.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ jobs:
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

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ on:
1010
env:
1111
DOTNET_NOLOGO: true
1212
Configuration: Release
13-
13+
PackOnBuild: true
14+
GeneratePackageOnBuild: true
15+
GH_TOKEN: ${{ secrets.GH_TOKEN }}
16+
1417
jobs:
1518
publish:
1619
runs-on: ubuntu-latest
@@ -27,15 +30,12 @@ jobs:
2730
- name: 🧪 test
2831
uses: ./.github/workflows/test
2932

30-
- name: 📦 pack
31-
run: dotnet pack -m:1 -p:version=${GITHUB_REF#refs/*/v} -bl:pack.binlog
32-
33-
- name: 🚀 nuget
34-
run: dotnet nuget push ./bin/**/*.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}} --skip-duplicate
35-
3633
- name: 🐛 logs
3734
uses: actions/upload-artifact@v3
3835
if: runner.debug && always()
3936
with:
4037
name: logs
41-
path: '*.binlog'
38+
path: '*.binlog'
39+
40+
- name: 🚀 nuget
41+
run: dotnet nuget push ./bin/**/*.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}} --skip-duplicate

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
bin
2-
app
32
obj
43
artifacts
54
pack
65
TestResults
76
results
87
BenchmarkDotNet.Artifacts
8+
/app
99
.vs
1010
.vscode
1111
.idea

‎.netconfig

+16-16
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
weak
3333
[file ".github/dependabot.yml"]
3434
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
35-
sha = 35ca3f3405452465058d89005f8a88a65847c377
36-
etag = f8080f8f04d87529e90d9a66751d304a7141196fb9734aa2d110784e52e66898
35+
sha = 49661dbf0720cde93eb5569be7523b5912351560
36+
etag = c147ea2f3431ca0338c315c4a45b56ee233c4d30f8d6ab698d0e1980a257fd6a
3737
weak
3838
[file ".github/workflows/dotnet-file.yml"]
3939
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
40-
sha = f08c3f28e46e28eb31e70846d65e57aa9553ce56
41-
etag = 567444486383d032c1c5fbc538f07e860f92b1d08c66ac6ffb1db64ca539251c
40+
sha = 11a331d50be517c29df5ab1358ef354d8871d59a
41+
etag = de115efac25b63d561d8b2ffcba3e7710bfef7bfefecb811ea943b6f2bd8de96
4242
weak
4343
[file "license.txt"]
4444
url = https://github.com/devlooped/oss/blob/main/license.txt
@@ -52,13 +52,13 @@
5252
weak
5353
[file "src/Directory.Build.props"]
5454
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
55-
sha = b1d14c6379e5820eb2c30e08bedbdf6e9c8e8cb2
56-
etag = 33cd19e0f599f444c320406da3452e9e84d28c3bb13c09e9190d9d2e7f129545
55+
sha = 6e96c592c7b44bfda10404b9f90e4b8fab299249
56+
etag = a4925eb815bbcecc022de8d3245db069573d96ac5ecdf5f0e604f06b5577b01e
5757
weak
5858
[file "src/Directory.Build.targets"]
5959
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
60-
sha = 1bf1eacc7ac3920d52c8e7045bfa34abc7c05302
61-
etag = 7cb1421f00d9f6f4c00f0ca98e485dcadb927cfa6b3f0b5d4fb212525d2ce9c0
60+
sha = 0789bf0988ea61b8dfa601d5769e68dc885ffb71
61+
etag = d44a194fd2bc6d564dea8c08245e20856f93ddf155f4acaf8dbfc9f088314737
6262
weak
6363
[file "src/nuget.config"]
6464
url = https://github.com/devlooped/oss/blob/main/src/nuget.config
@@ -81,8 +81,8 @@
8181
[file ".github/workflows/build.yml"]
8282
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
8383
weak
84-
sha = 13d67e2cf3f786c8189364fd29332aaa7dc575dc
85-
etag = c616df0877fba60002ccfc0397e9f731ddb22acbbb195a0598fedd4cac5f3135
84+
sha = 97ebd189e44da857e53e4d98af2727dd9dcb0740
85+
etag = f02775f5cdf8ba06238500e56bc25ca1e0aa329db4931f230c45bd1d7de1696d
8686
[file ".github/workflows/changelog.config"]
8787
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.config
8888
sha = 055a8b7c94b74ae139cce919d60b83976d2a9942
@@ -95,23 +95,23 @@
9595
weak
9696
[file ".github/workflows/includes.yml"]
9797
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
98-
sha = ac753b791d03997eb655efb26ae141b51addd1c0
99-
etag = fcd94a08ac9ebc0e8351deac4e7f085cf8ef67816cc50006e068f44166096eb8
98+
sha = 2c10a8351f61b0351c3db105445e032faa5c18aa
99+
etag = 3089f53e81f72b4d751548ff64e9fecbaa5ba2c6cd029d9288aab4e8f81580e1
100100
weak
101101
[file ".github/workflows/publish.yml"]
102102
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
103103
weak
104-
sha = d3022567c9ef2bc9461511e53b8abe065afdf03b
105-
etag = 58601b5a71c805647ab26e84053acdfb8d174eaa93330487af8a5503753c5707
104+
sha = 97ebd189e44da857e53e4d98af2727dd9dcb0740
105+
etag = 04a0796e61476765c0a233806e85fb3f461d7cf099a14c91e6c5abcab938062f
106106
[file ".github/workflows/sponsor.yml"]
107107
url = https://github.com/devlooped/oss/blob/main/.github/workflows/sponsor.yml
108108
sha = 8990ebb36199046e0b8098bad9e46dcef739c56e
109109
etag = e1dc114d2e8b57d50649989d32dbf0c9080ec77da3738a4cc79e9256d6ca5d3e
110110
weak
111111
[file ".gitignore"]
112112
url = https://github.com/devlooped/oss/blob/main/.gitignore
113-
sha = ef852e7d2ec9a845dac272dfc479909c0bc6d9f3
114-
etag = a556d6108892aa8e7e63476f4fad3a898b3ec1deda94332dd4e89d2fb6b555ca
113+
sha = 02811fa23b0a102b9b33048335d41e515bf75737
114+
etag = a9c37ae312afac14b78436a7d018af4483d88736b5f780576f2c5a0b3f14998c
115115
weak
116116
[file "Directory.Build.rsp"]
117117
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp

‎readme.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -438,21 +438,19 @@ The versioning scheme for packages is:
438438
[![Stephen Shaw](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/decriptor.png "Stephen Shaw")](https://github.com/decriptor)
439439
[![Torutek](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/torutek-gh.png "Torutek")](https://github.com/torutek-gh)
440440
[![DRIVE.NET, Inc.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/drivenet.png "DRIVE.NET, Inc.")](https://github.com/drivenet)
441-
[![Daniel Gnägi](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/dgnaegi.png "Daniel Gnägi")](https://github.com/dgnaegi)
442441
[![Ashley Medway](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/AshleyMedway.png "Ashley Medway")](https://github.com/AshleyMedway)
443442
[![Keith Pickford](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Keflon.png "Keith Pickford")](https://github.com/Keflon)
444443
[![Thomas Bolon](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/tbolon.png "Thomas Bolon")](https://github.com/tbolon)
445444
[![Kori Francis](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/kfrancis.png "Kori Francis")](https://github.com/kfrancis)
446445
[![Toni Wenzel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/twenzel.png "Toni Wenzel")](https://github.com/twenzel)
447446
[![Giorgi Dalakishvili](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Giorgi.png "Giorgi Dalakishvili")](https://github.com/Giorgi)
448447
[![Mike James](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/MikeCodesDotNET.png "Mike James")](https://github.com/MikeCodesDotNET)
448+
[![Uno Platform](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/unoplatform.png "Uno Platform")](https://github.com/unoplatform)
449449
[![Dan Siegel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/dansiegel.png "Dan Siegel")](https://github.com/dansiegel)
450450
[![Reuben Swartz](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/rbnswartz.png "Reuben Swartz")](https://github.com/rbnswartz)
451451
[![Jacob Foshee](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jfoshee.png "Jacob Foshee")](https://github.com/jfoshee)
452452
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Mrxx99.png "")](https://github.com/Mrxx99)
453453
[![Eric Johnson](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/eajhnsn1.png "Eric Johnson")](https://github.com/eajhnsn1)
454-
[![Norman Mackay](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/mackayn.png "Norman Mackay")](https://github.com/mackayn)
455-
[![Certify The Web](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/certifytheweb.png "Certify The Web")](https://github.com/certifytheweb)
456454
[![Ix Technologies B.V.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/IxTechnologies.png "Ix Technologies B.V.")](https://github.com/IxTechnologies)
457455
[![David JENNI](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/davidjenni.png "David JENNI")](https://github.com/davidjenni)
458456
[![Jonathan ](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Jonathan-Hickey.png "Jonathan ")](https://github.com/Jonathan-Hickey)
@@ -466,9 +464,12 @@ The versioning scheme for packages is:
466464
[![Ken Bonny](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/KenBonny.png "Ken Bonny")](https://github.com/KenBonny)
467465
[![Simon Cropp](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/SimonCropp.png "Simon Cropp")](https://github.com/SimonCropp)
468466
[![agileworks-eu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/agileworks-eu.png "agileworks-eu")](https://github.com/agileworks-eu)
469-
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/sorahex.png "")](https://github.com/sorahex)
467+
[![sorahex](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/sorahex.png "sorahex")](https://github.com/sorahex)
470468
[![Zheyu Shen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/arsdragonfly.png "Zheyu Shen")](https://github.com/arsdragonfly)
471469
[![Vezel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/vezel-dev.png "Vezel")](https://github.com/vezel-dev)
470+
[![Michael Staib](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/michaelstaib.png "Michael Staib")](https://github.com/michaelstaib)
471+
[![ChilliCream](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/ChilliCream.png "ChilliCream")](https://github.com/ChilliCream)
472+
[![4OTC](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/4OTC.png "4OTC")](https://github.com/4OTC)
472473
473474

474475
<!-- sponsors.md -->

‎src/Directory.Build.props

+10
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,16 @@
142142
<ProjectProperty Include="PublicKeyToken" />
143143
</ItemGroup>
144144

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

‎src/Directory.Build.targets

+5
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@
115115
</EmbeddedResource>
116116
</ItemGroup>
117117

118+
<ItemGroup Label="Sponsors">
119+
<AssemblyMetadata Include="Funding.PublicKey" Value="MIIBigKCAYEA5inhv8QymaDBOihNi1eY+6+hcIB5qSONFZxbxxXAyOtxAdjFCPM+94gIZqM9CDrX3pyg1lTJfml/a/FZSU9dB1ii5mSX/mNHBFXn1/l/gi1ErdbkIF5YbW6oxWFxf3G5mwVXwnPfxHTyQdmWQ3YJR+A3EB4kaFwLqA6Ha5lb2ObGpMTQJNakD4oTAGDhqHMGhu6PupGq5ie4qZcQ7N8ANw8xH7nicTkbqEhQABHWOTmLBWq5f5F6RYGF8P7cl0IWl/w4YcIZkGm2vX2fi26F9F60cU1v13GZEVDTXpJ9kzvYeM9sYk6fWaoyY2jhE51qbv0B0u6hScZiLREtm3n7ClJbIGXhkUppFS2JlNaX3rgQ6t+4LK8gUTyLt3zDs2H8OZyCwlCpfmGmdsUMkm1xX6t2r+95U3zywynxoWZfjBCJf41leM9OMKYwNWZ6LQMyo83HWw1PBIrX4ZLClFwqBcSYsXDyT8/ZLd1cdYmPfmtllIXxZhLClwT5qbCWv73VAgMBAAE=" />
120+
<AssemblyMetadata Include="Funding.GitHub" Value="devlooped" />
121+
</ItemGroup>
122+
118123
<Target Name="IsPackable" Returns="@(IsPackable)">
119124
<ItemGroup>
120125
<IsPackable Include="$(MSBuildProjectFullPath)" IsPackable="$(IsPackable)" PackageId="$(PackageId)" />

0 commit comments

Comments
 (0)