Drop netcoreapp2.0 and netcoreapp3.0

Replace with netcoreapp3.1
2026-07-08 18:06:08 +00:00 · 2021-11-09 09:25:32 +01:00
parent 21f91cf9f5
commit d75593b478
13 changed files with 55 additions and 51 deletions
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -13,6 +13,10 @@ resources:
    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

@@ -67,32 +71,6 @@ stages:
    strategy:
      maxParallel: 8
      matrix:
-        2.2-bionic-deb:
-          container: 2.2-bionic
-          command: deb
-        2.2-bionic-rpm:
-          container: 2.2-bionic
-          command: rpm
-        2.2-bionic-zip:
-          container: 2.2-bionic
-          command: zip
-        2.2-bionic-tarball:
-          container: 2.2-bionic
-          command: tarball
-
-        3.0-disco-deb:
-          container: 3.0-disco
-          command: deb
-        3.0-disco-rpm:
-          container: 3.0-disco
-          command: rpm
-        3.0-disco-zip:
-          container: 3.0-disco
-          command: zip
-        3.0-disco-tarball:
-          container: 3.0-disco
-          command: tarball
-
        3.1-focal-deb:
          container: 3.1-focal
          command: deb
@@ -119,6 +97,32 @@ stages:
          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
+
    container: $[ variables['container'] ]
    pool:
      vmImage: ubuntu-20.04
@@ -200,10 +204,10 @@ stages:
      command: tarball
    steps:
    - task: UseDotNet@2
-      displayName: 'Use .NET Core 3.0'
+      displayName: 'Use .NET Core 3.1'
      inputs:
        packageType: sdk
-        version: 3.0.100
+        version: 3.1.415
    - template: .azure-pipelines-shared.yml

  - job: test_macos
@@ -217,18 +221,20 @@ stages:
        artifactName: packages
        downloadPath: $(Build.ArtifactStagingDirectory)/
    - task: UseDotNet@2
-      displayName: 'Use .NET Core 3.0'
+      displayName: 'Use .NET Core 3.1'
      inputs:
        packageType: sdk
-        version: 3.0.100
+        version: 3.1.415
    - bash: |
        set -e
        tar xvzf $(Build.ArtifactStagingDirectory)/packages/macos/test-tarball.1.0.0.tar.gz
      displayName: Extract tarball
+    # .NET Core 3.x adn 5.x don't generate an app host for because the apps won't run on ARM if not notarized.
+    # See https://github.com/dotnet/sdk/pull/4019/files and https://github.com/dotnet/sdk/issues/4012.
+    # This means there's no 'test-tarball' executable to run.
    - bash: |
        set -e
-        chmod +x ./test-tarball
-        ./test-tarball
+        dotnet ./test-tarball.dll
      displayName: Execute program

  - job: publish_nuget
--- a/README.md
+++ b/README.md
@@ -80,10 +80,10 @@ All set. Let's package your application as a deb package:
 dotnet deb
 ```

-There's now a `bin\Debug\netcoreapp3.0\my-app.1.0.0.deb` file wich you can install:
+There's now a `bin\Debug\netcoreapp3.1\my-app.1.0.0.deb` file wich you can install:

 ```bash
-apt-get install bin\Debug\netcoreapp3.0\my-app.1.0.0.deb
+apt-get install bin\Debug\netcoreapp3.1\my-app.1.0.0.deb
 ```

 Your application is installed into `/usr/local/share/my-app`. Invoke it by running `/usr/local/share/my-app/my-app`:
--- a/demo/aspnetcore/aspnetcore.csproj
+++ b/demo/aspnetcore/aspnetcore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <RuntimeIdentifiers>win7-x64;rhel.7-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
    <CreateUser>true</CreateUser>
    <InstallService>true</InstallService>
--- a/demo/clifdd/clifdd.csproj
+++ b/demo/clifdd/clifdd.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <RuntimeIdentifiers>win7-x64;win7-x86;win10-x64;win10-x86;osx-x64;debian.8-x64;ubuntu.16.10-x64;ubuntu.16.04-x64;opensuse-x64;ol-x64;rhel-x64;fedora-x64;centos-x64</RuntimeIdentifiers>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/demo/cliscd/cliscd.csproj
+++ b/demo/cliscd/cliscd.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <RuntimeIdentifiers>win7-x64;win10-x64;osx-x64;debian.8-x64;debian.9-x64;ubuntu.19.04-x64;ubuntu.18.04-x64;ubuntu.16.04-x64;ubuntu.14.04-x64;opensuse.42.3-x64;ol.7-x64;rhel-x64;fedora.27-x64;fedora.28-x64;centos.7-x64</RuntimeIdentifiers>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
  </PropertyGroup>

--- a/demo/cliscd/run-tests.sh
+++ b/demo/cliscd/run-tests.sh
@@ -38,8 +38,8 @@ then
    exit 0
 fi

-dotnet $format -c Release -r $rid -f netcoreapp3.0
-cp bin/Release/netcoreapp3.0/$rid/cliscd.1.0.0.$rid.$format $rid
+dotnet $format -c Release -r $rid -f netcoreapp3.1
+cp bin/Release/netcoreapp3.1/$rid/cliscd.1.0.0.$rid.$format $rid
 sudo docker build -t clisc:$rid $rid
 sudo docker run clisc:$rid

--- 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>netcoreapp2.1;netcoreapp3.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.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>netcoreapp2.1;netcoreapp3.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.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>netcoreapp2.1;netcoreapp3.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.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>netcoreapp2.1;netcoreapp3.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.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>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <RootNamespace>framework_dependent_app</RootNamespace>
  </PropertyGroup>

--- a/molecule/framework-dependent/molecule/default/molecule.yml
+++ b/molecule/framework-dependent/molecule/default/molecule.yml
@@ -20,18 +20,16 @@ platforms:
    image: ubuntu:16.04
  - name: ubuntu.18.04
    image: ubuntu:18.04
-  # Ubuntu 20.04 supports .NET Core 3.1 only, but we target 3.0 (at the moment)
-  # - name: ubuntu.20.04
-  #   image: ubuntu:20.04
+  - name: ubuntu.20.04
+    image: ubuntu:20.04
  - name: debian.9
    image: debian:9
  - name: debian.10
    image: debian:10
  - name: fedora.31
    image: fedora:31
-  # Fedora 32 supports .NET Core 3.1 only, but we target 3.0 (at the moment)
-  # - name: fedora.32
-  #   image: fedora:32
+  - name: fedora.32
+    image: fedora:32
  - name: centos.7
    image: centos:7
  # There's an issue running on CentOS 8
--- 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>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <RootNamespace>self_contained_app</RootNamespace>
    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
  </PropertyGroup>