Fix C# nuget package build. (#28152)

* fix nuget build by removing deprecated packageIconUrl field * react to dotnet pack output fix in .NET
3 years ago · 1979d43341
parent 0bdb4d650b
commit 1979d43341
12 changed files with 60 additions and 20 deletions
--- a/src/csharp/Grpc.Auth/Grpc.Auth.csproj
+++ b/src/csharp/Grpc.Auth/Grpc.Auth.csproj
@ -3,7 +3,7 @@
    <Authors>The gRPC Authors</Authors>
    <Copyright>Copyright 2015 The gRPC Authors</Copyright>
    <Description>gRPC C# Authentication Library</Description>
-    <PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
    <PackageProjectUrl>https://github.com/grpc/grpc</PackageProjectUrl>
    <PackageTags>gRPC RPC HTTP/2 Auth OAuth2</PackageTags>
@ -18,6 +18,10 @@

  <Import Project="..\Grpc.Core\SourceLink.csproj.include" />

+  <ItemGroup>
+    <None Include="../packageIcon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
  <ItemGroup>
    <Compile Include="..\Grpc.Core.Api\Version.cs" />
  </ItemGroup>
--- a/src/csharp/Grpc.Core.Api/Grpc.Core.Api.csproj
+++ b/src/csharp/Grpc.Core.Api/Grpc.Core.Api.csproj
@ -3,7 +3,7 @@
    <Authors>The gRPC Authors</Authors>
    <Copyright>Copyright 2019 The gRPC Authors</Copyright>
    <Description>gRPC C# Surface API</Description>
-    <PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
    <PackageProjectUrl>https://github.com/grpc/grpc</PackageProjectUrl>
    <PackageTags>gRPC RPC HTTP/2</PackageTags>
@ -19,6 +19,10 @@

  <Import Project="..\Grpc.Core\SourceLink.csproj.include" />

+  <ItemGroup>
+    <None Include="../packageIcon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
  <ItemGroup>
    <PackageReference Include="System.Memory" Version="4.5.3" />
  </ItemGroup>
--- a/src/csharp/Grpc.Core.NativeDebug/Grpc.Core.NativeDebug.csproj
+++ b/src/csharp/Grpc.Core.NativeDebug/Grpc.Core.NativeDebug.csproj
@ -6,7 +6,7 @@

 Note that the Grpc.Core implementation of gRPC for C# is in maintenance mode and will be replaced by grpc-dotnet in the future.
 See https://grpc.io/blog/grpc-csharp-future/ for details.</Description>
-    <PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
    <PackageProjectUrl>https://github.com/grpc/grpc</PackageProjectUrl>
    <PackageTags>gRPC RPC HTTP/2</PackageTags>
@ -20,6 +20,10 @@ See https://grpc.io/blog/grpc-csharp-future/ for details.</Description>
    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
  </PropertyGroup>

+  <ItemGroup>
+    <None Include="../packageIcon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
  <ItemGroup>
    <None Include="..\nativelibs\csharp_ext_linux_x64\libgrpc_csharp_ext.dbginfo.so">
      <PackagePath>runtimes/linux-x64/native/libgrpc_csharp_ext.x64.dbginfo.so</PackagePath>
--- a/src/csharp/Grpc.Core.Testing/Grpc.Core.Testing.csproj
+++ b/src/csharp/Grpc.Core.Testing/Grpc.Core.Testing.csproj
@ -6,7 +6,7 @@
 Note that the Grpc.Core implementation of gRPC for C# is in maintenance mode and will be replaced by grpc-dotnet in the future.
 See https://grpc.io/blog/grpc-csharp-future/ for details.</Description>
    <Copyright>Copyright 2017 The gRPC Authors</Copyright>
-    <PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
    <PackageProjectUrl>https://github.com/grpc/grpc</PackageProjectUrl>
    <PackageTags>gRPC test testing</PackageTags>
@ -21,6 +21,10 @@ See https://grpc.io/blog/grpc-csharp-future/ for details.</Description>

  <Import Project="..\Grpc.Core\SourceLink.csproj.include" />

+  <ItemGroup>
+    <None Include="../packageIcon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
  <ItemGroup>
    <Compile Include="..\Grpc.Core.Api\Version.cs" />
  </ItemGroup>
--- a/src/csharp/Grpc.Core.Xamarin/Grpc.Core.Xamarin.csproj
+++ b/src/csharp/Grpc.Core.Xamarin/Grpc.Core.Xamarin.csproj
@ -9,7 +9,7 @@ WARNING: Versions of Grpc.Core.Xamarin and Grpc.Core dependencies being used in

 Note that the Grpc.Core implementation of gRPC for C# is in maintenance mode and will be replaced by grpc-dotnet in the future.
 See https://grpc.io/blog/grpc-csharp-future/ for details.</Description>
-    <PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
    <PackageProjectUrl>https://github.com/grpc/grpc</PackageProjectUrl>
    <PackageTags>gRPC RPC HTTP/2</PackageTags>
@ -24,6 +24,10 @@ See https://grpc.io/blog/grpc-csharp-future/ for details.</Description>

  <Import Project="..\Grpc.Core\SourceLink.csproj.include" />

+  <ItemGroup>
+    <None Include="../packageIcon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
  <ItemGroup>
    <Content Include="..\nativelibs\csharp_ext_linux_android_armeabi-v7a\libgrpc_csharp_ext.so">
      <PackagePath>native/android/armeabi-v7a/libgrpc_csharp_ext.so</PackagePath>
--- a/src/csharp/Grpc.Core/Grpc.Core.csproj
+++ b/src/csharp/Grpc.Core/Grpc.Core.csproj
@ -6,7 +6,7 @@

 Note that the Grpc.Core implementation of gRPC for C# is in maintenance mode and will be replaced by grpc-dotnet in the future.
 See https://grpc.io/blog/grpc-csharp-future/ for details.</Description>
-    <PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
    <PackageProjectUrl>https://github.com/grpc/grpc</PackageProjectUrl>
    <PackageTags>gRPC RPC HTTP/2</PackageTags>
@ -23,6 +23,10 @@ See https://grpc.io/blog/grpc-csharp-future/ for details.</Description>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>

+  <ItemGroup>
+    <None Include="../packageIcon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
  <ItemGroup>
    <Compile Include="..\Grpc.Core.Api\Version.cs" />
  </ItemGroup>
--- a/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj
+++ b/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj
@ -3,7 +3,7 @@
    <Authors>The gRPC Authors</Authors>
    <Copyright>Copyright 2015 The gRPC Authors</Copyright>
    <Description>gRPC C# Health Checking (for Grpc.Core)</Description>
-    <PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
    <PackageProjectUrl>https://github.com/grpc/grpc</PackageProjectUrl>
    <PackageTags>gRPC health check</PackageTags>
@ -22,6 +22,10 @@

  <Import Project="..\Grpc.Core\SourceLink.csproj.include" />

+  <ItemGroup>
+    <None Include="../packageIcon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
  <ItemGroup>
    <Compile Include="..\Grpc.Core.Api\Version.cs" />
  </ItemGroup>
--- a/src/csharp/Grpc.Reflection/Grpc.Reflection.csproj
+++ b/src/csharp/Grpc.Reflection/Grpc.Reflection.csproj
@ -3,7 +3,7 @@
    <Authors>The gRPC Authors</Authors>
    <Copyright>Copyright 2016 The gRPC Authors</Copyright>
    <Description>gRPC C# Server Reflection (for Grpc.Core)</Description>
-    <PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
    <PackageProjectUrl>https://github.com/grpc/grpc</PackageProjectUrl>
    <PackageTags>gRPC reflection</PackageTags>
@ -18,6 +18,10 @@

  <Import Project="..\Grpc.Core\SourceLink.csproj.include" />

+  <ItemGroup>
+    <None Include="../packageIcon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
  <ItemGroup>
    <Compile Include="..\Grpc.Core.Api\Version.cs" />
  </ItemGroup>
--- a/src/csharp/Grpc.Tools/Grpc.Tools.csproj
+++ b/src/csharp/Grpc.Tools/Grpc.Tools.csproj
@ -41,12 +41,16 @@ Add this package to a project that contains .proto files to be compiled to code.
 It contains the compilers, include files and project system integration for gRPC
 and Protocol buffer service description files necessary to build them on Windows,
 Linux and MacOS. Managed runtime is supplied separately in the Grpc.Core package.</Description>
-    <PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
    <PackageProjectUrl>https://github.com/grpc/grpc</PackageProjectUrl>
    <PackageTags>gRPC RPC HTTP/2</PackageTags>
  </PropertyGroup>

+  <ItemGroup>
+    <None Include="../packageIcon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
  <ItemGroup>
    <!-- include common code for platform detection to avoid duplicating the logic -->
    <Compile Include="..\Grpc.Core\Internal\CommonPlatformDetection.cs" Link="CommonPlatformDetection.cs" />
--- a/src/csharp/Grpc/Grpc.csproj
+++ b/src/csharp/Grpc/Grpc.csproj
@ -3,7 +3,7 @@
    <Authors>The gRPC Authors</Authors>
    <Copyright>Copyright 2015 The gRPC Authors</Copyright>
    <Description>Metapackage for gRPC C#</Description>
-    <PackageIconUrl>https://github.com/grpc/grpc.github.io/raw/master/img/grpc_square_reverse_4x.png</PackageIconUrl>
+    <PackageIconUrl>packageIcon.png</PackageIconUrl>
    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
    <PackageProjectUrl>https://github.com/grpc/grpc</PackageProjectUrl>
    <PackageTags>gRPC RPC HTTP/2</PackageTags>
@ -17,6 +17,10 @@
    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
  </PropertyGroup>

+  <ItemGroup>
+    <None Include="../packageIcon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
  <ItemGroup>
    <!-- PrivateAssets set to None to ensure the build targets/props are propagated to parent project -->
    <ProjectReference Include="../Grpc.Core/Grpc.Core.csproj" PrivateAssets="None" />
--- a/src/csharp/build_nuget.sh
+++ b/src/csharp/build_nuget.sh
@ -37,17 +37,17 @@ dotnet restore Grpc.sln
 mkdir -p ../../cmake/build
 cp nativelibs/csharp_ext_linux_x64/libgrpc_csharp_ext.so ../../cmake/build

-dotnet pack --configuration Release Grpc.Core.Api --output ../../../artifacts
-dotnet pack --configuration Release Grpc.Core --output ../../../artifacts
-dotnet pack --configuration Release Grpc.Core.Testing --output ../../../artifacts
-dotnet pack --configuration Release Grpc.Auth --output ../../../artifacts
-dotnet pack --configuration Release Grpc.HealthCheck --output ../../../artifacts
-dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts
-dotnet pack --configuration Release Grpc.Tools --output ../../../artifacts
+dotnet pack --configuration Release Grpc.Core.Api --output ../../artifacts
+dotnet pack --configuration Release Grpc.Core --output ../../artifacts
+dotnet pack --configuration Release Grpc.Core.Testing --output ../../artifacts
+dotnet pack --configuration Release Grpc.Auth --output ../../artifacts
+dotnet pack --configuration Release Grpc.HealthCheck --output ../../artifacts
+dotnet pack --configuration Release Grpc.Reflection --output ../../artifacts
+dotnet pack --configuration Release Grpc.Tools --output ../../artifacts
 # rem build auxiliary packages
-dotnet pack --configuration Release Grpc --output ../../../artifacts
-dotnet pack --configuration Release Grpc.Core.NativeDebug --output ../../../artifacts
-dotnet pack --configuration Release Grpc.Core.Xamarin --output ../../../artifacts
+dotnet pack --configuration Release Grpc --output ../../artifacts
+dotnet pack --configuration Release Grpc.Core.NativeDebug --output ../../artifacts
+dotnet pack --configuration Release Grpc.Core.Xamarin --output ../../artifacts

 # Create a zipfile with all the nugets we just created
 cd ../../artifacts
--- a/src/csharp/packageIcon.png
+++ b/src/csharp/packageIcon.png