diff --git a/3.1/BlazorSample_Server/TimerService.cs b/3.1/BlazorSample_Server/TimerService.cs
index 39f1f967..684b6f84 100644
--- a/3.1/BlazorSample_Server/TimerService.cs
+++ b/3.1/BlazorSample_Server/TimerService.cs
@@ -32,7 +32,7 @@ private async void HandleTimer(object source, ElapsedEventArgs e)
     {
         elapsedCount += 1;
         await notifier.Update("elapsedCount", elapsedCount);
-        logger.LogInformation($"elapsedCount: {elapsedCount}");
+        logger.LogInformation("elapsedCount: {ElapsedCount}", elapsedCount);
     }
 
     public void Dispose()
diff --git a/3.1/BlazorSample_WebAssembly/TimerService.cs b/3.1/BlazorSample_WebAssembly/TimerService.cs
index 39f1f967..684b6f84 100644
--- a/3.1/BlazorSample_WebAssembly/TimerService.cs
+++ b/3.1/BlazorSample_WebAssembly/TimerService.cs
@@ -32,7 +32,7 @@ private async void HandleTimer(object source, ElapsedEventArgs e)
     {
         elapsedCount += 1;
         await notifier.Update("elapsedCount", elapsedCount);
-        logger.LogInformation($"elapsedCount: {elapsedCount}");
+        logger.LogInformation("elapsedCount: {ElapsedCount}", elapsedCount);
     }
 
     public void Dispose()
diff --git a/5.0/BlazorSample_Server/TimerService.cs b/5.0/BlazorSample_Server/TimerService.cs
index 5f4920e5..4453fa7e 100644
--- a/5.0/BlazorSample_Server/TimerService.cs
+++ b/5.0/BlazorSample_Server/TimerService.cs
@@ -32,7 +32,7 @@ private async void HandleTimer(object source, ElapsedEventArgs e)
     {
         elapsedCount += 1;
         await notifier.Update("elapsedCount", elapsedCount);
-        logger.LogInformation($"elapsedCount: {elapsedCount}");
+        logger.LogInformation("elapsedCount: {ElapsedCount}", elapsedCount);
     }
 
     public void Dispose()
diff --git a/5.0/BlazorSample_WebAssembly/TimerService.cs b/5.0/BlazorSample_WebAssembly/TimerService.cs
index 5f4920e5..4453fa7e 100644
--- a/5.0/BlazorSample_WebAssembly/TimerService.cs
+++ b/5.0/BlazorSample_WebAssembly/TimerService.cs
@@ -32,7 +32,7 @@ private async void HandleTimer(object source, ElapsedEventArgs e)
     {
         elapsedCount += 1;
         await notifier.Update("elapsedCount", elapsedCount);
-        logger.LogInformation($"elapsedCount: {elapsedCount}");
+        logger.LogInformation("elapsedCount: {ElapsedCount}", elapsedCount);
     }
 
     public void Dispose()
diff --git a/6.0/BlazorSample_Server/TimerService.cs b/6.0/BlazorSample_Server/TimerService.cs
index dfc9d195..9a8786e9 100644
--- a/6.0/BlazorSample_Server/TimerService.cs
+++ b/6.0/BlazorSample_Server/TimerService.cs
@@ -26,7 +26,7 @@ public async Task Start()
                 {
                     elapsedCount += 1;
                     await notifier.Update("elapsedCount", elapsedCount);
-                    logger.LogInformation($"elapsedCount: {elapsedCount}");
+                    logger.LogInformation("elapsedCount: {ElapsedCount}", elapsedCount);
                 }
             }
         }
diff --git a/6.0/BlazorSample_WebAssembly/TimerService.cs b/6.0/BlazorSample_WebAssembly/TimerService.cs
index dfc9d195..9a8786e9 100644
--- a/6.0/BlazorSample_WebAssembly/TimerService.cs
+++ b/6.0/BlazorSample_WebAssembly/TimerService.cs
@@ -26,7 +26,7 @@ public async Task Start()
                 {
                     elapsedCount += 1;
                     await notifier.Update("elapsedCount", elapsedCount);
-                    logger.LogInformation($"elapsedCount: {elapsedCount}");
+                    logger.LogInformation("elapsedCount: {ElapsedCount}", elapsedCount);
                 }
             }
         }
diff --git a/7.0/BlazorSample_Server/TimerService.cs b/7.0/BlazorSample_Server/TimerService.cs
index dfc9d195..9a8786e9 100644
--- a/7.0/BlazorSample_Server/TimerService.cs
+++ b/7.0/BlazorSample_Server/TimerService.cs
@@ -26,7 +26,7 @@ public async Task Start()
                 {
                     elapsedCount += 1;
                     await notifier.Update("elapsedCount", elapsedCount);
-                    logger.LogInformation($"elapsedCount: {elapsedCount}");
+                    logger.LogInformation("elapsedCount: {ElapsedCount}", elapsedCount);
                 }
             }
         }
diff --git a/7.0/BlazorSample_WebAssembly/TimerService.cs b/7.0/BlazorSample_WebAssembly/TimerService.cs
index dfc9d195..9a8786e9 100644
--- a/7.0/BlazorSample_WebAssembly/TimerService.cs
+++ b/7.0/BlazorSample_WebAssembly/TimerService.cs
@@ -26,7 +26,7 @@ public async Task Start()
                 {
                     elapsedCount += 1;
                     await notifier.Update("elapsedCount", elapsedCount);
-                    logger.LogInformation($"elapsedCount: {elapsedCount}");
+                    logger.LogInformation("elapsedCount: {ElapsedCount}", elapsedCount);
                 }
             }
         }
diff --git a/8.0/BlazorSample_BlazorWebApp/Components/ListItem2.razor b/8.0/BlazorSample_BlazorWebApp/Components/ListItem2.razor
index 4df38869..999e9fd3 100644
--- a/8.0/BlazorSample_BlazorWebApp/Components/ListItem2.razor
+++ b/8.0/BlazorSample_BlazorWebApp/Components/ListItem2.razor
@@ -31,7 +31,7 @@
         }
     }
 
-    public async void CallJSToInvokeDotnet()
+    public async Task CallJSToInvokeDotnet()
     {
         if (module is not null)
         {
diff --git a/8.0/BlazorSample_WebAssembly/Shared/ListItem2.razor b/8.0/BlazorSample_WebAssembly/Shared/ListItem2.razor
index 57f0dfdb..c35f82ef 100644
--- a/8.0/BlazorSample_WebAssembly/Shared/ListItem2.razor
+++ b/8.0/BlazorSample_WebAssembly/Shared/ListItem2.razor
@@ -31,7 +31,7 @@
         }
     }
 
-    public async void CallJSToInvokeDotnet()
+    public async Task CallJSToInvokeDotnet()
     {
         if (module is not null)
         {
diff --git a/9.0/BlazorSample_BlazorWebApp/Components/ListItem2.razor b/9.0/BlazorSample_BlazorWebApp/Components/ListItem2.razor
index 4df38869..999e9fd3 100644
--- a/9.0/BlazorSample_BlazorWebApp/Components/ListItem2.razor
+++ b/9.0/BlazorSample_BlazorWebApp/Components/ListItem2.razor
@@ -31,7 +31,7 @@
         }
     }
 
-    public async void CallJSToInvokeDotnet()
+    public async Task CallJSToInvokeDotnet()
     {
         if (module is not null)
         {
diff --git a/9.0/BlazorSample_WebAssembly/Shared/ListItem2.razor b/9.0/BlazorSample_WebAssembly/Shared/ListItem2.razor
index 57f0dfdb..c35f82ef 100644
--- a/9.0/BlazorSample_WebAssembly/Shared/ListItem2.razor
+++ b/9.0/BlazorSample_WebAssembly/Shared/ListItem2.razor
@@ -31,7 +31,7 @@
         }
     }
 
-    public async void CallJSToInvokeDotnet()
+    public async Task CallJSToInvokeDotnet()
     {
         if (module is not null)
         {