streamline logging API (microsoft#377)

.github/workflows/test-coyote.yml

@@ -96,5 +96,5 @@ jobs:
           ./Samples/Scripts/build-tests.ps1 -local -nuget
         shell: pwsh
       - name: Test Coyote samples
-        run: dotnet ./Samples/Common/bin/net6.0/TestDriver.dll
+        run: ./Samples/Scripts/run-tests.ps1
         shell: pwsh

Samples/BoundedBuffer/Program.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Coyote.IO;
+using Microsoft.Coyote.Logging;
 using Microsoft.Coyote.Runtime;
 
 namespace Microsoft.Coyote.Samples.BoundedBuffer

Samples/Common/LogWriter.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using Microsoft.Coyote.IO;
+using Microsoft.Coyote.Logging;
 
 namespace Microsoft.Coyote.Samples.Common
 {

Samples/Scripts/build.ps1

@@ -30,23 +30,23 @@ if ($null -eq $sdk_version) {
 # Build the task-based samples.
 Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../AccountManager/AccountManager.sln" `
     -config $configuration -local $local.IsPresent -nuget $nuget.IsPresent
-Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../BoundedBuffer/BoundedBuffer.sln" `
+Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../BoundedBuffer/BoundedBuffer.csproj" `
     -config $configuration -local $local.IsPresent -nuget $nuget.IsPresent
-Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../CoffeeMachineTasks/CoffeeMachineTasks.sln" `
+Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../CoffeeMachineTasks/CoffeeMachineTasks.csproj" `
     -config $configuration -local $local.IsPresent -nuget $nuget.IsPresent
 
 # Build the actor samples.
-Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../HelloWorldActors/HelloWorldActors.sln" `
+Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../HelloWorldActors/HelloWorldActors.csproj" `
     -config $configuration -local $local.IsPresent -nuget $nuget.IsPresent
-Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../CoffeeMachineActors/CoffeeMachineActors.sln" `
+Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../CoffeeMachineActors/CoffeeMachineActors.csproj" `
     -config $configuration -local $local.IsPresent -nuget $nuget.IsPresent
-Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../DrinksServingRobotActors/DrinksServingRobotActors.sln" `
+Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../DrinksServingRobotActors/DrinksServingRobotActors.csproj" `
     -config $configuration -local $local.IsPresent -nuget $nuget.IsPresent
 Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../CloudMessaging/CloudMessaging.sln" `
     -config $configuration -local $local.IsPresent -nuget $nuget.IsPresent
-Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../Timers/Timers.sln" `
+Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../Timers/Timers.csproj" `
     -config $configuration -local $local.IsPresent -nuget $nuget.IsPresent
-Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../Monitors/Monitors.sln" `
+Invoke-DotnetBuild -dotnet $dotnet -solution "$PSScriptRoot/../Monitors/Monitors.csproj" `
     -config $configuration -local $local.IsPresent -nuget $nuget.IsPresent
 
 # Build the web app samples.

Samples/Scripts/run-tests.ps1

@@ -0,0 +1,20 @@
+param(
+    [string]$dotnet="dotnet"
+)
+
+Import-Module $PSScriptRoot/../../Scripts/common.psm1 -Force
+CheckPSVersion
+
+Write-Comment -prefix "." -text "Testing the Coyote samples" -color "yellow"
+
+$framework = "net6.0"
+$tests = "$PSScriptRoot/../Common/bin/$framework/TestDriver.dll"
+if (-not (Test-Path $tests)) {
+    Write-Error "tests for the Coyote samples not found."
+    exit
+}
+
+$error_msg = "Failed to test the Coyote samples"
+Invoke-ToolCommand -tool $dotnet -cmd $tests -error_msg $error_msg
+
+Write-Comment -prefix "." -text "Successfully tested the Coyote samples" -color "green"

Samples/WebApps/ImageGalleryAspNet/ImageGalleryService/Store/Cosmos/Providers/ClientProvider.cs

@@ -12,7 +12,7 @@ namespace ImageGallery.Store.Cosmos
     /// </summary>
     public class ClientProvider : IClientProvider, IDisposable
     {
-        private bool IsDsposed = false;
+        private bool IsDisposed = false;
 
         protected CosmosClient CosmosClient { get; }
 
@@ -47,7 +47,7 @@ public void Dispose()
 
         protected virtual void Dispose(bool disposing)
         {
-            if (this.IsDsposed)
+            if (this.IsDisposed)
             {
                 return;
             }
@@ -57,7 +57,7 @@ protected virtual void Dispose(bool disposing)
                 this.CosmosClient.Dispose();
             }
 
-            this.IsDsposed = true;
+            this.IsDisposed = true;
         }
     }
 }

Scripts/common.psm1

@@ -37,15 +37,16 @@ function Invoke-CoyoteTool([String]$cmd, [String]$dotnet, [String]$framework, [S
 function Invoke-DotnetBuild([String]$dotnet, [String]$solution, [String]$config, [bool]$local, [bool]$nuget) {
     Write-Comment -prefix "..." -text "Building $solution"
 
-    $nuget_config_file = "$PSScriptRoot/../NuGet.config"
     $platform = "/p:Platform=`"Any CPU`""
     $restore_command = "restore $solution"
     $build_command = "build -c $config $solution --no-restore"
     if ($local -and $nuget) {
-        $restore_command = "$restore_command --configfile $nuget_config_file $platform"
+        $nuget_config_file = "$PSScriptRoot/../NuGet.config"
+        $restore_command = "$restore_command --configfile $nuget_config_file /p:UseLocalNugetPackages=true $platform"
         $build_command = "$build_command /p:UseLocalNugetPackages=true $platform"
     } elseif ($local) {
-        $restore_command = "$restore_command --configfile $nuget_config_file $platform"
+        $nuget_config_file = "$PSScriptRoot/../Samples/NuGet.config"
+        $restore_command = "$restore_command --configfile $nuget_config_file /p:UseLocalCoyote=true $platform"
         $build_command = "$build_command /p:UseLocalCoyote=true $platform"
     }