Add net8.0, drop 4.8, consolidate UI projects

Author: condron

.github/workflows/pr-checks.yml

@@ -48,45 +48,31 @@ jobs:
 
     strategy:
       matrix:
-        configuration: [Debug, Release]
-        dotnet-version: [ '4.8', '6.0.x' ]
-
-    runs-on: windows-latest  # For a list of available runner types, refer to
-                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
-
-    env:
-      Solution_Name: ReactiveDomain.sln
-
-    steps:
+        dotnet-version: [ '6.0', '8.0']
+        os: [windows-latest, ubuntu-latest]              
+             
+    runs-on: ${{ matrix.os }}       
+     
+    # Checkout
+    steps:    
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        fetch-depth: 0
-
-    # Install the .NET Core workload
+        fetch-depth: 0  
+    
+    # Install .NET Core
     - name: Install .NET ${{ matrix.dotnet-version }}
-      if: ${{ matrix.dotnet-version == '6.0.x' }}
+      if: ${{ matrix.os == 'ubuntu-latest' }}
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ matrix.dotnet-version }}
-
-    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
-    - name: Setup MSBuild.exe
-      uses: microsoft/setup-msbuild@v2
-
-    # Build all framework versions
-    - name: Build all
+    # Build
+    - name: Build
       working-directory: src
-      run: dotnet build $env:Solution_Name
+      run: dotnet build ReactiveDomain.sln -f net${{ matrix.dotnet-version }} -c Release
 
-    # Execute all unit tests in the solution
-    - name: Execute unit tests with .NET Framework
-      if: ${{ (matrix.dotnet-version == '4.8') && (matrix.configuration == 'Debug') }}
+    # Test
+    - name: Test     
       working-directory: src
-      run: dotnet test $env:Solution_Name -f net48 -p:ParallelizeTestCollections=false
+      run: dotnet test ReactiveDomain.sln -f net${{ matrix.dotnet-version }} -p:ParallelizeTestCollections=false -c Release  --no-build 
 
-    # Execute all unit tests in the solution
-    - name: Execute unit tests with .NET
-      if: ${{ (matrix.dotnet-version == '6.0.x') && (matrix.configuration == 'Debug') }}
-      working-directory: src
-      run: dotnet test $env:Solution_Name -f net6.0 -p:ParallelizeTestCollections=false

package.bat

@@ -4,5 +4,5 @@ del .\bld\pub\*.* /q
 dotnet restore .\src\ReactiveDomain.sln
 dotnet build .\src\ReactiveDomain.sln -c Debug
 dotnet publish .\src\ReactiveDomain.PolicyTool\ReactiveDomain.PolicyTool.csproj -p:PublishProfile=FolderProfile
-pwsh.exe -Command "& {.\tools\CreateDebugNuget.ps1 -md005}"
+pwsh.exe -Command "& {.\tools\CreateDebugNuget.ps1 -local002}"
 

publish.bat

@@ -4,5 +4,5 @@ del .\bld\pub\*.* /q
 dotnet restore .\src\ReactiveDomain.sln
 dotnet build .\src\ReactiveDomain.sln -c Release
 dotnet publish .\src\ReactiveDomain.PolicyTool\ReactiveDomain.PolicyTool.csproj -c Release -p:PublishProfile=FolderProfile
-powershell -Command "& {.\tools\CreateNuget.ps1}"
+pwsh.exe -Command "& {.\tools\CreateNuget.ps1}"
 

src/.nuget/NuGet.exe

@@ -8,6 +8,6 @@
   <ItemGroup>
     <InternalsVisibleTo Include="ReactiveDomain.Persistence" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
 </Project>

src/ReactiveDomain.Core/ReactiveDomain.Core.csproj

@@ -3,28 +3,30 @@
   <metadata>
     <id>ReactiveDomain</id>
     <version>0.10.5.0</version>
-    <authors>PerkinElmer,Linedata</authors>
+    <authors>Reactive Domain Group</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <description>Package includes all ReactiveDomain Core assemblies</description>
     <dependencies>
-      <group targetFramework="net48">
+      <group targetFramework="net8.0">
         <dependency id="EventStore.Client" version="21.2.2" exclude="Build,Analyzers" />
         <dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
-        <dependency id="Newtonsoft.Json" version="13.0.2" exclude="Build,Analyzers" />
-        <dependency id="System.Configuration.ConfigurationManager" version="7.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.Diagnostics.PerformanceCounter" version="5.0.1" exclude="Build,Analyzers" />
+        <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
+        <dependency id="System.Reactive" version="6.0.1" exclude="Build,Analyzers"/>
+        <dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
+        <dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="net6.0">
         <dependency id="EventStore.Client" version="21.2.2" exclude="Build,Analyzers" />
         <dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
-        <dependency id="Newtonsoft.Json" version="13.0.2" exclude="Build,Analyzers" />
-        <dependency id="System.Configuration.ConfigurationManager" version="7.0.0" exclude="Build,Analyzers" />
-        <dependency id="System.Diagnostics.PerformanceCounter" version="5.0.1" exclude="Build,Analyzers" />
+        <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
+        <dependency id="System.Reactive" version="6.0.1" exclude="Build,Analyzers"/>
+        <dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
+        <dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
     <references>
-      <group targetFramework="net48">
+      <group targetFramework="net8.0">
         <reference file="ReactiveDomain.Core.dll" />
         <reference file="ReactiveDomain.Foundation.dll" />
         <reference file="ReactiveDomain.Messaging.dll" />
@@ -42,23 +44,23 @@
   </metadata>
   <files>
     <file src="..\build\ReactiveDomain.props" target="build" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Core.pdb" target="lib\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Foundation.pdb" target="lib\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Messaging.pdb" target="lib\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Persistence.pdb" target="lib\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Transport.pdb" target="lib\net48" />
-
-    <file src="..\bld\Debug\net48\ReactiveDomain.Core.dll" target="lib\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Foundation.dll" target="lib\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Messaging.dll" target="lib\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Persistence.dll" target="lib\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Transport.dll" target="lib\net48" />
-
-    <file src="..\bld\Debug\net48\ReactiveDomain.Core.dll" target="ref\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Foundation.dll" target="ref\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Messaging.dll" target="ref\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Persistence.dll" target="ref\net48" />
-    <file src="..\bld\Debug\net48\ReactiveDomain.Transport.dll" target="ref\net48" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Core.pdb" target="lib\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Foundation.pdb" target="lib\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Messaging.pdb" target="lib\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Persistence.pdb" target="lib\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Transport.pdb" target="lib\net8.0" />
+                               
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Core.dll" target="lib\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Foundation.dll" target="lib\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Messaging.dll" target="lib\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Persistence.dll" target="lib\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Transport.dll" target="lib\net8.0" />
+                               
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Core.dll" target="ref\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Foundation.dll" target="ref\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Messaging.dll" target="ref\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Persistence.dll" target="ref\net8.0" />
+    <file src="..\bld\Debug\net8.0\ReactiveDomain.Transport.dll" target="ref\net8.0" />
 
     <file src="..\bld\Debug\net6.0\ReactiveDomain.Core.pdb" target="lib\net6.0" />
     <file src="..\bld\Debug\net6.0\ReactiveDomain.Foundation.pdb" target="lib\net6.0" />

src/ReactiveDomain.Debug.nuspec

@@ -15,13 +15,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.6.1">
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit.runner.console" Version="2.9.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

src/ReactiveDomain.Foundation.Tests/ReactiveDomain.Foundation.Tests.csproj

@@ -165,6 +165,8 @@ public void can_use_checkpoint_on_one_stream()
             AssertEx.IsOrBecomesTrue(() => Sum == 20);
             //add more messages
             AppendEvents(10, _conn, _stream1, 5);
+            AssertEx.AtLeastModelVersion(this, 3, TimeSpan.FromMilliseconds(200), msg: $"Expected 3 got {Version}");
+            AssertEx.AtLeastModelVersion(this, 8, TimeSpan.FromMilliseconds(100), msg: $"Expected 8 got {Version}");
             AssertEx.AtLeastModelVersion(this, 12, TimeSpan.FromMilliseconds(100), msg: $"Expected 12 got {Version}");
             AssertEx.IsOrBecomesTrue(() => Sum == 70);
             //confirm checkpoints

src/ReactiveDomain.Foundation.Tests/when_using_read_model_base.cs

@@ -9,6 +9,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Reactive" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ReactiveDomain.Messaging\ReactiveDomain.Messaging.csproj" />

src/ReactiveDomain.Foundation/ReactiveDomain.Foundation.csproj

@@ -3,7 +3,7 @@
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 
-namespace ReactiveDomain.UI
+namespace ReactiveDomain.Foundation
 {
     /// <summary>
     /// A wrapper for an observable provider, intended for use in transient read models.
@@ -47,7 +47,7 @@ public ReadModelProperty(T startValue, Action<Action> publishWrapper = null)
         /// the new value even if that value is the same as the previous value.</param>
         public void Update(T val, bool force = false)
         {
-            var noChange = (val != null && val.Equals(_lastValue)) || (val == null && _lastValue == null);
+            var noChange = val != null && val.Equals(_lastValue) || val == null && _lastValue == null;
             if (!force && noChange) return;
             _lastValue = val;
             var subscribed = _subscribed.ToArray();