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.

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

Added basic WinUI3 support. #782

Merged
merged 12 commits into from
Mar 31, 2021
Merged

Added basic WinUI3 support. #782

merged 12 commits into from
Mar 31, 2021

Conversation

azchohfi
Copy link
Contributor

No description provided.

- Fixed obsolution warnings on nuspec files.
- Fixed a small typo on a resource.
@Haplois
Copy link
Contributor

Haplois commented Feb 24, 2021

@azchohfi, thank you for the contribution. This looks OK; after testing and getting more feedback from the team, I'll merge.

@azchohfi
Copy link
Contributor Author

This is great! The reason for the failing TestFx.CI.Real is that the build machine is still on old build configurations. It needs VS2019, for net5, and this is still running on a VS2017 machine.

@Haplois
Copy link
Contributor

Haplois commented Feb 25, 2021

The issue with the VS2019 machine when building it is that we get another error for UAP (Windows, 10.0, UAP, 10.0.10240.0, 10.0.14393.0). Any ideas on this?

The VM pool we're using does not have the required SDK installed. It's getting fixed.

@azchohfi
Copy link
Contributor Author

azchohfi commented Mar 8, 2021

Any updates on this?

# Conflicts:
#	src/Package/MSTest.TestAdapter.Dotnet.nuspec
@Haplois
Copy link
Contributor

Haplois commented Mar 10, 2021

The infra team is still working on that. Hopefully, they'll push the new images this week, and we can merge this.

@azchohfi
Copy link
Contributor Author

Build seems to be passing now.

@Haplois
Copy link
Contributor

Haplois commented Mar 11, 2021

@azchohfi, the failing one is our internal pipeline that generates the signed builds. I'll check back with the infra team and try to resolve this asap.

@azchohfi
Copy link
Contributor Author

I'll update this to use ProjectReunion 0.5.0-prerelease.

Copy link
Contributor

@Haplois Haplois left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Package generation failed, with the fixed pipeline as well. Could you check it?

~\scripts\build\TestFx.Loc.targets(73,5): error MSB3073: The command "xcopy /Y /I /S /E ..\..\..\packages\MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\Extensions\WinUI ..\..\..\artifacts\Release\Extension.WinUI\" exited with code 4. [~\src\TestFramework\Extension.WinUI\Extension.WinUI.csproj]

Nuget.config Outdated Show resolved Hide resolved
src/Package/MSTest.TestFramework.enu.nuspec Outdated Show resolved Hide resolved
src/Package/MSTest.TestFramework.nuspec Outdated Show resolved Hide resolved
Nuget.config Outdated Show resolved Hide resolved
Co-authored-by: Medeni Baykal <433724+Haplois@users.noreply.github.com>
@azchohfi
Copy link
Contributor Author

@Haplois The issue seems to be that MSTest.Internal.TestFx.Localized.Documentation, version 1.0.0-build-20170420-1 doesn't have any WinUI related xml files, which makes sense since this PR didn't update that package. Could you point me to where this should be updated?

@Haplois
Copy link
Contributor

Haplois commented Mar 15, 2021

@azchohfi, there is a chicken and egg problem :) This repository generates that package; we need this merged to get those files. I'll fix that tomorrow and hopefully merge it.

/// Gets or sets the <see cref="Microsoft.System.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; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, this would cause issues if the tests are run in parallel, wouldn't it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't see why it could, given that you provide one. The same concept was/is used in UWP, and it works fine (UWP used a static property to get the CoreDispatcher). Preferably, this should be set only once, and only if needed.

@Haplois
Copy link
Contributor

Haplois commented Mar 17, 2021

Added Microsoft.ProjectReunion package and its dependencies to dotnet-public field. It will be replicated from NuGet.org automatically.

@Haplois Haplois force-pushed the winui3 branch 3 times, most recently from a0ba65f to ad520d8 Compare March 18, 2021 03:16
Copy link
Contributor

@Haplois Haplois left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed the issues with the build, we need to add some acceptance tests, but it looks ok.

Copy link
Member

@Scottj1s Scottj1s left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great, and much needed - thx!

@Haplois Haplois merged commit c1cd55d into microsoft:master Mar 31, 2021
@Haplois
Copy link
Contributor

Haplois commented Mar 31, 2021

Thanks for the review @Scottj1s, and thank you for your contribution @azchohfi. It's merged.

@azchohfi azchohfi deleted the winui3 branch April 1, 2021 23:24
@azchohfi azchohfi mentioned this pull request Apr 15, 2021
@Haplois Haplois linked an issue Apr 20, 2021 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WinUI3 + MSTest
4 participants