Skip to content

Commit dfcced1

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Change label from 'docs' to 'dependencies' devlooped/oss@2d1fb4e - Enable package pruning in Directory.Build.props devlooped/oss@0ff8b7b
1 parent 0bccdbe commit dfcced1

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

.github/workflows/includes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
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

.netconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@
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 = 3ebde0a8630d526b80f15801179116e17a857ff880a4442e7db7b075efa4fd63
8585
weak
86-
sha = c509be4378ff6789df4f66338cb88119453c0975
86+
sha = 0ff8b7b79a82112678326d1dc5543ed890311366
8787
[file "src/Directory.Build.targets"]
8888
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
8989
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
@@ -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 = 2d1fb4ed52b63689f2b20b994512ebac28721243
113+
etag = 34ade86f020dea717c6a27ad7dcd0069c35be2832c58b0ba961278a1efe34089
114114
weak
115115
[file ".github/workflows/combine-prs.yml"]
116116
url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml

src/Directory.Build.props

Lines changed: 14 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">

0 commit comments

Comments
 (0)