Merge pull request #164 from qmfrederik/features/net50-2

Add .NET 5.0 support
2026-07-08 18:06:08 +00:00 · 2020-08-28 23:17:32 +02:00
parent 9941587984 5aae13e4c4
commit d6a91708dd
8 changed files with 24 additions and 70 deletions
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -12,13 +12,13 @@ resources:
  - container: 3.1-focal
    image: mcr.microsoft.com/dotnet/core/sdk:3.1-focal
  - container: 5.0-focal
-    image: mcr.microsoft.com/dotnet/core/sdk:5.0-focal
+    image: mcr.microsoft.com/dotnet/sdk:5.0

 stages:
 - stage: Build
  jobs:
  - job: build
-    container: 3.0-buster
+    container: 5.0-focal
    steps:
    - bash: |
        dotnet restore dotnet-packaging.sln
@@ -78,18 +78,18 @@ stages:
          container: 3.1-focal
          command: tarball

-        # 5.0-focal-deb:
-        #   container: 5.0-focal
-        #   command: deb
-        # 5.0-disco-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-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

    container: $[ variables['container'] ]
    steps:
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -13,6 +13,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="NerdBank.GitVersioning" Version="2.3.138" PrivateAssets="All" />
+    <PackageReference Include="NerdBank.GitVersioning" Version="3.2.31" PrivateAssets="All" />
  </ItemGroup>
 </Project>
--- a/Packaging.Targets/Packaging.Targets.csproj
+++ b/Packaging.Targets/Packaging.Targets.csproj
@@ -19,15 +19,15 @@
  </PropertyGroup>
  <ItemGroup>
    <!-- MSBuild ships as part of the .NET CLI -->
-    <PackageReference Include="Microsoft.Build.Framework" Version="15.3.409">
+    <PackageReference Include="Microsoft.Build.Framework" Version="16.6.0">
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.3.409">
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.6.0">
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
    <!-- BoncyCastle and SharpZipLib are included in the lib\ folder in the Packaging.Targets package (see below), so we don't need an
         explicit dependency on them, either -->
-    <PackageReference Include="Portable.BouncyCastle" Version="1.8.1.3">
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.6.7">
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
    <PackageReference Include="SharpZipLib" Version="1.2.0">
@@ -36,7 +36,7 @@
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="System.Buffers" Version="4.5.0" />
+    <PackageReference Include="System.Buffers" Version="4.5.1" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="build\*.*">
@@ -51,7 +51,7 @@
    </Content>

    <!-- Bouncy Castle-->
-    <Content Include="$(NuGetPackageRoot)\portable.bouncycastle\1.8.1.3\lib\netstandard2.0\BouncyCastle.Crypto.dll" Link="BouncyCastle.Crypto.dll">
+    <Content Include="$(NuGetPackageRoot)\portable.bouncycastle\1.8.6.7\lib\netstandard2.0\BouncyCastle.Crypto.dll" Link="BouncyCastle.Crypto.dll">
      <Pack>true</Pack>
      <PackagePath>tools\netstandard2.0\</PackagePath>
    </Content>
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,46 +0,0 @@
-image: Visual Studio 2019
-
-version: '0.1.{build}'
-skip_branch_with_pr: true
-
-before_build:
-  - dotnet restore dotnet-packaging.sln
-
-build_script:
-  - dotnet pack dotnet-packaging.sln -c Release
-
-test_script:
-  - cmd: cd %APPVEYOR_BUILD_FOLDER%\Packaging.Targets.Tests\
-  - cmd: dotnet restore
-  - cmd: dotnet build
-  - cmd: dotnet vstest bin\Debug\netcoreapp3.0\Packaging.Targets.Tests.dll /logger:trx;LogFileName=testresults.trx
-  - ps: '& (Join-Path $env:APPVEYOR_BUILD_FOLDER "appveyor-testresults.ps1")'
-  - cmd: cd ..
-
-  - cmd: set /p NuGetPackageVersion=<demo\version.txt
-
-  - cmd: dotnet tool install --global --add-source dotnet-tarball\bin\Release\ dotnet-tarball --version %NuGetPackageVersion%
-  - cmd: dotnet tool install --global --add-source dotnet-zip\bin\Release\ dotnet-zip --version %NuGetPackageVersion%
-  - cmd: dotnet tool install --global --add-source dotnet-rpm\bin\Release\ dotnet-rpm --version %NuGetPackageVersion%
-  - cmd: dotnet tool install --global --add-source dotnet-deb\bin\Release\ dotnet-deb --version %NuGetPackageVersion%
-
-  - cmd: cd %APPVEYOR_BUILD_FOLDER%/demo/aspnetcore
-  - cmd: dotnet restore
-  - cmd: dotnet rpm -c Release -r rhel.7-x64 -f netcoreapp3.0
-  - cmd: dotnet deb -c Release -r ubuntu.16.04-x64 -f netcoreapp3.0
-
-artifacts:
-  - path: dotnet-tarball\bin\Release\dotnet-tarball.*nupkg
-  - path: dotnet-zip\bin\Release\dotnet-zip.*nupkg
-  - path: dotnet-rpm\bin\Release\dotnet-rpm.*nupkg
-  - path: dotnet-deb\bin\Release\dotnet-deb.*nupkg
-  - path: Packaging.Targets\bin\Release\Packaging.Targets.*nupkg
-  - path: demo\**\*.deb
-  - path: demo\**\*.rpm
-
-deploy:
-  provider: NuGet
-  on:
-    branch: master
-  api_key:
-    secure: G26oZQpKHYN1Dr6pLjlaFp08zrS3ugIdNEnFxTyXvv/NEPvg7SsjBa0f9eNIKOlJ
--- 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</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0;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</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0;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</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0;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</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0;net5.0</TargetFrameworks>
    <PackageTags>dotnet cli packaging zip archive</PackageTags>
    <Description>Create .zip files of your .NET Core projects straight from the command line.