From e8f3c898475ca30d3a8b2808d990831301cae1f2 Mon Sep 17 00:00:00 2001
From: ektrah <ektrah@users.noreply.github.com>
Date: Wed, 4 Nov 2020 17:03:28 +0100
Subject: [PATCH] Pack the NuGet package with .NET 5.0 (#1009)

* Update libsodium.pkgproj

* Update dotnet-core.yml
---
 .github/workflows/dotnet-core.yml       | 19 +++++++++----------
 packaging/dotnet-core/libsodium.pkgproj | 10 ++--------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index ec72066d..7de694c4 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -1,4 +1,4 @@
-name: .NET Core Package
+name: .NET Package
 
 on:
   push:
@@ -99,11 +99,13 @@ jobs:
     - build-linux-glibc
     - build-linux-musl
     - build-macos
+    container:
+      image: mcr.microsoft.com/dotnet/sdk:5.0
+    env:
+      DOTNET_CLI_TELEMETRY_OPTOUT: 1
+      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+      DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: 1
     steps:
-    - name: Set up .NET Core SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 2.1.607
     - uses: actions/checkout@v1
     - uses: actions/download-artifact@v1
       with:
@@ -128,14 +130,11 @@ jobs:
     - name: Copy files
       run: cp AUTHORS ChangeLog LICENSE packaging/dotnet-core/libsodium.pkgproj .libsodium-pack/
     - name: Create NuGet package
-      run: dotnet pack .libsodium-pack/libsodium.pkgproj
-      env:
-        DOTNET_CLI_TELEMETRY_OPTOUT: 1
-        DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+      run: dotnet pack -c Release .libsodium-pack/libsodium.pkgproj
     - uses: actions/upload-artifact@v1
       with:
         name: nuget-package
-        path: .libsodium-pack/libsodium.1.0.18.nupkg
+        path: .libsodium-pack/bin/Release/libsodium.1.0.18.nupkg
 
   test-ubuntu18_04:
     runs-on: ubuntu-latest
diff --git a/packaging/dotnet-core/libsodium.pkgproj b/packaging/dotnet-core/libsodium.pkgproj
index 0efd1e09..fd863c47 100644
--- a/packaging/dotnet-core/libsodium.pkgproj
+++ b/packaging/dotnet-core/libsodium.pkgproj
@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <NoBuild>true</NoBuild>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <PackageOutputPath>$(MSBuildProjectDirectory)</PackageOutputPath>
-    <ProjectFileToPack>$(MSBuildProjectFullPath)</ProjectFileToPack>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -23,10 +21,6 @@
     <MinClientVersion>4.0</MinClientVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="1.0.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="LICENSE" PackagePath="" />
     <Content Include="AUTHORS" PackagePath="" />