Skip to content

Commit 5c1d5c8

Browse files
DevJasperNLDevJasperNL
authored
Added compatibility for .NET10 and removed compatibility for .NET 6 and 7. (#30)
* Added NET 10 * Updating references and removing compatability for net 6 and net 7. * Update build scripts. * Using IsTrue and IsFalse instead of AreEqual. * Making Parallelize explicit
1 parent 19f46cd commit 5c1d5c8

9 files changed

Lines changed: 80 additions & 83 deletions

‎.github/workflows/ci-build-and-test.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ jobs:
1717
steps:
1818
- name: 🗂️ Checkout the repository
1919
uses: actions/checkout@main
20-
21-
- name: ⬇️ Install .NET 6
22-
uses: actions/setup-dotnet@v5
23-
with:
24-
dotnet-version: '6.0.x'
25-
26-
- name: ⬇️ Install .NET 7
27-
uses: actions/setup-dotnet@v5
28-
with:
29-
dotnet-version: '7.0.x'
3020

3121
- name: ⬇️ Install .NET 8
3222
uses: actions/setup-dotnet@v5
@@ -37,6 +27,11 @@ jobs:
3727
uses: actions/setup-dotnet@v5
3828
with:
3929
dotnet-version: '9.0.x'
30+
31+
- name: ⬇️ Install .NET 10
32+
uses: actions/setup-dotnet@v5
33+
with:
34+
dotnet-version: '10.0.x'
4035

4136
- name: 🛠️ Build code
4237
run: dotnet build --configuration Release -p:TreatWarningsAsErrors=true

‎.github/workflows/nuget-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
echo Current version: $latest
2323
echo "version=$latest" >> $GITHUB_OUTPUT
2424
25-
- name: ⬇️ Install .NET 9
25+
- name: ⬇️ Install .NET 10
2626
uses: actions/setup-dotnet@v5
2727
with:
28-
dotnet-version: "9.0.x" # SDK Version
28+
dotnet-version: "10.0.x" # SDK Version
2929

3030
- name: 🎁 Pack
3131
run: dotnet pack Reactive.Boolean.sln --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }} -p:Version=${{ steps.version.outputs.version }}

‎src/Reactive.Boolean/Reactive.Boolean.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<Title>Reactive.Boolean</Title>

‎tests/Reactive.Boolean.Tests/BooleanObservableExtensions.Scheduling.LimitTrueDuration.Tests.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ public void LimitTrueDuration_FalseAfterTimeSpan(bool distinctUntilChanged, bool
9494
memoryObservable.Subscribe(b => result = b);
9595

9696
subject.OnNext(true);
97-
Assert.AreEqual(true, result);
97+
Assert.IsTrue(result);
9898

9999
scheduler.AdvanceBy(1);
100-
Assert.AreEqual(true, result);
100+
Assert.IsTrue(result);
101101

102102
scheduler.AdvanceBy(1);
103-
Assert.AreEqual(false, result);
103+
Assert.IsFalse(result);
104104
}
105105

106106
[TestMethod]
@@ -118,23 +118,23 @@ public void LimitTrueDuration_FalseAfterTimeSpan_Repeat(bool distinctUntilChange
118118
memoryObservable.Subscribe(b => result = b);
119119

120120
subject.OnNext(true);
121-
Assert.AreEqual(true, result);
121+
Assert.IsTrue(result);
122122

123123
scheduler.AdvanceBy(1);
124-
Assert.AreEqual(true, result);
124+
Assert.IsTrue(result);
125125

126126
scheduler.AdvanceBy(1);
127-
Assert.AreEqual(false, result);
127+
Assert.IsFalse(result);
128128

129129
subject.OnNext(false);
130130
subject.OnNext(true);
131-
Assert.AreEqual(true, result);
131+
Assert.IsTrue(result);
132132

133133
scheduler.AdvanceBy(1);
134-
Assert.AreEqual(true, result);
134+
Assert.IsTrue(result);
135135

136136
scheduler.AdvanceBy(1);
137-
Assert.AreEqual(false, result);
137+
Assert.IsFalse(result);
138138
}
139139

140140
[TestMethod]
@@ -152,13 +152,13 @@ public void LimitTrueDuration_FalseIsImmediate(bool distinctUntilChanged, bool r
152152
memoryObservable.Subscribe(b => result = b);
153153

154154
subject.OnNext(true);
155-
Assert.AreEqual(true, result);
155+
Assert.IsTrue(result);
156156

157157
scheduler.AdvanceBy(1);
158-
Assert.AreEqual(true, result);
158+
Assert.IsTrue(result);
159159

160160
subject.OnNext(false);
161-
Assert.AreEqual(false, result);
161+
Assert.IsFalse(result);
162162
}
163163

164164
[TestMethod]
@@ -281,7 +281,7 @@ public void LimitTrueDuration_CompleteIsImmediate(bool distinctUntilChanged, boo
281281
subject.OnNext(true);
282282

283283
scheduler.AdvanceBy(1);
284-
Assert.AreEqual(true, result);
284+
Assert.IsTrue(result);
285285

286286
subject.OnCompleted();
287287
Assert.IsTrue(completed);
@@ -305,7 +305,7 @@ public void LimitTrueDuration_Error(bool distinctUntilChanged, bool resetTimerOn
305305
subject.OnNext(true);
306306

307307
scheduler.AdvanceBy(1);
308-
Assert.AreEqual(true, result);
308+
Assert.IsTrue(result);
309309

310310
var exception = new InvalidOperationException("This is a test");
311311
subject.OnError(exception);

‎tests/Reactive.Boolean.Tests/BooleanObservableExtensions.Scheduling.PersistTrueFor.Tests.cs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void PersistTrueFor_RemainsTrue(bool resetTimerOnConsecutiveFalse)
7070
subject.OnNext(false);
7171

7272
// Assert
73-
Assert.AreEqual(true, result);
73+
Assert.IsTrue(result);
7474
}
7575

7676
[TestMethod]
@@ -87,13 +87,13 @@ public void PersistTrueFor_RemainsTrueForTimeSpan(bool resetTimerOnConsecutiveFa
8787

8888
subject.OnNext(true);
8989
subject.OnNext(false);
90-
Assert.AreEqual(true, result);
90+
Assert.IsTrue(result);
9191

9292
scheduler.AdvanceBy(1);
93-
Assert.AreEqual(true, result);
93+
Assert.IsTrue(result);
9494

9595
scheduler.AdvanceBy(1);
96-
Assert.AreEqual(false, result);
96+
Assert.IsFalse(result);
9797
}
9898

9999
[TestMethod]
@@ -110,23 +110,23 @@ public void PersistTrueFor_RemainsTrueForTimeSpan_Repeat(bool resetTimerOnConsec
110110

111111
subject.OnNext(true);
112112
subject.OnNext(false);
113-
Assert.AreEqual(true, result);
113+
Assert.IsTrue(result);
114114

115115
scheduler.AdvanceBy(1);
116-
Assert.AreEqual(true, result);
116+
Assert.IsTrue(result);
117117

118118
scheduler.AdvanceBy(1);
119-
Assert.AreEqual(false, result);
119+
Assert.IsFalse(result);
120120

121121
subject.OnNext(true);
122122
subject.OnNext(false);
123-
Assert.AreEqual(true, result);
123+
Assert.IsTrue(result);
124124

125125
scheduler.AdvanceBy(1);
126-
Assert.AreEqual(true, result);
126+
Assert.IsTrue(result);
127127

128128
scheduler.AdvanceBy(1);
129-
Assert.AreEqual(false, result);
129+
Assert.IsFalse(result);
130130
}
131131

132132
[TestMethod]
@@ -142,17 +142,17 @@ public void PersistTrueFor_RemainsTrueForTimeSpanAfterFalse(bool resetTimerOnCon
142142
memoryObservable.Subscribe(b => result = b);
143143

144144
subject.OnNext(true);
145-
Assert.AreEqual(true, result);
145+
Assert.IsTrue(result);
146146

147147
scheduler.AdvanceBy(1);
148148
subject.OnNext(false);
149-
Assert.AreEqual(true, result);
149+
Assert.IsTrue(result);
150150

151151
scheduler.AdvanceBy(1);
152-
Assert.AreEqual(true, result);
152+
Assert.IsTrue(result);
153153

154154
scheduler.AdvanceBy(1);
155-
Assert.AreEqual(false, result);
155+
Assert.IsFalse(result);
156156
}
157157

158158
[TestMethod]
@@ -169,17 +169,17 @@ public void PersistTrueFor_TrueResetsTimer(bool resetTimerOnConsecutiveFalse)
169169

170170
subject.OnNext(true);
171171
subject.OnNext(false);
172-
Assert.AreEqual(true, result);
172+
Assert.IsTrue(result);
173173

174174
scheduler.AdvanceBy(1);
175175
subject.OnNext(true);
176176
subject.OnNext(false);
177177

178178
scheduler.AdvanceBy(1);
179-
Assert.AreEqual(true, result);
179+
Assert.IsTrue(result);
180180

181181
scheduler.AdvanceBy(1);
182-
Assert.AreEqual(false, result);
182+
Assert.IsFalse(result);
183183
}
184184

185185
[TestMethod]
@@ -246,7 +246,7 @@ public void PersistTrueFor_CompleteIsImmediate(bool resetTimerOnConsecutiveFalse
246246
subject.OnNext(false);
247247

248248
scheduler.AdvanceBy(1);
249-
Assert.AreEqual(true, result);
249+
Assert.IsTrue(result);
250250

251251
subject.OnCompleted();
252252
Assert.IsTrue(completed);
@@ -269,7 +269,7 @@ public void PersistTrueFor_Error(bool resetTimerOnConsecutiveFalse)
269269
subject.OnNext(false);
270270

271271
scheduler.AdvanceBy(1);
272-
Assert.AreEqual(true, result);
272+
Assert.IsTrue(result);
273273

274274
var exception = new InvalidOperationException("This is a test");
275275
subject.OnError(exception);

‎tests/Reactive.Boolean.Tests/BooleanObservableExtensions.Scheduling.TrueForAtLeast.Tests.cs‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Microsoft.Reactive.Testing;
2+
using System.Reactive.Linq;
23
using System.Reactive.Subjects;
34

45
namespace Reactive.Boolean.Tests
@@ -99,7 +100,7 @@ public void TrueForAtLeast_RemainsTrue(bool distinctUntilChanged, bool resetTime
99100
subject.OnNext(false);
100101

101102
// Assert
102-
Assert.AreEqual(true, result);
103+
Assert.IsTrue(result);
103104
}
104105

105106
[TestMethod]
@@ -118,13 +119,13 @@ public void TrueForAtLeast_RemainsTrueForTimeSpan(bool distinctUntilChanged, boo
118119

119120
subject.OnNext(true);
120121
subject.OnNext(false);
121-
Assert.AreEqual(true, result);
122+
Assert.IsTrue(result);
122123

123124
scheduler.AdvanceBy(1);
124-
Assert.AreEqual(true, result);
125+
Assert.IsTrue(result);
125126

126127
scheduler.AdvanceBy(1);
127-
Assert.AreEqual(false, result);
128+
Assert.IsFalse(result);
128129
}
129130

130131
[TestMethod]
@@ -143,23 +144,23 @@ public void TrueForAtLeast_RemainsTrueForTimeSpan_Repeat(bool distinctUntilChang
143144

144145
subject.OnNext(true);
145146
subject.OnNext(false);
146-
Assert.AreEqual(true, result);
147+
Assert.IsTrue(result);
147148

148149
scheduler.AdvanceBy(1);
149-
Assert.AreEqual(true, result);
150+
Assert.IsTrue(result);
150151

151152
scheduler.AdvanceBy(1);
152-
Assert.AreEqual(false, result);
153+
Assert.IsFalse(result);
153154

154155
subject.OnNext(true);
155156
subject.OnNext(false);
156-
Assert.AreEqual(true, result);
157+
Assert.IsTrue(result);
157158

158159
scheduler.AdvanceBy(1);
159-
Assert.AreEqual(true, result);
160+
Assert.IsTrue(result);
160161

161162
scheduler.AdvanceBy(1);
162-
Assert.AreEqual(false, result);
163+
Assert.IsFalse(result);
163164
}
164165

165166
[TestMethod]
@@ -177,14 +178,14 @@ public void TrueForAtLeast_CanTurnFalseAfterTimeSpan(bool distinctUntilChanged,
177178
memoryObservable.Subscribe(b => result = b);
178179

179180
subject.OnNext(true);
180-
Assert.AreEqual(true, result);
181+
Assert.IsTrue(result);
181182

182183
scheduler.AdvanceBy(1);
183184
scheduler.AdvanceBy(1);
184-
Assert.AreEqual(true, result);
185+
Assert.IsTrue(result);
185186

186187
subject.OnNext(false);
187-
Assert.AreEqual(false, result);
188+
Assert.IsFalse(result);
188189
}
189190

190191
[TestMethod]
@@ -310,7 +311,7 @@ public void TrueForAtLeast_CompleteIsImmediate(bool distinctUntilChanged, bool r
310311
subject.OnNext(false);
311312

312313
scheduler.AdvanceBy(1);
313-
Assert.AreEqual(true, result);
314+
Assert.IsTrue(result);
314315

315316
subject.OnCompleted();
316317
Assert.IsTrue(completed);
@@ -335,7 +336,7 @@ public void TrueForAtLeast_Error(bool distinctUntilChanged, bool resetTimerOnCon
335336
subject.OnNext(false);
336337

337338
scheduler.AdvanceBy(1);
338-
Assert.AreEqual(true, result);
339+
Assert.IsTrue(result);
339340

340341
var exception = new InvalidOperationException("This is a test");
341342
subject.OnError(exception);

0 commit comments

Comments
 (0)