Skip to content

Commit 339539b

Browse files
authored
housekeeping: Make Splat 6.* the default. (#1900)
* housekeeping: Make Splat 6.* the default.
1 parent 3246efa commit 339539b

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

src/ReactiveUI.Tests/PocoObservableForPropertyTests.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ public void Write(string message, LogLevel logLevel)
6666
{
6767
LastMessages.Add(message);
6868
}
69+
70+
public void Write([Localizable(false)] string message, [Localizable(false)] Type type, LogLevel logLevel)
71+
{
72+
LastMessages.Add(message);
73+
}
6974
}
7075
}
7176
}

src/ReactiveUI.Tests/ReactiveCollectionTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1704,7 +1704,7 @@ public void DerivedCollectionsShouldWarnWhenSourceIsNotINotifyCollectionChanged(
17041704

17051705
var m = logger.Messages.Last();
17061706
var message = m.Item1;
1707-
var level = m.Item2;
1707+
var level = m.Item3;
17081708

17091709
Assert.Contains("INotifyCollectionChanged", message);
17101710
Assert.Equal(LogLevel.Warn, level);

src/ReactiveUI.Tests/TestLogger.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
using System;
66
using System.Collections.Generic;
7+
using System.ComponentModel;
78
using System.Linq;
89
using System.Text;
910
using System.Threading.Tasks;
@@ -15,17 +16,22 @@ public class TestLogger : ILogger
1516
{
1617
public TestLogger()
1718
{
18-
Messages = new List<Tuple<string, LogLevel>>();
19+
Messages = new List<Tuple<string, Type, LogLevel>>();
1920
Level = LogLevel.Debug;
2021
}
2122

22-
public List<Tuple<string, LogLevel>> Messages { get; }
23+
public List<Tuple<string, Type, LogLevel>> Messages { get; }
2324

2425
public LogLevel Level { get; set; }
2526

2627
public void Write(string message, LogLevel logLevel)
2728
{
28-
Messages.Add(Tuple.Create(message, logLevel));
29+
Messages.Add(Tuple.Create(message, typeof(TestLogger), logLevel));
30+
}
31+
32+
public void Write([Localizable(false)] string message, [Localizable(false)] Type type, LogLevel logLevel)
33+
{
34+
Messages.Add(Tuple.Create(message, type, logLevel));
2935
}
3036
}
3137
}

src/ReactiveUI/ReactiveUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<None Include="Platforms\**\*.cs" />
1313
<PackageReference Include="System.Reactive" Version="4.0.0" />
1414
<PackageReference Include="System.Reactive.Compatibility" Version="4.0.0" />
15-
<PackageReference Include="Splat" Version="5.*" />
15+
<PackageReference Include="Splat" Version="6.*" />
1616
<PackageReference Include="DynamicData" Version="6.7.*" />
1717
</ItemGroup>
1818

0 commit comments

Comments
 (0)