Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@ resources:
image: mcr.microsoft.com/dotnet/sdk:9.0-noble
- container: 9.0-nanoserver
image: mcr.microsoft.com/dotnet/sdk:9.0-nanoserver-1809

- container: 10.0-noble
image: mcr.microsoft.com/dotnet/sdk:10.0-noble
- container: 10.0-nanoserver
image: mcr.microsoft.com/dotnet/sdk:10.0-nanoserver-ltsc2025
stages:
- stage: Build
jobs:
- job: build_noble
container: 9.0-noble
container: 10.0-noble
pool:
vmImage: ubuntu-22.04
steps:
Expand All @@ -67,7 +70,7 @@ stages:
- job: build_windows
pool:
vmImage: windows-2019
container: 9.0-nanoserver
container: 10.0-nanoserver-ltsc2025
# Make sure we can run scripts in PowerShell core:
# https://github.com/microsoft/azure-pipelines-tasks/issues/11448
variables:
Expand Down Expand Up @@ -206,6 +209,18 @@ stages:
container: 9.0-noble
command: tarball

10.0-noble-deb:
container: 10.0-noble
command: deb
10.0-noble-rpm:
container: 10.0-noble
command: rpm
10.0-noble-zip:
container: 10.0-noble
command: zip
10.0-noble-tarball:
container: 10.0-noble
command: tarball
container: $[ variables['container'] ]
pool:
vmImage: ubuntu-22.04
Expand Down Expand Up @@ -259,12 +274,19 @@ stages:
framework-dependent-app-9_0:
suite: framework-dependent
framework: net9.0

self-contained-10_0:
suite: self-contained
framework: net10.0
framework-dependent-app-10_0:
suite: framework-dependent
framework: net10.0
steps:
- task: UseDotNet@2
displayName: 'Use .NET Core 9.0'
displayName: 'Use .NET Core 10.0'
inputs:
packageType: sdk
version: 9.0.x
version: 10.0.x
- bash: |
set -e
export PATH=~/.local/bin/:$PATH
Expand Down
2 changes: 1 addition & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ platform:

steps:
- name: build
image: mcr.microsoft.com/dotnet/sdk:9.0-noble-arm64v8
image: mcr.microsoft.com/dotnet/sdk:10.0-noble-arm64v8
commands:
- dotnet test Packaging.Targets.Tests/Packaging.Targets.Tests.csproj
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
7.0.x
8.0.x
9.0.x
10.0.x

- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion Packaging.Targets.Tests/Packaging.Targets.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
10 changes: 9 additions & 1 deletion Packaging.Targets/build/Packaging.Targets.targets
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@
<RpmDotNetDependency Include="dotnet-runtime-9.0" Version="" />
</ItemGroup>

<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net10.0'">
<RpmDotNetDependency Include="dotnet-runtime-10.0" Version="" />
</ItemGroup>

<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' != ''">
<RpmDotNetDependency Include="openssl-libs" Version="" />
<RpmDotNetDependency Include="libicu" Version="" />
Expand Down Expand Up @@ -194,6 +198,10 @@
<DebDotNetDependencies Include="dotnet-runtime-9.0"/>
</ItemGroup>

<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net10.0'">
<DebDotNetDependencies Include="dotnet-runtime-10.0"/>
</ItemGroup>

<!-- Dependency list for netcore3.1, updated to support Ubuntu 20.10/21.04 -->
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' != ''">
<DebDependencies Include="libc6"/>
Expand All @@ -202,7 +210,7 @@
<DebDependencies Include="libstdc++6"/>
<DebDependencies Include="zlib1g"/>
<DebDependencies Include="libssl3 | libssl1.1 | libssl1.0.2 | libssl1.0.1 | libssl1.0.0 | libssl0.9.8"/>
<DebDependencies Include="libicu74 | libicu72 | libicu70 | libicu69 | libicu68 | libicu67 | libicu66 | libicu65 | libicu64 | libicu63 | libicu62 | libicu61 | libicu60 | libicu59 | libicu58 | libicu57 | libicu56 | libicu55 | libicu54 | libicu53 | libicu52"/>
<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"/>
</ItemGroup>

<ItemGroup Condition="'$(SkipDebDependencies)' == 'true'">
Expand Down
2 changes: 1 addition & 1 deletion dotnet-deb/dotnet-deb.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<PackageTags>dotnet cli packaging deb debian ubuntu mint installer</PackageTags>
<Description>Create Debian and Ubuntu installers (.deb files ) of your .NET Core projects straight from the command line.

Expand Down
2 changes: 1 addition & 1 deletion dotnet-rpm/dotnet-rpm.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<PackageTags>dotnet cli packaging rpm package installer</PackageTags>
<Description>Create RPM packages (.rpm files) of your .NET Core projects straight from the command line.

Expand Down
2 changes: 1 addition & 1 deletion dotnet-tarball/dotnet-tarball.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<PackageTags>dotnet cli packaging tarball tar.gz archive</PackageTags>
<Description>Create tarballs (.tar.gz files) of your .NET Core projects straight from the command line.

Expand Down
2 changes: 1 addition & 1 deletion dotnet-zip/dotnet-zip.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<PackageTags>dotnet cli packaging zip archive</PackageTags>
<Description>Create .zip files of your .NET Core projects straight from the command line.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0,net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0,net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<RootNamespace>framework_dependent_app</RootNamespace>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0,net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net6.0,net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
<RootNamespace>self_contained_app</RootNamespace>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
</PropertyGroup>
Expand Down
Loading