Skip to content

Commit 71bd708

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Fix error message quotes in includes.yml devlooped/oss@26e8cb7 - Revert indent size for project files devlooped/oss@a62c459
1 parent 35f950f commit 71bd708

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ indent_size = 2
3030

3131
# Dotnet code style settings:
3232
[*.{cs,vb}]
33+
tab_width = 4
34+
3335
# Sort using and Import directives with System.* appearing first
3436
dotnet_sort_system_directives_first = true
3537
# Avoid "this." and "Me." if not necessary
@@ -57,6 +59,9 @@ dotnet_style_require_accessibility_modifiers = omit_if_default:error
5759
# IDE0040: Add accessibility modifiers
5860
dotnet_diagnostic.IDE0040.severity = error
5961

62+
# IDE1100: Error reading content of source file 'Project.TargetFrameworkMoniker' (i.e. from ThisAssembly)
63+
dotnet_diagnostic.IDE1100.severity = none
64+
6065
[*.cs]
6166
# Top-level files are definitely OK
6267
csharp_using_directive_placement = outside_namespace:silent

.github/workflows/includes.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ on:
55
branches:
66
- 'main'
77
paths:
8-
- '**.md'
8+
- '**.md'
99
- '!changelog.md'
10+
- 'osmfeula.txt'
1011

1112
jobs:
1213
includes:
@@ -31,10 +32,29 @@ jobs:
3132
- name: +Mᐁ includes
3233
uses: devlooped/actions-includes@v1
3334

35+
- name: 📝 OSMF EULA
36+
shell: pwsh
37+
run: |
38+
$file = "osmfeula.txt"
39+
$props = "src/Directory.Build.props"
40+
if (-not (test-path $file) -or -not (test-path $props)) {
41+
exit 0
42+
}
43+
44+
$product = dotnet msbuild $props -getproperty:Product
45+
if (-not $product) {
46+
write-error 'To use OSMF EULA, ensure the $(Product) property is set in Directory.props'
47+
exit 1
48+
}
49+
50+
((get-content -raw $file) -replace '\$product\$',$product).trim() | set-content $file
51+
3452
- name: ✍ pull request
3553
uses: peter-evans/create-pull-request@v6
3654
with:
37-
add-paths: '**.md'
55+
add-paths: |
56+
**.md
57+
osmfeula.txt
3858
base: main
3959
branch: markdown-includes
4060
delete-branch: true

.netconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
weak
1616
[file ".editorconfig"]
1717
url = https://github.com/devlooped/oss/blob/main/.editorconfig
18-
sha = e81ab754b366d52d92bd69b24bef1d5b1c610634
19-
etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
18+
sha = a62c45934ac2952f2f5d54d8aea4a7ebc1babaff
19+
etag = b5e919b472a52d4b522f86494f0f2c0ba74a6d9601454e20e4cbaf744317ff62
2020
weak
2121
[file ".github/workflows/dotnet-file.yml"]
2222
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
@@ -25,8 +25,8 @@
2525
weak
2626
[file ".github/workflows/includes.yml"]
2727
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
28-
sha = 85829f2510f335f4a411867f3dbaaa116c3ab3de
29-
etag = 086f6b6316cc6ea7089c0dcc6980be519e6ed6e6201e65042ef41b82634ec0ee
28+
sha = 26e8cb798ce72dec7072db826cc9694d456797bd
29+
etag = df06492eeb2daaae4168d71bbb643f5da2693b67cdd58c42ffa44a191ee99b69
3030
weak
3131
[file "src/Directory.Build.props"]
3232
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props

0 commit comments

Comments
 (0)