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

MediaBrowser.Installer/MainWindow.xaml.cs

@@ -409,14 +409,34 @@ namespace MediaBrowser.Installer
             }
 
             // And extract
+            var retryCount = 0;
+            var success = false;
+            while (!success && retryCount < 3)
+            {
+                try
+                {
                     using (var fileStream = File.OpenRead(archive))
                     {
                         using (var zipFile = ZipFile.Read(fileStream))
                         {
                             zipFile.ExtractAll(RootPath, ExtractExistingFileAction.OverwriteSilently);
+                            success = true;
+                        }
+                    }
+                }
+                catch
+                {
+                    if (retryCount < 3)
+                    {
+                        Thread.Sleep(250);
+                        retryCount++;
+                    }
+                    else
+                    {
+                        throw;
+                    }
                 }
             }
-
         }
 
         /// <summary>

MediaBrowser.Installer/MediaBrowser.Installer.csproj

@@ -31,7 +31,7 @@
     <PublisherName>Media Browser Team</PublisherName>
     <SuiteName>Media Browser</SuiteName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>51</ApplicationRevision>
+    <ApplicationRevision>53</ApplicationRevision>
     <ApplicationVersion>0.1.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>