Merge pull request #4 from jvandertil/feature/fdb-6.1.8

Add support for FoundationDb 6.1.8
jvandertil · Jun 21, 2019 · 964a4c4 · 964a4c4
2 parents fd4d5b0 + d110099
commit 964a4c4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/FdbServer/Builder/Download/FdbServerDownloader.cs b/src/FdbServer/Builder/Download/FdbServerDownloader.cs
@@ -12,11 +12,11 @@ public static Task<IResult> Download(FdbServerUrl url, string destinationFile)
             {
                 using (var webclient = new HttpClient())
                 {
-                    var serverDownloadTask = webclient.GetStreamAsync(url.Uri).ConfigureAwait(false);
+                    var serverDownloadTask = webclient.GetStreamAsync(url.Uri);
 
                     using (var destination = File.OpenWrite(destinationFile))
                     {
-                        var stream = await serverDownloadTask;
+                        var stream = await serverDownloadTask.ConfigureAwait(false);
 
                         await stream.CopyToAsync(destination).ConfigureAwait(false);
 

diff --git a/src/FdbServer/Builder/Download/FdbServerUrlRepository.cs b/src/FdbServer/Builder/Download/FdbServerUrlRepository.cs
@@ -5,7 +5,7 @@ namespace FdbServer.Builder.Download
 {
     internal static class FdbServerUrlRepository
     {
-        private static readonly Dictionary<FdbServerVersion, FdbServerUrl> _repository = new Dictionary<FdbServerVersion, FdbServerUrl>
+        private static readonly Dictionary<FdbServerVersion, FdbServerUrl> _repository = new Dictionary<FdbServerVersion, FdbServerUrl>(3)
         {
             { FdbServerVersion.v5_2_5,
                 new FdbServerUrl(
@@ -17,7 +17,14 @@ internal static class FdbServerUrlRepository
                 new FdbServerUrl(
                     FdbServerVersion.v6_0_15,
                     new Uri(@"https://www.github.com/jvandertil/FdbServer/releases/download/v0.4.0/fdbserver-6.0.15.zip"),
-                    "1648E1574D74B781953C44C556CD75DBBA5F41E1812B54758BE808056A1E9A3C31468D5ADCCA2E5729D90A0BC2D461C5113B79C1DAC936AE717C6AA5799D131E")}
+                    "1648E1574D74B781953C44C556CD75DBBA5F41E1812B54758BE808056A1E9A3C31468D5ADCCA2E5729D90A0BC2D461C5113B79C1DAC936AE717C6AA5799D131E")
+            },
+            { FdbServerVersion.v6_1_8,
+                new FdbServerUrl(
+                    FdbServerVersion.v6_1_8,
+                    new Uri(@"https://www.github.com/jvandertil/FdbServer/releases/download/v0.6.0/fdbserver-6.1.8.zip"),
+                    "E6EA555535CA7C3BCF7E8D17F68A5759DC401E5219FE9CA33808698C8FCEB4A74AC9E0DD32C9AD737600B3155C3EAF23947A4E6398F8AEE0F92F839D32A2D986")
+            },
         };
 
         public static FdbServerUrl GetUrl(FdbServerVersion version)

diff --git a/src/FdbServer/Builder/FdbServerVersion.cs b/src/FdbServer/Builder/FdbServerVersion.cs
@@ -4,5 +4,6 @@ public enum FdbServerVersion
     {
         v5_2_5,
         v6_0_15,
+        v6_1_8
     }
 }