Skip to content

Commit b89f842

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Add Company MSBuild property by default devlooped/oss@c509be4 - Improve default Product metadata, remove .git from user-facing URLs devlooped/oss@4339749 - Group MEAI packages together devlooped/oss@e733294 - Ensure lf for Scriban templates always devlooped/oss@4a9aa32 - Ignore .env files recursively devlooped/oss@3776526
1 parent b7631ad commit b89f842

File tree

6 files changed

+26
-12
lines changed

6 files changed

+26
-12
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# normalize by default
22
* text=auto encoding=UTF-8
33
*.sh text eol=lf
4+
*.sbn eol=lf
45

56
# These are windows specific files which we may as well ensure are
67
# always crlf on checkout

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ updates:
2424
Extensions:
2525
patterns:
2626
- "Microsoft.Extensions*"
27+
exclude-patterns:
28+
- "Microsoft.Extensions.AI*"
29+
ExtensionsAI:
30+
patterns:
31+
- "Microsoft.Extensions.AI*"
2732
Web:
2833
patterns:
2934
- "Microsoft.AspNetCore*"

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ artifacts
44
pack
55
TestResults
66
results
7+
BenchmarkDotNet.Artifacts
78
/app
89
.vs
910
.vscode
1011
.genaiscript
1112
.idea
1213
local.settings.json
14+
.env
1315

1416
*.suo
1517
*.sdf

.netconfig

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
weak
2020
[file ".gitattributes"]
2121
url = https://github.com/devlooped/oss/blob/main/.gitattributes
22-
sha = 5f92a68e302bae675b394ef343114139c075993e
23-
etag = 338ba6d92c8d1774363396739c2be4257bfc58026f4b0fe92cb0ae4460e1eff7
22+
sha = 4a9aa321c4982b83c185cf8dffed181ff84667d5
23+
etag = 09cad18280ed04b67f7f87591e5481510df04d44c3403231b8af885664d8fd58
2424
weak
2525
[file ".github/dependabot.yml"]
2626
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
27-
sha = 917ff5486e25bec90038e7ab6d146fd82c61f846
28-
etag = 50bf50df5a6eeb1705baea50f4c6e06d167a89cb5a590887ff939bd4120bd442
27+
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
28+
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
2929
weak
3030
[file ".github/release.yml"]
3131
url = https://github.com/devlooped/oss/blob/main/.github/release.yml
@@ -57,8 +57,8 @@
5757
skip
5858
[file ".gitignore"]
5959
url = https://github.com/devlooped/oss/blob/main/.gitignore
60-
sha = e0be248fff1d39133345283b8227372b36574b75
61-
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
60+
sha = 3776526342afb3f57da7e80f2095e5fdca3c31c9
61+
etag = 11767f73556aa4c6c8bcc153b77ee8e8114f99fa3b885b0a7d66d082f91e77b3
6262
weak
6363
[file "Directory.Build.rsp"]
6464
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -77,13 +77,13 @@
7777
weak
7878
[file "src/Directory.Build.props"]
7979
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
80-
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
81-
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
80+
sha = c509be4378ff6789df4f66338cb88119453c0975
81+
etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
8282
weak
8383
[file "src/Directory.Build.targets"]
8484
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
85-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
86-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
85+
sha = 4339749ef4b8f66def75931df09ef99c149f8421
86+
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
8787
weak
8888
[file ".github/workflows/dotnet-file-core.yml"]
8989
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml

src/Directory.Build.props

Lines changed: 3 additions & 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>
@@ -126,6 +127,8 @@
126127
<_VersionLabel>$(_VersionLabel.Replace('/merge', ''))</_VersionLabel>
127128
<!-- Finally sanitize the branch with dashes, so we can build path-separated branches, like rel/v1.0.0 or feature/foo -->
128129
<_VersionLabel>$(_VersionLabel.Replace('/', '-'))</_VersionLabel>
130+
<!-- And underscores which are also invalid labels, so we can use branches like dev/feature_foo -->
131+
<_VersionLabel>$(_VersionLabel.Replace('_', '-'))</_VersionLabel>
129132

130133
<!-- Set sanitized version to the actual version suffix used in build/pack -->
131134
<VersionSuffix Condition="!$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</VersionSuffix>

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)