Fix hosting samples (#414)

CoryCharlton · web-flow · commit 0cb40b329bd8 · 2025-03-17T09:12:23.000+01:00
diff --git a/samples/Hosting/Logging/Program.cs b/samples/Hosting/Logging/Program.cs
@@ -3,8 +3,7 @@
 // See LICENSE file in the project root for full license information.
 //
 
-using nanoFramework.Hosting;
-
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace nanoFramework.Logging
@@ -15,8 +14,8 @@ public static void Main()
         {
             IHost host = CreateHostBuilder().Build();
             
-            host.Start();
-            host.Stop();
+            host.StartAsync();
+            host.StopAsync();
         }
 
         public static IHostBuilder CreateHostBuilder() =>
diff --git a/samples/Hosting/Logging/Services/LoggingServices.cs b/samples/Hosting/Logging/Services/LoggingServices.cs
@@ -3,8 +3,8 @@
 // See LICENSE file in the project root for full license information.
 //
 
-using nanoFramework.Hosting;
-
+using System.Threading;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace nanoFramework.Logging
@@ -20,7 +20,7 @@ public LoggingService(ILogger logger, ILoggerFactory loggerFactory)
             ServiceLogger = loggerFactory.CreateLogger(nameof(LoggingService));
         }
 
-        public void Start()
+        public void StartAsync(CancellationToken cancellationToken)
         {
             Logger.Log(LogLevel.Information, new EventId(10, "Start"), "Logging started", null);
 
@@ -41,7 +41,7 @@ public void Start()
             ServiceLogger.LogCritical("Critical");
         }
 
-        public void Stop()
+        public void StopAsync(CancellationToken cancellationToken)
         {
             Logger.Log(LogLevel.Information, new EventId(11, "Stop"), "Logging stopped", null);
         }
diff --git a/samples/Hosting/SensorQueue/Program.cs b/samples/Hosting/SensorQueue/Program.cs
@@ -4,7 +4,7 @@
 //
 
 using Microsoft.Extensions.DependencyInjection;
-using nanoFramework.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace Hosting
 {
diff --git a/samples/Hosting/SensorQueue/Services/DisplayService.cs b/samples/Hosting/SensorQueue/Services/DisplayService.cs
@@ -6,8 +6,7 @@
 using System;
 using System.Threading;
 using System.Diagnostics;
-
-using nanoFramework.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace Hosting
 {
@@ -20,11 +19,11 @@ public DisplayService(BackgroundQueue queue)
             _queue = queue;
         }
 
-        protected override void ExecuteAsync()
+        protected override void ExecuteAsync(CancellationToken stoppingToken)
         {
             Debug.WriteLine($"Service '{nameof(DisplayService)}' is now running in the background.");
 
-            while (!CancellationRequested)
+            while (!stoppingToken.IsCancellationRequested)
             {
                 try
                 {
diff --git a/samples/Hosting/SensorQueue/Services/MonitorService.cs b/samples/Hosting/SensorQueue/Services/MonitorService.cs
@@ -5,8 +5,8 @@
 
 using System;
 using System.Diagnostics;
-
-using nanoFramework.Hosting;
+using System.Threading;
+using Microsoft.Extensions.Hosting;
 
 namespace Hosting
 {
@@ -20,23 +20,23 @@ public MonitorService(BackgroundQueue queue)
             _queue = queue;
         }
 
-        public override void Start()
+        public virtual void StartAsync(CancellationToken cancellationToken)
         {
             Debug.WriteLine($"Service '{nameof(MonitorService)}' is now running in the background.");
 
-            base.Start();
+            base.StartAsync(cancellationToken);
         }
 
-        protected override void ExecuteAsync()
+        protected override void ExecuteAsync(CancellationToken stoppingToken)
         {
             Debug.WriteLine($"Queue Depth: {_queue.QueueCount}");
         }
 
-        public override void Stop()
+        public virtual void StopAsync(CancellationToken cancellationToken)
         {
             Debug.WriteLine($"Service '{nameof(MonitorService)}' is stopping.");
             
-            base.Stop();
+            base.StopAsync(cancellationToken);
         }
     }
 }
diff --git a/samples/Hosting/SensorQueue/Services/SensorService.cs b/samples/Hosting/SensorQueue/Services/SensorService.cs
@@ -6,8 +6,7 @@
 using System;
 using System.Threading;
 using System.Diagnostics;
-
-using nanoFramework.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace Hosting
 {
@@ -22,11 +21,11 @@ public SensorService(BackgroundQueue queue)
             _random = new Random();
         }
 
-        protected override void ExecuteAsync()
+        protected override void ExecuteAsync(CancellationToken stoppingToken)
         {
             Debug.WriteLine($"Service '{nameof(SensorService)}' is now running in the background.");
 
-            while (!CancellationRequested)
+            while (!stoppingToken.IsCancellationRequested)
             {
                 try
                 {
diff --git a/samples/Hosting/Simple/Program.cs b/samples/Hosting/Simple/Program.cs
@@ -8,7 +8,7 @@
 using System.Device.Gpio;
 using System.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
-using nanoFramework.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace Hosting
 {
@@ -26,9 +26,9 @@ public static void Main()
             IHost host = builder.Build();
 
             // blink for 5 seconds and then stop and dispose of host 
-            host.Start();
+            host.StartAsync();
             Thread.Sleep(5000);
-            host.Stop();
+            host.StopAsync();
             host.Dispose();
         }
     }
@@ -57,31 +57,31 @@ public LedHostedService(HardwareService hardware)
             _hardware = hardware;
         }
 
-        public override void Start()
+        public override void StartAsync(CancellationToken cancellationToken)
         {
             Debug.WriteLine("LED Hosted Service running.");
 
-            base.Start();
+            base.StartAsync(cancellationToken);
         }
 
-        protected override void ExecuteAsync()
+        protected override void ExecuteAsync(CancellationToken cancellationToken)
         {
             var ledPin = 16; 
 
             GpioPin led = _hardware.GpioController.OpenPin(ledPin, PinMode.Output);
 
-            while (!CancellationRequested)
+            while (!cancellationToken.IsCancellationRequested)
             {
                 led.Toggle();
                 Thread.Sleep(100);
             }
         }
 
-        public override void Stop()
+        public override void StopAsync(CancellationToken cancellationToken)
         {
             Debug.WriteLine("LED Hosted Service stopped.");
 
-            base.Stop();
+            base.StopAsync(cancellationToken);
         }
     }
 }
diff --git a/samples/Hosting/SlowBlink/Program.cs b/samples/Hosting/SlowBlink/Program.cs
@@ -4,7 +4,7 @@
 //
 
 using Microsoft.Extensions.DependencyInjection;
-using nanoFramework.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace Hosting
 {
diff --git a/samples/Hosting/SlowBlink/Services/LedService.cs b/samples/Hosting/SlowBlink/Services/LedService.cs
@@ -5,8 +5,7 @@
 
 using System.Threading;
 using System.Device.Gpio;
-
-using nanoFramework.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace Hosting
 {
@@ -19,13 +18,13 @@ public LedService(IHardwareService hardware)
             _hardware = hardware;
         }
 
-        protected override void ExecuteAsync()
+        protected override void ExecuteAsync(CancellationToken cancellationToken)
         {
             var ledPin = 16;
 
             GpioPin led = _hardware.GpioController.OpenPin(ledPin, PinMode.Output);
 
-            while (!CancellationRequested)
+            while (!cancellationToken.IsCancellationRequested)
             {
                 led.Toggle();
                 Thread.Sleep(1000);

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`// See LICENSE file in the project root for full license information.`
`4`	`4`	`//`
`5`	`5`
`6`		`-using nanoFramework.Hosting;`
`7`		`-`
	`6`	`+using System.Threading;`
	`7`	`+using Microsoft.Extensions.Hosting;`
`8`	`8`	`using Microsoft.Extensions.Logging;`
`9`	`9`
`10`	`10`	`namespace nanoFramework.Logging`
`@@ -20,7 +20,7 @@ public LoggingService(ILogger logger, ILoggerFactory loggerFactory)`
`20`	`20`	`ServiceLogger = loggerFactory.CreateLogger(nameof(LoggingService));`
`21`	`21`	`}`
`22`	`22`
`23`		`- public void Start()`
	`23`	`+ public void StartAsync(CancellationToken cancellationToken)`
`24`	`24`	`{`
`25`	`25`	`Logger.Log(LogLevel.Information, new EventId(10, "Start"), "Logging started", null);`
`26`	`26`
`@@ -41,7 +41,7 @@ public void Start()`
`41`	`41`	`ServiceLogger.LogCritical("Critical");`
`42`	`42`	`}`
`43`	`43`
`44`		`- public void Stop()`
	`44`	`+ public void StopAsync(CancellationToken cancellationToken)`
`45`	`45`	`{`
`46`	`46`	`Logger.Log(LogLevel.Information, new EventId(11, "Stop"), "Logging stopped", null);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`//`
`5`	`5`
`6`	`6`	`using Microsoft.Extensions.DependencyInjection;`
`7`		`-using nanoFramework.Hosting;`
	`7`	`+using Microsoft.Extensions.Hosting;`
`8`	`8`
`9`	`9`	`namespace Hosting`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@`
`6`	`6`	`using System;`
`7`	`7`	`using System.Threading;`
`8`	`8`	`using System.Diagnostics;`
`9`		`-`
`10`		`-using nanoFramework.Hosting;`
	`9`	`+using Microsoft.Extensions.Hosting;`
`11`	`10`
`12`	`11`	`namespace Hosting`
`13`	`12`	`{`
`@@ -20,11 +19,11 @@ public DisplayService(BackgroundQueue queue)`
`20`	`19`	`_queue = queue;`
`21`	`20`	`}`
`22`	`21`
`23`		`- protected override void ExecuteAsync()`
	`22`	`+ protected override void ExecuteAsync(CancellationToken stoppingToken)`
`24`	`23`	`{`
`25`	`24`	`Debug.WriteLine($"Service '{nameof(DisplayService)}' is now running in the background.");`
`26`	`25`
`27`		`- while (!CancellationRequested)`
	`26`	`+ while (!stoppingToken.IsCancellationRequested)`
`28`	`27`	`{`
`29`	`28`	`try`
`30`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`
`6`	`6`	`using System;`
`7`	`7`	`using System.Diagnostics;`
`8`		`-`
`9`		`-using nanoFramework.Hosting;`
	`8`	`+using System.Threading;`
	`9`	`+using Microsoft.Extensions.Hosting;`
`10`	`10`
`11`	`11`	`namespace Hosting`
`12`	`12`	`{`
`@@ -20,23 +20,23 @@ public MonitorService(BackgroundQueue queue)`
`20`	`20`	`_queue = queue;`
`21`	`21`	`}`
`22`	`22`
`23`		`- public override void Start()`
	`23`	`+ public virtual void StartAsync(CancellationToken cancellationToken)`
`24`	`24`	`{`
`25`	`25`	`Debug.WriteLine($"Service '{nameof(MonitorService)}' is now running in the background.");`
`26`	`26`
`27`		`- base.Start();`
	`27`	`+ base.StartAsync(cancellationToken);`
`28`	`28`	`}`
`29`	`29`
`30`		`- protected override void ExecuteAsync()`
	`30`	`+ protected override void ExecuteAsync(CancellationToken stoppingToken)`
`31`	`31`	`{`
`32`	`32`	`Debug.WriteLine($"Queue Depth: {_queue.QueueCount}");`
`33`	`33`	`}`
`34`	`34`
`35`		`- public override void Stop()`
	`35`	`+ public virtual void StopAsync(CancellationToken cancellationToken)`
`36`	`36`	`{`
`37`	`37`	`Debug.WriteLine($"Service '{nameof(MonitorService)}' is stopping.");`
`38`	`38`
`39`		`- base.Stop();`
	`39`	`+ base.StopAsync(cancellationToken);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using System.Device.Gpio;`
`9`	`9`	`using System.Diagnostics;`
`10`	`10`	`using Microsoft.Extensions.DependencyInjection;`
`11`		`-using nanoFramework.Hosting;`
	`11`	`+using Microsoft.Extensions.Hosting;`
`12`	`12`
`13`	`13`	`namespace Hosting`
`14`	`14`	`{`
`@@ -26,9 +26,9 @@ public static void Main()`
`26`	`26`	`IHost host = builder.Build();`
`27`	`27`
`28`	`28`	`// blink for 5 seconds and then stop and dispose of host`
`29`		`- host.Start();`
	`29`	`+ host.StartAsync();`
`30`	`30`	`Thread.Sleep(5000);`
`31`		`- host.Stop();`
	`31`	`+ host.StopAsync();`
`32`	`32`	`host.Dispose();`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -57,31 +57,31 @@ public LedHostedService(HardwareService hardware)`
`57`	`57`	`_hardware = hardware;`
`58`	`58`	`}`
`59`	`59`
`60`		`- public override void Start()`
	`60`	`+ public override void StartAsync(CancellationToken cancellationToken)`
`61`	`61`	`{`
`62`	`62`	`Debug.WriteLine("LED Hosted Service running.");`
`63`	`63`
`64`		`- base.Start();`
	`64`	`+ base.StartAsync(cancellationToken);`
`65`	`65`	`}`
`66`	`66`
`67`		`- protected override void ExecuteAsync()`
	`67`	`+ protected override void ExecuteAsync(CancellationToken cancellationToken)`
`68`	`68`	`{`
`69`	`69`	`var ledPin = 16;`
`70`	`70`
`71`	`71`	`GpioPin led = _hardware.GpioController.OpenPin(ledPin, PinMode.Output);`
`72`	`72`
`73`		`- while (!CancellationRequested)`
	`73`	`+ while (!cancellationToken.IsCancellationRequested)`
`74`	`74`	`{`
`75`	`75`	`led.Toggle();`
`76`	`76`	`Thread.Sleep(100);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`- public override void Stop()`
	`80`	`+ public override void StopAsync(CancellationToken cancellationToken)`
`81`	`81`	`{`
`82`	`82`	`Debug.WriteLine("LED Hosted Service stopped.");`
`83`	`83`
`84`		`- base.Stop();`
	`84`	`+ base.StopAsync(cancellationToken);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@`
`5`	`5`
`6`	`6`	`using System.Threading;`
`7`	`7`	`using System.Device.Gpio;`
`8`		`-`
`9`		`-using nanoFramework.Hosting;`
	`8`	`+using Microsoft.Extensions.Hosting;`
`10`	`9`
`11`	`10`	`namespace Hosting`
`12`	`11`	`{`
`@@ -19,13 +18,13 @@ public LedService(IHardwareService hardware)`
`19`	`18`	`_hardware = hardware;`
`20`	`19`	`}`
`21`	`20`
`22`		`- protected override void ExecuteAsync()`
	`21`	`+ protected override void ExecuteAsync(CancellationToken cancellationToken)`
`23`	`22`	`{`
`24`	`23`	`var ledPin = 16;`
`25`	`24`
`26`	`25`	`GpioPin led = _hardware.GpioController.OpenPin(ledPin, PinMode.Output);`
`27`	`26`
`28`		`- while (!CancellationRequested)`
	`27`	`+ while (!cancellationToken.IsCancellationRequested)`
`29`	`28`	`{`
`30`	`29`	`led.Toggle();`
`31`	`30`	`Thread.Sleep(1000);`