Z-bit-Systems-LLC · bytedreamer · Feb 22, 2026 · Jan 24, 2026 · Feb 8, 2026 · Feb 8, 2026
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,4 @@ BundleArtifacts/
 /src/UI/WinUI (Package)/WinUI (Package).assets.cache
 
 .claude
+results.sarif
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src/UI/UsbSerialForAndroid"]
 	path = src/UI/UsbSerialForAndroid
 	url = https://github.com/bytedreamer/UsbSerialForAndroid
+[submodule "lib/Guidelines"]
+	path = lib/Guidelines
+	url = https://github.com/Z-bit-Systems-LLC/Guidelines.git
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -121,14 +121,54 @@ $sarif.runs[0].results | Where-Object { $_.level -eq 'warning' } | ForEach-Objec
 - Use meaningful variable names that reflect their purpose
 - Keep methods focused and small with a single responsibility
 
+## Shared UI Components
+
+This project uses the [Guidelines](https://github.com/Z-bit-Systems-LLC/Guidelines) shared WPF library for design system components.
+
+### Working with the Guidelines Submodule
+
+**Initial clone (new developers):**
+```bash
+git clone --recursive https://github.com/Z-bit-Systems-LLC/OSDP-Bench.git
+```
+
+**Update Guidelines to latest version:**
+```bash
+git submodule update --remote lib/Guidelines
+git add lib/Guidelines
+git commit -m "Update Guidelines submodule to latest version"
+```
+
+**Making changes to Guidelines:**
+If you need to modify the shared library:
+1. Make changes in `lib/Guidelines/`
+2. Test changes in OSDP-Bench (local project reference)
+3. Commit and push in Guidelines repository
+4. Update submodule reference in OSDP-Bench
+
+### Design System Reference
+See `lib/Guidelines/src/ZBitSystems.Wpf.UI/Styles/StyleGuide.md` for:
+- Available styles and design tokens
+- Standard components and layouts
+- Theme-aware semantic colors
+- Usage examples and best practices
+
 ## UI Style Guidelines
 - **Always use standard styles** - Apply predefined styles from the design system instead of inline properties
 - **Use design tokens for spacing** - Reference `{StaticResource Margin.Card}` instead of hardcoding values
 - **Apply theme-aware semantic colors** - Use `{DynamicResource SemanticSuccessBrush}` for automatic light/dark theme support
-- **Follow the style hierarchy** - Check ComponentStyles.xaml and LayoutTemplates.xaml before creating custom styles
+- **Follow the style hierarchy** - Check the shared design system (Guidelines library) and LayoutTemplates.xaml before creating custom styles
 - **Update existing code** - When modifying files, replace inline styling with standard styles
 - **Create reusable patterns** - If you find yourself repeating XAML structures, consider adding a new style or template
 - **Use WrapPanel for responsive layouts** - When controls should be horizontal on wide screens but wrap to vertical on narrow screens, use WrapPanel instead of fixed Grid layouts
+- **Avoid Grid row collisions in responsive layouts** - When using code-behind `SizeChanged` handlers to reposition elements between Grid rows, ensure moved elements don't share a row with existing static content. Always verify that the target row is either empty or the static content is also relocated
 - **Prefer dynamic resources for colors** - Use `{DynamicResource}` instead of `{StaticResource}` for colors to ensure theme compatibility
 
-For detailed UI styling guidelines and examples, see: `src/UI/Windows/Styles/StyleGuide.md`
+### Documentation References
+
+**Shared Design System (Guidelines Library):**
+- `lib/Guidelines/src/ZBitSystems.Wpf.UI/Styles/StyleGuide.md` - Complete style guide with design tokens, semantic colors, and component styles
+
+**OSDP-Specific Styling:**
+- `src/UI/Windows/Styles/LayoutTemplates.xaml` - Application-specific layout templates (connection status, page headers with activity indicators)
+- `src/UI/Windows/Styles/ExampleImplementation.md` - OSDP-specific implementation examples and migration guide
diff --git a/OSDP-Bench.sln b/OSDP-Bench.sln
@@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ci", "ci", "{5D426D86-43BB-
 		ci\azure-pipelines.yml = ci\azure-pipelines.yml
 		ci\build.yml = ci\build.yml
 		ci\package.yml = ci\package.yml
+		ci\ui-tests.yml = ci\ui-tests.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Windows", "src\UI\Windows\Windows.csproj", "{DD8BD355-FB29-42BD-AADD-C0E391EE1825}"
@@ -30,6 +31,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{ED2EC291-3
 		CLAUDE.md = CLAUDE.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{3A8DF596-E814-FECC-DD4B-D8EF8AAC1A0D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Guidelines", "Guidelines", "{704960A3-6C7D-5CB1-1F34-76459FC7CBAE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DDC3EA95-9E27-4E54-C9B7-EF99E65DDDE0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZBitSystems.Wpf.UI", "lib\Guidelines\src\ZBitSystems.Wpf.UI\ZBitSystems.Wpf.UI.csproj", "{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0C88DD14-F956-CE84-757C-A364CCF449FC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI.Tests", "test\UI.Tests\UI.Tests.csproj", "{D8F38927-04C5-4FB4-B7CC-50E201818F89}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -104,13 +117,58 @@ Global
 		{79C7EB0F-A75B-4DA7-BDDF-12C9714B48DF}.Release|x64.Build.0 = Release|x64
 		{79C7EB0F-A75B-4DA7-BDDF-12C9714B48DF}.Release|x86.ActiveCfg = Release|Any CPU
 		{79C7EB0F-A75B-4DA7-BDDF-12C9714B48DF}.Release|x86.Build.0 = Release|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Debug|x64.Build.0 = Debug|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Debug|x86.Build.0 = Debug|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Release|ARM.Build.0 = Release|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Release|ARM64.Build.0 = Release|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Release|x64.ActiveCfg = Release|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Release|x64.Build.0 = Release|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Release|x86.ActiveCfg = Release|Any CPU
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E}.Release|x86.Build.0 = Release|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Debug|x64.Build.0 = Debug|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Debug|x86.Build.0 = Debug|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Release|ARM.Build.0 = Release|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Release|ARM64.Build.0 = Release|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Release|x64.ActiveCfg = Release|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Release|x64.Build.0 = Release|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Release|x86.ActiveCfg = Release|Any CPU
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{5D426D86-43BB-4D6D-A6BF-0ACC65A19C92} = {8FB5794C-299E-4B9E-8D0D-6BFC695DA91B}
 		{DD8BD355-FB29-42BD-AADD-C0E391EE1825} = {6AF5FFEF-AFBA-4BB8-A14F-FDE4AEEC19AB}
+		{704960A3-6C7D-5CB1-1F34-76459FC7CBAE} = {3A8DF596-E814-FECC-DD4B-D8EF8AAC1A0D}
+		{DDC3EA95-9E27-4E54-C9B7-EF99E65DDDE0} = {704960A3-6C7D-5CB1-1F34-76459FC7CBAE}
+		{B5DAB0A8-CF87-4799-8BAE-08CE2A33E97E} = {DDC3EA95-9E27-4E54-C9B7-EF99E65DDDE0}
+		{0F31AAB4-B6FB-4DF1-B6BA-2AF58FADB005} = {0C88DD14-F956-CE84-757C-A364CCF449FC}
+		{D8F38927-04C5-4FB4-B7CC-50E201818F89} = {0C88DD14-F956-CE84-757C-A364CCF449FC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {09928BD4-7D4E-4C9A-86DA-49BC36820716}

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A professional tool for configuring and troubleshooting OSDP devices.
 
-[![.NET](https://img.shields.io/badge/.NET-8.0-blue)](https://dotnet.microsoft.com/)
+[![.NET](https://img.shields.io/badge/.NET-10.0-blue)](https://dotnet.microsoft.com/)
 [![License](https://img.shields.io/badge/License-Eclipse%202.0-green.svg)](LICENSE)
 
 ## About
@@ -21,7 +21,7 @@ Core functionality is under an open source license to help increase the adoption
 - **Packet Tracing** - View detailed OSDP communication packets
 - **Capture Packet Export** - Export captured packets for offline analysis and sharing
 - **Multi-language Support** - Available in multiple languages
-- **Cross-platform Core** - Core logic library built on .NET 8.0 can be reused across different platforms
+- **Cross-platform Core** - Core logic library built on .NET 10.0 can be reused across different platforms
 
 ## Get OSDP Bench
 
@@ -36,15 +36,15 @@ OSDP Bench is available for purchase on multiple platforms:
 
 ### Prerequisites
 
-- .NET 8.0 SDK or later
-- Windows 10/11 (for WinUI version)
+- .NET 10.0 SDK or later
+- Windows 10/11 (for Windows version)
 - Serial port access for device communication
 
 ### Building from Source
 
-1. Clone the repository:
+1. Clone the repository with submodules:
    ```bash
-   git clone https://github.com/bytedreamer/OSDP-Bench.git
+   git clone --recursive https://github.com/bytedreamer/OSDP-Bench.git
    cd OSDP-Bench
    ```
 
@@ -68,17 +68,14 @@ OSDP Bench is available for purchase on multiple platforms:
 ## Documentation
 
 ### Project Documentation
-- **[Developer Guidelines](docs/CLAUDE.md)** - Development guidelines and build commands
-- **[UI Style Guide](src/UI/Windows/Styles/StyleGuide.md)** - Comprehensive design system and styling guidelines
+- **[Developer Guidelines](CLAUDE.md)** - Development guidelines and build commands
+
+### Shared Libraries
+- **[Guidelines](https://github.com/Z-bit-Systems-LLC/Guidelines)** - Shared WPF components and CI/CD documentation
 
 ### Architecture Plans
 - **[Connection Plugin Architecture](docs/CONNECTION_PLUGIN_ARCHITECTURE.md)** - Plan for implementing pluggable connection types (Serial, Bluetooth, Network)
 
-### Localization
-- **[Localization Plan](docs/LOCALIZATION_PLAN.md)** - Multi-language support implementation
-- **[Language Switching](docs/LANGUAGE_SWITCHING_DEMO.md)** - Language switching functionality
-- **[Language Fixes](docs/LANGUAGE_SWITCHING_FIX.md)** - Language switching issue fixes
-
 ## Contributing
 
 We welcome contributions! Please follow these guidelines:

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
@@ -8,6 +8,14 @@ trigger:
 
 pr: none
 
+schedules:
+- cron: '0 6 * * *'
+  displayName: 'Daily full UI test run'
+  branches:
+    include:
+    - main
+  always: true
+
 pool:
   vmImage: 'windows-latest'
 
@@ -22,8 +30,34 @@ jobs:
       vmImage: 'windows-latest'
     steps:
       - checkout: self
+        submodules: true
       - template: build.yml
 
+  - job: ui_tests
+    displayName: 'UI Smoke Tests'
+    pool:
+      vmImage: 'windows-latest'
+    dependsOn:
+      build
+    continueOnError: true
+    steps:
+      - checkout: self
+        submodules: true
+      - template: ui-tests-smoke.yml
+
+  - job: ui_tests_full
+    displayName: 'UI Tests (Full)'
+    condition: or(eq(variables['Build.Reason'], 'Schedule'), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
+    pool:
+      vmImage: 'windows-latest'
+    dependsOn:
+      build
+    continueOnError: true
+    steps:
+      - checkout: self
+        submodules: true
+      - template: ui-tests.yml
+
   - job: package
     displayName: 'Package and Publish'
     condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
@@ -33,6 +67,7 @@ jobs:
       build
     steps:
       - checkout: self
+        submodules: true
         persistCredentials: true
         clean: true
       - template: package.yml
diff --git a/ci/build.yml b/ci/build.yml
@@ -16,7 +16,7 @@ steps:
     displayName: 'dotnet test'
     inputs:
       command: 'test'
-      projects: 'test/*Tests/*.csproj'
+      projects: 'test/Core.Tests/Core.Tests.csproj'
       arguments: '--configuration $(buildConfiguration) --collect:"XPlat Code Coverage"'
 
   - task: reportgenerator@5

diff --git a/ci/ui-tests-smoke.yml b/ci/ui-tests-smoke.yml
@@ -0,0 +1,20 @@
+steps:
+  - task: UseDotNet@2
+    displayName: 'Install .NET SDK'
+    inputs:
+      packageType: 'sdk'
+      version: '10.x'
+
+  - task: DotNetCoreCLI@2
+    displayName: 'dotnet build UI.Tests'
+    inputs:
+      command: 'build'
+      projects: 'test/UI.Tests/UI.Tests.csproj'
+      arguments: '--configuration $(buildConfiguration)'
+
+  - task: DotNetCoreCLI@2
+    displayName: 'dotnet test UI.Tests (Smoke)'
+    inputs:
+      command: 'test'
+      projects: 'test/UI.Tests/UI.Tests.csproj'
+      arguments: '--configuration $(buildConfiguration) --filter TestCategory=Smoke'
diff --git a/ci/ui-tests.yml b/ci/ui-tests.yml
@@ -0,0 +1,20 @@
+steps:
+  - task: UseDotNet@2
+    displayName: 'Install .NET SDK'
+    inputs:
+      packageType: 'sdk'
+      version: '10.x'
+
+  - task: DotNetCoreCLI@2
+    displayName: 'dotnet build UI.Tests'
+    inputs:
+      command: 'build'
+      projects: 'test/UI.Tests/UI.Tests.csproj'
+      arguments: '--configuration $(buildConfiguration)'
+
+  - task: DotNetCoreCLI@2
+    displayName: 'dotnet test UI.Tests'
+    inputs:
+      command: 'test'
+      projects: 'test/UI.Tests/UI.Tests.csproj'
+      arguments: '--configuration $(buildConfiguration)'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,3 +38,4 @@ BundleArtifacts/
		/src/UI/WinUI (Package)/WinUI (Package).assets.cache

		.claude
		results.sarif