Skip to content

Commit 832c298

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Allow extending build with local-only files devlooped/oss@6ae80a1 - Use a better CI version number devlooped/oss@1ec6385 - Only override VersionPrefix if it has no value devlooped/oss@28a27ba
1 parent a89397c commit 832c298

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ on:
1717

1818
env:
1919
DOTNET_NOLOGO: true
20+
VersionPrefix: 42.42.${{ github.run_number }}
21+
VersionLabel: ${{ github.ref }}
2022

2123
defaults:
2224
run:
@@ -54,7 +56,7 @@ jobs:
5456
fetch-depth: 0
5557

5658
- name: 🙏 build
57-
run: dotnet build -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER"
59+
run: dotnet build -m:1
5860

5961
- name: ⚙ GNU grep
6062
if: matrix.os == 'macOS-latest'
@@ -66,7 +68,7 @@ jobs:
6668
uses: ./.github/workflows/test
6769

6870
- name: 📦 pack
69-
run: dotnet pack -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER"
71+
run: dotnet pack -m:1
7072

7173
# Only push CI package to sleet feed if building on ubuntu (fastest)
7274
- name: 🚀 sleet

.netconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
weak
2323
[file ".github/workflows/build.yml"]
2424
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
25-
sha = 7e3288c3c7746354edc2836e4fb71f11e17db83c
26-
etag = bea8f881a2c7a02de70a201806edb432f7185d39df762f76efdefe392ea019a5
25+
sha = 1ec63850f943894e4b032cfc8721ff1aaffda7e0
26+
etag = 8a28f50655857cd25e97709354943b9665fb5efe05cf637860f2c45315c5f5e7
2727
weak
2828
[file ".github/workflows/changelog.config"]
2929
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.config
@@ -99,13 +99,13 @@
9999
skip
100100
[file "src/Directory.Build.props"]
101101
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
102-
sha = ef8e7fa7593ded91d871d30eeebd0dc79f679159
103-
etag = 1d5ec6bdb8b12c13635a11364dcfe54aefb82cc171f332a8d536aa35476222d5
102+
sha = 6ae80a175a8f926ac5d9ffb0f6afd55d85cc9320
103+
etag = 69d4b16c14d5047b3ed812dbf556b0b8d77deb86f73af04b9bd3640220056fa8
104104
weak
105105
[file "src/Directory.Build.targets"]
106106
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
107-
sha = 96b67734de9897ae5fb99f3b87c7042e6ccd218b
108-
etag = a495854b35fb101774cdfd2b2c2875ed3dd85ada5d04cbdd3b7a90c9afdbe36f
107+
sha = 6ae80a175a8f926ac5d9ffb0f6afd55d85cc9320
108+
etag = a890e3c9574327c4885f386756cba483c0f8fb2446554e4badcb6ab5b0eecfd0
109109
weak
110110
[file "src/kzu.snk"]
111111
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk

src/Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
after the fixed prefix. This allows dogfooding a branch build.
113113
The suffix is sanitized and optionally turned into
114114
-->
115-
<VersionPrefix>42.42.42</VersionPrefix>
115+
<VersionPrefix Condition="$(VersionPrefix) == ''">42.42.42</VersionPrefix>
116116
</PropertyGroup>
117117

118118
<PropertyGroup Label="Version" Condition="$(VersionLabel) != ''">
@@ -142,4 +142,5 @@
142142
</ItemGroup>
143143

144144
<Import Project="Directory.props" Condition="Exists('Directory.props')"/>
145+
<Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
145146
</Project>

src/Directory.Build.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,5 +159,6 @@
159159

160160
<!-- Import before UsingTask because first to declare tasks wins -->
161161
<Import Project="Directory.targets" Condition="Exists('Directory.targets')"/>
162+
<Import Project="Directory.targets.user" Condition="Exists('Directory.targets.user')" />
162163

163-
</Project>
164+
</Project>

0 commit comments

Comments
 (0)