From 44a373c4d947a9fa13c5c210c181e59c8093cbb8 Mon Sep 17 00:00:00 2001
From: William Bradley <williamabradley@outlook.com>
Date: Wed, 2 May 2018 23:35:28 +1200
Subject: [PATCH] Updated Build Scripts for bug being fixed.

---
 Directory.Build.props | 12 +-----------
 build/build.cake      | 18 +++---------------
 version.json          |  2 +-
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index bb7847f..3ff2e0c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -28,16 +28,6 @@
   </Choose>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" PrivateAssets="all" />
   </ItemGroup>
-
-  <!-- https://github.com/NuGet/Home/issues/4337 -->
-  <ImportGroup Condition="'$(ExcludeRestorePackageImports)' == 'true'">
-    <Import Project="$(UserProfile)\.nuget\packages\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets"
-            Condition="Exists('$(UserProfile)\.nuget\packages\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets')" />
-  </ImportGroup>
-  <Target Name="FixUpVersion"
-          BeforeTargets="_GenerateRestoreProjectSpec"
-          DependsOnTargets="GetBuildVersion"
-          Condition=" '$(NerdbankGitVersioningTasksPath)' != '' " />
 </Project>
\ No newline at end of file
diff --git a/build/build.cake b/build/build.cake
index 1a0215c..456e1ac 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -18,7 +18,7 @@ var toolsDir = buildDir + "/tools";
 var Solution = baseDir + "/ColorCode.sln";
 var nupkgDir = buildDir + "/nupkg";
 
-var gitVersioningVersion = "2.0.41";
+var gitVersioningVersion = "2.1.23";
 var versionClient = toolsDir + "/nerdbank.gitversioning/tools/Get-Version.ps1";
 string Version = null;
 
@@ -70,25 +70,13 @@ Task("Build")
         MaxCpuCount = 0
     }
     .SetConfiguration("Release")
-    .WithTarget("Restore");
-
-    // Force a restore again to get proper version numbers https://github.com/NuGet/Home/issues/4337
-    MSBuild(Solution, buildSettings);
-    MSBuild(Solution, buildSettings);
-
-    EnsureDirectoryExists(nupkgDir);
-
-    buildSettings = new MSBuildSettings
-    {
-        MaxCpuCount = 0
-    }
-    .SetConfiguration("Release")
-    .WithTarget("Build")
+    .WithTarget("Restore;Build")
     .WithProperty("IncludeSymbols", "true")
     .WithProperty("GenerateLibraryLayout", "true")
     .WithProperty("PackageOutputPath", nupkgDir)
     .WithProperty("GeneratePackageOnBuild", "true");
 
+    EnsureDirectoryExists(nupkgDir);
     MSBuild(Solution, buildSettings);
 });
 
diff --git a/version.json b/version.json
index d248379..14471f1 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.3",
+  "version": "2.0.4",
   "publicReleaseRefSpec": [
     "^refs/heads/master$", // we release out of master
     "^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N