Skip to content

Moved repeated test project properties into shared props files #74

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

Merged
merged 8 commits into from
Apr 14, 2022

Conversation

mrlacey
Copy link
Contributor

@mrlacey mrlacey commented Apr 12, 2022

This is tidying up what was added for #48

Copy link
Member

@michael-hawker michael-hawker left a comment

Choose a reason for hiding this comment

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

VS did hang for me trying to run the All solutions' tests at first. Running the experiment ones after worked fine though. But I did notice it was trying to build the WASM project head to run the tests, maybe a dependency we can simplify for the build? (Is anyone else's WASM head failing the first deploy?)

@Arlodotexe did it work for you locally without issue?

@mrlacey
Copy link
Contributor Author

mrlacey commented Apr 13, 2022

But I did notice it was trying to build the WASM project head to run the tests, maybe a dependency we can simplify for the build?

How about creating a solution filter for All solution that only includes what's needed for the tests to run?
I'm not sure how this will work with a dynamically generated *All.sln file though.

@mrlacey
Copy link
Contributor Author

mrlacey commented Apr 13, 2022

VS did hang for me trying to run the All solutions' tests at first. Running the experiment ones after worked fine though. (Is anyone else's WASM head failing the first deploy?)

I get regular (several times a day) VS hangs with this solution :(
Not sure it's tied to the WASM head though.

@michael-hawker
Copy link
Member

But I did notice it was trying to build the WASM project head to run the tests, maybe a dependency we can simplify for the build?

How about creating a solution filter for All solution that only includes what's needed for the tests to run? I'm not sure how this will work with a dynamically generated *All.sln file though.

This was on the experiment solution, not the all-up one.

@mrlacey
Copy link
Contributor Author

mrlacey commented Apr 13, 2022

But I did notice it was trying to build the WASM project head to run the tests, maybe a dependency we can simplify for the build?

How about creating a solution filter for All solution that only includes what's needed for the tests to run? I'm not sure how this will work with a dynamically generated *All.sln file though.

This was on the experiment solution, not the all-up one.

Where are you seeing this? The CI doesn't run the tests against the experiment solution. Or is this locally?

If I go from a clean repo, it builds everything if you run the tests before building the solution first, but this is expected as that's how the "Debug" configuration is set up.
I guess it's not ideal, but is this a scenario that's important?
If I run the tests after having previously built the whole solution it doesn't need to rebuild anything. (Unless any code is changed--obvs.)

If this is a valid scenario, we could add a solution filter or a separate configuration that only builds what's needed for testing. Preferences?

@michael-hawker
Copy link
Member

@mrlacey I guess it's an artifact of the solution Debug config and VS and how it builds. It's not important. Just something I noticed.

@Arlodotexe did you have any issues? If it's working fine for you too, then we can commit this PR.

Copy link
Member

@Arlodotexe Arlodotexe left a comment

Choose a reason for hiding this comment

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

The Labs.Uwp.Test.props file is only importing Labs.Uwp.Base.props, and the naming makes it easy to confuse with Labs.Tests.Uwp.props.

Since the file has no WinAppSDK equivalent, has potentially confusing naming, and is doing very little, maybe we should consider just importing the Labs.Uwp.Base.props file directly in the UWP test project, and doing away with Labs.Uwp.Test.props.

@Arlodotexe
Copy link
Member

Tested the All solution and the CanvasLayout solution, worked on first try 👍

@mrlacey
Copy link
Contributor Author

mrlacey commented Apr 14, 2022

The Labs.Uwp.Test.props file is only importing Labs.Uwp.Base.props, and the naming makes it easy to confuse with Labs.Tests.Uwp.props.

Since the file has no WinAppSDK equivalent, has potentially confusing naming, and is doing very little, maybe we should consider just importing the Labs.Uwp.Base.props file directly in the UWP test project, and doing away with Labs.Uwp.Test.props.

Made these changes :)

Comment on lines +71 to +84
common\Labs.Uwp.Base.props = common\Labs.Uwp.Base.props
common\Labs.Uwp.props = common\Labs.Uwp.props
common\Labs.Wasm.props = common\Labs.Wasm.props
common\Labs.WinAppSdk.props = common\Labs.WinAppSdk.props
Windows.Toolkit.Common.props = Windows.Toolkit.Common.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{DB021AE9-57A4-41BA-822F-2C76AF4A385B}"
ProjectSection(SolutionItems) = preProject
tests\Labs.Tests.props = tests\Labs.Tests.props
tests\Labs.Tests.Uwp.props = tests\Labs.Tests.Uwp.props
tests\Labs.Tests.WinAppSdk.props = tests\Labs.Tests.WinAppSdk.props
EndProjectSection
EndProject
Copy link
Member

Choose a reason for hiding this comment

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

Are these getting merged or is there a Props in Props folder? Should we just have them all be grouped together? We can adjust this later for #73 anyway too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They don't live in a specific "Props" directory, just trying to reflect the addition of these as solution items that was done for the other props files.

@mrlacey mrlacey merged commit 7326f73 into main Apr 14, 2022
@delete-merged-branch delete-merged-branch bot deleted the TestPropsFiles branch April 14, 2022 21:57
Martin1994 pushed a commit to Martin1994/Labs-Windows that referenced this pull request Sep 2, 2023
…sFiles

Moved repeated test project properties into shared props files
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.

3 participants