Merge may branch 26505

Directory.Build.props

@@ -23,10 +23,10 @@
     <Using Include="System.Threading"/>
     <Using Include="System.Runtime.InteropServices.ComTypes.FILETIME" Alias="FILETIME"/>
   </ItemGroup>
-  <ItemGroup>
+  <!-- <ItemGroup>
     <PackageReference Include="Vanara.CodeGen">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-  </ItemGroup>
+  </ItemGroup> -->
 </Project>

Directory.Packages.props

@@ -8,23 +8,27 @@
   <ItemGroup>
     <PackageVersion Include="AvalonEdit" Version="6.3.1.120" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.1.0" />
     <PackageVersion Include="ConEmu.Control.WinForms" Version="1.21.9.5" />
     <PackageVersion Include="DirectShowLib.Standard" Version="2.1.0" />
     <PackageVersion Include="Markdig" Version="0.44.0" />
     <PackageVersion Include="Microsoft.Direct3D.D3D12" Version="1.619.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705" />
     <PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.26100.7705" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.260209005" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.250108004" />
+    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.Data.OleDb" Version="10.0.4" />
     <PackageVersion Include="System.Drawing.Common" Version="10.0.4" />
     <PackageVersion Include="System.Management" Version="10.0.4" />
     <PackageVersion Include="Vanara.BITS" Version="$(VanaraVer)" />
     <PackageVersion Include="Vanara.CodeGen" Version="$(VanaraVer)" />
-    <PackageVersion Include="Vanara.Core" Version="$(VanaraVer)" />
+    <PackageVersion Include="Vanara.Core" Version="4.2.1" />
     <PackageVersion Include="Vanara.DirectoryServices" Version="$(VanaraVer)" />
     <PackageVersion Include="Vanara.Library" Version="$(VanaraVer)" />
     <PackageVersion Include="Vanara.PInvoke.AclUI" Version="$(VanaraVer)" />
@@ -110,5 +114,6 @@
     <PackageVersion Include="Vanara.Windows.Forms" Version="$(VanaraVer)" />
     <PackageVersion Include="Vanara.Windows.Shell" Version="$(VanaraVer)" />
     <PackageVersion Include="Vanara.Windows.Shell.Common" Version="$(VanaraVer)" />
+    <PackageVersion Include="WinUIEx" Version="2.3.2" />
   </ItemGroup>
 </Project>

Vanara-Jnana/.github/workflows/build.yml

@@ -0,0 +1,30 @@
+name: Build WinUI 3 App
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+
+    - name: Restore dependencies
+      run: dotnet restore
+
+    - name: Build solution
+      run: dotnet build --configuration Release --no-restore
+
+    - name: Publish (optional for unpackaged)
+      if: ${{ false }} # set to true if you want publish output
+      run: dotnet publish -c Release

Vanara-Jnana/App.xaml

@@ -0,0 +1,78 @@
+<Application
+    x:Class="ClassicSamplesBrowser.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:system="using:System"   
+    xmlns:ui="using:Microsoft.UI.Xaml"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Application.Resources>
+        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"/>
+    </Application.Resources>
+    <!--<ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources/>
+                <ResourceDictionary Source="Styles/NavigationView/NavigationView.xaml"/>
+                <ResourceDictionary Source="Styles/NavigationView/NavigationViewItem.xaml"/>
+                <ResourceDictionary Source="Styles/NavigationView/NavigationViewItemPresenter.xaml"/>
+                <ResourceDictionary Source="Styles/NavigationView/NavigationViewItemSeparator.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <CornerRadius x:Key="ControlCornerRadius">4</CornerRadius>
+            <SolidColorBrush x:Key="MicaBaseAltFillColorDefaultBrush" Color="{ThemeResource SystemBaseLowColor}" />
+            <SolidColorBrush x:Key="MicaBaseFillColorDefaultBrush" Color="{ThemeResource SystemBaseMediumColor}" />
+            <SolidColorBrush x:Key="MicaBaseFillColorSecondaryBrush" Color="{ThemeResource SystemBaseHighColor}" />
+            <SolidColorBrush x:Key="TabViewButtonBackground" Color="{ThemeResource SystemBaseLowColor}" />
+            <SolidColorBrush x:Key="TabViewButtonForeground" Color="{ThemeResource SystemBaseMediumColor}" />
+            <SolidColorBrush x:Key="TabViewScrollButtonBackground" Color="{ThemeResource SystemBaseLowColor}" />
+            <SolidColorBrush x:Key="TabViewScrollButtonForeground" Color="{ThemeResource SystemBaseMediumColor}" />
+            <system:Double x:Key="TabViewItemAddButtonFontSize">14</system:Double>
+            <system:Double x:Key="TabViewItemScrollButtonFontSize">14</system:Double>
+        </ResourceDictionary>-->
+
+</Application>
+
+
+
+<!--<Style TargetType="TabViewItem">
+      <Setter Property="Template">
+          <Setter.Value>
+              <ControlTemplate TargetType="TabViewItem">
+                  <Grid x:Name="RootGrid" Background="{TemplateBinding Background}">
+                      <Grid.ColumnDefinitions>
+                          <ColumnDefinition />
+                          <ColumnDefinition Width="Auto" />
+                      </Grid.ColumnDefinitions>
+                      <ContentPresenter x:Name="HeaderContentPresenter" Grid.Column="0" Content="{TemplateBinding Header}" Margin="12,0,12,0" VerticalAlignment="Center" />
+                      <Button x:Name="CloseButton" Grid.Column="1" Width="28" Height="28" Margin="0,0,4,0" VerticalAlignment="Center">
+                          <SymbolIcon Symbol="Cancel" />
+                      </Button>
+                  </Grid>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter TargetName="RootGrid" Property="Background" Value="{ThemeResource SystemControlHighlightAccentBrush}" />
+                                    <Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="White" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <Style TargetType="TabView">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="TabView">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+                                <StackPanel Orientation="Horizontal" Grid.Row="0" Background="{ThemeResource MicaBaseAltFillColorDefaultBrush}">
+                                    <TabViewListView x:Name="TabListView" ItemsSource="{TemplateBinding TabItems}" SelectedItem="{TemplateBinding SelectedItem}" SelectionMode="Single" IsTabStop="False" />
+                                    <Button x:Name="AddButton" Width="32" Height="32" Margin="4" VerticalAlignment="Center">
+                                        <SymbolIcon Symbol="Add" />
+                                    </Button>
+                                </StackPanel>
+                                <ContentPresenter Grid.Row="1" Content="{TemplateBinding SelectedContent}" Margin="0" />
+                            </Grid>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>-->

Vanara-Jnana/App.xaml.cs

@@ -0,0 +1,33 @@
+using Microsoft.UI.Xaml;
+//using LaunchActivatedEventArgs = Windows.ApplicationModel.Activation.LaunchActivatedEventArgs;
+
+namespace ClassicSamplesBrowser;
+
+public partial class App : Application
+{
+    private MainWindow? _mainWindow;
+
+    public App()
+    {
+        InitializeComponent();
+        //AppWindowTitleBar.SetIcon("Assets/VanaraMonkey.png");
+    }
+
+    private MainWindow? GetOrCreateMainWindow(bool allowInitialCreation = false)
+    {
+        if (_mainWindow == null && allowInitialCreation)
+        {
+            _mainWindow = new MainWindow
+            {
+                ExtendsContentIntoTitleBar = true
+            };
+        }
+
+        return _mainWindow;
+    }
+
+    protected override void OnLaunched(LaunchActivatedEventArgs args)
+    {
+        GetOrCreateMainWindow(true)?.Activate();
+    }
+}

Vanara-Jnana/ClassicSamplesBrowser.csproj

@@ -0,0 +1,100 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<EnableMsixTooling>true</EnableMsixTooling>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+		<UseWinUI>true</UseWinUI>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
+		<PackageReference Include="ICSharpCode.Decompiler" Version="10.0.1.8346" />
+		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3912.50" />
+		<PackageReference Include="Microsoft.Win32.SystemEvents" Version="10.0.7" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260317003" />
+		<PackageReference Include="NuGet.Common" Version="7.3.1" />
+		<PackageReference Include="Vanara.Core" Version="5.0.4" />
+		<PackageReference Include="Vanara.PInvoke.SearchApi" Version="5.0.4" />
+		<PackageReference Include="Vanara.PInvoke.Shell32" Version="5.0.4" />
+		<PackageReference Include="Vanara.PInvoke.User32" Version="5.0.4" />
+		<PackageReference Include="Vanara.Windows.Shell" Version="5.0.4" />
+		<PackageReference Include="Vanara.WinUI.Extensions" Version="5.0.4" />
+	</ItemGroup>
+	<ItemGroup>
+		<Folder Include="Resources\i18n\" />
+		<Folder Include="Templates\RyderShell\Project\" />
+	</ItemGroup>
+	<ItemGroup>
+		<Content Update="Assets\Vanara\Insert_Amiga-Disk.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="Assets\Vanara\WinUi-Sailing.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Vanara\Controls\FeatureTile.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Templates\RyderShell\Styles\MainPage.xaml">
+			<SubType>Designer</SubType>
+		</Page>
+		<Page Update="Templates\RyderShell\Views\MainPage.xaml">
+			<SubType>Designer</SubType>
+		</Page>
+		<Page Update="Views\ApiExplorerPage.xaml">
+			<SubType>Designer</SubType>
+		</Page>
+		<Page Update="Views\SettingsPage.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Views\AboutPage.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Views\SamplesPage.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Views\StartPage.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Views\ShellPage.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="DOCS\docs.assets\WinUi-Sailing.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</EmbeddedResource>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Vanara\Styles\NavButtonStyle.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Vanara\Styles\SidebarStyles.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Vanara\Controls\Shell32AppBar.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Vanara\Controls\FloatingStatusBar.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+</Project>

Vanara-Jnana/DOCS/README.md

@@ -0,0 +1,10 @@
+# WinUI Classic Samples Browser \ Docs
+
+## Content of this folder
+
+### WinForms Sampler
+[Download Sampler.zip](./Sampler.zip)
+
+See [Impact of .net runtime when dealing with low-level Windows-Messages, follow-up: Classic Samples Browser #606](https://github.com/dahall/Vanara/discussions/606#discussioncomment-16492844) discussion.
+
+### docs.assets folder - various assets used for documentation files

Vanara-Jnana/Directory.Packages.props

@@ -0,0 +1,12 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Include="Vanara.CodeGen" Version="5.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.0" />
+  </ItemGroup>
+</Project>

Vanara-Jnana/Helpers/WindowsSystemDispatcherQueueHelper.cs

@@ -0,0 +1,42 @@
+using Microsoft.UI.Dispatching;
+
+namespace ClassicSamplesBrowser.Helpers;
+
+public class WindowsSystemDispatcherQueueHelper
+{
+    [StructLayout(LayoutKind.Sequential)]
+    struct DispatcherQueueOptions
+    {
+        public int dwSize;
+        public int threadType;
+        public int apartmentType;
+    }
+
+    [DllImport("CoreMessaging.dll")]
+    private static extern int CreateDispatcherQueueController(
+        DispatcherQueueOptions options,
+        out IntPtr dispatcherQueueController);
+
+    private IntPtr _dispatcherQueueController = IntPtr.Zero;
+
+    public void EnsureWindowsSystemDispatcherQueueController()
+    {
+        if (DispatcherQueue.GetForCurrentThread() != null)
+        {
+            // Already initialized
+            return;
+        }
+
+        if (_dispatcherQueueController == IntPtr.Zero)
+        {
+            DispatcherQueueOptions options = new DispatcherQueueOptions
+            {
+                dwSize = Marshal.SizeOf(typeof(DispatcherQueueOptions)),
+                threadType = 2,      // INFO: TODO: Use Vanara' enum here: `DQTYPE_THREAD_CURRENT`
+                apartmentType = 2    // INFO: TODO: Use Vanara' enum here: `DQTAT_COM_STA`
+            };
+
+            CreateDispatcherQueueController(options, out _dispatcherQueueController);
+        }
+    }
+}

Vanara-Jnana/MainWindow.xaml

@@ -0,0 +1,14 @@
+<Window
+    x:Class="ClassicSamplesBrowser.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:ClassicSamplesBrowser.Vanara.Controls"
+    xmlns:local="using:ClassicSamplesBrowser"
+    Title="Classic Samples Browser"
+    Activated="Window_Activated">
+
+    <Grid x:Name="WindowRootGrid">
+        <Frame x:Name="RootFrame" />
+    </Grid>
+
+</Window>