Workaround NuGet restore problem with .NET Core

zeroc-ice · Feb 5, 2018 · 09a63f1 · 09a63f1
1 parent 3f78617
commit 09a63f1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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">
-Original file line number
+Diff line change
@@ Expand Up @@
     Open a Visual Studio Command prompt and run the following command:
     ```
+    MSBuild msbuild\icebuilder.proj /t:Restore
     MSBuild msbuild\icebuilder.proj /t:NuGetPack
     ```
@@ Expand Down @@