Let the SolutionInfo get generated during build

jordansjones · Aug 9, 2018 · 2e9c3e0 · 2e9c3e0
1 parent cb0e5d1
commit 2e9c3e0
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@
 *.user
 *.userosscache
 *.sln.docstates
-
 .vs/
 
 # Build results

diff --git 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
@@ -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
@@ -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
diff --git 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 />
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
     *.user
     *.userosscache
     *.sln.docstates
     .vs/
     # Build results
@@ Expand Down @@