From fe4ef74463b51901cc286aa2371e80276ea74f51 Mon Sep 17 00:00:00 2001
From: isc30 <ivansanzcarasa@gmail.com>
Date: Sun, 19 Apr 2020 13:25:55 +0200
Subject: [PATCH] [#16] Update to 3.2.0-preview4.20210.8
---
demo/Demo.sln | 49 +++++++++++++++++++
demo/ServerHost/ServerHost.csproj | 2 +-
demo/ServerHost/Startup.cs | 2 -
demo/WasmHost/Pages/FetchData.razor | 2 +-
demo/WasmHost/Program.cs | 18 +++++--
demo/WasmHost/WasmHost.csproj | 8 +--
demo/WasmHost/_Imports.razor | 1 +
.../AssemblyLoader.Server.csproj | 2 +-
8 files changed, 72 insertions(+), 12 deletions(-)
diff --git a/demo/Demo.sln b/demo/Demo.sln
index 6d6dc96..a491e99 100644
--- a/demo/Demo.sln
+++ b/demo/Demo.sln
@@ -17,6 +17,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
NuGet.Config = NuGet.Config
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorLazyLoading", "BlazorLazyLoading", "{2DFA918F-9417-49B8-9FDA-E2231179978C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Module", "..\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj", "{E3E28F5C-3F96-4634-9528-10C23F2478DF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Server", "..\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj", "{6C5945E8-44F9-4898-AB78-FF0D85F5515B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Wasm", "..\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj", "{B78FC2FE-F107-49AB-95FC-E7F4559C879A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -63,10 +71,51 @@ Global
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x64.Build.0 = Release|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x86.ActiveCfg = Release|Any CPU
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x86.Build.0 = Release|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|x64.Build.0 = Debug|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|x86.Build.0 = Debug|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|x64.ActiveCfg = Release|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|x64.Build.0 = Release|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|x86.ActiveCfg = Release|Any CPU
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|x86.Build.0 = Release|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|x64.Build.0 = Debug|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|x86.Build.0 = Debug|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|x64.ActiveCfg = Release|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|x64.Build.0 = Release|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|x86.ActiveCfg = Release|Any CPU
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|x86.Build.0 = Release|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|x64.Build.0 = Debug|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|x86.Build.0 = Debug|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|x64.ActiveCfg = Release|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|x64.Build.0 = Release|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|x86.ActiveCfg = Release|Any CPU
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {E3E28F5C-3F96-4634-9528-10C23F2478DF} = {2DFA918F-9417-49B8-9FDA-E2231179978C}
+ {6C5945E8-44F9-4898-AB78-FF0D85F5515B} = {2DFA918F-9417-49B8-9FDA-E2231179978C}
+ {B78FC2FE-F107-49AB-95FC-E7F4559C879A} = {2DFA918F-9417-49B8-9FDA-E2231179978C}
+ EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B979A335-AE81-406A-AADA-F236549D23D3}
EndGlobalSection
diff --git a/demo/ServerHost/ServerHost.csproj b/demo/ServerHost/ServerHost.csproj
index 7a34259..3b4234d 100644
--- a/demo/ServerHost/ServerHost.csproj
+++ b/demo/ServerHost/ServerHost.csproj
@@ -16,7 +16,7 @@
<!-- Extra dependencies -->
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview3.20168.3" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
diff --git a/demo/ServerHost/Startup.cs b/demo/ServerHost/Startup.cs
index 42a6f03..621059a 100644
--- a/demo/ServerHost/Startup.cs
+++ b/demo/ServerHost/Startup.cs
@@ -1,8 +1,6 @@
-using System.Net.Mime;
using BlazorLazyLoading.Server;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
diff --git a/demo/WasmHost/Pages/FetchData.razor b/demo/WasmHost/Pages/FetchData.razor
index f996c73..4432ee5 100644
--- a/demo/WasmHost/Pages/FetchData.razor
+++ b/demo/WasmHost/Pages/FetchData.razor
@@ -39,7 +39,7 @@ else
protected override async Task OnInitializedAsync()
{
- forecasts = await Http.GetJsonAsync<WeatherForecast[]>("sample-data/weather.json");
+ forecasts = await Http.GetFromJsonAsync<WeatherForecast[]>("sample-data/weather.json");
}
public class WeatherForecast
diff --git a/demo/WasmHost/Program.cs b/demo/WasmHost/Program.cs
index 497325f..e234c02 100644
--- a/demo/WasmHost/Program.cs
+++ b/demo/WasmHost/Program.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Net.Http;
using System.Threading.Tasks;
using BlazorLazyLoading.Wasm;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
@@ -12,17 +14,27 @@ public static async Task Main(string[] args)
var builder = WebAssemblyHostBuilder.CreateDefault(args);
builder.RootComponents.Add<App>("app");
- ConfigureServices(builder.Services);
+ ConfigureServices(builder.Services, builder);
WebAssemblyHost host = builder.Build();
await host.RunAsync();
}
- private static void ConfigureServices(IServiceCollection services)
+ private static void ConfigureServices(IServiceCollection services, WebAssemblyHostBuilder builder)
{
- services.AddBaseAddressHttpClient();
+ AddHttpClient(services, builder);
services.AddLazyLoading();
}
+
+ private static void AddHttpClient(IServiceCollection services, WebAssemblyHostBuilder builder)
+ {
+ services.AddSingleton(
+ typeof(HttpClient),
+ p => new HttpClient
+ {
+ BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)
+ });
+ }
}
}
diff --git a/demo/WasmHost/WasmHost.csproj b/demo/WasmHost/WasmHost.csproj
index e1668ff..506dfa9 100644
--- a/demo/WasmHost/WasmHost.csproj
+++ b/demo/WasmHost/WasmHost.csproj
@@ -18,10 +18,10 @@
<!-- Extra dependencies -->
<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.DevServer" Version="3.2.0-preview3.20168.3" PrivateAssets="all" />
- <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview3.20168.3" />
+ <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.WebAssembly.DevServer" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
+ <PackageReference Include="System.Net.Http.Json" Version="3.2.0-preview5.20210.3" />
</ItemGroup>
<ItemGroup>
diff --git a/demo/WasmHost/_Imports.razor b/demo/WasmHost/_Imports.razor
index 2530d69..79da024 100644
--- a/demo/WasmHost/_Imports.razor
+++ b/demo/WasmHost/_Imports.razor
@@ -1,4 +1,5 @@
@using System.Net.Http
+@using System.Net.Http.Json
@using Microsoft.AspNetCore.Components.Forms
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
diff --git a/src/AssemblyLoader.Server/AssemblyLoader.Server.csproj b/src/AssemblyLoader.Server/AssemblyLoader.Server.csproj
index 4e63224..ce2e692 100644
--- a/src/AssemblyLoader.Server/AssemblyLoader.Server.csproj
+++ b/src/AssemblyLoader.Server/AssemblyLoader.Server.csproj
@@ -17,7 +17,7 @@
</ItemGroup>
<ItemGroup>
- <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.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.3" />
</ItemGroup>