Update to HttpClient.

ricaun-io · Nov 29, 2023 · e3248fa · e3248fa
1 parent 3595835
commit e3248fa
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Update `csproj`.
 - Add `ApplicationPreviewUtils` to enable know if Revit application is preview.
 - Enable run without `LoginUserId` when `IsPreviewRelease`.
+- Update `ricaun.Revit.UI`
+- Update `RibbonUtils` with updated `ricaun.Revit.UI`
 ### Shared
 - Update `net6.0-windows` framework.
 ### Console
@@ -29,6 +31,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Update `ResourceConsoleUtils`
 - Update `RevitTestConsole` to remove `+` in FileInfo.
 - Add `FileVersionInfoUtils` to remove `+` in FileInfo.
+- Update to `HttpClient`.
 ### Warning
 - Ignore `Newtonsoft.Json` warning in `Application` project.
 

diff --git a/README.md b/README.md
@@ -52,6 +52,7 @@ flowchart LR
 * [ricaun.NUnit](https://github.com/ricaun-io/ricaun.NUnit)
 * [ricaun.Revit.UI](https://github.com/ricaun-io/ricaun.Revit.UI)
 * [ricaun.Revit.Async](https://github.com/ricaun-io/ricaun.Revit.Async)
+* [ricaun.Auth](https://github.com/ricaun-io/ricaun.Auth)
 * [Revit.Busy](https://github.com/ricaun-io/Revit.Busy)
 * [ricaun.RevitTest.Shared](ricaun.RevitTest.Shared)
 #### Console

diff --git a/ricaun.RevitTest.Application/Revit/Utils/RibbonUtils.cs b/ricaun.RevitTest.Application/Revit/Utils/RibbonUtils.cs
@@ -9,6 +9,10 @@ public static class RibbonUtils
         public static string TestSkip { get; } = GetComponentImage("test-skip");
         public static string TestWait { get; } = GetComponentImage("test-wait");
         public static string GetComponentImage(string imageName)
+        {
+            return string.Format("Images/{0}.png", imageName);
+        }
+        static string GetComponentImagePack(string imageName)
         {
             var assemblyName = Assembly.GetCallingAssembly().GetName().Name;
             return string.Format("pack://application:,,,/{0};component/Images/{1}.png", assemblyName, imageName);

diff --git a/ricaun.RevitTest.Application/ricaun.RevitTest.Application.csproj b/ricaun.RevitTest.Application/ricaun.RevitTest.Application.csproj
@@ -98,7 +98,7 @@
   <ItemGroup>
     <PackageReference Include="Revit.Busy" Version="*" />
     <PackageReference Include="ricaun.Auth.Aps.UI" Version="*" />
-    <PackageReference Include="ricaun.Revit.UI" Version="0.6.0-alpha" />
+    <PackageReference Include="ricaun.Revit.UI" Version="*-*" />
     <PackageReference Include="ricaun.Revit.Async" Version="*" />
     <PackageReference Include="ricaun.NUnit" Version="*" />
     <PackageReference Include="NamedPipeWrapper.Json" Version="*" />

diff --git a/ricaun.RevitTest.TestAdapter/Services/ApplicationUtils.cs b/ricaun.RevitTest.TestAdapter/Services/ApplicationUtils.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.IO.Compression;
 using System.Net;
+using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace ricaun.RevitTest.TestAdapter.Services
@@ -89,6 +90,54 @@ public static async Task<bool> DownloadAsync(string applicationFolder, string ad
             var zipPath = Path.Combine(applicationFolder, fileName);
             var result = false;
 
+            using (var client = new HttpClient())
+            {
+                System.Net.ServicePointManager.SecurityProtocol |= System.Net.SecurityProtocolType.Tls12;
+                try
+                {
+                    if (File.Exists(address))
+                    {
+                        File.Copy(address, zipPath, true);
+                    }
+                    else
+                    {
+                        client.DefaultRequestHeaders.Add("User-Agent", nameof(ApplicationUtils));
+                        using (var s = await client.GetStreamAsync(address))
+                        {
+                            using (var fs = new FileStream(zipPath, FileMode.Create))
+                            {
+                                await s.CopyToAsync(fs);
+                            }
+                        }
+                    }
+                    ExtractZipToDirectory(zipPath, applicationFolder);
+                    result = true;
+                }
+                catch (Exception ex)
+                {
+                    downloadFileException?.Invoke(ex);
+                }
+                if (Path.GetExtension(zipPath) == ZIP_FILE_EXTENSION)
+                    if (File.Exists(zipPath)) File.Delete(zipPath);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Download and unzip Application Async
+        /// </summary>
+        /// <param name="applicationFolder">Folder of the Application</param>
+        /// <param name="address"></param>
+        /// <param name="downloadFileException"></param>
+        /// <returns></returns>
+        public static async Task<bool> DownloadAsyncWeb(string applicationFolder, string address, Action<Exception> downloadFileException = null)
+        {
+            var fileName = Path.GetFileName(address);
+            var zipPath = Path.Combine(applicationFolder, fileName);
+            var result = false;
+
+#pragma warning disable SYSLIB0014 // Type or member is obsolete
             using (var client = new WebClient())
             {
                 System.Net.ServicePointManager.SecurityProtocol |= System.Net.SecurityProtocolType.Tls12;
@@ -106,6 +155,7 @@ public static async Task<bool> DownloadAsync(string applicationFolder, string ad
                 if (Path.GetExtension(zipPath) == ZIP_FILE_EXTENSION)
                     if (File.Exists(zipPath)) File.Delete(zipPath);
             }
+#pragma warning restore SYSLIB0014 // Type or member is obsolete
 
             return result;
         }

diff --git a/ricaun.RevitTest.TestAdapter/ricaun.RevitTest.TestAdapter.csproj b/ricaun.RevitTest.TestAdapter/ricaun.RevitTest.TestAdapter.csproj
@@ -41,6 +41,7 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Net.Http" />
   </ItemGroup>
 
   <!-- Fody -->