From e25858b75e36bcfa515e609e86b4b310b9fb4e3b Mon Sep 17 00:00:00 2001
From: Wade Wegner <wade.wegner@gmail.com>
Date: Tue, 21 Aug 2018 13:26:15 -0700
Subject: [PATCH] Adding fixes for packaging

---
 package.sh                                        | 15 ++++++++++++++-
 push.sh                                           |  4 ++--
 .../ChatterToolkitForNET.csproj                   | 10 ++++++++--
 src/ForceToolkitForNET/ForceToolkitForNET.csproj  | 10 ++++++++--
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/package.sh b/package.sh
index 62d70cd..8f5c590 100755
--- a/package.sh
+++ b/package.sh
@@ -1,3 +1,4 @@
+rm -rf "artifacts"
 mkdir "artifacts"
 
 dotnet clean src/ForceToolkitForNET.sln
@@ -8,4 +9,16 @@ dotnet build src/ForceToolkitForNET.sln -c Debug /p:DebugType=Full
 
 dotnet pack src/ForceToolkitForNET/ForceToolkitForNET.csproj -o "..\..\artifacts" --include-symbols --include-source
 
-dotnet pack src/ChatterToolkitForNET/ChatterToolkitForNET.csproj -o "..\..\artifacts" --include-symbols --include-source
\ No newline at end of file
+dotnet pack src/ChatterToolkitForNET/ChatterToolkitForNET.csproj -o "..\..\artifacts" --include-symbols --include-source
+
+cp artifacts/DeveloperForce.Chatter.$1.nupkg artifacts/DeveloperForce.Chatter.$1.nupkg.zip
+
+cp artifacts/DeveloperForce.Force.$1.nupkg artifacts/DeveloperForce.Force.$1.nupkg.zip
+
+unzip artifacts/DeveloperForce.Chatter.$1.nupkg.zip -d artifacts/DeveloperForce.Chatter
+
+unzip artifacts/DeveloperForce.Force.$1.nupkg.zip -d artifacts/DeveloperForce.Force
+
+chmod +r artifacts/DeveloperForce.Chatter/DeveloperForce.Chatter.nuspec
+
+chmod +r artifacts/DeveloperForce.Force/DeveloperForce.Force.nuspec
\ No newline at end of file
diff --git a/push.sh b/push.sh
index 9f5f822..07298b8 100755
--- a/push.sh
+++ b/push.sh
@@ -1,3 +1,3 @@
-dotnet nuget push artifacts/DeveloperForce.Force.$1.nupkg -k $2 -s https://api.nuget.org/v3/index.json
+dotnet nuget push artifacts/DeveloperForce.Force.$2.nupkg -k $1 -s https://api.nuget.org/v3/index.json
 
-dotnet nuget push artifacts/DeveloperForce.Chatter.$1.nupkg -k $2 -s https://api.nuget.org/v3/index.json
\ No newline at end of file
+dotnet nuget push artifacts/DeveloperForce.Chatter.$2.nupkg -k $1 -s https://api.nuget.org/v3/index.json
\ No newline at end of file
diff --git a/src/ChatterToolkitForNET/ChatterToolkitForNET.csproj b/src/ChatterToolkitForNET/ChatterToolkitForNET.csproj
index a89a990..2851b0b 100644
--- a/src/ChatterToolkitForNET/ChatterToolkitForNET.csproj
+++ b/src/ChatterToolkitForNET/ChatterToolkitForNET.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard20</TargetFramework>
+    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeSalesforceCommon</TargetsForTfmSpecificBuildOutput>
     <RootNamespace>Salesforce.Chatter</RootNamespace>
     <AssemblyName>Salesforce.Chatter</AssemblyName>
     <SignAssembly>true</SignAssembly>
@@ -17,7 +18,7 @@
   <PropertyGroup>
     <PackageId>DeveloperForce.Chatter</PackageId>
     <Title>DeveloperForce.Chatter</Title>
-    <Version>2.0.1</Version>
+    <Version>2.0.4</Version>
     <Authors>wadewegner</Authors>
     <Description>The DeveloperForce.Chatter NuGet provides a .NET library for interacting with the Salesforce Lightning Chatter APIs.</Description>
     <PackageLicenseUrl>https://raw.github.com/developerforce/Force.com-Toolkit-for-NET/master/LICENSE</PackageLicenseUrl>
@@ -31,9 +32,14 @@
     <AssemblyOriginatorKeyFile>..\ForceTookitForNet.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CommonLibrariesForNET\CommonLibrariesForNET.csproj" />
+    <ProjectReference Include="..\CommonLibrariesForNET\CommonLibrariesForNET.csproj" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> 
   </ItemGroup>
+  <Target Name="IncludeSalesforceCommon">
+    <ItemGroup>
+      <BuildOutputInPackage Include="$(OutputPath)\Salesforce.Common.dll" />
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/ForceToolkitForNET/ForceToolkitForNET.csproj b/src/ForceToolkitForNET/ForceToolkitForNET.csproj
index 0c892b4..e4f1bdf 100644
--- a/src/ForceToolkitForNET/ForceToolkitForNET.csproj
+++ b/src/ForceToolkitForNET/ForceToolkitForNET.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard20</TargetFramework>
+    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeSalesforceCommon</TargetsForTfmSpecificBuildOutput>
     <RootNamespace>Salesforce.Force</RootNamespace>
     <AssemblyName>Salesforce.Force</AssemblyName>
     <SignAssembly>true</SignAssembly>
@@ -17,7 +18,7 @@
   <PropertyGroup>
     <PackageId>DeveloperForce.Force</PackageId>
     <Title>DeveloperForce.Force</Title>
-    <Version>2.0.1</Version>
+    <Version>2.0.4</Version>
     <Authors>wadewegner</Authors>
     <Description>The DeveloperForce.Force NuGet provides a .NET library for interacting with Salesforce Lightning REST APIs.</Description>
     <PackageLicenseUrl>https://raw.github.com/developerforce/Force.com-Toolkit-for-NET/master/LICENSE</PackageLicenseUrl>
@@ -31,9 +32,14 @@
     <AssemblyOriginatorKeyFile>..\ForceTookitForNet.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CommonLibrariesForNET\CommonLibrariesForNET.csproj" />
+    <ProjectReference Include="..\CommonLibrariesForNET\CommonLibrariesForNET.csproj" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
+  <Target Name="IncludeSalesforceCommon">
+    <ItemGroup>
+      <BuildOutputInPackage Include="$(OutputPath)\Salesforce.Common.dll" />
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file