Skip to content

Commit 4c8cb74

Browse files
mkArtakMSFTmkArtakMSFT
authored
Merge pull request #310 from dotnet-presentations/release/5.0
Merge release/5.0 to master
2 parents 49aa724 + a186591 commit 4c8cb74

File tree

84 files changed

+181
-193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+181
-193
lines changed

‎Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<AspNetCoreVersion>3.1.4</AspNetCoreVersion>
4-
<BlazorVersion>3.2.0</BlazorVersion>
5-
<EntityFrameworkVersion>3.1.4</EntityFrameworkVersion>
6-
<SystemNetHttpJsonVersion>3.2.0</SystemNetHttpJsonVersion>
3+
<AspNetCoreVersion>5.0.0</AspNetCoreVersion>
4+
<BlazorVersion>5.0.0</BlazorVersion>
5+
<EntityFrameworkVersion>5.0.0</EntityFrameworkVersion>
6+
<SystemNetHttpJsonVersion>5.0.0</SystemNetHttpJsonVersion>
77
</PropertyGroup>
88
</Project>

‎docs/04-refactor-state-management.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Create a new class called `OrderState` in the Client Project root directory - an
1818
public static async Task Main(string[] args)
1919
{
2020
var builder = WebAssemblyHostBuilder.CreateDefault(args);
21-
builder.RootComponents.Add<App>("app");
21+
builder.RootComponents.Add<App>("#app");
2222

2323
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
2424
builder.Services.AddScoped<OrderState>();

‎docs/06-authentication-and-authorization.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ To enable the authentication services, add a call to `AddApiAuthorization` in *P
4949
public static async Task Main(string[] args)
5050
{
5151
var builder = WebAssemblyHostBuilder.CreateDefault(args);
52-
builder.RootComponents.Add<App>("app");
52+
builder.RootComponents.Add<App>("#app");
5353

5454
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
5555
builder.Services.AddScoped<OrderState>();
@@ -68,8 +68,8 @@ The added services will be configured by default to use an identity provider on
6868
```csharp
6969
public void ConfigureServices(IServiceCollection services)
7070
{
71-
services.AddMvc()
72-
.AddNewtonsoftJson();
71+
services.AddControllersWithViews();
72+
services.AddRazorPages();
7373

7474
services.AddDbContext<PizzaStoreContext>(options =>
7575
options.UseSqlite("Data Source=pizza.db"));

‎save-points/00-get-started/BlazingPizza.Client/BlazingPizza.Client.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
5-
<LangVersion>7.3</LangVersion>
6-
<RazorLangVersion>3.0</RazorLangVersion>
4+
<TargetFramework>net5.0</TargetFramework>
75
</PropertyGroup>
86

97
<ItemGroup>
108
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
119
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
1310
<PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
1411
<PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
1512
</ItemGroup>

‎save-points/00-get-started/BlazingPizza.Client/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class Program
1111
public static async Task Main(string[] args)
1212
{
1313
var builder = WebAssemblyHostBuilder.CreateDefault(args);
14-
builder.RootComponents.Add<App>("app");
14+
builder.RootComponents.Add<App>("#app");
1515

1616
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
1717

‎save-points/00-get-started/BlazingPizza.Client/wwwroot/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<title>Blazing Pizza</title>
1212
</head>
1313
<body>
14-
<app>
14+
<div id="app">
1515
<div class="loading-bar"></div>
16-
</app>
16+
</div>
1717

1818
<div id="blazor-error-ui">
1919
An unhandled error has occurred.

‎save-points/00-get-started/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
5-
<RazorLangVersion>3.0</RazorLangVersion>
4+
<TargetFramework>net5.0</TargetFramework>
65
</PropertyGroup>
76

87
<ItemGroup>
98
<PackageReference Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
109
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
1110
</ItemGroup>
11+
12+
<ItemGroup>
13+
<SupportedPlatform Include="browser" />
14+
</ItemGroup>
15+
1216
</Project>

‎save-points/00-get-started/BlazingPizza.Server/BlazingPizza.Server.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
<LangVersion>7.3</LangVersion>
4+
<TargetFramework>net5.0</TargetFramework>
65
</PropertyGroup>
76

87
<ItemGroup>

‎save-points/00-get-started/BlazingPizza.Server/Startup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public Startup(IConfiguration configuration)
1919

2020
public void ConfigureServices(IServiceCollection services)
2121
{
22-
services.AddMvc()
23-
.AddNewtonsoftJson();
22+
services.AddControllersWithViews();
23+
services.AddRazorPages();
2424

2525
services.AddDbContext<PizzaStoreContext>(options =>
2626
options.UseSqlite("Data Source=pizza.db"));

‎save-points/00-get-started/BlazingPizza.Shared/BlazingPizza.Shared.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
5-
<LangVersion>7.3</LangVersion>
4+
<TargetFramework>net5.0</TargetFramework>
65
<RootNamespace>BlazingPizza</RootNamespace>
76
</PropertyGroup>
87

0 commit comments

Comments
 (0)