diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index bf19d5b..8ad6bde 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -3,32 +3,6 @@ trigger: resources: containers: - - container: 2.2-bionic - image: mcr.microsoft.com/dotnet/core/sdk:2.2-bionic - - container: 3.0-disco - image: mcr.microsoft.com/dotnet/core/sdk:3.0-disco - - container: 3.0-buster - image: mcr.microsoft.com/dotnet/core/sdk:3.0-buster - - container: 3.1-focal - image: mcr.microsoft.com/dotnet/core/sdk:3.1-focal - - container: 5.0-focal - image: mcr.microsoft.com/dotnet/sdk:5.0-focal - - container: 5.0-buster - image: mcr.microsoft.com/dotnet/sdk:5.0-buster-slim - - container: 5.0-bullseye - image: mcr.microsoft.com/dotnet/sdk:5.0-bullseye-slim - - container: 5.0-nanoserver - image: mcr.microsoft.com/dotnet/sdk:5.0-nanoserver-1809 - - container: 6.0-focal - image: mcr.microsoft.com/dotnet/sdk:6.0-focal - - container: 6.0-bullseye - image: mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim - - container: 6.0-nanoserver - image: mcr.microsoft.com/dotnet/sdk:6.0-nanoserver-1809 - - container: 7.0-bullseye - image: mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim - - container: 7.0-nanoserver - image: mcr.microsoft.com/dotnet/sdk:7.0-nanoserver-1809 - container: 8.0-jammy image: mcr.microsoft.com/dotnet/sdk:8.0-jammy - container: 8.0-nanoserver @@ -92,102 +66,11 @@ stages: strategy: maxParallel: 8 matrix: - 3.1-focal-deb: - container: 3.1-focal - command: deb - 3.1-disco-rpm: - container: 3.1-focal - command: rpm - 3.1-focal-zip: - container: 3.1-focal - command: zip - 3.1-focal-tarball: - container: 3.1-focal - command: tarball - - 5.0-focal-deb: - container: 5.0-focal - command: deb - 5.0-focal-rpm: - container: 5.0-focal - command: rpm - 5.0-focal-zip: - container: 5.0-focal - command: zip - 5.0-focal-tarball: - container: 5.0-focal - command: tarball - - 5.0-buster-deb: - container: 5.0-buster - command: deb - 5.0-buster-rpm: - container: 5.0-buster - command: rpm - 5.0-buster-zip: - container: 5.0-buster - command: zip - 5.0-buster-tarball: - container: 5.0-buster - command: tarball - - 5.0-bullseye-deb: - container: 5.0-bullseye - command: deb - 5.0-bullseye-rpm: - container: 5.0-bullseye - command: rpm - 5.0-bullseye-zip: - container: 5.0-bullseye - command: zip - 5.0-bullseye-tarball: - container: 5.0-bullseye - command: tarball - - 6.0-focal-deb: - container: 6.0-focal - command: deb - 6.0-focal-rpm: - container: 6.0-focal - command: rpm - 6.0-focal-zip: - container: 6.0-focal - command: zip - 6.0-focal-tarball: - container: 6.0-focal - command: tarball - - 6.0-bullseye-deb: - container: 6.0-bullseye - command: deb - 6.0-bullseye-rpm: - container: 6.0-bullseye - command: rpm - 6.0-bullseye-zip: - container: 6.0-bullseye - command: zip - 6.0-bullseye-tarball: - 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 - 8.0-jammy-deb: - container: 8.0-jammy + container: 8.0-jammy command: deb 8.0-jammy-rpm: - container: 8.0-jammy + container: 8.0-jammy command: rpm 8.0-jammy-zip: container: 8.0-jammy @@ -195,7 +78,7 @@ stages: 8.0-jammy-tarball: container: 8.0-jammy command: tarball - + 9.0-noble-deb: container: 9.0-noble command: deb @@ -233,41 +116,13 @@ stages: strategy: maxParallel: 8 matrix: - self-contained-3_1: - suite: self-contained - framework: netcoreapp3.1 - framework-dependent-app-3_1: - suite: framework-dependent - framework: netcoreapp3.1 - - self-contained-5_0: - suite: self-contained - framework: net5.0 - framework-dependent-app-5_0: - suite: framework-dependent - framework: net5.0 - - self-contained-6_0: - suite: self-contained - framework: net6.0 - framework-dependent-app-6_0: - suite: framework-dependent - framework: net6.0 - - self-contained-7_0: - suite: self-contained - framework: net7.0 - framework-dependent-app-7_0: - suite: framework-dependent - framework: net7.0 - self-contained-8_0: suite: self-contained framework: net8.0 framework-dependent-app-8_0: suite: framework-dependent framework: net8.0 - + self-contained-9_0: suite: self-contained framework: net9.0 @@ -399,7 +254,7 @@ stages: inputs: artifactName: 'nuget' displayName: 'Download NuGet artifacts' - + - task: NuGetToolInstaller@0 displayName: Install NuGet diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9643808..24d8d6c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,8 +15,6 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x - 7.0.x 8.0.x 9.0.x 10.0.x diff --git a/Packaging.Targets.Tests/Packaging.Targets.Tests.csproj b/Packaging.Targets.Tests/Packaging.Targets.Tests.csproj index 367925b..5c56603 100644 --- a/Packaging.Targets.Tests/Packaging.Targets.Tests.csproj +++ b/Packaging.Targets.Tests/Packaging.Targets.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0 diff --git a/Packaging.Targets/build/Packaging.Targets.targets b/Packaging.Targets/build/Packaging.Targets.targets index 786b729..5b01377 100644 --- a/Packaging.Targets/build/Packaging.Targets.targets +++ b/Packaging.Targets/build/Packaging.Targets.targets @@ -10,7 +10,7 @@ and allow the user to override this. --> $(Version) 1.0.0 - + $(TargetName) $(PackagePrefix).$(PackageVersion).$(RuntimeIdentifier) $(PackagePrefix).$(PackageVersion) @@ -51,7 +51,7 @@ https://github.com/dotnet/core-setup/blob/release/2.2/src/pkg/packaging/rpm/ https://github.com/dotnet/core-setup/blob/master/src/pkg/packaging/rpm/ https://github.com/dotnet/runtime/tree/v6.0.0/src/installer/pkg/sfx/installers/dotnet-runtime-deps - + The syntax for "boolean dependencies" is described here (available starting with rpm 3.14): https://rpm.org/user_doc/boolean_dependencies.html @@ -64,34 +64,6 @@ - Upstream lists compat libraries for OpenSSL 1.0 instead of OpenSSL 1.1, that seems like an oversight. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -112,12 +84,12 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -204,7 +148,7 @@ - + @@ -215,11 +159,11 @@ - - + + - - - + - + diff --git a/dotnet-deb/dotnet-deb.csproj b/dotnet-deb/dotnet-deb.csproj index 240dc10..dbc0d8d 100644 --- a/dotnet-deb/dotnet-deb.csproj +++ b/dotnet-deb/dotnet-deb.csproj @@ -1,7 +1,7 @@  Exe - net6.0;net7.0;net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0 dotnet cli packaging deb debian ubuntu mint installer Create Debian and Ubuntu installers (.deb files ) of your .NET Core projects straight from the command line. @@ -17,7 +17,7 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how - + diff --git a/dotnet-rpm/dotnet-rpm.csproj b/dotnet-rpm/dotnet-rpm.csproj index 900a2d3..58b7778 100644 --- a/dotnet-rpm/dotnet-rpm.csproj +++ b/dotnet-rpm/dotnet-rpm.csproj @@ -1,7 +1,7 @@  Exe - net6.0;net7.0;net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0 dotnet cli packaging rpm package installer Create RPM packages (.rpm files) of your .NET Core projects straight from the command line. diff --git a/dotnet-tarball/dotnet-tarball.csproj b/dotnet-tarball/dotnet-tarball.csproj index a9d2d74..3788e04 100644 --- a/dotnet-tarball/dotnet-tarball.csproj +++ b/dotnet-tarball/dotnet-tarball.csproj @@ -1,7 +1,7 @@  Exe - net6.0;net7.0;net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0 dotnet cli packaging tarball tar.gz archive Create tarballs (.tar.gz files) of your .NET Core projects straight from the command line. @@ -17,7 +17,7 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how - + diff --git a/dotnet-zip/dotnet-zip.csproj b/dotnet-zip/dotnet-zip.csproj index e831b32..da19c19 100644 --- a/dotnet-zip/dotnet-zip.csproj +++ b/dotnet-zip/dotnet-zip.csproj @@ -1,7 +1,7 @@  Exe - net6.0;net7.0;net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0 dotnet cli packaging zip archive Create .zip files of your .NET Core projects straight from the command line. @@ -17,7 +17,7 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how - + diff --git a/molecule/framework-dependent/framework-dependent-app/framework-dependent-app.csproj b/molecule/framework-dependent/framework-dependent-app/framework-dependent-app.csproj index 3695d64..7cbaab0 100644 --- 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 @@ Exe - net6.0,net7.0;net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0 framework_dependent_app @@ -24,7 +24,7 @@ - + diff --git a/molecule/self-contained/self-contained-app/self-contained-app.csproj b/molecule/self-contained/self-contained-app/self-contained-app.csproj index e956be9..5ec2d13 100644 --- 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 @@ Exe - net6.0,net7.0;net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0 self_contained_app linux-x64 @@ -25,7 +25,7 @@ - +