Upgrade to Blazor 0.8.0

Blazored · Feb 9, 2019 · 7a44a88 · 7a44a88
1 parent f617105
commit 7a44a88
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 139 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,24 +11,24 @@ steps:
 - task: DotNetCoreInstaller@0
   displayName: 'Installing .NET Core SDK...'
   inputs:
-    version: 2.2.100
+    version: 3.0.100-preview-010184
 
 - task: NuGetToolInstaller@0
   displayName: 'Installing Nuget Tools...'
   inputs:
     versionSpec: '4.9.2'
 
+- script: dotnet build --configuration $(buildConfiguration) src/Blazored.Toast/Blazored.Toast.csproj
+  displayName: 'Building $(buildConfiguration)...'
+
 - task: DotNetCoreCLI@2
   displayName: 'Generating Nuget Package... '
   inputs:
     command: pack
+
+    arguments: --no-build
     packagesToPack: src/Blazored.Toast/Blazored.Toast.csproj
     configuration: $(buildConfiguration)
-    verbosityPack: Detailed
 
-- task: NuGetCommand@2
-  displayName: 'Publishing to Nuget...'
-  inputs:
-    command: push
-    nuGetFeedType: external
-    publishFeedCredentials: 'Nuget'
+- task: PublishBuildArtifacts@1
+  displayName: 'Publishing Build Artifacts...'
diff --git a/samples/BlazorSample/BlazorSample.csproj b/samples/BlazorSample/BlazorSample.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.7.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.7.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="0.8.0-preview-19104-04" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.8.0-preview-19104-04" PrivateAssets="all" />
 
-    <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.7.0" />
+    <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.8.0-preview-19104-04" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/BlazorSample/Pages/Counter.cshtml b/samples/BlazorSample/Pages/Counter.cshtml
diff --git a/samples/BlazorSample/Pages/FetchData.cshtml b/samples/BlazorSample/Pages/FetchData.cshtml
diff --git a/samples/BlazorSample/Shared/MainLayout.cshtml b/samples/BlazorSample/Shared/MainLayout.cshtml
@@ -1,4 +1,4 @@
-@inherits BlazorLayoutComponent
+@inherits LayoutComponentBase
 
 <BlazoredToasts />
 

diff --git a/samples/BlazorSample/Shared/NavMenu.cshtml b/samples/BlazorSample/Shared/NavMenu.cshtml
@@ -1,5 +1,5 @@
 <div class="top-row pl-4 navbar navbar-dark">
-    <a class="navbar-brand" href="">BlazorSample</a>
+    <a class="navbar-brand" href="">Blazored Toast</a>
     <button class="navbar-toggler" onclick=@ToggleNavMenu>
         <span class="navbar-toggler-icon"></span>
     </button>
@@ -12,16 +12,6 @@
                 <span class="oi oi-home" aria-hidden="true"></span> Home
             </NavLink>
         </li>
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="counter">
-                <span class="oi oi-plus" aria-hidden="true"></span> Counter
-            </NavLink>
-        </li>
-        <li class="nav-item px-3">
-            <NavLink class="nav-link" href="fetchdata">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
-            </NavLink>
-        </li>
     </ul>
 </div>
 

diff --git a/samples/BlazorSample/Startup.cs b/samples/BlazorSample/Startup.cs
@@ -1,12 +1,12 @@
 using Blazored.Toast;
-using Microsoft.AspNetCore.Blazor.Builder;
+using Microsoft.AspNetCore.Components.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace BlazorSample
 {
     public class Startup
     {
-        public void Configure(IBlazorApplicationBuilder app)
+        public void Configure(IComponentsApplicationBuilder app)
         {
             app.AddComponent<App>("app");
         }

diff --git a/samples/BlazorSample/_ViewImports.cshtml b/samples/BlazorSample/_ViewImports.cshtml
@@ -1,6 +1,6 @@
 @using System.Net.Http
-@using Microsoft.AspNetCore.Blazor.Layouts
-@using Microsoft.AspNetCore.Blazor.Routing
+@using Microsoft.AspNetCore.Components.Layouts
+@using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
 @using BlazorSample
 @using BlazorSample.Shared

diff --git a/samples/BlazorSample/wwwroot/index.html b/samples/BlazorSample/wwwroot/index.html
@@ -1,16 +1,16 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width">
-    <title>BlazorSample</title>
+    <title>Blazored Toast</title>
     <base href="/" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <link href="css/site.css" rel="stylesheet" />
 </head>
 <body>
     <app>Loading...</app>
 
-    <script src="_framework/blazor.webassembly.js"></script>
+    <script src="_framework/components.webassembly.js"></script>
 </body>
 </html>
diff --git a/samples/BlazorSample/wwwroot/sample-data/weather.json b/samples/BlazorSample/wwwroot/sample-data/weather.json
diff --git a/src/Blazored.Toast/Blazored.Toast.csproj b/src/Blazored.Toast/Blazored.Toast.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -17,7 +17,7 @@
     <PackageTags>Blazored Blazor Razor Components Toast Popup Notification</PackageTags>
     <Description>A JavaScript free Toast library for Blazor and Razor Components applications.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,8 +28,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.7.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.7.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview-19075-0444" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Build" Version="3.0.0-preview-19075-0444" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Blazored.Toast/BlazoredToast.cshtml.cs b/src/Blazored.Toast/BlazoredToast.cshtml.cs
@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Blazor.Components;
+using Microsoft.AspNetCore.Components;
 using System;
 
 namespace Blazored.Toast
 {
-    public class BlazoredToastBase : BlazorComponent
+    public class BlazoredToastBase : ComponentBase
     {
         [Parameter] protected Guid ToastId { get; set; }
         [Parameter] protected ToastSettings ToastSettings { get; set; }

diff --git a/src/Blazored.Toast/BlazoredToasts.cshtml.cs b/src/Blazored.Toast/BlazoredToasts.cshtml.cs
@@ -1,13 +1,12 @@
 using Blazored.Toast.Services;
-using Microsoft.AspNetCore.Blazor;
-using Microsoft.AspNetCore.Blazor.Components;
+using Microsoft.AspNetCore.Components;
 using System;
 using System.Collections.Generic;
 using System.Timers;
 
 namespace Blazored.Toast
 {
-    public class BlazoredToastsBase : BlazorComponent
+    public class BlazoredToastsBase : ComponentBase
     {
         protected Dictionary<Guid, RenderFragment> ToastList { get; set; } = new Dictionary<Guid, RenderFragment>();
         [Inject] private IToastService ToastService { get; set; }

diff --git a/src/Blazored.Toast/content/styles.css b/src/Blazored.Toast/content/styles.css
@@ -17,6 +17,7 @@
     width: 30rem;
     border-radius: .25rem;
     font-family: monospace;
+    box-shadow: rgba(0,0,0,0.25) 0px 10px 40px;
 }
 
 .toast-info {