Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs

@@ -38,8 +38,8 @@ namespace MediaBrowser.Common.Implementations.Updates
             // Our updater needs SS and ionic
             source = Path.Combine(appPaths.ProgramSystemPath, "ServiceStack.Text.dll");
             File.Copy(source, Path.Combine(Path.GetTempPath(), "ServiceStack.Text.dll"), true);
-            source = Path.Combine(appPaths.ProgramSystemPath, "Ionic.Zip.dll");
-            File.Copy(source, Path.Combine(Path.GetTempPath(), "Ionic.Zip.dll"), true);
+            source = Path.Combine(appPaths.ProgramSystemPath, "SharpCompress.dll");
+            File.Copy(source, Path.Combine(Path.GetTempPath(), "SharpCompress.dll"), true);
             Process.Start(tempUpdater, string.Format("product={0} archive=\"{1}\" caller={2} pismo=false version={3}", product, archive, Process.GetCurrentProcess().Id, version));
 
             // That's it.  The installer will do the work once we exit

MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj

@@ -415,7 +415,7 @@ mkdir "$(SolutionDir)..\Deploy\Server\System\dashboard-ui"
 xcopy "$(TargetDir)dashboard-ui" "$(SolutionDir)..\Deploy\Server\System\dashboard-ui" /y /s
 
 del "$(SolutionDir)..\Deploy\MBServer.zip"
-"$(SolutionDir)ThirdParty\7zip\7za" a -tzip -mx9 "$(SolutionDir)..\Deploy\MBServer.zip" "$(SolutionDir)..\Deploy\Server\*"
+"$(SolutionDir)ThirdParty\7zip\7za" a -mx9 "$(SolutionDir)..\Deploy\MBServer.zip" "$(SolutionDir)..\Deploy\Server\*"
 )</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />