From 09a63f180c325047cd135640f530918036f29985 Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Mon, 5 Feb 2018 21:57:02 +0100
Subject: [PATCH] Workaround NuGet restore problem with .NET Core

---
 README.md               |  1 +
 msbuild/icebuilder.proj | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 41c27a5..2581ecf 100644
--- a/README.md
+++ b/README.md
@@ -230,6 +230,7 @@ You need Visual Studio 2017 with the .NET Core cross-development toolset.
 Open a Visual Studio Command prompt and run the following command:
 
 ```
+MSBuild msbuild\icebuilder.proj /t:Restore
 MSBuild msbuild\icebuilder.proj /t:NuGetPack
 ```
 
diff --git a/msbuild/icebuilder.proj b/msbuild/icebuilder.proj
index e16a5d0..7899d32 100644
--- a/msbuild/icebuilder.proj
+++ b/msbuild/icebuilder.proj
@@ -20,13 +20,19 @@
         <Schemas Include="SliceCompile.*.xaml;ProjectItemsSchema.xaml"/>
     </ItemGroup>
 
-    <Target Name="Build">
+    <Target Name="Restore">
+        <MSBuild Projects="netstandard2.0\icebuilder.msbuild.netstandard2.0.csproj"
+                 Properties="Platform=AnyCPU;Configuration=$(Configuration)"
+                 Targets="Restore"/>
+    </Target>
+
+    <Target Name="Build" DependsOnTargets="Restore">
         <MSBuild Projects="net45\icebuilder.msbuild.net45.csproj"
                  Properties="Platform=AnyCPU;Configuration=$(Configuration)"
                  Targets="Build"/>
         <MSBuild Projects="netstandard2.0\icebuilder.msbuild.netstandard2.0.csproj"
                  Properties="Platform=AnyCPU;Configuration=$(Configuration)"
-                 Targets="Restore;Build"/>
+                 Targets="Build"/>
     </Target>
 
     <Target Name="NuGetPack" DependsOnTargets="Build;GetNuGet">