Merge pull request #18 from chris579/development

Auto updater crash fix
klemmchr · Mar 2, 2018 · f622dd9 · f622dd9
2 parents c6a6da4 + 30a3a9a
commit f622dd9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 21 deletions.
diff --git a/src/YTMusicDownloader.sln b/src/YTMusicDownloader.sln
@@ -102,9 +102,9 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_SaveFilesImmediatelyUponChange = True
-		RESX_SortFileContentOnSave = True
-		RESX_ResXSortingComparison = OrdinalIgnoreCase
 		RESX_AutoCreateNewLanguageFiles = False
+		RESX_ResXSortingComparison = OrdinalIgnoreCase
+		RESX_SortFileContentOnSave = True
+		RESX_SaveFilesImmediatelyUponChange = True
 	EndGlobalSection
 EndGlobal
diff --git a/src/YTMusicDownloaderLib/Updater/Updater.cs b/src/YTMusicDownloaderLib/Updater/Updater.cs
@@ -171,20 +171,28 @@ public static async Task<Update> IsUpdateAvailable(Version assemblyVersion, stri
         {
             return await Task.Run(async () =>
             {
-                var client = new GitHubClient(new ProductHeaderValue(Settings.Default.GitHubRepositoryName));
-                var release =
-                (await
-                    client.Repository.Release.GetAll(Settings.Default.GitHubRepositoryOwner,
-                        Settings.Default.GitHubRepositoryName))[0];
-                var match = Regex.Match(release.TagName, @"(\d+\.\d+\.\d+(\.\d+)?)");
-                if (!match.Success)
-                    return null;
-
-                var version = match.Groups[0].ToString();
-                var updateVersion = new Version(version);
-
-                var update = new Update(updateVersion, GetAssets(release.AssetsUrl), assemblyPath);
-                return updateVersion.CompareTo(assemblyVersion) > 0 ? update : null;
+                try
+                {
+                    var client = new GitHubClient(new ProductHeaderValue(Settings.Default.GitHubRepositoryName));
+                    var release =
+                    (await
+                        client.Repository.Release.GetAll(Settings.Default.GitHubRepositoryOwner,
+                            Settings.Default.GitHubRepositoryName))[0];
+                    var match = Regex.Match(release.TagName, @"(\d+\.\d+\.\d+(\.\d+)?)");
+                    if (!match.Success)
+                        return null;
+
+                    var version = match.Groups[0].ToString();
+                    var updateVersion = new Version(version);
+
+                    var update = new Update(updateVersion, GetAssets(release.AssetsUrl), assemblyPath);
+                    return updateVersion.CompareTo(assemblyVersion) > 0 ? update : null;
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine(ex);
+                }
+                return null;
             });
         }
 

diff --git a/src/YTMusicDownloaderLib/YTMusicDownloaderLib.csproj b/src/YTMusicDownloaderLib/YTMusicDownloaderLib.csproj
@@ -98,9 +98,8 @@
       <HintPath>..\packages\NLog.5.0.0-beta04\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Octokit, Version=0.24.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Octokit.0.24.0\lib\net45\Octokit.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Octokit, Version=0.29.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Octokit.0.29.0\lib\net45\Octokit.dll</HintPath>
     </Reference>
     <Reference Include="policy.2.0.taglib-sharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=MSIL">
       <HintPath>..\packages\taglib.2.1.0.0\lib\policy.2.0.taglib-sharp.dll</HintPath>

diff --git a/src/YTMusicDownloaderLib/packages.config b/src/YTMusicDownloaderLib/packages.config
@@ -9,7 +9,7 @@
   <package id="NAudio" version="1.8.1" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
   <package id="NLog" version="5.0.0-beta04" targetFramework="net452" />
-  <package id="Octokit" version="0.24.0" targetFramework="net452" />
+  <package id="Octokit" version="0.29.0" targetFramework="net452" />
   <package id="RestSharp" version="105.2.3" targetFramework="net452" />
   <package id="taglib" version="2.1.0.0" targetFramework="net452" />
   <package id="Zlib.Portable.Signed" version="1.11.0" targetFramework="net452" />