Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for net9.0 #257

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
82 changes: 53 additions & 29 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,16 @@ resources:
image: mcr.microsoft.com/dotnet/sdk:8.0-jammy
- container: 8.0-nanoserver
image: mcr.microsoft.com/dotnet/sdk:8.0-nanoserver-1809
- container: 9.0-noble
image: mcr.microsoft.com/dotnet/sdk:9.0-noble
- container: 9.0-nanoserver
image: mcr.microsoft.com/dotnet/sdk:9.0-nanoserver-1809

stages:
- stage: Build
jobs:
- job: build_jammy
container: 8.0-jammy
- job: build_noble
container: 9.0-noble
pool:
vmImage: ubuntu-22.04
steps:
Expand All @@ -63,7 +67,7 @@ stages:
- job: build_windows
pool:
vmImage: windows-2019
container: 8.0-nanoserver
container: 9.0-nanoserver
# Make sure we can run scripts in PowerShell core:
# https://github.com/microsoft/azure-pipelines-tasks/issues/11448
variables:
Expand Down Expand Up @@ -163,31 +167,44 @@ stages:
container: 6.0-bullseye
command: tarball

7.0-bullseye-deb:
container: 7.0-bullseye
command: deb
7.0-bullseye-rpm:
container: 7.0-bullseye
command: rpm
7.0-bullseye-zip:
container: 7.0-bullseye
command: zip
7.0-bullseye-tarball:
container: 7.0-bullseye
command: tarball
7.0-bullseye-deb:
container: 7.0-bullseye
command: deb
7.0-bullseye-rpm:
container: 7.0-bullseye
command: rpm
7.0-bullseye-zip:
container: 7.0-bullseye
command: zip
7.0-bullseye-tarball:
container: 7.0-bullseye
command: tarball

8.0-jammy-deb:
container: 8.0-jammy
command: deb
8.0-jammy-rpm:
container: 8.0-jammy
command: rpm
8.0-jammy-zip:
container: 8.0-jammy
command: zip
8.0-jammy-tarball:
container: 8.0-jammy
command: tarball
8.0-jammy-deb:
container: 8.0-jammy
command: deb
8.0-jammy-rpm:
container: 8.0-jammy
command: rpm
8.0-jammy-zip:
container: 8.0-jammy
command: zip
8.0-jammy-tarball:
container: 8.0-jammy
command: tarball

9.0-noble-deb:
container: 9.0-noble
command: deb
9.0-noble-rpm:
container: 9.0-noble
command: rpm
9.0-noble-zip:
container: 9.0-noble
command: zip
9.0-noble-tarball:
container: 9.0-noble
command: tarball

container: $[ variables['container'] ]
pool:
Expand Down Expand Up @@ -235,12 +252,19 @@ stages:
framework-dependent-app-8_0:
suite: framework-dependent
framework: net8.0

self-contained-9_0:
suite: self-contained
framework: net9.0
framework-dependent-app-9_0:
suite: framework-dependent
framework: net9.0
steps:
- task: UseDotNet@2
displayName: 'Use .NET Core 8.0'
displayName: 'Use .NET Core 9.0'
inputs:
packageType: sdk
version: 8.0.x
version: 9.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:8.0.2-jammy-arm64v8
image: mcr.microsoft.com/dotnet/sdk:9.0-noble-arm64v8
commands:
- dotnet test Packaging.Targets.Tests/Packaging.Targets.Tests.csproj
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</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions Packaging.Targets/build/Packaging.Targets.targets
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@
<RpmDotNetDependency Include="dotnet-runtime-8.0" Version="" />
</ItemGroup>

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

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

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

<!-- Dependency list for netcore3.1, updated to support Ubuntu 20.10/21.04 -->
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' != ''">
<DebDependencies Include="libc6"/>
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;</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.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</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.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</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.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</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.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;</TargetFrameworks>
<TargetFrameworks>net6.0,net7.0;net8.0;net9.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;</TargetFrameworks>
<TargetFrameworks>net6.0,net7.0;net8.0;net9.0</TargetFrameworks>
<RootNamespace>self_contained_app</RootNamespace>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
</PropertyGroup>
Expand Down