From 49a3b6bcae7b39b04655a2f8657cd15178c7afe0 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Wed, 17 Jan 2018 14:52:46 -0800
Subject: [PATCH] Use ZipArchive task instead of powershell.

#1937
---
 build/MPack.targets | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/build/MPack.targets b/build/MPack.targets
index 898af7921b..2caa15e54d 100644
--- a/build/MPack.targets
+++ b/build/MPack.targets
@@ -77,8 +77,14 @@
     <Copy SourceFiles="$(LanguageServiceOutputPath)\%(LanguageServiceAssemblies.Identity)" DestinationFolder="$(MPackIntermediateOutputPath)" />
     <Copy SourceFiles="$(AddinOutputPath)$(AddinName).dll" DestinationFolder="$(MPackIntermediateOutputPath)" />
 
-    <!-- We cannot use the ZipArchive task due to how it functions in CoreCLR. The archive it generates is unreadable by Visual Studio for Mac. -->
-    <Exec Command="powershell.exe -NonInteractive -command &quot;&amp; { Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::CreateFromDirectory('$(MPackIntermediateOutputPath)', '$(MPackOutputPath)') } &quot;" />
+    <ItemGroup>
+      <MPackFiles Include="$(MPackIntermediateOutputPath)\*" />
+    </ItemGroup>
+
+    <ZipArchive
+      File="$(MPackOutputPath)"
+      SourceFiles="@(MPackFiles)"
+      WorkingDirectory="$(MPackIntermediateOutputPath)" />
   </Target>
 
 </Project>