Add support for net9.0

2026-07-08 18:06:08 +00:00 · 2024-11-22 00:28:30 -06:00
parent 462ba880a7
commit 951cad2351
10 changed files with 23 additions and 11 deletions
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -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:
@@ -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:
--- a/.drone.yml
+++ b/.drone.yml
@@ -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
--- a/Packaging.Targets.Tests/Packaging.Targets.Tests.csproj
+++ b/Packaging.Targets.Tests/Packaging.Targets.Tests.csproj
@@ -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>
--- a/Packaging.Targets/build/Packaging.Targets.targets
+++ b/Packaging.Targets/build/Packaging.Targets.targets
@@ -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="" />
@@ -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"/>  
--- a/dotnet-deb/dotnet-deb.csproj
+++ b/dotnet-deb/dotnet-deb.csproj
@@ -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.

--- a/dotnet-rpm/dotnet-rpm.csproj
+++ b/dotnet-rpm/dotnet-rpm.csproj
@@ -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.

--- a/dotnet-tarball/dotnet-tarball.csproj
+++ b/dotnet-tarball/dotnet-tarball.csproj
@@ -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.

--- a/dotnet-zip/dotnet-zip.csproj
+++ b/dotnet-zip/dotnet-zip.csproj
@@ -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.

--- a/molecule/framework-dependent/framework-dependent-app/framework-dependent-app.csproj
+++ b/molecule/framework-dependent/framework-dependent-app/framework-dependent-app.csproj
@@ -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>

--- a/molecule/self-contained/self-contained-app/self-contained-app.csproj
+++ b/molecule/self-contained/self-contained-app/self-contained-app.csproj
@@ -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>