From a037a5f43ea789561ad78e3849bab06ec4054ce1 Mon Sep 17 00:00:00 2001
From: Nick Chamberlain <nick.chamberlain.jr@gmail.com>
Date: Fri, 11 Aug 2017 13:30:24 -0400
Subject: [PATCH 1/2] Fix nuget publish when symbols aren't required to nuget
 push (#69)

* add option for not publishing symbols for production release

* bad folder name
---
 build.fsx | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/build.fsx b/build.fsx
index 1aa9a9c8..e3dd2b27 100644
--- a/build.fsx
+++ b/build.fsx
@@ -170,15 +170,26 @@ Target "PublishNuget" (fun _ ->
     let apiKey = getBuildParamOrDefault "nugetkey" ""
     let source = getBuildParamOrDefault "nugetpublishurl" ""
     let symbolSource = getBuildParamOrDefault "symbolspublishurl" ""
+    let shouldPublishSymbolsPackages = not (symbolSource = "")
 
-    let runSingleProject project =
-        DotNetCli.RunCommand
-            (fun p -> 
-                { p with 
-                    TimeOut = TimeSpan.FromMinutes 10. })
-            (sprintf "nuget push %s --api-key %s --source %s --symbol-source %s" project apiKey source symbolSource)
+    if (not (source = "") && not (apiKey = "") && shouldPublishSymbolsPackages) then
+        let runSingleProject project =
+            DotNetCli.RunCommand
+                (fun p -> 
+                    { p with 
+                        TimeOut = TimeSpan.FromMinutes 10. })
+                (sprintf "nuget push %s --api-key %s --source %s --symbol-source %s" project apiKey source symbolSource)
+
+        projects |> Seq.iter (runSingleProject)
+    else if (not (source = "") && not (apiKey = "") && not shouldPublishSymbolsPackages) then
+        let runSingleProject project =
+            DotNetCli.RunCommand
+                (fun p -> 
+                    { p with 
+                        TimeOut = TimeSpan.FromMinutes 10. })
+                (sprintf "nuget push %s --api-key %s --source %s" project apiKey source)
 
-    projects |> Seq.iter (runSingleProject)
+        projects |> Seq.iter (runSingleProject)
 )
 
 //--------------------------------------------------------------------------------

From 15a56e903f4d60d55b49d72a4896ae9b5c63cd6d Mon Sep 17 00:00:00 2001
From: Aaron Stannard <aaron@petabridge.com>
Date: Thu, 17 Aug 2017 15:18:27 -0500
Subject: [PATCH 2/2] bumped versions to v0.9.6 (#73)

---
 Hyperion/Hyperion.csproj |  6 +-----
 RELEASE_NOTES.md         |  4 ++++
 build.fsx                |  1 +
 common.props             | 16 ++++++++++++++++
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 common.props

diff --git a/Hyperion/Hyperion.csproj b/Hyperion/Hyperion.csproj
index e5c46eaa..608c63da 100644
--- a/Hyperion/Hyperion.csproj
+++ b/Hyperion/Hyperion.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\common.props" />
 
   <PropertyGroup>
     <AssemblyTitle>Hyperion</AssemblyTitle>
     <Description>Hyperion, fast binary POCO serializer</Description>
-    <Copyright>Copyright © 2016-2017 Akka.NET Team</Copyright>
-    <VersionPrefix>0.9.5</VersionPrefix>
-    <Authors>akkadotnet</Authors>
     <TargetFrameworks>netstandard1.6;net45</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageTags>serialization;poco</PackageTags>
-    <PackageProjectUrl>https://github.com/akkadotnet/Hyperion</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/akkadotnet/Hyperion/blob/master/LICENSE</PackageLicenseUrl>
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
   </PropertyGroup>
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index aaf9c41b..d7cf16d4 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+### 0.9.6 August 17 2017
+
+Resolving issues with conflicting binary being downloaded via NuGet with version bump.
+
 ### 0.9.5 August 11 2017
 
 Provides support for .NET Standard 1.6.
diff --git a/build.fsx b/build.fsx
index e3dd2b27..f006098e 100644
--- a/build.fsx
+++ b/build.fsx
@@ -264,5 +264,6 @@ Target "Nuget" DoNothing
 // all
 "BuildRelease" ==> "All"
 "RunTests" ==> "All"
+"Nuget" ==> "All"
 
 RunTargetOrDefault "Help"
\ No newline at end of file
diff --git a/common.props b/common.props
new file mode 100644
index 00000000..973e3486
--- /dev/null
+++ b/common.props
@@ -0,0 +1,16 @@
+<Project>
+  <PropertyGroup>
+    <Copyright>Copyright © 2016-2017 Akka.NET Team</Copyright>
+    <Authors>Akka.NET Team</Authors>
+    <VersionPrefix>0.9.6</VersionPrefix>
+    <PackageReleaseNotes>Placeholder</PackageReleaseNotes>
+    <PackageIconUrl>http://getakka.net/images/akkalogo.png</PackageIconUrl>
+    <PackageIconUrl></PackageIconUrl>
+    <PackageProjectUrl>https://github.com/akkadotnet/Hyperion</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/akkadotnet/Hyperion/blob/master/LICENSE</PackageLicenseUrl>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <XunitVersion>2.3.0-beta4-*</XunitVersion>
+  </PropertyGroup>
+</Project>
\ No newline at end of file