Skip to content

[#16] Update to 3.2.0-preview4.20210.8 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2020
Merged

[#16] Update to 3.2.0-preview4.20210.8 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions demo/Demo.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion demo/ServerHost/ServerHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions demo/ServerHost/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion demo/WasmHost/Pages/FetchData.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 15 additions & 3 deletions demo/WasmHost/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System;
using System.Net.Http;
using System.Threading.Tasks;
using BlazorLazyLoading.Wasm;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
Expand All @@ -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)
});
}
}
}
8 changes: 4 additions & 4 deletions demo/WasmHost/WasmHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions demo/WasmHost/_Imports.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/AssemblyLoader.Server/AssemblyLoader.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down