Skip to content

Commit 330216e

Browse files
CorruptComputerqmfrederik
authored andcommitted
.NET 10 support
1 parent dfc9dde commit 330216e

File tree

11 files changed

+45
-14
lines changed

11 files changed

+45
-14
lines changed

.azure-pipelines.yml

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,15 @@ resources:
3737
image: mcr.microsoft.com/dotnet/sdk:9.0-noble
3838
- container: 9.0-nanoserver
3939
image: mcr.microsoft.com/dotnet/sdk:9.0-nanoserver-1809
40-
40+
- container: 10.0-noble
41+
image: mcr.microsoft.com/dotnet/sdk:10.0-noble
42+
- container: 10.0-nanoserver
43+
image: mcr.microsoft.com/dotnet/sdk:10.0-nanoserver-ltsc2025
4144
stages:
4245
- stage: Build
4346
jobs:
4447
- job: build_noble
45-
container: 9.0-noble
48+
container: 10.0-noble
4649
pool:
4750
vmImage: ubuntu-22.04
4851
steps:
@@ -67,7 +70,7 @@ stages:
6770
- job: build_windows
6871
pool:
6972
vmImage: windows-2019
70-
container: 9.0-nanoserver
73+
container: 10.0-nanoserver-ltsc2025
7174
# Make sure we can run scripts in PowerShell core:
7275
# https://github.com/microsoft/azure-pipelines-tasks/issues/11448
7376
variables:
@@ -206,6 +209,18 @@ stages:
206209
container: 9.0-noble
207210
command: tarball
208211

212+
10.0-noble-deb:
213+
container: 10.0-noble
214+
command: deb
215+
10.0-noble-rpm:
216+
container: 10.0-noble
217+
command: rpm
218+
10.0-noble-zip:
219+
container: 10.0-noble
220+
command: zip
221+
10.0-noble-tarball:
222+
container: 10.0-noble
223+
command: tarball
209224
container: $[ variables['container'] ]
210225
pool:
211226
vmImage: ubuntu-22.04
@@ -259,12 +274,19 @@ stages:
259274
framework-dependent-app-9_0:
260275
suite: framework-dependent
261276
framework: net9.0
277+
278+
self-contained-10_0:
279+
suite: self-contained
280+
framework: net10.0
281+
framework-dependent-app-10_0:
282+
suite: framework-dependent
283+
framework: net10.0
262284
steps:
263285
- task: UseDotNet@2
264-
displayName: 'Use .NET Core 9.0'
286+
displayName: 'Use .NET Core 10.0'
265287
inputs:
266288
packageType: sdk
267-
version: 9.0.x
289+
version: 10.0.x
268290
- bash: |
269291
set -e
270292
export PATH=~/.local/bin/:$PATH

.drone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ platform:
77

88
steps:
99
- name: build
10-
image: mcr.microsoft.com/dotnet/sdk:9.0-noble-arm64v8
10+
image: mcr.microsoft.com/dotnet/sdk:10.0-noble-arm64v8
1111
commands:
1212
- dotnet test Packaging.Targets.Tests/Packaging.Targets.Tests.csproj

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
7.0.x
2020
8.0.x
2121
9.0.x
22+
10.0.x
2223
2324
- name: Build
2425
run: |

Packaging.Targets.Tests/Packaging.Targets.Tests.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>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

Packaging.Targets/build/Packaging.Targets.targets

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@
100100
<RpmDotNetDependency Include="dotnet-runtime-9.0" Version="" />
101101
</ItemGroup>
102102

103+
<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net10.0'">
104+
<RpmDotNetDependency Include="dotnet-runtime-10.0" Version="" />
105+
</ItemGroup>
106+
103107
<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' != ''">
104108
<RpmDotNetDependency Include="openssl-libs" Version="" />
105109
<RpmDotNetDependency Include="libicu" Version="" />
@@ -194,6 +198,10 @@
194198
<DebDotNetDependencies Include="dotnet-runtime-9.0"/>
195199
</ItemGroup>
196200

201+
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net10.0'">
202+
<DebDotNetDependencies Include="dotnet-runtime-10.0"/>
203+
</ItemGroup>
204+
197205
<!-- Dependency list for netcore3.1, updated to support Ubuntu 20.10/21.04 -->
198206
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' != ''">
199207
<DebDependencies Include="libc6"/>
@@ -202,7 +210,7 @@
202210
<DebDependencies Include="libstdc++6"/>
203211
<DebDependencies Include="zlib1g"/>
204212
<DebDependencies Include="libssl3 | libssl1.1 | libssl1.0.2 | libssl1.0.1 | libssl1.0.0 | libssl0.9.8"/>
205-
<DebDependencies Include="libicu74 | libicu72 | libicu70 | libicu69 | libicu68 | libicu67 | libicu66 | libicu65 | libicu64 | libicu63 | libicu62 | libicu61 | libicu60 | libicu59 | libicu58 | libicu57 | libicu56 | libicu55 | libicu54 | libicu53 | libicu52"/>
213+
<DebDependencies Include="libicu78 | libicu77 | libicu76 | libicu75 | libicu74 | libicu72 | libicu70 | libicu69 | libicu68 | libicu67 | libicu66 | libicu65 | libicu64 | libicu63 | libicu62 | libicu61 | libicu60 | libicu59 | libicu58 | libicu57 | libicu56 | libicu55 | libicu54 | libicu53 | libicu52"/>
206214
</ItemGroup>
207215

208216
<ItemGroup Condition="'$(SkipDebDependencies)' == 'true'">

dotnet-deb/dotnet-deb.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" ToolsVersion="15.0">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
<PackageTags>dotnet cli packaging deb debian ubuntu mint installer</PackageTags>
66
<Description>Create Debian and Ubuntu installers (.deb files ) of your .NET Core projects straight from the command line.
77

dotnet-rpm/dotnet-rpm.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
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
<PackageTags>dotnet cli packaging rpm package installer</PackageTags>
66
<Description>Create RPM packages (.rpm files) of your .NET Core projects straight from the command line.
77

dotnet-tarball/dotnet-tarball.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" ToolsVersion="15.0">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
<PackageTags>dotnet cli packaging tarball tar.gz archive</PackageTags>
66
<Description>Create tarballs (.tar.gz files) of your .NET Core projects straight from the command line.
77

dotnet-zip/dotnet-zip.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" ToolsVersion="15.0">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
<PackageTags>dotnet cli packaging zip archive</PackageTags>
66
<Description>Create .zip files of your .NET Core projects straight from the command line.
77

molecule/framework-dependent/framework-dependent-app/framework-dependent-app.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0,net7.0;net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0,net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
66
<RootNamespace>framework_dependent_app</RootNamespace>
77
</PropertyGroup>
88

0 commit comments

Comments
 (0)