Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgraded winui to 0.8.0 #888

Merged
merged 1 commit into from
Jun 24, 2021
Merged

Upgraded winui to 0.8.0 #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
<!-- UWP and WinUI dependencies -->
<MicrosoftNETCoreUniversalWindowsPlatformVersion>5.3.0</MicrosoftNETCoreUniversalWindowsPlatformVersion>
<MicrosoftProjectReunionVersion>0.5.0</MicrosoftProjectReunionVersion>
<MicrosoftProjectReunionVersion>0.8.0</MicrosoftProjectReunionVersion>
<!-- / UWP and WinUI dependencies -->
<MoqVersion>4.8.3</MoqVersion>
<CastleCoreVersion>4.3.0</CastleCoreVersion>
Expand Down
6 changes: 3 additions & 3 deletions src/TestFramework/Extension.WinUI/UITestMethodAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer
public class UITestMethodAttribute : TestMethodAttribute
{
/// <summary>
/// Gets or sets the <see cref="Microsoft.System.DispatcherQueue"/> that should be used to invoke the UITestMethodAttribute.
/// Gets or sets the <see cref="Microsoft.UI.Dispatching.DispatcherQueue"/> that should be used to invoke the UITestMethodAttribute.
/// If none is provided, it will try to use the Microsoft.UI.Xaml.Window.Current.DispatcherQueue, which only works on UWP.
/// </summary>
public static Microsoft.System.DispatcherQueue DispatcherQueue { get; set; }
public static Microsoft.UI.Dispatching.DispatcherQueue DispatcherQueue { get; set; }

/// <summary>
/// Executes the test method on the UI Thread.
Expand Down Expand Up @@ -59,7 +59,7 @@ public override TestResult[] Execute(ITestMethod testMethod)
{
var taskCompletionSource = new global::System.Threading.Tasks.TaskCompletionSource<object>();

if (!dispatcher.TryEnqueue(System.DispatcherQueuePriority.Normal, () =>
if (!dispatcher.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
{
try
{
Expand Down