diff options
| author | Eric Reed <ebr@mediabrowser3.com> | 2013-02-25 21:50:43 -0500 |
|---|---|---|
| committer | Eric Reed <ebr@mediabrowser3.com> | 2013-02-25 21:50:43 -0500 |
| commit | 59ce9444786c4cb3a4eac23f4d26c537a9983c8f (patch) | |
| tree | df3efa6416d99c1cad77acb9c0c32beb7344b1d4 | |
| parent | 1013717808c5744f10e97bd8b79132e29b915c1a (diff) | |
Fix new version number logic
| -rw-r--r-- | MediaBrowser.Installer/MainWindow.xaml.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Installer/MediaBrowser.Installer.csproj | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/MediaBrowser.Installer/MainWindow.xaml.cs b/MediaBrowser.Installer/MainWindow.xaml.cs index 6bd2834af..01e15dfd8 100644 --- a/MediaBrowser.Installer/MainWindow.xaml.cs +++ b/MediaBrowser.Installer/MainWindow.xaml.cs @@ -101,11 +101,11 @@ namespace MediaBrowser.Installer prgProgress.Visibility = Visibility.Visible; // Determine Package version - var version = await GetPackageVersion().ConfigureAwait(false); + var version = await GetPackageVersion(); lblStatus.Content = string.Format("Downloading {0} (version {1})...", FriendlyName, version.versionStr); // Download - var archive = await DownloadPackage(version).ConfigureAwait(false); + var archive = await DownloadPackage(version); dlAnimation.StopAnimation(); prgProgress.Visibility = btnCancel.Visibility = Visibility.Hidden; @@ -152,7 +152,7 @@ namespace MediaBrowser.Installer try { // get the package information for the server - var json = await client.DownloadStringTaskAsync("http://www.mb3admin.com/admin/service/package/retrieveAll?name=" + PackageName).ConfigureAwait(false); + var json = await client.DownloadStringTaskAsync("http://www.mb3admin.com/admin/service/package/retrieveAll?name=" + PackageName); var packages = JsonSerializer.DeserializeFromString<List<PackageInfo>>(json); var version = packages[0].versions.Where(v => v.classification == PackageClass).OrderByDescending(v => v.version).FirstOrDefault(v => v.version <= PackageVersion); @@ -161,6 +161,7 @@ namespace MediaBrowser.Installer SystemClose("Could not locate download package. Aborting."); return null; } + return version; } catch (Exception e) { @@ -185,7 +186,7 @@ namespace MediaBrowser.Installer // setup download progress and download the package client.DownloadProgressChanged += DownloadProgressChanged; - await client.DownloadFileTaskAsync(version.sourceUrl, archiveFile).ConfigureAwait(false); + await client.DownloadFileTaskAsync(version.sourceUrl, archiveFile); return archiveFile; } catch (Exception e) diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj index ae7277abe..30267e76e 100644 --- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj +++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj @@ -29,7 +29,7 @@ <PublisherName>Media Browser Team</PublisherName> <SuiteName>Media Browser</SuiteName> <OpenBrowserOnPublish>false</OpenBrowserOnPublish> - <ApplicationRevision>11</ApplicationRevision> + <ApplicationRevision>14</ApplicationRevision> <ApplicationVersion>0.1.1.%2a</ApplicationVersion> <UseApplicationTrust>false</UseApplicationTrust> <PublishWizardCompleted>true</PublishWizardCompleted> |