Skip to content

Commit c41301c

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Use a better CI version number devlooped/oss@1ec6385 - Don't run analyzers/codefixers in format devlooped/oss@543f7da - Only override VersionPrefix if it has no value devlooped/oss@28a27ba - Allow extending build with local-only files devlooped/oss@6ae80a1 - Fix incremental build issue with package files and doc file devlooped/oss@96b6773
1 parent 7adc017 commit c41301c

4 files changed

Lines changed: 18 additions & 12 deletions

File tree

.github/workflows/build.yml

Lines changed: 7 additions & 3 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
@@ -88,4 +90,6 @@ jobs:
8890
fetch-depth: 0
8991

9092
- name: ✓ ensure format
91-
run: dotnet format --verify-no-changes -v:diag --exclude ~/.nuget
93+
run: |
94+
dotnet format whitespace --verify-no-changes -v:diag --exclude ~/.nuget
95+
dotnet format style --verify-no-changes -v:diag --exclude ~/.nuget

.netconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
weak
3030
[file ".github/workflows/build.yml"]
3131
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
32-
sha = 7e3288c3c7746354edc2836e4fb71f11e17db83c
33-
etag = bea8f881a2c7a02de70a201806edb432f7185d39df762f76efdefe392ea019a5
32+
sha = 543f7daf1e8a63ea0dc599ae0494df7d1a90caa4
33+
etag = 6abaf57f2624bc65517b8cc7b8a4b7e34542cf26f2ebcd1935a15a2a075c8733
3434
weak
3535
[file ".github/workflows/changelog.yml"]
3636
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml
@@ -84,13 +84,13 @@
8484
weak
8585
[file "src/Directory.Build.props"]
8686
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
87-
sha = ef8e7fa7593ded91d871d30eeebd0dc79f679159
88-
etag = 1d5ec6bdb8b12c13635a11364dcfe54aefb82cc171f332a8d536aa35476222d5
87+
sha = 6ae80a175a8f926ac5d9ffb0f6afd55d85cc9320
88+
etag = 69d4b16c14d5047b3ed812dbf556b0b8d77deb86f73af04b9bd3640220056fa8
8989
weak
9090
[file "src/Directory.Build.targets"]
9191
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
92-
sha = b9fb0a7d34d6c16fb404f9dff4aac6789ef08a00
93-
etag = 852b16129d2c681ad6ec86ff56b256541e0ce0961eb3a9492e0ead89ffe5a6bd
92+
sha = 6ae80a175a8f926ac5d9ffb0f6afd55d85cc9320
93+
etag = a890e3c9574327c4885f386756cba483c0f8fb2446554e4badcb6ab5b0eecfd0
9494
weak
9595
[file ".github/workflows/combine-prs.yml"]
9696
url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml

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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696

9797
<ItemGroup>
9898
<!-- Consider the project out of date if any of these files changes -->
99-
<UpToDateCheck Include="@(PackageFile);@(None);@(Content);@(EmbeddedResource)" />
99+
<UpToDateCheck Include="@(None);@(Content);@(EmbeddedResource)" />
100100
<!-- We'll typically use ThisAssembly.Strings instead of the built-in resource manager codegen -->
101101
<EmbeddedResource Update="@(EmbeddedResource)" Generator="" Condition="'$(EnableRexCodeGenerator)' != 'true'" />
102102
</ItemGroup>
@@ -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)