Merge pull request #74 from TRUMPF-IoT/7.0.1-prepare

C-DEngine update and shutdown exception fix.

Author: berndbr

Directory.Packages.props

@@ -9,7 +9,7 @@ SPDX-License-Identifier: MPL-2.0
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="C-DEngine" Version="5.171.1" />
+    <PackageVersion Include="C-DEngine" Version="5.171.2" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
     <PackageVersion Include="LiteDB" Version="5.0.17" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
@@ -31,8 +31,8 @@ SPDX-License-Identifier: MPL-2.0
     <PackageVersion Include="System.Data.SQLite.Core" Version="1.0.118" />
     <PackageVersion Include="System.IO.Abstractions" Version="19.2.87" />
     <PackageVersion Include="System.Text.Json" Version="8.0.0" />
-    <PackageVersion Include="xunit" Version="2.6.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageVersion Include="xunit" Version="2.6.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
   </ItemGroup>
   <ItemGroup>
     <GlobalPackageReference Include="MinVer" Version="4.3.0">

README.md

@@ -2,7 +2,7 @@
 
 ![License](https://img.shields.io/github/license/trumpf-iot/saf)
 ![Nuget](https://img.shields.io/nuget/v/SAF.Common)
-![.NET Core](https://github.com/TRUMPF-IoT/saf/workflows/.NET%20Core/badge.svg)
+![.NET Core](https://github.com/trumpf-iot/saf/actions/workflows/dotnet-core.yml/badge.svg?branch=master)
 
 The Smart Application Framework (SAF) is an open-source and cross-plattform framework for building distributed applications across cloud and edge. It allows developers to build resilient, stateless and stateful plug-ins that run on cloud and edge.
 

src/Hosting/SAF.Hosting.Tests/ServiceHostTests.cs

@@ -49,30 +49,6 @@ public async Task StartsAndStopsLoadedServices(bool asyncService)
         Assert.Equal(0, callCounters.KillCalled);
     }
 
-    [Theory]
-    [InlineData(false)]
-    [InlineData(true)]
-    public async Task StopsLoadedServicesOnDispose(bool asyncService)
-    {
-        // Arrange
-        var callCounters = new CallCounters();
-        using (var sut = SetupServiceHostWithCallCountersService(callCounters, asyncService))
-        {
-            // Act
-            await sut.StartAsync(CancellationToken.None);
-
-            // Assert
-            Assert.Equal(1, callCounters.StartCalled);
-            Assert.Equal(0, callCounters.StopCalled);
-            Assert.Equal(0, callCounters.KillCalled);
-        }
-
-        // Assert
-        Assert.Equal(1, callCounters.StartCalled);
-        Assert.Equal(1, callCounters.StopCalled);
-        Assert.Equal(0, callCounters.KillCalled);
-    }
-
     [Theory]
     [InlineData(false)]
     [InlineData(true)]

src/Hosting/SAF.Hosting/ServiceHost.cs

@@ -66,21 +66,6 @@ public Task StartAsync(CancellationToken cancellationToken)
             }
         }, cancellationToken);
 
-    private async Task StartInternalAsync(CancellationToken token)
-    {
-        var stopWatch = new Stopwatch();
-        stopWatch.Start();
-
-        InitializeServices();
-        AddRuntimeMessageHandlersToDispatcher();
-
-        await StartServicesAsync(_services, token);
-
-        stopWatch.Stop();
-
-        _log.LogInformation($"Starting all services took {stopWatch.Elapsed.TotalMilliseconds * 1000000:N0} ns");
-    }
-
     public async Task StopAsync(CancellationToken cancellationToken)
     {
         if (_services.Count == 0)
@@ -115,7 +100,22 @@ public async Task StopAsync(CancellationToken cancellationToken)
 
     public void Dispose()
     {
-        StopAsync(CancellationToken.None).Wait();
+        // intentionally left blank
+    }
+
+    private async Task StartInternalAsync(CancellationToken token)
+    {
+        var stopWatch = new Stopwatch();
+        stopWatch.Start();
+
+        InitializeServices();
+        AddRuntimeMessageHandlersToDispatcher();
+
+        await StartServicesAsync(_services, token);
+
+        stopWatch.Stop();
+
+        _log.LogInformation($"Starting all services took {stopWatch.Elapsed.TotalMilliseconds * 1000000:N0} ns");
     }
 
     private async Task StartServicesAsync(IEnumerable<IHostedServiceBase> services, CancellationToken cancelToken)