From 47d2e0f2e2753fc62048e9bce3f2fa8aa66b86a4 Mon Sep 17 00:00:00 2001
From: Christopher Currie <christopher@currie.com>
Date: Sat, 22 Sep 2018 11:17:08 -0700
Subject: [PATCH] Generate NuGet symbol and source packages

---
 packages/jsii-dotnet-generator/NuGet.Metadata.props.t.js        | 2 ++
 .../Amazon.JSII.Generator.UnitTests/AssemblyExtensionsTests.cs  | 2 ++
 .../Amazon.JSII.Generator.UnitTests/AssemblyGeneratorTests.cs   | 2 ++
 .../src/Amazon.JSII.Generator/AssemblyExtensions.cs             | 2 ++
 packages/jsii-dotnet-jsonmodel/NuGet.Metadata.props.t.js        | 2 ++
 packages/jsii-dotnet-runtime/NuGet.Metadata.props.t.js          | 2 ++
 .../Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj  | 2 ++
 .../Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj   | 2 ++
 .../Amazon.JSII.Tests.CalculatorPackageId.csproj                | 2 ++
 9 files changed, 18 insertions(+)

diff --git a/packages/jsii-dotnet-generator/NuGet.Metadata.props.t.js b/packages/jsii-dotnet-generator/NuGet.Metadata.props.t.js
index 3ad36ae84e..a16129c39c 100644
--- a/packages/jsii-dotnet-generator/NuGet.Metadata.props.t.js
+++ b/packages/jsii-dotnet-generator/NuGet.Metadata.props.t.js
@@ -3,6 +3,8 @@ const package = require('./package.json');
 process.stdout.write(`<Project>
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <IncludeSymbols>True</IncludeSymbols>
+    <IncludeSource>True</IncludeSource>
     <PackageOutputPath>..\\..\\bin\\$(Configuration)\\NuGet\\</PackageOutputPath>
     <PackageVersion>$(JsiiVersion)</PackageVersion>
     <Description>${package.description}</Description>
diff --git a/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator.UnitTests/AssemblyExtensionsTests.cs b/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator.UnitTests/AssemblyExtensionsTests.cs
index ded75d6508..2480d6ef2f 100644
--- a/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator.UnitTests/AssemblyExtensionsTests.cs
+++ b/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator.UnitTests/AssemblyExtensionsTests.cs
@@ -277,6 +277,8 @@ public void IncludesAllPresentProperties()
                 Assert.Collection(actual,
                     element => Assert.Equal("<TargetFramework>netstandard2.0</TargetFramework>", element.ToString()),
                     element => Assert.Equal("<GeneratePackageOnBuild>true</GeneratePackageOnBuild>", element.ToString()),
+                    element => Assert.Equal("<IncludeSymbols>True</IncludeSymbols>", element.ToString()),
+                    element => Assert.Equal("<IncludeSource>True</IncludeSource>", element.ToString()),
                     element => Assert.Equal("<PackageVersion>1.2.3</PackageVersion>", element.ToString()),
                     element => Assert.Equal("<PackageId>My.PackageId</PackageId>", element.ToString()),
                     element => Assert.Equal("<Description>my description</Description>", element.ToString()),
diff --git a/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator.UnitTests/AssemblyGeneratorTests.cs b/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator.UnitTests/AssemblyGeneratorTests.cs
index 03f80b066c..4b96d299a5 100644
--- a/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator.UnitTests/AssemblyGeneratorTests.cs
+++ b/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator.UnitTests/AssemblyGeneratorTests.cs
@@ -234,6 +234,8 @@ public void CreatesBasicProjectFile()
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeSymbols>true</IncludeSymbols>
+    <IncludeSource>true</IncludeSource>
     <Authors>myAuthors</Authors>
     <Company>myCompany</Company>
     <PackageVersion>1.2.3</PackageVersion>
diff --git a/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator/AssemblyExtensions.cs b/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator/AssemblyExtensions.cs
index c6e2db96d3..49cf83af1f 100644
--- a/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator/AssemblyExtensions.cs
+++ b/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator/AssemblyExtensions.cs
@@ -57,6 +57,8 @@ public static IEnumerable<XElement> GetMsBuildProperties(this Assembly assembly)
         {
             yield return new XElement("TargetFramework", "netstandard2.0");
             yield return new XElement("GeneratePackageOnBuild", true);
+            yield return new XElement("IncludeSymbols", true);
+            yield return new XElement("IncludeSource", true);
             yield return new XElement("PackageVersion", assembly.Version);
             yield return new XElement("PackageId", assembly.Targets.DotNet.PackageId);
             yield return new XElement("Description", assembly.Description);
diff --git a/packages/jsii-dotnet-jsonmodel/NuGet.Metadata.props.t.js b/packages/jsii-dotnet-jsonmodel/NuGet.Metadata.props.t.js
index 31ae79a311..e0c50b6ad4 100644
--- a/packages/jsii-dotnet-jsonmodel/NuGet.Metadata.props.t.js
+++ b/packages/jsii-dotnet-jsonmodel/NuGet.Metadata.props.t.js
@@ -3,6 +3,8 @@ const package = require('./package.json');
 process.stdout.write(`<Project>
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <IncludeSymbols>True</IncludeSymbols>
+    <IncludeSource>True</IncludeSource>
     <PackageOutputPath>..\\..\\bin\\$(Configuration)\\NuGet\\</PackageOutputPath>
     <PackageVersion>$(JsiiVersion)</PackageVersion>
     <Description>${package.description}</Description>
diff --git a/packages/jsii-dotnet-runtime/NuGet.Metadata.props.t.js b/packages/jsii-dotnet-runtime/NuGet.Metadata.props.t.js
index 31ae79a311..e0c50b6ad4 100644
--- a/packages/jsii-dotnet-runtime/NuGet.Metadata.props.t.js
+++ b/packages/jsii-dotnet-runtime/NuGet.Metadata.props.t.js
@@ -3,6 +3,8 @@ const package = require('./package.json');
 process.stdout.write(`<Project>
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <IncludeSymbols>True</IncludeSymbols>
+    <IncludeSource>True</IncludeSource>
     <PackageOutputPath>..\\..\\bin\\$(Configuration)\\NuGet\\</PackageOutputPath>
     <PackageVersion>$(JsiiVersion)</PackageVersion>
     <Description>${package.description}</Description>
diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj
index 10cf8e74b2..5f33920bc8 100644
--- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj
+++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeSymbols>true</IncludeSymbols>
+    <IncludeSource>true</IncludeSource>
     <PackageVersion>0.7.6</PackageVersion>
     <PackageId>Amazon.JSII.Tests.CalculatorPackageId.BasePackageId</PackageId>
     <Description>An example direct dependency for jsii-calc.</Description>
diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj
index 86c77ccf03..80e06f9d67 100644
--- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj
+++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeSymbols>true</IncludeSymbols>
+    <IncludeSource>true</IncludeSource>
     <PackageVersion>0.7.6</PackageVersion>
     <PackageId>Amazon.JSII.Tests.CalculatorPackageId.LibPackageId</PackageId>
     <Description>A simple calcuator library built on JSII.</Description>
diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj
index 2651a4d11c..f65bdabca1 100644
--- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj
+++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeSymbols>true</IncludeSymbols>
+    <IncludeSource>true</IncludeSource>
     <PackageVersion>0.7.6</PackageVersion>
     <PackageId>Amazon.JSII.Tests.CalculatorPackageId</PackageId>
     <Description>A simple calcuator built on JSII.</Description>