Attempt to fix versioning dependencies from NuGet/Home #4337

See NuGet/Home#4337 for the issue. Kudos to @onovotny for an assist here.
NickCraver · Feb 17, 2018 · 6869cea · 6869cea
1 parent a720fdb
commit 6869cea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -53,6 +53,10 @@ if ($CreatePackages) {
     Write-Host "Building all packages" -ForegroundColor "Green"
 }
 
+Write-Host "Doube restoring StackExchange.Exceptional.sln due to NuGet/Home #4337"
+dotnet restore ".\StackExchange.Exceptional.sln"
+dotnet restore ".\StackExchange.Exceptional.sln"
+
 foreach ($project in $projectsToBuild) {
     Write-Host "Working on $project`:" -ForegroundColor "Magenta"
 

diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -21,4 +21,14 @@
     <DotNetCliToolReference Include="dotnet-sourcelink" Version="2.1.2" />
     <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.1.2" />
   </ItemGroup>
+
+  <!-- https://github.com/NuGet/Home/issues/4337 -->
+  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' == 'true' ">
+    <Import Project="$(NuGetPackageRoot)\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets"
+            Condition="Exists('$(NuGetPackageRoot)\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets')" />
+  </ImportGroup>
+  <Target Name="FixUpVersion"
+      BeforeTargets="_GenerateRestoreProjectSpec"
+      DependsOnTargets="GetBuildVersion"
+      Condition=" '$(NerdbankGitVersioningTasksPath)' != '' " />
 </Project>