Skip to content

Commit dc63a14

Browse files
IVNSTNIVNSTN
authored
Build for net10 (#2)
1 parent 064a9e6 commit dc63a14

File tree

5 files changed

+98
-14
lines changed

5 files changed

+98
-14
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
3.1.x
7373
6.0.x
7474
8.0.x
75+
10.0.x
7576
7677
- name: Display dotnet version
7778
run: dotnet --info
@@ -140,24 +141,43 @@ jobs:
140141
-p:Configuration=${{ matrix.configuration }}
141142
-p:BaseOutputPath="${{ env.OUTPUT_PATH }}"
142143
-p:PublishDir="${{ env.PUBLISH_PATH }}/Release/net8.0"
144+
&& dotnet publish "${{ env.PUBLISH_PROJECT_PATH }}" --no-build
145+
-p:TargetFramework=net10.0
146+
-p:Configuration=${{ matrix.configuration }}
147+
-p:BaseOutputPath="${{ env.OUTPUT_PATH }}"
148+
-p:PublishDir="${{ env.PUBLISH_PATH }}/Release/net10.0"
143149
144-
- name: Upload build for netcoreapp3.1
150+
- name: Upload build artifacts netcore3.1
145151
uses: actions/upload-artifact@v4
152+
if: ${{ matrix.publish }}
146153
with:
147154
name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-netcoreapp3.1
148155
path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/netcoreapp3.1
156+
if-no-files-found: error
149157

150-
- name: Upload build for net6.0
158+
- name: Upload build artifacts 6.0
151159
uses: actions/upload-artifact@v4
160+
if: ${{ matrix.publish }}
152161
with:
153162
name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-net6.0
154163
path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/net6.0
164+
if-no-files-found: error
155165

156-
- name: Upload build for net8.0
166+
- name: Upload build artifacts 8.0
157167
uses: actions/upload-artifact@v4
168+
if: ${{ matrix.publish }}
158169
with:
159170
name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-net8.0
160171
path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/net8.0
172+
if-no-files-found: error
173+
174+
- name: Upload build artifacts 10.0
175+
uses: actions/upload-artifact@v4
176+
if: ${{ matrix.publish }}
177+
with:
178+
name: ${{ env.PRODUCT_NAME }}-${{ needs.semver.outputs.next-version }}-${{ matrix.configuration }}-net10.0
179+
path: ${{ env.PUBLISH_PATH }}/${{ matrix.configuration }}/net10.0
180+
if-no-files-found: error
161181

162182
- name: Test
163183
if: ${{ !matrix.coverage }}
@@ -182,6 +202,7 @@ jobs:
182202
with:
183203
name: test-results
184204
path: TestResults
205+
if-no-files-found: error
185206

186207
- name: Test Report
187208
uses: dorny/test-reporter@v2
@@ -190,6 +211,7 @@ jobs:
190211
name: NUnit testing ${{ matrix.configuration }} build on ${{ matrix.os }}
191212
path: "**/TestResults/*.trx,*.trx"
192213
reporter: dotnet-trx
214+
if-no-files-found: error
193215

194216
validate-markdown:
195217
runs-on: ubuntu-latest
@@ -220,6 +242,7 @@ jobs:
220242

221243
steps:
222244
- uses: actions/checkout@v4
245+
223246
- name: Download test results
224247
uses: actions/download-artifact@v4
225248
with:
@@ -265,14 +288,16 @@ jobs:
265288
fail-fast: false
266289
matrix:
267290
configuration: [Release]
268-
dotnet: [netstandard2.0, net6.0, net8.0]
291+
dotnet: [netstandard2.0, net6.0, net8.0, net10.0]
269292
include:
293+
- dotnet: netstandard2.0
294+
app-dotnet: netcoreapp3.1
270295
- dotnet: net6.0
271296
app-dotnet: net6.0
272297
- dotnet: net8.0
273298
app-dotnet: net8.0
274-
- dotnet: netstandard2.0
275-
app-dotnet: netcoreapp3.1
299+
- dotnet: net10.0
300+
app-dotnet: net10.0
276301

277302
steps:
278303
- name: Grab CLI ${{ matrix.app-dotnet }}

‎TeamTools.Linter.CommandLine/TeamTools.Linter.CommandLine.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net6.0;net8.0;net10.0</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<Configurations>Debug;Release</Configurations>
77
</PropertyGroup>

‎TeamTools.Linter.CommandLine/packages.lock.json‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,9 @@
3838
"resolved": "7.0.0",
3939
"contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==",
4040
"dependencies": {
41-
"System.Memory": "4.5.5",
4241
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
4342
}
4443
},
45-
"System.Memory": {
46-
"type": "Transitive",
47-
"resolved": "4.5.5",
48-
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
49-
},
5044
"System.Runtime.CompilerServices.Unsafe": {
5145
"type": "Transitive",
5246
"resolved": "6.0.0",
@@ -60,6 +54,45 @@
6054
}
6155
}
6256
},
57+
"net10.0": {
58+
"CommandLineParser": {
59+
"type": "Direct",
60+
"requested": "[2.9.1, )",
61+
"resolved": "2.9.1",
62+
"contentHash": "OE0sl1/sQ37bjVsPKKtwQlWDgqaxWgtme3xZz7JssWUzg5JpMIyHgCTY9MVMxOg48fJ1AgGT3tgdH5m/kQ5xhA=="
63+
},
64+
"Microsoft.NETCore.Platforms": {
65+
"type": "Direct",
66+
"requested": "[7.0.4, )",
67+
"resolved": "7.0.4",
68+
"contentHash": "yLEHlNN7O5WiND89r42sepgVwy5W/ZoTiFEdJDV7MHR1lW02LL7Nipz2TD5qM/Kx9W3/k3NP+PAP2qUdOm+leg=="
69+
},
70+
"Newtonsoft.Json": {
71+
"type": "Direct",
72+
"requested": "[13.0.4, )",
73+
"resolved": "13.0.4",
74+
"contentHash": "pdgNNMai3zv51W5aq268sujXUyx7SNdE2bj1wZcWjAQrKMFZV260lbqYop1d2GM67JI1huLRwxo9ZqnfF/lC6A=="
75+
},
76+
"Roslynator.Analyzers": {
77+
"type": "Direct",
78+
"requested": "[4.14.1, )",
79+
"resolved": "4.14.1",
80+
"contentHash": "yMSjze/xMYDF6PCE60/ULWx0tttNyKAndw2KijNxbKil0FX8nvDeEneDZGma8Uifk17RlfZqIXxf1mmBmhRHjg=="
81+
},
82+
"StyleCop.Analyzers": {
83+
"type": "Direct",
84+
"requested": "[1.1.118, )",
85+
"resolved": "1.1.118",
86+
"contentHash": "Onx6ovGSqXSK07n/0eM3ZusiNdB6cIlJdabQhWGgJp3Vooy9AaLS/tigeybOJAobqbtggTamoWndz72JscZBvw=="
87+
},
88+
"teamtools.common.linting": {
89+
"type": "Project",
90+
"dependencies": {
91+
"Microsoft.NETCore.Platforms": "[7.0.4, )",
92+
"Newtonsoft.Json": "[13.0.4, )"
93+
}
94+
}
95+
},
6396
"net6.0": {
6497
"CommandLineParser": {
6598
"type": "Direct",

‎TeamTools.TSQL.Common/TeamTools.Common.Linting.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
55
<OutputType>Library</OutputType>
66
<Configurations>Debug;Release</Configurations>
77
</PropertyGroup>

‎TeamTools.TSQL.Common/packages.lock.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,32 @@
3636
"contentHash": "Onx6ovGSqXSK07n/0eM3ZusiNdB6cIlJdabQhWGgJp3Vooy9AaLS/tigeybOJAobqbtggTamoWndz72JscZBvw=="
3737
}
3838
},
39+
"net10.0": {
40+
"Microsoft.NETCore.Platforms": {
41+
"type": "Direct",
42+
"requested": "[7.0.4, )",
43+
"resolved": "7.0.4",
44+
"contentHash": "yLEHlNN7O5WiND89r42sepgVwy5W/ZoTiFEdJDV7MHR1lW02LL7Nipz2TD5qM/Kx9W3/k3NP+PAP2qUdOm+leg=="
45+
},
46+
"Newtonsoft.Json": {
47+
"type": "Direct",
48+
"requested": "[13.0.4, )",
49+
"resolved": "13.0.4",
50+
"contentHash": "pdgNNMai3zv51W5aq268sujXUyx7SNdE2bj1wZcWjAQrKMFZV260lbqYop1d2GM67JI1huLRwxo9ZqnfF/lC6A=="
51+
},
52+
"Roslynator.Analyzers": {
53+
"type": "Direct",
54+
"requested": "[4.14.1, )",
55+
"resolved": "4.14.1",
56+
"contentHash": "yMSjze/xMYDF6PCE60/ULWx0tttNyKAndw2KijNxbKil0FX8nvDeEneDZGma8Uifk17RlfZqIXxf1mmBmhRHjg=="
57+
},
58+
"StyleCop.Analyzers": {
59+
"type": "Direct",
60+
"requested": "[1.1.118, )",
61+
"resolved": "1.1.118",
62+
"contentHash": "Onx6ovGSqXSK07n/0eM3ZusiNdB6cIlJdabQhWGgJp3Vooy9AaLS/tigeybOJAobqbtggTamoWndz72JscZBvw=="
63+
}
64+
},
3965
"net6.0": {
4066
"Microsoft.NETCore.Platforms": {
4167
"type": "Direct",

0 commit comments

Comments
 (0)