Skip to content

Commit 6b3f438

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Update .editorconfig devlooped/oss@2981836 - Ignore test analyzer rules recursively. devlooped/oss@fd5b554 - Use a better CI version number devlooped/oss@1ec6385 - Don't run analyzers/codefixers in format devlooped/oss@543f7da - Fix action repo name devlooped/oss@ac753b7 - Update .gitignore with JetBrains private folder devlooped/oss@9dff0bd - Ignore app root folder too devlooped/oss@b87a8a7 - Only override VersionPrefix if it has no value devlooped/oss@28a27ba - Allow extending build with local-only files devlooped/oss@6ae80a1
1 parent a89397c commit 6b3f438

File tree

7 files changed

+36
-19
lines changed

7 files changed

+36
-19
lines changed

.editorconfig

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ dotnet_style_require_accessibility_modifiers = omit_if_default:error
5858
dotnet_diagnostic.IDE0040.severity = error
5959

6060
[*.cs]
61+
# Top-level files are definitely OK
62+
csharp_using_directive_placement = outside_namespace:silent
63+
csharp_style_namespace_declarations = block_scoped:silent
64+
csharp_prefer_simple_using_statement = true:suggestion
65+
csharp_prefer_braces = true:silent
66+
6167
# Prefer "var" everywhere
6268
csharp_style_var_for_built_in_types = true:suggestion
6369
csharp_style_var_when_type_is_apparent = true:suggestion
@@ -89,9 +95,12 @@ csharp_new_line_before_members_in_object_initializers = true
8995
csharp_new_line_before_members_in_anonymous_types = true
9096

9197
# Test settings
92-
[**/*Tests*/*{.cs,.vb}]
98+
[**/*Tests*/**{.cs,.vb}]
9399
# xUnit1013: Public method should be marked as test. Allows using records as test classes
94100
dotnet_diagnostic.xUnit1013.severity = none
95101

102+
# Default severity for analyzer diagnostics with category 'Style'
103+
dotnet_analyzer_diagnostic.category-Style.severity = none
104+
96105
# VSTHRD200: Use "Async" suffix for async methods
97106
dotnet_diagnostic.VSTHRD200.severity = none

.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

.github/workflows/includes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
token: ${{ env.GH_TOKEN }}
2727

2828
- name: +Mᐁ includes
29-
uses: devlooped/actions-include@v1
29+
uses: devlooped/actions-includes@v1
3030

3131
- name: ✍ pull request
3232
uses: peter-evans/create-pull-request@v4

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
bin
2+
app
23
obj
34
artifacts
45
pack
56
TestResults
67
.vs
78
.vscode
9+
.idea
810

911
*.suo
1012
*.sdf

.netconfig

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
url = https://github.com/devlooped/oss
33
[file ".editorconfig"]
44
url = https://github.com/devlooped/oss/blob/main/.editorconfig
5-
sha = 448cf45a26e068fe5d7164ea48d1dc8bf620df46
6-
etag = 897634b9ba05c00e8ef35b24533d31bc43a5299be5a64e240109ba4c00fcad15
5+
sha = fd5b554bf3538a3c92a0b49e395c8ad2e8429158
6+
etag = bf02d1679442e5169d03304164b8e9407997ac3132145831a91ba61fc8b50687
77
weak
88
[file ".gitattributes"]
99
url = https://github.com/devlooped/oss/blob/main/.gitattributes
@@ -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 = 543f7daf1e8a63ea0dc599ae0494df7d1a90caa4
26+
etag = 6abaf57f2624bc65517b8cc7b8a4b7e34542cf26f2ebcd1935a15a2a075c8733
2727
weak
2828
[file ".github/workflows/changelog.config"]
2929
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.config
@@ -47,8 +47,8 @@
4747
weak
4848
[file ".github/workflows/includes.yml"]
4949
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
50-
sha = f08c3f28e46e28eb31e70846d65e57aa9553ce56
51-
etag = 884175b3f80b39edc1a23c6a34d58aa3c481432d4f20938f9a834dd918ef283d
50+
sha = ac753b791d03997eb655efb26ae141b51addd1c0
51+
etag = fcd94a08ac9ebc0e8351deac4e7f085cf8ef67816cc50006e068f44166096eb8
5252
weak
5353
[file ".github/workflows/publish.yml"]
5454
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
@@ -67,8 +67,8 @@
6767
weak
6868
[file ".gitignore"]
6969
url = https://github.com/devlooped/oss/blob/main/.gitignore
70-
sha = c78868eba59a3e04602434684f9eac241fef13fb
71-
etag = 1c1705a3f0ed65e33c9133996ebaa100aa445a8b968b2904ad48fef938702006
70+
sha = b87a8a795a4c2b6830602225c066c11108552a99
71+
etag = 96e0860052044780f1fc9e3bdfbee09d82d5dddb8b1217d67460fc7330a64dd8
7272
weak
7373
[file ".netconfig"]
7474
url = https://github.com/devlooped/oss/blob/main/.netconfig
@@ -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)