From 49d6864649fef1c94175766c800fb878b10c3567 Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Mon, 20 May 2024 23:10:00 -0700
Subject: [PATCH] Increasing timeout to be 10 minutes

Adjusting message
---
 src/Velopack.Build/PublishTask.cs                        | 7 +++++--
 src/Velopack.Packaging/Flow/VelopackFlowServiceClient.cs | 6 ++++--
 src/Velopack.Vpk/Program.cs                              | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Velopack.Build/PublishTask.cs b/src/Velopack.Build/PublishTask.cs
index 1b1dddb2..e4d000d4 100644
--- a/src/Velopack.Build/PublishTask.cs
+++ b/src/Velopack.Build/PublishTask.cs
@@ -1,4 +1,5 @@
-using System.Net.Http;
+using System;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Build.Framework;
 using Microsoft.Extensions.Logging;
@@ -8,7 +9,9 @@ namespace Velopack.Build;
 
 public class PublishTask : MSBuildAsyncTask
 {
-    private static HttpClient HttpClient { get; } = new(new HmacAuthHttpClientHandler());
+    private static HttpClient HttpClient { get; } = new(new HmacAuthHttpClientHandler()) {
+        Timeout = TimeSpan.FromMinutes(10)
+    };
 
     [Required]
     public string ReleaseDirectory { get; set; } = "";
diff --git a/src/Velopack.Packaging/Flow/VelopackFlowServiceClient.cs b/src/Velopack.Packaging/Flow/VelopackFlowServiceClient.cs
index 13f10f6f..f83365a6 100644
--- a/src/Velopack.Packaging/Flow/VelopackFlowServiceClient.cs
+++ b/src/Velopack.Packaging/Flow/VelopackFlowServiceClient.cs
@@ -119,7 +119,7 @@ public class VelopackFlowServiceClient(HttpClient HttpClient, ILogger Logger) :
             }
         }
 
-        Logger.LogInformation("Preparing to upload {AssetCount} assets to Velopack ({ServiceUrl})", latestAssets.Count + installers.Count, serviceUrl);
+        Logger.LogInformation("Uploading {AssetCount} assets to Velopack ({ServiceUrl})", latestAssets.Count + installers.Count, serviceUrl);
 
         foreach (var assetFileName in files) {
 
@@ -301,7 +301,9 @@ public class VelopackFlowServiceClient(HttpClient HttpClient, ILogger Logger) :
                 .Create(authConfiguration.ClientId)
                 .WithB2CAuthority(authConfiguration.B2CAuthority)
                 .WithRedirectUri(authConfiguration.RedirectUri)
-                //.WithLogging((LogLevel level, string message, bool containsPii) => System.Console.WriteLine($"[{level}]: {message}"))
+#if DEBUG
+                .WithLogging((Microsoft.Identity.Client.LogLevel level, string message, bool containsPii) => System.Console.WriteLine($"[{level}]: {message}"), enablePiiLogging: true, enableDefaultPlatformLogging: true)
+#endif
                 .WithClientName("velopack")
                 .Build();
 
diff --git a/src/Velopack.Vpk/Program.cs b/src/Velopack.Vpk/Program.cs
index ff88fa2f..fd0a8398 100644
--- a/src/Velopack.Vpk/Program.cs
+++ b/src/Velopack.Vpk/Program.cs
@@ -149,7 +149,7 @@ public class Program
     {
         services.AddSingleton<IVelopackFlowServiceClient, VelopackFlowServiceClient>();
         services.AddSingleton<HmacAuthHttpClientHandler>();
-        services.AddHttpClient().ConfigureHttpClientDefaults(x => x.AddHttpMessageHandler<HmacAuthHttpClientHandler>());
+        services.AddHttpClient().ConfigureHttpClientDefaults(x => x.AddHttpMessageHandler<HmacAuthHttpClientHandler>().ConfigureHttpClient(httpClient => httpClient.Timeout = TimeSpan.FromMinutes(10)));
     }
 }