Upgrade to preview 6

Blazored · Jun 13, 2019 · c4c6e6b · c4c6e6b
1 parent d2aab70
commit c4c6e6b
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 35 deletions.
diff --git a/samples/BlazorClientSide/App.razor b/samples/BlazorClientSide/App.razor
@@ -2,4 +2,8 @@
     Configuring this here is temporary. Later we'll move the app config
     into Program.cs, and it won't be necessary to specify AppAssembly.
 -->
-<Router AppAssembly=typeof(Program).Assembly />
+<Router AppAssembly=typeof(Program).Assembly>
+    <NotFoundContent>
+        Sorry, not found.
+    </NotFoundContent>
+</Router>
diff --git a/samples/BlazorClientSide/BlazorClientSide.csproj b/samples/BlazorClientSide/BlazorClientSide.csproj
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/BlazorClientSide/Pages/Index.razor b/samples/BlazorClientSide/Pages/Index.razor
@@ -14,21 +14,21 @@ Welcome to your new app.
     <div class="col-md-4">
         <h5>Add Item to local storage</h5>
         <div class="input-group">
-            <input class="form-control" type="text" placeholder="Enter a value" bind="@Name" />
+            <input class="form-control" type="text" placeholder="Enter a value" @bind="@Name" />
             <div class="input-group-append">
-                <button class="btn btn-primary" onclick="@SaveName">Save</button>
+                <button class="btn btn-primary" @onclick="@SaveName">Save</button>
             </div>
         </div>
     </div>
 
     <div class="col-md-4">
         <h5>Remove item from local storage</h5>
-        <button class="btn btn-primary" onclick=@RemoveName>Remove Item</button>
+        <button class="btn btn-primary" @onclick=@RemoveName>Remove Item</button>
     </div>
 
     <div class="col-md-4">
         <h5>Clear local storage</h5>
-        <button class="btn btn-primary" onclick=@ClearLocalStorage>Clear All</button>
+        <button class="btn btn-primary" @onclick=@ClearLocalStorage>Clear All</button>
     </div>
 </div>
 
@@ -45,7 +45,7 @@ Welcome to your new app.
     </div>
 </div>
 
-@functions {
+@code {
 
     string NameFromLocalStorage { get; set; }
     int ItemsInLocalStorage { get; set; }

diff --git a/samples/BlazorClientSide/Pages/Sync.razor b/samples/BlazorClientSide/Pages/Sync.razor
@@ -10,19 +10,19 @@
         <div class="input-group">
             <input class="form-control" type="text" placeholder="Enter a value" bind="@Name" />
             <div class="input-group-append">
-                <button class="btn btn-primary" onclick="@SaveName">Save</button>
+                <button class="btn btn-primary" @onclick="@SaveName">Save</button>
             </div>
         </div>
     </div>
 
     <div class="col-md-4">
         <h5>Remove item from local storage</h5>
-        <button class="btn btn-primary" onclick=@RemoveName>Remove Item</button>
+        <button class="btn btn-primary" @onclick=@RemoveName>Remove Item</button>
     </div>
 
     <div class="col-md-4">
         <h5>Clear local storage</h5>
-        <button class="btn btn-primary" onclick=@ClearLocalStorage>Clear All</button>
+        <button class="btn btn-primary" @onclick=@ClearLocalStorage>Clear All</button>
     </div>
 </div>
 
@@ -39,7 +39,7 @@
     </div>
 </div>
 
-@functions {
+@code {
 
     string NameFromLocalStorage { get; set; }
     int ItemsInLocalStorage { get; set; }

diff --git a/samples/BlazorClientSide/Shared/NavMenu.razor b/samples/BlazorClientSide/Shared/NavMenu.razor
@@ -1,11 +1,11 @@
 <div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="">Blazored LocalStorage</a>
-    <button class="navbar-toggler" onclick=@ToggleNavMenu>
+    <button class="navbar-toggler" @onclick=@ToggleNavMenu>
         <span class="navbar-toggler-icon"></span>
     </button>
 </div>
 
-<div class=@(collapseNavMenu ? "collapse" : null) onclick=@ToggleNavMenu>
+<div class=@(collapseNavMenu ? "collapse" : null) @onclick=@ToggleNavMenu>
     <ul class="nav flex-column">
         <li class="nav-item px-3">
             <NavLink class="nav-link" href="" Match=NavLinkMatch.All>
@@ -18,7 +18,7 @@
     </ul>
 </div>
 
-@functions {
+@code {
     bool collapseNavMenu = true;
 
     void ToggleNavMenu()

diff --git a/samples/BlazorClientSide/Shared/SurveyPrompt.razor b/samples/BlazorClientSide/Shared/SurveyPrompt.razor
@@ -9,7 +9,7 @@
     and tell us what you think.
 </div>
 
-@functions {
+@code {
     [Parameter]
     string Title { get; set; } // Demonstrates how a parent component can supply parameters
 }
diff --git a/samples/BlazorServerSide/App.razor b/samples/BlazorServerSide/App.razor
@@ -2,4 +2,8 @@
     The Router component displays whichever component has a @page
     directive matching the current URI.
 *@
-<Router AppAssembly="typeof(Startup).Assembly" />
+<Router AppAssembly="typeof(Startup).Assembly" >
+    <NotFoundContent>
+        Route Not Found.
+    </NotFoundContent>
+</Router>
diff --git a/samples/BlazorServerSide/Pages/Index.razor b/samples/BlazorServerSide/Pages/Index.razor
@@ -14,21 +14,21 @@ Welcome to your new app.
     <div class="col-md-4">
         <h5>Add Item to local storage</h5>
         <div class="input-group">
-            <input class="form-control" type="text" placeholder="Enter a value" bind="@Name" />
+            <input class="form-control" type="text" placeholder="Enter a value" @bind="@Name" />
             <div class="input-group-append">
-                <button class="btn btn-primary" onclick="@SaveName">Save</button>
+                <button class="btn btn-primary" @onclick="@SaveName">Save</button>
             </div>
         </div>
     </div>
 
     <div class="col-md-4">
         <h5>Remove item from local storage</h5>
-        <button class="btn btn-primary" onclick=@RemoveName>Remove Item</button>
+        <button class="btn btn-primary" @onclick=@RemoveName>Remove Item</button>
     </div>
 
     <div class="col-md-4">
         <h5>Clear local storage</h5>
-        <button class="btn btn-primary" onclick=@ClearLocalStorage>Clear All</button>
+        <button class="btn btn-primary" @onclick=@ClearLocalStorage>Clear All</button>
     </div>
 </div>
 
@@ -45,7 +45,7 @@ Welcome to your new app.
     </div>
 </div>
 
-@functions {
+@code {
 
     string NameFromLocalStorage { get; set; }
     int ItemsInLocalStorage { get; set; }

diff --git a/samples/BlazorServerSide/Shared/NavMenu.razor b/samples/BlazorServerSide/Shared/NavMenu.razor
@@ -1,11 +1,11 @@
 <div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="">Blazored LocalStorage</a>
-    <button class="navbar-toggler" onclick="@ToggleNavMenu">
+    <button class="navbar-toggler" @onclick="@ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>
     </button>
 </div>
 
-<div class="@NavMenuCssClass" onclick="@ToggleNavMenu">
+<div class="@NavMenuCssClass" @onclick="@ToggleNavMenu">
     <ul class="nav flex-column">
         <li class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
@@ -15,7 +15,7 @@
     </ul>
 </div>
 
-@functions {
+@code {
     bool collapseNavMenu = true;
 
     string NavMenuCssClass => collapseNavMenu ? "collapse" : null;

diff --git a/src/Blazored.LocalStorage/Blazored.LocalStorage.csproj b/src/Blazored.LocalStorage/Blazored.LocalStorage.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <OutputType>Library</OutputType>
     <IsPackable>true</IsPackable>
-    <BlazorLinkOnBuild>false</BlazorLinkOnBuild>
     <LangVersion>7.3</LangVersion>
+    <RazorLangVersion>3.0</RazorLangVersion>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <TypeScriptToolsVersion>3.2</TypeScriptToolsVersion>
 
     <PackageId>Blazored.LocalStorage</PackageId>
-    <Version>2.0.1</Version>
+    <Version>2.0.2</Version>
     <Authors>Chris Sainty</Authors>
     <Description>A library to provide access to local storage in Blazor applications</Description>
     <Copyright>Copyright 2018 (c) Chris Sainty. All rights reserved.</Copyright>
@@ -29,8 +29,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview4-19216-03" />
-    <PackageReference Include="Microsoft.TypeScript.MsBuild" Version="3.4.3">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview6.19307.2" />
+    <PackageReference Include="Microsoft.TypeScript.MsBuild" Version="3.5.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Blazored.LocalStorage/LocalStorageService.cs b/src/Blazored.LocalStorage/LocalStorageService.cs
@@ -1,5 +1,6 @@
 using Microsoft.JSInterop;
 using System;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace Blazored.LocalStorage
@@ -25,7 +26,7 @@ public async Task SetItemAsync(string key, object data)
             if (e.Cancel)
                 return;
 
-            await _jSRuntime.InvokeAsync<object>("Blazored.LocalStorage.SetItem", key, Json.Serialize(data));
+            await _jSRuntime.InvokeAsync<object>("Blazored.LocalStorage.SetItem", key, JsonSerializer.ToString(data));
 
             RaiseOnChanged(key, e.OldValue, data);
         }
@@ -40,7 +41,7 @@ public async Task<T> GetItemAsync<T>(string key)
             if (serialisedData == null)
                 return default(T);
 
-            return Json.Deserialize<T>(serialisedData);
+            return JsonSerializer.Parse<T>(serialisedData);
         }
 
         public async Task RemoveItemAsync(string key)
@@ -70,7 +71,7 @@ public void SetItem(string key, object data)
             if (e.Cancel)
                 return;
 
-            _jSInProcessRuntime.Invoke<object>("Blazored.LocalStorage.SetItem", key, Json.Serialize(data));
+            _jSInProcessRuntime.Invoke<object>("Blazored.LocalStorage.SetItem", key, JsonSerializer.ToString(data));
 
             RaiseOnChanged(key, e.OldValue, data);
         }
@@ -88,7 +89,7 @@ public T GetItem<T>(string key)
             if (serialisedData == null)
                 return default(T);
 
-            return Json.Deserialize<T>(serialisedData);
+            return JsonSerializer.Parse<T>(serialisedData);
         }
 
         public void RemoveItem(string key)