Skip to content

Commit 5822f2c

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Ensure dnx run succeeds even on Windows devlooped/oss@7f5f9ee - Update create-pull-request action to version 8 devlooped/oss@0662872 - Enable package pruning in Directory.Build.props devlooped/oss@0ff8b7b
1 parent 56133ff commit 5822f2c

File tree

5 files changed

+26
-17
lines changed

5 files changed

+26
-17
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ 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

.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

.netconfig

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
weak
3939
[file ".github/workflows/build.yml"]
4040
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
41-
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
42-
etag = bf99c19427f4372ecfe38ec56aa8c411058684fb717da5661f17ac00388b3602
41+
sha = 7f5f9ee9f362f7e8f951d618f8f799033550e687
42+
etag = a04ce46114292f5c0e76bc1f260381b174c93d6f264749dfacbfc892238bec73
4343
weak
4444
[file ".github/workflows/changelog.yml"]
4545
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml
@@ -53,8 +53,8 @@
5353
weak
5454
[file ".github/workflows/publish.yml"]
5555
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
56-
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
57-
etag = 2ef43521627aa3a91dd55bdc2856ec0c6a93b42485d4fe9d6b181f9ee42c8e18
56+
sha = 7f5f9ee9f362f7e8f951d618f8f799033550e687
57+
etag = c60411d1aa4e98e7f69e2d34cbccb8eb7e387ec11f6f8e78ee8d8b92122d7025
5858
weak
5959
[file ".gitignore"]
6060
url = https://github.com/devlooped/oss/blob/main/.gitignore
@@ -83,8 +83,8 @@
8383
weak
8484
[file "src/Directory.Build.props"]
8585
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
86-
sha = 95b338b9780de6b8ed11f060fed2d300f136ec60
87-
etag = 5e73ffebd7aef6fecae5a73d4fb044bf46f3a593ee2858ff1648d9c337e546ad
86+
sha = 0ff8b7b79a82112678326d1dc5543ed890311366
87+
etag = 3ebde0a8630d526b80f15801179116e17a857ff880a4442e7db7b075efa4fd63
8888
weak
8989
[file "src/Directory.Build.targets"]
9090
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
@@ -116,8 +116,8 @@
116116
weak
117117
[file ".github/workflows/includes.yml"]
118118
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
119-
sha = 2d1fb4ed52b63689f2b20b994512ebac28721243
120-
etag = 34ade86f020dea717c6a27ad7dcd0069c35be2832c58b0ba961278a1efe34089
119+
sha = 06628725a6303bb8c4cf3076a384fc982a91bc0b
120+
etag = 478f91d4126230e57cc601382da1ba23f9daa054645b4af89800d8dd862e64fd
121121
weak
122122
[file ".github/workflows/dotnet-file-core.yml"]
123123
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml

src/Directory.Build.props

Lines changed: 12 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)' == ''">
@@ -45,6 +45,8 @@
4545
<GeneratePathProperty>true</GeneratePathProperty>
4646
<!-- Avoid warnings for test projects when we run dotnet pack on the whole solution. -->
4747
<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>
4850
</PropertyGroup>
4951

5052
<PropertyGroup Label="Build">
@@ -136,6 +138,15 @@
136138
<VersionSuffix Condition="!$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</VersionSuffix>
137139
<!-- Special case for tags, the label is actually the version. Backs compat since passed-in value overrides MSBuild-set one -->
138140
<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>
139150
</PropertyGroup>
140151

141152
<ItemGroup Label="ThisAssembly.Project">

0 commit comments

Comments
 (0)