Skip to content

Commit 8f5358e

Browse files
MalcolmnixonMalcolm Nixon
andauthored
Update multitarget support for DotNet 8, 9, and 10 (#7)
Update dependencies. Co-authored-by: Malcolm Nixon <Malcolm.Nixon@hiarc.inc>
1 parent 08034ed commit 8f5358e

File tree

5 files changed

+28
-19
lines changed

5 files changed

+28
-19
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.sbom.dotnettool": {
6-
"version": "3.0.1",
6+
"version": "4.1.4",
77
"commands": [
88
"sbom-tool"
99
]
1010
},
1111
"demaconsulting.spdxtool": {
12-
"version": "2.2.0",
12+
"version": "2.5.0",
1313
"commands": [
1414
"spdx-tool"
1515
]

.github/workflows/build.yaml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515

16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1717

18-
- name: Setup dotnet 6/8
19-
uses: actions/setup-dotnet@v4
18+
- name: Setup dotnet
19+
uses: actions/setup-dotnet@v5
2020
with:
2121
dotnet-version: |
22-
6.x
2322
8.x
23+
9.x
24+
10.x
2425
2526
- name: Restore Tools
2627
run: >
@@ -37,14 +38,18 @@ jobs:
3738
- name: Create Drop Folder
3839
shell: bash
3940
run: |
40-
mkdir -p drop/net6.0
4141
mkdir -p drop/net8.0
42-
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net6.0/*.dll drop/net6.0
43-
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net6.0/*.runtimeconfig.json drop/net6.0
44-
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net6.0/*.deps.json drop/net6.0
42+
mkdir -p drop/net9.0
43+
mkdir -p drop/net10.0
4544
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net8.0/*.dll drop/net8.0
4645
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net8.0/*.runtimeconfig.json drop/net8.0
4746
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net8.0/*.deps.json drop/net8.0
47+
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net9.0/*.dll drop/net9.0
48+
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net9.0/*.runtimeconfig.json drop/net9.0
49+
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net9.0/*.deps.json drop/net9.0
50+
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net10.0/*.dll drop/net10.0
51+
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net10.0/*.runtimeconfig.json drop/net10.0
52+
cp src/DemaConsulting.DotnetToolWrapper/bin/Release/net10.0/*.deps.json drop/net10.0
4853
4954
- name: Generate SBOM
5055
run: >
@@ -62,10 +67,11 @@ jobs:
6267
run-workflow spdx-workflow.yaml
6368
6469
- name: Upload Artifacts
65-
uses: actions/upload-artifact@v4
70+
uses: actions/upload-artifact@v5
6671
with:
6772
name: build-artifacts
6873
path: |
6974
drop/_manifest/spdx_2.2/*.*
70-
drop/net6.0/*.*
7175
drop/net8.0/*.*
76+
drop/net9.0/*.*
77+
drop/net10.0/*.*

.github/workflows/release.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,28 @@ jobs:
4040

4141
steps:
4242

43-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v6
4444

4545
- name: Download Artifacts
46-
uses: actions/download-artifact@v4
46+
uses: actions/download-artifact@v5
4747
with:
4848
name: build-artifacts
4949
path: build-artifacts
5050

5151
- name: Assemble
5252
shell: bash
5353
run: |
54-
mkdir -p dist/net6.0
5554
mkdir -p dist/net8.0
56-
cp build-artifacts/net6.0/*.* dist/net6.0
55+
mkdir -p dist/net9.0
56+
mkdir -p dist/net10.0
5757
cp build-artifacts/net8.0/*.* dist/net8.0
58+
cp build-artifacts/net9.0/*.* dist/net9.0
59+
cp build-artifacts/net10.0/*.* dist/net10.0
5860
cd dist
5961
zip -r ../DotnetToolWrapper.zip *
6062
6163
- name: Upload Artifacts
62-
uses: actions/upload-artifact@v4
64+
uses: actions/upload-artifact@v5
6365
with:
6466
name: release-artifacts
6567
path: |

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# About
77

8-
This project generates a .NET 6.0 and 8.0 console application suitable for use in [Dotnet Tool](https://learn.microsoft.com/en-us/dotnet/core/tools/global-tools) packages which wrap native applications.
8+
This project generates a .NET 8.0, 9.0, and 10.0 console application suitable for use in [Dotnet Tool](https://learn.microsoft.com/en-us/dotnet/core/tools/global-tools) packages which wrap native applications.
99

1010
# Usage
1111

src/DemaConsulting.DotnetToolWrapper/DemaConsulting.DotnetToolWrapper.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
6+
<LangVersion>12</LangVersion>
67
<ImplicitUsings>enable</ImplicitUsings>
78
<Nullable>enable</Nullable>
89
<Title>Dotnet Tool Wrapper</Title>

0 commit comments

Comments
 (0)