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

Merge Feature/winappsdk 1.2 into main #1116

Merged
merged 6 commits into from
Nov 11, 2022
Merged

Merge Feature/winappsdk 1.2 into main #1116

merged 6 commits into from
Nov 11, 2022

Conversation

bpulliam
Copy link
Contributor

@bpulliam bpulliam commented Nov 10, 2022

Description

This merges the feature branch that has captured the road to 1.2 release.
Now that 1.2 stable has been released, we can bring this into main.

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Copy link
Contributor

@gregwoo-microsoft gregwoo-microsoft left a comment

Choose a reason for hiding this comment

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

Works great! The only thing that I would change is adding the MediaPlayerElement control to the "recently added samples" list.

@gregwoo-microsoft
Copy link
Contributor

In fact, here is the list of all of the controls that were updated since the last update:
AnimatedIcon
AutoSuggestBox
Button
CheckBox
ListView
RevealFocus
ScrollViewer
Slider
SplitButton
SplitView
Swipe
TitleBar
WebView2
SystemBackdrops

Copy link
Collaborator

@marcelwgn marcelwgn left a comment

Choose a reason for hiding this comment

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

What's up with the files in the Helpers\Colorcode.internal folder? Visual Studio does not seem to show them and they don't seem to be referenced (unless I'm missing something here).

@bpulliam
Copy link
Contributor Author

What's up with the files in the Helpers\Colorcode.internal folder? Visual Studio does not seem to show them and they don't seem to be referenced (unless I'm missing something here).

Colorcode.WinUI is built against the shipping version of WinUI and causes conflicts when WinUI Gallery is built against internal builds of WinUI. One of the tasks we have been working on is eliminating copies of the Gallery code and the cost of keeping them in sync. As such, we use the public WinUIGallery code to validate and develop WinUI itself. The Colorcode.Internal allows us to use Colorcode.Core directly when building WinUI Gallery internally, but it is not used in external builds. The switch is in the csproj file by changing the reference and using compile removes.

@bpulliam bpulliam merged commit c93d378 into main Nov 11, 2022
@bpulliam bpulliam deleted the feature/winappsdk-1.2 branch November 11, 2022 12:45
@marcelwgn
Copy link
Collaborator

Ah I see, thanks for the clarification @bpulliam!

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.

None yet

3 participants