Skip to content

Commit 876f4b1

Browse files
committed
Updates NuGet package versions
Updates several NuGet package versions, including Microsoft.NET.Test.Sdk, TUnit, and XAMLTest. Fixes a potential issue in a test case by using CancellationToken.None instead of TestContext.Current!.CancellationToken
1 parent d2d98b3 commit 876f4b1

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

Directory.packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageVersion Include="Microsoft.Composition" Version="1.0.31" />
1515
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
1616
<PackageVersion Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
17-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
17+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1818
<PackageVersion Include="Microsoft.Toolkit.MVVM" Version="7.1.2" />
1919
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
2020
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -26,8 +26,8 @@
2626
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
2727
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
2828
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
29-
<PackageVersion Include="TUnit" Version="0.19.86" />
29+
<PackageVersion Include="TUnit" Version="0.25.21" />
3030
<PackageVersion Include="VirtualizingWrapPanel" Version="1.5.8" />
31-
<PackageVersion Include="XAMLTest" Version="1.3.0-ci602" />
31+
<PackageVersion Include="XAMLTest" Version="1.3.0-ci616" />
3232
</ItemGroup>
33-
</Project>
33+
</Project>

tests/MaterialDesignThemes.UITests/Samples/Validation/ValidationUpdates.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections;
22
using System.ComponentModel;
3-
using System.ComponentModel.DataAnnotations;
3+
using System.Threading;
44
using CommunityToolkit.Mvvm.ComponentModel;
55
using CommunityToolkit.Mvvm.Input;
66

@@ -46,7 +46,7 @@ private async Task CauseErrors()
4646
{
4747
Error = "Some error";
4848
ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Text)));
49-
await Task.Delay(100, TestContext.Current!.CancellationToken);
49+
await Task.Delay(100, CancellationToken.None);
5050
Error += " + more";
5151
ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Text)));
5252
}

tests/MaterialDesignThemes.Wpf.Tests/DialogHostTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ await DialogHost.Show("Content", id,
100100
{
101101
var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => DialogHost.Show("Content", id));
102102
args.Session.Close();
103-
await Assert.That(ex.Message).IsEqualTo("DialogHost is already open.");
103+
await Assert.That(ex?.Message).IsEqualTo("DialogHost is already open.");
104104
})));
105105
}
106106

@@ -113,7 +113,7 @@ public async Task WhenNoDialogsAreOpenItThrows()
113113

114114
var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => DialogHost.Show("Content", id));
115115

116-
await Assert.That(ex.Message).IsEqualTo("No loaded DialogHost instances.");
116+
await Assert.That(ex?.Message).IsEqualTo("No loaded DialogHost instances.");
117117
}
118118

119119
[Test]
@@ -124,7 +124,7 @@ public async Task WhenNoDialogsMatchIdentifierItThrows()
124124

125125
var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => DialogHost.Show("Content", id));
126126

127-
await Assert.That(ex.Message).IsEqualTo($"No loaded DialogHost have an {nameof(DialogHost.Identifier)} property matching dialogIdentifier ('{id}') argument.");
127+
await Assert.That(ex?.Message).IsEqualTo($"No loaded DialogHost have an {nameof(DialogHost.Identifier)} property matching dialogIdentifier ('{id}') argument.");
128128
}
129129

130130
[Test]
@@ -141,7 +141,7 @@ public async Task WhenMultipleDialogHostsHaveTheSameIdentifierItThrows()
141141

142142
otherDialogHost.RaiseEvent(new RoutedEventArgs(FrameworkElement.UnloadedEvent));
143143

144-
await Assert.That(ex.Message).IsEqualTo("Multiple viable DialogHosts. Specify a unique Identifier on each DialogHost, especially where multiple Windows are a concern.");
144+
await Assert.That(ex?.Message).IsEqualTo("Multiple viable DialogHosts. Specify a unique Identifier on each DialogHost, especially where multiple Windows are a concern.");
145145
}
146146

147147
[Test]
@@ -164,7 +164,7 @@ public async Task WhenContentIsNullItThrows()
164164
CreateElement(); // ensure at least one DialogHost exists
165165
var ex = await Assert.ThrowsAsync<ArgumentNullException>(() => DialogHost.Show(null!));
166166

167-
await Assert.That(ex.ParamName).IsEqualTo("content");
167+
await Assert.That(ex?.ParamName).IsEqualTo("content");
168168
}
169169

170170
[Test]

0 commit comments

Comments
 (0)