Merge Dev/split controls Refactoring to Main #3752
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
….Uwp.UI.Controls.Primitives.csproj Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
This reverts commit e885c10.
Remove NeutralResourcesLanguage on attribute on assembly, no resources or language specific code.
to Microsoft.Toolkit.Uwp.UI.Controls.Media Issue: coped ControlHelpers.XamlHost.cs Controls -> Controls.Media
Split out Controls.Primitives package.
Should run more like the for loop version. Loads types from one assembly at a time.
#3740) <!-- 🚨 Please Do Not skip any instructions and information mentioned below as they are all required and essential to evaluate and test the PR. By fulfilling all the required information you will be able to reduce the volume of questions and most likely help merge the PR faster 🚨 --> <!-- 📝 It is preferred if you keep the "☑️ Allow edits by maintainers" checked in the Pull Request Template as it increases collaboration with the Toolkit maintainers by permitting commits to your PR branch (only) created from your fork. This can let us quickly make fixes for minor typos or forgotten StyleCop issues during review without needing to wait on you doing extra work. Let us help you help us! 🎉 --> ## Fixes #3739 #3735 <!-- Add the relevant issue number after the "#" mentioned above (for ex: Fixes #1234) which will automatically close the issue once the PR is merged. --> <!-- Add a brief overview here of the feature/bug & fix. --> Smaple.cs LookForTypeByName(string) add assmbiles to search in - Microsoft.Toolkit.Uwp.UI.Controls -> Microsoft.Toolkit.Uwp.UI.Controls.Core - Microsoft.Toolkit.Uwp.UI.Controls.Layout - Microsoft.Toolkit.Uwp.UI.Controls.Media - Microsoft.Toolkit.Uwp.UI.Controls.Media ## PR Type What kind of change does this PR introduce? <!-- Please uncomment one or more that apply to this PR. --> - Bugfix <!-- - Feature --> <!-- - Code style update (formatting) --> <!-- - Refactoring (no functional changes, no api changes) --> <!-- - Build or CI related changes --> <!-- - Documentation content changes --> <!-- - Sample app changes --> <!-- - Other... Please describe: --> ## What is the current behavior? <!-- Please describe the current behavior that you are modifying, or link to a relevant issue. --> ## What is the new behavior? <!-- Describe how was this issue resolved or changed? --> ## PR Checklist Please check if your PR fulfills the following requirements: - [ ] Tested code with current [supported SDKs](../readme.md#supported) - [ ] Pull Request has been submitted to the documentation repository [instructions](..\contributing.md#docs). Link: <!-- docs PR link --> - [ ] Sample in sample app has been added / updated (for bug fixes / features) - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets) - [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/windows-toolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc... - [ ] Tests for the changes have been added (for bug fixes / features) (if applicable) - [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*) - [ ] Contains **NO** breaking changes <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. Please note that breaking changes are likely to be rejected within minor release cycles or held until major versions. --> ## Other information
Only include depedencies in package.
Aggregate packages
|
Thanks michael-hawker for opening a Pull Request! The reviewers will test the PR and highlight if there is any conflict or changes required. If the PR is approved we will proceed to merge the pull request 🙌 |
ghost
requested review from
# Conflicts: # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBar.Typedata.cs # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Metadata.cs # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Typedata.cs # Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj # Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml # Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml # UnitTests/UnitTests.UWP/UnitTests.UWP.csproj # Windows Community Toolkit.sln Tested Sample App
8 tasks
michael-hawker
added
the
next preview ✈️
This was
linked to
issues
Feb 12, 2021
Rosuavio
approved these changes
Feb 12, 2021
| @@ -2,23 +2,40 @@ | |||
|
|
|||
| <PropertyGroup> | |||
| <TargetFrameworks>uap10.0.17763</TargetFrameworks> | |||
| <TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion> | |||
There was a problem hiding this comment.
Not completely sure what this line was for. As we moved all the original code in here (The layouts) to .Primitives do we want this in the .Primitives csproj?
There was a problem hiding this comment.
I'm pretty sure this comes from the root target/props files now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3594, #3145, #3606
Reverse of #3751. Since everything's pretty much ready to go with
dev/split-controlslet's just try and merge it into main directly.This dev branch has been for our refactoring of controls into individual packages of more similarly grouped controls.
We now have an uber Controls package which contains everything, which will smooth the upgrade process, but also individual packages:
Microsoft.Toolkit.Uwp.UI.Controls
We've also removed Animations references from the Controls.
PR Checklist
Please check if your PR fulfills the following requirements:
Other information