Update dependencies for the Blazor sample (dotnet#6706)

sheng-jie · Aug 24, 2020 · f524fb4 · f524fb4
1 parent 53f8e0f
commit f524fb4
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 62 deletions.
diff --git a/Samples/3.0/Blazor/Sample.ClientSide/Program.cs b/Samples/3.0/Blazor/Sample.ClientSide/Program.cs
@@ -1,16 +1,26 @@
-using Microsoft.AspNetCore.Blazor.Hosting;
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Sample.ClientSide.Services;
 
 namespace Sample.ClientSide
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static async Task Main(string[] args)
         {
-            CreateHostBuilder(args).Build().Run();
-        }
+            var builder = WebAssemblyHostBuilder.CreateDefault(args);
+            builder.RootComponents.Add<App>("app");
+
+            builder.Services.AddSingleton<HttpClient>();
+            builder.Services.AddApiService(options =>
+            {
+                options.BaseAddress = new Uri("http://localhost:8081/api");
+            });
 
-        public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>
-            BlazorWebAssemblyHost.CreateDefaultBuilder()
-                .UseBlazorStartup<Startup>();
+            await builder.Build().RunAsync();
+        }
     }
 }
diff --git a/Samples/3.0/Blazor/Sample.ClientSide/Sample.ClientSide.csproj b/Samples/3.0/Blazor/Sample.ClientSide/Sample.ClientSide.csproj
@@ -2,17 +2,14 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
     <RazorLangVersion>3.0</RazorLangVersion>
+    <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview4.19579.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview4.19579.2" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="3.2.1" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Samples/3.0/Blazor/Sample.ClientSide/Services/ApiService.cs b/Samples/3.0/Blazor/Sample.ClientSide/Services/ApiService.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Net.Http.Json;
 using System.Threading.Tasks;
 
 namespace Sample.ClientSide.Services
@@ -21,13 +22,13 @@ public ApiService(IOptions<ApiServiceOptions> options, HttpClient client)
         }
 
         public Task<WeatherInfo[]> GetWeatherForecastAsync() =>
-            client.GetJsonAsync<WeatherInfo[]>($"{options.BaseAddress}/Weather");
+            client.GetFromJsonAsync<WeatherInfo[]>($"{options.BaseAddress}/Weather");
 
         public Task<IEnumerable<TodoItem>> GetTodosAsync(Guid ownerKey) =>
-            client.GetJsonAsync<IEnumerable<TodoItem>>($"{options.BaseAddress}/todo/list/{ownerKey}");
+            client.GetFromJsonAsync<IEnumerable<TodoItem>>($"{options.BaseAddress}/todo/list/{ownerKey}");
 
         public Task SetTodoAsync(TodoItem item) =>
-            client.PostJsonAsync($"{options.BaseAddress}/todo", item);
+            client.PostAsJsonAsync($"{options.BaseAddress}/todo", item);
 
         public Task DeleteTodoAsync(Guid itemKey) =>
             client.DeleteAsync($"{options.BaseAddress}/todo/{itemKey}");

diff --git a/Samples/3.0/Blazor/Sample.ClientSide/Startup.cs b/Samples/3.0/Blazor/Sample.ClientSide/Startup.cs
diff --git a/Samples/3.0/Blazor/Sample.Grains.Interfaces/Sample.Grains.Interfaces.csproj b/Samples/3.0/Blazor/Sample.Grains.Interfaces/Sample.Grains.Interfaces.csproj
@@ -6,12 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.0.2">
+    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.2.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.0.2" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.2.2" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0-preview.18571.3" />
   </ItemGroup>
 

diff --git a/Samples/3.0/Blazor/Sample.Grains/Sample.Grains.csproj b/Samples/3.0/Blazor/Sample.Grains/Sample.Grains.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.0.2">
+    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.2.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.0.2" />
-    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.0.2" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.2.2" />
+    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.2.2" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0-preview.18571.3" />
   </ItemGroup>
 

diff --git a/Samples/3.0/Blazor/Sample.ServerSide/Sample.ServerSide.csproj b/Samples/3.0/Blazor/Sample.ServerSide/Sample.ServerSide.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Client" Version="3.0.2" />
-    <PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.0.2" />
+    <PackageReference Include="Microsoft.Orleans.Client" Version="3.2.2" />
+    <PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.2.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/3.0/Blazor/Sample.Silo/Sample.Silo.csproj b/Samples/3.0/Blazor/Sample.Silo/Sample.Silo.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
   </PropertyGroup>
@@ -15,19 +15,18 @@
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview4.19579.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="4.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Orleans.Server" Version="3.0.2" />
-    <PackageReference Include="OrleansDashboard" Version="3.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="4.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="3.2.2" />
+    <PackageReference Include="OrleansDashboard" Version="3.1.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.2-dev-10265" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0-dev-00834" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc5" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Sample.Grains\Sample.Grains.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>