Enable SourceLink with .NET Core builds

11 files changed, 23 insertions, 5 deletions

diff --git a/csharp/msbuild/ice.common.props b/csharp/msbuild/ice.common.props
index 9aac153e6cd..7c1d5894161 100644
--- a/csharp/msbuild/ice.common.props
+++ b/csharp/msbuild/ice.common.props
@@ -19,6 +19,10 @@
     <DefineConstants>TRACE</DefineConstants>
     <SignAssembly>true</SignAssembly>
     <DefineConstants Condition="'$(TargetFrameworkVersion)' == 'v4.5.1'">NET45;$(DefineConstants)</DefineConstants>
+    <!-- Source Link Settings -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <SourceLinkUrl>https://github.com/zeroc-ice/ice.git</SourceLinkUrl>
   </PropertyGroup>
 
   <!-- Import Ice version settings -->
diff --git a/csharp/msbuild/ice.nuget.targets b/csharp/msbuild/ice.nuget.targets
index 85d8166149a..ba9805ebdf0 100644
--- a/csharp/msbuild/ice.nuget.targets
+++ b/csharp/msbuild/ice.nuget.targets
@@ -17,10 +17,10 @@
                            Condition="'$(BuildNetStandardTargets)' == 'true'" />
 
         <Assemblies Include="$(IceSrcRootDir)lib\**\*.dll;
-                             $(IceSrcRootDir)lib\**\*.xml;
-                             $(IceSrcRootDir)lib\netstandard2.0\*.pdb"/>
+                             $(IceSrcRootDir)lib\**\*.xml"/>
 
-        <Assemblies Include="$(IcePdbRootDir)\lib\net45\*.pdb" />
+        <Net45Pdbs Include="$(IcePdbRootDir)\lib\net45\*.pdb" />
+        <NetStandardPdbs Include="$(IceSrcRootDir)lib\netstandard2.0\*.pdb" />
 
         <Slices Include="$(IceSrcRootDir)..\slice\**\*.ice"
                 Exclude="$(IceSrcRootDir)..\slice\IceDiscovery\*.ice;
@@ -30,6 +30,9 @@
     <!-- Copy required files to the package specific directories -->
     <Target Name="NugetPack">
         <Copy SourceFiles="@(Assemblies)" DestinationFolder="$(PackageDirectory)\lib\%(Assemblies.RecursiveDir)"/>
+        <Copy SourceFiles="@(Net45Pdbs)" DestinationFolder="$(PackageDirectory)\lib\net45"/>
+        <Copy SourceFiles="@(NetStandardPdbs)" DestinationFolder="$(PackageDirectory)\lib\netstandard2.0"
+              Condition="'$(BuildNetStandardTargets)' == 'true'"/>
         <Copy SourceFiles="@(Slices)" DestinationFolder="$(PackageDirectory)\slice\%(Slices.RecursiveDir)"/>
         <Copy SourceFiles="@(SliceCompilers)" DestinationFolder="$(PackageDirectory)\tools"/>
         <Copy SourceFiles="@(IceBoxNet45)" DestinationFolder="$(PackageDirectory)\tools\net45"/>
diff --git a/csharp/src/Glacier2/msbuild/netstandard2.0/glacier2.csproj b/csharp/src/Glacier2/msbuild/netstandard2.0/glacier2.csproj
index 956c0824b2d..5d12e8a0a7e 100644
--- a/csharp/src/Glacier2/msbuild/netstandard2.0/glacier2.csproj
+++ b/csharp/src/Glacier2/msbuild/netstandard2.0/glacier2.csproj
@@ -12,7 +12,8 @@
     <Compile Include="../../*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+      <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+      <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />
diff --git a/csharp/src/Ice/msbuild/netstandard2.0/ice.csproj b/csharp/src/Ice/msbuild/netstandard2.0/ice.csproj
index 130c3ded6c7..dd2cc1a14f1 100644
--- a/csharp/src/Ice/msbuild/netstandard2.0/ice.csproj
+++ b/csharp/src/Ice/msbuild/netstandard2.0/ice.csproj
@@ -12,7 +12,8 @@
     <Compile Include="../../*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+      <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+      <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
   </ItemGroup>
   <Import Project="$(MSBuildThisFileDirectory)../../../../msbuild/ice.sign.targets"/>
 </Project>
diff --git a/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj b/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj
index ec8ebc6eaf7..a255cd1b645 100644
--- a/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj
+++ b/csharp/src/IceBox/msbuild/icebox/netstandard2.0/icebox.csproj
@@ -18,5 +18,8 @@
     <ProjectReference Include="../../../../IceSSL/msbuild/netstandard2.0/icessl.csproj" />
     <ProjectReference Include="../../iceboxlib/netstandard2.0/iceboxlib.csproj" />
   </ItemGroup>
+  <ItemGroup>
+      <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
+  </ItemGroup>
   <Import Project="$(MSBuildThisFileDirectory)../../../../../msbuild/ice.sign.targets"/>
 </Project>
diff --git a/csharp/src/IceBox/msbuild/iceboxlib/netstandard2.0/iceboxlib.csproj b/csharp/src/IceBox/msbuild/iceboxlib/netstandard2.0/iceboxlib.csproj
index 9d7ca55cc8a..b2d0231f657 100644
--- a/csharp/src/IceBox/msbuild/iceboxlib/netstandard2.0/iceboxlib.csproj
+++ b/csharp/src/IceBox/msbuild/iceboxlib/netstandard2.0/iceboxlib.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../../../Ice/msbuild/netstandard2.0/ice.csproj" />
diff --git a/csharp/src/IceDiscovery/msbuild/netstandard2.0/icediscovery.csproj b/csharp/src/IceDiscovery/msbuild/netstandard2.0/icediscovery.csproj
index a9f7b90798a..80f0c13e97b 100644
--- a/csharp/src/IceDiscovery/msbuild/netstandard2.0/icediscovery.csproj
+++ b/csharp/src/IceDiscovery/msbuild/netstandard2.0/icediscovery.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />
diff --git a/csharp/src/IceGrid/msbuild/netstandard2.0/icegrid.csproj b/csharp/src/IceGrid/msbuild/netstandard2.0/icegrid.csproj
index 108777a31c6..4445e3c5691 100644
--- a/csharp/src/IceGrid/msbuild/netstandard2.0/icegrid.csproj
+++ b/csharp/src/IceGrid/msbuild/netstandard2.0/icegrid.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />
diff --git a/csharp/src/IceLocatorDiscovery/msbuild/netstandard2.0/icelocatordiscovery.csproj b/csharp/src/IceLocatorDiscovery/msbuild/netstandard2.0/icelocatordiscovery.csproj
index 76fbb4be01f..962497c86d4 100644
--- a/csharp/src/IceLocatorDiscovery/msbuild/netstandard2.0/icelocatordiscovery.csproj
+++ b/csharp/src/IceLocatorDiscovery/msbuild/netstandard2.0/icelocatordiscovery.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />
diff --git a/csharp/src/IceSSL/msbuild/netstandard2.0/icessl.csproj b/csharp/src/IceSSL/msbuild/netstandard2.0/icessl.csproj
index a84f2e40691..4b9e1507d9a 100644
--- a/csharp/src/IceSSL/msbuild/netstandard2.0/icessl.csproj
+++ b/csharp/src/IceSSL/msbuild/netstandard2.0/icessl.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />
diff --git a/csharp/src/IceStorm/msbuild/netstandard2.0/icestorm.csproj b/csharp/src/IceStorm/msbuild/netstandard2.0/icestorm.csproj
index 3a935298343..da2697ca01c 100644
--- a/csharp/src/IceStorm/msbuild/netstandard2.0/icestorm.csproj
+++ b/csharp/src/IceStorm/msbuild/netstandard2.0/icestorm.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../../Ice/msbuild/netstandard2.0/ice.csproj" />