Skip to content

Commit 189130a

Browse files
isc30isc30
authored
[#16] Update to 3.2.0-preview4.20210.8 (#18)
1 parent af049b7 commit 189130a

File tree

8 files changed

+72
-12
lines changed

8 files changed

+72
-12
lines changed

‎demo/Demo.sln

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1717
NuGet.Config = NuGet.Config
1818
EndProjectSection
1919
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorLazyLoading", "BlazorLazyLoading", "{2DFA918F-9417-49B8-9FDA-E2231179978C}"
21+
EndProject
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Module", "..\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj", "{E3E28F5C-3F96-4634-9528-10C23F2478DF}"
23+
EndProject
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Server", "..\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj", "{6C5945E8-44F9-4898-AB78-FF0D85F5515B}"
25+
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Wasm", "..\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj", "{B78FC2FE-F107-49AB-95FC-E7F4559C879A}"
27+
EndProject
2028
Global
2129
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2230
Debug|Any CPU = Debug|Any CPU
@@ -63,10 +71,51 @@ Global
6371
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x64.Build.0 = Release|Any CPU
6472
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x86.ActiveCfg = Release|Any CPU
6573
{C9941BB9-0C56-45C4-B54C-3755A868DA0D}.Release|x86.Build.0 = Release|Any CPU
74+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|x64.ActiveCfg = Debug|Any CPU
77+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|x64.Build.0 = Debug|Any CPU
78+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|x86.ActiveCfg = Debug|Any CPU
79+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Debug|x86.Build.0 = Debug|Any CPU
80+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
81+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|Any CPU.Build.0 = Release|Any CPU
82+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|x64.ActiveCfg = Release|Any CPU
83+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|x64.Build.0 = Release|Any CPU
84+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|x86.ActiveCfg = Release|Any CPU
85+
{E3E28F5C-3F96-4634-9528-10C23F2478DF}.Release|x86.Build.0 = Release|Any CPU
86+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|Any CPU.Build.0 = Debug|Any CPU
88+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|x64.ActiveCfg = Debug|Any CPU
89+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|x64.Build.0 = Debug|Any CPU
90+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|x86.ActiveCfg = Debug|Any CPU
91+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Debug|x86.Build.0 = Debug|Any CPU
92+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|Any CPU.ActiveCfg = Release|Any CPU
93+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|Any CPU.Build.0 = Release|Any CPU
94+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|x64.ActiveCfg = Release|Any CPU
95+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|x64.Build.0 = Release|Any CPU
96+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|x86.ActiveCfg = Release|Any CPU
97+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B}.Release|x86.Build.0 = Release|Any CPU
98+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|Any CPU.Build.0 = Debug|Any CPU
100+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|x64.ActiveCfg = Debug|Any CPU
101+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|x64.Build.0 = Debug|Any CPU
102+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|x86.ActiveCfg = Debug|Any CPU
103+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Debug|x86.Build.0 = Debug|Any CPU
104+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|Any CPU.ActiveCfg = Release|Any CPU
105+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|Any CPU.Build.0 = Release|Any CPU
106+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|x64.ActiveCfg = Release|Any CPU
107+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|x64.Build.0 = Release|Any CPU
108+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|x86.ActiveCfg = Release|Any CPU
109+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A}.Release|x86.Build.0 = Release|Any CPU
66110
EndGlobalSection
67111
GlobalSection(SolutionProperties) = preSolution
68112
HideSolutionNode = FALSE
69113
EndGlobalSection
114+
GlobalSection(NestedProjects) = preSolution
115+
{E3E28F5C-3F96-4634-9528-10C23F2478DF} = {2DFA918F-9417-49B8-9FDA-E2231179978C}
116+
{6C5945E8-44F9-4898-AB78-FF0D85F5515B} = {2DFA918F-9417-49B8-9FDA-E2231179978C}
117+
{B78FC2FE-F107-49AB-95FC-E7F4559C879A} = {2DFA918F-9417-49B8-9FDA-E2231179978C}
118+
EndGlobalSection
70119
GlobalSection(ExtensibilityGlobals) = postSolution
71120
SolutionGuid = {B979A335-AE81-406A-AADA-F236549D23D3}
72121
EndGlobalSection

‎demo/ServerHost/ServerHost.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- Extra dependencies -->
1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview3.20168.3" PrivateAssets="all" />
19+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎demo/ServerHost/Startup.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using System.Net.Mime;
21
using BlazorLazyLoading.Server;
32
using Microsoft.AspNetCore.Builder;
43
using Microsoft.AspNetCore.Hosting;
5-
using Microsoft.AspNetCore.StaticFiles;
64
using Microsoft.Extensions.Configuration;
75
using Microsoft.Extensions.DependencyInjection;
86
using Microsoft.Extensions.Hosting;

‎demo/WasmHost/Pages/FetchData.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ else
3939

4040
protected override async Task OnInitializedAsync()
4141
{
42-
forecasts = await Http.GetJsonAsync<WeatherForecast[]>("sample-data/weather.json");
42+
forecasts = await Http.GetFromJsonAsync<WeatherForecast[]>("sample-data/weather.json");
4343
}
4444

4545
public class WeatherForecast

‎demo/WasmHost/Program.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
using System.Net.Http;
13
using System.Threading.Tasks;
24
using BlazorLazyLoading.Wasm;
35
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
@@ -12,17 +14,27 @@ public static async Task Main(string[] args)
1214
var builder = WebAssemblyHostBuilder.CreateDefault(args);
1315
builder.RootComponents.Add<App>("app");
1416

15-
ConfigureServices(builder.Services);
17+
ConfigureServices(builder.Services, builder);
1618

1719
WebAssemblyHost host = builder.Build();
1820

1921
await host.RunAsync();
2022
}
2123

22-
private static void ConfigureServices(IServiceCollection services)
24+
private static void ConfigureServices(IServiceCollection services, WebAssemblyHostBuilder builder)
2325
{
24-
services.AddBaseAddressHttpClient();
26+
AddHttpClient(services, builder);
2527
services.AddLazyLoading();
2628
}
29+
30+
private static void AddHttpClient(IServiceCollection services, WebAssemblyHostBuilder builder)
31+
{
32+
services.AddSingleton(
33+
typeof(HttpClient),
34+
p => new HttpClient
35+
{
36+
BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)
37+
});
38+
}
2739
}
2840
}

‎demo/WasmHost/WasmHost.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
<!-- Extra dependencies -->
2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview3.20168.3" />
22-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview3.20168.3" PrivateAssets="all" />
23-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-preview3.20168.3" PrivateAssets="all" />
24-
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview3.20168.3" />
21+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview4.20210.8" />
22+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
23+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
24+
<PackageReference Include="System.Net.Http.Json" Version="3.2.0-preview5.20210.3" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎demo/WasmHost/_Imports.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@using System.Net.Http
2+
@using System.Net.Http.Json
23
@using Microsoft.AspNetCore.Components.Forms
34
@using Microsoft.AspNetCore.Components.Routing
45
@using Microsoft.AspNetCore.Components.Web

‎src/AssemblyLoader.Server/AssemblyLoader.Server.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview3.20168.3" />
20+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview4.20210.8" />
2121
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
2222
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="3.1.3" />
2323
</ItemGroup>

0 commit comments

Comments
 (0)