Skip to content

Commit f97be11

Browse files
devlooped-botkzu
devlooped-bot
authored and
kzu
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Change label from 'docs' to 'dependencies' devlooped/oss@2d1fb4e - Avoid failure on PR creation if osmfeula.txt doesn't exist in repo devlooped/oss@8ff5178 - Update create-pull-request action to version 8 devlooped/oss@0662872 - Switch to dnx retest shorthand devlooped/oss@fddfd89 - Ignore *.local recursively devlooped/oss@a225b7a - Ensure quiet confirmation of tool download/install devlooped/oss@e11b002 - Ensure dnx run succeeds even on Windows devlooped/oss@7f5f9ee - Update branches for push event in build.yml devlooped/oss@5da103c
1 parent 0e2ffa6 commit f97be11

8 files changed

Lines changed: 59 additions & 32 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- Release
1313
- Debug
1414
push:
15-
branches: [ main, dev, 'dev/*', 'feature/*', 'rel/*' ]
15+
branches: [ main, 'feature/*', 'rel/*' ]
1616
paths-ignore:
1717
- changelog.md
1818
- readme.md
@@ -72,9 +72,8 @@ jobs:
7272
run: dotnet build -m:1 -bl:build.binlog
7373

7474
- name: 🧪 test
75-
run: |
76-
dotnet tool update -g dotnet-retest
77-
dotnet retest -- --no-build
75+
shell: pwsh
76+
run: dnx --yes retest -- --no-build
7877

7978
- name: 🐛 logs
8079
uses: actions/upload-artifact@v4

‎.github/workflows/includes.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ jobs:
5050
((get-content -raw $file) -replace '\$product\$',$product).trim() | set-content $file
5151
5252
- name: ✍ pull request
53-
uses: peter-evans/create-pull-request@v6
53+
uses: peter-evans/create-pull-request@v8
5454
with:
5555
add-paths: |
5656
**.md
57-
osmfeula.txt
57+
*.txt
5858
base: main
5959
branch: markdown-includes
6060
delete-branch: true
61-
labels: docs
61+
labels: dependencies
6262
author: ${{ env.BOT_AUTHOR }}
6363
committer: ${{ env.BOT_AUTHOR }}
6464
commit-message: +Mᐁ includes

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ jobs:
3434
run: dotnet build -m:1 -bl:build.binlog
3535

3636
- name: 🧪 test
37-
run: |
38-
dotnet tool update -g dotnet-retest
39-
dotnet retest -- --no-build
37+
shell: pwsh
38+
run: dnx --yes retest -- --no-build
4039

4140
- name: 🐛 logs
4241
uses: actions/upload-artifact@v4

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ BenchmarkDotNet.Artifacts
1212
.idea
1313
local.settings.json
1414
.env
15+
*.local
1516

1617
*.suo
1718
*.sdf

‎.netconfig‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,27 @@
3838
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
3939
[file ".github/workflows/build.yml"]
4040
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
41-
etag = bf99c19427f4372ecfe38ec56aa8c411058684fb717da5661f17ac00388b3602
41+
etag = 851af098748f7cfa5bc3cfd4cc404a6de930532b59ceb2b3b535282c41226f3a
4242
weak
43-
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
43+
sha = 5da103cfbc1c4f9b5f59cfa698d2afbd744a7525
4444
[file ".github/workflows/changelog.yml"]
4545
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml
4646
etag = ad1efa56d6024ee1add2bcda81a7e4e38d0e9069473c6ff70374d5ce06af1f5a
4747
weak
4848
sha = 5fb172362c767bef7c36478f1a6bdc264723f8f9
4949
[file ".github/workflows/publish.yml"]
5050
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
51-
etag = 2ef43521627aa3a91dd55bdc2856ec0c6a93b42485d4fe9d6b181f9ee42c8e18
51+
etag = c60411d1aa4e98e7f69e2d34cbccb8eb7e387ec11f6f8e78ee8d8b92122d7025
5252
weak
53-
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
53+
sha = 7f5f9ee9f362f7e8f951d618f8f799033550e687
5454
[file ".github/workflows/release-artifacts.yml"]
5555
url = https://github.com/devlooped/oss/blob/main/.github/workflows/release-artifacts.yml
5656
skip
5757
[file ".gitignore"]
5858
url = https://github.com/devlooped/oss/blob/main/.gitignore
59-
etag = 11767f73556aa4c6c8bcc153b77ee8e8114f99fa3b885b0a7d66d082f91e77b3
59+
etag = 20a8b49d57024abbd85aac5b0020c30e5eb68e0384b2761e93727c8780c4a991
6060
weak
61-
sha = 3776526342afb3f57da7e80f2095e5fdca3c31c9
61+
sha = a225b7a9f609f26bcc24e0d84f663387be251a7d
6262
[file "Directory.Build.rsp"]
6363
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
6464
etag = 0ccae83fc51f400bfd7058170bfec7aba11455e24a46a0d7e6a358da6486e255
@@ -81,14 +81,14 @@
8181
sha = 0683ee777d7d878d4bf013d7deea352685135a05
8282
[file "src/Directory.Build.props"]
8383
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
84-
etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
84+
etag = bca64456d4e2cd05375a72b6de376b2c51edf6ad49029aa9a729f4a349a54656
8585
weak
86-
sha = c509be4378ff6789df4f66338cb88119453c0975
86+
sha = 4b84c540df6f37c30fb38df7947d79871c34f036
8787
[file "src/Directory.Build.targets"]
8888
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
89-
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
89+
etag = 09ce6b3f9521f8eedc44b77e7b7eaf90bf5df36e1ffb7f78ca27658812180977
9090
weak
91-
sha = 4339749ef4b8f66def75931df09ef99c149f8421
91+
sha = 4b84c540df6f37c30fb38df7947d79871c34f036
9292
[file "src/kzu.snk"]
9393
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk
9494
skip
@@ -109,8 +109,8 @@
109109
weak
110110
[file ".github/workflows/includes.yml"]
111111
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
112-
sha = 26e8cb798ce72dec7072db826cc9694d456797bd
113-
etag = df06492eeb2daaae4168d71bbb643f5da2693b67cdd58c42ffa44a191ee99b69
112+
sha = 06628725a6303bb8c4cf3076a384fc982a91bc0b
113+
etag = 478f91d4126230e57cc601382da1ba23f9daa054645b4af89800d8dd862e64fd
114114
weak
115115
[file ".github/workflows/combine-prs.yml"]
116116
url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml
@@ -150,3 +150,9 @@
150150
sha = 032439dbf180fca0539a5bd3a019f18ab3484b76
151151
etag = da7c0104131bd474b52fc9bc9f9bda6470e24ae38d4fb9f5c4f719bc01370ab5
152152
weak
153+
[file "readme.tmp.md"]
154+
url = https://github.com/devlooped/oss/blob/main/readme.tmp.md
155+
skip
156+
[file "oss.cs"]
157+
url = https://github.com/devlooped/oss/blob/main/oss.cs
158+
skip

‎readme.md‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,35 +183,31 @@ since the "Main" file selection is performed exclusively via MSBuild item manipu
183183
<!-- sponsors.md -->
184184
[![Clarius Org](https://avatars.githubusercontent.com/u/71888636?v=4&s=39 "Clarius Org")](https://github.com/clarius)
185185
[![MFB Technologies, Inc.](https://avatars.githubusercontent.com/u/87181630?v=4&s=39 "MFB Technologies, Inc.")](https://github.com/MFB-Technologies-Inc)
186+
[![Khamza Davletov](https://avatars.githubusercontent.com/u/13615108?u=11b0038e255cdf9d1940fbb9ae9d1d57115697ab&v=4&s=39 "Khamza Davletov")](https://github.com/khamza85)
186187
[![SandRock](https://avatars.githubusercontent.com/u/321868?u=99e50a714276c43ae820632f1da88cb71632ec97&v=4&s=39 "SandRock")](https://github.com/sandrock)
187188
[![DRIVE.NET, Inc.](https://avatars.githubusercontent.com/u/15047123?v=4&s=39 "DRIVE.NET, Inc.")](https://github.com/drivenet)
188189
[![Keith Pickford](https://avatars.githubusercontent.com/u/16598898?u=64416b80caf7092a885f60bb31612270bffc9598&v=4&s=39 "Keith Pickford")](https://github.com/Keflon)
189190
[![Thomas Bolon](https://avatars.githubusercontent.com/u/127185?u=7f50babfc888675e37feb80851a4e9708f573386&v=4&s=39 "Thomas Bolon")](https://github.com/tbolon)
190191
[![Kori Francis](https://avatars.githubusercontent.com/u/67574?u=3991fb983e1c399edf39aebc00a9f9cd425703bd&v=4&s=39 "Kori Francis")](https://github.com/kfrancis)
191-
[![Uno Platform](https://avatars.githubusercontent.com/u/52228309?v=4&s=39 "Uno Platform")](https://github.com/unoplatform)
192192
[![Reuben Swartz](https://avatars.githubusercontent.com/u/724704?u=2076fe336f9f6ad678009f1595cbea434b0c5a41&v=4&s=39 "Reuben Swartz")](https://github.com/rbnswartz)
193193
[![Jacob Foshee](https://avatars.githubusercontent.com/u/480334?v=4&s=39 "Jacob Foshee")](https://github.com/jfoshee)
194194
[![](https://avatars.githubusercontent.com/u/33566379?u=bf62e2b46435a267fa246a64537870fd2449410f&v=4&s=39 "")](https://github.com/Mrxx99)
195195
[![Eric Johnson](https://avatars.githubusercontent.com/u/26369281?u=41b560c2bc493149b32d384b960e0948c78767ab&v=4&s=39 "Eric Johnson")](https://github.com/eajhnsn1)
196-
[![David JENNI](https://avatars.githubusercontent.com/u/3200210?v=4&s=39 "David JENNI")](https://github.com/davidjenni)
197196
[![Jonathan ](https://avatars.githubusercontent.com/u/5510103?u=98dcfbef3f32de629d30f1f418a095bf09e14891&v=4&s=39 "Jonathan ")](https://github.com/Jonathan-Hickey)
198-
[![Charley Wu](https://avatars.githubusercontent.com/u/574719?u=ea7c743490c83e8e4b36af76000f2c71f75d636e&v=4&s=39 "Charley Wu")](https://github.com/akunzai)
199197
[![Ken Bonny](https://avatars.githubusercontent.com/u/6417376?u=569af445b6f387917029ffb5129e9cf9f6f68421&v=4&s=39 "Ken Bonny")](https://github.com/KenBonny)
200198
[![Simon Cropp](https://avatars.githubusercontent.com/u/122666?v=4&s=39 "Simon Cropp")](https://github.com/SimonCropp)
201199
[![agileworks-eu](https://avatars.githubusercontent.com/u/5989304?v=4&s=39 "agileworks-eu")](https://github.com/agileworks-eu)
202200
[![Zheyu Shen](https://avatars.githubusercontent.com/u/4067473?v=4&s=39 "Zheyu Shen")](https://github.com/arsdragonfly)
203201
[![Vezel](https://avatars.githubusercontent.com/u/87844133?v=4&s=39 "Vezel")](https://github.com/vezel-dev)
204202
[![ChilliCream](https://avatars.githubusercontent.com/u/16239022?v=4&s=39 "ChilliCream")](https://github.com/ChilliCream)
205203
[![4OTC](https://avatars.githubusercontent.com/u/68428092?v=4&s=39 "4OTC")](https://github.com/4OTC)
206-
[![Vincent Limo](https://avatars.githubusercontent.com/devlooped-user?s=39 "Vincent Limo")](https://github.com/v-limo)
207204
[![domischell](https://avatars.githubusercontent.com/u/66068846?u=0a5c5e2e7d90f15ea657bc660f175605935c5bea&v=4&s=39 "domischell")](https://github.com/DominicSchell)
208-
[![Justin Wendlandt](https://avatars.githubusercontent.com/u/1068431?u=f7715ed6a8bf926d96ec286f0f1c65f94bf86928&v=4&s=39 "Justin Wendlandt")](https://github.com/jwendl)
209205
[![Adrian Alonso](https://avatars.githubusercontent.com/u/2027083?u=129cf516d99f5cb2fd0f4a0787a069f3446b7522&v=4&s=39 "Adrian Alonso")](https://github.com/adalon)
210-
[![Michael Hagedorn](https://avatars.githubusercontent.com/u/61711586?u=8f653dfcb641e8c18cc5f78692ebc6bb3a0c92be&v=4&s=39 "Michael Hagedorn")](https://github.com/Eule02)
211206
[![torutek](https://avatars.githubusercontent.com/u/33917059?v=4&s=39 "torutek")](https://github.com/torutek)
212-
[![mccaffers](https://avatars.githubusercontent.com/u/16667079?u=739e110e62a75870c981640447efa5eb2cb3bc8f&v=4&s=39 "mccaffers")](https://github.com/mccaffers)
213-
[![Christoph Hochstätter](https://avatars.githubusercontent.com/u/17645550?u=01bbdcb84d03cac26260f1c951e046d24a324591&v=4&s=39 "Christoph Hochstätter")](https://github.com/christoh)
214-
[![ADS Fund](https://avatars.githubusercontent.com/u/202042116?v=4&s=39 "ADS Fund")](https://github.com/ADS-Fund)
207+
[![mccaffers](https://avatars.githubusercontent.com/u/16667079?u=110034edf51097a5ee82cb6a94ae5483568e3469&v=4&s=39 "mccaffers")](https://github.com/mccaffers)
208+
[![Seika Logiciel](https://avatars.githubusercontent.com/u/2564602?v=4&s=39 "Seika Logiciel")](https://github.com/SeikaLogiciel)
209+
[![Andrew Grant](https://avatars.githubusercontent.com/devlooped-user?s=39 "Andrew Grant")](https://github.com/wizardness)
210+
[![Lars](https://avatars.githubusercontent.com/u/1727124?v=4&s=39 "Lars")](https://github.com/latonz)
215211

216212

217213
<!-- sponsors.md -->

‎src/Directory.Build.props‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project TreatAsLocalProperty="VersionPrefix">
22
<!-- To extend/change the defaults, create a Directory.props alongside this file -->
33

44
<PropertyGroup Label="CI" Condition="'$(CI)' == ''">
@@ -43,6 +43,10 @@
4343

4444
<!-- Ensure MSBuild tooling can access package artifacts always via PKG_[PackageId] -->
4545
<GeneratePathProperty>true</GeneratePathProperty>
46+
<!-- Avoid warnings for test projects when we run dotnet pack on the whole solution. -->
47+
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
48+
<!-- See https://learn.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#prunepackagereference-specification -->
49+
<RestoreEnablePackagePruning>true</RestoreEnablePackagePruning>
4650
</PropertyGroup>
4751

4852
<PropertyGroup Label="Build">
@@ -134,6 +138,15 @@
134138
<VersionSuffix Condition="!$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</VersionSuffix>
135139
<!-- Special case for tags, the label is actually the version. Backs compat since passed-in value overrides MSBuild-set one -->
136140
<Version Condition="$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</Version>
141+
142+
<!-- In order for latest from main/master to always be greatest when using -prerelease switch on install/run,
143+
we change the scheme as follows:
144+
- main/master remain as today: VersionPrefix: 42.42.${{ github.run_number }} (from yaml)
145+
- others: VersionPrefix: 42.42.0-[label].${{ github.run_number }}
146+
-->
147+
<IsMaster Condition="$(VersionLabel.Contains('refs/heads/main')) or $(VersionLabel.Contains('refs/heads/master'))">true</IsMaster>
148+
<VersionPrefix Condition="'$(IsMaster)' != 'true'">42.42.0</VersionPrefix>
149+
<VersionSuffix Condition="'$(IsMaster)' != 'true'">$(VersionSuffix).$(GITHUB_RUN_NUMBER)</VersionSuffix>
137150
</PropertyGroup>
138151

139152
<ItemGroup Label="ThisAssembly.Project">
@@ -153,6 +166,10 @@
153166
<Using Include="System.ArgumentNullException" Static="true" />
154167
</ItemGroup>
155168

169+
<ItemGroup Label="OSMF" Condition="Exists('$(MSBuildThisFileDirectory)..\osmfeula.txt')">
170+
<None Include="$(MSBuildThisFileDirectory)..\osmfeula.txt" Link="osmfeula.txt" PackagePath="OSMFEULA.txt" />
171+
</ItemGroup>
172+
156173
<Import Project="Directory.props" Condition="Exists('Directory.props')"/>
157174
<Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
158175

‎src/Directory.Build.targets‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,15 @@
184184
</PropertyGroup>
185185
</Target>
186186

187+
<Target Name="UpdatePackageLicense" BeforeTargets="GetPackageMetadata;GenerateNuspec;Pack" Condition="'$(IsPackable)' == 'true'">
188+
<!-- If project has a None item with PackagePath=OSMFEULA.txt -->
189+
<PropertyGroup Condition="@(None -> WithMetadataValue('PackagePath', 'OSMFEULA.txt')) != ''">
190+
<PackageLicenseExpression></PackageLicenseExpression>
191+
<PackageLicenseFile>OSMFEULA.txt</PackageLicenseFile>
192+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
193+
</PropertyGroup>
194+
</Target>
195+
187196
<!-- Import before UsingTask because first to declare tasks wins -->
188197
<Import Project="Directory.targets" Condition="Exists('Directory.targets')"/>
189198
<Import Project="Directory.targets.user" Condition="Exists('Directory.targets.user')" />

0 commit comments

Comments
 (0)