Skip to content

Commit 22c734f

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Revert indent size for project files devlooped/oss@a62c459 - Change label from 'docs' to 'dependencies' devlooped/oss@2d1fb4e - Disable warnings for non-packable test projects devlooped/oss@95b338b
1 parent ea33e5f commit 22c734f

File tree

4 files changed

+36
-9
lines changed

4 files changed

+36
-9
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: 23 additions & 3 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,14 +32,33 @@ 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
41-
labels: docs
61+
labels: dependencies
4262
author: ${{ env.BOT_AUTHOR }}
4363
committer: ${{ env.BOT_AUTHOR }}
4464
commit-message: +Mᐁ includes

.netconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
skip
1515
[file ".editorconfig"]
1616
url = https://github.com/devlooped/oss/blob/main/.editorconfig
17-
sha = e81ab754b366d52d92bd69b24bef1d5b1c610634
17+
sha = a62c45934ac2952f2f5d54d8aea4a7ebc1babaff
1818

19-
etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
19+
etag = b5e919b472a52d4b522f86494f0f2c0ba74a6d9601454e20e4cbaf744317ff62
2020
weak
2121
[file ".gitattributes"]
2222
url = https://github.com/devlooped/oss/blob/main/.gitattributes
@@ -65,9 +65,9 @@
6565
skip
6666
[file ".github/workflows/includes.yml"]
6767
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
68-
sha = 85829f2510f335f4a411867f3dbaaa116c3ab3de
68+
sha = 2d1fb4ed52b63689f2b20b994512ebac28721243
6969

70-
etag = 086f6b6316cc6ea7089c0dcc6980be519e6ed6e6201e65042ef41b82634ec0ee
70+
etag = 34ade86f020dea717c6a27ad7dcd0069c35be2832c58b0ba961278a1efe34089
7171
weak
7272
[file ".github/workflows/publish.yml"]
7373
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
@@ -110,9 +110,9 @@
110110
skip
111111
[file "src/Directory.Build.props"]
112112
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
113-
sha = c509be4378ff6789df4f66338cb88119453c0975
113+
sha = 95b338b9780de6b8ed11f060fed2d300f136ec60
114114

115-
etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
115+
etag = 5e73ffebd7aef6fecae5a73d4fb044bf46f3a593ee2858ff1648d9c337e546ad
116116
weak
117117
[file "src/Directory.Build.targets"]
118118
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets

src/Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343

4444
<!-- Ensure MSBuild tooling can access package artifacts always via PKG_[PackageId] -->
4545
<GeneratePathProperty>true</GeneratePathProperty>
46+
<!-- Avoid warnings for test projects when we run dotnet pack on the whole solution. -->
47+
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
4648
</PropertyGroup>
4749

4850
<PropertyGroup Label="Build">

0 commit comments

Comments
 (0)