Skip to content

Shadow container (backport #638) - #703

Merged
agneszitte merged 17 commits into
legacy/3xfrom
mergify/bp/legacy/3x/pr-638
Aug 19, 2023
Merged

Shadow container (backport #638)#703
agneszitte merged 17 commits into
legacy/3xfrom
mergify/bp/legacy/3x/pr-638

Conversation

@mergify

@mergify mergify Bot commented Aug 8, 2023

Copy link
Copy Markdown
Contributor

This is an automatic backport of pull request #638 done by Mergify.
Cherry-pick of 97bc94f has failed:

On branch mergify/bp/legacy/3x/pr-638
Your branch is up to date with 'origin/legacy/3x'.

You are currently cherry-picking commit 97bc94f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   build/workflow/scripts/wasm-uitest-run.sh
	modified:   build/workflow/stage-uitests-android.yml
	modified:   build/workflow/stage-uitests-build.yml
	modified:   build/workflow/stage-uitests-ios.yml
	modified:   build/workflow/stage-uitests-wasm.yml
	new file:   doc/assets/shadows-colors.png
	new file:   doc/assets/shadows-neumorphism.png
	modified:   doc/controls-styles.md
	new file:   doc/controls/ShadowContainer.md
	new file:   samples/Uno.Toolkit.Samples/Directory.Build.props
	new file:   samples/Uno.Toolkit.Samples/Directory.Build.targets
	modified:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml.Navigation.cs
	new file:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
	new file:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml.cs
	new file:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
	new file:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
	modified:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Converters.xaml
	new file:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Converters/HexToColorConverter.cs
	modified:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Entities/SampleCategory.cs
	modified:   samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Uno.Toolkit.Samples.Shared.projitems
	new file:   samples/Uno.Toolkit.WinUI.Samples/Directory.Build.props
	modified:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Skia.Gtk/Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj
	modified:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm/Uno.Toolkit.WinUI.Samples.Wasm.csproj
	modified:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
	modified:   src/Directory.Packages.props
	modified:   src/Uno.Toolkit.RuntimeTests/Helpers/ImageAssertHelper.cs
	new file:   src/Uno.Toolkit.RuntimeTests/Tests/ShadowContainerTests.cs
	modified:   src/Uno.Toolkit.RuntimeTests/Uno.Toolkit.RuntimeTests.WinUI.csproj
	new file:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/Shadow.cs
	new file:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs
	new file:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Paint.cs
	new file:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Properties.cs
	new file:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
	new file:   src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowsCache.cs
	new file:   src/Uno.Toolkit.Skia.WinUI/Themes/Generic.xaml
	new file:   src/Uno.Toolkit.Skia.WinUI/Uno.Toolkit.Skia.WinUI.csproj
	modified:   src/Uno.Toolkit.UI/AssemblyInfo.cs
	new file:   src/Uno.Toolkit.UI/MetaAttributes.cs
	modified:   src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
	modified:   src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
	new file:   src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
	modified:   src/Uno.Toolkit.UITest/Uno.Toolkit.UITest.csproj

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   build/workflow/templates/dotnet-workload-install-mac.yml
	both modified:   build/workflow/templates/dotnet-workload-install-windows.yml
	both modified:   samples/Directory.Packages.props
	deleted by us:   samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Uno.Toolkit.WinUI.Samples.Mobile.csproj
	both modified:   src/Uno.Toolkit.sln

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Comment thread doc/controls/ShadowContainer.md Outdated
@agneszitte

Copy link
Copy Markdown
Member

Will need #714 changes to fix CI build issues for this Backport PR

@jeromelaban

Copy link
Copy Markdown
Member

@agneszitte the changes in #714 cannot be backported, as they require net6+ heads. For this particular PR, WinUI+xamarin tests must be disabled.

@pictos
pictos force-pushed the mergify/bp/legacy/3x/pr-638 branch 2 times, most recently from 52ed60f to 9f0e8a6 Compare August 17, 2023 20:52
@jeromelaban

Copy link
Copy Markdown
Member

@pictos looking at the errors, it seems that there's an uno update that is not supposed to be there (it upgrade to uno 5 which is incorrect)

@pictos
pictos force-pushed the mergify/bp/legacy/3x/pr-638 branch from fdc85f4 to 2cb7164 Compare August 18, 2023 20:43
@agneszitte
agneszitte merged commit c30ea9d into legacy/3x Aug 19, 2023
@agneszitte
agneszitte deleted the mergify/bp/legacy/3x/pr-638 branch August 19, 2023 00:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Specs] ShadowContainer

6 participants