diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-25 22:01:32 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-25 22:01:32 -0400 |
| commit | 3528d01fdb00c95743699ee3b562d9bc1ed3977a (patch) | |
| tree | bc748bbe42922ab633e07f44d5e4cd8268fed97e | |
| parent | 791d64ceed95bd08f3d5aae00a5a9c3c0dabde8e (diff) | |
| parent | cdb60b5c4c16b02ee430092c3a0b80fbad72845b (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs b/MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs index c01430026..4a15f452a 100644 --- a/MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs +++ b/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 diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 3597e0755..ddbe05e59 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/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" /> |