From 2e9c3e02391518b55672622cfb63ada07438e578 Mon Sep 17 00:00:00 2001
From: "Jordan S. Jones" <jordansjones@gmail.com>
Date: Thu, 9 Aug 2018 16:39:27 -0600
Subject: [PATCH] Let the SolutionInfo get generated during build

---
 .gitignore                      |  1 -
 Draft.sln                       |  1 -
 ReleaseNotes.md                 |  3 +++
 build.cake                      |  3 +--
 meta/SolutionInfo.cs            | 12 ------------
 source/Draft/Draft-Net45.csproj |  4 ++--
 6 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 meta/SolutionInfo.cs

diff --git a/.gitignore b/.gitignore
index b8cff76..3c224c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
 *.user
 *.userosscache
 *.sln.docstates
-
 .vs/
 
 # Build results
diff --git a/Draft.sln b/Draft.sln
index fd15bfb..f002c13 100644
--- a/Draft.sln
+++ b/Draft.sln
@@ -13,7 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{EC663AEE-1
 		LICENSE.txt = LICENSE.txt
 		README.md = README.md
 		ReleaseNotes.md = ReleaseNotes.md
-		meta\SolutionInfo.cs = meta\SolutionInfo.cs
 	EndProjectSection
 EndProject
 Global
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 88de826..627b9e5 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,3 +1,6 @@
+### new in 1.0.7.1 (Release 2018/08/09)
+* Fixed: Assembly version should match Nuget package version
+
 ### new in 1.0.7 (Release 2018/08/09)
 * New: EndpointPool.Build()..WithHttpReadTimeout() - Set timeout for HTTP GET requests
 * Fixed: NullReferenceException thrown in certain HTTP timeout conditions is now EtcdTimeoutException
diff --git a/build.cake b/build.cake
index b9d6420..177e2f3 100644
--- a/build.cake
+++ b/build.cake
@@ -68,7 +68,7 @@ Setup(context =>
 Teardown(context =>
 {
     // Executed AFTER the last task.
-    Information("Built {0} [{1}] v{2} ({3})", solution.GetFilename(), configuration, semVersion, target);
+    Information("Built {0} [{1}] v{2} ({3}): IsReleaseBuild: {4}", solution.GetFilename(), configuration, semVersion, target, isReleaseBuild);
 });
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -99,7 +99,6 @@ Task("Restore")
 });
 
 Task("AssemblyInfo")
-    .WithCriteria(() => !isReleaseBuild)
     .Does(() =>
 {
     Information("Creating {0} - Version: {1}", solutionInfoCs, version);
diff --git a/meta/SolutionInfo.cs b/meta/SolutionInfo.cs
deleted file mode 100644
index 47c51ec..0000000
--- a/meta/SolutionInfo.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by Cake.
-// </auto-generated>
-//------------------------------------------------------------------------------
-using System.Reflection;
-
-[assembly: AssemblyProduct("Draft")]
-[assembly: AssemblyVersion("1.0.6")]
-[assembly: AssemblyFileVersion("1.0.6")]
-[assembly: AssemblyInformationalVersion("1.0.6")]
-
diff --git a/source/Draft/Draft-Net45.csproj b/source/Draft/Draft-Net45.csproj
index 9098d1e..605b47e 100644
--- a/source/Draft/Draft-Net45.csproj
+++ b/source/Draft/Draft-Net45.csproj
@@ -165,6 +165,7 @@
     <Compile Include="ValueConverters\JsonValueConverter.cs" />
     <Compile Include="ValueConverters\StringValueConverter.cs" />
     <Compile Include="Etcd.cs" />
+    <Compile Include="Constants.ErrorCode.cs" />
     <Compile Include="Constants.Etcd.cs" />
     <Compile Include="Extensions\Flurl.Extensions.cs" />
     <Compile Include="EtcdClient.cs" />
@@ -182,7 +183,7 @@
     <Compile Include="Requests\ICreateDirectoryRequest.cs" />
     <Compile Include="IEtcdClient.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\meta\SolutionInfo.cs">
+    <Compile Include="..\..\meta\SolutionInfo.cs" Condition="Exists('..\..\meta\SolutionInfo.cs')">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
     <Compile Include="Requests\IDeleteDirectoryRequest.cs" />
@@ -213,7 +214,6 @@
     <Compile Include="Responses\Version.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Constants.ErrorCode.cs" />
     <None Include="packages.Draft-Net45.config" />
   </ItemGroup>
   <ItemGroup />