Fixed #27 (part 2).

dedepete · May 10, 2018 · 657217c · 657217c
1 parent ae244ca
commit 657217c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/src/FreeLauncher/Forms/LauncherForm/LauncherForm.cs b/src/FreeLauncher/Forms/LauncherForm/LauncherForm.cs
@@ -834,7 +834,7 @@ private string DownloadLibraries()
                 }
                 if (a.DownloadInfo == null) {
                     libsToDownload.Add(new DownloadEntry {
-                        Path = a.GetPath(), Url = a.Url
+                        Path = a.GetPath(), Url = a.GetUrl()
                     }, false);
                     continue;
                 }

diff --git a/src/FreeLauncher/Properties/AssemblyInfo.cs b/src/FreeLauncher/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.10.1588")]
-[assembly: AssemblyFileVersion("0.1.10.1588")]
+[assembly: AssemblyVersion("0.1.10.1593")]
+[assembly: AssemblyFileVersion("0.1.10.1593")]
 [assembly: AssemblyInformationalVersion("%version3%_%branch%.%shorthash%")]
diff --git a/src/dotMCLauncher.Versioning/Lib/Lib.cs b/src/dotMCLauncher.Versioning/Lib/Lib.cs
@@ -71,5 +71,13 @@ public string GetPath()
                 (!string.IsNullOrEmpty(IsNative) ? "-" + IsNative : string.Empty) + ".jar",
                 s[0].Replace('.', '\\'), s[1], s[2]);
         }
+
+        /// <summary>
+        /// Returns full URL. Null if Url is not presented.
+        /// </summary>
+        public string GetUrl()
+        {
+            return Url != null ? Url += GetPath() : null;
+        }
     }
 }
diff --git a/src/dotMCLauncher.Versioning/Properties/AssemblyInfo.cs b/src/dotMCLauncher.Versioning/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.0.16")]
-[assembly: AssemblyFileVersion("0.2.0.15")]
+[assembly: AssemblyVersion("0.2.0.20")]
+[assembly: AssemblyFileVersion("0.2.0.19")]