Skip to content

Commit a1f7805

Browse files
condronjoshkempner
condron
authored and
joshkempner
committed
Add net8.0, drop 4.8, consolidate UI projects
1 parent 9990ee9 commit a1f7805

File tree

59 files changed

+633
-1726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+633
-1726
lines changed

‎.github/workflows/pr-checks.yml‎

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -48,45 +48,31 @@ jobs:
4848

4949
strategy:
5050
matrix:
51-
configuration: [Debug, Release]
52-
dotnet-version: [ '4.8', '6.0.x' ]
53-
54-
runs-on: windows-latest # For a list of available runner types, refer to
55-
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
56-
57-
env:
58-
Solution_Name: ReactiveDomain.sln
59-
60-
steps:
51+
dotnet-version: [ '6.0', '8.0']
52+
os: [windows-latest, ubuntu-latest]
53+
54+
runs-on: ${{ matrix.os }}
55+
56+
# Checkout
57+
steps:
6158
- name: Checkout
6259
uses: actions/checkout@v4
6360
with:
64-
fetch-depth: 0
65-
66-
# Install the .NET Core workload
61+
fetch-depth: 0
62+
63+
# Install .NET Core
6764
- name: Install .NET ${{ matrix.dotnet-version }}
68-
if: ${{ matrix.dotnet-version == '6.0.x' }}
65+
if: ${{ matrix.os == 'ubuntu-latest' }}
6966
uses: actions/setup-dotnet@v4
7067
with:
7168
dotnet-version: ${{ matrix.dotnet-version }}
72-
73-
# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
74-
- name: Setup MSBuild.exe
75-
uses: microsoft/setup-msbuild@v2
76-
77-
# Build all framework versions
78-
- name: Build all
69+
# Build
70+
- name: Build
7971
working-directory: src
80-
run: dotnet build $env:Solution_Name
72+
run: dotnet build ReactiveDomain.sln -f net${{ matrix.dotnet-version }} -c Release
8173

82-
# Execute all unit tests in the solution
83-
- name: Execute unit tests with .NET Framework
84-
if: ${{ (matrix.dotnet-version == '4.8') && (matrix.configuration == 'Debug') }}
74+
# Test
75+
- name: Test
8576
working-directory: src
86-
run: dotnet test $env:Solution_Name -f net48 -p:ParallelizeTestCollections=false
77+
run: dotnet test ReactiveDomain.sln -f net${{ matrix.dotnet-version }} -p:ParallelizeTestCollections=false -c Release --no-build
8778

88-
# Execute all unit tests in the solution
89-
- name: Execute unit tests with .NET
90-
if: ${{ (matrix.dotnet-version == '6.0.x') && (matrix.configuration == 'Debug') }}
91-
working-directory: src
92-
run: dotnet test $env:Solution_Name -f net6.0 -p:ParallelizeTestCollections=false

‎package.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ del .\bld\pub\*.* /q
44
dotnet restore .\src\ReactiveDomain.sln
55
dotnet build .\src\ReactiveDomain.sln -c Debug
66
dotnet publish .\src\ReactiveDomain.PolicyTool\ReactiveDomain.PolicyTool.csproj -p:PublishProfile=FolderProfile
7-
pwsh.exe -Command "& {.\tools\CreateDebugNuget.ps1 -md005}"
7+
pwsh.exe -Command "& {.\tools\CreateDebugNuget.ps1 -local002}"
88

‎publish.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ del .\bld\pub\*.* /q
44
dotnet restore .\src\ReactiveDomain.sln
55
dotnet build .\src\ReactiveDomain.sln -c Release
66
dotnet publish .\src\ReactiveDomain.PolicyTool\ReactiveDomain.PolicyTool.csproj -c Release -p:PublishProfile=FolderProfile
7-
powershell -Command "& {.\tools\CreateNuget.ps1}"
7+
pwsh.exe -Command "& {.\tools\CreateNuget.ps1}"
88

‎src/.nuget/NuGet.exe‎

118 KB
Binary file not shown.

‎src/ReactiveDomain.Core/ReactiveDomain.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<ItemGroup>
99
<InternalsVisibleTo Include="ReactiveDomain.Persistence" />
1010
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
11-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
11+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
1212
</ItemGroup>
1313
</Project>

‎src/ReactiveDomain.Debug.nuspec‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,30 @@
33
<metadata>
44
<id>ReactiveDomain</id>
55
<version>0.10.5.0</version>
6-
<authors>PerkinElmer,Linedata</authors>
6+
<authors>Reactive Domain Group</authors>
77
<requireLicenseAcceptance>false</requireLicenseAcceptance>
88
<license type="expression">MIT</license>
99
<description>Package includes all ReactiveDomain Core assemblies</description>
1010
<dependencies>
11-
<group targetFramework="net48">
11+
<group targetFramework="net8.0">
1212
<dependency id="EventStore.Client" version="21.2.2" exclude="Build,Analyzers" />
1313
<dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
14-
<dependency id="Newtonsoft.Json" version="13.0.2" exclude="Build,Analyzers" />
15-
<dependency id="System.Configuration.ConfigurationManager" version="7.0.0" exclude="Build,Analyzers" />
16-
<dependency id="System.Diagnostics.PerformanceCounter" version="5.0.1" exclude="Build,Analyzers" />
14+
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
15+
<dependency id="System.Reactive" version="6.0.1" exclude="Build,Analyzers"/>
16+
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
17+
<dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
1718
</group>
1819
<group targetFramework="net6.0">
1920
<dependency id="EventStore.Client" version="21.2.2" exclude="Build,Analyzers" />
2021
<dependency id="Microsoft.CSharp" version="4.7.0" exclude="Build,Analyzers" />
21-
<dependency id="Newtonsoft.Json" version="13.0.2" exclude="Build,Analyzers" />
22-
<dependency id="System.Configuration.ConfigurationManager" version="7.0.0" exclude="Build,Analyzers" />
23-
<dependency id="System.Diagnostics.PerformanceCounter" version="5.0.1" exclude="Build,Analyzers" />
22+
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
23+
<dependency id="System.Reactive" version="6.0.1" exclude="Build,Analyzers"/>
24+
<dependency id="System.Configuration.ConfigurationManager" version="8.0.0" exclude="Build,Analyzers" />
25+
<dependency id="System.Diagnostics.PerformanceCounter" version="8.0.0" exclude="Build,Analyzers" />
2426
</group>
2527
</dependencies>
2628
<references>
27-
<group targetFramework="net48">
29+
<group targetFramework="net8.0">
2830
<reference file="ReactiveDomain.Core.dll" />
2931
<reference file="ReactiveDomain.Foundation.dll" />
3032
<reference file="ReactiveDomain.Messaging.dll" />
@@ -42,23 +44,23 @@
4244
</metadata>
4345
<files>
4446
<file src="..\build\ReactiveDomain.props" target="build" />
45-
<file src="..\bld\Debug\net48\ReactiveDomain.Core.pdb" target="lib\net48" />
46-
<file src="..\bld\Debug\net48\ReactiveDomain.Foundation.pdb" target="lib\net48" />
47-
<file src="..\bld\Debug\net48\ReactiveDomain.Messaging.pdb" target="lib\net48" />
48-
<file src="..\bld\Debug\net48\ReactiveDomain.Persistence.pdb" target="lib\net48" />
49-
<file src="..\bld\Debug\net48\ReactiveDomain.Transport.pdb" target="lib\net48" />
50-
51-
<file src="..\bld\Debug\net48\ReactiveDomain.Core.dll" target="lib\net48" />
52-
<file src="..\bld\Debug\net48\ReactiveDomain.Foundation.dll" target="lib\net48" />
53-
<file src="..\bld\Debug\net48\ReactiveDomain.Messaging.dll" target="lib\net48" />
54-
<file src="..\bld\Debug\net48\ReactiveDomain.Persistence.dll" target="lib\net48" />
55-
<file src="..\bld\Debug\net48\ReactiveDomain.Transport.dll" target="lib\net48" />
56-
57-
<file src="..\bld\Debug\net48\ReactiveDomain.Core.dll" target="ref\net48" />
58-
<file src="..\bld\Debug\net48\ReactiveDomain.Foundation.dll" target="ref\net48" />
59-
<file src="..\bld\Debug\net48\ReactiveDomain.Messaging.dll" target="ref\net48" />
60-
<file src="..\bld\Debug\net48\ReactiveDomain.Persistence.dll" target="ref\net48" />
61-
<file src="..\bld\Debug\net48\ReactiveDomain.Transport.dll" target="ref\net48" />
47+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Core.pdb" target="lib\net8.0" />
48+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Foundation.pdb" target="lib\net8.0" />
49+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Messaging.pdb" target="lib\net8.0" />
50+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Persistence.pdb" target="lib\net8.0" />
51+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Transport.pdb" target="lib\net8.0" />
52+
53+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Core.dll" target="lib\net8.0" />
54+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Foundation.dll" target="lib\net8.0" />
55+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Messaging.dll" target="lib\net8.0" />
56+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Persistence.dll" target="lib\net8.0" />
57+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Transport.dll" target="lib\net8.0" />
58+
59+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Core.dll" target="ref\net8.0" />
60+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Foundation.dll" target="ref\net8.0" />
61+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Messaging.dll" target="ref\net8.0" />
62+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Persistence.dll" target="ref\net8.0" />
63+
<file src="..\bld\Debug\net8.0\ReactiveDomain.Transport.dll" target="ref\net8.0" />
6264

6365
<file src="..\bld\Debug\net6.0\ReactiveDomain.Core.pdb" target="lib\net6.0" />
6466
<file src="..\bld\Debug\net6.0\ReactiveDomain.Foundation.pdb" target="lib\net6.0" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
</ItemGroup>
1616
<ItemGroup>
1717
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
18-
<PackageReference Include="xunit" Version="2.6.1" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
20-
<PackageReference Include="xunit.runner.console" Version="2.6.1">
18+
<PackageReference Include="xunit" Version="2.9.0" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
20+
<PackageReference Include="xunit.runner.console" Version="2.9.0">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
24+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>

‎src/ReactiveDomain.Foundation.Tests/when_using_read_model_base.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ public void can_use_checkpoint_on_one_stream()
165165
AssertEx.IsOrBecomesTrue(() => Sum == 20);
166166
//add more messages
167167
AppendEvents(10, _conn, _stream1, 5);
168+
AssertEx.AtLeastModelVersion(this, 3, TimeSpan.FromMilliseconds(200), msg: $"Expected 3 got {Version}");
169+
AssertEx.AtLeastModelVersion(this, 8, TimeSpan.FromMilliseconds(100), msg: $"Expected 8 got {Version}");
168170
AssertEx.AtLeastModelVersion(this, 12, TimeSpan.FromMilliseconds(100), msg: $"Expected 12 got {Version}");
169171
AssertEx.IsOrBecomesTrue(() => Sum == 70);
170172
//confirm checkpoints

‎src/ReactiveDomain.Foundation/ReactiveDomain.Foundation.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
</ItemGroup>
1010
<ItemGroup>
1111
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
12+
<PackageReference Include="System.Reactive" Version="6.0.1" />
1213
</ItemGroup>
1314
<ItemGroup>
1415
<ProjectReference Include="..\ReactiveDomain.Messaging\ReactiveDomain.Messaging.csproj" />

src/ReactiveDomain.UI/ReadModel/ReadModelProperty.cs renamed to src/ReactiveDomain.Foundation/StreamStore/ReadModelProperty.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Reactive.Linq;
44
using System.Threading.Tasks;
55

6-
namespace ReactiveDomain.UI
6+
namespace ReactiveDomain.Foundation
77
{
88
/// <summary>
99
/// 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)
4747
/// the new value even if that value is the same as the previous value.</param>
4848
public void Update(T val, bool force = false)
4949
{
50-
var noChange = (val != null && val.Equals(_lastValue)) || (val == null && _lastValue == null);
50+
var noChange = val != null && val.Equals(_lastValue) || val == null && _lastValue == null;
5151
if (!force && noChange) return;
5252
_lastValue = val;
5353
var subscribed = _subscribed.ToArray();

0 commit comments

Comments
 (0)