Skip to content

Commit 5894f0b

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Ignore .env files recursively devlooped/oss@3776526 - Fix path pattern for markdown files in workflow devlooped/oss@6a6de05 - Add Company MSBuild property by default devlooped/oss@c509be4 - Improve default Product metadata, remove .git from user-facing URLs devlooped/oss@4339749
1 parent 8c964e3 commit 5894f0b

File tree

6 files changed

+40
-16
lines changed

6 files changed

+40
-16
lines changed

.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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ BenchmarkDotNet.Artifacts
1111
.genaiscript
1212
.idea
1313
local.settings.json
14+
.env
1415

1516
*.suo
1617
*.sdf

.netconfig

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
weak
6262
[file ".gitignore"]
6363
url = https://github.com/devlooped/oss/blob/main/.gitignore
64-
sha = e0be248fff1d39133345283b8227372b36574b75
65-
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
64+
sha = 3776526342afb3f57da7e80f2095e5fdca3c31c9
65+
etag = 11767f73556aa4c6c8bcc153b77ee8e8114f99fa3b885b0a7d66d082f91e77b3
6666
weak
6767
[file "Directory.Build.rsp"]
6868
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -86,13 +86,13 @@
8686
weak
8787
[file "src/Directory.Build.props"]
8888
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
89-
sha = 81d972fd0760c244d134dae7f4b17d6c43cb004a
90-
etag = 1368697c1521e465a1dea88b93787b1c7def441c37d62afc903fb8d07179e4f6
89+
sha = c509be4378ff6789df4f66338cb88119453c0975
90+
etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
9191
weak
9292
[file "src/Directory.Build.targets"]
9393
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
94-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
95-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
94+
sha = 4339749ef4b8f66def75931df09ef99c149f8421
95+
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
9696
weak
9797
[file "src/kzu.snk"]
9898
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk
@@ -101,8 +101,8 @@
101101
weak
102102
[file ".github/workflows/includes.yml"]
103103
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
104-
sha = 85829f2510f335f4a411867f3dbaaa116c3ab3de
105-
etag = 086f6b6316cc6ea7089c0dcc6980be519e6ed6e6201e65042ef41b82634ec0ee
104+
sha = 6a6de0580b40e305f7a0f41b406d4aabaa0756fe
105+
etag = 1a5cd7a883700c328105910cc212f5f8c9f3759fc1af023e048a9f486da794c1
106106
weak
107107
[file ".github/workflows/combine-prs.yml"]
108108
url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml

readme.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,10 @@ The versioning scheme for packages is:
9797
<!-- sponsors.md -->
9898
[![Clarius Org](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/clarius.png "Clarius Org")](https://github.com/clarius)
9999
[![MFB Technologies, Inc.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/MFB-Technologies-Inc.png "MFB Technologies, Inc.")](https://github.com/MFB-Technologies-Inc)
100-
[![Torutek](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/torutek-gh.png "Torutek")](https://github.com/torutek-gh)
101100
[![DRIVE.NET, Inc.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/drivenet.png "DRIVE.NET, Inc.")](https://github.com/drivenet)
102101
[![Keith Pickford](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Keflon.png "Keith Pickford")](https://github.com/Keflon)
103102
[![Thomas Bolon](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/tbolon.png "Thomas Bolon")](https://github.com/tbolon)
104103
[![Kori Francis](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/kfrancis.png "Kori Francis")](https://github.com/kfrancis)
105-
[![Toni Wenzel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/twenzel.png "Toni Wenzel")](https://github.com/twenzel)
106104
[![Uno Platform](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/unoplatform.png "Uno Platform")](https://github.com/unoplatform)
107105
[![Reuben Swartz](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/rbnswartz.png "Reuben Swartz")](https://github.com/rbnswartz)
108106
[![Jacob Foshee](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jfoshee.png "Jacob Foshee")](https://github.com/jfoshee)
@@ -114,7 +112,6 @@ The versioning scheme for packages is:
114112
[![Ken Bonny](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/KenBonny.png "Ken Bonny")](https://github.com/KenBonny)
115113
[![Simon Cropp](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/SimonCropp.png "Simon Cropp")](https://github.com/SimonCropp)
116114
[![agileworks-eu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/agileworks-eu.png "agileworks-eu")](https://github.com/agileworks-eu)
117-
[![sorahex](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/sorahex.png "sorahex")](https://github.com/sorahex)
118115
[![Zheyu Shen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/arsdragonfly.png "Zheyu Shen")](https://github.com/arsdragonfly)
119116
[![Vezel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/vezel-dev.png "Vezel")](https://github.com/vezel-dev)
120117
[![ChilliCream](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/ChilliCream.png "ChilliCream")](https://github.com/ChilliCream)
@@ -125,7 +122,9 @@ The versioning scheme for packages is:
125122
[![Justin Wendlandt](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jwendl.png "Justin Wendlandt")](https://github.com/jwendl)
126123
[![Adrian Alonso](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/adalon.png "Adrian Alonso")](https://github.com/adalon)
127124
[![Michael Hagedorn](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Eule02.png "Michael Hagedorn")](https://github.com/Eule02)
128-
[![Matt Frear](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/mattfrear.png "Matt Frear")](https://github.com/mattfrear)
125+
[![torutek](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/torutek.png "torutek")](https://github.com/torutek)
126+
[![Ryan McCaffery](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/mccaffers.png "Ryan McCaffery")](https://github.com/mccaffers)
127+
[![Alex Wiese](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/alexwiese.png "Alex Wiese")](https://github.com/alexwiese)
129128

130129

131130
<!-- sponsors.md -->

src/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
<PropertyGroup Label="NuGet">
2222
<Authors>Daniel Cazzulino</Authors>
23+
<Company>Devlooped</Company>
2324
<Copyright>Copyright (C) Daniel Cazzulino and Contributors. All rights reserved.</Copyright>
2425
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
2526
<PackageLicenseExpression>MIT</PackageLicenseExpression>

src/Directory.Build.targets

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@
165165

166166
<PropertyGroup>
167167
<RepositoryRoot>@(_GitSourceRoot)</RepositoryRoot>
168+
<!-- Only change if it wasn't just the default from Microsoft.NET.DefaultAssemblyInfo.targets -->
169+
<ProductFromUrl Condition="'$(SourceControlInformationFeatureSupported)' == 'true'">$([System.IO.Path]::GetFileNameWithoutExtension($(PrivateRepositoryUrl)))</ProductFromUrl>
170+
<Product Condition="'$(Product)' == '$(AssemblyName)' and '$(ProductFromUrl)' != ''">$(ProductFromUrl)</Product>
168171
</PropertyGroup>
169172

170173
</Target>
@@ -175,9 +178,9 @@
175178
Condition="'$(SourceControlInformationFeatureSupported)' == 'true' And
176179
'$(IsPackable)' == 'true'">
177180
<PropertyGroup>
178-
<PackageProjectUrl Condition="'$(PackageProjectUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(RepositoryUrl)</PackageProjectUrl>
181+
<PackageProjectUrl Condition="'$(PackageProjectUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(RepositoryUrl.Replace('.git', ''))</PackageProjectUrl>
179182
<PackageDescription>$(Description)</PackageDescription>
180-
<PackageReleaseNotes Condition="'$(RepositoryUrl)' != '' and Exists('$(MSBuildThisFileDirectory)..\changelog.md')">$(RepositoryUrl)/blob/main/changelog.md</PackageReleaseNotes>
183+
<PackageReleaseNotes Condition="'$(RepositoryUrl)' != '' and Exists('$(MSBuildThisFileDirectory)..\changelog.md')">$(RepositoryUrl.Replace('.git', ''))/blob/main/changelog.md</PackageReleaseNotes>
181184
</PropertyGroup>
182185
</Target>
183186

0 commit comments

Comments
 (0)