Skip to content

Commit 11971b3

Browse files
devlooped-botkzu
authored andcommitted
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Change label from 'docs' to 'dependencies' devlooped/oss@2d1fb4e - Enable package pruning in Directory.Build.props devlooped/oss@0ff8b7b - Revert indent size for project files devlooped/oss@a62c459
1 parent fb4502d commit 11971b3

File tree

4 files changed

+27
-9
lines changed

4 files changed

+27
-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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
4444
$product = dotnet msbuild $props -getproperty:Product
4545
if (-not $product) {
46-
write-error "To use OSMF EULA, ensure the $(Product) property is set in Directory.props"
46+
write-error 'To use OSMF EULA, ensure the $(Product) property is set in Directory.props'
4747
exit 1
4848
}
4949
@@ -58,7 +58,7 @@ jobs:
5858
base: main
5959
branch: markdown-includes
6060
delete-branch: true
61-
labels: docs
61+
labels: dependencies
6262
author: ${{ env.BOT_AUTHOR }}
6363
committer: ${{ env.BOT_AUTHOR }}
6464
commit-message: +Mᐁ includes

.netconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
skip
1515
[file ".editorconfig"]
1616
url = https://github.com/devlooped/oss/blob/main/.editorconfig
17-
sha = e81ab754b366d52d92bd69b24bef1d5b1c610634
18-
etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
17+
sha = a62c45934ac2952f2f5d54d8aea4a7ebc1babaff
18+
etag = b5e919b472a52d4b522f86494f0f2c0ba74a6d9601454e20e4cbaf744317ff62
1919
weak
2020
[file ".gitattributes"]
2121
url = https://github.com/devlooped/oss/blob/main/.gitattributes
@@ -52,8 +52,8 @@
5252
weak
5353
[file ".github/workflows/includes.yml"]
5454
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
55-
sha = 6a6de0580b40e305f7a0f41b406d4aabaa0756fe
56-
etag = 1a5cd7a883700c328105910cc212f5f8c9f3759fc1af023e048a9f486da794c1
55+
sha = 2d1fb4ed52b63689f2b20b994512ebac28721243
56+
etag = 34ade86f020dea717c6a27ad7dcd0069c35be2832c58b0ba961278a1efe34089
5757
weak
5858
[file ".github/workflows/publish.yml"]
5959
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
@@ -85,8 +85,8 @@
8585
weak
8686
[file "src/Directory.Build.props"]
8787
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
88-
sha = c509be4378ff6789df4f66338cb88119453c0975
89-
etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
88+
sha = 0ff8b7b79a82112678326d1dc5543ed890311366
89+
etag = 3ebde0a8630d526b80f15801179116e17a857ff880a4442e7db7b075efa4fd63
9090
weak
9191
[file "src/Directory.Build.targets"]
9292
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets

src/Directory.Build.props

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project TreatAsLocalProperty="VersionPrefix">
22
<!-- To extend/change the defaults, create a Directory.props alongside this file -->
33

44
<PropertyGroup Label="CI" Condition="'$(CI)' == ''">
@@ -43,6 +43,10 @@
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>
48+
<!-- See https://learn.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#prunepackagereference-specification -->
49+
<RestoreEnablePackagePruning>true</RestoreEnablePackagePruning>
4650
</PropertyGroup>
4751

4852
<PropertyGroup Label="Build">
@@ -134,6 +138,15 @@
134138
<VersionSuffix Condition="!$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</VersionSuffix>
135139
<!-- Special case for tags, the label is actually the version. Backs compat since passed-in value overrides MSBuild-set one -->
136140
<Version Condition="$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</Version>
141+
142+
<!-- In order for latest from main/master to always be greatest when using -prerelease switch on install/run,
143+
we change the scheme as follows:
144+
- main/master remain as today: VersionPrefix: 42.42.${{ github.run_number }} (from yaml)
145+
- others: VersionPrefix: 42.42.0-[label].${{ github.run_number }}
146+
-->
147+
<IsMaster Condition="$(VersionLabel.Contains('refs/heads/main')) or $(VersionLabel.Contains('refs/heads/master'))">true</IsMaster>
148+
<VersionPrefix Condition="'$(IsMaster)' != 'true'">42.42.0</VersionPrefix>
149+
<VersionSuffix Condition="'$(IsMaster)' != 'true'">$(VersionSuffix).$(GITHUB_RUN_NUMBER)</VersionSuffix>
137150
</PropertyGroup>
138151

139152
<ItemGroup Label="ThisAssembly.Project">

0 commit comments

Comments
 (0)