Skip to content

Commit 9cbe765

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Use GH_TOKEN if available for PR devlooped/oss@77e83f2 - Add Company MSBuild property by default devlooped/oss@c509be4 - Ensure lf for Scriban templates always devlooped/oss@4a9aa32 - Fix error message quotes in includes.yml devlooped/oss@26e8cb7 - Revert EOL change in editorconfig for C# files devlooped/oss@2d0e5a5 - Group MEAI packages together devlooped/oss@e733294 - Ignore .env files recursively devlooped/oss@3776526 - Improve default Product metadata, remove .git from user-facing URLs devlooped/oss@4339749
1 parent 49dd7aa commit 9cbe765

File tree

10 files changed

+122
-31
lines changed

10 files changed

+122
-31
lines changed

.editorconfig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ indent_size = 4
1414

1515
# Xml project files
1616
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,msbuildproj,props,targets}]
17-
indent_size = 2
17+
indent_size = 4
1818

1919
# Xml config files
2020
[*.{ruleset,config,nuspec,resx,vsixmanifest,vsct}]
@@ -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

.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*"

.github/workflows/dotnet-env.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: dotnet-env
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- '**/*.*proj'
9+
10+
jobs:
11+
which-dotnet:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: write
15+
pull-requests: write
16+
17+
steps:
18+
- name: 🤖 defaults
19+
uses: devlooped/actions-bot@v1
20+
with:
21+
name: ${{ secrets.BOT_NAME }}
22+
email: ${{ secrets.BOT_EMAIL }}
23+
gh_token: ${{ secrets.GH_TOKEN }}
24+
github_token: ${{ secrets.GITHUB_TOKEN }}
25+
26+
- name: 🤘 checkout
27+
uses: actions/checkout@v4
28+
with:
29+
token: ${{ env.GH_TOKEN }}
30+
31+
- name: 🤌 dotnet
32+
uses: devlooped/actions-which-dotnet@v1
33+
34+
- name: ✍ pull request
35+
uses: peter-evans/create-pull-request@v7
36+
with:
37+
base: main
38+
branch: which-dotnet
39+
delete-branch: true
40+
labels: dependencies
41+
title: "⚙ Update dotnet versions"
42+
body: "Update dotnet versions"
43+
commit-message: "Update dotnet versions"
44+
token: ${{ env.GH_TOKEN }}

.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: 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: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
skip
1515
[file ".editorconfig"]
1616
url = https://github.com/devlooped/oss/blob/main/.editorconfig
17-
sha = e81ab754b366d52d92bd69b24bef1d5b1c610634
18-
etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
17+
sha = 2d0e5a5e0bb259dfb00b2b27fe4af2dd5c58c693
18+
etag = 160587f1ec0a7d68f1e4bc49605f8c7033c5d7991776003d9f2bc916ea7aa817
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
@@ -46,8 +46,8 @@
4646
weak
4747
[file ".github/workflows/includes.yml"]
4848
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
49-
sha = 85829f2510f335f4a411867f3dbaaa116c3ab3de
50-
etag = 086f6b6316cc6ea7089c0dcc6980be519e6ed6e6201e65042ef41b82634ec0ee
49+
sha = 26e8cb798ce72dec7072db826cc9694d456797bd
50+
etag = df06492eeb2daaae4168d71bbb643f5da2693b67cdd58c42ffa44a191ee99b69
5151
weak
5252
[file ".github/workflows/publish.yml"]
5353
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.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
@@ -104,3 +104,8 @@
104104
sha = f2b690ce307acb76c5b8d7faec1a5b971a93653e
105105
etag = 27ea11baa2397b3ec9e643a935832da97719c4e44215cfd135c49cad4c29373f
106106
weak
107+
[file ".github/workflows/dotnet-env.yml"]
108+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-env.yml
109+
sha = 77e83f238196d2723640abef0c7b6f43994f9747
110+
etag = fcb9759a96966df40dcd24906fd328ddec05953b7e747a6bb8d0d1e4c3865274
111+
weak

readme.md

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,25 @@ Results:
2828
<!-- include artifacts/results/AI.Benchmarks.ModelPerformance-report-github.md -->
2929
```
3030
31-
BenchmarkDotNet v0.14.0, Windows 11 (10.0.22631.4890/23H2/2023Update/SunValley3)
31+
BenchmarkDotNet v0.14.0, Windows 11 (10.0.26100.3775)
3232
Intel Core i9-10900T CPU 1.90GHz, 1 CPU, 20 logical and 10 physical cores
33-
.NET SDK 9.0.200
34-
[Host] : .NET 8.0.13 (8.0.1325.6609), X64 RyuJIT AVX2
35-
DefaultJob : .NET 8.0.13 (8.0.1325.6609), X64 RyuJIT AVX2
33+
.NET SDK 9.0.201
34+
[Host] : .NET 8.0.15 (8.0.1525.16413), X64 RyuJIT AVX2
35+
DefaultJob : .NET 8.0.15 (8.0.1525.16413), X64 RyuJIT AVX2
3636
3737
3838
```
39-
| Method | Client | Provider | Model | Mean | Error | StdDev | Median |
40-
|------- |---------------- |--------- |------------ |---------:|---------:|----------:|---------:|
41-
| **Chat** | **aai-gpt-4o** | **Azure AI** | **gpt-4o** | **20.170 s** | **6.4958 s** | **19.1529 s** | **13.888 s** |
42-
| **Chat** | **aai-gpt-4o-mini** | **Azure AI** | **gpt-4o-mini** | **20.221 s** | **5.3235 s** | **15.6966 s** | **18.061 s** |
43-
| **Chat** | **oai-gpt-4o** | **OpenAI** | **gpt-4o** | **2.387 s** | **0.1910 s** | **0.5540 s** | **2.269 s** |
44-
| **Chat** | **oai-gpt-4o-mini** | **OpenAI** | **gpt-4o-mini** | **2.620 s** | **0.1723 s** | **0.4859 s** | **2.573 s** |
45-
| **Chat** | **xai-grok-2** | **xAI** | **grok-2** | **1.876 s** | **0.1525 s** | **0.4447 s** | **1.770 s** |
46-
| **Chat** | **xai-grok-beta** | **xAI** | **grok-beta** | **1.661 s** | **0.1001 s** | **0.2919 s** | **1.655 s** |
39+
| Method | Client | Provider | Model | Mean | Error | StdDev | Median |
40+
|------- |--------------------- |--------- |----------------- |---------:|---------:|----------:|--------:|
41+
| **Chat** | **aai-gpt-4o** | **Azure AI** | **gpt-4o** | **20.181 s** | **7.8701 s** | **23.2052 s** | **5.630 s** |
42+
| **Chat** | **aai-gpt-4o-mini** | **Azure AI** | **gpt-4o-mini** | **20.171 s** | **6.6035 s** | **19.4707 s** | **9.726 s** |
43+
| **Chat** | **oai-gpt-4o** | **OpenAI** | **gpt-4o** | **2.013 s** | **0.1394 s** | **0.4000 s** | **1.937 s** |
44+
| **Chat** | **oai-gpt-4o-mini** | **OpenAI** | **gpt-4o-mini** | **2.930 s** | **0.1641 s** | **0.4736 s** | **2.916 s** |
45+
| **Chat** | **xai-grok-3-beta** | **xAI** | **grok-3-beta** | **NA** | **NA** | **NA** | **NA** |
46+
| **Chat** | **xai-grok-3-mini-beta** | **xAI** | **grok-3-mini-beta** | **5.666 s** | **0.2034 s** | **0.5964 s** | **5.699 s** |
47+
48+
Benchmarks with issues:
49+
ModelPerformance.Chat: DefaultJob [Client=xai-grok-3-beta]
4750

4851
<!-- artifacts/results/AI.Benchmarks.ModelPerformance-report-github.md -->
4952

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)