Skip to content

Commit 3bfa19c

Browse files
devlooped-botkzu
authored andcommitted
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Allow extending build with local-only files devlooped/oss@6ae80a1 - Fix action repo name devlooped/oss@ac753b7 - Update .editorconfig devlooped/oss@2981836 - Update .gitignore with JetBrains private folder devlooped/oss@9dff0bd - Only override VersionPrefix if it has no value devlooped/oss@28a27ba
1 parent 372d4e9 commit 3bfa19c

File tree

6 files changed

+25
-13
lines changed

6 files changed

+25
-13
lines changed

.editorconfig

Lines changed: 9 additions & 0 deletions
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
@@ -93,5 +99,8 @@ csharp_new_line_before_members_in_anonymous_types = true
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/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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ pack
55
TestResults
66
.vs
77
.vscode
8+
.idea
89

910
*.suo
1011
*.sdf

.netconfig

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
skip
3030
[file ".editorconfig"]
3131
url = https://github.com/devlooped/oss/blob/main/.editorconfig
32-
sha = 448cf45a26e068fe5d7164ea48d1dc8bf620df46
33-
etag = 897634b9ba05c00e8ef35b24533d31bc43a5299be5a64e240109ba4c00fcad15
32+
sha = 29818360755cdb9ba5527013a2ecc9670c437e44
33+
etag = f0b411ee5aa5ddb4449d98ad73fe11c921589b8d26e4f4527d58e26d39f03958
3434
weak
3535
[file ".gitattributes"]
3636
url = https://github.com/devlooped/oss/blob/main/.gitattributes
@@ -60,8 +60,8 @@
6060
skip
6161
[file ".gitignore"]
6262
url = https://github.com/devlooped/oss/blob/main/.gitignore
63-
sha = c78868eba59a3e04602434684f9eac241fef13fb
64-
etag = 1c1705a3f0ed65e33c9133996ebaa100aa445a8b968b2904ad48fef938702006
63+
sha = 9dff0bde290185226986f512c75fa0434bc9fe3f
64+
etag = 7b3f23aa88e3ed628f03677a5b0fc4587c404bd0ef97dcf9650917a48316d51c
6565
weak
6666
[file "Directory.Build.rsp"]
6767
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -80,13 +80,13 @@
8080
weak
8181
[file "src/Directory.Build.props"]
8282
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
83-
sha = ef8e7fa7593ded91d871d30eeebd0dc79f679159
84-
etag = 1d5ec6bdb8b12c13635a11364dcfe54aefb82cc171f332a8d536aa35476222d5
83+
sha = 6ae80a175a8f926ac5d9ffb0f6afd55d85cc9320
84+
etag = 69d4b16c14d5047b3ed812dbf556b0b8d77deb86f73af04b9bd3640220056fa8
8585
weak
8686
[file "src/Directory.Build.targets"]
8787
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
88-
sha = 96b67734de9897ae5fb99f3b87c7042e6ccd218b
89-
etag = a495854b35fb101774cdfd2b2c2875ed3dd85ada5d04cbdd3b7a90c9afdbe36f
88+
sha = 6ae80a175a8f926ac5d9ffb0f6afd55d85cc9320
89+
etag = a890e3c9574327c4885f386756cba483c0f8fb2446554e4badcb6ab5b0eecfd0
9090
weak
9191
[file "src/kzu.snk"]
9292
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk
@@ -113,8 +113,8 @@
113113
weak
114114
[file ".github/workflows/includes.yml"]
115115
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
116-
sha = f08c3f28e46e28eb31e70846d65e57aa9553ce56
117-
etag = 884175b3f80b39edc1a23c6a34d58aa3c481432d4f20938f9a834dd918ef283d
116+
sha = ac753b791d03997eb655efb26ae141b51addd1c0
117+
etag = fcd94a08ac9ebc0e8351deac4e7f085cf8ef67816cc50006e068f44166096eb8
118118
weak
119119
[file ".github/workflows/combine-prs.yml"]
120120
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: 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)