Skip to content

Commit

Permalink
Migrate to 3.2.0-preview1.20073.1
Browse files Browse the repository at this point in the history
  • Loading branch information
JeremyLikness committed Feb 18, 2020
1 parent b4ac055 commit 8def4d4
Show file tree
Hide file tree
Showing 12 changed files with 53 additions and 105 deletions.
10 changes: 5 additions & 5 deletions BlazorState.Wasm/BlazorState.Wasm.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RazorLangVersion>3.0</RazorLangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview1.19508.20" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview1.19508.20" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview1.19508.20" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview1.19508.20" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.2.0-preview1.20073.1" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.2.0-preview1.20073.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview1.20073.1" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.2.0-preview1.20073.1" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 9 additions & 7 deletions BlazorState.Wasm/Program.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
using Microsoft.AspNetCore.Blazor.Hosting;
using BlazorState.ViewModel;
using Microsoft.AspNetCore.Blazor.Hosting;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;

namespace BlazorState.Wasm
{
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<IHealthModel, HealthModel>();
await builder.Build().RunAsync();
}

public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>
BlazorWebAssemblyHost.CreateDefaultBuilder()
.UseBlazorStartup<Startup>();
}
}
19 changes: 0 additions & 19 deletions BlazorState.Wasm/Startup.cs

This file was deleted.

11 changes: 5 additions & 6 deletions BlazorState.WasmLocal/BlazorState.WasmLocal.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RazorLangVersion>3.0</RazorLangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview1.19508.20" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview1.19508.20" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview1.19508.20" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview1.19508.20" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.ProtectedBrowserStorage" Version="0.1.0-alpha.19521.1" />
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.2.0-preview1.20073.1" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.2.0-preview1.20073.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview1.20073.1" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.2.0-preview1.20073.1" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 8 additions & 6 deletions BlazorState.WasmLocal/Program.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
using Microsoft.AspNetCore.Blazor.Hosting;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using BlazorState.ViewModel;

namespace BlazorState.WasmLocal
{
public class Program
{
public static void Main(string[] args)
public static async Task Main(string[] args)
{
CreateHostBuilder(args).Build().Run();
var builder = WebAssemblyHostBuilder.CreateDefault();
builder.RootComponents.Add<App>("app");
builder.Services.AddSingleton<IHealthModel, HealthModel>();
await builder.Build().RunAsync();
}

public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>
BlazorWebAssemblyHost.CreateDefaultBuilder()
.UseBlazorStartup<Startup>();
}
}
19 changes: 0 additions & 19 deletions BlazorState.WasmLocal/Startup.cs

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RazorLangVersion>3.0</RazorLangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview1.19508.20" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview1.19508.20" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview1.19508.20" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview1.19508.20" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.2.0-preview1.20073.1" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.2.0-preview1.20073.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview1.20073.1" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.2.0-preview1.20073.1" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
24 changes: 17 additions & 7 deletions BlazorState.WasmRemote/Client/Program.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
using Microsoft.AspNetCore.Blazor.Hosting;
using BlazorState.Shared;
using BlazorState.ViewModel;
using Microsoft.AspNetCore.Blazor.Hosting;
using Microsoft.Extensions.DependencyInjection;
using System.Threading.Tasks;

namespace BlazorState.WasmRemote.Client
{
public class Program
{
public static void Main(string[] args)
public class StateServiceConfig : IStateServiceConfig
{
CreateHostBuilder(args).Build().Run();
public string Url => "http://localhost:49935/State";
}

public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>
BlazorWebAssemblyHost.CreateDefaultBuilder()
.UseBlazorStartup<Startup>();

public static async Task Main(string[] _)
{
var builder = WebAssemblyHostBuilder.CreateDefault();
builder.RootComponents.Add<App>("app");
builder.Services.AddSingleton<IHealthModel, HealthModel>();
builder.Services.AddSingleton<IStateServiceConfig, StateServiceConfig>();
builder.Services.AddSingleton<StateService, StateService>();
await builder.Build().RunAsync();
}
}
}
27 changes: 0 additions & 27 deletions BlazorState.WasmRemote/Client/Startup.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.1.0-preview1.19508.20" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.2.0-preview1.20073.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:49934/",
"applicationUrl": "http://localhost:49935/",
"sslPort": 0
}
},
Expand Down
4 changes: 2 additions & 2 deletions BlazorState.WasmRemote/Server/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
}

app.UseStaticFiles();
app.UseClientSideBlazorFiles<Client.Startup>();
app.UseClientSideBlazorFiles<Client.Program>();

app.UseRouting();

app.UseEndpoints(endpoints =>
{
endpoints.MapDefaultControllerRoute();
endpoints.MapFallbackToClientSideBlazor<Client.Startup>("index.html");
endpoints.MapFallbackToClientSideBlazor<Client.Program>("index.html");
});
}
}
Expand Down

0 comments on commit 8def4d4

Please sign in to comment.