diff --git a/.github/ISSUE_TEMPLATE/1-bug_report.yaml b/.github/ISSUE_TEMPLATE/1-bug_report.yaml index 1e752f18..96a68cfb 100644 --- a/.github/ISSUE_TEMPLATE/1-bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/1-bug_report.yaml @@ -35,13 +35,8 @@ body: attributes: label: NuGet package version options: - - "DevWinUI 9.5.0" - - "DevWinUI 9.4.2" - - "DevWinUI 9.3.0" - - "DevWinUI 9.2.0" - - "DevWinUI 9.1.0" - - "DevWinUI 9.0.0" - - "DevWinUI 8.9.2" + - "DevWinUI 10.0.0" + - "DevWinUI 9.9.4" - type: dropdown attributes: label: IDE diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b8c4f724..67be4d9a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ To get started quickly, watch these YouTube video tutorials: > [!TIP] > Please confirm that your development environment meets the requirements before compiling. -### 1. πŸ–₯️ Visual Studio 2022 +### 1. πŸ–₯️ Visual Studio 2026 Ensure that your installation includes the appropriate workloads: @@ -36,16 +36,7 @@ Ensure that you have following installed: - .Net **10.x** - Windows 10 SDK (10.0.19041) -### 3. πŸ“‚ Solution Format (SLNX) - -This project uses the new **`.slnx`** solution format. - -> ⚠️ This feature is currently in preview β€” enable it in Visual Studio: -> **Tools β†’ Options β†’ Preview Features β†’ Use the new solution format (`.slnx`)** - -![DevWinUI](https://raw.githubusercontent.com/Ghost1372/DevWinUI-Resources/refs/heads/main/DevWinUI-Docs/SLNX.png) - -### 4. Installed the **XAML Styler** extension (Optional for Building, Required for Contribute): +### 3. Installed the **XAML Styler** extension (Optional for Building, Required for Contribute): [XAML Styler for Visual Studio](https://marketplace.visualstudio.com/items?itemName=TeamXavalon.XAMLStyler2022) Make sure your environment matches these requirements to avoid issues during compilation. @@ -57,10 +48,9 @@ Make sure your environment matches these requirements to avoid issues during com ```bash DevWinUI/ dev/ - DevWinUI/ # Core (non-XAML) logic - DevWinUI.Controls/ # Custom controls and styles - Themes/ # Styles, templates, and resources - + DevWinUI/ # Full Library (Custom controls and Styles and Base Library) + Themes/ # Styles, templates, and resources + DevWinUI.Base/ # Core Library DevWinUI.ContextMenu/ # Cross-platform context menu logic DevWinUI.Gallery/ # Demo app for controls VSIX/ # Source code for Visual Studio item templates @@ -89,17 +79,18 @@ To fix certain Visual Studio issues when switching between `Debug` and `Release` ## πŸš€ Debug and Release Configuration -- **Debug** builds target only `.NET 9` for faster development. -- **Release** builds target both `.NET 8` and `.NET 9`, and will automatically generate a NuGet package in `Output/`. +- **Debug** builds target only `.NET 10` for faster development. +- **Release** builds target both `.NET 8`, `.Net 9` and `.NET 10`, and will automatically generate a NuGet package in `Output/`. --- ## 🧱 Project Details -### πŸ“ DevWinUI (Core Library) +### πŸ“ DevWinUI.Base (Core Library) Contains: - Attached properties +- Common - Helpers - Native methods - Services @@ -111,7 +102,7 @@ Contains: --- -### πŸ“ DevWinUI.Controls (Control Library) +### πŸ“ DevWinUI (Controls Library) Contains all XAML-related functionality: - Custom controls @@ -243,13 +234,13 @@ Versions are controlled centrally in `Directory.Build.props` with properties lik 4 -4 +4 3 4 1 -1 +1 0 0 diff --git a/DevWinUI.slnx b/DevWinUI.slnx index 58724a73..7629e99a 100644 --- a/DevWinUI.slnx +++ b/DevWinUI.slnx @@ -44,14 +44,14 @@ - - - + + + \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 4b197c6b..158fba47 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,33 +6,34 @@ DevWinUI.SourceGenerator - 9 + 10 - 9 - 9 - 9 - 9 - 9 + 0 + 0 + 0 + 0 + 0 - 4 - 4 + 0 + 0 0 0 - 4 + 0 - false - -Preview + true + -Preview1 $(PreviewLabel) 1.0.0-alpha.189 0.3.269 - 1.3.2 - - WMC1506;WMC0001;CA1416;CS8632;CS0067;CS0078;CS0649;CS0414;NU1903;NU1902;NU1900;WIN2D0001 + 1.4.0 + 1.8.260204000 + + CS8632;WIN2D0001;WMC1510 $(SolutionDir)Output\ @@ -43,7 +44,7 @@ true 2 True - + Icon.png LICENSE @@ -77,9 +78,8 @@ - - - + + diff --git a/README.md b/README.md index 734cc77f..a2598a68 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ Native AOT Compatible β€” 99% Full support for Native AOT compilation |:---|:---|:---:| |[![Visual Studio Marketplace Version](https://img.shields.io/visual-studio-marketplace/v/MahdiHosseini.DevWinUITemplates?label=DevWinUI-Templates)](https://marketplace.visualstudio.com/items?itemName=MahdiHosseini.DevWinUITemplates)|[![Marketplace](https://img.shields.io/visual-studio-marketplace/d/MahdiHosseini.DevWinUITemplates?logo=visual%20studio&label=DevWinUI-Templates)](https://marketplace.visualstudio.com/items?itemName=MahdiHosseini.DevWinUITemplates)|[![Document](https://img.shields.io/badge/See%20Here-%20?logo=github&label=Document&color=red)](https://github.com/Ghost1372/DevWinUI)| |||| -|[![NuGet Version](https://img.shields.io/nuget/v/DevWinUI?label=DevWinUI)](https://www.nuget.org/packages/DevWinUI)|[![NuGet Download](https://img.shields.io/nuget/dt/DevWinUI?label=DevWinUI)](https://www.nuget.org/packages/DevWinUI)|[![Document](https://img.shields.io/badge/See%20Here-%20?logo=github&label=Document&color=red)](https://Ghost1372.github.io/DevWinUI)| -|[![NuGet Version](https://img.shields.io/nuget/v/DevWinUI.Controls?label=DevWinUI.Controls)](https://www.nuget.org/packages/DevWinUI.Controls)|[![NuGet Download](https://img.shields.io/nuget/dt/DevWinUI.Controls?label=DevWinUI.Controls)](https://www.nuget.org/packages/DevWinUI.Controls)|[![Document](https://img.shields.io/badge/See%20Here-%20?logo=github&label=Document&color=red)](https://Ghost1372.github.io/DevWinUIControls/)| +|[![NuGet Version](https://img.shields.io/nuget/v/DevWinUI.Base?label=DevWinUI.Base)](https://www.nuget.org/packages/DevWinUI.Base)|[![NuGet Download](https://img.shields.io/nuget/dt/DevWinUI.Base?label=DevWinUI.Base)](https://www.nuget.org/packages/DevWinUI.Base)|[![Document](https://img.shields.io/badge/See%20Here-%20?logo=github&label=Document&color=red)](https://Ghost1372.github.io/DevWinUIBase)| +|[![NuGet Version](https://img.shields.io/nuget/v/DevWinUI?label=DevWinUI)](https://www.nuget.org/packages/DevWinUI)|[![NuGet Download](https://img.shields.io/nuget/dt/DevWinUI?label=DevWinUI)](https://www.nuget.org/packages/DevWinUI)|[![Document](https://img.shields.io/badge/See%20Here-%20?logo=github&label=Document&color=red)](https://Ghost1372.github.io/DevWinUI/)| |[![NuGet Version](https://img.shields.io/nuget/v/DevWinUI.ContextMenu?label=DevWinUI.ContextMenu)](https://www.nuget.org/packages/DevWinUI.ContextMenu)|[![NuGet Download](https://img.shields.io/nuget/dt/DevWinUI.ContextMenu?label=DevWinUI.ContextMenu)](https://www.nuget.org/packages/DevWinUI.ContextMenu)|[![Document](https://img.shields.io/badge/See%20Here-%20?logo=github&label=Document&color=red)](https://Ghost1372.github.io/DevWinUIContextMenu)| |[![NuGet Version](https://img.shields.io/nuget/v/DevWinUI.SourceGenerator?label=DevWinUI.SourceGenerator)](https://www.nuget.org/packages/DevWinUI.SourceGenerator)|[![NuGet Download](https://img.shields.io/nuget/dt/DevWinUI.SourceGenerator?label=DevWinUI.SourceGenerator)](https://www.nuget.org/packages/DevWinUI.SourceGenerator)|[![Document](https://img.shields.io/badge/See%20Here-%20?logo=github&label=Document&color=red)](https://Ghost1372.github.io/DevWinUISourceGenerator)| @@ -93,9 +93,41 @@ To compile the project, contribute new features, or explore guidelines: πŸ‘‰ Please refer to our [Contributing Guide](CONTRIBUTING.md) for detailed instructions. +## ⚠️ Important: Package Renaming (v10.0.0+) + +This version introduces **breaking changes** related to package renaming to support meta packages. + +### Package Changes + +| Version | Core Library | Controls Library | +|---------|--------------|------------------| +| **v9.9.4 and below** | `DevWinUI` | `DevWinUI.Controls` | +| **v10.0.0+** | `DevWinUI.Base` | `DevWinUI` | + +### ResourceDictionary Path Changes + +| Version | ResourceDictionary Path | +|---------|------------------------| +| **v9.9.4 and below** | `ms-appx:///DevWinUI.Controls/Themes/Generic.xaml` | +| **v10.0.0+** | `ms-appx:///DevWinUI/Themes/Generic.xaml` | + +### Migration Guide + +**If you are using v10.0.0 or above:** +- Install `DevWinUI.Base` for core utilities only +- Install `DevWinUI` for the full package (controls + core) β€” recommended for most users + +**If you are using v9.9.4 or below:** +- Install `DevWinUI` for core utilities (services, helpers, extensions, managers) +- Install `DevWinUI.Controls` for custom controls, styles, and XAML resources (includes DevWinUI core) + +### Note for Upgrading from v9.9.4 β†’ v10.0.0+ + +Simply replace `DevWinUI.Controls` with `DevWinUI` in your project references and update the ResourceDictionary path as shown above. The `DevWinUI` package now includes everything from the old `DevWinUI.Controls` plus the core library. + --- -## πŸ”₯ DevWinUI πŸ”₯ +## πŸ”₯ DevWinUI.Base πŸ”₯ ### ⚑ What’s Inside? ⚑ - ✨ CycleCollection @@ -128,14 +160,15 @@ To compile the project, contribute new features, or explore guidelines: #### πŸ’» Installation | Nuget ``` -Install-Package DevWinUI +Install-Package DevWinUI.Base ``` --- -## πŸ”₯ DevWinUI.Controls πŸ”₯ +## πŸ”₯ DevWinUI πŸ”₯ ### ⚑ What’s Inside? ⚑ +- ✨ EdgeLighting - ✨ RichButton - ✨ Spoiler - ✨ SidebarView @@ -300,12 +333,12 @@ Install-Package DevWinUI - #### πŸ’» Installation | Nuget ``` -Install-Package DevWinUI.Controls +Install-Package DevWinUI ``` After installing, add the following resource to app.xaml ```xml - + ``` --- @@ -331,6 +364,9 @@ Install-Package DevWinUI.ContextMenu ## πŸ•°οΈ History πŸ•°οΈ +### EdgeLighting +![EdgeLighting](https://raw.githubusercontent.com/ghost1372/DevWinUI-Resources/refs/heads/main/DevWinUI-Docs/EdgeLighting.gif) + ### RichButton ![RichButton](https://raw.githubusercontent.com/ghost1372/DevWinUI-Resources/refs/heads/main/DevWinUI-Docs/RichButton.gif) diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/Constants.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/Constants.cs index 14e187b8..c9c9e69e 100644 --- a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/Constants.cs +++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/Constants.cs @@ -2,9 +2,9 @@ public static class Constants { - internal readonly static string DevWinUI_Core = "DevWinUI"; - internal readonly static string DevWinUI_Controls = "DevWinUI.Controls"; + internal readonly static string DevWinUI_Core = "DevWinUI.Base"; + internal readonly static string DevWinUI_Controls = "DevWinUI"; internal readonly static string DevWinUI_ContextMenu = "DevWinUI.ContextMenu"; - internal readonly static string DevWinUI_Controls_Xaml = ""; + internal readonly static string DevWinUI_SourceGenerator = "DevWinUI.SourceGenerator"; } diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PreDefinedLibrary.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PreDefinedLibrary.cs index 99a8d7a5..287444d0 100644 --- a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PreDefinedLibrary.cs +++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PreDefinedLibrary.cs @@ -162,6 +162,7 @@ public static List InitDevWinUI() { new Library(Constants.DevWinUI_Core, Group.DevWinUI), new Library(Constants.DevWinUI_Controls, Group.DevWinUI), + new Library(Constants.DevWinUI_SourceGenerator, Group.DevWinUI), new Library(Constants.DevWinUI_ContextMenu, Group.DevWinUI) }; return list; diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/SharedWizard.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/SharedWizard.cs index 3d784df3..1574b52e 100644 --- a/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/SharedWizard.cs +++ b/VSIX/DevWinUI_Template/DevWinUI_Template/TemplateWizard/SharedWizard.cs @@ -374,22 +374,6 @@ private void AddReplacementsDictionary(Dictionary replacementsDi } #endregion - #region Blank - - if (WizardConfig.IsBlank) - { - if (WizardConfig.LibraryDic != null && WizardConfig.LibraryDic.ContainsKey(Constants.DevWinUI_Controls)) - { - replacementsDictionary.Add("$DevWinUI.Controls$", Environment.NewLine + Constants.DevWinUI_Controls_Xaml); - } - else - { - replacementsDictionary.Add("$DevWinUI.Controls$", ""); - } - } - - #endregion - #region Add Xaml Dictionary if User Use Extra Lib if (WizardConfig.LibraryDic != null && WizardConfig.LibraryDic.ContainsKey(Constants.DevWinUI_ContextMenu)) { diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Startup/StartupToolWindowControl.xaml b/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Startup/StartupToolWindowControl.xaml index b22e714c..d9d4ac1e 100644 --- a/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Startup/StartupToolWindowControl.xaml +++ b/VSIX/DevWinUI_Template/DevWinUI_Template/Views/Startup/StartupToolWindowControl.xaml @@ -38,8 +38,7 @@ VerticalAlignment="Top"> - + - + + NavigateUri="https://ghost1372.github.io/DevWinUIBase/" /> + NavigateUri="https://ghost1372.github.io/DevWinUI/" /> - + + NavigateUri="https://apps.microsoft.com/detail/DevWinUI%20Gallery%20App/9nmx5x5dlsrq?launch=true&mode=mini" /> @@ -123,9 +118,7 @@ - + - + DevWinUI Templates for WinUI DevWinUI Project Template, help you quickly create a new WinUI 3 App with DevWinUI and MVVM Packages. We prepare your project with the following features: NavigationView, Custom TitleBar, HomeLandingPage and Settings Page (with Theme settings). We also always use the latest version of WindowsAppSDK. diff --git a/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/WinUIApp-Blank-UnitTest.vstemplate b/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/WinUIApp-Blank-UnitTest.vstemplate index c13ddc4d..f0b9f30d 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/WinUIApp-Blank-UnitTest.vstemplate +++ b/VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/WinUIApp-Blank-UnitTest.vstemplate @@ -2,7 +2,7 @@ WinUI Unit Test App - A project to create unit test app for WinUI 3 apps using MSTest. + A project to create unit test app for WinUI apps using MSTest. TemplateIcon.ico WinUIApp-Blank-UnitTest-{BECD9E2D-FD3A-435B-8DE1-DC6F12E707FF} WinRT-Managed diff --git a/VSIX/DevWinUI_Template/WinUIApp-Blank/WinUIApp-Blank.vstemplate b/VSIX/DevWinUI_Template/WinUIApp-Blank/WinUIApp-Blank.vstemplate index 39c49e60..63659eb9 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-Blank/WinUIApp-Blank.vstemplate +++ b/VSIX/DevWinUI_Template/WinUIApp-Blank/WinUIApp-Blank.vstemplate @@ -2,7 +2,7 @@ WinUI Blank App - Creates a new Blank WinUI 3 App without DevWinUI Packages. + Creates a new Blank WinUI App without DevWinUI Packages. TemplateIcon.ico WinUIApp-Blank-{8217C719-97BA-4482-A019-26B4C2EF8469} WinRT-Managed diff --git a/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/App.xaml b/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/App.xaml index 36f6fe9d..b642d844 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/App.xaml +++ b/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/App.xaml @@ -7,7 +7,7 @@ - + $AppDicColors$$AppDicFonts$$AppDicConverters$ diff --git a/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/ViewModels/Settings/AppUpdateSettingViewModel.cs b/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/ViewModels/Settings/AppUpdateSettingViewModel.cs index 919a3d68..a0e00ac7 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/ViewModels/Settings/AppUpdateSettingViewModel.cs +++ b/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/ViewModels/Settings/AppUpdateSettingViewModel.cs @@ -4,22 +4,22 @@ namespace $safeprojectname$.ViewModels; public partial class AppUpdateSettingViewModel : ObservableObject { [ObservableProperty] - public string currentVersion; + public partial string CurrentVersion { get; set; } [ObservableProperty] - public string lastUpdateCheck; + public partial string LastUpdateCheck { get; set; } [ObservableProperty] - public bool isUpdateAvailable; + public partial bool IsUpdateAvailable { get; set; } [ObservableProperty] - public bool isLoading; + public partial bool IsLoading { get; set; } [ObservableProperty] - public bool isCheckButtonEnabled = true; + public partial bool IsCheckButtonEnabled { get; set; } = true; [ObservableProperty] - public string loadingStatus = "Status"; + public partial string LoadingStatus { get; set; } = "Status"; private string ChangeLog = string.Empty; diff --git a/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/WinUIApp-MVVM-NavigationView.vstemplate b/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/WinUIApp-MVVM-NavigationView.vstemplate index b04d5d22..55e0df42 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/WinUIApp-MVVM-NavigationView.vstemplate +++ b/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/WinUIApp-MVVM-NavigationView.vstemplate @@ -2,7 +2,7 @@ WinUI App (MVVM + NavigationView) - Creates a new WinUI 3 App with DevWinUI, MVVM Packages and NavigationView. + Creates a new WinUI App with DevWinUI, MVVM Packages and NavigationView. TemplateIcon.ico WinUIApp-MVVM-NavigationView-{F8D06623-1F58-4E3F-98F6-15178E4BB860} WinRT-Managed @@ -120,7 +120,7 @@ - + diff --git a/VSIX/DevWinUI_Template/WinUIApp-MVVM/App.xaml b/VSIX/DevWinUI_Template/WinUIApp-MVVM/App.xaml index 6a09ca8a..12508749 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-MVVM/App.xaml +++ b/VSIX/DevWinUI_Template/WinUIApp-MVVM/App.xaml @@ -7,7 +7,7 @@ - + $AppDicColors$$AppDicFonts$$AppDicConverters$$AppDicStyles$ diff --git a/VSIX/DevWinUI_Template/WinUIApp-MVVM/WinUIApp-MVVM.vstemplate b/VSIX/DevWinUI_Template/WinUIApp-MVVM/WinUIApp-MVVM.vstemplate index 404a062c..b51c63a7 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-MVVM/WinUIApp-MVVM.vstemplate +++ b/VSIX/DevWinUI_Template/WinUIApp-MVVM/WinUIApp-MVVM.vstemplate @@ -2,7 +2,7 @@ WinUI App (MVVM) - Creates a new WinUI 3 App with DevWinUI and MVVM Packages. + Creates a new WinUI App with DevWinUI and MVVM Packages. TemplateIcon.ico WinUIApp-MVVM-{22A41A5C-0D49-49C8-81C1-E3E34C7916AB} WinRT-Managed @@ -76,7 +76,7 @@ - + diff --git a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/App.xaml b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/App.xaml index 36f6fe9d..b642d844 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/App.xaml +++ b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/App.xaml @@ -7,7 +7,7 @@ - + $AppDicColors$$AppDicFonts$$AppDicConverters$ diff --git a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/WinUIApp-NavigationView.vstemplate b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/WinUIApp-NavigationView.vstemplate index a3087fdb..602fe060 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/WinUIApp-NavigationView.vstemplate +++ b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/WinUIApp-NavigationView.vstemplate @@ -2,7 +2,7 @@ WinUI App (NavigationView) - Creates a new WinUI 3 App with DevWinUI Packages and NavigationView. + Creates a new WinUI App with DevWinUI Packages and NavigationView. TemplateIcon.ico WinUIApp-NavigationView-{4171FCC2-74F0-4402-A8E3-04D38730C092} WinRT-Managed @@ -108,7 +108,7 @@ - + diff --git a/VSIX/DevWinUI_Template/WinUIApp/App.xaml b/VSIX/DevWinUI_Template/WinUIApp/App.xaml index 6a09ca8a..12508749 100644 --- a/VSIX/DevWinUI_Template/WinUIApp/App.xaml +++ b/VSIX/DevWinUI_Template/WinUIApp/App.xaml @@ -7,7 +7,7 @@ - + $AppDicColors$$AppDicFonts$$AppDicConverters$$AppDicStyles$ diff --git a/VSIX/DevWinUI_Template/WinUIApp/WinUIApp.vstemplate b/VSIX/DevWinUI_Template/WinUIApp/WinUIApp.vstemplate index ba360e09..884e4924 100644 --- a/VSIX/DevWinUI_Template/WinUIApp/WinUIApp.vstemplate +++ b/VSIX/DevWinUI_Template/WinUIApp/WinUIApp.vstemplate @@ -2,7 +2,7 @@ WinUI App - Creates a new WinUI 3 App with DevWinUI Packages. + Creates a new WinUI App with DevWinUI Packages. TemplateIcon.ico WinUIApp-{07E96C59-27D7-497F-B096-08922AC9C65F} WinRT-Managed @@ -68,7 +68,7 @@ - + diff --git a/dev/DevWinUI/Attach/BrushAttach.cs b/dev/DevWinUI.Base/Attach/BrushAttach.cs similarity index 100% rename from dev/DevWinUI/Attach/BrushAttach.cs rename to dev/DevWinUI.Base/Attach/BrushAttach.cs diff --git a/dev/DevWinUI/Attach/FlipViewAttach.cs b/dev/DevWinUI.Base/Attach/FlipViewAttach.cs similarity index 100% rename from dev/DevWinUI/Attach/FlipViewAttach.cs rename to dev/DevWinUI.Base/Attach/FlipViewAttach.cs diff --git a/dev/DevWinUI/Attach/PanelAttach.cs b/dev/DevWinUI.Base/Attach/PanelAttach.cs similarity index 100% rename from dev/DevWinUI/Attach/PanelAttach.cs rename to dev/DevWinUI.Base/Attach/PanelAttach.cs diff --git a/dev/DevWinUI/Attach/ThemeServiceAttach.cs b/dev/DevWinUI.Base/Attach/ThemeServiceAttach.cs similarity index 100% rename from dev/DevWinUI/Attach/ThemeServiceAttach.cs rename to dev/DevWinUI.Base/Attach/ThemeServiceAttach.cs diff --git a/dev/DevWinUI/Attach/TitleBarAttach.cs b/dev/DevWinUI.Base/Attach/TitleBarAttach.cs similarity index 100% rename from dev/DevWinUI/Attach/TitleBarAttach.cs rename to dev/DevWinUI.Base/Attach/TitleBarAttach.cs diff --git a/dev/DevWinUI/Common/Backdrop/AcrylicSystemBackdrop.cs b/dev/DevWinUI.Base/Common/Backdrop/AcrylicSystemBackdrop.cs similarity index 100% rename from dev/DevWinUI/Common/Backdrop/AcrylicSystemBackdrop.cs rename to dev/DevWinUI.Base/Common/Backdrop/AcrylicSystemBackdrop.cs diff --git a/dev/DevWinUI/Common/Backdrop/CompositionBrushBackdrop.cs b/dev/DevWinUI.Base/Common/Backdrop/CompositionBrushBackdrop.cs similarity index 100% rename from dev/DevWinUI/Common/Backdrop/CompositionBrushBackdrop.cs rename to dev/DevWinUI.Base/Common/Backdrop/CompositionBrushBackdrop.cs diff --git a/dev/DevWinUI/Common/Backdrop/MicaSystemBackdrop.cs b/dev/DevWinUI.Base/Common/Backdrop/MicaSystemBackdrop.cs similarity index 100% rename from dev/DevWinUI/Common/Backdrop/MicaSystemBackdrop.cs rename to dev/DevWinUI.Base/Common/Backdrop/MicaSystemBackdrop.cs diff --git a/dev/DevWinUI/Common/Backdrop/TransparentBackdrop.cs b/dev/DevWinUI.Base/Common/Backdrop/TransparentBackdrop.cs similarity index 100% rename from dev/DevWinUI/Common/Backdrop/TransparentBackdrop.cs rename to dev/DevWinUI.Base/Common/Backdrop/TransparentBackdrop.cs diff --git a/dev/DevWinUI/Common/BreadcrumbNavigator/BreadcrumbNavigator.Attach.cs b/dev/DevWinUI.Base/Common/BreadcrumbNavigator/BreadcrumbNavigator.Attach.cs similarity index 100% rename from dev/DevWinUI/Common/BreadcrumbNavigator/BreadcrumbNavigator.Attach.cs rename to dev/DevWinUI.Base/Common/BreadcrumbNavigator/BreadcrumbNavigator.Attach.cs diff --git a/dev/DevWinUI/Common/BreadcrumbNavigator/BreadcrumbNavigator.cs b/dev/DevWinUI.Base/Common/BreadcrumbNavigator/BreadcrumbNavigator.cs similarity index 100% rename from dev/DevWinUI/Common/BreadcrumbNavigator/BreadcrumbNavigator.cs rename to dev/DevWinUI.Base/Common/BreadcrumbNavigator/BreadcrumbNavigator.cs diff --git a/dev/DevWinUI/Common/BreadcrumbNavigator/BreadcrumbNavigatorHeaderVisibilityOptions.cs b/dev/DevWinUI.Base/Common/BreadcrumbNavigator/BreadcrumbNavigatorHeaderVisibilityOptions.cs similarity index 100% rename from dev/DevWinUI/Common/BreadcrumbNavigator/BreadcrumbNavigatorHeaderVisibilityOptions.cs rename to dev/DevWinUI.Base/Common/BreadcrumbNavigator/BreadcrumbNavigatorHeaderVisibilityOptions.cs diff --git a/dev/DevWinUI/Common/BreadcrumbNavigator/BreadcrumbPageConfig.cs b/dev/DevWinUI.Base/Common/BreadcrumbNavigator/BreadcrumbPageConfig.cs similarity index 100% rename from dev/DevWinUI/Common/BreadcrumbNavigator/BreadcrumbPageConfig.cs rename to dev/DevWinUI.Base/Common/BreadcrumbNavigator/BreadcrumbPageConfig.cs diff --git a/dev/DevWinUI/Common/BreadcrumbNavigator/BreadcrumbStep.cs b/dev/DevWinUI.Base/Common/BreadcrumbNavigator/BreadcrumbStep.cs similarity index 100% rename from dev/DevWinUI/Common/BreadcrumbNavigator/BreadcrumbStep.cs rename to dev/DevWinUI.Base/Common/BreadcrumbNavigator/BreadcrumbStep.cs diff --git a/dev/DevWinUI/Common/ColorAnalyzer/AnalyzedColor.cs b/dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzedColor.cs similarity index 100% rename from dev/DevWinUI/Common/ColorAnalyzer/AnalyzedColor.cs rename to dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzedColor.cs diff --git a/dev/DevWinUI/Common/ColorAnalyzer/AnalyzerSelectors/AccentColorAnalyzer.cs b/dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzerSelectors/AccentColorAnalyzer.cs similarity index 100% rename from dev/DevWinUI/Common/ColorAnalyzer/AnalyzerSelectors/AccentColorAnalyzer.cs rename to dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzerSelectors/AccentColorAnalyzer.cs diff --git a/dev/DevWinUI/Common/ColorAnalyzer/AnalyzerSelectors/BaseColorAnalyzer.cs b/dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzerSelectors/BaseColorAnalyzer.cs similarity index 100% rename from dev/DevWinUI/Common/ColorAnalyzer/AnalyzerSelectors/BaseColorAnalyzer.cs rename to dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzerSelectors/BaseColorAnalyzer.cs diff --git a/dev/DevWinUI/Common/ColorAnalyzer/AnalyzerSelectors/ColorAnalyzerExtensions.cs b/dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzerSelectors/ColorAnalyzerExtensions.cs similarity index 100% rename from dev/DevWinUI/Common/ColorAnalyzer/AnalyzerSelectors/ColorAnalyzerExtensions.cs rename to dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzerSelectors/ColorAnalyzerExtensions.cs diff --git a/dev/DevWinUI/Common/ColorAnalyzer/AnalyzerSelectors/ColorAnalyzerSelector.cs b/dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzerSelectors/ColorAnalyzerSelector.cs similarity index 100% rename from dev/DevWinUI/Common/ColorAnalyzer/AnalyzerSelectors/ColorAnalyzerSelector.cs rename to dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzerSelectors/ColorAnalyzerSelector.cs diff --git a/dev/DevWinUI/Common/ColorAnalyzer/AnalyzerSelectors/ColorWeightAnalyzer.cs b/dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzerSelectors/ColorWeightAnalyzer.cs similarity index 100% rename from dev/DevWinUI/Common/ColorAnalyzer/AnalyzerSelectors/ColorWeightAnalyzer.cs rename to dev/DevWinUI.Base/Common/ColorAnalyzer/AnalyzerSelectors/ColorWeightAnalyzer.cs diff --git a/dev/DevWinUI/Common/ColorAnalyzer/ColorAnalyzer.DBScan.cs b/dev/DevWinUI.Base/Common/ColorAnalyzer/ColorAnalyzer.DBScan.cs similarity index 100% rename from dev/DevWinUI/Common/ColorAnalyzer/ColorAnalyzer.DBScan.cs rename to dev/DevWinUI.Base/Common/ColorAnalyzer/ColorAnalyzer.DBScan.cs diff --git a/dev/DevWinUI/Common/ColorAnalyzer/ColorAnalyzer.KMeans.cs b/dev/DevWinUI.Base/Common/ColorAnalyzer/ColorAnalyzer.KMeans.cs similarity index 100% rename from dev/DevWinUI/Common/ColorAnalyzer/ColorAnalyzer.KMeans.cs rename to dev/DevWinUI.Base/Common/ColorAnalyzer/ColorAnalyzer.KMeans.cs diff --git a/dev/DevWinUI/Common/ColorAnalyzer/ColorAnalyzer.Properties.cs b/dev/DevWinUI.Base/Common/ColorAnalyzer/ColorAnalyzer.Properties.cs similarity index 100% rename from dev/DevWinUI/Common/ColorAnalyzer/ColorAnalyzer.Properties.cs rename to dev/DevWinUI.Base/Common/ColorAnalyzer/ColorAnalyzer.Properties.cs diff --git a/dev/DevWinUI/Common/ColorAnalyzer/ColorAnalyzer.cs b/dev/DevWinUI.Base/Common/ColorAnalyzer/ColorAnalyzer.cs similarity index 100% rename from dev/DevWinUI/Common/ColorAnalyzer/ColorAnalyzer.cs rename to dev/DevWinUI.Base/Common/ColorAnalyzer/ColorAnalyzer.cs diff --git a/dev/DevWinUI/Common/Command/DelegateCommand.cs b/dev/DevWinUI.Base/Common/Command/DelegateCommand.cs similarity index 100% rename from dev/DevWinUI/Common/Command/DelegateCommand.cs rename to dev/DevWinUI.Base/Common/Command/DelegateCommand.cs diff --git a/dev/DevWinUI/Common/Command/Internals/DelegateCommand/AsyncDelegateCommand.cs b/dev/DevWinUI.Base/Common/Command/Internals/DelegateCommand/AsyncDelegateCommand.cs similarity index 100% rename from dev/DevWinUI/Common/Command/Internals/DelegateCommand/AsyncDelegateCommand.cs rename to dev/DevWinUI.Base/Common/Command/Internals/DelegateCommand/AsyncDelegateCommand.cs diff --git a/dev/DevWinUI/Common/Command/Internals/DelegateCommand/IDelegateCommand.cs b/dev/DevWinUI.Base/Common/Command/Internals/DelegateCommand/IDelegateCommand.cs similarity index 100% rename from dev/DevWinUI/Common/Command/Internals/DelegateCommand/IDelegateCommand.cs rename to dev/DevWinUI.Base/Common/Command/Internals/DelegateCommand/IDelegateCommand.cs diff --git a/dev/DevWinUI/Common/Command/Internals/DelegateCommand/SyncDelegateCommand.cs b/dev/DevWinUI.Base/Common/Command/Internals/DelegateCommand/SyncDelegateCommand.cs similarity index 100% rename from dev/DevWinUI/Common/Command/Internals/DelegateCommand/SyncDelegateCommand.cs rename to dev/DevWinUI.Base/Common/Command/Internals/DelegateCommand/SyncDelegateCommand.cs diff --git a/dev/DevWinUI/Common/CompositionAnimationController.cs b/dev/DevWinUI.Base/Common/CompositionAnimationController.cs similarity index 100% rename from dev/DevWinUI/Common/CompositionAnimationController.cs rename to dev/DevWinUI.Base/Common/CompositionAnimationController.cs diff --git a/dev/DevWinUI/Common/ContrastAnalyzer/ContrastAnalyzer.Callbacks.cs b/dev/DevWinUI.Base/Common/ContrastAnalyzer/ContrastAnalyzer.Callbacks.cs similarity index 100% rename from dev/DevWinUI/Common/ContrastAnalyzer/ContrastAnalyzer.Callbacks.cs rename to dev/DevWinUI.Base/Common/ContrastAnalyzer/ContrastAnalyzer.Callbacks.cs diff --git a/dev/DevWinUI/Common/ContrastAnalyzer/ContrastAnalyzer.Properties.cs b/dev/DevWinUI.Base/Common/ContrastAnalyzer/ContrastAnalyzer.Properties.cs similarity index 100% rename from dev/DevWinUI/Common/ContrastAnalyzer/ContrastAnalyzer.Properties.cs rename to dev/DevWinUI.Base/Common/ContrastAnalyzer/ContrastAnalyzer.Properties.cs diff --git a/dev/DevWinUI/Common/ContrastAnalyzer/ContrastAnalyzer.cs b/dev/DevWinUI.Base/Common/ContrastAnalyzer/ContrastAnalyzer.cs similarity index 100% rename from dev/DevWinUI/Common/ContrastAnalyzer/ContrastAnalyzer.cs rename to dev/DevWinUI.Base/Common/ContrastAnalyzer/ContrastAnalyzer.cs diff --git a/dev/DevWinUI/Common/ControlTokenManager.cs b/dev/DevWinUI.Base/Common/ControlTokenManager.cs similarity index 100% rename from dev/DevWinUI/Common/ControlTokenManager.cs rename to dev/DevWinUI.Base/Common/ControlTokenManager.cs diff --git a/dev/DevWinUI/Common/CycleCollection/CycleCollection.cs b/dev/DevWinUI.Base/Common/CycleCollection/CycleCollection.cs similarity index 100% rename from dev/DevWinUI/Common/CycleCollection/CycleCollection.cs rename to dev/DevWinUI.Base/Common/CycleCollection/CycleCollection.cs diff --git a/dev/DevWinUI/Common/CycleCollection/ICycleCollection.cs b/dev/DevWinUI.Base/Common/CycleCollection/ICycleCollection.cs similarity index 100% rename from dev/DevWinUI/Common/CycleCollection/ICycleCollection.cs rename to dev/DevWinUI.Base/Common/CycleCollection/ICycleCollection.cs diff --git a/dev/DevWinUI/Common/Dispatcher/AsyncDelegates.cs b/dev/DevWinUI.Base/Common/Dispatcher/AsyncDelegates.cs similarity index 100% rename from dev/DevWinUI/Common/Dispatcher/AsyncDelegates.cs rename to dev/DevWinUI.Base/Common/Dispatcher/AsyncDelegates.cs diff --git a/dev/DevWinUI/Common/Dispatcher/Dispatcher.cs b/dev/DevWinUI.Base/Common/Dispatcher/Dispatcher.cs similarity index 100% rename from dev/DevWinUI/Common/Dispatcher/Dispatcher.cs rename to dev/DevWinUI.Base/Common/Dispatcher/Dispatcher.cs diff --git a/dev/DevWinUI/Common/Dispatcher/IDispatcher.cs b/dev/DevWinUI.Base/Common/Dispatcher/IDispatcher.cs similarity index 100% rename from dev/DevWinUI/Common/Dispatcher/IDispatcher.cs rename to dev/DevWinUI.Base/Common/Dispatcher/IDispatcher.cs diff --git a/dev/DevWinUI/Common/GenerateAutoSaveOnChangeAttribute.cs b/dev/DevWinUI.Base/Common/GenerateAutoSaveOnChangeAttribute.cs similarity index 100% rename from dev/DevWinUI/Common/GenerateAutoSaveOnChangeAttribute.cs rename to dev/DevWinUI.Base/Common/GenerateAutoSaveOnChangeAttribute.cs diff --git a/dev/DevWinUI/Common/GenericCompare.cs b/dev/DevWinUI.Base/Common/GenericCompare.cs similarity index 100% rename from dev/DevWinUI/Common/GenericCompare.cs rename to dev/DevWinUI.Base/Common/GenericCompare.cs diff --git a/dev/DevWinUI/Common/ITitleBarAutoSuggestBoxAware.cs b/dev/DevWinUI.Base/Common/ITitleBarAutoSuggestBoxAware.cs similarity index 100% rename from dev/DevWinUI/Common/ITitleBarAutoSuggestBoxAware.cs rename to dev/DevWinUI.Base/Common/ITitleBarAutoSuggestBoxAware.cs diff --git a/dev/DevWinUI/Common/LegacyMessageBox/LegacyMessageBox.cs b/dev/DevWinUI.Base/Common/LegacyMessageBox/LegacyMessageBox.cs similarity index 100% rename from dev/DevWinUI/Common/LegacyMessageBox/LegacyMessageBox.cs rename to dev/DevWinUI.Base/Common/LegacyMessageBox/LegacyMessageBox.cs diff --git a/dev/DevWinUI/Common/LegacyMessageBox/MessageBoxResult.cs b/dev/DevWinUI.Base/Common/LegacyMessageBox/MessageBoxResult.cs similarity index 100% rename from dev/DevWinUI/Common/LegacyMessageBox/MessageBoxResult.cs rename to dev/DevWinUI.Base/Common/LegacyMessageBox/MessageBoxResult.cs diff --git a/dev/DevWinUI/Common/LegacyMessageBox/MessageBoxStyle.cs b/dev/DevWinUI.Base/Common/LegacyMessageBox/MessageBoxStyle.cs similarity index 100% rename from dev/DevWinUI/Common/LegacyMessageBox/MessageBoxStyle.cs rename to dev/DevWinUI.Base/Common/LegacyMessageBox/MessageBoxStyle.cs diff --git a/dev/DevWinUI/Common/Messaging/Message.cs b/dev/DevWinUI.Base/Common/Messaging/Message.cs similarity index 100% rename from dev/DevWinUI/Common/Messaging/Message.cs rename to dev/DevWinUI.Base/Common/Messaging/Message.cs diff --git a/dev/DevWinUI/Common/Messaging/WindowMessageEventArgs.cs b/dev/DevWinUI.Base/Common/Messaging/WindowMessageEventArgs.cs similarity index 100% rename from dev/DevWinUI/Common/Messaging/WindowMessageEventArgs.cs rename to dev/DevWinUI.Base/Common/Messaging/WindowMessageEventArgs.cs diff --git a/dev/DevWinUI/Common/Messaging/WindowMessageMonitor.cs b/dev/DevWinUI.Base/Common/Messaging/WindowMessageMonitor.cs similarity index 100% rename from dev/DevWinUI/Common/Messaging/WindowMessageMonitor.cs rename to dev/DevWinUI.Base/Common/Messaging/WindowMessageMonitor.cs diff --git a/dev/DevWinUI/Common/Messaging/WndProcHelper.cs b/dev/DevWinUI.Base/Common/Messaging/WndProcHelper.cs similarity index 100% rename from dev/DevWinUI/Common/Messaging/WndProcHelper.cs rename to dev/DevWinUI.Base/Common/Messaging/WndProcHelper.cs diff --git a/dev/DevWinUI/Common/ModernSystemMenu/ModernSystemMenu.Command.cs b/dev/DevWinUI.Base/Common/ModernSystemMenu/ModernSystemMenu.Command.cs similarity index 100% rename from dev/DevWinUI/Common/ModernSystemMenu/ModernSystemMenu.Command.cs rename to dev/DevWinUI.Base/Common/ModernSystemMenu/ModernSystemMenu.Command.cs diff --git a/dev/DevWinUI/Common/ModernSystemMenu/ModernSystemMenu.cs b/dev/DevWinUI.Base/Common/ModernSystemMenu/ModernSystemMenu.cs similarity index 100% rename from dev/DevWinUI/Common/ModernSystemMenu/ModernSystemMenu.cs rename to dev/DevWinUI.Base/Common/ModernSystemMenu/ModernSystemMenu.cs diff --git a/dev/DevWinUI/Common/PausableDispatcherTimer.cs b/dev/DevWinUI.Base/Common/PausableDispatcherTimer.cs similarity index 100% rename from dev/DevWinUI/Common/PausableDispatcherTimer.cs rename to dev/DevWinUI.Base/Common/PausableDispatcherTimer.cs diff --git a/dev/DevWinUI/Common/PersianDateTime/PersianDateTime.cs b/dev/DevWinUI.Base/Common/PersianDateTime/PersianDateTime.cs similarity index 100% rename from dev/DevWinUI/Common/PersianDateTime/PersianDateTime.cs rename to dev/DevWinUI.Base/Common/PersianDateTime/PersianDateTime.cs diff --git a/dev/DevWinUI/Common/PersianDateTime/PersianDateTimeToString.cs b/dev/DevWinUI.Base/Common/PersianDateTime/PersianDateTimeToString.cs similarity index 100% rename from dev/DevWinUI/Common/PersianDateTime/PersianDateTimeToString.cs rename to dev/DevWinUI.Base/Common/PersianDateTime/PersianDateTimeToString.cs diff --git a/dev/DevWinUI/Common/PersianDateTime/PersianUtil.cs b/dev/DevWinUI.Base/Common/PersianDateTime/PersianUtil.cs similarity index 100% rename from dev/DevWinUI/Common/PersianDateTime/PersianUtil.cs rename to dev/DevWinUI.Base/Common/PersianDateTime/PersianUtil.cs diff --git a/dev/DevWinUI/Common/PopupBackdropManager.cs b/dev/DevWinUI.Base/Common/PopupBackdropManager.cs similarity index 100% rename from dev/DevWinUI/Common/PopupBackdropManager.cs rename to dev/DevWinUI.Base/Common/PopupBackdropManager.cs diff --git a/dev/DevWinUI/Common/RainbowFrame/IRainbowFrame.cs b/dev/DevWinUI.Base/Common/RainbowFrame/IRainbowFrame.cs similarity index 100% rename from dev/DevWinUI/Common/RainbowFrame/IRainbowFrame.cs rename to dev/DevWinUI.Base/Common/RainbowFrame/IRainbowFrame.cs diff --git a/dev/DevWinUI/Common/RainbowFrame/RainbowFrame.cs b/dev/DevWinUI.Base/Common/RainbowFrame/RainbowFrame.cs similarity index 100% rename from dev/DevWinUI/Common/RainbowFrame/RainbowFrame.cs rename to dev/DevWinUI.Base/Common/RainbowFrame/RainbowFrame.cs diff --git a/dev/DevWinUI/Common/RelativeDate.cs b/dev/DevWinUI.Base/Common/RelativeDate.cs similarity index 100% rename from dev/DevWinUI/Common/RelativeDate.cs rename to dev/DevWinUI.Base/Common/RelativeDate.cs diff --git a/dev/DevWinUI/Common/SemanticVersion/ReadOnlyList.cs b/dev/DevWinUI.Base/Common/SemanticVersion/ReadOnlyList.cs similarity index 100% rename from dev/DevWinUI/Common/SemanticVersion/ReadOnlyList.cs rename to dev/DevWinUI.Base/Common/SemanticVersion/ReadOnlyList.cs diff --git a/dev/DevWinUI/Common/SemanticVersion/SemanticVersion.cs b/dev/DevWinUI.Base/Common/SemanticVersion/SemanticVersion.cs similarity index 100% rename from dev/DevWinUI/Common/SemanticVersion/SemanticVersion.cs rename to dev/DevWinUI.Base/Common/SemanticVersion/SemanticVersion.cs diff --git a/dev/DevWinUI/Common/SemanticVersion/SemanticVersionComparer.cs b/dev/DevWinUI.Base/Common/SemanticVersion/SemanticVersionComparer.cs similarity index 100% rename from dev/DevWinUI/Common/SemanticVersion/SemanticVersionComparer.cs rename to dev/DevWinUI.Base/Common/SemanticVersion/SemanticVersionComparer.cs diff --git a/dev/DevWinUI/Common/SingleInstanceApp.cs b/dev/DevWinUI.Base/Common/SingleInstanceApp.cs similarity index 100% rename from dev/DevWinUI/Common/SingleInstanceApp.cs rename to dev/DevWinUI.Base/Common/SingleInstanceApp.cs diff --git a/dev/DevWinUI/Common/SnapLayoutManager.cs b/dev/DevWinUI.Base/Common/SnapLayoutManager.cs similarity index 100% rename from dev/DevWinUI/Common/SnapLayoutManager.cs rename to dev/DevWinUI.Base/Common/SnapLayoutManager.cs diff --git a/dev/DevWinUI/Common/TrayIcon/SystemTrayIcon.cs b/dev/DevWinUI.Base/Common/TrayIcon/SystemTrayIcon.cs similarity index 100% rename from dev/DevWinUI/Common/TrayIcon/SystemTrayIcon.cs rename to dev/DevWinUI.Base/Common/TrayIcon/SystemTrayIcon.cs diff --git a/dev/DevWinUI/Common/TrayIcon/SystemTrayIconEventArgs.cs b/dev/DevWinUI.Base/Common/TrayIcon/SystemTrayIconEventArgs.cs similarity index 100% rename from dev/DevWinUI/Common/TrayIcon/SystemTrayIconEventArgs.cs rename to dev/DevWinUI.Base/Common/TrayIcon/SystemTrayIconEventArgs.cs diff --git a/dev/DevWinUI/Common/Window/ModalWindow.cs b/dev/DevWinUI.Base/Common/Window/ModalWindow.cs similarity index 100% rename from dev/DevWinUI/Common/Window/ModalWindow.cs rename to dev/DevWinUI.Base/Common/Window/ModalWindow.cs diff --git a/dev/DevWinUI/Common/Window/SmoothWindowResizer.cs b/dev/DevWinUI.Base/Common/Window/SmoothWindowResizer.cs similarity index 100% rename from dev/DevWinUI/Common/Window/SmoothWindowResizer.cs rename to dev/DevWinUI.Base/Common/Window/SmoothWindowResizer.cs diff --git a/dev/DevWinUI/Common/Window/WindowManager.cs b/dev/DevWinUI.Base/Common/Window/WindowManager.cs similarity index 100% rename from dev/DevWinUI/Common/Window/WindowManager.cs rename to dev/DevWinUI.Base/Common/Window/WindowManager.cs diff --git a/dev/DevWinUI.Base/DevWinUI.Base.csproj b/dev/DevWinUI.Base/DevWinUI.Base.csproj new file mode 100644 index 00000000..9ef209dd --- /dev/null +++ b/dev/DevWinUI.Base/DevWinUI.Base.csproj @@ -0,0 +1,15 @@ +ο»Ώ + + $(LibraryMajorVersion).$(DevWinUI_Base_MinorVersion).$(DevWinUI_Base_PatchVersion)$(PreviewBuildSuffix) + $(BaseNamespace).Base + $(BaseNamespace).Base + Experience WinUI 3 quickly and easily with the help of Core, Everything you need to develop an application is gathered in one place. Helpers, Extensions... + winui winui3 win11 xaml core DevWinUI Common SettingsUI settings theme styles projectreunion winappsdk windowsappsdk wasdk reunion SettingsControls settingsexpander settingscard composition + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + \ No newline at end of file diff --git a/dev/DevWinUI/Extensions/Collections/CollectionExtension.cs b/dev/DevWinUI.Base/Extensions/Collections/CollectionExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Collections/CollectionExtension.cs rename to dev/DevWinUI.Base/Extensions/Collections/CollectionExtension.cs diff --git a/dev/DevWinUI/Extensions/Collections/DictionaryExtension.cs b/dev/DevWinUI.Base/Extensions/Collections/DictionaryExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Collections/DictionaryExtension.cs rename to dev/DevWinUI.Base/Extensions/Collections/DictionaryExtension.cs diff --git a/dev/DevWinUI/Extensions/Collections/ListExtension.cs b/dev/DevWinUI.Base/Extensions/Collections/ListExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Collections/ListExtension.cs rename to dev/DevWinUI.Base/Extensions/Collections/ListExtension.cs diff --git a/dev/DevWinUI/Extensions/Collections/ObservableCollectionExtensions.cs b/dev/DevWinUI.Base/Extensions/Collections/ObservableCollectionExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/Collections/ObservableCollectionExtensions.cs rename to dev/DevWinUI.Base/Extensions/Collections/ObservableCollectionExtensions.cs diff --git a/dev/DevWinUI/Extensions/Collections/ResourceDictionaryExtension.cs b/dev/DevWinUI.Base/Extensions/Collections/ResourceDictionaryExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Collections/ResourceDictionaryExtension.cs rename to dev/DevWinUI.Base/Extensions/Collections/ResourceDictionaryExtension.cs diff --git a/dev/DevWinUI/Extensions/ColorExtensions.cs b/dev/DevWinUI.Base/Extensions/ColorExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/ColorExtensions.cs rename to dev/DevWinUI.Base/Extensions/ColorExtensions.cs diff --git a/dev/DevWinUI/Extensions/Composition/CompositionExtensions.cs b/dev/DevWinUI.Base/Extensions/Composition/CompositionExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/Composition/CompositionExtensions.cs rename to dev/DevWinUI.Base/Extensions/Composition/CompositionExtensions.cs diff --git a/dev/DevWinUI/Extensions/Composition/Enums/CompositionAnimationAxis.cs b/dev/DevWinUI.Base/Extensions/Composition/Enums/CompositionAnimationAxis.cs similarity index 100% rename from dev/DevWinUI/Extensions/Composition/Enums/CompositionAnimationAxis.cs rename to dev/DevWinUI.Base/Extensions/Composition/Enums/CompositionAnimationAxis.cs diff --git a/dev/DevWinUI/Extensions/Composition/Enums/CompositionClipAnimationDirection.cs b/dev/DevWinUI.Base/Extensions/Composition/Enums/CompositionClipAnimationDirection.cs similarity index 100% rename from dev/DevWinUI/Extensions/Composition/Enums/CompositionClipAnimationDirection.cs rename to dev/DevWinUI.Base/Extensions/Composition/Enums/CompositionClipAnimationDirection.cs diff --git a/dev/DevWinUI/Extensions/Composition/Enums/CompositionFlickDirection.cs b/dev/DevWinUI.Base/Extensions/Composition/Enums/CompositionFlickDirection.cs similarity index 100% rename from dev/DevWinUI/Extensions/Composition/Enums/CompositionFlickDirection.cs rename to dev/DevWinUI.Base/Extensions/Composition/Enums/CompositionFlickDirection.cs diff --git a/dev/DevWinUI/Extensions/Composition/Enums/CompositionVisualPropertyType.cs b/dev/DevWinUI.Base/Extensions/Composition/Enums/CompositionVisualPropertyType.cs similarity index 100% rename from dev/DevWinUI/Extensions/Composition/Enums/CompositionVisualPropertyType.cs rename to dev/DevWinUI.Base/Extensions/Composition/Enums/CompositionVisualPropertyType.cs diff --git a/dev/DevWinUI/Extensions/ContentDialogExtensions.cs b/dev/DevWinUI.Base/Extensions/ContentDialogExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/ContentDialogExtensions.cs rename to dev/DevWinUI.Base/Extensions/ContentDialogExtensions.cs diff --git a/dev/DevWinUI/Extensions/DateTimeExtension.cs b/dev/DevWinUI.Base/Extensions/DateTimeExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/DateTimeExtension.cs rename to dev/DevWinUI.Base/Extensions/DateTimeExtension.cs diff --git a/dev/DevWinUI/Extensions/DependencyObject/DependencyObjectExtensions.Find!.cs b/dev/DevWinUI.Base/Extensions/DependencyObject/DependencyObjectExtensions.Find!.cs similarity index 98% rename from dev/DevWinUI/Extensions/DependencyObject/DependencyObjectExtensions.Find!.cs rename to dev/DevWinUI.Base/Extensions/DependencyObject/DependencyObjectExtensions.Find!.cs index abff34c7..049ae192 100644 --- a/dev/DevWinUI/Extensions/DependencyObject/DependencyObjectExtensions.Find!.cs +++ b/dev/DevWinUI.Base/Extensions/DependencyObject/DependencyObjectExtensions.Find!.cs @@ -1,4 +1,5 @@ ο»Ώnamespace DevWinUI; +#pragma warning disable IL2070, IL2075 public partial class DependencyObjectExtensions { @@ -149,3 +150,4 @@ public static bool TryGetValue(this DependencyObject dependencyObject, Dependenc internal record class DependencyPropertyInfo(DependencyProperty Definition, string PropertyName, Type? PropertyType, Type OwnerType, bool IsAttached); } +#pragma warning restore IL2070, IL2075 diff --git a/dev/DevWinUI/Extensions/DependencyObject/DependencyObjectExtensions.Find.cs b/dev/DevWinUI.Base/Extensions/DependencyObject/DependencyObjectExtensions.Find.cs similarity index 100% rename from dev/DevWinUI/Extensions/DependencyObject/DependencyObjectExtensions.Find.cs rename to dev/DevWinUI.Base/Extensions/DependencyObject/DependencyObjectExtensions.Find.cs diff --git a/dev/DevWinUI/Extensions/DependencyObject/DependencyObjectExtensions.cs b/dev/DevWinUI.Base/Extensions/DependencyObject/DependencyObjectExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/DependencyObject/DependencyObjectExtensions.cs rename to dev/DevWinUI.Base/Extensions/DependencyObject/DependencyObjectExtensions.cs diff --git a/dev/DevWinUI/Extensions/DispatcherExtensions.cs b/dev/DevWinUI.Base/Extensions/DispatcherExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/DispatcherExtensions.cs rename to dev/DevWinUI.Base/Extensions/DispatcherExtensions.cs diff --git a/dev/DevWinUI/Extensions/DispatcherQueueExtensions.cs b/dev/DevWinUI.Base/Extensions/DispatcherQueueExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/DispatcherQueueExtensions.cs rename to dev/DevWinUI.Base/Extensions/DispatcherQueueExtensions.cs diff --git a/dev/DevWinUI/Extensions/DoubleExtensions.cs b/dev/DevWinUI.Base/Extensions/DoubleExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/DoubleExtensions.cs rename to dev/DevWinUI.Base/Extensions/DoubleExtensions.cs diff --git a/dev/DevWinUI/Extensions/Extensions.cs b/dev/DevWinUI.Base/Extensions/Extensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/Extensions.cs rename to dev/DevWinUI.Base/Extensions/Extensions.cs diff --git a/dev/DevWinUI/Extensions/FloatExtensions.cs b/dev/DevWinUI.Base/Extensions/FloatExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/FloatExtensions.cs rename to dev/DevWinUI.Base/Extensions/FloatExtensions.cs diff --git a/dev/DevWinUI/Extensions/FrameworkElement/FrameworkElementExtensions.Animation.cs b/dev/DevWinUI.Base/Extensions/FrameworkElement/FrameworkElementExtensions.Animation.cs similarity index 100% rename from dev/DevWinUI/Extensions/FrameworkElement/FrameworkElementExtensions.Animation.cs rename to dev/DevWinUI.Base/Extensions/FrameworkElement/FrameworkElementExtensions.Animation.cs diff --git a/dev/DevWinUI/Extensions/FrameworkElement/FrameworkElementExtensions.Child.cs b/dev/DevWinUI.Base/Extensions/FrameworkElement/FrameworkElementExtensions.Child.cs similarity index 100% rename from dev/DevWinUI/Extensions/FrameworkElement/FrameworkElementExtensions.Child.cs rename to dev/DevWinUI.Base/Extensions/FrameworkElement/FrameworkElementExtensions.Child.cs diff --git a/dev/DevWinUI/Extensions/FrameworkElement/FrameworkElementExtensions.Composition.cs b/dev/DevWinUI.Base/Extensions/FrameworkElement/FrameworkElementExtensions.Composition.cs similarity index 100% rename from dev/DevWinUI/Extensions/FrameworkElement/FrameworkElementExtensions.Composition.cs rename to dev/DevWinUI.Base/Extensions/FrameworkElement/FrameworkElementExtensions.Composition.cs diff --git a/dev/DevWinUI/Extensions/FrameworkElement/FrameworkElementExtensions.cs b/dev/DevWinUI.Base/Extensions/FrameworkElement/FrameworkElementExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/FrameworkElement/FrameworkElementExtensions.cs rename to dev/DevWinUI.Base/Extensions/FrameworkElement/FrameworkElementExtensions.cs diff --git a/dev/DevWinUI/Extensions/Markup/AncestorBinding/AncestorBindingExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/AncestorBinding/AncestorBindingExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/AncestorBinding/AncestorBindingExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/AncestorBinding/AncestorBindingExtension.cs diff --git a/dev/DevWinUI/Extensions/Markup/AncestorBinding/Disposable.cs b/dev/DevWinUI.Base/Extensions/Markup/AncestorBinding/Disposable.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/AncestorBinding/Disposable.cs rename to dev/DevWinUI.Base/Extensions/Markup/AncestorBinding/Disposable.cs diff --git a/dev/DevWinUI/Extensions/Markup/ColorBrightnessExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/ColorBrightnessExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/ColorBrightnessExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/ColorBrightnessExtension.cs diff --git a/dev/DevWinUI/Extensions/Markup/EnumValuesExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/EnumValuesExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/EnumValuesExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/EnumValuesExtension.cs diff --git a/dev/DevWinUI/Extensions/Markup/IconElement/ArgumentNullExceptionExtensions.cs b/dev/DevWinUI.Base/Extensions/Markup/IconElement/ArgumentNullExceptionExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/IconElement/ArgumentNullExceptionExtensions.cs rename to dev/DevWinUI.Base/Extensions/Markup/IconElement/ArgumentNullExceptionExtensions.cs diff --git a/dev/DevWinUI/Extensions/Markup/IconElement/BitmapIconExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/IconElement/BitmapIconExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/IconElement/BitmapIconExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/IconElement/BitmapIconExtension.cs diff --git a/dev/DevWinUI/Extensions/Markup/IconElement/BitmapIconSourceExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/IconElement/BitmapIconSourceExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/IconElement/BitmapIconSourceExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/IconElement/BitmapIconSourceExtension.cs diff --git a/dev/DevWinUI/Extensions/Markup/IconElement/FontIconExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/IconElement/FontIconExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/IconElement/FontIconExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/IconElement/FontIconExtension.cs diff --git a/dev/DevWinUI/Extensions/Markup/IconElement/FontIconSourceExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/IconElement/FontIconSourceExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/IconElement/FontIconSourceExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/IconElement/FontIconSourceExtension.cs diff --git a/dev/DevWinUI/Extensions/Markup/IconElement/Icons/GlyphCode.cs b/dev/DevWinUI.Base/Extensions/Markup/IconElement/Icons/GlyphCode.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/IconElement/Icons/GlyphCode.cs rename to dev/DevWinUI.Base/Extensions/Markup/IconElement/Icons/GlyphCode.cs diff --git a/dev/DevWinUI/Extensions/Markup/IconElement/Icons/GlyphName.cs b/dev/DevWinUI.Base/Extensions/Markup/IconElement/Icons/GlyphName.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/IconElement/Icons/GlyphName.cs rename to dev/DevWinUI.Base/Extensions/Markup/IconElement/Icons/GlyphName.cs diff --git a/dev/DevWinUI/Extensions/Markup/IconElement/SymbolIconExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/IconElement/SymbolIconExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/IconElement/SymbolIconExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/IconElement/SymbolIconExtension.cs diff --git a/dev/DevWinUI/Extensions/Markup/IconElement/SymbolIconSourceExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/IconElement/SymbolIconSourceExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/IconElement/SymbolIconSourceExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/IconElement/SymbolIconSourceExtension.cs diff --git a/dev/DevWinUI/Extensions/Markup/IconElement/TextIconExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/IconElement/TextIconExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/IconElement/TextIconExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/IconElement/TextIconExtension.cs diff --git a/dev/DevWinUI/Extensions/Markup/NavigationParameterExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/NavigationParameterExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/NavigationParameterExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/NavigationParameterExtension.cs diff --git a/dev/DevWinUI/Extensions/Markup/ResourceStringExtension.cs b/dev/DevWinUI.Base/Extensions/Markup/ResourceStringExtension.cs similarity index 100% rename from dev/DevWinUI/Extensions/Markup/ResourceStringExtension.cs rename to dev/DevWinUI.Base/Extensions/Markup/ResourceStringExtension.cs diff --git a/dev/DevWinUI/Extensions/Predicates/IPredicate.cs b/dev/DevWinUI.Base/Extensions/Predicates/IPredicate.cs similarity index 100% rename from dev/DevWinUI/Extensions/Predicates/IPredicate.cs rename to dev/DevWinUI.Base/Extensions/Predicates/IPredicate.cs diff --git a/dev/DevWinUI/Extensions/Predicates/PredicateByAny{T}.cs b/dev/DevWinUI.Base/Extensions/Predicates/PredicateByAny{T}.cs similarity index 100% rename from dev/DevWinUI/Extensions/Predicates/PredicateByAny{T}.cs rename to dev/DevWinUI.Base/Extensions/Predicates/PredicateByAny{T}.cs diff --git a/dev/DevWinUI/Extensions/Predicates/PredicateByFunc{T,TState}.cs b/dev/DevWinUI.Base/Extensions/Predicates/PredicateByFunc{T,TState}.cs similarity index 100% rename from dev/DevWinUI/Extensions/Predicates/PredicateByFunc{T,TState}.cs rename to dev/DevWinUI.Base/Extensions/Predicates/PredicateByFunc{T,TState}.cs diff --git a/dev/DevWinUI/Extensions/Predicates/PredicateByFunc{T}.cs b/dev/DevWinUI.Base/Extensions/Predicates/PredicateByFunc{T}.cs similarity index 100% rename from dev/DevWinUI/Extensions/Predicates/PredicateByFunc{T}.cs rename to dev/DevWinUI.Base/Extensions/Predicates/PredicateByFunc{T}.cs diff --git a/dev/DevWinUI/Extensions/Predicates/PredicateByName.cs b/dev/DevWinUI.Base/Extensions/Predicates/PredicateByName.cs similarity index 100% rename from dev/DevWinUI/Extensions/Predicates/PredicateByName.cs rename to dev/DevWinUI.Base/Extensions/Predicates/PredicateByName.cs diff --git a/dev/DevWinUI/Extensions/Predicates/PredicateByType.cs b/dev/DevWinUI.Base/Extensions/Predicates/PredicateByType.cs similarity index 100% rename from dev/DevWinUI/Extensions/Predicates/PredicateByType.cs rename to dev/DevWinUI.Base/Extensions/Predicates/PredicateByType.cs diff --git a/dev/DevWinUI/Extensions/ScrollViewerExtensions.cs b/dev/DevWinUI.Base/Extensions/ScrollViewerExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/ScrollViewerExtensions.cs rename to dev/DevWinUI.Base/Extensions/ScrollViewerExtensions.cs diff --git a/dev/DevWinUI/Extensions/SemanticVersionExtensions.cs b/dev/DevWinUI.Base/Extensions/SemanticVersionExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/SemanticVersionExtensions.cs rename to dev/DevWinUI.Base/Extensions/SemanticVersionExtensions.cs diff --git a/dev/DevWinUI/Extensions/StringExtensions.cs b/dev/DevWinUI.Base/Extensions/StringExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/StringExtensions.cs rename to dev/DevWinUI.Base/Extensions/StringExtensions.cs diff --git a/dev/DevWinUI/Extensions/StyleExtensions.cs b/dev/DevWinUI.Base/Extensions/StyleExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/StyleExtensions.cs rename to dev/DevWinUI.Base/Extensions/StyleExtensions.cs diff --git a/dev/DevWinUI/Extensions/Text/StringExtensions!.cs b/dev/DevWinUI.Base/Extensions/Text/StringExtensions!.cs similarity index 100% rename from dev/DevWinUI/Extensions/Text/StringExtensions!.cs rename to dev/DevWinUI.Base/Extensions/Text/StringExtensions!.cs diff --git a/dev/DevWinUI/Extensions/Text/TextBoxExtensions.Mask.Internals.cs b/dev/DevWinUI.Base/Extensions/Text/TextBoxExtensions.Mask.Internals.cs similarity index 100% rename from dev/DevWinUI/Extensions/Text/TextBoxExtensions.Mask.Internals.cs rename to dev/DevWinUI.Base/Extensions/Text/TextBoxExtensions.Mask.Internals.cs diff --git a/dev/DevWinUI/Extensions/Text/TextBoxExtensions.Mask.Properties.cs b/dev/DevWinUI.Base/Extensions/Text/TextBoxExtensions.Mask.Properties.cs similarity index 100% rename from dev/DevWinUI/Extensions/Text/TextBoxExtensions.Mask.Properties.cs rename to dev/DevWinUI.Base/Extensions/Text/TextBoxExtensions.Mask.Properties.cs diff --git a/dev/DevWinUI/Extensions/Text/TextBoxExtensions.Regex.Data.cs b/dev/DevWinUI.Base/Extensions/Text/TextBoxExtensions.Regex.Data.cs similarity index 100% rename from dev/DevWinUI/Extensions/Text/TextBoxExtensions.Regex.Data.cs rename to dev/DevWinUI.Base/Extensions/Text/TextBoxExtensions.Regex.Data.cs diff --git a/dev/DevWinUI/Extensions/Text/TextBoxExtensions.Regex.Internals.cs b/dev/DevWinUI.Base/Extensions/Text/TextBoxExtensions.Regex.Internals.cs similarity index 100% rename from dev/DevWinUI/Extensions/Text/TextBoxExtensions.Regex.Internals.cs rename to dev/DevWinUI.Base/Extensions/Text/TextBoxExtensions.Regex.Internals.cs diff --git a/dev/DevWinUI/Extensions/Text/TextBoxExtensions.Regex.Properties.cs b/dev/DevWinUI.Base/Extensions/Text/TextBoxExtensions.Regex.Properties.cs similarity index 100% rename from dev/DevWinUI/Extensions/Text/TextBoxExtensions.Regex.Properties.cs rename to dev/DevWinUI.Base/Extensions/Text/TextBoxExtensions.Regex.Properties.cs diff --git a/dev/DevWinUI/Extensions/UIElements/UIElementExtensions.Composition.cs b/dev/DevWinUI.Base/Extensions/UIElements/UIElementExtensions.Composition.cs similarity index 100% rename from dev/DevWinUI/Extensions/UIElements/UIElementExtensions.Composition.cs rename to dev/DevWinUI.Base/Extensions/UIElements/UIElementExtensions.Composition.cs diff --git a/dev/DevWinUI/Extensions/UIElements/UIElementExtensions.cs b/dev/DevWinUI.Base/Extensions/UIElements/UIElementExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/UIElements/UIElementExtensions.cs rename to dev/DevWinUI.Base/Extensions/UIElements/UIElementExtensions.cs diff --git a/dev/DevWinUI/Extensions/VectorExtensions.cs b/dev/DevWinUI.Base/Extensions/VectorExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/VectorExtensions.cs rename to dev/DevWinUI.Base/Extensions/VectorExtensions.cs diff --git a/dev/DevWinUI/Extensions/VisualExtensions.cs b/dev/DevWinUI.Base/Extensions/VisualExtensions.cs similarity index 100% rename from dev/DevWinUI/Extensions/VisualExtensions.cs rename to dev/DevWinUI.Base/Extensions/VisualExtensions.cs diff --git a/dev/DevWinUI.Base/GlobalUsings.cs b/dev/DevWinUI.Base/GlobalUsings.cs new file mode 100644 index 00000000..5a6db28c --- /dev/null +++ b/dev/DevWinUI.Base/GlobalUsings.cs @@ -0,0 +1,26 @@ +ο»Ώglobal using System.Collections.ObjectModel; +global using System.ComponentModel; +global using System.Net; +global using System.Numerics; +global using System.Reflection; +global using System.Runtime.CompilerServices; +global using System.Runtime.InteropServices; +global using System.Text; +global using Microsoft.UI; +global using Microsoft.UI.Composition; +global using Microsoft.UI.Windowing; +global using Microsoft.UI.Xaml; +global using Microsoft.UI.Xaml.Controls; +global using Microsoft.UI.Xaml.Hosting; +global using Microsoft.UI.Xaml.Markup; +global using Microsoft.UI.Xaml.Media; +global using Microsoft.UI.Xaml.Media.Animation; +global using Microsoft.UI.Xaml.Navigation; +global using Windows.Foundation; +global using Windows.Graphics; +global using Windows.Networking.Connectivity; +global using Windows.Storage; +global using Windows.UI; +global using Windows.Win32; +global using Windows.Win32.Foundation; +global using WinRT.Interop; diff --git a/dev/DevWinUI/Helpers/AppLanguageHelper/AppLanguageHelper.cs b/dev/DevWinUI.Base/Helpers/AppLanguageHelper/AppLanguageHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/AppLanguageHelper/AppLanguageHelper.cs rename to dev/DevWinUI.Base/Helpers/AppLanguageHelper/AppLanguageHelper.cs diff --git a/dev/DevWinUI/Helpers/AppLanguageHelper/AppLanguageItem.cs b/dev/DevWinUI.Base/Helpers/AppLanguageHelper/AppLanguageItem.cs similarity index 100% rename from dev/DevWinUI/Helpers/AppLanguageHelper/AppLanguageItem.cs rename to dev/DevWinUI.Base/Helpers/AppLanguageHelper/AppLanguageItem.cs diff --git a/dev/DevWinUI/Helpers/AutoSuggestBoxHelper.cs b/dev/DevWinUI.Base/Helpers/AutoSuggestBoxHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/AutoSuggestBoxHelper.cs rename to dev/DevWinUI.Base/Helpers/AutoSuggestBoxHelper.cs diff --git a/dev/DevWinUI/Helpers/ColorHelper.cs b/dev/DevWinUI.Base/Helpers/ColorHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/ColorHelper.cs rename to dev/DevWinUI.Base/Helpers/ColorHelper.cs diff --git a/dev/DevWinUI/Helpers/CompositionHelper.cs b/dev/DevWinUI.Base/Helpers/CompositionHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/CompositionHelper.cs rename to dev/DevWinUI.Base/Helpers/CompositionHelper.cs diff --git a/dev/DevWinUI/Helpers/CredentialHelper.cs b/dev/DevWinUI.Base/Helpers/CredentialHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/CredentialHelper.cs rename to dev/DevWinUI.Base/Helpers/CredentialHelper.cs diff --git a/dev/DevWinUI/Helpers/DesignTimeHelpers.cs b/dev/DevWinUI.Base/Helpers/DesignTimeHelpers.cs similarity index 100% rename from dev/DevWinUI/Helpers/DesignTimeHelpers.cs rename to dev/DevWinUI.Base/Helpers/DesignTimeHelpers.cs diff --git a/dev/DevWinUI/Helpers/DisplayMonitor/DisplayMonitorDetails.cs b/dev/DevWinUI.Base/Helpers/DisplayMonitor/DisplayMonitorDetails.cs similarity index 100% rename from dev/DevWinUI/Helpers/DisplayMonitor/DisplayMonitorDetails.cs rename to dev/DevWinUI.Base/Helpers/DisplayMonitor/DisplayMonitorDetails.cs diff --git a/dev/DevWinUI/Helpers/DisplayMonitor/DisplayMonitorHelper.cs b/dev/DevWinUI.Base/Helpers/DisplayMonitor/DisplayMonitorHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/DisplayMonitor/DisplayMonitorHelper.cs rename to dev/DevWinUI.Base/Helpers/DisplayMonitor/DisplayMonitorHelper.cs diff --git a/dev/DevWinUI/Helpers/DisplayMonitor/MonitorHandleWrapper.cs b/dev/DevWinUI.Base/Helpers/DisplayMonitor/MonitorHandleWrapper.cs similarity index 100% rename from dev/DevWinUI/Helpers/DisplayMonitor/MonitorHandleWrapper.cs rename to dev/DevWinUI.Base/Helpers/DisplayMonitor/MonitorHandleWrapper.cs diff --git a/dev/DevWinUI/Helpers/DisplayMonitor/MonitorInfo.cs b/dev/DevWinUI.Base/Helpers/DisplayMonitor/MonitorInfo.cs similarity index 100% rename from dev/DevWinUI/Helpers/DisplayMonitor/MonitorInfo.cs rename to dev/DevWinUI.Base/Helpers/DisplayMonitor/MonitorInfo.cs diff --git a/dev/DevWinUI/Helpers/DragMoveAndResize/DragMoveAndResizeHelper.cs b/dev/DevWinUI.Base/Helpers/DragMoveAndResize/DragMoveAndResizeHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/DragMoveAndResize/DragMoveAndResizeHelper.cs rename to dev/DevWinUI.Base/Helpers/DragMoveAndResize/DragMoveAndResizeHelper.cs diff --git a/dev/DevWinUI/Helpers/DragMoveAndResize/DragMoveAndResizeInfo.cs b/dev/DevWinUI.Base/Helpers/DragMoveAndResize/DragMoveAndResizeInfo.cs similarity index 100% rename from dev/DevWinUI/Helpers/DragMoveAndResize/DragMoveAndResizeInfo.cs rename to dev/DevWinUI.Base/Helpers/DragMoveAndResize/DragMoveAndResizeInfo.cs diff --git a/dev/DevWinUI/Helpers/DragMoveAndResize/DragMoveAndResizeMode.cs b/dev/DevWinUI.Base/Helpers/DragMoveAndResize/DragMoveAndResizeMode.cs similarity index 100% rename from dev/DevWinUI/Helpers/DragMoveAndResize/DragMoveAndResizeMode.cs rename to dev/DevWinUI.Base/Helpers/DragMoveAndResize/DragMoveAndResizeMode.cs diff --git a/dev/DevWinUI/Helpers/FileExtensionHelpers.cs b/dev/DevWinUI.Base/Helpers/FileExtensionHelpers.cs similarity index 100% rename from dev/DevWinUI/Helpers/FileExtensionHelpers.cs rename to dev/DevWinUI.Base/Helpers/FileExtensionHelpers.cs diff --git a/dev/DevWinUI/Helpers/FileHelper.cs b/dev/DevWinUI.Base/Helpers/FileHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/FileHelper.cs rename to dev/DevWinUI.Base/Helpers/FileHelper.cs diff --git a/dev/DevWinUI/Helpers/GeneralHelper.cs b/dev/DevWinUI.Base/Helpers/GeneralHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/GeneralHelper.cs rename to dev/DevWinUI.Base/Helpers/GeneralHelper.cs diff --git a/dev/DevWinUI/Helpers/GithubUpdate/SystemVersionInfo.cs b/dev/DevWinUI.Base/Helpers/GithubUpdate/SystemVersionInfo.cs similarity index 100% rename from dev/DevWinUI/Helpers/GithubUpdate/SystemVersionInfo.cs rename to dev/DevWinUI.Base/Helpers/GithubUpdate/SystemVersionInfo.cs diff --git a/dev/DevWinUI/Helpers/GithubUpdate/UpdateHelper.cs b/dev/DevWinUI.Base/Helpers/GithubUpdate/UpdateHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/GithubUpdate/UpdateHelper.cs rename to dev/DevWinUI.Base/Helpers/GithubUpdate/UpdateHelper.cs diff --git a/dev/DevWinUI/Helpers/GithubUpdate/UpdateHelperJsonContext.cs b/dev/DevWinUI.Base/Helpers/GithubUpdate/UpdateHelperJsonContext.cs similarity index 100% rename from dev/DevWinUI/Helpers/GithubUpdate/UpdateHelperJsonContext.cs rename to dev/DevWinUI.Base/Helpers/GithubUpdate/UpdateHelperJsonContext.cs diff --git a/dev/DevWinUI/Helpers/GithubUpdate/UpdateInfo.cs b/dev/DevWinUI.Base/Helpers/GithubUpdate/UpdateInfo.cs similarity index 100% rename from dev/DevWinUI/Helpers/GithubUpdate/UpdateInfo.cs rename to dev/DevWinUI.Base/Helpers/GithubUpdate/UpdateInfo.cs diff --git a/dev/DevWinUI/Helpers/InIHelper.cs b/dev/DevWinUI.Base/Helpers/InIHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/InIHelper.cs rename to dev/DevWinUI.Base/Helpers/InIHelper.cs diff --git a/dev/DevWinUI/Helpers/LocationHelper.cs b/dev/DevWinUI.Base/Helpers/LocationHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/LocationHelper.cs rename to dev/DevWinUI.Base/Helpers/LocationHelper.cs diff --git a/dev/DevWinUI/Helpers/NetworkHelper.cs b/dev/DevWinUI.Base/Helpers/NetworkHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/NetworkHelper.cs rename to dev/DevWinUI.Base/Helpers/NetworkHelper.cs diff --git a/dev/DevWinUI/Helpers/OSVersionHelper.cs b/dev/DevWinUI.Base/Helpers/OSVersionHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/OSVersionHelper.cs rename to dev/DevWinUI.Base/Helpers/OSVersionHelper.cs diff --git a/dev/DevWinUI/Helpers/PackageHelper.cs b/dev/DevWinUI.Base/Helpers/PackageHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/PackageHelper.cs rename to dev/DevWinUI.Base/Helpers/PackageHelper.cs diff --git a/dev/DevWinUI/Helpers/PathHelper.cs b/dev/DevWinUI.Base/Helpers/PathHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/PathHelper.cs rename to dev/DevWinUI.Base/Helpers/PathHelper.cs diff --git a/dev/DevWinUI/Helpers/PopupHelper.cs b/dev/DevWinUI.Base/Helpers/PopupHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/PopupHelper.cs rename to dev/DevWinUI.Base/Helpers/PopupHelper.cs diff --git a/dev/DevWinUI/Helpers/PreviewKeyDownHelper.cs b/dev/DevWinUI.Base/Helpers/PreviewKeyDownHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/PreviewKeyDownHelper.cs rename to dev/DevWinUI.Base/Helpers/PreviewKeyDownHelper.cs diff --git a/dev/DevWinUI/Helpers/ProcessInfoHelper.cs b/dev/DevWinUI.Base/Helpers/ProcessInfoHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/ProcessInfoHelper.cs rename to dev/DevWinUI.Base/Helpers/ProcessInfoHelper.cs diff --git a/dev/DevWinUI/Helpers/ResourceHelper/IResourceHelper.cs b/dev/DevWinUI.Base/Helpers/ResourceHelper/IResourceHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/ResourceHelper/IResourceHelper.cs rename to dev/DevWinUI.Base/Helpers/ResourceHelper/IResourceHelper.cs diff --git a/dev/DevWinUI/Helpers/ResourceHelper/ResourceHelper.cs b/dev/DevWinUI.Base/Helpers/ResourceHelper/ResourceHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/ResourceHelper/ResourceHelper.cs rename to dev/DevWinUI.Base/Helpers/ResourceHelper/ResourceHelper.cs diff --git a/dev/DevWinUI/Helpers/RichTextFormatterHelper.cs b/dev/DevWinUI.Base/Helpers/RichTextFormatterHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/RichTextFormatterHelper.cs rename to dev/DevWinUI.Base/Helpers/RichTextFormatterHelper.cs diff --git a/dev/DevWinUI/Helpers/RuntimeHelper.cs b/dev/DevWinUI.Base/Helpers/RuntimeHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/RuntimeHelper.cs rename to dev/DevWinUI.Base/Helpers/RuntimeHelper.cs diff --git a/dev/DevWinUI/Helpers/SecurityHelper/SecurityEnum.cs b/dev/DevWinUI.Base/Helpers/SecurityHelper/SecurityEnum.cs similarity index 100% rename from dev/DevWinUI/Helpers/SecurityHelper/SecurityEnum.cs rename to dev/DevWinUI.Base/Helpers/SecurityHelper/SecurityEnum.cs diff --git a/dev/DevWinUI/Helpers/SecurityHelper/SecurityHelper.Asymmetric.cs b/dev/DevWinUI.Base/Helpers/SecurityHelper/SecurityHelper.Asymmetric.cs similarity index 100% rename from dev/DevWinUI/Helpers/SecurityHelper/SecurityHelper.Asymmetric.cs rename to dev/DevWinUI.Base/Helpers/SecurityHelper/SecurityHelper.Asymmetric.cs diff --git a/dev/DevWinUI/Helpers/SecurityHelper/SecurityHelper.Symmetric.cs b/dev/DevWinUI.Base/Helpers/SecurityHelper/SecurityHelper.Symmetric.cs similarity index 100% rename from dev/DevWinUI/Helpers/SecurityHelper/SecurityHelper.Symmetric.cs rename to dev/DevWinUI.Base/Helpers/SecurityHelper/SecurityHelper.Symmetric.cs diff --git a/dev/DevWinUI/Helpers/SecurityHelper/SecurityHelper.cs b/dev/DevWinUI.Base/Helpers/SecurityHelper/SecurityHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/SecurityHelper/SecurityHelper.cs rename to dev/DevWinUI.Base/Helpers/SecurityHelper/SecurityHelper.cs diff --git a/dev/DevWinUI/Helpers/StartupHelper.cs b/dev/DevWinUI.Base/Helpers/StartupHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/StartupHelper.cs rename to dev/DevWinUI.Base/Helpers/StartupHelper.cs diff --git a/dev/DevWinUI/Helpers/SunTimes/SunTimes.cs b/dev/DevWinUI.Base/Helpers/SunTimes/SunTimes.cs similarity index 100% rename from dev/DevWinUI/Helpers/SunTimes/SunTimes.cs rename to dev/DevWinUI.Base/Helpers/SunTimes/SunTimes.cs diff --git a/dev/DevWinUI/Helpers/SunTimes/SunTimesHelper.cs b/dev/DevWinUI.Base/Helpers/SunTimes/SunTimesHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/SunTimes/SunTimesHelper.cs rename to dev/DevWinUI.Base/Helpers/SunTimes/SunTimesHelper.cs diff --git a/dev/DevWinUI/Helpers/TaskbarHelper.cs b/dev/DevWinUI.Base/Helpers/TaskbarHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/TaskbarHelper.cs rename to dev/DevWinUI.Base/Helpers/TaskbarHelper.cs diff --git a/dev/DevWinUI/Helpers/VisualHelper.cs b/dev/DevWinUI.Base/Helpers/VisualHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/VisualHelper.cs rename to dev/DevWinUI.Base/Helpers/VisualHelper.cs diff --git a/dev/DevWinUI/Helpers/WindowHelper/ScreenRegion.cs b/dev/DevWinUI.Base/Helpers/WindowHelper/ScreenRegion.cs similarity index 100% rename from dev/DevWinUI/Helpers/WindowHelper/ScreenRegion.cs rename to dev/DevWinUI.Base/Helpers/WindowHelper/ScreenRegion.cs diff --git a/dev/DevWinUI/Helpers/WindowHelper/TrackWindowItem.cs b/dev/DevWinUI.Base/Helpers/WindowHelper/TrackWindowItem.cs similarity index 100% rename from dev/DevWinUI/Helpers/WindowHelper/TrackWindowItem.cs rename to dev/DevWinUI.Base/Helpers/WindowHelper/TrackWindowItem.cs diff --git a/dev/DevWinUI/Helpers/WindowHelper/Win32Window.cs b/dev/DevWinUI.Base/Helpers/WindowHelper/Win32Window.cs similarity index 100% rename from dev/DevWinUI/Helpers/WindowHelper/Win32Window.cs rename to dev/DevWinUI.Base/Helpers/WindowHelper/Win32Window.cs diff --git a/dev/DevWinUI/Helpers/WindowHelper/WindowHelper.cs b/dev/DevWinUI.Base/Helpers/WindowHelper/WindowHelper.cs similarity index 100% rename from dev/DevWinUI/Helpers/WindowHelper/WindowHelper.cs rename to dev/DevWinUI.Base/Helpers/WindowHelper/WindowHelper.cs diff --git a/dev/DevWinUI/Internal/AppConfig.cs b/dev/DevWinUI.Base/Internal/AppConfig.cs similarity index 100% rename from dev/DevWinUI/Internal/AppConfig.cs rename to dev/DevWinUI.Base/Internal/AppConfig.cs diff --git a/dev/DevWinUI/Internal/GlobalData.cs b/dev/DevWinUI.Base/Internal/GlobalData.cs similarity index 100% rename from dev/DevWinUI/Internal/GlobalData.cs rename to dev/DevWinUI.Base/Internal/GlobalData.cs diff --git a/dev/DevWinUI/Internal/GlobalDataJsonContext.cs b/dev/DevWinUI.Base/Internal/GlobalDataJsonContext.cs similarity index 100% rename from dev/DevWinUI/Internal/GlobalDataJsonContext.cs rename to dev/DevWinUI.Base/Internal/GlobalDataJsonContext.cs diff --git a/dev/DevWinUI/Internal/InternalLocalizationHelper.cs b/dev/DevWinUI.Base/Internal/InternalLocalizationHelper.cs similarity index 100% rename from dev/DevWinUI/Internal/InternalLocalizationHelper.cs rename to dev/DevWinUI.Base/Internal/InternalLocalizationHelper.cs diff --git a/dev/DevWinUI/Internal/ResourceType.cs b/dev/DevWinUI.Base/Internal/ResourceType.cs similarity index 100% rename from dev/DevWinUI/Internal/ResourceType.cs rename to dev/DevWinUI.Base/Internal/ResourceType.cs diff --git a/dev/DevWinUI/NativeMethods.json b/dev/DevWinUI.Base/NativeMethods.json similarity index 100% rename from dev/DevWinUI/NativeMethods.json rename to dev/DevWinUI.Base/NativeMethods.json diff --git a/dev/DevWinUI/NativeMethods.txt b/dev/DevWinUI.Base/NativeMethods.txt similarity index 100% rename from dev/DevWinUI/NativeMethods.txt rename to dev/DevWinUI.Base/NativeMethods.txt diff --git a/dev/DevWinUI/NativeMethods/NativeMethods.cs b/dev/DevWinUI.Base/NativeMethods/NativeMethods.cs similarity index 100% rename from dev/DevWinUI/NativeMethods/NativeMethods.cs rename to dev/DevWinUI.Base/NativeMethods/NativeMethods.cs diff --git a/dev/DevWinUI/NativeMethods/NativeValues.cs b/dev/DevWinUI.Base/NativeMethods/NativeValues.cs similarity index 100% rename from dev/DevWinUI/NativeMethods/NativeValues.cs rename to dev/DevWinUI.Base/NativeMethods/NativeValues.cs diff --git a/dev/DevWinUI.Base/README.md b/dev/DevWinUI.Base/README.md new file mode 100644 index 00000000..50c198e8 --- /dev/null +++ b/dev/DevWinUI.Base/README.md @@ -0,0 +1,64 @@ +ο»Ώ

+ Documentation + Β· + Release notes + Β· + Samples + Β· + Gallery App (Store) +

+ +
+ +
+ +|Packages|Download/Installation|Documentation| +|:---|:---|:---:| +|[![NuGet Version](https://img.shields.io/nuget/v/DevWinUI?label=DevWinUI.Base)](https://www.nuget.org/packages/DevWinUI.Base)|[![NuGet Download](https://img.shields.io/nuget/dt/DevWinUI?label=DevWinUI.Base)](https://www.nuget.org/packages/DevWinUI.Base)|[![Document](https://img.shields.io/badge/See%20Here-%20?logo=github&label=Document&color=red)](https://Ghost1372.github.io/DevWinUIBase)| + +
+ +--- + +# DevWinUI.Base + +### Experience WinUI 3 quickly and easily with the help of DevWinUI.Base, Everything you need to develop an application is gathered in one place. + +## Install +``` +Install-Package DevWinUI.Base +``` + +## ⚠️ Important: Package Renaming (v10.0.0+) + +This version introduces **breaking changes** related to package renaming to support meta packages. + +### Package Changes + +| Version | Core Library | +|---------|--------------| +| **v9.9.4 and below** | `DevWinUI` | +| **v10.0.0+** | `DevWinUI.Base` | + +### Migration Guide + +**If you are using v9.9.4 or below:** +- Install `DevWinUI` for core utilities (services, helpers, extensions, managers) + +**If you are using v10.0.0 or above:** +- Install `DevWinUI.Base` for core utilities only + +### Note for Upgrading from v9.9.4 β†’ v10.0.0+ + +Simply replace `DevWinUI` with `DevWinUI.Base` in your project references. + +## Demo + +See the [Gallery](https://github.com/Ghost1372/DevWinUI) app to see how to use it + +## Documentation + +See Here for Online [Documentation](https://ghost1372.github.io/devWinUIBase/) + +![GalleryApp](https://raw.githubusercontent.com/ghost1372/DevWinUI-Resources/refs/heads/main/DevWinUI-Docs/GalleryApp.png) diff --git a/dev/DevWinUI/Services/NavigationService/Contracts/IJsonNavigationService.cs b/dev/DevWinUI.Base/Services/NavigationService/Contracts/IJsonNavigationService.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Contracts/IJsonNavigationService.cs rename to dev/DevWinUI.Base/Services/NavigationService/Contracts/IJsonNavigationService.cs diff --git a/dev/DevWinUI/Services/NavigationService/Contracts/INavigationAwareEx.cs b/dev/DevWinUI.Base/Services/NavigationService/Contracts/INavigationAwareEx.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Contracts/INavigationAwareEx.cs rename to dev/DevWinUI.Base/Services/NavigationService/Contracts/INavigationAwareEx.cs diff --git a/dev/DevWinUI/Services/NavigationService/Contracts/INavigationServiceEx.cs b/dev/DevWinUI.Base/Services/NavigationService/Contracts/INavigationServiceEx.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Contracts/INavigationServiceEx.cs rename to dev/DevWinUI.Base/Services/NavigationService/Contracts/INavigationServiceEx.cs diff --git a/dev/DevWinUI/Services/NavigationService/Contracts/IPageServiceEx.cs b/dev/DevWinUI.Base/Services/NavigationService/Contracts/IPageServiceEx.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Contracts/IPageServiceEx.cs rename to dev/DevWinUI.Base/Services/NavigationService/Contracts/IPageServiceEx.cs diff --git a/dev/DevWinUI/Services/NavigationService/InternalAutoSuggestBoxItemTemplate.xaml b/dev/DevWinUI.Base/Services/NavigationService/InternalAutoSuggestBoxItemTemplate.xaml similarity index 100% rename from dev/DevWinUI/Services/NavigationService/InternalAutoSuggestBoxItemTemplate.xaml rename to dev/DevWinUI.Base/Services/NavigationService/InternalAutoSuggestBoxItemTemplate.xaml diff --git a/dev/DevWinUI/Services/NavigationService/InternalAutoSuggestBoxItemTemplate.xaml.cs b/dev/DevWinUI.Base/Services/NavigationService/InternalAutoSuggestBoxItemTemplate.xaml.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/InternalAutoSuggestBoxItemTemplate.xaml.cs rename to dev/DevWinUI.Base/Services/NavigationService/InternalAutoSuggestBoxItemTemplate.xaml.cs diff --git a/dev/DevWinUI/Services/NavigationService/Models/BaseDataInfo.cs b/dev/DevWinUI.Base/Services/NavigationService/Models/BaseDataInfo.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Models/BaseDataInfo.cs rename to dev/DevWinUI.Base/Services/NavigationService/Models/BaseDataInfo.cs diff --git a/dev/DevWinUI/Services/NavigationService/Models/DataGroup.cs b/dev/DevWinUI.Base/Services/NavigationService/Models/DataGroup.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Models/DataGroup.cs rename to dev/DevWinUI.Base/Services/NavigationService/Models/DataGroup.cs diff --git a/dev/DevWinUI/Services/NavigationService/Models/DataInfoBadge.cs b/dev/DevWinUI.Base/Services/NavigationService/Models/DataInfoBadge.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Models/DataInfoBadge.cs rename to dev/DevWinUI.Base/Services/NavigationService/Models/DataInfoBadge.cs diff --git a/dev/DevWinUI/Services/NavigationService/Models/DataItem.cs b/dev/DevWinUI.Base/Services/NavigationService/Models/DataItem.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Models/DataItem.cs rename to dev/DevWinUI.Base/Services/NavigationService/Models/DataItem.cs diff --git a/dev/DevWinUI/Services/NavigationService/Models/DataLink.cs b/dev/DevWinUI.Base/Services/NavigationService/Models/DataLink.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Models/DataLink.cs rename to dev/DevWinUI.Base/Services/NavigationService/Models/DataLink.cs diff --git a/dev/DevWinUI/Services/NavigationService/Models/GroupInfoList.cs b/dev/DevWinUI.Base/Services/NavigationService/Models/GroupInfoList.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Models/GroupInfoList.cs rename to dev/DevWinUI.Base/Services/NavigationService/Models/GroupInfoList.cs diff --git a/dev/DevWinUI/Services/NavigationService/Models/OrderItemsType.cs b/dev/DevWinUI.Base/Services/NavigationService/Models/OrderItemsType.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Models/OrderItemsType.cs rename to dev/DevWinUI.Base/Services/NavigationService/Models/OrderItemsType.cs diff --git a/dev/DevWinUI/Services/NavigationService/Models/PathType.cs b/dev/DevWinUI.Base/Services/NavigationService/Models/PathType.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Models/PathType.cs rename to dev/DevWinUI.Base/Services/NavigationService/Models/PathType.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/DataSource.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/DataSource.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/DataSource.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/DataSource.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Builder.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Builder.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Builder.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Builder.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.NavigationView.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.NavigationView.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.NavigationView.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.NavigationView.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Properties.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Properties.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Properties.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Properties.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Service.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Service.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Service.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.Service.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Attach.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Attach.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Attach.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Attach.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Builder.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Builder.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Builder.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Builder.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Properties.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Properties.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Properties.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Properties.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Service.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Service.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Service.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.Service.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/NavigationServiceEx/NavigationServiceEx.cs diff --git a/dev/DevWinUI/Services/NavigationService/Services/PageServiceEx.cs b/dev/DevWinUI.Base/Services/NavigationService/Services/PageServiceEx.cs similarity index 100% rename from dev/DevWinUI/Services/NavigationService/Services/PageServiceEx.cs rename to dev/DevWinUI.Base/Services/NavigationService/Services/PageServiceEx.cs diff --git a/dev/DevWinUI/Services/ThemeService/BackdropType.cs b/dev/DevWinUI.Base/Services/ThemeService/BackdropType.cs similarity index 100% rename from dev/DevWinUI/Services/ThemeService/BackdropType.cs rename to dev/DevWinUI.Base/Services/ThemeService/BackdropType.cs diff --git a/dev/DevWinUI/Services/ThemeService/IThemeService.cs b/dev/DevWinUI.Base/Services/ThemeService/IThemeService.cs similarity index 100% rename from dev/DevWinUI/Services/ThemeService/IThemeService.cs rename to dev/DevWinUI.Base/Services/ThemeService/IThemeService.cs diff --git a/dev/DevWinUI/Services/ThemeService/ThemeService.AutoConfig.cs b/dev/DevWinUI.Base/Services/ThemeService/ThemeService.AutoConfig.cs similarity index 100% rename from dev/DevWinUI/Services/ThemeService/ThemeService.AutoConfig.cs rename to dev/DevWinUI.Base/Services/ThemeService/ThemeService.AutoConfig.cs diff --git a/dev/DevWinUI/Services/ThemeService/ThemeService.Backdrop.cs b/dev/DevWinUI.Base/Services/ThemeService/ThemeService.Backdrop.cs similarity index 100% rename from dev/DevWinUI/Services/ThemeService/ThemeService.Backdrop.cs rename to dev/DevWinUI.Base/Services/ThemeService/ThemeService.Backdrop.cs diff --git a/dev/DevWinUI/Services/ThemeService/ThemeService.Builder.cs b/dev/DevWinUI.Base/Services/ThemeService/ThemeService.Builder.cs similarity index 100% rename from dev/DevWinUI/Services/ThemeService/ThemeService.Builder.cs rename to dev/DevWinUI.Base/Services/ThemeService/ThemeService.Builder.cs diff --git a/dev/DevWinUI/Services/ThemeService/ThemeService.ElementTheme.cs b/dev/DevWinUI.Base/Services/ThemeService/ThemeService.ElementTheme.cs similarity index 100% rename from dev/DevWinUI/Services/ThemeService/ThemeService.ElementTheme.cs rename to dev/DevWinUI.Base/Services/ThemeService/ThemeService.ElementTheme.cs diff --git a/dev/DevWinUI/Services/ThemeService/ThemeService.cs b/dev/DevWinUI.Base/Services/ThemeService/ThemeService.cs similarity index 100% rename from dev/DevWinUI/Services/ThemeService/ThemeService.cs rename to dev/DevWinUI.Base/Services/ThemeService/ThemeService.cs diff --git a/dev/DevWinUI/Strings/en-US/Resources.resw b/dev/DevWinUI.Base/Strings/en-US/Resources.resw similarity index 100% rename from dev/DevWinUI/Strings/en-US/Resources.resw rename to dev/DevWinUI.Base/Strings/en-US/Resources.resw diff --git a/dev/DevWinUI/Strings/fa-IR/Resources.resw b/dev/DevWinUI.Base/Strings/fa-IR/Resources.resw similarity index 100% rename from dev/DevWinUI/Strings/fa-IR/Resources.resw rename to dev/DevWinUI.Base/Strings/fa-IR/Resources.resw diff --git a/dev/DevWinUI.Controls/DevWinUI.Controls.csproj b/dev/DevWinUI.Controls/DevWinUI.Controls.csproj deleted file mode 100644 index 2e1d9a49..00000000 --- a/dev/DevWinUI.Controls/DevWinUI.Controls.csproj +++ /dev/null @@ -1,57 +0,0 @@ -ο»Ώ - - $(LibraryMajorVersion).$(DevWinUI_Controls_MinorVersion).$(DevWinUI_Controls_PatchVersion)$(PreviewBuildSuffix) - $(BaseNamespace).Controls - $(BaseNamespace).Controls - - Experience WinUI 3 quickly and easily with the help of DevWinUI.Controls, Everything you need to develop an application is gathered in one place. DevWinUI.Controls Includes custom controls, styles, landingPages,Compositions and win2d. - - winui winui3 win11 xaml DevWinUI DevWinUI.Controls SettingsUI Components settings theme styles projectreunion winappsdk windowsappsdk wasdk reunion SettingsControls settingsexpander settingscard landingPages win2d composition - - $([System.Text.RegularExpressions.Regex]::Replace('$(TargetFramework)','\.0$','')) - $(TargetsForTfmSpecificContentInPackage);PackCustomContent - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - Themes\Generic.xaml - True - - - Themes\Generic.xaml - True - - - - - Assets.Mask.ForegroundFocusMask.png - - - Assets.Mask.TextGlitchMask.png - - - Assets.Mask.CircleMask.png - - - Assets.Noise.Noise.jpg - - - - - - - - - - lib\$(CleanTargetFramework)\DevWinUI.Controls\Themes\ - - - - \ No newline at end of file diff --git a/dev/DevWinUI.Controls/GlobalUsings.cs b/dev/DevWinUI.Controls/GlobalUsings.cs deleted file mode 100644 index c7fb7b02..00000000 --- a/dev/DevWinUI.Controls/GlobalUsings.cs +++ /dev/null @@ -1,23 +0,0 @@ -ο»Ώglobal using System.Collections.ObjectModel; -global using System.Numerics; -global using Microsoft.Graphics.Canvas; -global using Microsoft.Graphics.Canvas.Brushes; -global using Microsoft.Graphics.Canvas.Effects; -global using Microsoft.Graphics.Canvas.Geometry; -global using Microsoft.Graphics.Canvas.Text; -global using Microsoft.Graphics.Canvas.UI; -global using Microsoft.Graphics.Canvas.UI.Composition; -global using Microsoft.Graphics.Canvas.UI.Xaml; -global using Microsoft.Graphics.DirectX; -global using Microsoft.UI; -global using Microsoft.UI.Composition; -global using Microsoft.UI.Xaml; -global using Microsoft.UI.Xaml.Controls; -global using Microsoft.UI.Xaml.Data; -global using Microsoft.UI.Xaml.Hosting; -global using Microsoft.UI.Xaml.Media; -global using Microsoft.UI.Xaml.Media.Animation; -global using Microsoft.UI.Xaml.Media.Imaging; -global using Windows.Foundation; -global using Windows.Graphics; -global using Windows.UI; diff --git a/dev/DevWinUI.Controls/README.md b/dev/DevWinUI.Controls/README.md deleted file mode 100644 index 30d26372..00000000 --- a/dev/DevWinUI.Controls/README.md +++ /dev/null @@ -1,48 +0,0 @@ -ο»Ώ

- Documentation - Β· - Release notes - Β· - Samples - Β· - Gallery App (Store) -

- -
- -
- -|Packages|Download/Installation|Documentation| -|:---|:---|:---:| -|[![NuGet Version](https://img.shields.io/nuget/v/DevWinUI.Controls?label=DevWinUI.Controls)](https://www.nuget.org/packages/DevWinUI.Controls)|[![NuGet Download](https://img.shields.io/nuget/dt/DevWinUI.Controls?label=DevWinUI.Controls)](https://www.nuget.org/packages/DevWinUI.Controls)|[![Document](https://img.shields.io/badge/See%20Here-%20?logo=github&label=Document&color=red)](https://Ghost1372.github.io/DevWinUIControls/)| - -
- ---- - -# DevWinUI.Controls - -### Experience WinUI 3 quickly and easily with the help of DevWinUI.Controls, Everything you need to develop an application is gathered in one place. - - -## Install -``` -Install-Package DevWinUI.Controls -``` - -After installing, add the following resource to app.xaml - -```xml - -``` - -## Demo - -See the [Gallery](https://github.com/Ghost1372/DevWinUI) app to see how to use it - -## Documentation - -See Here for Online [Documentation](https://ghost1372.github.io/DevWinUIControls/) - -![GalleryApp](https://raw.githubusercontent.com/ghost1372/DevWinUI-Resources/refs/heads/main/DevWinUI-Docs/GalleryApp.png) diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/DropdownColorPicker.xaml b/dev/DevWinUI.Controls/Themes/Styles/Controls/DropdownColorPicker.xaml deleted file mode 100644 index 56cc2ea9..00000000 --- a/dev/DevWinUI.Controls/Themes/Styles/Controls/DropdownColorPicker.xaml +++ /dev/null @@ -1,73 +0,0 @@ -ο»Ώ - - - - diff --git a/dev/DevWinUI.Gallery/App.xaml b/dev/DevWinUI.Gallery/App.xaml index 55167bb1..68d2aae5 100644 --- a/dev/DevWinUI.Gallery/App.xaml +++ b/dev/DevWinUI.Gallery/App.xaml @@ -7,7 +7,7 @@ - + diff --git a/dev/DevWinUI.Gallery/Assets/NavViewMenu/AppData.json b/dev/DevWinUI.Gallery/Assets/NavViewMenu/AppData.json index 6d21a393..642bf3ef 100644 --- a/dev/DevWinUI.Gallery/Assets/NavViewMenu/AppData.json +++ b/dev/DevWinUI.Gallery/Assets/NavViewMenu/AppData.json @@ -680,6 +680,13 @@ "Title": "Composition", "ImagePath": "ms-appx:///Assets/Fluent/Acrylic.png", "Items": [ + { + "UniqueId": "DevWinUIGallery.Views.EdgeLightingPage", + "Title": "Edge Lighting", + "Subtitle": "Edge Lighting", + "IsNew": true, + "ImagePath": "ms-appx:///Assets/Fluent/RevealFocus.png" + }, { "UniqueId": "DevWinUIGallery.Views.CarouselView2Page", "Title": "Carousel View 2", diff --git a/dev/DevWinUI.Gallery/ControlPagesSampleCode/Features/Styles/Styles_xaml.txt b/dev/DevWinUI.Gallery/ControlPagesSampleCode/Features/Styles/Styles_xaml.txt index 154d0f4c..c37cc417 100644 --- a/dev/DevWinUI.Gallery/ControlPagesSampleCode/Features/Styles/Styles_xaml.txt +++ b/dev/DevWinUI.Gallery/ControlPagesSampleCode/Features/Styles/Styles_xaml.txt @@ -8,6 +8,6 @@ Message="Message" Severity="Informational"> - + diff --git a/dev/DevWinUI.Gallery/DevWinUI.Gallery.csproj b/dev/DevWinUI.Gallery/DevWinUI.Gallery.csproj index d059d891..c8ff17dd 100644 --- a/dev/DevWinUI.Gallery/DevWinUI.Gallery.csproj +++ b/dev/DevWinUI.Gallery/DevWinUI.Gallery.csproj @@ -32,14 +32,16 @@ - - - + + - - + + + + + @@ -54,14 +56,12 @@ - - - + diff --git a/dev/DevWinUI.Gallery/Examples/ControlExample.xaml.cs b/dev/DevWinUI.Gallery/Examples/ControlExample.xaml.cs index fe417758..bc520e47 100644 --- a/dev/DevWinUI.Gallery/Examples/ControlExample.xaml.cs +++ b/dev/DevWinUI.Gallery/Examples/ControlExample.xaml.cs @@ -117,10 +117,10 @@ private async void GoToDoc_Click(object sender, RoutedEventArgs e) switch (DocType) { case DocType.Core: - docTypeValue = "DevWinUI"; + docTypeValue = "DevWinUIBase"; break; case DocType.Controls: - docTypeValue = "DevWinUIControls"; + docTypeValue = "DevWinUI"; break; case DocType.ContextMenu: docTypeValue = "DevWinUIContextMenu"; diff --git a/dev/DevWinUI.Gallery/Themes/ThemeResources.xaml b/dev/DevWinUI.Gallery/Themes/ThemeResources.xaml index 68b4e504..ffa25b6c 100644 --- a/dev/DevWinUI.Gallery/Themes/ThemeResources.xaml +++ b/dev/DevWinUI.Gallery/Themes/ThemeResources.xaml @@ -4,14 +4,17 @@ /Assets/Cover/CoverLight.png + - + /Assets/Cover/CoverDark.png + /Assets/Cover/CoverDark.png + diff --git a/dev/DevWinUI.Gallery/Views/HomeLandingPage.xaml b/dev/DevWinUI.Gallery/Views/HomeLandingPage.xaml index 823991c2..b4f0e492 100644 --- a/dev/DevWinUI.Gallery/Views/HomeLandingPage.xaml +++ b/dev/DevWinUI.Gallery/Views/HomeLandingPage.xaml @@ -8,7 +8,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> diff --git a/dev/DevWinUI.Gallery/Views/HomeLandingPage.xaml.cs b/dev/DevWinUI.Gallery/Views/HomeLandingPage.xaml.cs index d6775570..87827a19 100644 --- a/dev/DevWinUI.Gallery/Views/HomeLandingPage.xaml.cs +++ b/dev/DevWinUI.Gallery/Views/HomeLandingPage.xaml.cs @@ -1,7 +1,10 @@ -ο»Ώnamespace DevWinUIGallery.Views; +ο»Ώusing Microsoft.Windows.ApplicationModel.WindowsAppRuntime; + +namespace DevWinUIGallery.Views; public sealed partial class HomeLandingPage : Page { + public string WASDKVersion { get; } = $"Windows App SDK {ReleaseInfo.Major}.{ReleaseInfo.Minor}+"; public HomeLandingPage() { this.InitializeComponent(); diff --git a/dev/DevWinUI.Gallery/Views/Pages/Common/ExtensionPage.xaml.cs b/dev/DevWinUI.Gallery/Views/Pages/Common/ExtensionPage.xaml.cs index 5569d6d6..87e15cc7 100644 --- a/dev/DevWinUI.Gallery/Views/Pages/Common/ExtensionPage.xaml.cs +++ b/dev/DevWinUI.Gallery/Views/Pages/Common/ExtensionPage.xaml.cs @@ -5,7 +5,6 @@ namespace DevWinUIGallery.Views; public sealed partial class ExtensionPage : Page { public ExtensionViewModel ViewModel { get; } - private bool _isBusy = false; public ExtensionPage() { ViewModel = App.GetService(); @@ -39,31 +38,24 @@ private void NumberValidatorDynamic_TextChanging(Microsoft.UI.Xaml.Controls.Text private async void OnFadeIn(object sender, RoutedEventArgs e) { - _isBusy = true; await SampleGrid.AnimateDoublePropertyAsync("Opacity", 1.0, 0.0, 500); await SampleGrid.AnimateDoublePropertyAsync("Opacity", 0.0, 1.0, 500); - _isBusy = false; } private async void OnAnimateWidth(object sender, RoutedEventArgs e) { - _isBusy = true; await SampleGrid.AnimateDoublePropertyAsync("Width", 200.0, 400.0, 500); await SampleGrid.AnimateDoublePropertyAsync("Width", 400.0, 200.0, 500); - _isBusy = false; } private async void OnAnimateHeight(object sender, RoutedEventArgs e) { - _isBusy = true; await SampleGrid.AnimateDoublePropertyAsync("Height", 200.0, 400.0, 500); await SampleGrid.AnimateDoublePropertyAsync("Height", 400.0, 200.0, 500); - _isBusy = false; } private async void OnGrow(object sender, RoutedEventArgs e) { - _isBusy = true; SampleGrid.AnimateDoubleProperty("Width", 200.0, 250.0, 300); SampleGrid.AnimateDoubleProperty("Height", 200.0, 250.0, 300); await Task.Delay(300); @@ -72,21 +64,17 @@ private async void OnGrow(object sender, RoutedEventArgs e) await Task.Delay(300); SampleGrid.AnimateDoubleProperty("Width", 150.0, 200.0, 300); SampleGrid.AnimateDoubleProperty("Height", 150.0, 200.0, 300); - _isBusy = false; } private async void OnRotate(object sender, RoutedEventArgs e) { - _isBusy = true; RotateTransform rotateTransform = new RotateTransform() { CenterX = 100, CenterY = 100 }; SampleGrid.RenderTransform = rotateTransform; await rotateTransform.AnimateDoublePropertyAsync("Angle", 0.0, -360.0, 1000); - _isBusy = false; } private async void OnTranslate(object sender, RoutedEventArgs e) { - _isBusy = true; TranslateTransform translateTransform = new TranslateTransform(); SampleGrid.RenderTransform = translateTransform; translateTransform.AnimateDoubleProperty("X", 0.0, 100.0, 300); @@ -94,12 +82,10 @@ private async void OnTranslate(object sender, RoutedEventArgs e) await Task.Delay(500); translateTransform.AnimateDoubleProperty("X", 100.0, 0.0, 300); translateTransform.AnimateDoubleProperty("Y", 100.0, 0.0, 300); - _isBusy = false; } private async void OnSkew(object sender, RoutedEventArgs e) { - _isBusy = true; SkewTransform skewTransform = new SkewTransform() { CenterX = 100, CenterY = 100 }; SampleGrid.RenderTransform = skewTransform; await skewTransform.AnimateDoublePropertyAsync("AngleX", 0.0, 20.0, 300); @@ -108,6 +94,5 @@ private async void OnSkew(object sender, RoutedEventArgs e) await skewTransform.AnimateDoublePropertyAsync("AngleY", 0.0, 20.0, 300); await skewTransform.AnimateDoublePropertyAsync("AngleY", 20.0, -20.0, 600); await skewTransform.AnimateDoublePropertyAsync("AngleY", -20.0, 0.0, 300); - _isBusy = false; } } diff --git a/dev/DevWinUI.Gallery/Views/Pages/Composition/EdgeLightingPage.xaml b/dev/DevWinUI.Gallery/Views/Pages/Composition/EdgeLightingPage.xaml new file mode 100644 index 00000000..af8bc9ef --- /dev/null +++ b/dev/DevWinUI.Gallery/Views/Pages/Composition/EdgeLightingPage.xaml @@ -0,0 +1,92 @@ +ο»Ώ + + + + + + + <dev:EdgeLighting Width="200" Height="200" /> + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/DevWinUI.Gallery/Views/Pages/Composition/EdgeLightingPage.xaml.cs b/dev/DevWinUI.Gallery/Views/Pages/Composition/EdgeLightingPage.xaml.cs new file mode 100644 index 00000000..730564ab --- /dev/null +++ b/dev/DevWinUI.Gallery/Views/Pages/Composition/EdgeLightingPage.xaml.cs @@ -0,0 +1,9 @@ +ο»Ώnamespace DevWinUIGallery.Views; + +public sealed partial class EdgeLightingPage : Page +{ + public EdgeLightingPage() + { + InitializeComponent(); + } +} diff --git a/dev/DevWinUI.Gallery/Views/Pages/Features/StylesPage.xaml b/dev/DevWinUI.Gallery/Views/Pages/Features/StylesPage.xaml index b368e126..86680c61 100644 --- a/dev/DevWinUI.Gallery/Views/Pages/Features/StylesPage.xaml +++ b/dev/DevWinUI.Gallery/Views/Pages/Features/StylesPage.xaml @@ -91,10 +91,10 @@ - + diff --git a/dev/DevWinUI.Gallery/Views/Pages/LandingsPage/HomeLandingsPage.xaml b/dev/DevWinUI.Gallery/Views/Pages/LandingsPage/HomeLandingsPage.xaml index d70da4a6..10b065c6 100644 --- a/dev/DevWinUI.Gallery/Views/Pages/LandingsPage/HomeLandingsPage.xaml +++ b/dev/DevWinUI.Gallery/Views/Pages/LandingsPage/HomeLandingsPage.xaml @@ -27,14 +27,14 @@ + Link="https://Ghost1372.github.io/DevWinUI"> + Link="https://Ghost1372.github.io/DevWinUIBase"> diff --git a/dev/DevWinUI.Controls/Common/Attach/MenuFlyoutAttach/MenuFlyoutAttach.cs b/dev/DevWinUI/Common/Attach/MenuFlyoutAttach/MenuFlyoutAttach.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Attach/MenuFlyoutAttach/MenuFlyoutAttach.cs rename to dev/DevWinUI/Common/Attach/MenuFlyoutAttach/MenuFlyoutAttach.cs diff --git a/dev/DevWinUI.Controls/Common/Attach/MenuFlyoutAttach/MenuFlyoutSecondaryItems.cs b/dev/DevWinUI/Common/Attach/MenuFlyoutAttach/MenuFlyoutSecondaryItems.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Attach/MenuFlyoutAttach/MenuFlyoutSecondaryItems.cs rename to dev/DevWinUI/Common/Attach/MenuFlyoutAttach/MenuFlyoutSecondaryItems.cs diff --git a/dev/DevWinUI.Controls/Common/Attach/MenuFlyoutAttach/MenuFlyoutSecondaryMenuPlacement.cs b/dev/DevWinUI/Common/Attach/MenuFlyoutAttach/MenuFlyoutSecondaryMenuPlacement.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Attach/MenuFlyoutAttach/MenuFlyoutSecondaryMenuPlacement.cs rename to dev/DevWinUI/Common/Attach/MenuFlyoutAttach/MenuFlyoutSecondaryMenuPlacement.cs diff --git a/dev/DevWinUI.Controls/Common/Attach/StoreNavigationViewItemAttach.cs b/dev/DevWinUI/Common/Attach/StoreNavigationViewItemAttach.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Attach/StoreNavigationViewItemAttach.cs rename to dev/DevWinUI/Common/Attach/StoreNavigationViewItemAttach.cs diff --git a/dev/DevWinUI.Controls/Common/Attach/VisualAttach.cs b/dev/DevWinUI/Common/Attach/VisualAttach.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Attach/VisualAttach.cs rename to dev/DevWinUI/Common/Attach/VisualAttach.cs diff --git a/dev/DevWinUI.Controls/Common/Brush/BlurEffectBrush.cs b/dev/DevWinUI/Common/Brush/BlurEffectBrush.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Brush/BlurEffectBrush.cs rename to dev/DevWinUI/Common/Brush/BlurEffectBrush.cs diff --git a/dev/DevWinUI.Controls/Common/Brush/ImageEffectBrush.cs b/dev/DevWinUI/Common/Brush/ImageEffectBrush.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Brush/ImageEffectBrush.cs rename to dev/DevWinUI/Common/Brush/ImageEffectBrush.cs diff --git a/dev/DevWinUI.Controls/Common/Brush/TiledImageBrush.cs b/dev/DevWinUI/Common/Brush/TiledImageBrush.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Brush/TiledImageBrush.cs rename to dev/DevWinUI/Common/Brush/TiledImageBrush.cs diff --git a/dev/DevWinUI.Controls/Common/Extension/ContentDialogWindowedExtensions.cs b/dev/DevWinUI/Common/Extension/ContentDialogWindowedExtensions.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Extension/ContentDialogWindowedExtensions.cs rename to dev/DevWinUI/Common/Extension/ContentDialogWindowedExtensions.cs diff --git a/dev/DevWinUI.Controls/Common/Extension/InternalExtensions.cs b/dev/DevWinUI/Common/Extension/InternalExtensions.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Extension/InternalExtensions.cs rename to dev/DevWinUI/Common/Extension/InternalExtensions.cs diff --git a/dev/DevWinUI.Controls/Common/Helper/ColorHelperEx.cs b/dev/DevWinUI/Common/Helper/ColorHelperEx.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Helper/ColorHelperEx.cs rename to dev/DevWinUI/Common/Helper/ColorHelperEx.cs diff --git a/dev/DevWinUI.Controls/Common/Helper/ControlHelpers.cs b/dev/DevWinUI/Common/Helper/ControlHelpers.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Helper/ControlHelpers.cs rename to dev/DevWinUI/Common/Helper/ControlHelpers.cs diff --git a/dev/DevWinUI.Controls/Common/NavigationView/ImplicitOffsetAnimationHelper.cs b/dev/DevWinUI/Common/NavigationView/ImplicitOffsetAnimationHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/NavigationView/ImplicitOffsetAnimationHelper.cs rename to dev/DevWinUI/Common/NavigationView/ImplicitOffsetAnimationHelper.cs diff --git a/dev/DevWinUI.Controls/Common/Squircle/CompositionPathBuilder.cs b/dev/DevWinUI/Common/Squircle/CompositionPathBuilder.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Squircle/CompositionPathBuilder.cs rename to dev/DevWinUI/Common/Squircle/CompositionPathBuilder.cs diff --git a/dev/DevWinUI.Controls/Common/Squircle/SquircleClipAttach.cs b/dev/DevWinUI/Common/Squircle/SquircleClipAttach.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Squircle/SquircleClipAttach.cs rename to dev/DevWinUI/Common/Squircle/SquircleClipAttach.cs diff --git a/dev/DevWinUI.Controls/Common/Squircle/SquircleCornerRadiusExtensions.cs b/dev/DevWinUI/Common/Squircle/SquircleCornerRadiusExtensions.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Squircle/SquircleCornerRadiusExtensions.cs rename to dev/DevWinUI/Common/Squircle/SquircleCornerRadiusExtensions.cs diff --git a/dev/DevWinUI.Controls/Common/Squircle/SquircleFactory.cs b/dev/DevWinUI/Common/Squircle/SquircleFactory.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Squircle/SquircleFactory.cs rename to dev/DevWinUI/Common/Squircle/SquircleFactory.cs diff --git a/dev/DevWinUI.Controls/Common/Squircle/SquirclePathBuilder.cs b/dev/DevWinUI/Common/Squircle/SquirclePathBuilder.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Squircle/SquirclePathBuilder.cs rename to dev/DevWinUI/Common/Squircle/SquirclePathBuilder.cs diff --git a/dev/DevWinUI.Controls/Common/Squircle/Win2DPathBuilder.cs b/dev/DevWinUI/Common/Squircle/Win2DPathBuilder.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/Squircle/Win2DPathBuilder.cs rename to dev/DevWinUI/Common/Squircle/Win2DPathBuilder.cs diff --git a/dev/DevWinUI.Controls/Common/StateTrigger/ControlSizeTrigger.cs b/dev/DevWinUI/Common/StateTrigger/ControlSizeTrigger.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/StateTrigger/ControlSizeTrigger.cs rename to dev/DevWinUI/Common/StateTrigger/ControlSizeTrigger.cs diff --git a/dev/DevWinUI.Controls/Common/StateTrigger/IsEqualStateTrigger.cs b/dev/DevWinUI/Common/StateTrigger/IsEqualStateTrigger.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/StateTrigger/IsEqualStateTrigger.cs rename to dev/DevWinUI/Common/StateTrigger/IsEqualStateTrigger.cs diff --git a/dev/DevWinUI.Controls/Common/StateTrigger/IsNullOrEmptyStateTrigger.cs b/dev/DevWinUI/Common/StateTrigger/IsNullOrEmptyStateTrigger.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/StateTrigger/IsNullOrEmptyStateTrigger.cs rename to dev/DevWinUI/Common/StateTrigger/IsNullOrEmptyStateTrigger.cs diff --git a/dev/DevWinUI.Controls/Common/StateTrigger/WeakEventListener.cs b/dev/DevWinUI/Common/StateTrigger/WeakEventListener.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/StateTrigger/WeakEventListener.cs rename to dev/DevWinUI/Common/StateTrigger/WeakEventListener.cs diff --git a/dev/DevWinUI.Controls/Common/XamlLight/AmbLight.cs b/dev/DevWinUI/Common/XamlLight/AmbLight.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/XamlLight/AmbLight.cs rename to dev/DevWinUI/Common/XamlLight/AmbLight.cs diff --git a/dev/DevWinUI.Controls/Common/XamlLight/HoverLight.cs b/dev/DevWinUI/Common/XamlLight/HoverLight.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/XamlLight/HoverLight.cs rename to dev/DevWinUI/Common/XamlLight/HoverLight.cs diff --git a/dev/DevWinUI.Controls/Common/XamlLight/RippleLight.cs b/dev/DevWinUI/Common/XamlLight/RippleLight.cs similarity index 100% rename from dev/DevWinUI.Controls/Common/XamlLight/RippleLight.cs rename to dev/DevWinUI/Common/XamlLight/RippleLight.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/CompositionDefinitions.cs b/dev/DevWinUI/CompositionProToolkit/CompositionDefinitions.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/CompositionDefinitions.cs rename to dev/DevWinUI/CompositionProToolkit/CompositionDefinitions.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/CompositionProExtensions.cs b/dev/DevWinUI/CompositionProToolkit/CompositionProExtensions.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/CompositionProExtensions.cs rename to dev/DevWinUI/CompositionProToolkit/CompositionProExtensions.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/CompositorExtensions.cs b/dev/DevWinUI/CompositionProToolkit/CompositorExtensions.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/CompositorExtensions.cs rename to dev/DevWinUI/CompositionProToolkit/CompositorExtensions.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionAnimationExtensions.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/CompositionAnimationExtensions.cs similarity index 93% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionAnimationExtensions.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/CompositionAnimationExtensions.cs index 82a02d68..218fa5e2 100644 --- a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionAnimationExtensions.cs +++ b/dev/DevWinUI/CompositionProToolkit/Expressions/CompositionAnimationExtensions.cs @@ -73,7 +73,9 @@ static CompositionAnimationExtensions() public static void SetExpression(this ExpressionAnimation animation, Expression> expression) { +#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling. var result = CompositionExpressionEngine.CreateCompositionExpression(expression); +#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling. animation.Expression = result.Expression; animation.SetParameters(result.Parameters); } @@ -92,7 +94,9 @@ public static void SetExpression(this ExpressionAnimation animation, public static KeyFrameAnimation InsertExpressionKeyFrame(this KeyFrameAnimation animation, float normalizedProgressKey, Expression> expression, CompositionEasingFunction easingFunction = null) { +#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling. var result = CompositionExpressionEngine.CreateCompositionExpression(expression); +#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling. animation.InsertExpressionKeyFrame(normalizedProgressKey, result.Expression, easingFunction); animation.SetParameters(result.Parameters); diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionExpressionContext.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/CompositionExpressionContext.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionExpressionContext.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/CompositionExpressionContext.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionExpressionEngine.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/CompositionExpressionEngine.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionExpressionEngine.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/CompositionExpressionEngine.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionKeyFrame.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/CompositionKeyFrame.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionKeyFrame.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/CompositionKeyFrame.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionObjectExtensions.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/CompositionObjectExtensions.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionObjectExtensions.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/CompositionObjectExtensions.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionPropertySetExtensions.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/CompositionPropertySetExtensions.cs similarity index 96% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionPropertySetExtensions.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/CompositionPropertySetExtensions.cs index 8011d535..695e1cda 100644 --- a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/CompositionPropertySetExtensions.cs +++ b/dev/DevWinUI/CompositionProToolkit/Expressions/CompositionPropertySetExtensions.cs @@ -277,6 +277,7 @@ public static CompositionPropertySet ToPropertySet(object input, Compositor comp { var propertySet = compositor.CreatePropertySet(); +#pragma warning disable IL2075 // 'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations. foreach (var property in input.GetType().GetTypeInfo().DeclaredProperties) { var type = property.PropertyType; @@ -305,6 +306,7 @@ public static CompositionPropertySet ToPropertySet(object input, Compositor comp // Once a matching Insertxxx method is found, Invoke it! InsertMethods[methodKey].Invoke(propertySet, new[] { property.Name, parameter }); } +#pragma warning restore IL2075 // 'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations. return propertySet; } diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/ExpressionAnimation.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/ExpressionAnimation.cs similarity index 96% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/ExpressionAnimation.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/ExpressionAnimation.cs index 75c4a02b..1ce5ee1a 100644 --- a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/ExpressionAnimation.cs +++ b/dev/DevWinUI/CompositionProToolkit/Expressions/ExpressionAnimation.cs @@ -137,7 +137,9 @@ private void UpdateExpression(Expression> expression) // Clear previous references if any _references.Clear(); _expression = expression; +#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling. var result = CompositionExpressionEngine.CreateCompositionExpression(_expression); +#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling. _expressionString = result.Expression; _references = new Dictionary(result.Parameters); _anyReferenceUpdated = true; diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/CompositionExpressionEngine.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Internals/CompositionExpressionEngine.cs similarity index 98% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/CompositionExpressionEngine.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Internals/CompositionExpressionEngine.cs index a27dfd2d..50e49eea 100644 --- a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/CompositionExpressionEngine.cs +++ b/dev/DevWinUI/CompositionProToolkit/Expressions/Internals/CompositionExpressionEngine.cs @@ -26,6 +26,7 @@ // // CompositionProToolkit v1.0.1 // +#pragma warning disable IL2075 // 'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations. using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; @@ -198,12 +199,14 @@ static CompositionExpressionEngine() }; // Get all the types which derive from Expression or MemberBinding +#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code ExpressionTypes = typeof(Expression) .GetTypeInfo() .Assembly .GetTypes() .Where(t => t.IsSubclassOf(typeof(Expression)) || t.IsSubclassOf(typeof(MemberBinding))); +#pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code // Get all the Visit Methods @@ -356,7 +359,9 @@ private static ExpressionToken Visit(BinaryExpression expression) // Is this an Array Index expression? if (expression.NodeType == ExpressionType.ArrayIndex) { +#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling. return VisitArrayExpression(expression); +#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling. } // Check if it is the outermost BinaryExpression @@ -1739,3 +1744,4 @@ private static void AddParameter(string paramName, object paramValue) #endregion } +#pragma warning restore IL2075 // 'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations. diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/CompositionExpressionResult.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Internals/CompositionExpressionResult.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/CompositionExpressionResult.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Internals/CompositionExpressionResult.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/ExpressionParameter.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Internals/ExpressionParameter.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/ExpressionParameter.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Internals/ExpressionParameter.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/ExpressionToken.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Internals/ExpressionToken.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/ExpressionToken.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Internals/ExpressionToken.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/KeyFrameAnimationHelper.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Internals/KeyFrameAnimationHelper.cs similarity index 88% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/KeyFrameAnimationHelper.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Internals/KeyFrameAnimationHelper.cs index ca1e303a..ba94ea35 100644 --- a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Internals/KeyFrameAnimationHelper.cs +++ b/dev/DevWinUI/CompositionProToolkit/Expressions/Internals/KeyFrameAnimationHelper.cs @@ -50,11 +50,13 @@ static KeyFrameAnimationHelper() { // Get the InsertKeyFrame method (of the KeyFrameAnimation matching // the animationType.Key) which take 3 parameters +#pragma warning disable IL2075 // 'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations. var methodInfo = animationType.Value.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static) .FirstOrDefault(m => m.Name.Equals("InsertKeyFrame") && (m.GetParameters().Length == 3)); +#pragma warning restore IL2075 // 'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations. InsertMethods[animationType.Key] = methodInfo; } @@ -87,4 +89,4 @@ internal static KeyFrameAnimation CreateAnimation(Compositor compositor) } #endregion -} \ No newline at end of file +} diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/AmbientLight.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/AmbientLight.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/AmbientLight.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/AmbientLight.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/ColorBrush.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/ColorBrush.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/ColorBrush.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/ColorBrush.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/DistantLight.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/DistantLight.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/DistantLight.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/DistantLight.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/DropShadow.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/DropShadow.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/DropShadow.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/DropShadow.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/ExpressionTemplate.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/ExpressionTemplate.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/ExpressionTemplate.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/ExpressionTemplate.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/InsetClip.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/InsetClip.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/InsetClip.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/InsetClip.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/InteractionTracker.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/InteractionTracker.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/InteractionTracker.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/InteractionTracker.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/ManipulationPropertySet.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/ManipulationPropertySet.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/ManipulationPropertySet.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/ManipulationPropertySet.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/NineGridBrush.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/NineGridBrush.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/NineGridBrush.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/NineGridBrush.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/PointLight.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/PointLight.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/PointLight.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/PointLight.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/PointerPositionPropertySet.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/PointerPositionPropertySet.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/PointerPositionPropertySet.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/PointerPositionPropertySet.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/SpotLight.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/SpotLight.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/SpotLight.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/SpotLight.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/SurfaceBrush.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/SurfaceBrush.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/SurfaceBrush.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/SurfaceBrush.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/Visual.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/Templates/Visual.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/Templates/Visual.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/Templates/Visual.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/TypeExtensions.cs b/dev/DevWinUI/CompositionProToolkit/Expressions/TypeExtensions.cs similarity index 95% rename from dev/DevWinUI.Controls/CompositionProToolkit/Expressions/TypeExtensions.cs rename to dev/DevWinUI/CompositionProToolkit/Expressions/TypeExtensions.cs index 36d5259d..77f1cde4 100644 --- a/dev/DevWinUI.Controls/CompositionProToolkit/Expressions/TypeExtensions.cs +++ b/dev/DevWinUI/CompositionProToolkit/Expressions/TypeExtensions.cs @@ -31,6 +31,8 @@ namespace DevWinUI; +#pragma warning disable IL2075 // 'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations. + /// /// Extension methods for System.Type /// @@ -217,3 +219,4 @@ internal static string FormattedName(this Type t, bool fullname = false) return fullname ? t.FullName : t.Name; } } +#pragma warning restore IL2075 // 'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations. diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/ICompositionGenerator.cs b/dev/DevWinUI/CompositionProToolkit/ICompositionGenerator.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/ICompositionGenerator.cs rename to dev/DevWinUI/CompositionProToolkit/ICompositionGenerator.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/IGaussianMaskSurface.cs b/dev/DevWinUI/CompositionProToolkit/IGaussianMaskSurface.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/IGaussianMaskSurface.cs rename to dev/DevWinUI/CompositionProToolkit/IGaussianMaskSurface.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/IGeometrySurface.cs b/dev/DevWinUI/CompositionProToolkit/IGeometrySurface.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/IGeometrySurface.cs rename to dev/DevWinUI/CompositionProToolkit/IGeometrySurface.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/IImageMaskSurface.cs b/dev/DevWinUI/CompositionProToolkit/IImageMaskSurface.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/IImageMaskSurface.cs rename to dev/DevWinUI/CompositionProToolkit/IImageMaskSurface.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/IImageSurface.cs b/dev/DevWinUI/CompositionProToolkit/IImageSurface.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/IImageSurface.cs rename to dev/DevWinUI/CompositionProToolkit/IImageSurface.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/IMaskSurface.cs b/dev/DevWinUI/CompositionProToolkit/IMaskSurface.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/IMaskSurface.cs rename to dev/DevWinUI/CompositionProToolkit/IMaskSurface.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/IRenderSurface.cs b/dev/DevWinUI/CompositionProToolkit/IRenderSurface.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/IRenderSurface.cs rename to dev/DevWinUI/CompositionProToolkit/IRenderSurface.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Internals/CompositionGenerator.cs b/dev/DevWinUI/CompositionProToolkit/Internals/CompositionGenerator.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Internals/CompositionGenerator.cs rename to dev/DevWinUI/CompositionProToolkit/Internals/CompositionGenerator.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Internals/CompositionPathInfo.cs b/dev/DevWinUI/CompositionProToolkit/Internals/CompositionPathInfo.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Internals/CompositionPathInfo.cs rename to dev/DevWinUI/CompositionProToolkit/Internals/CompositionPathInfo.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Internals/DeviceLostHelper.cs b/dev/DevWinUI/CompositionProToolkit/Internals/DeviceLostHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Internals/DeviceLostHelper.cs rename to dev/DevWinUI/CompositionProToolkit/Internals/DeviceLostHelper.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Internals/GaussianMaskSurface.cs b/dev/DevWinUI/CompositionProToolkit/Internals/GaussianMaskSurface.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Internals/GaussianMaskSurface.cs rename to dev/DevWinUI/CompositionProToolkit/Internals/GaussianMaskSurface.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Internals/GeometrySurface.cs b/dev/DevWinUI/CompositionProToolkit/Internals/GeometrySurface.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Internals/GeometrySurface.cs rename to dev/DevWinUI/CompositionProToolkit/Internals/GeometrySurface.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Internals/ICompositionGeneratorInternal.cs b/dev/DevWinUI/CompositionProToolkit/Internals/ICompositionGeneratorInternal.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Internals/ICompositionGeneratorInternal.cs rename to dev/DevWinUI/CompositionProToolkit/Internals/ICompositionGeneratorInternal.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Internals/ImageMaskSurface.cs b/dev/DevWinUI/CompositionProToolkit/Internals/ImageMaskSurface.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Internals/ImageMaskSurface.cs rename to dev/DevWinUI/CompositionProToolkit/Internals/ImageMaskSurface.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Internals/ImageSurface.cs b/dev/DevWinUI/CompositionProToolkit/Internals/ImageSurface.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Internals/ImageSurface.cs rename to dev/DevWinUI/CompositionProToolkit/Internals/ImageSurface.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Internals/MaskSurface.cs b/dev/DevWinUI/CompositionProToolkit/Internals/MaskSurface.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Internals/MaskSurface.cs rename to dev/DevWinUI/CompositionProToolkit/Internals/MaskSurface.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Scalar.cs b/dev/DevWinUI/CompositionProToolkit/Scalar.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Scalar.cs rename to dev/DevWinUI/CompositionProToolkit/Scalar.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Utils.cs b/dev/DevWinUI/CompositionProToolkit/Utils.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Utils.cs rename to dev/DevWinUI/CompositionProToolkit/Utils.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasDrawingSessionExtensions.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/CanvasDrawingSessionExtensions.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasDrawingSessionExtensions.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/CanvasDrawingSessionExtensions.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/CanvasElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/CanvasElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasObject.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/CanvasObject.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasObject.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/CanvasObject.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasPathBuilderExtensions.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/CanvasPathBuilderExtensions.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasPathBuilderExtensions.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/CanvasPathBuilderExtensions.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasRenderLayer.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/CanvasRenderLayer.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasRenderLayer.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/CanvasRenderLayer.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasStroke.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/CanvasStroke.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/CanvasStroke.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/CanvasStroke.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/ICanvasRenderLayer.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/ICanvasRenderLayer.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/ICanvasRenderLayer.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/ICanvasRenderLayer.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/ICanvasStroke.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/ICanvasStroke.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/ICanvasStroke.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/ICanvasStroke.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Common/CommonDefinitions.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Common/CommonDefinitions.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Common/CommonDefinitions.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Common/CommonDefinitions.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Core/CanvasRoundRect.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Core/CanvasRoundRect.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Core/CanvasRoundRect.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Core/CanvasRoundRect.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Core/PathElementFactory.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Core/PathElementFactory.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Core/PathElementFactory.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Core/PathElementFactory.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Core/RegexFactory.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Core/RegexFactory.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Core/RegexFactory.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Core/RegexFactory.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/AbstractCanvasBrushElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/AbstractCanvasBrushElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/AbstractCanvasBrushElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/AbstractCanvasBrushElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/ICanvasBrushElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/ICanvasBrushElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/ICanvasBrushElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/ICanvasBrushElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/LinearGradientBrushElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/LinearGradientBrushElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/LinearGradientBrushElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/LinearGradientBrushElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/LinearGradientHdrBrushElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/LinearGradientHdrBrushElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/LinearGradientHdrBrushElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/LinearGradientHdrBrushElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/RadialGradientBrushElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/RadialGradientBrushElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/RadialGradientBrushElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/RadialGradientBrushElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/RadialGradientHdrBrushElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/RadialGradientHdrBrushElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/RadialGradientHdrBrushElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/RadialGradientHdrBrushElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/SolidColorBrushElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/SolidColorBrushElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Brush/SolidColorBrushElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Brush/SolidColorBrushElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/AbstractPathElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/AbstractPathElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/AbstractPathElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/AbstractPathElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/ArcElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/ArcElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/ArcElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/ArcElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasEllipseFigure.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasEllipseFigure.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasEllipseFigure.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasEllipseFigure.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasPathFigure.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasPathFigure.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasPathFigure.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasPathFigure.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasPolygonFigure.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasPolygonFigure.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasPolygonFigure.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasPolygonFigure.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasRectangleFigure.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasRectangleFigure.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasRectangleFigure.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasRectangleFigure.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasRoundRectangleFigure.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasRoundRectangleFigure.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasRoundRectangleFigure.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CanvasRoundRectangleFigure.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/ClosePathElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/ClosePathElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/ClosePathElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/ClosePathElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CubicBezierElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CubicBezierElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/CubicBezierElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/CubicBezierElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/FillRuleElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/FillRuleElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/FillRuleElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/FillRuleElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/HorizontalLineElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/HorizontalLineElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/HorizontalLineElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/HorizontalLineElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/ICanvasPathElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/ICanvasPathElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/ICanvasPathElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/ICanvasPathElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/LineElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/LineElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/LineElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/LineElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/MoveToElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/MoveToElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/MoveToElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/MoveToElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/QuadraticBezierElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/QuadraticBezierElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/QuadraticBezierElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/QuadraticBezierElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/SmoothCubicBezierElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/SmoothCubicBezierElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/SmoothCubicBezierElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/SmoothCubicBezierElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/SmoothQuadraticBezierElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/SmoothQuadraticBezierElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/SmoothQuadraticBezierElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/SmoothQuadraticBezierElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/VerticalLineElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/VerticalLineElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Path/VerticalLineElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Path/VerticalLineElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/AbstractCanvasStrokeElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/AbstractCanvasStrokeElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/AbstractCanvasStrokeElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/AbstractCanvasStrokeElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/CanvasStrokeElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/CanvasStrokeElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/CanvasStrokeElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/CanvasStrokeElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/CanvasStrokeStyleElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/CanvasStrokeStyleElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/CanvasStrokeStyleElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/CanvasStrokeStyleElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/ICanvasStrokeElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/ICanvasStrokeElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/ICanvasStrokeElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/ICanvasStrokeElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/ICanvasStrokeStyleElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/ICanvasStrokeStyleElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/ICanvasStrokeStyleElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Geometry/Stroke/ICanvasStrokeStyleElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/ICanvasElement.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/ICanvasElement.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/ICanvasElement.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/ICanvasElement.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Parsers/CanvasBrushParser.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Parsers/CanvasBrushParser.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Parsers/CanvasBrushParser.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Parsers/CanvasBrushParser.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Parsers/CanvasGeometryParser.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Parsers/CanvasGeometryParser.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Parsers/CanvasGeometryParser.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Parsers/CanvasGeometryParser.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Parsers/CanvasStrokeParser.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Parsers/CanvasStrokeParser.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Parsers/CanvasStrokeParser.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Parsers/CanvasStrokeParser.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Parsers/CanvasStrokeStyleParser.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Parsers/CanvasStrokeStyleParser.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Parsers/CanvasStrokeStyleParser.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Parsers/CanvasStrokeStyleParser.cs diff --git a/dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Parsers/ColorParser.cs b/dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Parsers/ColorParser.cs similarity index 100% rename from dev/DevWinUI.Controls/CompositionProToolkit/Win2d/Internals/Parsers/ColorParser.cs rename to dev/DevWinUI/CompositionProToolkit/Win2d/Internals/Parsers/ColorParser.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Accordion/Accordion.cs b/dev/DevWinUI/Controls/Native/Accordion/Accordion.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Accordion/Accordion.cs rename to dev/DevWinUI/Controls/Native/Accordion/Accordion.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Accordion/AccordionItem.cs b/dev/DevWinUI/Controls/Native/Accordion/AccordionItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Accordion/AccordionItem.cs rename to dev/DevWinUI/Controls/Native/Accordion/AccordionItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Accordion/AccordionPanel.Manipulation.cs b/dev/DevWinUI/Controls/Native/Accordion/AccordionPanel.Manipulation.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Accordion/AccordionPanel.Manipulation.cs rename to dev/DevWinUI/Controls/Native/Accordion/AccordionPanel.Manipulation.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Accordion/AccordionPanel.Properties.cs b/dev/DevWinUI/Controls/Native/Accordion/AccordionPanel.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Accordion/AccordionPanel.Properties.cs rename to dev/DevWinUI/Controls/Native/Accordion/AccordionPanel.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Accordion/AccordionPanel.cs b/dev/DevWinUI/Controls/Native/Accordion/AccordionPanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Accordion/AccordionPanel.cs rename to dev/DevWinUI/Controls/Native/Accordion/AccordionPanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Card/Card.cs b/dev/DevWinUI/Controls/Native/Card/Card.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Card/Card.cs rename to dev/DevWinUI/Controls/Native/Card/Card.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Card/GoToCard.cs b/dev/DevWinUI/Controls/Native/Card/GoToCard.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Card/GoToCard.cs rename to dev/DevWinUI/Controls/Native/Card/GoToCard.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Card/InfoCard.cs b/dev/DevWinUI/Controls/Native/Card/InfoCard.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Card/InfoCard.cs rename to dev/DevWinUI/Controls/Native/Card/InfoCard.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorItemShape.cs b/dev/DevWinUI/Controls/Native/ColorPalette/ColorItemShape.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorItemShape.cs rename to dev/DevWinUI/Controls/Native/ColorPalette/ColorItemShape.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorPalette.Properties.cs b/dev/DevWinUI/Controls/Native/ColorPalette/ColorPalette.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorPalette.Properties.cs rename to dev/DevWinUI/Controls/Native/ColorPalette/ColorPalette.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorPalette.cs b/dev/DevWinUI/Controls/Native/ColorPalette/ColorPalette.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorPalette.cs rename to dev/DevWinUI/Controls/Native/ColorPalette/ColorPalette.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorPaletteColorChangedEventArgs.cs b/dev/DevWinUI/Controls/Native/ColorPalette/ColorPaletteColorChangedEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorPaletteColorChangedEventArgs.cs rename to dev/DevWinUI/Controls/Native/ColorPalette/ColorPaletteColorChangedEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorPaletteItem.Properties.cs b/dev/DevWinUI/Controls/Native/ColorPalette/ColorPaletteItem.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorPaletteItem.Properties.cs rename to dev/DevWinUI/Controls/Native/ColorPalette/ColorPaletteItem.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorPaletteItem.cs b/dev/DevWinUI/Controls/Native/ColorPalette/ColorPaletteItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorPaletteItem.cs rename to dev/DevWinUI/Controls/Native/ColorPalette/ColorPaletteItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorSetType.cs b/dev/DevWinUI/Controls/Native/ColorPalette/ColorSetType.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ColorPalette/ColorSetType.cs rename to dev/DevWinUI/Controls/Native/ColorPalette/ColorSetType.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ColorfulShimmingEffect/ColorfulShimmingEffect.cs b/dev/DevWinUI/Controls/Native/ColorfulShimmingEffect/ColorfulShimmingEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ColorfulShimmingEffect/ColorfulShimmingEffect.cs rename to dev/DevWinUI/Controls/Native/ColorfulShimmingEffect/ColorfulShimmingEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ColorfulShimmingEffect/ColorfulShimmingEffectItem.cs b/dev/DevWinUI/Controls/Native/ColorfulShimmingEffect/ColorfulShimmingEffectItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ColorfulShimmingEffect/ColorfulShimmingEffectItem.cs rename to dev/DevWinUI/Controls/Native/ColorfulShimmingEffect/ColorfulShimmingEffectItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/CoverFlow/CoverFlow.Properties.cs b/dev/DevWinUI/Controls/Native/CoverFlow/CoverFlow.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/CoverFlow/CoverFlow.Properties.cs rename to dev/DevWinUI/Controls/Native/CoverFlow/CoverFlow.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/CoverFlow/CoverFlow.cs b/dev/DevWinUI/Controls/Native/CoverFlow/CoverFlow.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/CoverFlow/CoverFlow.cs rename to dev/DevWinUI/Controls/Native/CoverFlow/CoverFlow.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/CoverFlow/CoverFlowEventArgs.cs b/dev/DevWinUI/Controls/Native/CoverFlow/CoverFlowEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/CoverFlow/CoverFlowEventArgs.cs rename to dev/DevWinUI/Controls/Native/CoverFlow/CoverFlowEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/CoverFlow/CoverFlowItem.cs b/dev/DevWinUI/Controls/Native/CoverFlow/CoverFlowItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/CoverFlow/CoverFlowItem.cs rename to dev/DevWinUI/Controls/Native/CoverFlow/CoverFlowItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/CalendarWithClock/CalendarViewAttach.cs b/dev/DevWinUI/Controls/Native/Date/CalendarWithClock/CalendarViewAttach.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/CalendarWithClock/CalendarViewAttach.cs rename to dev/DevWinUI/Controls/Native/Date/CalendarWithClock/CalendarViewAttach.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/CalendarWithClock/CalendarWithClock.Property.cs b/dev/DevWinUI/Controls/Native/Date/CalendarWithClock/CalendarWithClock.Property.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/CalendarWithClock/CalendarWithClock.Property.cs rename to dev/DevWinUI/Controls/Native/Date/CalendarWithClock/CalendarWithClock.Property.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/CalendarWithClock/CalendarWithClock.cs b/dev/DevWinUI/Controls/Native/Date/CalendarWithClock/CalendarWithClock.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/CalendarWithClock/CalendarWithClock.cs rename to dev/DevWinUI/Controls/Native/Date/CalendarWithClock/CalendarWithClock.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/CalendarWithClock/ClockMode.cs b/dev/DevWinUI/Controls/Native/Date/CalendarWithClock/ClockMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/CalendarWithClock/ClockMode.cs rename to dev/DevWinUI/Controls/Native/Date/CalendarWithClock/ClockMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/CalendarWithClock/TimePickerDisplayMode.cs b/dev/DevWinUI/Controls/Native/Date/CalendarWithClock/TimePickerDisplayMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/CalendarWithClock/TimePickerDisplayMode.cs rename to dev/DevWinUI/Controls/Native/Date/CalendarWithClock/TimePickerDisplayMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/Clock/ArithmeticHelper.cs b/dev/DevWinUI/Controls/Native/Date/Clock/ArithmeticHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/Clock/ArithmeticHelper.cs rename to dev/DevWinUI/Controls/Native/Date/Clock/ArithmeticHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/Clock/Clock.Property.cs b/dev/DevWinUI/Controls/Native/Date/Clock/Clock.Property.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/Clock/Clock.Property.cs rename to dev/DevWinUI/Controls/Native/Date/Clock/Clock.Property.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/Clock/Clock.cs b/dev/DevWinUI/Controls/Native/Date/Clock/Clock.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/Clock/Clock.cs rename to dev/DevWinUI/Controls/Native/Date/Clock/Clock.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/Clock/ClockRadioButton.cs b/dev/DevWinUI/Controls/Native/Date/Clock/ClockRadioButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/Clock/ClockRadioButton.cs rename to dev/DevWinUI/Controls/Native/Date/Clock/ClockRadioButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/DateTimeBase.cs b/dev/DevWinUI/Controls/Native/Date/DateTimeBase.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/DateTimeBase.cs rename to dev/DevWinUI/Controls/Native/Date/DateTimeBase.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/DateTimePicker/DateTimePicker.Property.cs b/dev/DevWinUI/Controls/Native/Date/DateTimePicker/DateTimePicker.Property.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/DateTimePicker/DateTimePicker.Property.cs rename to dev/DevWinUI/Controls/Native/Date/DateTimePicker/DateTimePicker.Property.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Date/DateTimePicker/DateTimePicker.cs b/dev/DevWinUI/Controls/Native/Date/DateTimePicker/DateTimePicker.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Date/DateTimePicker/DateTimePicker.cs rename to dev/DevWinUI/Controls/Native/Date/DateTimePicker/DateTimePicker.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DepthLayerView/DepthLayerView.cs b/dev/DevWinUI/Controls/Native/DepthLayerView/DepthLayerView.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DepthLayerView/DepthLayerView.cs rename to dev/DevWinUI/Controls/Native/DepthLayerView/DepthLayerView.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DepthLayerView/DepthLayerViewEventArgs.cs b/dev/DevWinUI/Controls/Native/DepthLayerView/DepthLayerViewEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DepthLayerView/DepthLayerViewEventArgs.cs rename to dev/DevWinUI/Controls/Native/DepthLayerView/DepthLayerViewEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DepthLayerView/DepthLayerViewItem.cs b/dev/DevWinUI/Controls/Native/DepthLayerView/DepthLayerViewItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DepthLayerView/DepthLayerViewItem.cs rename to dev/DevWinUI/Controls/Native/DepthLayerView/DepthLayerViewItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DepthLayerView/IDepthLayerViewItem.cs b/dev/DevWinUI/Controls/Native/DepthLayerView/IDepthLayerViewItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DepthLayerView/IDepthLayerViewItem.cs rename to dev/DevWinUI/Controls/Native/DepthLayerView/IDepthLayerViewItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegment.Properties.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegment.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegment.Properties.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegment.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegment.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegment.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegment.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegment.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegmentScrollDirection.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegmentScrollDirection.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegmentScrollDirection.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/DigitalSegment/DigitalSegmentScrollDirection.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/DigitalSegmentHelper.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/DigitalSegmentHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/DigitalSegmentHelper.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/DigitalSegmentHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Fourteen/FourteenSegmentChar.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Fourteen/FourteenSegmentChar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Fourteen/FourteenSegmentChar.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Fourteen/FourteenSegmentChar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Fourteen/StandardFourteenSegmentPattern.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Fourteen/StandardFourteenSegmentPattern.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Fourteen/StandardFourteenSegmentPattern.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Fourteen/StandardFourteenSegmentPattern.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/ISegmentPattern.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/ISegmentPattern.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/ISegmentPattern.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/ISegmentPattern.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/Matrix5x7SegmentChar.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/Matrix5x7SegmentChar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/Matrix5x7SegmentChar.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/Matrix5x7SegmentChar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/Matrix5x8SegmentChar.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/Matrix5x8SegmentChar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/Matrix5x8SegmentChar.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/Matrix5x8SegmentChar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/Matrix8x14SegmentChar.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/Matrix8x14SegmentChar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/Matrix8x14SegmentChar.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/Matrix8x14SegmentChar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/MatrixSegmentChar.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/MatrixSegmentChar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/MatrixSegmentChar.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/MatrixSegmentChar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix5x7Pattern.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix5x7Pattern.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix5x7Pattern.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix5x7Pattern.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix5x8Pattern.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix5x8Pattern.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix5x8Pattern.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix5x8Pattern.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix8x14Pattern.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix8x14Pattern.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix8x14Pattern.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Matrix/StandardMatrix8x14Pattern.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentChar.Properties.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentChar.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentChar.Properties.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentChar.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentChar.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentChar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentChar.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentChar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentEventArgs.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentEventArgs.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/SegmentChar/SegmentEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Sixteen/SixteenSegmentChar.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Sixteen/SixteenSegmentChar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Sixteen/SixteenSegmentChar.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Sixteen/SixteenSegmentChar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Sixteen/StandardSixteenSegmentPattern.cs b/dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Sixteen/StandardSixteenSegmentPattern.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DigitalSegment/Segments/Sixteen/StandardSixteenSegmentPattern.cs rename to dev/DevWinUI/Controls/Native/DigitalSegment/Segments/Sixteen/StandardSixteenSegmentPattern.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Divider/Divider.cs b/dev/DevWinUI/Controls/Native/Divider/Divider.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Divider/Divider.cs rename to dev/DevWinUI/Controls/Native/Divider/Divider.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Divider/LineDashStrokeArrayConverter.cs b/dev/DevWinUI/Controls/Native/Divider/LineDashStrokeArrayConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Divider/LineDashStrokeArrayConverter.cs rename to dev/DevWinUI/Controls/Native/Divider/LineDashStrokeArrayConverter.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DropdownColorPicker/DropdownColorPicker.Properties.cs b/dev/DevWinUI/Controls/Native/DropdownColorPicker/DropdownColorPicker.Properties.cs similarity index 93% rename from dev/DevWinUI.Controls/Controls/Native/DropdownColorPicker/DropdownColorPicker.Properties.cs rename to dev/DevWinUI/Controls/Native/DropdownColorPicker/DropdownColorPicker.Properties.cs index 18ced05b..d85421dc 100644 --- a/dev/DevWinUI.Controls/Controls/Native/DropdownColorPicker/DropdownColorPicker.Properties.cs +++ b/dev/DevWinUI/Controls/Native/DropdownColorPicker/DropdownColorPicker.Properties.cs @@ -239,4 +239,23 @@ public double TintBoxHeight public static readonly DependencyProperty TintBoxHeightProperty = DependencyProperty.Register(nameof(TintBoxHeight), typeof(double), typeof(DropdownColorPicker), new PropertyMetadata(24.0)); + + public object Header + { + get { return (object)GetValue(HeaderProperty); } + set { SetValue(HeaderProperty, value); } + } + + public static readonly DependencyProperty HeaderProperty = + DependencyProperty.Register(nameof(Header), typeof(object), typeof(DropdownColorPicker), new PropertyMetadata(null)); + + public DataTemplate HeaderTemplate + { + get { return (DataTemplate)GetValue(HeaderTemplateProperty); } + set { SetValue(HeaderTemplateProperty, value); } + } + + public static readonly DependencyProperty HeaderTemplateProperty = + DependencyProperty.Register(nameof(HeaderTemplate), typeof(DataTemplate), typeof(DropdownColorPicker), new PropertyMetadata(default(DataTemplate))); } + diff --git a/dev/DevWinUI.Controls/Controls/Native/DropdownColorPicker/DropdownColorPicker.cs b/dev/DevWinUI/Controls/Native/DropdownColorPicker/DropdownColorPicker.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DropdownColorPicker/DropdownColorPicker.cs rename to dev/DevWinUI/Controls/Native/DropdownColorPicker/DropdownColorPicker.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/DropdownColorPicker/DropdownColorPickerColorChangedEventArgs.cs b/dev/DevWinUI/Controls/Native/DropdownColorPicker/DropdownColorPickerColorChangedEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/DropdownColorPicker/DropdownColorPickerColorChangedEventArgs.cs rename to dev/DevWinUI/Controls/Native/DropdownColorPicker/DropdownColorPickerColorChangedEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/FlipCard/FlipBlock.cs b/dev/DevWinUI/Controls/Native/FlipCard/FlipBlock.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/FlipCard/FlipBlock.cs rename to dev/DevWinUI/Controls/Native/FlipCard/FlipBlock.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/FlipCard/FlipCards.cs b/dev/DevWinUI/Controls/Native/FlipCard/FlipCards.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/FlipCard/FlipCards.cs rename to dev/DevWinUI/Controls/Native/FlipCard/FlipCards.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/FlipCard/FlipCardsSourceType.cs b/dev/DevWinUI/Controls/Native/FlipCard/FlipCardsSourceType.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/FlipCard/FlipCardsSourceType.cs rename to dev/DevWinUI/Controls/Native/FlipCard/FlipCardsSourceType.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/FlipSide/FlipOrientationMode.cs b/dev/DevWinUI/Controls/Native/FlipSide/FlipOrientationMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/FlipSide/FlipOrientationMode.cs rename to dev/DevWinUI/Controls/Native/FlipSide/FlipOrientationMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/FlipSide/FlipSide.cs b/dev/DevWinUI/Controls/Native/FlipSide/FlipSide.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/FlipSide/FlipSide.cs rename to dev/DevWinUI/Controls/Native/FlipSide/FlipSide.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/GifImage/FrameProperties.cs b/dev/DevWinUI/Controls/Native/GifImage/FrameProperties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/GifImage/FrameProperties.cs rename to dev/DevWinUI/Controls/Native/GifImage/FrameProperties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/GifImage/GifImage.Play.cs b/dev/DevWinUI/Controls/Native/GifImage/GifImage.Play.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/GifImage/GifImage.Play.cs rename to dev/DevWinUI/Controls/Native/GifImage/GifImage.Play.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/GifImage/GifImage.Tools.cs b/dev/DevWinUI/Controls/Native/GifImage/GifImage.Tools.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/GifImage/GifImage.Tools.cs rename to dev/DevWinUI/Controls/Native/GifImage/GifImage.Tools.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/GifImage/GifImage.cs b/dev/DevWinUI/Controls/Native/GifImage/GifImage.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/GifImage/GifImage.cs rename to dev/DevWinUI/Controls/Native/GifImage/GifImage.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Gravatar/GithubGravatarGenerator.cs b/dev/DevWinUI/Controls/Native/Gravatar/GithubGravatarGenerator.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Gravatar/GithubGravatarGenerator.cs rename to dev/DevWinUI/Controls/Native/Gravatar/GithubGravatarGenerator.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Gravatar/Gravatar.cs b/dev/DevWinUI/Controls/Native/Gravatar/Gravatar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Gravatar/Gravatar.cs rename to dev/DevWinUI/Controls/Native/Gravatar/Gravatar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Gravatar/IGravatarGenerator.cs b/dev/DevWinUI/Controls/Native/Gravatar/IGravatarGenerator.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Gravatar/IGravatarGenerator.cs rename to dev/DevWinUI/Controls/Native/Gravatar/IGravatarGenerator.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Growl/GridLengthConverter.cs b/dev/DevWinUI/Controls/Native/Growl/GridLengthConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Growl/GridLengthConverter.cs rename to dev/DevWinUI/Controls/Native/Growl/GridLengthConverter.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Growl/Growl.Methods.cs b/dev/DevWinUI/Controls/Native/Growl/Growl.Methods.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Growl/Growl.Methods.cs rename to dev/DevWinUI/Controls/Native/Growl/Growl.Methods.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Growl/Growl.Properties.cs b/dev/DevWinUI/Controls/Native/Growl/Growl.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Growl/Growl.Properties.cs rename to dev/DevWinUI/Controls/Native/Growl/Growl.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Growl/Growl.cs b/dev/DevWinUI/Controls/Native/Growl/Growl.cs similarity index 99% rename from dev/DevWinUI.Controls/Controls/Native/Growl/Growl.cs rename to dev/DevWinUI/Controls/Native/Growl/Growl.cs index e7f55f0c..631dc22e 100644 --- a/dev/DevWinUI.Controls/Controls/Native/Growl/Growl.cs +++ b/dev/DevWinUI/Controls/Native/Growl/Growl.cs @@ -171,7 +171,7 @@ private void AddBlueInfoResource() { Resources.MergedDictionaries.Add(new ResourceDictionary { - Source = new Uri("ms-appx:///DevWinUI.Controls/Themes/InfoBarInformationalColor.xaml") + Source = new Uri("ms-appx:///DevWinUI/Themes/InfoBarInformationalColor.xaml") }); } diff --git a/dev/DevWinUI.Controls/Controls/Native/Growl/GrowlInfo.cs b/dev/DevWinUI/Controls/Native/Growl/GrowlInfo.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Growl/GrowlInfo.cs rename to dev/DevWinUI/Controls/Native/Growl/GrowlInfo.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Growl/GrowlTransition.cs b/dev/DevWinUI/Controls/Native/Growl/GrowlTransition.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Growl/GrowlTransition.cs rename to dev/DevWinUI/Controls/Native/Growl/GrowlTransition.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Growl/GrowlWindow.cs b/dev/DevWinUI/Controls/Native/Growl/GrowlWindow.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Growl/GrowlWindow.cs rename to dev/DevWinUI/Controls/Native/Growl/GrowlWindow.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/HaloArc.cs b/dev/DevWinUI/Controls/Native/Halo/HaloArc.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/HaloArc.cs rename to dev/DevWinUI/Controls/Native/Halo/HaloArc.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/HaloArcSlider.cs b/dev/DevWinUI/Controls/Native/Halo/HaloArcSlider.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/HaloArcSlider.cs rename to dev/DevWinUI/Controls/Native/Halo/HaloArcSlider.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/HaloChain.cs b/dev/DevWinUI/Controls/Native/Halo/HaloChain.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/HaloChain.cs rename to dev/DevWinUI/Controls/Native/Halo/HaloChain.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/HaloDisc.cs b/dev/DevWinUI/Controls/Native/Halo/HaloDisc.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/HaloDisc.cs rename to dev/DevWinUI/Controls/Native/Halo/HaloDisc.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/HaloPanel.cs b/dev/DevWinUI/Controls/Native/Halo/HaloPanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/HaloPanel.cs rename to dev/DevWinUI/Controls/Native/Halo/HaloPanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/HaloRingLabel.cs b/dev/DevWinUI/Controls/Native/Halo/HaloRingLabel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/HaloRingLabel.cs rename to dev/DevWinUI/Controls/Native/Halo/HaloRingLabel.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/HaloRingPanel.cs b/dev/DevWinUI/Controls/Native/Halo/HaloRingPanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/HaloRingPanel.cs rename to dev/DevWinUI/Controls/Native/Halo/HaloRingPanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/HaloSlice.cs b/dev/DevWinUI/Controls/Native/Halo/HaloSlice.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/HaloSlice.cs rename to dev/DevWinUI/Controls/Native/Halo/HaloSlice.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/HaloSlider.cs b/dev/DevWinUI/Controls/Native/Halo/HaloSlider.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/HaloSlider.cs rename to dev/DevWinUI/Controls/Native/Halo/HaloSlider.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/HaloSliderEventArgs.cs b/dev/DevWinUI/Controls/Native/Halo/HaloSliderEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/HaloSliderEventArgs.cs rename to dev/DevWinUI/Controls/Native/Halo/HaloSliderEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/HaloTimePicker.cs b/dev/DevWinUI/Controls/Native/Halo/HaloTimePicker.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/HaloTimePicker.cs rename to dev/DevWinUI/Controls/Native/Halo/HaloTimePicker.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/Internals/HaloCircleHelper.cs b/dev/DevWinUI/Controls/Native/Halo/Internals/HaloCircleHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/Internals/HaloCircleHelper.cs rename to dev/DevWinUI/Controls/Native/Halo/Internals/HaloCircleHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/Internals/HaloExtensions.cs b/dev/DevWinUI/Controls/Native/Halo/Internals/HaloExtensions.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/Internals/HaloExtensions.cs rename to dev/DevWinUI/Controls/Native/Halo/Internals/HaloExtensions.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/Internals/HaloVector.cs b/dev/DevWinUI/Controls/Native/Halo/Internals/HaloVector.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/Internals/HaloVector.cs rename to dev/DevWinUI/Controls/Native/Halo/Internals/HaloVector.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/Internals/TimeDisplayConverter.cs b/dev/DevWinUI/Controls/Native/Halo/Internals/TimeDisplayConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/Internals/TimeDisplayConverter.cs rename to dev/DevWinUI/Controls/Native/Halo/Internals/TimeDisplayConverter.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/Internals/TimeHoursConverter.cs b/dev/DevWinUI/Controls/Native/Halo/Internals/TimeHoursConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/Internals/TimeHoursConverter.cs rename to dev/DevWinUI/Controls/Native/Halo/Internals/TimeHoursConverter.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Halo/Internals/TimeMinutesConverter.cs b/dev/DevWinUI/Controls/Native/Halo/Internals/TimeMinutesConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Halo/Internals/TimeMinutesConverter.cs rename to dev/DevWinUI/Controls/Native/Halo/Internals/TimeMinutesConverter.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/HeaderCarousel/HeaderCarousel.Properties.cs b/dev/DevWinUI/Controls/Native/HeaderCarousel/HeaderCarousel.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/HeaderCarousel/HeaderCarousel.Properties.cs rename to dev/DevWinUI/Controls/Native/HeaderCarousel/HeaderCarousel.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/HeaderCarousel/HeaderCarousel.cs b/dev/DevWinUI/Controls/Native/HeaderCarousel/HeaderCarousel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/HeaderCarousel/HeaderCarousel.cs rename to dev/DevWinUI/Controls/Native/HeaderCarousel/HeaderCarousel.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/HeaderCarousel/HeaderCarouselEventArgs.cs b/dev/DevWinUI/Controls/Native/HeaderCarousel/HeaderCarouselEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/HeaderCarousel/HeaderCarouselEventArgs.cs rename to dev/DevWinUI/Controls/Native/HeaderCarousel/HeaderCarouselEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/HeaderCarousel/HeaderCarouselItem.Properties.cs b/dev/DevWinUI/Controls/Native/HeaderCarousel/HeaderCarouselItem.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/HeaderCarousel/HeaderCarouselItem.Properties.cs rename to dev/DevWinUI/Controls/Native/HeaderCarousel/HeaderCarouselItem.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/HeaderCarousel/HeaderCarouselItem.cs b/dev/DevWinUI/Controls/Native/HeaderCarousel/HeaderCarouselItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/HeaderCarousel/HeaderCarouselItem.cs rename to dev/DevWinUI/Controls/Native/HeaderCarousel/HeaderCarouselItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageEx.Members.cs b/dev/DevWinUI/Controls/Native/ImageEx/ImageEx.Members.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageEx.Members.cs rename to dev/DevWinUI/Controls/Native/ImageEx/ImageEx.Members.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageEx.cs b/dev/DevWinUI/Controls/Native/ImageEx/ImageEx.cs similarity index 96% rename from dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageEx.cs rename to dev/DevWinUI/Controls/Native/ImageEx/ImageEx.cs index 30fb7fcd..c2fba824 100644 --- a/dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageEx.cs +++ b/dev/DevWinUI/Controls/Native/ImageEx/ImageEx.cs @@ -18,6 +18,6 @@ public ImageEx() : base() { DefaultStyleKey = typeof(ImageEx); - DefaultStyleResourceUri = new System.Uri("ms-appx:///DevWinUI.Controls/Themes/Generic.xaml"); + DefaultStyleResourceUri = new System.Uri("ms-appx:///DevWinUI/Themes/Generic.xaml"); } } diff --git a/dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExBase.Members.cs b/dev/DevWinUI/Controls/Native/ImageEx/ImageExBase.Members.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExBase.Members.cs rename to dev/DevWinUI/Controls/Native/ImageEx/ImageExBase.Members.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExBase.Placeholder.cs b/dev/DevWinUI/Controls/Native/ImageEx/ImageExBase.Placeholder.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExBase.Placeholder.cs rename to dev/DevWinUI/Controls/Native/ImageEx/ImageExBase.Placeholder.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExBase.Source.cs b/dev/DevWinUI/Controls/Native/ImageEx/ImageExBase.Source.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExBase.Source.cs rename to dev/DevWinUI/Controls/Native/ImageEx/ImageExBase.Source.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExBase.cs b/dev/DevWinUI/Controls/Native/ImageEx/ImageExBase.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExBase.cs rename to dev/DevWinUI/Controls/Native/ImageEx/ImageExBase.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExFailedEventArgs.cs b/dev/DevWinUI/Controls/Native/ImageEx/ImageExFailedEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExFailedEventArgs.cs rename to dev/DevWinUI/Controls/Native/ImageEx/ImageExFailedEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExOpenedEventArgs.cs b/dev/DevWinUI/Controls/Native/ImageEx/ImageExOpenedEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageExOpenedEventArgs.cs rename to dev/DevWinUI/Controls/Native/ImageEx/ImageExOpenedEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/KeyVisual/KeyVisual.cs b/dev/DevWinUI/Controls/Native/KeyVisual/KeyVisual.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/KeyVisual/KeyVisual.cs rename to dev/DevWinUI/Controls/Native/KeyVisual/KeyVisual.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/KeyVisual/KeyVisualInfo.cs b/dev/DevWinUI/Controls/Native/KeyVisual/KeyVisualInfo.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/KeyVisual/KeyVisualInfo.cs rename to dev/DevWinUI/Controls/Native/KeyVisual/KeyVisualInfo.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoadingIndicator/IndicatorVisualStateGroupNames.cs b/dev/DevWinUI/Controls/Native/LoadingIndicator/IndicatorVisualStateGroupNames.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoadingIndicator/IndicatorVisualStateGroupNames.cs rename to dev/DevWinUI/Controls/Native/LoadingIndicator/IndicatorVisualStateGroupNames.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoadingIndicator/IndicatorVisualStateNames.cs b/dev/DevWinUI/Controls/Native/LoadingIndicator/IndicatorVisualStateNames.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoadingIndicator/IndicatorVisualStateNames.cs rename to dev/DevWinUI/Controls/Native/LoadingIndicator/IndicatorVisualStateNames.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoadingIndicator/LoadingIndicator.cs b/dev/DevWinUI/Controls/Native/LoadingIndicator/LoadingIndicator.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoadingIndicator/LoadingIndicator.cs rename to dev/DevWinUI/Controls/Native/LoadingIndicator/LoadingIndicator.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoadingIndicator/LoadingIndicatorMode.cs b/dev/DevWinUI/Controls/Native/LoadingIndicator/LoadingIndicatorMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoadingIndicator/LoadingIndicatorMode.cs rename to dev/DevWinUI/Controls/Native/LoadingIndicator/LoadingIndicatorMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoadingIndicator/VisualStateUtilities.cs b/dev/DevWinUI/Controls/Native/LoadingIndicator/VisualStateUtilities.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoadingIndicator/VisualStateUtilities.cs rename to dev/DevWinUI/Controls/Native/LoadingIndicator/VisualStateUtilities.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoopPanel/LoopPanel.Properties.cs b/dev/DevWinUI/Controls/Native/LoopPanel/LoopPanel.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoopPanel/LoopPanel.Properties.cs rename to dev/DevWinUI/Controls/Native/LoopPanel/LoopPanel.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoopPanel/LoopPanel.cs b/dev/DevWinUI/Controls/Native/LoopPanel/LoopPanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoopPanel/LoopPanel.cs rename to dev/DevWinUI/Controls/Native/LoopPanel/LoopPanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoopPanel/LoopPanelHelper.cs b/dev/DevWinUI/Controls/Native/LoopPanel/LoopPanelHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoopPanel/LoopPanelHelper.cs rename to dev/DevWinUI/Controls/Native/LoopPanel/LoopPanelHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoopingList/LoopingList.Properties.cs b/dev/DevWinUI/Controls/Native/LoopingList/LoopingList.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoopingList/LoopingList.Properties.cs rename to dev/DevWinUI/Controls/Native/LoopingList/LoopingList.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoopingList/LoopingList.cs b/dev/DevWinUI/Controls/Native/LoopingList/LoopingList.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoopingList/LoopingList.cs rename to dev/DevWinUI/Controls/Native/LoopingList/LoopingList.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoopingList/LoopingListEventArgs.cs b/dev/DevWinUI/Controls/Native/LoopingList/LoopingListEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoopingList/LoopingListEventArgs.cs rename to dev/DevWinUI/Controls/Native/LoopingList/LoopingListEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoopingList/LoopingListFlyout.cs b/dev/DevWinUI/Controls/Native/LoopingList/LoopingListFlyout.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoopingList/LoopingListFlyout.cs rename to dev/DevWinUI/Controls/Native/LoopingList/LoopingListFlyout.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/LoopingList/LoopingListFlyoutPresenter.cs b/dev/DevWinUI/Controls/Native/LoopingList/LoopingListFlyoutPresenter.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/LoopingList/LoopingListFlyoutPresenter.cs rename to dev/DevWinUI/Controls/Native/LoopingList/LoopingListFlyoutPresenter.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Magnifier/Magnifier.cs b/dev/DevWinUI/Controls/Native/Magnifier/Magnifier.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Magnifier/Magnifier.cs rename to dev/DevWinUI/Controls/Native/Magnifier/Magnifier.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Magnifier/MagnifierPosition.cs b/dev/DevWinUI/Controls/Native/Magnifier/MagnifierPosition.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Magnifier/MagnifierPosition.cs rename to dev/DevWinUI/Controls/Native/Magnifier/MagnifierPosition.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.Error.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBox.Error.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.Error.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBox.Error.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.Info.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBox.Info.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.Info.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBox.Info.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.Question.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBox.Question.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.Question.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBox.Question.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.Success.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBox.Success.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.Success.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBox.Success.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.Warning.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBox.Warning.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.Warning.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBox.Warning.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBox.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBox.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBox.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxBase.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBoxBase.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxBase.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBoxBase.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxBaseOptions.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBoxBaseOptions.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxBaseOptions.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBoxBaseOptions.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxButtons.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBoxButtons.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxButtons.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBoxButtons.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxDefaultButton.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBoxDefaultButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxDefaultButton.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBoxDefaultButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxHeader.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBoxHeader.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxHeader.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBoxHeader.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxIcon.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBoxIcon.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxIcon.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBoxIcon.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxOptions.cs b/dev/DevWinUI/Controls/Native/MessageBox/MessageBoxOptions.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/MessageBoxOptions.cs rename to dev/DevWinUI/Controls/Native/MessageBox/MessageBoxOptions.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/NativeMessageBoxButtonStringLoader.cs b/dev/DevWinUI/Controls/Native/MessageBox/NativeMessageBoxButtonStringLoader.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/NativeMessageBoxButtonStringLoader.cs rename to dev/DevWinUI/Controls/Native/MessageBox/NativeMessageBoxButtonStringLoader.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/MessageBox/SelectableTextBlock.cs b/dev/DevWinUI/Controls/Native/MessageBox/SelectableTextBlock.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/MessageBox/SelectableTextBlock.cs rename to dev/DevWinUI/Controls/Native/MessageBox/SelectableTextBlock.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/OpacityMaskView/OpacityMaskView.cs b/dev/DevWinUI/Controls/Native/OpacityMaskView/OpacityMaskView.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/OpacityMaskView/OpacityMaskView.cs rename to dev/DevWinUI/Controls/Native/OpacityMaskView/OpacityMaskView.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/OpacityMaskView/RedirectVisualView.cs b/dev/DevWinUI/Controls/Native/OpacityMaskView/RedirectVisualView.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/OpacityMaskView/RedirectVisualView.cs rename to dev/DevWinUI/Controls/Native/OpacityMaskView/RedirectVisualView.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/AnimatedImage.cs b/dev/DevWinUI/Controls/Native/Others/AnimatedImage.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/AnimatedImage.cs rename to dev/DevWinUI/Controls/Native/Others/AnimatedImage.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/AutoScrollView.cs b/dev/DevWinUI/Controls/Native/Others/AutoScrollView.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/AutoScrollView.cs rename to dev/DevWinUI/Controls/Native/Others/AutoScrollView.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/CheckBoxWithDescriptionControl.cs b/dev/DevWinUI/Controls/Native/Others/CheckBoxWithDescriptionControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/CheckBoxWithDescriptionControl.cs rename to dev/DevWinUI/Controls/Native/Others/CheckBoxWithDescriptionControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/CheckUpdateControl.cs b/dev/DevWinUI/Controls/Native/Others/CheckUpdateControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/CheckUpdateControl.cs rename to dev/DevWinUI/Controls/Native/Others/CheckUpdateControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/CompareSlider.cs b/dev/DevWinUI/Controls/Native/Others/CompareSlider.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/CompareSlider.cs rename to dev/DevWinUI/Controls/Native/Others/CompareSlider.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/ElementGroup.cs b/dev/DevWinUI/Controls/Native/Others/ElementGroup.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/ElementGroup.cs rename to dev/DevWinUI/Controls/Native/Others/ElementGroup.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/FlyoutMenuButton.cs b/dev/DevWinUI/Controls/Native/Others/FlyoutMenuButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/FlyoutMenuButton.cs rename to dev/DevWinUI/Controls/Native/Others/FlyoutMenuButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/GotoTop.cs b/dev/DevWinUI/Controls/Native/Others/GotoTop.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/GotoTop.cs rename to dev/DevWinUI/Controls/Native/Others/GotoTop.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/HeaderTile.cs b/dev/DevWinUI/Controls/Native/Others/HeaderTile.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/HeaderTile.cs rename to dev/DevWinUI/Controls/Native/Others/HeaderTile.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/HorizontalScrollContainer.cs b/dev/DevWinUI/Controls/Native/Others/HorizontalScrollContainer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/HorizontalScrollContainer.cs rename to dev/DevWinUI/Controls/Native/Others/HorizontalScrollContainer.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/HorizontalSimpleGridLayout.cs b/dev/DevWinUI/Controls/Native/Others/HorizontalSimpleGridLayout.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/HorizontalSimpleGridLayout.cs rename to dev/DevWinUI/Controls/Native/Others/HorizontalSimpleGridLayout.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/InlineAutoCompleteTextBox.cs b/dev/DevWinUI/Controls/Native/Others/InlineAutoCompleteTextBox.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/InlineAutoCompleteTextBox.cs rename to dev/DevWinUI/Controls/Native/Others/InlineAutoCompleteTextBox.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/IsEnabledTextBlock.cs b/dev/DevWinUI/Controls/Native/Others/IsEnabledTextBlock.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/IsEnabledTextBlock.cs rename to dev/DevWinUI/Controls/Native/Others/IsEnabledTextBlock.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/LayeredFontIcons.cs b/dev/DevWinUI/Controls/Native/Others/LayeredFontIcons.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/LayeredFontIcons.cs rename to dev/DevWinUI/Controls/Native/Others/LayeredFontIcons.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/LayoutTransformer.cs b/dev/DevWinUI/Controls/Native/Others/LayoutTransformer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/LayoutTransformer.cs rename to dev/DevWinUI/Controls/Native/Others/LayoutTransformer.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/LongShadowTextBlock.cs b/dev/DevWinUI/Controls/Native/Others/LongShadowTextBlock.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/LongShadowTextBlock.cs rename to dev/DevWinUI/Controls/Native/Others/LongShadowTextBlock.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/OffsetBox.cs b/dev/DevWinUI/Controls/Native/Others/OffsetBox.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/OffsetBox.cs rename to dev/DevWinUI/Controls/Native/Others/OffsetBox.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/SelectorBarSegmented.cs b/dev/DevWinUI/Controls/Native/Others/SelectorBarSegmented.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/SelectorBarSegmented.cs rename to dev/DevWinUI/Controls/Native/Others/SelectorBarSegmented.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/Shield.cs b/dev/DevWinUI/Controls/Native/Others/Shield.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/Shield.cs rename to dev/DevWinUI/Controls/Native/Others/Shield.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/Shimmer.cs b/dev/DevWinUI/Controls/Native/Others/Shimmer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/Shimmer.cs rename to dev/DevWinUI/Controls/Native/Others/Shimmer.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/SplitCircle.cs b/dev/DevWinUI/Controls/Native/Others/SplitCircle.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/SplitCircle.cs rename to dev/DevWinUI/Controls/Native/Others/SplitCircle.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/TextBox.cs b/dev/DevWinUI/Controls/Native/Others/TextBox.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/TextBox.cs rename to dev/DevWinUI/Controls/Native/Others/TextBox.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Others/WanderingParticles.cs b/dev/DevWinUI/Controls/Native/Others/WanderingParticles.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Others/WanderingParticles.cs rename to dev/DevWinUI/Controls/Native/Others/WanderingParticles.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Pages/HomePageHeader.cs b/dev/DevWinUI/Controls/Native/Pages/HomePageHeader.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Pages/HomePageHeader.cs rename to dev/DevWinUI/Controls/Native/Pages/HomePageHeader.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Pages/OptionsPageControl/OptionsPageControl.Properties.cs b/dev/DevWinUI/Controls/Native/Pages/OptionsPageControl/OptionsPageControl.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Pages/OptionsPageControl/OptionsPageControl.Properties.cs rename to dev/DevWinUI/Controls/Native/Pages/OptionsPageControl/OptionsPageControl.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Pages/OptionsPageControl/OptionsPageControl.cs b/dev/DevWinUI/Controls/Native/Pages/OptionsPageControl/OptionsPageControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Pages/OptionsPageControl/OptionsPageControl.cs rename to dev/DevWinUI/Controls/Native/Pages/OptionsPageControl/OptionsPageControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Pages/OutOfBoxPage/OutOfBoxPage.cs b/dev/DevWinUI/Controls/Native/Pages/OutOfBoxPage/OutOfBoxPage.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Pages/OutOfBoxPage/OutOfBoxPage.cs rename to dev/DevWinUI/Controls/Native/Pages/OutOfBoxPage/OutOfBoxPage.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Pages/OutOfBoxPage/OutOfBoxPageLink.cs b/dev/DevWinUI/Controls/Native/Pages/OutOfBoxPage/OutOfBoxPageLink.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Pages/OutOfBoxPage/OutOfBoxPageLink.cs rename to dev/DevWinUI/Controls/Native/Pages/OutOfBoxPage/OutOfBoxPageLink.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Pages/OverviewPageHeader.cs b/dev/DevWinUI/Controls/Native/Pages/OverviewPageHeader.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Pages/OverviewPageHeader.cs rename to dev/DevWinUI/Controls/Native/Pages/OverviewPageHeader.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/CirclePanel.cs b/dev/DevWinUI/Controls/Native/Panel/CirclePanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/CirclePanel.cs rename to dev/DevWinUI/Controls/Native/Panel/CirclePanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexContentAlignment.cs b/dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexContentAlignment.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexContentAlignment.cs rename to dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexContentAlignment.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexContentJustify.cs b/dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexContentJustify.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexContentJustify.cs rename to dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexContentJustify.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexDirection.cs b/dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexDirection.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexDirection.cs rename to dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexDirection.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexItemAlignment.cs b/dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexItemAlignment.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexItemAlignment.cs rename to dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexItemAlignment.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexItemsAlignment.cs b/dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexItemsAlignment.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexItemsAlignment.cs rename to dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexItemsAlignment.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexPanel.cs b/dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexPanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexPanel.cs rename to dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexPanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexWrap.cs b/dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexWrap.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/FlexWrap.cs rename to dev/DevWinUI/Controls/Native/Panel/FlexPanel/FlexWrap.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/MathHelper.cs b/dev/DevWinUI/Controls/Native/Panel/FlexPanel/MathHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/MathHelper.cs rename to dev/DevWinUI/Controls/Native/Panel/FlexPanel/MathHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/ValidateHelper.cs b/dev/DevWinUI/Controls/Native/Panel/FlexPanel/ValidateHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/FlexPanel/ValidateHelper.cs rename to dev/DevWinUI/Controls/Native/Panel/FlexPanel/ValidateHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/HoneycombPanel.cs b/dev/DevWinUI/Controls/Native/Panel/HoneycombPanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/HoneycombPanel.cs rename to dev/DevWinUI/Controls/Native/Panel/HoneycombPanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/WrapPanel/StretchChild.cs b/dev/DevWinUI/Controls/Native/Panel/WrapPanel/StretchChild.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/WrapPanel/StretchChild.cs rename to dev/DevWinUI/Controls/Native/Panel/WrapPanel/StretchChild.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/WrapPanel/WrapPanel.Data.cs b/dev/DevWinUI/Controls/Native/Panel/WrapPanel/WrapPanel.Data.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/WrapPanel/WrapPanel.Data.cs rename to dev/DevWinUI/Controls/Native/Panel/WrapPanel/WrapPanel.Data.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Panel/WrapPanel/WrapPanel.cs b/dev/DevWinUI/Controls/Native/Panel/WrapPanel/WrapPanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Panel/WrapPanel/WrapPanel.cs rename to dev/DevWinUI/Controls/Native/Panel/WrapPanel/WrapPanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/PinBox/PinBox.Helper.cs b/dev/DevWinUI/Controls/Native/PinBox/PinBox.Helper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/PinBox/PinBox.Helper.cs rename to dev/DevWinUI/Controls/Native/PinBox/PinBox.Helper.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/PinBox/PinBox.Property.cs b/dev/DevWinUI/Controls/Native/PinBox/PinBox.Property.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/PinBox/PinBox.Property.cs rename to dev/DevWinUI/Controls/Native/PinBox/PinBox.Property.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/PinBox/PinBox.cs b/dev/DevWinUI/Controls/Native/PinBox/PinBox.cs similarity index 98% rename from dev/DevWinUI.Controls/Controls/Native/PinBox/PinBox.cs rename to dev/DevWinUI/Controls/Native/PinBox/PinBox.cs index f026620d..c8ff92a0 100644 --- a/dev/DevWinUI.Controls/Controls/Native/PinBox/PinBox.cs +++ b/dev/DevWinUI/Controls/Native/PinBox/PinBox.cs @@ -8,12 +8,14 @@ public partial class PinBox : Control private const string PART_Panel = "PART_Panel"; private UniformGrid _uniformGrid; private List _passwordList; +#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value 0 private long _foregroundPropertyToken; private long _backgroundPropertyToken; private long _borderBrushPropertyToken; private long _borderThicknessPropertyToken; private long _contextFlyoutPropertyToken; private long _cornerRadiusPropertyToken; +#pragma warning restore CS0649 // Field is never assigned to, and will always have its default value 0 public PinBox() { diff --git a/dev/DevWinUI.Controls/Controls/Native/PinBox/PinBoxFocusMode.cs b/dev/DevWinUI/Controls/Native/PinBox/PinBoxFocusMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/PinBox/PinBoxFocusMode.cs rename to dev/DevWinUI/Controls/Native/PinBox/PinBoxFocusMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/PinBox/PinBoxPasswordChangedEventArgs.cs b/dev/DevWinUI/Controls/Native/PinBox/PinBoxPasswordChangedEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/PinBox/PinBoxPasswordChangedEventArgs.cs rename to dev/DevWinUI/Controls/Native/PinBox/PinBoxPasswordChangedEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/ArcProgress/ArcProgress.cs b/dev/DevWinUI/Controls/Native/Progress/ArcProgress/ArcProgress.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/ArcProgress/ArcProgress.cs rename to dev/DevWinUI/Controls/Native/Progress/ArcProgress/ArcProgress.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/ArcProgress/ArcProgressFillAnimationState.cs b/dev/DevWinUI/Controls/Native/Progress/ArcProgress/ArcProgressFillAnimationState.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/ArcProgress/ArcProgressFillAnimationState.cs rename to dev/DevWinUI/Controls/Native/Progress/ArcProgress/ArcProgressFillAnimationState.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/ArcProgress/ArcProgressInitialPosition.cs b/dev/DevWinUI/Controls/Native/Progress/ArcProgress/ArcProgressInitialPosition.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/ArcProgress/ArcProgressInitialPosition.cs rename to dev/DevWinUI/Controls/Native/Progress/ArcProgress/ArcProgressInitialPosition.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/IndeterminateProgressBar/IndeterminateProgressBar.Properties.cs b/dev/DevWinUI/Controls/Native/Progress/IndeterminateProgressBar/IndeterminateProgressBar.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/IndeterminateProgressBar/IndeterminateProgressBar.Properties.cs rename to dev/DevWinUI/Controls/Native/Progress/IndeterminateProgressBar/IndeterminateProgressBar.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/IndeterminateProgressBar/IndeterminateProgressBar.cs b/dev/DevWinUI/Controls/Native/Progress/IndeterminateProgressBar/IndeterminateProgressBar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/IndeterminateProgressBar/IndeterminateProgressBar.cs rename to dev/DevWinUI/Controls/Native/Progress/IndeterminateProgressBar/IndeterminateProgressBar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/IndeterminateProgressBar/KeyFrameDetails.cs b/dev/DevWinUI/Controls/Native/Progress/IndeterminateProgressBar/KeyFrameDetails.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/IndeterminateProgressBar/KeyFrameDetails.cs rename to dev/DevWinUI/Controls/Native/Progress/IndeterminateProgressBar/KeyFrameDetails.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/ProgressButton.cs b/dev/DevWinUI/Controls/Native/Progress/ProgressButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/ProgressButton.cs rename to dev/DevWinUI/Controls/Native/Progress/ProgressButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/ProgressRing/ProgressRing.cs b/dev/DevWinUI/Controls/Native/Progress/ProgressRing/ProgressRing.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/ProgressRing/ProgressRing.cs rename to dev/DevWinUI/Controls/Native/Progress/ProgressRing/ProgressRing.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/ProgressRing/TemplateSettingValues.cs b/dev/DevWinUI/Controls/Native/Progress/ProgressRing/TemplateSettingValues.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/ProgressRing/TemplateSettingValues.cs rename to dev/DevWinUI/Controls/Native/Progress/ProgressRing/TemplateSettingValues.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/Storage/Data/BarShapes.cs b/dev/DevWinUI/Controls/Native/Progress/Storage/Data/BarShapes.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/Storage/Data/BarShapes.cs rename to dev/DevWinUI/Controls/Native/Progress/Storage/Data/BarShapes.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/Storage/Data/ThicknessCheck.cs b/dev/DevWinUI/Controls/Native/Progress/Storage/Data/ThicknessCheck.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/Storage/Data/ThicknessCheck.cs rename to dev/DevWinUI/Controls/Native/Progress/Storage/Data/ThicknessCheck.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/Storage/RingShape/RingShape.Properties.cs b/dev/DevWinUI/Controls/Native/Progress/Storage/RingShape/RingShape.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/Storage/RingShape/RingShape.Properties.cs rename to dev/DevWinUI/Controls/Native/Progress/Storage/RingShape/RingShape.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/Storage/RingShape/RingShape.cs b/dev/DevWinUI/Controls/Native/Progress/Storage/RingShape/RingShape.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/Storage/RingShape/RingShape.cs rename to dev/DevWinUI/Controls/Native/Progress/Storage/RingShape/RingShape.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/Storage/StorageBar/StorageBar.Properties.cs b/dev/DevWinUI/Controls/Native/Progress/Storage/StorageBar/StorageBar.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/Storage/StorageBar/StorageBar.Properties.cs rename to dev/DevWinUI/Controls/Native/Progress/Storage/StorageBar/StorageBar.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/Storage/StorageBar/StorageBar.cs b/dev/DevWinUI/Controls/Native/Progress/Storage/StorageBar/StorageBar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/Storage/StorageBar/StorageBar.cs rename to dev/DevWinUI/Controls/Native/Progress/Storage/StorageBar/StorageBar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/Storage/StorageControlsHelpers.cs b/dev/DevWinUI/Controls/Native/Progress/Storage/StorageControlsHelpers.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/Storage/StorageControlsHelpers.cs rename to dev/DevWinUI/Controls/Native/Progress/Storage/StorageControlsHelpers.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/Storage/StorageRing/StorageRing.Properties.cs b/dev/DevWinUI/Controls/Native/Progress/Storage/StorageRing/StorageRing.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/Storage/StorageRing/StorageRing.Properties.cs rename to dev/DevWinUI/Controls/Native/Progress/Storage/StorageRing/StorageRing.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/Storage/StorageRing/StorageRing.cs b/dev/DevWinUI/Controls/Native/Progress/Storage/StorageRing/StorageRing.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/Storage/StorageRing/StorageRing.cs rename to dev/DevWinUI/Controls/Native/Progress/Storage/StorageRing/StorageRing.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/WaveProgressBar/WaveProgressBar.cs b/dev/DevWinUI/Controls/Native/Progress/WaveProgressBar/WaveProgressBar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/WaveProgressBar/WaveProgressBar.cs rename to dev/DevWinUI/Controls/Native/Progress/WaveProgressBar/WaveProgressBar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Progress/WaveProgressBar/WaveProgressBarValueToPercentConverter.cs b/dev/DevWinUI/Controls/Native/Progress/WaveProgressBar/WaveProgressBarValueToPercentConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Progress/WaveProgressBar/WaveProgressBarValueToPercentConverter.cs rename to dev/DevWinUI/Controls/Native/Progress/WaveProgressBar/WaveProgressBarValueToPercentConverter.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/RichButton/RichButton.cs b/dev/DevWinUI/Controls/Native/RichButton/RichButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/RichButton/RichButton.cs rename to dev/DevWinUI/Controls/Native/RichButton/RichButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/RichButton/RichButtonDisplayMode.cs b/dev/DevWinUI/Controls/Native/RichButton/RichButtonDisplayMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/RichButton/RichButtonDisplayMode.cs rename to dev/DevWinUI/Controls/Native/RichButton/RichButtonDisplayMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentChangedEventArgs.cs b/dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentChangedEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentChangedEventArgs.cs rename to dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentChangedEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentedSlider.Properties.cs b/dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentedSlider.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentedSlider.Properties.cs rename to dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentedSlider.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentedSlider.cs b/dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentedSlider.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentedSlider.cs rename to dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentedSlider.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentedSliderSegment.cs b/dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentedSliderSegment.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentedSliderSegment.cs rename to dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentedSliderSegment.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentedSliderTimeInfo.cs b/dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentedSliderTimeInfo.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentedSliderTimeInfo.cs rename to dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentedSliderTimeInfo.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentedSliderTitleVisibility.cs b/dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentedSliderTitleVisibility.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SegmentedSlider/SegmentedSliderTitleVisibility.cs rename to dev/DevWinUI/Controls/Native/SegmentedSlider/SegmentedSliderTitleVisibility.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SettingsGroup/Bool2CornerRadiusConverter.cs b/dev/DevWinUI/Controls/Native/SettingsGroup/SettingsGroup/Bool2CornerRadiusConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SettingsGroup/Bool2CornerRadiusConverter.cs rename to dev/DevWinUI/Controls/Native/SettingsGroup/SettingsGroup/Bool2CornerRadiusConverter.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SettingsGroup/SettingGroup.Property.cs b/dev/DevWinUI/Controls/Native/SettingsGroup/SettingsGroup/SettingGroup.Property.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SettingsGroup/SettingGroup.Property.cs rename to dev/DevWinUI/Controls/Native/SettingsGroup/SettingsGroup/SettingGroup.Property.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SettingsGroup/SettingsGroup.cs b/dev/DevWinUI/Controls/Native/SettingsGroup/SettingsGroup/SettingsGroup.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SettingsGroup/SettingsGroup.cs rename to dev/DevWinUI/Controls/Native/SettingsGroup/SettingsGroup/SettingsGroup.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SettingsGroup/TextBlockTemplateSelector.cs b/dev/DevWinUI/Controls/Native/SettingsGroup/SettingsGroup/TextBlockTemplateSelector.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SettingsGroup/TextBlockTemplateSelector.cs rename to dev/DevWinUI/Controls/Native/SettingsGroup/SettingsGroup/TextBlockTemplateSelector.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SimpleSettingsGroup/SettingsGroupAutomationPeer.cs b/dev/DevWinUI/Controls/Native/SettingsGroup/SimpleSettingsGroup/SettingsGroupAutomationPeer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SimpleSettingsGroup/SettingsGroupAutomationPeer.cs rename to dev/DevWinUI/Controls/Native/SettingsGroup/SimpleSettingsGroup/SettingsGroupAutomationPeer.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SimpleSettingsGroup/SimpleSettingsGroup.cs b/dev/DevWinUI/Controls/Native/SettingsGroup/SimpleSettingsGroup/SimpleSettingsGroup.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SettingsGroup/SimpleSettingsGroup/SimpleSettingsGroup.cs rename to dev/DevWinUI/Controls/Native/SettingsGroup/SimpleSettingsGroup/SimpleSettingsGroup.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Shortcut/BaseShortcut.cs b/dev/DevWinUI/Controls/Native/Shortcut/BaseShortcut.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Shortcut/BaseShortcut.cs rename to dev/DevWinUI/Controls/Native/Shortcut/BaseShortcut.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Shortcut/Shortcut.cs b/dev/DevWinUI/Controls/Native/Shortcut/Shortcut.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Shortcut/Shortcut.cs rename to dev/DevWinUI/Controls/Native/Shortcut/Shortcut.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Shortcut/ShortcutPreview.cs b/dev/DevWinUI/Controls/Native/Shortcut/ShortcutPreview.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Shortcut/ShortcutPreview.cs rename to dev/DevWinUI/Controls/Native/Shortcut/ShortcutPreview.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Shortcut/ShortcutValidationEventArgs.cs b/dev/DevWinUI/Controls/Native/Shortcut/ShortcutValidationEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Shortcut/ShortcutValidationEventArgs.cs rename to dev/DevWinUI/Controls/Native/Shortcut/ShortcutValidationEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Shortcut/ShortcutWithTextLabelControl.cs b/dev/DevWinUI/Controls/Native/Shortcut/ShortcutWithTextLabelControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Shortcut/ShortcutWithTextLabelControl.cs rename to dev/DevWinUI/Controls/Native/Shortcut/ShortcutWithTextLabelControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SnowFlakeEffect/SnowFlake.cs b/dev/DevWinUI/Controls/Native/SnowFlakeEffect/SnowFlake.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SnowFlakeEffect/SnowFlake.cs rename to dev/DevWinUI/Controls/Native/SnowFlakeEffect/SnowFlake.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SnowFlakeEffect/SnowFlakeEffect.cs b/dev/DevWinUI/Controls/Native/SnowFlakeEffect/SnowFlakeEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SnowFlakeEffect/SnowFlakeEffect.cs rename to dev/DevWinUI/Controls/Native/SnowFlakeEffect/SnowFlakeEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SpectrumAnalyzer/BarHeightScalingStyles.cs b/dev/DevWinUI/Controls/Native/SpectrumAnalyzer/BarHeightScalingStyles.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SpectrumAnalyzer/BarHeightScalingStyles.cs rename to dev/DevWinUI/Controls/Native/SpectrumAnalyzer/BarHeightScalingStyles.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SpectrumAnalyzer/FFTDataSize.cs b/dev/DevWinUI/Controls/Native/SpectrumAnalyzer/FFTDataSize.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SpectrumAnalyzer/FFTDataSize.cs rename to dev/DevWinUI/Controls/Native/SpectrumAnalyzer/FFTDataSize.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SpectrumAnalyzer/ISpectrumPlayer.cs b/dev/DevWinUI/Controls/Native/SpectrumAnalyzer/ISpectrumPlayer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SpectrumAnalyzer/ISpectrumPlayer.cs rename to dev/DevWinUI/Controls/Native/SpectrumAnalyzer/ISpectrumPlayer.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SpectrumAnalyzer/SpectrumAnalyzer.Properties.cs b/dev/DevWinUI/Controls/Native/SpectrumAnalyzer/SpectrumAnalyzer.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SpectrumAnalyzer/SpectrumAnalyzer.Properties.cs rename to dev/DevWinUI/Controls/Native/SpectrumAnalyzer/SpectrumAnalyzer.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/SpectrumAnalyzer/SpectrumAnalyzer.cs b/dev/DevWinUI/Controls/Native/SpectrumAnalyzer/SpectrumAnalyzer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/SpectrumAnalyzer/SpectrumAnalyzer.cs rename to dev/DevWinUI/Controls/Native/SpectrumAnalyzer/SpectrumAnalyzer.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Spoiler/Spoiler.cs b/dev/DevWinUI/Controls/Native/Spoiler/Spoiler.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Spoiler/Spoiler.cs rename to dev/DevWinUI/Controls/Native/Spoiler/Spoiler.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Spoiler/SpoilerRevealChangedEventArgs.cs b/dev/DevWinUI/Controls/Native/Spoiler/SpoilerRevealChangedEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Spoiler/SpoilerRevealChangedEventArgs.cs rename to dev/DevWinUI/Controls/Native/Spoiler/SpoilerRevealChangedEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Spoiler/SpoilerRevealMode.cs b/dev/DevWinUI/Controls/Native/Spoiler/SpoilerRevealMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Spoiler/SpoilerRevealMode.cs rename to dev/DevWinUI/Controls/Native/Spoiler/SpoilerRevealMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/StepBar/StepBar.Property.cs b/dev/DevWinUI/Controls/Native/StepBar/StepBar.Property.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/StepBar/StepBar.Property.cs rename to dev/DevWinUI/Controls/Native/StepBar/StepBar.Property.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/StepBar/StepBar.cs b/dev/DevWinUI/Controls/Native/StepBar/StepBar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/StepBar/StepBar.cs rename to dev/DevWinUI/Controls/Native/StepBar/StepBar.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/StepBar/StepBarDisplayMode.cs b/dev/DevWinUI/Controls/Native/StepBar/StepBarDisplayMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/StepBar/StepBarDisplayMode.cs rename to dev/DevWinUI/Controls/Native/StepBar/StepBarDisplayMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/StepBar/StepBarHeaderDisplayMode.cs b/dev/DevWinUI/Controls/Native/StepBar/StepBarHeaderDisplayMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/StepBar/StepBarHeaderDisplayMode.cs rename to dev/DevWinUI/Controls/Native/StepBar/StepBarHeaderDisplayMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/StepBar/StepBarItem.cs b/dev/DevWinUI/Controls/Native/StepBar/StepBarItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/StepBar/StepBarItem.cs rename to dev/DevWinUI/Controls/Native/StepBar/StepBarItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/StepBar/StepBarItemClickEventArgs.cs b/dev/DevWinUI/Controls/Native/StepBar/StepBarItemClickEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/StepBar/StepBarItemClickEventArgs.cs rename to dev/DevWinUI/Controls/Native/StepBar/StepBarItemClickEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/StepBar/StepProgressState.cs b/dev/DevWinUI/Controls/Native/StepBar/StepProgressState.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/StepBar/StepProgressState.cs rename to dev/DevWinUI/Controls/Native/StepBar/StepProgressState.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/StepBar/StepStatus.cs b/dev/DevWinUI/Controls/Native/StepBar/StepStatus.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/StepBar/StepStatus.cs rename to dev/DevWinUI/Controls/Native/StepBar/StepStatus.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/TransitioningContentControl/TransitionMode.cs b/dev/DevWinUI/Controls/Native/TransitioningContentControl/TransitionMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/TransitioningContentControl/TransitionMode.cs rename to dev/DevWinUI/Controls/Native/TransitioningContentControl/TransitionMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/TransitioningContentControl/TransitioningContentControl.cs b/dev/DevWinUI/Controls/Native/TransitioningContentControl/TransitioningContentControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/TransitioningContentControl/TransitioningContentControl.cs rename to dev/DevWinUI/Controls/Native/TransitioningContentControl/TransitioningContentControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Validation/Validation.cs b/dev/DevWinUI/Controls/Native/Validation/Validation.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Validation/Validation.cs rename to dev/DevWinUI/Controls/Native/Validation/Validation.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/Validation/ValidationEnabledConverter.cs b/dev/DevWinUI/Controls/Native/Validation/ValidationEnabledConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/Validation/ValidationEnabledConverter.cs rename to dev/DevWinUI/Controls/Native/Validation/ValidationEnabledConverter.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/WaveformTimeline/ISoundPlayer.cs b/dev/DevWinUI/Controls/Native/WaveformTimeline/ISoundPlayer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/WaveformTimeline/ISoundPlayer.cs rename to dev/DevWinUI/Controls/Native/WaveformTimeline/ISoundPlayer.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/WaveformTimeline/IWaveformPlayer.cs b/dev/DevWinUI/Controls/Native/WaveformTimeline/IWaveformPlayer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/WaveformTimeline/IWaveformPlayer.cs rename to dev/DevWinUI/Controls/Native/WaveformTimeline/IWaveformPlayer.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/WaveformTimeline/WaveformTimeline.Properties.cs b/dev/DevWinUI/Controls/Native/WaveformTimeline/WaveformTimeline.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/WaveformTimeline/WaveformTimeline.Properties.cs rename to dev/DevWinUI/Controls/Native/WaveformTimeline/WaveformTimeline.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/WaveformTimeline/WaveformTimeline.cs b/dev/DevWinUI/Controls/Native/WaveformTimeline/WaveformTimeline.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/WaveformTimeline/WaveformTimeline.cs rename to dev/DevWinUI/Controls/Native/WaveformTimeline/WaveformTimeline.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/ContentDialogContent.cs b/dev/DevWinUI/Controls/Native/WindowedContentDialog/ContentDialogContent.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/ContentDialogContent.cs rename to dev/DevWinUI/Controls/Native/WindowedContentDialog/ContentDialogContent.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/ContentDialogWindow.cs b/dev/DevWinUI/Controls/Native/WindowedContentDialog/ContentDialogWindow.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/ContentDialogWindow.cs rename to dev/DevWinUI/Controls/Native/WindowedContentDialog/ContentDialogWindow.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/IStandaloneContentDialog.cs b/dev/DevWinUI/Controls/Native/WindowedContentDialog/IStandaloneContentDialog.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/IStandaloneContentDialog.cs rename to dev/DevWinUI/Controls/Native/WindowedContentDialog/IStandaloneContentDialog.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/Underlay/UnderlayCoverMode.cs b/dev/DevWinUI/Controls/Native/WindowedContentDialog/Underlay/UnderlayCoverMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/Underlay/UnderlayCoverMode.cs rename to dev/DevWinUI/Controls/Native/WindowedContentDialog/Underlay/UnderlayCoverMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/Underlay/UnderlayMode.cs b/dev/DevWinUI/Controls/Native/WindowedContentDialog/Underlay/UnderlayMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/Underlay/UnderlayMode.cs rename to dev/DevWinUI/Controls/Native/WindowedContentDialog/Underlay/UnderlayMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/Underlay/UnderlaySystemBackdropOptions.cs b/dev/DevWinUI/Controls/Native/WindowedContentDialog/Underlay/UnderlaySystemBackdropOptions.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/Underlay/UnderlaySystemBackdropOptions.cs rename to dev/DevWinUI/Controls/Native/WindowedContentDialog/Underlay/UnderlaySystemBackdropOptions.cs diff --git a/dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/WindowedContentDialog.cs b/dev/DevWinUI/Controls/Native/WindowedContentDialog/WindowedContentDialog.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Native/WindowedContentDialog/WindowedContentDialog.cs rename to dev/DevWinUI/Controls/Native/WindowedContentDialog/WindowedContentDialog.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBar.Properties.cs b/dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBar.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBar.Properties.cs rename to dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBar.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBar.cs b/dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBar.cs rename to dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBar.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBar.xaml b/dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBar.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBar.xaml rename to dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBar.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.Events.cs b/dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.Events.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.Events.cs rename to dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.Events.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.Properties.cs b/dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.Properties.cs rename to dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.cs b/dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.cs rename to dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBarItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBarItemAutomationPeer.cs b/dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBarItemAutomationPeer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBarItemAutomationPeer.cs rename to dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBarItemAutomationPeer.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBarLayout.cs b/dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBarLayout.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/BreadcrumbBarLayout.cs rename to dev/DevWinUI/Controls/Ported/BreadcrumbBar/BreadcrumbBarLayout.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/EventArgs.cs b/dev/DevWinUI/Controls/Ported/BreadcrumbBar/EventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/BreadcrumbBar/EventArgs.cs rename to dev/DevWinUI/Controls/Ported/BreadcrumbBar/EventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/CopyButton/CopyButton.cs b/dev/DevWinUI/Controls/Ported/CopyButton/CopyButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/CopyButton/CopyButton.cs rename to dev/DevWinUI/Controls/Ported/CopyButton/CopyButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/AutomationHelper.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/AutomationHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/AutomationHelper.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/AutomationHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorAutomationPeer_Partial.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorAutomationPeer_Partial.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorAutomationPeer_Partial.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorAutomationPeer_Partial.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorAutomationPeer_Partial.h.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorAutomationPeer_Partial.h.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorAutomationPeer_Partial.h.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorAutomationPeer_Partial.h.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemAutomationPeer_Partial.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemAutomationPeer_Partial.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemAutomationPeer_Partial.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemAutomationPeer_Partial.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemAutomationPeer_Partial.h.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemAutomationPeer_Partial.h.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemAutomationPeer_Partial.h.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemAutomationPeer_Partial.h.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemDataAutomationPeer_Partial.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemDataAutomationPeer_Partial.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemDataAutomationPeer_Partial.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemDataAutomationPeer_Partial.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemDataAutomationPeer_Partial.h.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemDataAutomationPeer_Partial.h.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemDataAutomationPeer_Partial.h.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/Automation/LoopingSelectorItemDataAutomationPeer_Partial.h.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/IPropertyValue.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/IPropertyValue.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/IPropertyValue.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/IPropertyValue.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/InternalDoubleExtensions.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/InternalDoubleExtensions.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/InternalDoubleExtensions.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/InternalDoubleExtensions.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/PlatformHelpers.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/PlatformHelpers.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/Internal/PlatformHelpers.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/Internal/PlatformHelpers.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingListSelectorInfo.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingListSelectorInfo.cs similarity index 99% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingListSelectorInfo.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingListSelectorInfo.cs index 57eb211e..5f28f0ed 100644 --- a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingListSelectorInfo.cs +++ b/dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingListSelectorInfo.cs @@ -107,7 +107,6 @@ protected override void OnPointerEntered(PointerRoutedEventArgs pEventArgs) { var pointerDeviceType = PointerDeviceType.Touch; PointerPoint spPointerPoint; - global::Windows.Devices.Input.PointerDevice spPointerDevice; spPointerPoint = pEventArgs.GetCurrentPoint(null); if (spPointerPoint == null) { return; } diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelector.Properties.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelector.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelector.Properties.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelector.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelector.xaml b/dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelector.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelector.xaml rename to dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelector.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelectorItem.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelectorItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelectorItem.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelectorItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelectorItem_Partial.h.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelectorItem_Partial.h.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelectorItem_Partial.h.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelectorItem_Partial.h.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelectorPanel_Partial.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelectorPanel_Partial.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelectorPanel_Partial.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelectorPanel_Partial.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelectorPanel_Partial.h.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelectorPanel_Partial.h.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelectorPanel_Partial.h.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelectorPanel_Partial.h.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelector_Partial.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelector_Partial.cs similarity index 99% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelector_Partial.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelector_Partial.cs index 0f978b18..2b135039 100644 --- a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelector_Partial.cs +++ b/dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelector_Partial.cs @@ -469,7 +469,6 @@ void OnPointerEntered( //UNREFERENCED_PARAMETER(pEventArgs); var nPointerDeviceType = PointerDeviceType.Touch; PointerPoint spPointerPoint; - global::Windows.Devices.Input.PointerDevice spPointerDevice; spPointerPoint = pEventArgs.GetCurrentPoint(null); if (spPointerPoint == null) diff --git a/dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelector_Partial.h.cs b/dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelector_Partial.h.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/LoopingSelector/LoopingSelector_Partial.h.cs rename to dev/DevWinUI/Controls/Ported/LoopingSelector/LoopingSelector_Partial.h.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControl.Constants.cs b/dev/DevWinUI/Controls/Ported/PagerControl/PagerControl.Constants.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControl.Constants.cs rename to dev/DevWinUI/Controls/Ported/PagerControl/PagerControl.Constants.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControl.Properties.cs b/dev/DevWinUI/Controls/Ported/PagerControl/PagerControl.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControl.Properties.cs rename to dev/DevWinUI/Controls/Ported/PagerControl/PagerControl.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControl.cs b/dev/DevWinUI/Controls/Ported/PagerControl/PagerControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControl.cs rename to dev/DevWinUI/Controls/Ported/PagerControl/PagerControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControl.xaml b/dev/DevWinUI/Controls/Ported/PagerControl/PagerControl.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControl.xaml rename to dev/DevWinUI/Controls/Ported/PagerControl/PagerControl.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControlAutomationPeer.cs b/dev/DevWinUI/Controls/Ported/PagerControl/PagerControlAutomationPeer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControlAutomationPeer.cs rename to dev/DevWinUI/Controls/Ported/PagerControl/PagerControlAutomationPeer.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControlButtonVisibility.cs b/dev/DevWinUI/Controls/Ported/PagerControl/PagerControlButtonVisibility.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControlButtonVisibility.cs rename to dev/DevWinUI/Controls/Ported/PagerControl/PagerControlButtonVisibility.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControlDisplayMode.cs b/dev/DevWinUI/Controls/Ported/PagerControl/PagerControlDisplayMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControlDisplayMode.cs rename to dev/DevWinUI/Controls/Ported/PagerControl/PagerControlDisplayMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControlSelectedIndexChangedEventArgs.cs b/dev/DevWinUI/Controls/Ported/PagerControl/PagerControlSelectedIndexChangedEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControlSelectedIndexChangedEventArgs.cs rename to dev/DevWinUI/Controls/Ported/PagerControl/PagerControlSelectedIndexChangedEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControlTemplateSettings.cs b/dev/DevWinUI/Controls/Ported/PagerControl/PagerControlTemplateSettings.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/PagerControl/PagerControlTemplateSettings.cs rename to dev/DevWinUI/Controls/Ported/PagerControl/PagerControlTemplateSettings.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SamplePanel/SamplePanel.Properties.cs b/dev/DevWinUI/Controls/Ported/SamplePanel/SamplePanel.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SamplePanel/SamplePanel.Properties.cs rename to dev/DevWinUI/Controls/Ported/SamplePanel/SamplePanel.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SamplePanel/SamplePanel.cs b/dev/DevWinUI/Controls/Ported/SamplePanel/SamplePanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SamplePanel/SamplePanel.cs rename to dev/DevWinUI/Controls/Ported/SamplePanel/SamplePanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SamplePanel/SamplePanel.xaml b/dev/DevWinUI/Controls/Ported/SamplePanel/SamplePanel.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SamplePanel/SamplePanel.xaml rename to dev/DevWinUI/Controls/Ported/SamplePanel/SamplePanel.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/SettingsCard/SettingsCard.Properties.cs b/dev/DevWinUI/Controls/Ported/SettingsCard/SettingsCard.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SettingsCard/SettingsCard.Properties.cs rename to dev/DevWinUI/Controls/Ported/SettingsCard/SettingsCard.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SettingsCard/SettingsCard.cs b/dev/DevWinUI/Controls/Ported/SettingsCard/SettingsCard.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SettingsCard/SettingsCard.cs rename to dev/DevWinUI/Controls/Ported/SettingsCard/SettingsCard.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SettingsCard/SettingsCard.xaml b/dev/DevWinUI/Controls/Ported/SettingsCard/SettingsCard.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SettingsCard/SettingsCard.xaml rename to dev/DevWinUI/Controls/Ported/SettingsCard/SettingsCard.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/SettingsCard/SettingsCardAutomationPeer.cs b/dev/DevWinUI/Controls/Ported/SettingsCard/SettingsCardAutomationPeer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SettingsCard/SettingsCardAutomationPeer.cs rename to dev/DevWinUI/Controls/Ported/SettingsCard/SettingsCardAutomationPeer.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpander.Events.cs b/dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpander.Events.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpander.Events.cs rename to dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpander.Events.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpander.ItemsControl.cs b/dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpander.ItemsControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpander.ItemsControl.cs rename to dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpander.ItemsControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpander.Properties.cs b/dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpander.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpander.Properties.cs rename to dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpander.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpander.cs b/dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpander.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpander.cs rename to dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpander.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpander.xaml b/dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpander.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpander.xaml rename to dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpander.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpanderAutomationPeer.cs b/dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpanderAutomationPeer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpanderAutomationPeer.cs rename to dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpanderAutomationPeer.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpanderItemStyleSelector.cs b/dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpanderItemStyleSelector.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SettingsExpander/SettingsExpanderItemStyleSelector.cs rename to dev/DevWinUI/Controls/Ported/SettingsExpander/SettingsExpanderItemStyleSelector.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/ISidebarItemModel.cs b/dev/DevWinUI/Controls/Ported/Sidebar/ISidebarItemModel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/ISidebarItemModel.cs rename to dev/DevWinUI/Controls/Ported/Sidebar/ISidebarItemModel.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/ISidebarViewModel.cs b/dev/DevWinUI/Controls/Ported/Sidebar/ISidebarViewModel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/ISidebarViewModel.cs rename to dev/DevWinUI/Controls/Ported/Sidebar/ISidebarViewModel.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarDisplayMode.cs b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarDisplayMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarDisplayMode.cs rename to dev/DevWinUI/Controls/Ported/Sidebar/SidebarDisplayMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarItem.Properties.cs b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarItem.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarItem.Properties.cs rename to dev/DevWinUI/Controls/Ported/Sidebar/SidebarItem.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarItem.cs b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarItem.cs rename to dev/DevWinUI/Controls/Ported/Sidebar/SidebarItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarItemAutomationPeer.cs b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarItemAutomationPeer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarItemAutomationPeer.cs rename to dev/DevWinUI/Controls/Ported/Sidebar/SidebarItemAutomationPeer.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarItemDropPosition.cs b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarItemDropPosition.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarItemDropPosition.cs rename to dev/DevWinUI/Controls/Ported/Sidebar/SidebarItemDropPosition.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarStyles.xaml b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarStyles.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarStyles.xaml rename to dev/DevWinUI/Controls/Ported/Sidebar/SidebarStyles.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarView.Properties.cs b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarView.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarView.Properties.cs rename to dev/DevWinUI/Controls/Ported/Sidebar/SidebarView.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarView.ThemeResources.xaml b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarView.ThemeResources.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarView.ThemeResources.xaml rename to dev/DevWinUI/Controls/Ported/Sidebar/SidebarView.ThemeResources.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarView.xaml b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarView.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarView.xaml rename to dev/DevWinUI/Controls/Ported/Sidebar/SidebarView.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarView.xaml.cs b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarView.xaml.cs similarity index 92% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarView.xaml.cs rename to dev/DevWinUI/Controls/Ported/Sidebar/SidebarView.xaml.cs index bb0685cb..dcfb83cf 100644 --- a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarView.xaml.cs +++ b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarView.xaml.cs @@ -19,9 +19,13 @@ public sealed partial class SidebarView : UserControl, INotifyPropertyChanged public event EventHandler? ItemContextInvoked; public event EventHandler? ItemDragOver; public event EventHandler? ItemDropped; - public event PropertyChangedEventHandler? PropertyChanged; +#pragma warning disable IDE0079 // Remove unnecessary suppression +#pragma warning disable CS8632, CS0067 + public event PropertyChangedEventHandler? PropertyChanged; +#pragma warning restore IDE0079 // Remove unnecessary suppression +#pragma warning restore CS8632, CS0067 - internal SidebarItem? SelectedItemContainer = null; + internal SidebarItem? SelectedItemContainer = null; private bool draggingSidebarResizer; private double preManipulationSidebarWidth = 0; @@ -235,8 +239,10 @@ private void MenuItemHostScrollViewer_ContextRequested(UIElement sender, Context e.Handled = true; } - private void MenuItemsHost_ElementPrepared(ItemsRepeater sender, ItemsRepeaterElementPreparedEventArgs args) - { +#pragma warning disable CA1822 // Mark members as static + private void MenuItemsHost_ElementPrepared(ItemsRepeater sender, ItemsRepeaterElementPreparedEventArgs args) +#pragma warning restore CA1822 // Mark members as static + { if (args.Element is SidebarItem sidebarItem) { sidebarItem.HandleItemChange(); diff --git a/dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarViewAutomationPeer.cs b/dev/DevWinUI/Controls/Ported/Sidebar/SidebarViewAutomationPeer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Sidebar/SidebarViewAutomationPeer.cs rename to dev/DevWinUI/Controls/Ported/Sidebar/SidebarViewAutomationPeer.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SwitchPresenter/Case.cs b/dev/DevWinUI/Controls/Ported/SwitchPresenter/Case.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SwitchPresenter/Case.cs rename to dev/DevWinUI/Controls/Ported/SwitchPresenter/Case.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SwitchPresenter/CaseCollection.cs b/dev/DevWinUI/Controls/Ported/SwitchPresenter/CaseCollection.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SwitchPresenter/CaseCollection.cs rename to dev/DevWinUI/Controls/Ported/SwitchPresenter/CaseCollection.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SwitchPresenter/SwitchConverter.cs b/dev/DevWinUI/Controls/Ported/SwitchPresenter/SwitchConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SwitchPresenter/SwitchConverter.cs rename to dev/DevWinUI/Controls/Ported/SwitchPresenter/SwitchConverter.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SwitchPresenter/SwitchHelpers.cs b/dev/DevWinUI/Controls/Ported/SwitchPresenter/SwitchHelpers.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SwitchPresenter/SwitchHelpers.cs rename to dev/DevWinUI/Controls/Ported/SwitchPresenter/SwitchHelpers.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/SwitchPresenter/SwitchPresenter.cs b/dev/DevWinUI/Controls/Ported/SwitchPresenter/SwitchPresenter.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/SwitchPresenter/SwitchPresenter.cs rename to dev/DevWinUI/Controls/Ported/SwitchPresenter/SwitchPresenter.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Data/ThemedIconColorType.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/Data/ThemedIconColorType.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Data/ThemedIconColorType.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Data/ThemedIconColorType.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Data/ThemedIconLayerType.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/Data/ThemedIconLayerType.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Data/ThemedIconLayerType.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Data/ThemedIconLayerType.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Data/ThemedIconLayers.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/Data/ThemedIconLayers.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Data/ThemedIconLayers.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Data/ThemedIconLayers.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Data/ThemedIconToggleBehaviors.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/Data/ThemedIconToggleBehaviors.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Data/ThemedIconToggleBehaviors.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Data/ThemedIconToggleBehaviors.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Data/ThemedIconTypes.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/Data/ThemedIconTypes.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Data/ThemedIconTypes.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Data/ThemedIconTypes.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Action.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Action.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Action.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Action.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Common.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Common.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Common.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Common.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Favorite.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Favorite.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Favorite.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Favorite.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Git.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Git.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Git.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Git.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Misc16.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Misc16.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Misc16.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Misc16.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.New.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.New.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.New.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.New.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Open.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Open.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Open.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Open.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Panel.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Panel.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Panel.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Panel.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Properties.Dialog.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Properties.Dialog.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Properties.Dialog.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Properties.Dialog.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Settings.Sidebar.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Settings.Sidebar.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Settings.Sidebar.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Settings.Sidebar.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Settings.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Settings.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Settings.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Settings.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.SizeLayout.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.SizeLayout.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.SizeLayout.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.SizeLayout.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.SizeLayout28.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.SizeLayout28.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.SizeLayout28.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.SizeLayout28.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Status.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Status.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.Status.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.Status.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.TabPane.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.TabPane.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/Styles/Icons.TabPane.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/Styles/Icons.TabPane.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.Consts.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.Consts.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.Consts.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.Consts.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.Owner.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.Owner.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.Owner.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.Owner.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.Properties.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.Properties.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.ThemeResources.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.ThemeResources.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.ThemeResources.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.ThemeResources.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIcon.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIcon.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIconExtension.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIconExtension.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIconExtension.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIconExtension.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.Consts.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.Consts.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.Consts.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.Consts.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.Properties.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.Properties.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.cs b/dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.cs rename to dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.xaml b/dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.xaml rename to dev/DevWinUI/Controls/Ported/ThemedIcon/ThemedIconLayer/ThemedIconLayer.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/TileControl/ImageAlignment.cs b/dev/DevWinUI/Controls/Ported/TileControl/ImageAlignment.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/TileControl/ImageAlignment.cs rename to dev/DevWinUI/Controls/Ported/TileControl/ImageAlignment.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/TileControl/ScrollOrientation.cs b/dev/DevWinUI/Controls/Ported/TileControl/ScrollOrientation.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/TileControl/ScrollOrientation.cs rename to dev/DevWinUI/Controls/Ported/TileControl/ScrollOrientation.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/TileControl/TileControl.Properties.cs b/dev/DevWinUI/Controls/Ported/TileControl/TileControl.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/TileControl/TileControl.Properties.cs rename to dev/DevWinUI/Controls/Ported/TileControl/TileControl.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/TileControl/TileControl.cs b/dev/DevWinUI/Controls/Ported/TileControl/TileControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/TileControl/TileControl.cs rename to dev/DevWinUI/Controls/Ported/TileControl/TileControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/TileControl/TileControl.xaml b/dev/DevWinUI/Controls/Ported/TileControl/TileControl.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/TileControl/TileControl.xaml rename to dev/DevWinUI/Controls/Ported/TileControl/TileControl.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Timeline/TimeSpanHelper.cs b/dev/DevWinUI/Controls/Ported/Timeline/TimeSpanHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Timeline/TimeSpanHelper.cs rename to dev/DevWinUI/Controls/Ported/Timeline/TimeSpanHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Timeline/Timeline.cs b/dev/DevWinUI/Controls/Ported/Timeline/Timeline.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Timeline/Timeline.cs rename to dev/DevWinUI/Controls/Ported/Timeline/Timeline.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Timeline/TimelineAutomationPeer.cs b/dev/DevWinUI/Controls/Ported/Timeline/TimelineAutomationPeer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Timeline/TimelineAutomationPeer.cs rename to dev/DevWinUI/Controls/Ported/Timeline/TimelineAutomationPeer.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/Primitives/IToolbarItemSet.cs b/dev/DevWinUI/Controls/Ported/Toolbar/Primitives/IToolbarItemSet.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/Primitives/IToolbarItemSet.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/Primitives/IToolbarItemSet.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/Primitives/IToolbarOverflowItemSet.cs b/dev/DevWinUI/Controls/Ported/Toolbar/Primitives/IToolbarOverflowItemSet.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/Primitives/IToolbarOverflowItemSet.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/Primitives/IToolbarOverflowItemSet.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/Primitives/OverflowBehaviors.cs b/dev/DevWinUI/Controls/Ported/Toolbar/Primitives/OverflowBehaviors.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/Primitives/OverflowBehaviors.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/Primitives/OverflowBehaviors.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/Primitives/ToolbarLayout.cs b/dev/DevWinUI/Controls/Ported/Toolbar/Primitives/ToolbarLayout.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/Primitives/ToolbarLayout.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/Primitives/ToolbarLayout.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/Primitives/ToolbarSizes.cs b/dev/DevWinUI/Controls/Ported/Toolbar/Primitives/ToolbarSizes.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/Primitives/ToolbarSizes.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/Primitives/ToolbarSizes.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/Toolbar.Constants.cs b/dev/DevWinUI/Controls/Ported/Toolbar/Toolbar.Constants.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/Toolbar.Constants.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/Toolbar.Constants.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/Toolbar.Properties.cs b/dev/DevWinUI/Controls/Ported/Toolbar/Toolbar.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/Toolbar.Properties.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/Toolbar.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/Toolbar.ThemeResources.xaml b/dev/DevWinUI/Controls/Ported/Toolbar/Toolbar.ThemeResources.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/Toolbar.ThemeResources.xaml rename to dev/DevWinUI/Controls/Ported/Toolbar/Toolbar.ThemeResources.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/Toolbar.cs b/dev/DevWinUI/Controls/Ported/Toolbar/Toolbar.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/Toolbar.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/Toolbar.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/Toolbar.xaml b/dev/DevWinUI/Controls/Ported/Toolbar/Toolbar.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/Toolbar.xaml rename to dev/DevWinUI/Controls/Ported/Toolbar/Toolbar.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.Constants.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.Constants.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.Constants.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.Constants.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.Properties.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.Properties.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.ThemeResources.xaml b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.ThemeResources.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.ThemeResources.xaml rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.ThemeResources.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.xaml b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.xaml rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarButton/ToolbarButton.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.Constants.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.Constants.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.Constants.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.Constants.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.Properties.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.Properties.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.xaml b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.xaml rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarFlyoutButton/ToolbarFlyoutButton.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarItem/ToolbarItem.Properties.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarItem/ToolbarItem.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarItem/ToolbarItem.Properties.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarItem/ToolbarItem.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarItem/ToolbarItem.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarItem/ToolbarItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarItem/ToolbarItem.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarItem/ToolbarItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarItem/ToolbarItemTypes.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarItem/ToolbarItemTypes.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarItem/ToolbarItemTypes.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarItem/ToolbarItemTypes.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarItemList.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarItemList.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarItemList.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarItemList.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarItemOverflowList.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarItemOverflowList.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarItemOverflowList.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarItemOverflowList.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.Constants.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.Constants.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.Constants.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.Constants.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.Properties.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.Properties.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.xaml b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.xaml rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarRadioButton/ToolbarRadioButton.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.ThemeResources.xaml b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.ThemeResources.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.ThemeResources.xaml rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.ThemeResources.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.xaml b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.xaml rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSeparator/ToolbarSeparator.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.Constants.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.Constants.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.Constants.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.Constants.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.Properties.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.Properties.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.xaml b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.xaml rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarSplitButton/ToolbarSplitButton.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.Constants.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.Constants.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.Constants.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.Constants.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.Properties.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.Properties.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.ThemeResources.xaml b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.ThemeResources.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.ThemeResources.xaml rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.ThemeResources.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.cs b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.cs rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.xaml b/dev/DevWinUI/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.xaml similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.xaml rename to dev/DevWinUI/Controls/Ported/Toolbar/ToolbarToggleButton/ToolbarToggleButton.xaml diff --git a/dev/DevWinUI.Controls/Controls/Ported/UniformGrid/TakenSpotsReferenceHolder.cs b/dev/DevWinUI/Controls/Ported/UniformGrid/TakenSpotsReferenceHolder.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/UniformGrid/TakenSpotsReferenceHolder.cs rename to dev/DevWinUI/Controls/Ported/UniformGrid/TakenSpotsReferenceHolder.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/UniformGrid/UniformGrid.Helpers.cs b/dev/DevWinUI/Controls/Ported/UniformGrid/UniformGrid.Helpers.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/UniformGrid/UniformGrid.Helpers.cs rename to dev/DevWinUI/Controls/Ported/UniformGrid/UniformGrid.Helpers.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/UniformGrid/UniformGrid.Properties.cs b/dev/DevWinUI/Controls/Ported/UniformGrid/UniformGrid.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/UniformGrid/UniformGrid.Properties.cs rename to dev/DevWinUI/Controls/Ported/UniformGrid/UniformGrid.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Ported/UniformGrid/UniformGrid.cs b/dev/DevWinUI/Controls/Ported/UniformGrid/UniformGrid.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Ported/UniformGrid/UniformGrid.cs rename to dev/DevWinUI/Controls/Ported/UniformGrid/UniformGrid.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedGradient/AnimatedGradient.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedGradient/AnimatedGradient.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedGradient/AnimatedGradient.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedGradient/AnimatedGradient.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedGradient/AnimatedGradientColorScheme.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedGradient/AnimatedGradientColorScheme.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedGradient/AnimatedGradientColorScheme.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedGradient/AnimatedGradientColorScheme.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/AnimatedTextBlock.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/AnimatedTextBlock.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/AnimatedTextBlock.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/AnimatedTextBlock.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextBlurEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextBlurEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextBlurEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextBlurEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextDefaultEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextDefaultEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextDefaultEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextDefaultEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextElasticEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextElasticEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextElasticEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextElasticEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextMotionBlurEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextMotionBlurEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextMotionBlurEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextMotionBlurEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextPivotEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextPivotEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextPivotEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextPivotEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextZoomEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextZoomEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextZoomEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Effects/TextZoomEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockDiffOperationType.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockDiffOperationType.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockDiffOperationType.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockDiffOperationType.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockRedrawState.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockRedrawState.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockRedrawState.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockRedrawState.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockTextDirection.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockTextDirection.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockTextDirection.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Enums/AnimatedTextBlockTextDirection.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/GraphemeCluster.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/GraphemeCluster.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/GraphemeCluster.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/GraphemeCluster.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/ITextEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/ITextEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/ITextEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/ITextEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/Easing.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/Easing.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/Easing.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/Easing.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/GraphemeClusterDiff.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/GraphemeClusterDiff.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/GraphemeClusterDiff.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/GraphemeClusterDiff.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/TextRenderingHelper.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/TextRenderingHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/TextRenderingHelper.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/TextRenderingHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/Win2dHelpers.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/Win2dHelpers.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/Win2dHelpers.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/Internals/Win2dHelpers.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/TextDiffResult.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/TextDiffResult.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AnimatedTextBlock/TextDiffResult.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AnimatedTextBlock/TextDiffResult.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AudioWave/AudioWave.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AudioWave/AudioWave.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AudioWave/AudioWave.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AudioWave/AudioWave.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AudioWave/AudioWave.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AudioWave/AudioWave.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AudioWave/AudioWave.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AudioWave/AudioWave.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/AudioWave/AudioWaveState.cs b/dev/DevWinUI/Controls/Win2DAndComposition/AudioWave/AudioWaveState.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/AudioWave/AudioWaveState.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/AudioWave/AudioWaveState.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/BannerView/BannerView.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/BannerView/BannerView.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/BannerView/BannerView.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/BannerView/BannerView.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/BannerView/BannerView.cs b/dev/DevWinUI/Controls/Win2DAndComposition/BannerView/BannerView.cs similarity index 99% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/BannerView/BannerView.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/BannerView/BannerView.cs index db4a9a20..ce7bd51a 100644 --- a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/BannerView/BannerView.cs +++ b/dev/DevWinUI/Controls/Win2DAndComposition/BannerView/BannerView.cs @@ -25,7 +25,7 @@ public partial class BannerView : FlipView private static readonly string ClampedDistanceNode = $"Clamp({DistanceNode}, -1f, 1f)"; - protected bool IsLoaded { get; private set; } + protected new bool IsLoaded { get; private set; } private DispatcherTimer timer; public BannerView() { diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/BannerView/BannerViewItem.cs b/dev/DevWinUI/Controls/Win2DAndComposition/BannerView/BannerViewItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/BannerView/BannerViewItem.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/BannerView/BannerViewItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/BannerView/CycleSelectionState.cs b/dev/DevWinUI/Controls/Win2DAndComposition/BannerView/CycleSelectionState.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/BannerView/CycleSelectionState.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/BannerView/CycleSelectionState.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/BlendedImage.cs b/dev/DevWinUI/Controls/Win2DAndComposition/BlendedImage.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/BlendedImage.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/BlendedImage.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/BlurEffectControl.cs b/dev/DevWinUI/Controls/Win2DAndComposition/BlurEffectControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/BlurEffectControl.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/BlurEffectControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/BlurEffectManager/BlurEffectManager.cs b/dev/DevWinUI/Controls/Win2DAndComposition/BlurEffectManager/BlurEffectManager.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/BlurEffectManager/BlurEffectManager.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/BlurEffectManager/BlurEffectManager.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/BlurEffectManager/BlurSourceType.cs b/dev/DevWinUI/Controls/Win2DAndComposition/BlurEffectManager/BlurSourceType.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/BlurEffectManager/BlurSourceType.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/BlurEffectManager/BlurSourceType.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/BlurEffectManager/BlurTintTarget.cs b/dev/DevWinUI/Controls/Win2DAndComposition/BlurEffectManager/BlurTintTarget.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/BlurEffectManager/BlurTintTarget.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/BlurEffectManager/BlurTintTarget.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/Bubble.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Bubble/Bubble.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/Bubble.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Bubble/Bubble.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/BubbleButton.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Bubble/BubbleButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/BubbleButton.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Bubble/BubbleButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressButton.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressButton.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressButton.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressButton.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressButton.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressButton.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressButton.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressButton.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressState.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressState.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressState.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Bubble/BubbleProgressButton/BubbleProgressState.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/BubbleView.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Bubble/BubbleView.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Bubble/BubbleView.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Bubble/BubbleView.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView/CarouselView.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView/CarouselView.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView/CarouselView.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView/CarouselView.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView/CarouselView.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView/CarouselView.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView/CarouselView.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView/CarouselView.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView/CarouselViewItem.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView/CarouselViewItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView/CarouselViewItem.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView/CarouselViewItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView/CarouselViewItemClickEventArgs.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView/CarouselViewItemClickEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView/CarouselViewItemClickEventArgs.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView/CarouselViewItemClickEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView/ICarouselViewItemSource.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView/ICarouselViewItemSource.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView/ICarouselViewItemSource.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView/ICarouselViewItemSource.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/CarouselView2.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/CarouselView2.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/CarouselView2.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/CarouselView2.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/CarouselView2.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/CarouselView2.cs similarity index 99% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/CarouselView2.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/CarouselView2.cs index a5ede76f..a48c76b3 100644 --- a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/CarouselView2.cs +++ b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/CarouselView2.cs @@ -717,7 +717,9 @@ private void SetColorAnimation(ScalarNode distanceAsPercentOfScaleThreshold, Boo foreach (var element in elements) { var t = element.GetType(); +#pragma warning disable IL2075 // 'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations. var props = t.GetProperties(); +#pragma warning restore IL2075 // 'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations. foreach (var prop in props) { if (prop.PropertyType == typeof(CompositionColorBrush) || prop.PropertyType == typeof(CompositionLinearGradientBrush)) diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/CarouselView2CarouselTypes.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/CarouselView2CarouselTypes.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/CarouselView2CarouselTypes.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/CarouselView2CarouselTypes.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/CarouselView2WheelAlignments.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/CarouselView2WheelAlignments.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/CarouselView2WheelAlignments.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/CarouselView2WheelAlignments.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/ICarouselView2.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/ICarouselView2.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/ICarouselView2.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/ICarouselView2.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/CarouselView2InternalExtensions.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/CarouselView2InternalExtensions.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/CarouselView2InternalExtensions.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/CarouselView2InternalExtensions.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/ExpressionFunctions.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/ExpressionFunctions.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/ExpressionFunctions.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/ExpressionFunctions.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/ExpressionNodeType.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/ExpressionNodeType.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/ExpressionNodeType.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/ExpressionNodeType.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/BooleanNode.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/BooleanNode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/BooleanNode.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/BooleanNode.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ColorNode.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ColorNode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ColorNode.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ColorNode.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ExpressionNode.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ExpressionNode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ExpressionNode.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ExpressionNode.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ReferenceNode.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ReferenceNode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ReferenceNode.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ReferenceNode.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ScalarNode.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ScalarNode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ScalarNode.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/ScalarNode.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector2Node.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector2Node.cs similarity index 78% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector2Node.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector2Node.cs index 2d0884e6..f44a2721 100644 --- a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector2Node.cs +++ b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector2Node.cs @@ -1,7 +1,7 @@ ο»Ώnamespace DevWinUI; -#pragma warning disable CS0660, CS0661 +#pragma warning disable CS0660, CS0661, CS0649 internal sealed partial class Vector2Node : ExpressionNode { internal Vector2Node() @@ -16,4 +16,4 @@ protected internal override string GetValue() private Vector2 _value; } -#pragma warning restore CS0660, CS0661 +#pragma warning restore CS0660, CS0661, CS0649 diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector3Node.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector3Node.cs similarity index 89% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector3Node.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector3Node.cs index ed5b9f4a..c7285700 100644 --- a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector3Node.cs +++ b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/Vector3Node.cs @@ -1,7 +1,7 @@ ο»Ώnamespace DevWinUI; -#pragma warning disable CS0660, CS0661 +#pragma warning disable CS0660, CS0661, CS0649 internal sealed partial class Vector3Node : ExpressionNode { @@ -40,4 +40,4 @@ protected internal override string GetValue() private Vector3 _value; } -#pragma warning restore CS0660, CS0661 +#pragma warning restore CS0660, CS0661, CS0649 diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/VisualReferenceNode.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/VisualReferenceNode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/VisualReferenceNode.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/Nodes/VisualReferenceNode.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/OperationType.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/OperationType.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CarouselView2/Internals/OperationType.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CarouselView2/Internals/OperationType.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CircleIcon/CircleIcon.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CircleIcon/CircleIcon.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CircleIcon/CircleIcon.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CircleIcon/CircleIcon.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CircleIcon/RadialGradientStopData.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CircleIcon/RadialGradientStopData.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CircleIcon/RadialGradientStopData.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CircleIcon/RadialGradientStopData.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorBloom/ColorBloomControl.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ColorBloom/ColorBloomControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorBloom/ColorBloomControl.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ColorBloom/ColorBloomControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorBloom/ColorBloomTransitionHelper.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ColorBloom/ColorBloomTransitionHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorBloom/ColorBloomTransitionHelper.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ColorBloom/ColorBloomTransitionHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorShadow/ColorShadow.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ColorShadow/ColorShadow.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorShadow/ColorShadow.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ColorShadow/ColorShadow.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorShadow/ColorShadow.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ColorShadow/ColorShadow.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorShadow/ColorShadow.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ColorShadow/ColorShadow.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorSlide/ColorSlideControl.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ColorSlide/ColorSlideControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorSlide/ColorSlideControl.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ColorSlide/ColorSlideControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorSlide/ColorSlideTransitionHelper.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ColorSlide/ColorSlideTransitionHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ColorSlide/ColorSlideTransitionHelper.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ColorSlide/ColorSlideTransitionHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CompositionImage.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CompositionImage.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CompositionImage.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CompositionImage.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CompositionShadow/CompositionShadow.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CompositionShadow/CompositionShadow.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CompositionShadow/CompositionShadow.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CompositionShadow/CompositionShadow.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/CompositionShadow/CompositionShadow.cs b/dev/DevWinUI/Controls/Win2DAndComposition/CompositionShadow/CompositionShadow.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/CompositionShadow/CompositionShadow.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/CompositionShadow/CompositionShadow.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ConfettiCannon/ConfettiCannon.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ConfettiCannon/ConfettiCannon.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ConfettiCannon/ConfettiCannon.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ConfettiCannon/ConfettiCannon.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ConfettiCannon/ConfettiCannonOptions.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ConfettiCannon/ConfettiCannonOptions.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ConfettiCannon/ConfettiCannonOptions.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ConfettiCannon/ConfettiCannonOptions.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ConfettiCannon/ConfettiEngine.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ConfettiCannon/ConfettiEngine.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ConfettiCannon/ConfettiEngine.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ConfettiCannon/ConfettiEngine.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ConfettiCannon/ConfettiParticle.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ConfettiCannon/ConfettiParticle.cs similarity index 92% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ConfettiCannon/ConfettiParticle.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ConfettiCannon/ConfettiParticle.cs index 2ee9bfe3..9cc6a29b 100644 --- a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ConfettiCannon/ConfettiParticle.cs +++ b/dev/DevWinUI/Controls/Win2DAndComposition/ConfettiCannon/ConfettiParticle.cs @@ -3,7 +3,9 @@ internal struct ConfettiParticle { public Vector2 Position; +#pragma warning disable CS0649 public Vector2 Velocity2D; +#pragma warning restore CS0649 public double Wobble; public double WobbleSpeed; diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ContentSlider.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ContentSlider.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ContentSlider.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ContentSlider.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Countdown/Countdown.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Countdown/Countdown.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Countdown/Countdown.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Countdown/Countdown.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Countdown/Countdown.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Countdown/Countdown.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Countdown/Countdown.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Countdown/Countdown.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Countdown/CountdownState.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Countdown/CountdownState.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Countdown/CountdownState.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Countdown/CountdownState.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/EasyCarouselPanel/CarouselShiftingDirection.cs b/dev/DevWinUI/Controls/Win2DAndComposition/EasyCarouselPanel/CarouselShiftingDirection.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/EasyCarouselPanel/CarouselShiftingDirection.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/EasyCarouselPanel/CarouselShiftingDirection.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/EasyCarouselPanel/EasyCarouselPanel.cs b/dev/DevWinUI/Controls/Win2DAndComposition/EasyCarouselPanel/EasyCarouselPanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/EasyCarouselPanel/EasyCarouselPanel.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/EasyCarouselPanel/EasyCarouselPanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/EdgeLighting/EdgeLighting.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/EdgeLighting/EdgeLighting.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/EdgeLighting/EdgeLighting.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/EdgeLighting/EdgeLighting.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/EdgeLighting/EdgeLighting.cs b/dev/DevWinUI/Controls/Win2DAndComposition/EdgeLighting/EdgeLighting.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/EdgeLighting/EdgeLighting.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/EdgeLighting/EdgeLighting.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/FlipToReveal.cs b/dev/DevWinUI/Controls/Win2DAndComposition/FlipToReveal.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/FlipToReveal.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/FlipToReveal.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/FluidBanner.cs b/dev/DevWinUI/Controls/Win2DAndComposition/FluidBanner.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/FluidBanner.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/FluidBanner.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ForegroundFocusEffects/ForegroundFocusEffectTypes.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ForegroundFocusEffects/ForegroundFocusEffectTypes.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ForegroundFocusEffects/ForegroundFocusEffectTypes.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ForegroundFocusEffects/ForegroundFocusEffectTypes.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ForegroundFocusEffects/ForegroundFocusEffects.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ForegroundFocusEffects/ForegroundFocusEffects.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ForegroundFocusEffects/ForegroundFocusEffects.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ForegroundFocusEffects/ForegroundFocusEffects.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/FrostedGlass.cs b/dev/DevWinUI/Controls/Win2DAndComposition/FrostedGlass.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/FrostedGlass.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/FrostedGlass.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyButton/GooeyButton.cs b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyButton/GooeyButton.cs similarity index 99% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyButton/GooeyButton.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/GooeyButton/GooeyButton.cs index 402760f7..28fc42a9 100644 --- a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyButton/GooeyButton.cs +++ b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyButton/GooeyButton.cs @@ -18,7 +18,6 @@ public sealed partial class GooeyButton : ItemsControl private IReadOnlyList gooeyButtonItemsProperty; private ICanvasImage image; private Button InnerButton; - private bool isAnimating; private Grid LayoutRoot; private readonly double mainButtonAnimationDuration = 0.6d; @@ -383,12 +382,10 @@ private void OnWin2DDraw(CanvasControl sender, CanvasDrawEventArgs args) private void OnItemsAnimationCompleted(object sender, EventArgs e) { - isAnimating = false; } private void OnItemsAnimationStarted(object sender, EventArgs e) { - isAnimating = true; } private void OnItemsPanelUnloaded(object sender, RoutedEventArgs e) diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyButton/GooeyButtonItem.cs b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyButton/GooeyButtonItem.cs similarity index 99% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyButton/GooeyButtonItem.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/GooeyButton/GooeyButtonItem.cs index 44d002e2..8a17a852 100644 --- a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyButton/GooeyButtonItem.cs +++ b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyButton/GooeyButtonItem.cs @@ -10,7 +10,6 @@ public sealed partial class GooeyButtonItem : Button private Brush background; private long brushColorToken = -1; private long brushOpacityToken = -1; - private bool isAnimating = false; public GooeyButtonItem() { diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyButton/GooeyButtonItemsPanel.cs b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyButton/GooeyButtonItemsPanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyButton/GooeyButtonItemsPanel.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/GooeyButton/GooeyButtonItemsPanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/DoubleTimeline.cs b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/DoubleTimeline.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/DoubleTimeline.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/DoubleTimeline.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/TimelineProgresser.cs b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/TimelineProgresser.cs similarity index 97% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/TimelineProgresser.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/TimelineProgresser.cs index 8e177643..24d35085 100644 --- a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/TimelineProgresser.cs +++ b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/TimelineProgresser.cs @@ -16,7 +16,7 @@ public TimelineProgresser(double seconds, bool autoReverse) public double GetCurrentProgress(TimeSpan timeSpan) { - var beginTimeTicks = 0l; + var beginTimeTicks = 0L; if (BeginTime != null) beginTimeTicks = BeginTime.Value.Ticks; diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/Vector2Timeline.cs b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/Vector2Timeline.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/Vector2Timeline.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/GooeyEffect/AnimationTimelines/Vector2Timeline.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyEffect/GooeyEffect.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyEffect/GooeyEffect.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyEffect/GooeyEffect.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/GooeyEffect/GooeyEffect.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyEffect/GooeyEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyEffect/GooeyEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyEffect/GooeyEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/GooeyEffect/GooeyEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyBubble.cs b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyBubble.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyBubble.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyBubble.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyFooterEffect.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyFooterEffect.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyFooterEffect.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyFooterEffect.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyFooterEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyFooterEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyFooterEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/GooeyFooterEffect/GooeyFooterEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Hatch/Hatch.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Hatch/Hatch.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Hatch/Hatch.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Hatch/Hatch.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Hatch/HatchGenerator.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Hatch/HatchGenerator.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Hatch/HatchGenerator.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Hatch/HatchGenerator.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Hatch/HatchStyle.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Hatch/HatchStyle.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Hatch/HatchStyle.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Hatch/HatchStyle.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageFrame/ImageFrame.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ImageFrame/ImageFrame.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageFrame/ImageFrame.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ImageFrame/ImageFrame.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageFrame/ImageFrameEventArgs.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ImageFrame/ImageFrameEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageFrame/ImageFrameEventArgs.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ImageFrame/ImageFrameEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageFrame/ImageFrameTransitionMode.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ImageFrame/ImageFrameTransitionMode.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageFrame/ImageFrameTransitionMode.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ImageFrame/ImageFrameTransitionMode.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageFrame/ShadowProvider.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ImageFrame/ShadowProvider.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageFrame/ShadowProvider.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ImageFrame/ShadowProvider.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/BitmapDrawer.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/BitmapDrawer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/BitmapDrawer.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/BitmapDrawer.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/CircleDrawer.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/CircleDrawer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/CircleDrawer.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/CircleDrawer.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/ContentDrawer.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/ContentDrawer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/ContentDrawer.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/ContentDrawer.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/ImageLoader.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/ImageLoader.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/ImageLoader.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/ImageLoader.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/ManagedSurface.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/ManagedSurface.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/ManagedSurface.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/ManagedSurface.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/TextDrawer.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/TextDrawer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ImageLoader/TextDrawer.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ImageLoader/TextDrawer.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/ICompositor.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/ICompositor.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/ICompositor.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/ICompositor.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/LinearGradientBlurHelper.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/LinearGradientBlurHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/LinearGradientBlurHelper.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/LinearGradientBlurHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/LinearGradientBlurHelperBase.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/LinearGradientBlurHelperBase.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/LinearGradientBlurHelperBase.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/LinearGradientBlurHelperBase.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionAnimationProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionAnimationProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionAnimationProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionAnimationProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionBrushProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionBrushProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionBrushProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionBrushProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorBrushProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorBrushProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorBrushProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorBrushProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorGradientStopCollectionProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorGradientStopCollectionProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorGradientStopCollectionProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorGradientStopCollectionProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorGradientStopProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorGradientStopProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorGradientStopProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionColorGradientStopProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionEffectBrushProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionEffectBrushProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionEffectBrushProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionEffectBrushProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionLinearGradientBrushProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionLinearGradientBrushProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionLinearGradientBrushProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionLinearGradientBrushProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionObjectProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionObjectProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionObjectProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionObjectProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionPropertySetProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionPropertySetProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionPropertySetProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositionPropertySetProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositorProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositorProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositorProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/CompositorProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/ExpressionAnimationProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/ExpressionAnimationProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/ExpressionAnimationProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/ExpressionAnimationProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/SpriteVisualProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/SpriteVisualProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/SpriteVisualProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/SpriteVisualProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/VisualCollectionProxy.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/VisualCollectionProxy.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/VisualCollectionProxy.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/Internals/Proxy/VisualCollectionProxy.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/LinearGradientBlurPanel.cs b/dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/LinearGradientBlurPanel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/LinearGradientBlurPanel/LinearGradientBlurPanel.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/LinearGradientBlurPanel/LinearGradientBlurPanel.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/OrbitLoadingIndicator.cs b/dev/DevWinUI/Controls/Win2DAndComposition/OrbitLoadingIndicator.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/OrbitLoadingIndicator.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/OrbitLoadingIndicator.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/OutlineTextControl.cs b/dev/DevWinUI/Controls/Win2DAndComposition/OutlineTextControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/OutlineTextControl.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/OutlineTextControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Particle/Particle.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Particle/Particle.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Particle/Particle.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Particle/Particle.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Particle/Particle.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Particle/Particle.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Particle/Particle.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Particle/Particle.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Particle/ParticleModel.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Particle/ParticleModel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Particle/ParticleModel.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Particle/ParticleModel.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/PerspectiveHost.cs b/dev/DevWinUI/Controls/Win2DAndComposition/PerspectiveHost.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/PerspectiveHost.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/PerspectiveHost.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/PerspectiveZoom.cs b/dev/DevWinUI/Controls/Win2DAndComposition/PerspectiveZoom.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/PerspectiveZoom.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/PerspectiveZoom.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ProfileControl.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ProfileControl.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ProfileControl.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ProfileControl.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ShimmerTextBlock.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ShimmerTextBlock.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ShimmerTextBlock.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ShimmerTextBlock.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/ShyHeader.cs b/dev/DevWinUI/Controls/Win2DAndComposition/ShyHeader.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/ShyHeader.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/ShyHeader.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpectrumVisualizer/ISpectrumAnalyzer.cs b/dev/DevWinUI/Controls/Win2DAndComposition/SpectrumVisualizer/ISpectrumAnalyzer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpectrumVisualizer/ISpectrumAnalyzer.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/SpectrumVisualizer/ISpectrumAnalyzer.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumColorType.cs b/dev/DevWinUI/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumColorType.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumColorType.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumColorType.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumType.cs b/dev/DevWinUI/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumType.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumType.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumType.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumVisualizer.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumVisualizer.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumVisualizer.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumVisualizer.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumVisualizer.cs b/dev/DevWinUI/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumVisualizer.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumVisualizer.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/SpectrumVisualizer/SpectrumVisualizer.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpeedGraph.cs b/dev/DevWinUI/Controls/Win2DAndComposition/SpeedGraph.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/SpeedGraph.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/SpeedGraph.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Stars.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Stars.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Stars.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Stars.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/StoreCarousel/StoreCarousel.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/StoreCarousel/StoreCarousel.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/StoreCarousel/StoreCarousel.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/StoreCarousel/StoreCarousel.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/StoreCarousel/StoreCarousel.cs b/dev/DevWinUI/Controls/Win2DAndComposition/StoreCarousel/StoreCarousel.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/StoreCarousel/StoreCarousel.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/StoreCarousel/StoreCarousel.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/StoreCarousel/StoreCarouselEventArgs.cs b/dev/DevWinUI/Controls/Win2DAndComposition/StoreCarousel/StoreCarouselEventArgs.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/StoreCarousel/StoreCarouselEventArgs.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/StoreCarousel/StoreCarouselEventArgs.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/StoreCarousel/StoreCarouselItem.cs b/dev/DevWinUI/Controls/Win2DAndComposition/StoreCarousel/StoreCarouselItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/StoreCarousel/StoreCarouselItem.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/StoreCarousel/StoreCarouselItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextBlockStrokeView/DisposableCollector.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextBlockStrokeView/DisposableCollector.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextBlockStrokeView/DisposableCollector.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextBlockStrokeView/DisposableCollector.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextBlockStrokeView/SpriteVisualPool.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextBlockStrokeView/SpriteVisualPool.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextBlockStrokeView/SpriteVisualPool.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextBlockStrokeView/SpriteVisualPool.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeHelper.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeHelper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeHelper.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeHelper.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeView!.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeView!.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeView!.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeView!.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeView.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeView.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeView.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextBlockStrokeView/TextBlockStrokeView.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect2.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect2.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect2.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect2.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect2.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect2.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect2.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect2.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect3.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect3.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect3.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect3.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect3.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect3.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect3.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextGlitchEffect3.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextToBrushWrapper.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextToBrushWrapper.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextGlitchEffect/TextToBrushWrapper.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextGlitchEffect/TextToBrushWrapper.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextMorphEffect/TextMorphEffect.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextMorphEffect/TextMorphEffect.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextMorphEffect/TextMorphEffect.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextMorphEffect/TextMorphEffect.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextMorphEffect/TextMorphEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextMorphEffect/TextMorphEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextMorphEffect/TextMorphEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextMorphEffect/TextMorphEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextMorphEffect/TextMorphItem.cs b/dev/DevWinUI/Controls/Win2DAndComposition/TextMorphEffect/TextMorphItem.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/TextMorphEffect/TextMorphItem.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/TextMorphEffect/TextMorphItem.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Watermark/Watermark.Properties.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Watermark/Watermark.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Watermark/Watermark.Properties.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Watermark/Watermark.Properties.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Watermark/Watermark.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Watermark/Watermark.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Watermark/Watermark.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Watermark/Watermark.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/Watermark/WatermarkEffect.cs b/dev/DevWinUI/Controls/Win2DAndComposition/Watermark/WatermarkEffect.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/Watermark/WatermarkEffect.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/Watermark/WatermarkEffect.cs diff --git a/dev/DevWinUI.Controls/Controls/Win2DAndComposition/WaveCircle.cs b/dev/DevWinUI/Controls/Win2DAndComposition/WaveCircle.cs similarity index 100% rename from dev/DevWinUI.Controls/Controls/Win2DAndComposition/WaveCircle.cs rename to dev/DevWinUI/Controls/Win2DAndComposition/WaveCircle.cs diff --git a/dev/DevWinUI.Controls/Converters/BoolToObjectConverter.cs b/dev/DevWinUI/Converters/BoolToObjectConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/BoolToObjectConverter.cs rename to dev/DevWinUI/Converters/BoolToObjectConverter.cs diff --git a/dev/DevWinUI.Controls/Converters/BoolToVisibilityConverter.cs b/dev/DevWinUI/Converters/BoolToVisibilityConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/BoolToVisibilityConverter.cs rename to dev/DevWinUI/Converters/BoolToVisibilityConverter.cs diff --git a/dev/DevWinUI.Controls/Converters/DoubleToObjectConverter.cs b/dev/DevWinUI/Converters/DoubleToObjectConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/DoubleToObjectConverter.cs rename to dev/DevWinUI/Converters/DoubleToObjectConverter.cs diff --git a/dev/DevWinUI.Controls/Converters/DoubleToVisibilityConverter.cs b/dev/DevWinUI/Converters/DoubleToVisibilityConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/DoubleToVisibilityConverter.cs rename to dev/DevWinUI/Converters/DoubleToVisibilityConverter.cs diff --git a/dev/DevWinUI.Controls/Converters/Internals/ConverterTools.cs b/dev/DevWinUI/Converters/Internals/ConverterTools.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/Internals/ConverterTools.cs rename to dev/DevWinUI/Converters/Internals/ConverterTools.cs diff --git a/dev/DevWinUI.Controls/Converters/Internals/CornerRadiusConverter.cs b/dev/DevWinUI/Converters/Internals/CornerRadiusConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/Internals/CornerRadiusConverter.cs rename to dev/DevWinUI/Converters/Internals/CornerRadiusConverter.cs diff --git a/dev/DevWinUI.Controls/Converters/Internals/CornerRadiusSplitConverter.cs b/dev/DevWinUI/Converters/Internals/CornerRadiusSplitConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/Internals/CornerRadiusSplitConverter.cs rename to dev/DevWinUI/Converters/Internals/CornerRadiusSplitConverter.cs diff --git a/dev/DevWinUI.Controls/Converters/Internals/SelectorBarSegmentedMarginConverter.cs b/dev/DevWinUI/Converters/Internals/SelectorBarSegmentedMarginConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/Internals/SelectorBarSegmentedMarginConverter.cs rename to dev/DevWinUI/Converters/Internals/SelectorBarSegmentedMarginConverter.cs diff --git a/dev/DevWinUI.Controls/Converters/Internals/StringToUriConverter.cs b/dev/DevWinUI/Converters/Internals/StringToUriConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/Internals/StringToUriConverter.cs rename to dev/DevWinUI/Converters/Internals/StringToUriConverter.cs diff --git a/dev/DevWinUI.Controls/Converters/NullToObjectConverter.cs b/dev/DevWinUI/Converters/NullToObjectConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/NullToObjectConverter.cs rename to dev/DevWinUI/Converters/NullToObjectConverter.cs diff --git a/dev/DevWinUI.Controls/Converters/NullToVisibilityConverter.cs b/dev/DevWinUI/Converters/NullToVisibilityConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/NullToVisibilityConverter.cs rename to dev/DevWinUI/Converters/NullToVisibilityConverter.cs diff --git a/dev/DevWinUI.Controls/Converters/NumberToPercentageConverter.cs b/dev/DevWinUI/Converters/NumberToPercentageConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/NumberToPercentageConverter.cs rename to dev/DevWinUI/Converters/NumberToPercentageConverter.cs diff --git a/dev/DevWinUI.Controls/Converters/StringToStyleConverter.cs b/dev/DevWinUI/Converters/StringToStyleConverter.cs similarity index 100% rename from dev/DevWinUI.Controls/Converters/StringToStyleConverter.cs rename to dev/DevWinUI/Converters/StringToStyleConverter.cs diff --git a/dev/DevWinUI/DevWinUI.csproj b/dev/DevWinUI/DevWinUI.csproj index ba095161..b3e07a35 100644 --- a/dev/DevWinUI/DevWinUI.csproj +++ b/dev/DevWinUI/DevWinUI.csproj @@ -1,15 +1,61 @@ ο»Ώ $(LibraryMajorVersion).$(DevWinUI_MinorVersion).$(DevWinUI_PatchVersion)$(PreviewBuildSuffix) - $(BaseNamespace) $(BaseNamespace) - Experience WinUI 3 quickly and easily with the help of Core, Everything you need to develop an application is gathered in one place. Helpers, Extensions... - winui winui3 win11 xaml core DevWinUI Common SettingsUI settings theme styles projectreunion winappsdk windowsappsdk wasdk reunion SettingsControls settingsexpander settingscard composition + $(BaseNamespace) + + Experience WinUI 3 quickly and easily with the help of DevWinUI, Everything you need to develop an application is gathered in one place. DevWinUI Includes custom controls, styles, landingPages,Compositions and win2d. + + winui winui3 win11 xaml DevWinUI DevWinUI.Controls SettingsUI Components settings theme styles projectreunion winappsdk windowsappsdk wasdk reunion SettingsControls settingsexpander settingscard landingPages win2d composition + + $([System.Text.RegularExpressions.Regex]::Replace('$(TargetFramework)','\.0$','')) + $(TargetsForTfmSpecificContentInPackage);PackCustomContent + - + + all runtime; build; native; contentfiles; analyzers; buildtransitive + + + Themes\Generic.xaml + True + + + Themes\Generic.xaml + True + + + + + Assets.Mask.ForegroundFocusMask.png + + + Assets.Mask.TextGlitchMask.png + + + Assets.Mask.CircleMask.png + + + Assets.Noise.Noise.jpg + + + + + + + + + + + + + + lib\$(CleanTargetFramework)\DevWinUI\Themes\ + + + \ No newline at end of file diff --git a/dev/DevWinUI/GlobalUsings.cs b/dev/DevWinUI/GlobalUsings.cs index 5a6db28c..c7fb7b02 100644 --- a/dev/DevWinUI/GlobalUsings.cs +++ b/dev/DevWinUI/GlobalUsings.cs @@ -1,26 +1,23 @@ ο»Ώglobal using System.Collections.ObjectModel; -global using System.ComponentModel; -global using System.Net; global using System.Numerics; -global using System.Reflection; -global using System.Runtime.CompilerServices; -global using System.Runtime.InteropServices; -global using System.Text; +global using Microsoft.Graphics.Canvas; +global using Microsoft.Graphics.Canvas.Brushes; +global using Microsoft.Graphics.Canvas.Effects; +global using Microsoft.Graphics.Canvas.Geometry; +global using Microsoft.Graphics.Canvas.Text; +global using Microsoft.Graphics.Canvas.UI; +global using Microsoft.Graphics.Canvas.UI.Composition; +global using Microsoft.Graphics.Canvas.UI.Xaml; +global using Microsoft.Graphics.DirectX; global using Microsoft.UI; global using Microsoft.UI.Composition; -global using Microsoft.UI.Windowing; global using Microsoft.UI.Xaml; global using Microsoft.UI.Xaml.Controls; +global using Microsoft.UI.Xaml.Data; global using Microsoft.UI.Xaml.Hosting; -global using Microsoft.UI.Xaml.Markup; global using Microsoft.UI.Xaml.Media; global using Microsoft.UI.Xaml.Media.Animation; -global using Microsoft.UI.Xaml.Navigation; +global using Microsoft.UI.Xaml.Media.Imaging; global using Windows.Foundation; global using Windows.Graphics; -global using Windows.Networking.Connectivity; -global using Windows.Storage; global using Windows.UI; -global using Windows.Win32; -global using Windows.Win32.Foundation; -global using WinRT.Interop; diff --git a/dev/DevWinUI.Controls/LandingPages/AllLandingPage.xaml b/dev/DevWinUI/LandingPages/AllLandingPage.xaml similarity index 100% rename from dev/DevWinUI.Controls/LandingPages/AllLandingPage.xaml rename to dev/DevWinUI/LandingPages/AllLandingPage.xaml diff --git a/dev/DevWinUI.Controls/LandingPages/AllLandingPage.xaml.cs b/dev/DevWinUI/LandingPages/AllLandingPage.xaml.cs similarity index 100% rename from dev/DevWinUI.Controls/LandingPages/AllLandingPage.xaml.cs rename to dev/DevWinUI/LandingPages/AllLandingPage.xaml.cs diff --git a/dev/DevWinUI.Controls/LandingPages/ItemsPageBase.Properties.cs b/dev/DevWinUI/LandingPages/ItemsPageBase.Properties.cs similarity index 100% rename from dev/DevWinUI.Controls/LandingPages/ItemsPageBase.Properties.cs rename to dev/DevWinUI/LandingPages/ItemsPageBase.Properties.cs diff --git a/dev/DevWinUI.Controls/LandingPages/ItemsPageBase.cs b/dev/DevWinUI/LandingPages/ItemsPageBase.cs similarity index 100% rename from dev/DevWinUI.Controls/LandingPages/ItemsPageBase.cs rename to dev/DevWinUI/LandingPages/ItemsPageBase.cs diff --git a/dev/DevWinUI.Controls/LandingPages/MainLandingPage.xaml b/dev/DevWinUI/LandingPages/MainLandingPage.xaml similarity index 100% rename from dev/DevWinUI.Controls/LandingPages/MainLandingPage.xaml rename to dev/DevWinUI/LandingPages/MainLandingPage.xaml diff --git a/dev/DevWinUI.Controls/LandingPages/MainLandingPage.xaml.cs b/dev/DevWinUI/LandingPages/MainLandingPage.xaml.cs similarity index 100% rename from dev/DevWinUI.Controls/LandingPages/MainLandingPage.xaml.cs rename to dev/DevWinUI/LandingPages/MainLandingPage.xaml.cs diff --git a/dev/DevWinUI.Controls/LandingPages/SectionPage.xaml b/dev/DevWinUI/LandingPages/SectionPage.xaml similarity index 100% rename from dev/DevWinUI.Controls/LandingPages/SectionPage.xaml rename to dev/DevWinUI/LandingPages/SectionPage.xaml diff --git a/dev/DevWinUI.Controls/LandingPages/SectionPage.xaml.cs b/dev/DevWinUI/LandingPages/SectionPage.xaml.cs similarity index 100% rename from dev/DevWinUI.Controls/LandingPages/SectionPage.xaml.cs rename to dev/DevWinUI/LandingPages/SectionPage.xaml.cs diff --git a/dev/DevWinUI/README.md b/dev/DevWinUI/README.md index 1cfb949e..3b5e2fe3 100644 --- a/dev/DevWinUI/README.md +++ b/dev/DevWinUI/README.md @@ -15,7 +15,7 @@ |Packages|Download/Installation|Documentation| |:---|:---|:---:| -|[![NuGet Version](https://img.shields.io/nuget/v/DevWinUI?label=DevWinUI)](https://www.nuget.org/packages/DevWinUI)|[![NuGet Download](https://img.shields.io/nuget/dt/DevWinUI?label=DevWinUI)](https://www.nuget.org/packages/DevWinUI)|[![Document](https://img.shields.io/badge/See%20Here-%20?logo=github&label=Document&color=red)](https://Ghost1372.github.io/DevWinUI)| +|[![NuGet Version](https://img.shields.io/nuget/v/DevWinUI?label=DevWinUI)](https://www.nuget.org/packages/DevWinUI)|[![NuGet Download](https://img.shields.io/nuget/dt/DevWinUI?label=DevWinUI)](https://www.nuget.org/packages/DevWinUI)|[![Document](https://img.shields.io/badge/See%20Here-%20?logo=github&label=Document&color=red)](https://Ghost1372.github.io/DevWinUI/)| @@ -23,19 +23,56 @@ # DevWinUI -### Experience WinUI 3 quickly and easily with the help of Core, Everything you need to develop an application is gathered in one place. +### Experience WinUI 3 quickly and easily with the help of DevWinUI, Everything you need to develop an application is gathered in one place. + ## Install ``` Install-Package DevWinUI ``` +After installing, add the following resource to app.xaml + +```xml + +``` + +## ⚠️ Important: Package Renaming (v10.0.0+) + +This version introduces **breaking changes** related to package renaming to support meta packages. + +### Package Changes + +| Version | Controls Library | +|---------|--------------|------------------| +| **v9.9.4 and below** | `DevWinUI.Controls` | +| **v10.0.0+** | `DevWinUI` | + +### ResourceDictionary Path Changes + +| Version | ResourceDictionary Path | +|---------|------------------------| +| **v9.9.4 and below** | `ms-appx:///DevWinUI.Controls/Themes/Generic.xaml` | +| **v10.0.0+** | `ms-appx:///DevWinUI/Themes/Generic.xaml` | + +### Migration Guide + +**If you are using v10.0.0 or above:** +- Install `DevWinUI` for the full package (controls + core) β€” recommended for most users + +**If you are using v9.9.4 or below:** +- Install `DevWinUI.Controls` for custom controls, styles, and XAML resources (includes DevWinUI core) + +### Note for Upgrading from v9.9.4 β†’ v10.0.0+ + +Simply replace `DevWinUI.Controls` with `DevWinUI` in your project references and update the ResourceDictionary path as shown above. The `DevWinUI` package now includes everything from the old `DevWinUI.Controls` plus the core library. + ## Demo See the [Gallery](https://github.com/Ghost1372/DevWinUI) app to see how to use it ## Documentation -See Here for Online [Documentation](https://ghost1372.github.io/devWinUI/) +See Here for Online [Documentation](https://ghost1372.github.io/DevWinUI/) ![GalleryApp](https://raw.githubusercontent.com/ghost1372/DevWinUI-Resources/refs/heads/main/DevWinUI-Docs/GalleryApp.png) diff --git a/dev/DevWinUI.Controls/Themes/DevWinUI.cs b/dev/DevWinUI/Themes/DevWinUI.cs similarity index 53% rename from dev/DevWinUI.Controls/Themes/DevWinUI.cs rename to dev/DevWinUI/Themes/DevWinUI.cs index a17fda0d..3d453008 100644 --- a/dev/DevWinUI.Controls/Themes/DevWinUI.cs +++ b/dev/DevWinUI/Themes/DevWinUI.cs @@ -3,6 +3,6 @@ public partial class DevWinUI : ResourceDictionary { public DevWinUI() { - Source = new Uri("ms-appx:///DevWinUI.Controls/Themes/Generic.xaml", UriKind.Absolute); + Source = new Uri("ms-appx:///DevWinUI/Themes/Generic.xaml", UriKind.Absolute); } } diff --git a/dev/DevWinUI.Controls/Themes/Generic.xaml b/dev/DevWinUI/Themes/Generic.xaml similarity index 99% rename from dev/DevWinUI.Controls/Themes/Generic.xaml rename to dev/DevWinUI/Themes/Generic.xaml index 4daa41ff..2f96f214 100644 --- a/dev/DevWinUI.Controls/Themes/Generic.xaml +++ b/dev/DevWinUI/Themes/Generic.xaml @@ -44,7 +44,6 @@ Controls\Ported\Toolbar\ToolbarToggleButton\ToolbarToggleButton.ThemeResources.x Controls\Ported\Toolbar\ToolbarToggleButton\ToolbarToggleButton.xaml Themes\Styles\CommonStyles\Button.xaml Themes\Styles\CommonStyles\CalendarViewStyle.xaml -Themes\Styles\CommonStyles\Colors.xaml Themes\Styles\CommonStyles\ComboBox.xaml Themes\Styles\CommonStyles\Common.xaml Themes\Styles\CommonStyles\Converters.xaml @@ -57,6 +56,7 @@ Themes\Styles\CommonStyles\Panel.xaml Themes\Styles\CommonStyles\SelectorBar.xaml Themes\Styles\CommonStyles\TabViewItem.xaml Themes\Styles\CommonStyles\TextBlock.xaml +Themes\Styles\CommonStyles\ThemeResources.xaml Themes\Styles\CommonStyles\Thumb.xaml Themes\Styles\CommonStyles\ToggleSwitch.xaml Themes\Styles\Controls\Accordion.xaml @@ -280,35 +280,6 @@ Themes\Styles\Controls\WaveProgressBar.xaml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -345,11 +316,42 @@ Themes\Styles\Controls\WaveProgressBar.xaml 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -574,35 +576,6 @@ Themes\Styles\Controls\WaveProgressBar.xaml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -639,11 +612,42 @@ Themes\Styles\Controls\WaveProgressBar.xaml 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -865,23 +869,6 @@ Themes\Styles\Controls\WaveProgressBar.xaml - - - - - - - - - - - - - - - - - @@ -918,11 +905,30 @@ Themes\Styles\Controls\WaveProgressBar.xaml 1 + + + + + + + + + + + + + + + + + Transparent + + @@ -1414,31 +1420,6 @@ Themes\Styles\Controls\WaveProgressBar.xaml - - - - - - - - - - - - - - - - - - - - - - - - - 240 @@ -1537,6 +1518,31 @@ Themes\Styles\Controls\WaveProgressBar.xaml 1 12 12 + + + + + + + + + + + + + + + + + + + + + + + + + + 0,0,0,4 + Normal + diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/EdgeLighting.xaml b/dev/DevWinUI/Themes/Styles/Controls/EdgeLighting.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/EdgeLighting.xaml rename to dev/DevWinUI/Themes/Styles/Controls/EdgeLighting.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/FlipBlock.xaml b/dev/DevWinUI/Themes/Styles/Controls/FlipBlock.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/FlipBlock.xaml rename to dev/DevWinUI/Themes/Styles/Controls/FlipBlock.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/FlipSide.xaml b/dev/DevWinUI/Themes/Styles/Controls/FlipSide.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/FlipSide.xaml rename to dev/DevWinUI/Themes/Styles/Controls/FlipSide.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/FlipToReveal.xaml b/dev/DevWinUI/Themes/Styles/Controls/FlipToReveal.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/FlipToReveal.xaml rename to dev/DevWinUI/Themes/Styles/Controls/FlipToReveal.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/FlyoutMenuButton.xaml b/dev/DevWinUI/Themes/Styles/Controls/FlyoutMenuButton.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/FlyoutMenuButton.xaml rename to dev/DevWinUI/Themes/Styles/Controls/FlyoutMenuButton.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/ForegroundFocusEffects.xaml b/dev/DevWinUI/Themes/Styles/Controls/ForegroundFocusEffects.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/ForegroundFocusEffects.xaml rename to dev/DevWinUI/Themes/Styles/Controls/ForegroundFocusEffects.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/FrostedGlass.xaml b/dev/DevWinUI/Themes/Styles/Controls/FrostedGlass.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/FrostedGlass.xaml rename to dev/DevWinUI/Themes/Styles/Controls/FrostedGlass.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/GifImage.xaml b/dev/DevWinUI/Themes/Styles/Controls/GifImage.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/GifImage.xaml rename to dev/DevWinUI/Themes/Styles/Controls/GifImage.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/GoToCard.xaml b/dev/DevWinUI/Themes/Styles/Controls/GoToCard.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/GoToCard.xaml rename to dev/DevWinUI/Themes/Styles/Controls/GoToCard.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/GoToTop.xaml b/dev/DevWinUI/Themes/Styles/Controls/GoToTop.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/GoToTop.xaml rename to dev/DevWinUI/Themes/Styles/Controls/GoToTop.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/GooeyButton.xaml b/dev/DevWinUI/Themes/Styles/Controls/GooeyButton.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/GooeyButton.xaml rename to dev/DevWinUI/Themes/Styles/Controls/GooeyButton.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/GooeyButtonItem.xaml b/dev/DevWinUI/Themes/Styles/Controls/GooeyButtonItem.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/GooeyButtonItem.xaml rename to dev/DevWinUI/Themes/Styles/Controls/GooeyButtonItem.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/GooeyEffect.xaml b/dev/DevWinUI/Themes/Styles/Controls/GooeyEffect.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/GooeyEffect.xaml rename to dev/DevWinUI/Themes/Styles/Controls/GooeyEffect.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/GooeyFooterEffect.xaml b/dev/DevWinUI/Themes/Styles/Controls/GooeyFooterEffect.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/GooeyFooterEffect.xaml rename to dev/DevWinUI/Themes/Styles/Controls/GooeyFooterEffect.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Gravatar.xaml b/dev/DevWinUI/Themes/Styles/Controls/Gravatar.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Gravatar.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Gravatar.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Growl.xaml b/dev/DevWinUI/Themes/Styles/Controls/Growl.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Growl.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Growl.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/HaloArcSlider.xaml b/dev/DevWinUI/Themes/Styles/Controls/HaloArcSlider.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/HaloArcSlider.xaml rename to dev/DevWinUI/Themes/Styles/Controls/HaloArcSlider.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/HaloSlider.xaml b/dev/DevWinUI/Themes/Styles/Controls/HaloSlider.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/HaloSlider.xaml rename to dev/DevWinUI/Themes/Styles/Controls/HaloSlider.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/HaloTimePicker.xaml b/dev/DevWinUI/Themes/Styles/Controls/HaloTimePicker.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/HaloTimePicker.xaml rename to dev/DevWinUI/Themes/Styles/Controls/HaloTimePicker.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Hatch.xaml b/dev/DevWinUI/Themes/Styles/Controls/Hatch.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Hatch.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Hatch.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/HeaderCarousel.xaml b/dev/DevWinUI/Themes/Styles/Controls/HeaderCarousel.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/HeaderCarousel.xaml rename to dev/DevWinUI/Themes/Styles/Controls/HeaderCarousel.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/HeaderCarouselItem.xaml b/dev/DevWinUI/Themes/Styles/Controls/HeaderCarouselItem.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/HeaderCarouselItem.xaml rename to dev/DevWinUI/Themes/Styles/Controls/HeaderCarouselItem.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/HeaderTile.xaml b/dev/DevWinUI/Themes/Styles/Controls/HeaderTile.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/HeaderTile.xaml rename to dev/DevWinUI/Themes/Styles/Controls/HeaderTile.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/HomePageHeader.xaml b/dev/DevWinUI/Themes/Styles/Controls/HomePageHeader.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/HomePageHeader.xaml rename to dev/DevWinUI/Themes/Styles/Controls/HomePageHeader.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/HorizontalScrollContainer.xaml b/dev/DevWinUI/Themes/Styles/Controls/HorizontalScrollContainer.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/HorizontalScrollContainer.xaml rename to dev/DevWinUI/Themes/Styles/Controls/HorizontalScrollContainer.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/ImageEx.xaml b/dev/DevWinUI/Themes/Styles/Controls/ImageEx.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/ImageEx.xaml rename to dev/DevWinUI/Themes/Styles/Controls/ImageEx.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/ImageFrame.xaml b/dev/DevWinUI/Themes/Styles/Controls/ImageFrame.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/ImageFrame.xaml rename to dev/DevWinUI/Themes/Styles/Controls/ImageFrame.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/IndeterminateProgressBar.xaml b/dev/DevWinUI/Themes/Styles/Controls/IndeterminateProgressBar.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/IndeterminateProgressBar.xaml rename to dev/DevWinUI/Themes/Styles/Controls/IndeterminateProgressBar.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/InfoCard.xaml b/dev/DevWinUI/Themes/Styles/Controls/InfoCard.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/InfoCard.xaml rename to dev/DevWinUI/Themes/Styles/Controls/InfoCard.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/InlineAutoCompleteTextBox.xaml b/dev/DevWinUI/Themes/Styles/Controls/InlineAutoCompleteTextBox.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/InlineAutoCompleteTextBox.xaml rename to dev/DevWinUI/Themes/Styles/Controls/InlineAutoCompleteTextBox.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/IsEnabledTextBlock.xaml b/dev/DevWinUI/Themes/Styles/Controls/IsEnabledTextBlock.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/IsEnabledTextBlock.xaml rename to dev/DevWinUI/Themes/Styles/Controls/IsEnabledTextBlock.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/KeyVisual.xaml b/dev/DevWinUI/Themes/Styles/Controls/KeyVisual.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/KeyVisual.xaml rename to dev/DevWinUI/Themes/Styles/Controls/KeyVisual.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/LayoutTransformer.xaml b/dev/DevWinUI/Themes/Styles/Controls/LayoutTransformer.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/LayoutTransformer.xaml rename to dev/DevWinUI/Themes/Styles/Controls/LayoutTransformer.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/LoadingIndicator.xaml b/dev/DevWinUI/Themes/Styles/Controls/LoadingIndicator.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/LoadingIndicator.xaml rename to dev/DevWinUI/Themes/Styles/Controls/LoadingIndicator.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/LongShadowTextBlock.xaml b/dev/DevWinUI/Themes/Styles/Controls/LongShadowTextBlock.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/LongShadowTextBlock.xaml rename to dev/DevWinUI/Themes/Styles/Controls/LongShadowTextBlock.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/LoopingList.xaml b/dev/DevWinUI/Themes/Styles/Controls/LoopingList.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/LoopingList.xaml rename to dev/DevWinUI/Themes/Styles/Controls/LoopingList.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Magnifier.xaml b/dev/DevWinUI/Themes/Styles/Controls/Magnifier.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Magnifier.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Magnifier.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/MessageBoxHeader.xaml b/dev/DevWinUI/Themes/Styles/Controls/MessageBoxHeader.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/MessageBoxHeader.xaml rename to dev/DevWinUI/Themes/Styles/Controls/MessageBoxHeader.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/OptionsPageControl.xaml b/dev/DevWinUI/Themes/Styles/Controls/OptionsPageControl.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/OptionsPageControl.xaml rename to dev/DevWinUI/Themes/Styles/Controls/OptionsPageControl.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/OutOfBoxPage.xaml b/dev/DevWinUI/Themes/Styles/Controls/OutOfBoxPage.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/OutOfBoxPage.xaml rename to dev/DevWinUI/Themes/Styles/Controls/OutOfBoxPage.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/OverviewPageHeader.xaml b/dev/DevWinUI/Themes/Styles/Controls/OverviewPageHeader.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/OverviewPageHeader.xaml rename to dev/DevWinUI/Themes/Styles/Controls/OverviewPageHeader.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Particle.xaml b/dev/DevWinUI/Themes/Styles/Controls/Particle.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Particle.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Particle.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/PerspectiveHost.xaml b/dev/DevWinUI/Themes/Styles/Controls/PerspectiveHost.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/PerspectiveHost.xaml rename to dev/DevWinUI/Themes/Styles/Controls/PerspectiveHost.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/PerspectiveZoom.xaml b/dev/DevWinUI/Themes/Styles/Controls/PerspectiveZoom.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/PerspectiveZoom.xaml rename to dev/DevWinUI/Themes/Styles/Controls/PerspectiveZoom.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/PinBox.xaml b/dev/DevWinUI/Themes/Styles/Controls/PinBox.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/PinBox.xaml rename to dev/DevWinUI/Themes/Styles/Controls/PinBox.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/ProfileControl.xaml b/dev/DevWinUI/Themes/Styles/Controls/ProfileControl.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/ProfileControl.xaml rename to dev/DevWinUI/Themes/Styles/Controls/ProfileControl.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/ProgressButton.xaml b/dev/DevWinUI/Themes/Styles/Controls/ProgressButton.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/ProgressButton.xaml rename to dev/DevWinUI/Themes/Styles/Controls/ProgressButton.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/ProgressRing.xaml b/dev/DevWinUI/Themes/Styles/Controls/ProgressRing.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/ProgressRing.xaml rename to dev/DevWinUI/Themes/Styles/Controls/ProgressRing.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/RedirectVisualView.xaml b/dev/DevWinUI/Themes/Styles/Controls/RedirectVisualView.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/RedirectVisualView.xaml rename to dev/DevWinUI/Themes/Styles/Controls/RedirectVisualView.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/RichButton.xaml b/dev/DevWinUI/Themes/Styles/Controls/RichButton.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/RichButton.xaml rename to dev/DevWinUI/Themes/Styles/Controls/RichButton.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/SegmentedSlider.xaml b/dev/DevWinUI/Themes/Styles/Controls/SegmentedSlider.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/SegmentedSlider.xaml rename to dev/DevWinUI/Themes/Styles/Controls/SegmentedSlider.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/SelectableTextBlock.xaml b/dev/DevWinUI/Themes/Styles/Controls/SelectableTextBlock.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/SelectableTextBlock.xaml rename to dev/DevWinUI/Themes/Styles/Controls/SelectableTextBlock.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/SelectorBarSegmented.xaml b/dev/DevWinUI/Themes/Styles/Controls/SelectorBarSegmented.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/SelectorBarSegmented.xaml rename to dev/DevWinUI/Themes/Styles/Controls/SelectorBarSegmented.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/SettingsGroup.xaml b/dev/DevWinUI/Themes/Styles/Controls/SettingsGroup.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/SettingsGroup.xaml rename to dev/DevWinUI/Themes/Styles/Controls/SettingsGroup.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Shield.xaml b/dev/DevWinUI/Themes/Styles/Controls/Shield.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Shield.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Shield.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Shimmer.xaml b/dev/DevWinUI/Themes/Styles/Controls/Shimmer.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Shimmer.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Shimmer.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/ShimmerTextBlock.xaml b/dev/DevWinUI/Themes/Styles/Controls/ShimmerTextBlock.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/ShimmerTextBlock.xaml rename to dev/DevWinUI/Themes/Styles/Controls/ShimmerTextBlock.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Shortcut.xaml b/dev/DevWinUI/Themes/Styles/Controls/Shortcut.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Shortcut.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Shortcut.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/ShyHeader.xaml b/dev/DevWinUI/Themes/Styles/Controls/ShyHeader.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/ShyHeader.xaml rename to dev/DevWinUI/Themes/Styles/Controls/ShyHeader.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/SimpleSettingsGroup.xaml b/dev/DevWinUI/Themes/Styles/Controls/SimpleSettingsGroup.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/SimpleSettingsGroup.xaml rename to dev/DevWinUI/Themes/Styles/Controls/SimpleSettingsGroup.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/SnowFlakeEffect.xaml b/dev/DevWinUI/Themes/Styles/Controls/SnowFlakeEffect.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/SnowFlakeEffect.xaml rename to dev/DevWinUI/Themes/Styles/Controls/SnowFlakeEffect.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/SpectrumAnalyzer.xaml b/dev/DevWinUI/Themes/Styles/Controls/SpectrumAnalyzer.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/SpectrumAnalyzer.xaml rename to dev/DevWinUI/Themes/Styles/Controls/SpectrumAnalyzer.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/SpectrumVisualizer.xaml b/dev/DevWinUI/Themes/Styles/Controls/SpectrumVisualizer.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/SpectrumVisualizer.xaml rename to dev/DevWinUI/Themes/Styles/Controls/SpectrumVisualizer.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/SpeedGraph.xaml b/dev/DevWinUI/Themes/Styles/Controls/SpeedGraph.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/SpeedGraph.xaml rename to dev/DevWinUI/Themes/Styles/Controls/SpeedGraph.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/SplitCircle.xaml b/dev/DevWinUI/Themes/Styles/Controls/SplitCircle.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/SplitCircle.xaml rename to dev/DevWinUI/Themes/Styles/Controls/SplitCircle.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Spoiler.xaml b/dev/DevWinUI/Themes/Styles/Controls/Spoiler.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Spoiler.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Spoiler.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Stars.xaml b/dev/DevWinUI/Themes/Styles/Controls/Stars.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Stars.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Stars.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/StepBar.xaml b/dev/DevWinUI/Themes/Styles/Controls/StepBar.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/StepBar.xaml rename to dev/DevWinUI/Themes/Styles/Controls/StepBar.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/StorageBar.xaml b/dev/DevWinUI/Themes/Styles/Controls/StorageBar.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/StorageBar.xaml rename to dev/DevWinUI/Themes/Styles/Controls/StorageBar.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/StorageRing.xaml b/dev/DevWinUI/Themes/Styles/Controls/StorageRing.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/StorageRing.xaml rename to dev/DevWinUI/Themes/Styles/Controls/StorageRing.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/StoreCarousel.xaml b/dev/DevWinUI/Themes/Styles/Controls/StoreCarousel.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/StoreCarousel.xaml rename to dev/DevWinUI/Themes/Styles/Controls/StoreCarousel.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/TextBlockStrokeView.xaml b/dev/DevWinUI/Themes/Styles/Controls/TextBlockStrokeView.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/TextBlockStrokeView.xaml rename to dev/DevWinUI/Themes/Styles/Controls/TextBlockStrokeView.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/TextBox.xaml b/dev/DevWinUI/Themes/Styles/Controls/TextBox.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/TextBox.xaml rename to dev/DevWinUI/Themes/Styles/Controls/TextBox.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/TextGlitchEffect.xaml b/dev/DevWinUI/Themes/Styles/Controls/TextGlitchEffect.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/TextGlitchEffect.xaml rename to dev/DevWinUI/Themes/Styles/Controls/TextGlitchEffect.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/TextMorphEffect.xaml b/dev/DevWinUI/Themes/Styles/Controls/TextMorphEffect.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/TextMorphEffect.xaml rename to dev/DevWinUI/Themes/Styles/Controls/TextMorphEffect.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Timeline.xaml b/dev/DevWinUI/Themes/Styles/Controls/Timeline.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Timeline.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Timeline.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/TransitioningContentControl.xaml b/dev/DevWinUI/Themes/Styles/Controls/TransitioningContentControl.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/TransitioningContentControl.xaml rename to dev/DevWinUI/Themes/Styles/Controls/TransitioningContentControl.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Validation.xaml b/dev/DevWinUI/Themes/Styles/Controls/Validation.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Validation.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Validation.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/WanderingParticles.xaml b/dev/DevWinUI/Themes/Styles/Controls/WanderingParticles.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/WanderingParticles.xaml rename to dev/DevWinUI/Themes/Styles/Controls/WanderingParticles.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/Watermark.xaml b/dev/DevWinUI/Themes/Styles/Controls/Watermark.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/Watermark.xaml rename to dev/DevWinUI/Themes/Styles/Controls/Watermark.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/WaveProgressBar.xaml b/dev/DevWinUI/Themes/Styles/Controls/WaveProgressBar.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/WaveProgressBar.xaml rename to dev/DevWinUI/Themes/Styles/Controls/WaveProgressBar.xaml diff --git a/dev/DevWinUI.Controls/Themes/Styles/Controls/WaveformTimeline.xaml b/dev/DevWinUI/Themes/Styles/Controls/WaveformTimeline.xaml similarity index 100% rename from dev/DevWinUI.Controls/Themes/Styles/Controls/WaveformTimeline.xaml rename to dev/DevWinUI/Themes/Styles/Controls/WaveformTimeline.xaml diff --git a/dev/DevWinUI/build/DevWinUI.targets b/dev/DevWinUI/build/DevWinUI.targets new file mode 100644 index 00000000..2c5910f5 --- /dev/null +++ b/dev/DevWinUI/build/DevWinUI.targets @@ -0,0 +1,9 @@ +ο»Ώ + + DevWinUI.Controls + + + + +