Skip to content

Commit 0800230

Browse files
committed
apply updates from template
1 parent eb499ab commit 0800230

File tree

7 files changed

+41
-29
lines changed

7 files changed

+41
-29
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,15 @@ updates:
1616
GitHub-Actions-Workflows:
1717
patterns:
1818
- "actions/*"
19-
Smdn-Fundamentals-Workflows:
19+
smdn-workflows-dotnet:
2020
patterns:
21-
- "smdn/Smdn.Fundamentals/*"
21+
- "smdn/workflows-dotnet/*"
2222
ignore:
23+
# smdn/workflows-dotnet/*: report major and minor updates only
24+
- dependency-name: "smdn/workflows-dotnet/*"
25+
update-types:
26+
- "version-update:semver-patch"
27+
# actions/checkout: report major updates only
2328
- dependency-name: "actions/checkout"
2429
update-types:
2530
- "version-update:semver-minor"
@@ -42,6 +47,11 @@ updates:
4247
update-types:
4348
- "version-update:semver-minor"
4449
- "version-update:semver-patch"
50+
# For project SDK packages named with "Smdn.*", all updates should be reported.
51+
- dependency-name: "Smdn.MSBuild.ProjectAssets.*"
52+
update-types:
53+
# Since the `ignore` cannot be overwritten with an empty array, use a workaround to ignore only major updates
54+
- "version-update:semver-major"
4555
# For NUnit packages, only major updates should be reported.
4656
- dependency-name: "NUnit*"
4757
update-types: # major updates only

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,26 +71,11 @@ jobs:
7171
if: ${{ (matrix.build-mode == 'autobuild') || (matrix.build-mode == '') }}
7272
uses: github/codeql-action/autobuild@v4
7373

74-
- name: Check .NET SDK ${{ env.MINIMAL_DOTNET_SDK_VERSION }} is installed
75-
id: dotnet-sdk-version
74+
- name: Prepare .NET SDK ${{ env.MINIMAL_DOTNET_SDK_VERSION }}
75+
uses: smdn/workflows-dotnet/actions/prepare-dotnet-sdk@actions/prepare-dotnet-sdk/v1.0.0
7676
if: ${{ (matrix.build-mode == 'manual') && (matrix.language == 'csharp') }}
77-
shell: pwsh
78-
run: |
79-
$installed_version = [System.Version]::Parse($(dotnet --version))
80-
$required_version = [System.Version]::Parse('${{ env.MINIMAL_DOTNET_SDK_VERSION }}')
81-
82-
if ( $required_version -gt $installed_version ) {
83-
# required SDK version is not installed
84-
"::notice::.NET SDK version: installed ${installed_version}, required ${required_version}"
85-
86-
"install-dotnet-sdk-version=${required_version}" >> $Env:GITHUB_OUTPUT
87-
}
88-
89-
- name: Install .NET SDK ${{ steps.dotnet-sdk-version.outputs.install-dotnet-sdk-version }}
90-
if: ${{ (matrix.build-mode == 'manual') && (matrix.language == 'csharp') && (steps.dotnet-sdk-version.outputs.install-dotnet-sdk-version != '') }}
91-
uses: actions/setup-dotnet@v5.0.1
9277
with:
93-
dotnet-version: '${{ steps.dotnet-sdk-version.outputs.install-dotnet-sdk-version }}'
78+
minimal_dotnet_sdk_version: '${{ env.MINIMAL_DOTNET_SDK_VERSION }}'
9479

9580
- name: Build all .NET projects
9681
if: ${{ (matrix.build-mode == 'manual') && (matrix.language == 'csharp') }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727

2828
jobs:
2929
determine-release-target:
30-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-slim
3131
outputs:
3232
tag_name: ${{ steps.release-target.outputs.tag_name }}
3333
dry_run: ${{ steps.release-target.outputs.dry_run }}
@@ -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.12.1
64+
uses: smdn/workflows-dotnet/.github/workflows/generate-release-target.yml@release-target/v1.13.1
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.12.1
18+
uses: smdn/workflows-dotnet/.github/workflows/publish-release-target.yml@release-target/v1.13.1
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: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,23 @@ on:
4646
required: false
4747
type: string
4848

49+
dotnet_test_options_output_verbosity_level:
50+
description: "The argument to be set to the `--output <VERBOSITY_LEVEL>` option of the `dotnet test` command."
51+
required: false
52+
type: string
53+
default: ''
54+
4955
jobs:
5056
await-package-publishing:
5157
name: Wait for publishing of released package
5258
if: ${{ github.event_name == 'release' }}
53-
uses: smdn/Smdn.Fundamentals/.github/workflows/nuget-await-package-publishing.yml@workflows/nuget/v1.0.0
59+
uses: smdn/workflows-dotnet/.github/workflows/nuget-await-package-publishing.yml@nuget/v1.1.1
5460
with:
5561
release_tag: ${{ github.event.release.tag_name }}
5662

5763
run-test:
5864
name: Run tests with released packages
59-
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test/v1.6.0
65+
uses: smdn/workflows-dotnet/.github/workflows/test.yml@test/v1.8.0
6066
needs: await-package-publishing
6167
if: ${{ always() && !failure() && !cancelled() }} # run tests even if await-package-publishing is skipped
6268
with:
@@ -67,9 +73,9 @@ jobs:
6773
dotnet_sdk_version: ${{ inputs.dotnet_sdk_version == '' && '10.0.100' || inputs.dotnet_sdk_version }}
6874
timeout_minutes_test_job: 10
6975
timeout_hang: "[ {'OS':'windows','Timeout':'6min'}, {'OS':'macos','Timeout':'3min'}, {'OS':'','Timeout':'1min'} ]"
70-
timeout_vstest_connection: "[ {'OS':'windows','Timeout':360}, {'OS':'macos','Timeout':180}, {'OS':'','Timeout':60} ]"
7176
dotnet_test_options_verbosity_level: ${{ inputs.dotnet_test_options_verbosity_level }}
7277
dotnet_test_options_framework: ${{ inputs.dotnet_test_options_framework }}
7378
dotnet_test_options_filter_expression: ${{ inputs.dotnet_test_options_filter_expression }}
79+
dotnet_test_options_output_verbosity_level: ${{ inputs.dotnet_test_options_output_verbosity_level }}
7480
secrets:
7581
token_repo: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,27 @@ on:
6464
required: false
6565
type: string
6666

67+
dotnet_test_options_output_verbosity_level:
68+
description: "The argument to be set to the `--output <VERBOSITY_LEVEL>` option of the `dotnet test` command."
69+
required: false
70+
type: string
71+
default: ''
72+
6773
jobs:
6874
run-test:
6975
name: Run tests
70-
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test/v1.6.0
76+
uses: smdn/workflows-dotnet/.github/workflows/test.yml@test/v1.8.0
7177
with:
7278
project: ${{ inputs.project }}
7379
os: ${{ inputs.os == '' && 'ubuntu-24.04, ubuntu-22.04, windows-latest' || inputs.os }}
7480
verbose: ${{ inputs.verbose == 'true' }}
7581
dotnet_sdk_version: ${{ inputs.dotnet_sdk_version == '' && '10.0.100' || inputs.dotnet_sdk_version }}
7682
timeout_minutes_test_job: 10
7783
timeout_hang: "[ {'OS':'windows','Timeout':'6min'}, {'OS':'macos','Timeout':'3min'}, {'OS':'','Timeout':'1min'} ]"
78-
timeout_vstest_connection: "[ {'OS':'windows','Timeout':360}, {'OS':'macos','Timeout':180}, {'OS':'','Timeout':60} ]"
7984
extra_options_common: ${{ inputs.extra_options_common }}
8085
dotnet_test_options_verbosity_level: ${{ inputs.dotnet_test_options_verbosity_level }}
8186
dotnet_test_options_framework: ${{ inputs.dotnet_test_options_framework }}
8287
dotnet_test_options_filter_expression: ${{ inputs.dotnet_test_options_filter_expression }}
88+
dotnet_test_options_output_verbosity_level: ${{ inputs.dotnet_test_options_output_verbosity_level }}
8389
secrets:
8490
token_repo: ${{ secrets.GITHUB_TOKEN }}

global.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
{
2+
"sdk": {
3+
"version": "10.0.100",
4+
"rollForward": "latestMajor",
5+
"allowPrerelease": false
6+
},
27
"msbuild-sdks": {
38
"Smdn.MSBuild.ProjectAssets.Common": "1.6.2",
4-
"Smdn.MSBuild.ProjectAssets.Library": "1.12.2"
9+
"Smdn.MSBuild.ProjectAssets.Library": "1.12.4"
510
},
611
"test": {
712
"runner": "Microsoft.Testing.Platform"

0 commit comments

Comments
 (0)