Skip to content

Commit 46a64cc

Browse files
smdnsmdn
committed
apply updates from template
1 parent 37a88cd commit 46a64cc

17 files changed

+89
-104
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
* text=auto
22

33
*.sln text eol=crlf
4+
*.slnx text eol=crlf
45
*.csproj text eol=crlf
56
*.vbproj text eol=crlf
67
*.proj text eol=crlf

‎.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ version: 2
77
updates:
88
- package-ecosystem: "github-actions"
99
directory: "/"
10+
groups:
11+
smdn-fundamentals-workflows:
12+
patterns:
13+
- "smdn/Smdn.Fundamentals/*"
1014
schedule:
1115
interval: "weekly"
1216
day: "wednesday"

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
# - cron: '07 20 03,16 * *'
2929
workflow_dispatch:
3030

31+
# cSpell:ignore autobuild
3132
jobs:
3233
analyze:
3334
name: Analyze

‎.github/workflows/generate-release-target.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Determine the release target tag
3636
id: release-target
3737
run: |
38-
# If workflow is trigged by workflow_dispatch, the value of github.ref_name contains branch ref which workflow runs from.
38+
# If workflow is triggered by workflow_dispatch, the value of github.ref_name contains branch ref which workflow runs from.
3939
# Due to the reason of above, github.event.inputs.release_target_tag_name must be tested before testing github.ref_name.
4040
if [[ -n '${{ github.event.inputs.release_target_tag_name }}' ]]; then
4141
# use dispatched tag name
@@ -61,7 +61,7 @@ jobs:
6161
exit 1
6262
6363
run-generate-release-target:
64-
uses: smdn/Smdn.Fundamentals/.github/workflows/generate-release-target.yml@workflows/release-target/v1.10.3
64+
uses: smdn/Smdn.Fundamentals/.github/workflows/generate-release-target.yml@workflows/release-target/v1.11.0
6565
needs: determine-release-target
6666
if: startsWith(needs.determine-release-target.outputs.tag_name, 'new-release/')
6767
with:

‎.github/workflows/publish-release-target.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515

1616
jobs:
1717
run-publish-release-target:
18-
uses: smdn/Smdn.Fundamentals/.github/workflows/publish-release-target.yml@workflows/release-target/v1.10.3
18+
uses: smdn/Smdn.Fundamentals/.github/workflows/publish-release-target.yml@workflows/release-target/v1.11.0
1919
if: |
2020
(github.event.pull_request.merged == true && startsWith(github.head_ref, 'releases/')) &&
2121
(contains(github.event.pull_request.labels.*.name, 'release-target'))

‎.github/workflows/test-packages.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ on:
3131
default: false
3232

3333
dotnet_test_options_verbosity_level:
34+
# cSpell:disable-next-line
3435
description: "The argument to be set to the `--verbosity <LEVEL>` option of the `dotnet test` command. <LEVEL> := q[uiet], m[inimal], n[ormal], d[etailed], diag[nostic]"
3536
required: false
3637
type: string
@@ -46,15 +47,23 @@ on:
4647
type: string
4748

4849
jobs:
50+
await-package-publishing:
51+
name: Wait for publishing of released package
52+
if: ${{ github.event_name == 'release' }}
53+
uses: smdn/Smdn.Fundamentals/.github/workflows/nuget-await-package-publishing.yml@workflows/nuget/v1.0.0
54+
with:
55+
release_tag: ${{ github.event.release.tag_name }}
56+
4957
run-test:
5058
name: Run tests with released packages
51-
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test/v1.4.2
59+
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test/v1.5.0
60+
needs: await-package-publishing
61+
if: ${{ always() && !failure() && !cancelled() }} # run tests even if await-package-publishing is skipped
5262
with:
5363
project: ${{ inputs.project }}
5464
os: ${{ inputs.os == '' && 'ubuntu-24.04, ubuntu-22.04, windows-latest, macos-latest' || inputs.os }}
5565
extra_options_common: '/p:TestReleasedPackage=true'
5666
verbose: ${{ inputs.verbose == 'true' }}
57-
path_proj_install_project_assets: "eng/InstallProjectAssets.proj"
5867
dotnet_sdk_version: ${{ inputs.dotnet_sdk_version == '' && '8.0.100' || inputs.dotnet_sdk_version }}
5968
timeout_minutes_test_job: 10
6069
timeout_hang: "[ {'OS':'windows','Timeout':'6min'}, {'OS':'macos','Timeout':'3min'}, {'OS':'','Timeout':'1min'} ]"

‎.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ on:
4949
type: string
5050

5151
dotnet_test_options_verbosity_level:
52+
# cSpell:disable-next-line
5253
description: "The argument to be set to the `--verbosity <LEVEL>` option of the `dotnet test` command. <LEVEL> := q[uiet], m[inimal], n[ormal], d[etailed], diag[nostic]"
5354
required: false
5455
type: string
@@ -66,12 +67,11 @@ on:
6667
jobs:
6768
run-test:
6869
name: Run tests
69-
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test/v1.4.2
70+
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test/v1.5.0
7071
with:
7172
project: ${{ inputs.project }}
7273
os: ${{ inputs.os == '' && 'ubuntu-24.04, ubuntu-22.04, windows-latest, macos-latest' || inputs.os }}
7374
verbose: ${{ inputs.verbose == 'true' }}
74-
path_proj_install_project_assets: "eng/InstallProjectAssets.proj"
7575
dotnet_sdk_version: ${{ inputs.dotnet_sdk_version == '' && '8.0.100' || inputs.dotnet_sdk_version }}
7676
timeout_minutes_test_job: 10
7777
timeout_hang: "[ {'OS':'windows','Timeout':'6min'}, {'OS':'macos','Timeout':'3min'}, {'OS':'','Timeout':'1min'} ]"

‎.vscode/cspell.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,26 @@
1414
"cloneable",
1515
"LINQ",
1616
"memberwise",
17+
"MSBuild",
1718
"munin",
1819
"smdn",
1920
"SYSLIB",
2021
],
2122
"ignoreWords": [
2223
"dirtyconfig",
2324
"multigraph",
25+
"netcoreapp",
26+
"netframework",
27+
"netfx",
2428
"netstandard",
2529
"rrdgraph",
2630
"vlabel",
2731
],
2832
"ignoreRegExpList": [
2933
"SYSTEM_[A-Z][A-Z0-9_]+",
34+
"NETFRAMEWORK[0-9][A-Z0-9_]+",
35+
"NETCOREAPP[0-9]_[0-9]_[A-Z0-9_]+",
36+
"NETSTANDARD[0-9]_[0-9]_[A-Z0-9_]+",
3037
],
3138
// flagWords - list of words to be always considered incorrect
3239
// This is useful for offensive words and common spelling errors.
@@ -39,6 +46,7 @@
3946
"**/bin",
4047
"**/obj",
4148
".git",
49+
"doc/api-list/",
4250
],
4351
"enabledLanguageIds": [
4452
"csharp",

‎Smdn.Net.MuninNode.slnx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!--
2+
SPDX-FileCopyrightText: 2025 smdn <smdn@smdn.jp>
3+
SPDX-License-Identifier: MIT
4+
-->
5+
<Solution>
6+
<Folder Name="/src/">
7+
<Project Path="src/Smdn.Net.MuninNode.Hosting/Smdn.Net.MuninNode.Hosting.csproj" />
8+
<Project Path="src/Smdn.Net.MuninNode/Smdn.Net.MuninNode.csproj" />
9+
</Folder>
10+
<Folder Name="/tests/Smdn.Net.MuninNode.Hosting/">
11+
<Project Path="tests/Smdn.Net.MuninNode.Hosting/Smdn.Net.MuninNode.Hosting.Tests.csproj" />
12+
<Project Path="tests/Smdn.Net.MuninNode/Smdn.Net.MuninNode.Tests.csproj" />
13+
</Folder>
14+
</Solution>

‎eng/BuildAllProjects.ps1

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,27 @@ $RepositoryRootDirectory = [System.IO.Path]::GetFullPath(
66
[System.IO.Path]::Join($PSScriptRoot, "../")
77
)
88

9-
# download Smdn.MSBuild.ProjectAssets.* first
10-
dotnet restore $([System.IO.Path]::Join($RepositoryRootDirectory, 'eng', 'InstallProjectAssets.proj'))
11-
12-
# create a solution for the build target projects
9+
# create a temporary solution for the build target projects
1310
Set-Location $RepositoryRootDirectory
1411

15-
dotnet new sln
12+
$SolutionFile = [System.IO.Path]::GetFileName(
13+
[System.IO.Path]::GetDirectoryName($RepositoryRootDirectory)
14+
) + ".temp.sln"
15+
16+
dotnet new sln --force --name $([System.IO.Path]::GetFileNameWithoutExtension($SolutionFile))
1617

1718
# add build target projects to the solution
1819
$ProjectFiles = Get-ChildItem -Path $([System.IO.Path]::Join($RepositoryRootDirectory, 'src', 'Smdn.*', '*')) -Filter '*.csproj'
1920

2021
foreach ($ProjectFile in $ProjectFiles) {
21-
dotnet sln add $ProjectFile
22+
dotnet sln $SolutionFile add $ProjectFile
2223
}
2324

2425
# restore dependencies
25-
dotnet restore
26+
dotnet restore $SolutionFile
2627

2728
# then build all projects
28-
dotnet build --no-restore
29+
dotnet build --no-restore $SolutionFile
30+
31+
# delete the temporary solution
32+
Remove-Item $SolutionFile

0 commit comments

Comments
 (0)