From 4c6210cc69f7c52f0c7ec5bc76cf79a255dc5ce3 Mon Sep 17 00:00:00 2001 From: Mahdi Hosseini Date: Tue, 7 Apr 2026 21:32:09 +0330 Subject: [PATCH 01/16] Update 1-bug_report.yaml --- .github/ISSUE_TEMPLATE/1-bug_report.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 From 896753c6953c951de1d60c9f490d232aa334f204 Mon Sep 17 00:00:00 2001 From: Mahdi Hosseini Date: Tue, 7 Apr 2026 21:32:15 +0330 Subject: [PATCH 02/16] Update CONTRIBUTING.md --- CONTRIBUTING.md | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) 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 From 425026a06d06450d7a7f04914c8f47f889b7e23f Mon Sep 17 00:00:00 2001 From: Mahdi Hosseini Date: Tue, 7 Apr 2026 21:32:20 +0330 Subject: [PATCH 03/16] Update README.md --- README.md | 46 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 734cc77f..291e75b4 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,12 +160,12 @@ 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? ⚡ - ✨ RichButton @@ -300,12 +332,12 @@ Install-Package DevWinUI - #### 💻 Installation | Nuget ``` -Install-Package DevWinUI.Controls +Install-Package DevWinUI ``` After installing, add the following resource to app.xaml ```xml - + ``` --- From 57efdf6784b33a0fba9a984d2c13fb9fd6959d8a Mon Sep 17 00:00:00 2001 From: Mahdi Hosseini Date: Tue, 7 Apr 2026 21:32:24 +0330 Subject: [PATCH 04/16] Update README.md --- dev/DevWinUI/README.md | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dev/DevWinUI/README.md b/dev/DevWinUI/README.md index 1cfb949e..50c198e8 100644 --- a/dev/DevWinUI/README.md +++ b/dev/DevWinUI/README.md @@ -15,27 +15,50 @@ |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.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 +# DevWinUI.Base -### 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.Base, Everything you need to develop an application is gathered in one place. ## Install ``` -Install-Package DevWinUI +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/devWinUI/) +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) From 79c27317007c809722bd713dcd380b1b6bc0c035 Mon Sep 17 00:00:00 2001 From: Mahdi Hosseini Date: Tue, 7 Apr 2026 21:32:35 +0330 Subject: [PATCH 05/16] Update README.md --- dev/DevWinUI.Controls/README.md | 42 ++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/dev/DevWinUI.Controls/README.md b/dev/DevWinUI.Controls/README.md index 30d26372..3b5e2fe3 100644 --- a/dev/DevWinUI.Controls/README.md +++ b/dev/DevWinUI.Controls/README.md @@ -15,34 +15,64 @@ |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/)| +|[![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/)| --- -# DevWinUI.Controls +# DevWinUI -### Experience WinUI 3 quickly and easily with the help of DevWinUI.Controls, 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.Controls +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/DevWinUIControls/) +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) From 845023ca3b28302be4667f39f55512e75317c94a Mon Sep 17 00:00:00 2001 From: Mahdi Hosseini Date: Tue, 7 Apr 2026 23:44:50 +0330 Subject: [PATCH 06/16] Rename Projects --- DevWinUI.slnx | 6 +++--- Directory.Build.props | 4 ++-- dev/DevWinUI.Controls/Controls/Native/Growl/Growl.cs | 2 +- .../Controls/Native/ImageEx/ImageEx.cs | 2 +- .../{DevWinUI.Controls.csproj => DevWinUI.csproj} | 12 ++++++------ dev/DevWinUI.Controls/Themes/DevWinUI.cs | 2 +- dev/DevWinUI.Gallery/App.xaml | 2 +- .../Features/Styles/Styles_xaml.txt | 2 +- dev/DevWinUI.Gallery/DevWinUI.Gallery.csproj | 4 ++-- dev/DevWinUI.Gallery/Examples/ControlExample.xaml.cs | 4 ++-- .../Views/Pages/Features/StylesPage.xaml | 4 ++-- .../Views/Pages/LandingsPage/HomeLandingsPage.xaml | 4 ++-- .../{DevWinUI.csproj => DevWinUI.Base.csproj} | 6 +++--- 13 files changed, 27 insertions(+), 27 deletions(-) rename dev/DevWinUI.Controls/{DevWinUI.Controls.csproj => DevWinUI.csproj} (80%) rename dev/DevWinUI/{DevWinUI.csproj => DevWinUI.Base.csproj} (77%) diff --git a/DevWinUI.slnx b/DevWinUI.slnx index 58724a73..726d49b6 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..cc02fa8a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,14 +10,14 @@ 9 - 9 + 9 9 9 9 4 - 4 + 4 0 0 4 diff --git a/dev/DevWinUI.Controls/Controls/Native/Growl/Growl.cs b/dev/DevWinUI.Controls/Controls/Native/Growl/Growl.cs index e7f55f0c..631dc22e 100644 --- a/dev/DevWinUI.Controls/Controls/Native/Growl/Growl.cs +++ b/dev/DevWinUI.Controls/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/ImageEx/ImageEx.cs b/dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageEx.cs index 30fb7fcd..c2fba824 100644 --- a/dev/DevWinUI.Controls/Controls/Native/ImageEx/ImageEx.cs +++ b/dev/DevWinUI.Controls/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/DevWinUI.Controls.csproj b/dev/DevWinUI.Controls/DevWinUI.csproj similarity index 80% rename from dev/DevWinUI.Controls/DevWinUI.Controls.csproj rename to dev/DevWinUI.Controls/DevWinUI.csproj index 2e1d9a49..edbce325 100644 --- a/dev/DevWinUI.Controls/DevWinUI.Controls.csproj +++ b/dev/DevWinUI.Controls/DevWinUI.csproj @@ -1,10 +1,10 @@  - $(LibraryMajorVersion).$(DevWinUI_Controls_MinorVersion).$(DevWinUI_Controls_PatchVersion)$(PreviewBuildSuffix) - $(BaseNamespace).Controls - $(BaseNamespace).Controls + $(LibraryMajorVersion).$(DevWinUI_MinorVersion).$(DevWinUI_PatchVersion)$(PreviewBuildSuffix) + $(BaseNamespace) + $(BaseNamespace) - 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. + 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 @@ -44,13 +44,13 @@ - + - lib\$(CleanTargetFramework)\DevWinUI.Controls\Themes\ + lib\$(CleanTargetFramework)\DevWinUI\Themes\ diff --git a/dev/DevWinUI.Controls/Themes/DevWinUI.cs b/dev/DevWinUI.Controls/Themes/DevWinUI.cs index a17fda0d..3d453008 100644 --- a/dev/DevWinUI.Controls/Themes/DevWinUI.cs +++ b/dev/DevWinUI.Controls/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.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/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..c153107a 100644 --- a/dev/DevWinUI.Gallery/DevWinUI.Gallery.csproj +++ b/dev/DevWinUI.Gallery/DevWinUI.Gallery.csproj @@ -55,8 +55,8 @@ - - + + 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/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/DevWinUI.csproj b/dev/DevWinUI/DevWinUI.Base.csproj similarity index 77% rename from dev/DevWinUI/DevWinUI.csproj rename to dev/DevWinUI/DevWinUI.Base.csproj index ba095161..9ef209dd 100644 --- a/dev/DevWinUI/DevWinUI.csproj +++ b/dev/DevWinUI/DevWinUI.Base.csproj @@ -1,8 +1,8 @@  - $(LibraryMajorVersion).$(DevWinUI_MinorVersion).$(DevWinUI_PatchVersion)$(PreviewBuildSuffix) - $(BaseNamespace) - $(BaseNamespace) + $(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 From 3d326ac7429b373dcbb78b21b30750631322653b Mon Sep 17 00:00:00 2001 From: Mahdi Hosseini Date: Wed, 8 Apr 2026 11:28:51 +0330 Subject: [PATCH 07/16] Fix Crash --- dev/DevWinUI.Controls/Themes/Generic.xaml | 202 +++++++++--------- .../{Colors.xaml => ThemeResources.xaml} | 17 +- .../Themes/ThemeResources.xaml | 5 +- 3 files changed, 114 insertions(+), 110 deletions(-) rename dev/DevWinUI.Controls/Themes/Styles/CommonStyles/{Colors.xaml => ThemeResources.xaml} (90%) diff --git a/dev/DevWinUI.Controls/Themes/Generic.xaml b/dev/DevWinUI.Controls/Themes/Generic.xaml index 4daa41ff..e4e8fa54 100644 --- a/dev/DevWinUI.Controls/Themes/Generic.xaml +++ b/dev/DevWinUI.Controls/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,6 +316,35 @@ Themes\Styles\Controls\WaveProgressBar.xaml 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -574,35 +574,6 @@ Themes\Styles\Controls\WaveProgressBar.xaml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -639,6 +610,35 @@ Themes\Styles\Controls\WaveProgressBar.xaml 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -865,23 +865,6 @@ Themes\Styles\Controls\WaveProgressBar.xaml - - - - - - - - - - - - - - - - - @@ -918,6 +901,23 @@ Themes\Styles\Controls\WaveProgressBar.xaml 1 + + + + + + + + + + + + + + + + + Transparent @@ -1414,31 +1414,6 @@ Themes\Styles\Controls\WaveProgressBar.xaml - - - - - - - - - - - - - - - - - - - - - - - - - 240 @@ -1537,6 +1512,31 @@ Themes\Styles\Controls\WaveProgressBar.xaml 1 12 12 + + + + + + + + + + + + + + + + + + + + + + + + + + 0,0,0,4 + 0,5,32,0 + Normal 0,0,0,4 - 0,5,32,0 Normal