Updates to work with Blazor 3.0.0-preview4

Author: DanielCarmingham

.vsts-ci.yml

@@ -4,10 +4,22 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
+
+  - task: DotNetCoreInstaller@0
+    inputs:
+      packageType: 'sdk'
+      version: '3.0.100-preview4-011223'
+
   - task: Npm@1
     inputs:
       command: 'install'
       workingDir: src/Blazor.Extensions.Logging.JS
+
+  - task: DotNetCoreCLI@2
+    inputs:
+      command: 'restore'
+      projects: '**/*.csproj'
+
   - task: DotNetCoreCLI@2
     inputs:
       command: 'build'

.vsts-release.yml

@@ -4,11 +4,22 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
+
+  - task: DotNetCoreInstaller@0
+    inputs:
+      packageType: 'sdk'
+      version: '3.0.100-preview4-011223'
+
   - task: Npm@1
     inputs:
       command: 'install'
       workingDir: src/Blazor.Extensions.Logging.JS
 
+  - task: DotNetCoreCLI@2
+    inputs:
+      command: 'restore'
+      projects: '**/*.csproj'
+
   - task: DotNetCoreCLI@2
     inputs:
       command: 'build'

src/Blazor.Extensions.Logging.JS/Blazor.Extensions.Logging.JS.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.7.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview4-19216-03" PrivateAssets="all" />
     <WebpackInputs Include="**\*.ts" Exclude="dist\**;node_modules\**" />
   </ItemGroup>
 

src/Blazor.Extensions.Logging.JS/package-lock.json

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <Title>Blazor Extensions Logging</Title>
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.7.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview4-19216-03" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0-preview4.19216.2" />
   </ItemGroup>
 
   <ItemGroup>

src/Blazor.Extensions.Logging/Blazor.Extensions.Logging.csproj

@@ -1,27 +1,29 @@
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions.Internal;
 using Microsoft.JSInterop;
 using System;
 
 namespace Blazor.Extensions.Logging
 {
     internal class BrowserConsoleLogger : ILogger
     {
+
 #if !DESKTOP_BUILD
         private const string LoggerFunctionName = "BlazorExtensions.Logging.BrowserConsoleLogger.Log";
 #endif
 
+        private readonly IJSRuntime runtime;
         private Func<string, LogLevel, bool> filter;
 
-        public BrowserConsoleLogger(string name, Func<string, LogLevel, bool> filter)
+        public BrowserConsoleLogger(IJSRuntime runtime, string name, Func<string, LogLevel, bool> filter)
         {
+            this.runtime = runtime;
             this.filter = filter ?? ((category, logLevel) => true);
             this.Name = name ?? throw new ArgumentNullException(nameof(name));
         }
 
-        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+        public async void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
         {
-            if (!IsEnabled(logLevel))
+            if (!this.IsEnabled(logLevel))
             {
                 return;
             }
@@ -39,9 +41,9 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
 
                 message = internalFormatter.ToString();
             }
-            
+
 #if !DESKTOP_BUILD
-            ((IJSInProcessRuntime)JSRuntime.Current).Invoke<object>(LoggerFunctionName, message);
+            await this.runtime.InvokeAsync<object>(LoggerFunctionName, message);
 #else
             Console.WriteLine(message);
 #endif
@@ -68,6 +70,6 @@ public Func<string, LogLevel, bool> Filter
 
         public string Name { get; }
 
-        public IDisposable BeginScope<TState>(TState state) => NullScope.Instance;
+        public IDisposable BeginScope<TState>(TState state) => null;
     }
 }