From f83778fd70248d29e41bafb0e0eb926f9f413700 Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Tue, 21 Apr 2020 19:56:24 +0300
Subject: [PATCH 1/2] Updated to Blazor WebAssembly 3.2 preview 4

---
 Oqtane.Client/Oqtane.Client.csproj | 6 +++---
 Oqtane.Server/Oqtane.Server.csproj | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj
index 68dad12d..acc4da87 100644
--- a/Oqtane.Client/Oqtane.Client.csproj
+++ b/Oqtane.Client/Oqtane.Client.csproj
@@ -27,10 +27,10 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview3.20168.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview3.20168.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview4.20210.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.2" />
-    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-preview3.20175.8" />
+    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-preview5.20210.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index bbf00ff7..fd6d457d 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="dbup" Version="4.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview3.20168.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview4.20210.8" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />

From 845d38caf6c630e541a22e227284efa4ef788060 Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Thu, 23 Apr 2020 00:22:12 +0300
Subject: [PATCH 2/2] Remove AddBaseAddressHttpClient()

---
 Oqtane.Client/Program.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Oqtane.Client/Program.cs b/Oqtane.Client/Program.cs
index 8c9b118a..74fa8de4 100644
--- a/Oqtane.Client/Program.cs
+++ b/Oqtane.Client/Program.cs
@@ -5,6 +5,7 @@ using Oqtane.Services;
 using System.Reflection;
 using System;
 using System.Linq;
+using System.Net.Http;
 using Oqtane.Modules;
 using Oqtane.Shared;
 using Oqtane.Providers;
@@ -19,7 +20,9 @@ namespace Oqtane.Client
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
             builder.RootComponents.Add<App>("app");
 
-            builder.Services.AddBaseAddressHttpClient();
+            builder.Services.AddSingleton(
+                new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }
+            );
             builder.Services.AddOptions();
 
             // register auth services