Skip to content

Commit 072c242

Browse files
authored
Merge branch 'v2_develop' into v2_3984-Redraw
2 parents 3ae047f + af633fc commit 072c242

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

Directory.Packages.props

+18-18
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,41 @@
77
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="[8,9)" />
88

99
<PackageVersion Include="ColorHelper" Version="[1.8.1,2)" />
10-
<PackageVersion Include="JetBrains.Annotations" Version="[2024.2.0,)" />
11-
<PackageVersion Include="Microsoft.CodeAnalysis" Version="[4.10,5)" />
12-
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="[4.10,5)" />
13-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="[4.10,5)" />
14-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
15-
<PackageVersion Include="System.IO.Abstractions" Version="[21.0.22,22)" />
10+
<PackageVersion Include="JetBrains.Annotations" Version="[2024.3.0,)" />
11+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="[4.13,5)" />
12+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="[4.13,5)" />
13+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="[4.13,5)" />
14+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="[9.0.2,10)" />
15+
<PackageVersion Include="System.IO.Abstractions" Version="[22.0.11,23)" />
1616
<PackageVersion Include="System.Text.Json" Version="[8.0.5,9)" />
1717
<PackageVersion Include="Wcwidth" Version="[2,3)" />
1818

19-
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="[1.21,2)" />
19+
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="[1.21.2,2)" />
2020
<PackageVersion Include="Serilog" Version="4.2.0" />
2121
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
2222
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
2323
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
24-
<PackageVersion Include="SixLabors.ImageSharp" Version="[3.1.5,4)" />
24+
<PackageVersion Include="SixLabors.ImageSharp" Version="[3.1.7,4)" />
2525
<PackageVersion Include="CsvHelper" Version="[33.0.1,34)" />
2626
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="[3.1.6,4)" />
2727
<PackageVersion Include="System.CommandLine" Version="[2.0.0-beta4.22272.1,3)" />
2828

2929
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
3030

31-
<PackageVersion Include="CommunityToolkit.Mvvm" Version="[8.2.2,9)" />
32-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[8,9)" />
33-
<PackageVersion Include="ReactiveUI" Version="[20.1.1,21)" />
31+
<PackageVersion Include="CommunityToolkit.Mvvm" Version="[8.4.0,9)" />
32+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.2,10)" />
33+
<PackageVersion Include="ReactiveUI" Version="[20.1.63,21)" />
3434
<PackageVersion Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="[1.3.1,2)" />
35-
<PackageVersion Include="ReactiveUI.SourceGenerators" Version="[1.0.3,2)"/>
35+
<PackageVersion Include="ReactiveUI.SourceGenerators" Version="[2.1.8,3)"/>
3636

37-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.10,18)" />
38-
<PackageVersion Include="Moq" Version="[4.20.70,5)" />
39-
<PackageVersion Include="ReportGenerator" Version="[5.3.8,6)" />
40-
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="[21.0.29,22)" />
41-
<PackageVersion Include="xunit" Version="[2.9.0,3)" />
37+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.13,18)" />
38+
<PackageVersion Include="Moq" Version="[4.20.72,5)" />
39+
<PackageVersion Include="ReportGenerator" Version="[5.4.4,6)" />
40+
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="[22.0.11,23)" />
41+
<PackageVersion Include="xunit" Version="[2.9.3,3)" />
4242
<PackageVersion Include="Xunit.Combinatorial" Version="[1.6.24,2)" />
4343
<PackageVersion Include="xunit.runner.visualstudio" Version="[2.8.2,3)"/>
44-
<PackageVersion Include="coverlet.collector" Version="[6.0.2,7)" />
44+
<PackageVersion Include="coverlet.collector" Version="[6.0.4,7)" />
4545

4646
</ItemGroup>
4747

ReactiveExample/LoginViewModel.cs

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public partial class LoginViewModel : ReactiveObject
4040

4141
public LoginViewModel ()
4242
{
43-
InitializeCommands ();
4443
IObservable<bool> canLogin = this.WhenAnyValue
4544
(
4645
x => x.Username,

0 commit comments

Comments
 (0)