Merge pull request #169 from reactivemarbles/UpdatePackages

ChrisPulman · web-flow · commit fdf6a31df010 · 2025-02-19T13:01:16.000Z
Update Packages
diff --git a/.github/workflows/BuildDeploy.yml b/.github/workflows/BuildDeploy.yml
@@ -50,6 +50,15 @@ jobs:
             6.0.x
             8.0.x
             9.0.x
+
+      - name: Get Latest Visual Studio Version
+        shell: bash
+        run: |
+            dotnet tool update -g dotnet-vs
+            vs where release
+            vs update release Enterprise
+            vs modify release Enterprise +mobile +desktop +uwp +web
+            vs where release
       
       - name: 'Install DotNet workloads'
         shell: bash
@@ -89,7 +98,7 @@ jobs:
       #   run: |
       #       $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.SIGNING_CERTIFICATE }}")
       #       [IO.File]::WriteAllBytes("GitHubActionsWorkflow.pfx", $pfx_cert_byte)
-      #       $secure_password = ConvertTo-SecureString ${{ secrets.SIGN_CERTIFICATE_PASSWORD }} �asplaintext �force
+      #       $secure_password = ConvertTo-SecureString ${{ secrets.SIGN_CERTIFICATE_PASSWORD }} �asplaintext �force
       #       Import-PfxCertificate -FilePath GitHubActionsWorkflow.pfx -Password $secure_password -CertStoreLocation Cert:\CurrentUser\My
       #       nuget sign -Timestamper http://timestamp.digicert.com -CertificateFingerprint ${{ secrets.SIGN_CERTIFICATE_HASH }} **/*.nupkg
         
diff --git a/.github/workflows/BuildOnly.yml b/.github/workflows/BuildOnly.yml
@@ -45,6 +45,15 @@ jobs:
             6.0.x
             8.0.x
             9.0.x
+
+      - name: Get Latest Visual Studio Version
+        shell: bash
+        run: |
+            dotnet tool update -g dotnet-vs
+            vs where release
+            vs update release Enterprise
+            vs modify release Enterprise +mobile +desktop +uwp +web
+            vs where release
       
       - name: 'Install DotNet workloads'
         shell: bash
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -29,10 +29,10 @@
     <!-- Include PDB in the built .nupkg -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <AvaloniaVersion>11.2.3</AvaloniaVersion>
+    <AvaloniaVersion>11.2.4</AvaloniaVersion>
     <ReactiveUIVersion>20.1.63</ReactiveUIVersion>
     <XamarinReactiveUIVersion>19.6.12</XamarinReactiveUIVersion>
-    <WebViewVersion>1.0.2957.106</WebViewVersion>
+    <WebViewVersion>1.0.3065.39</WebViewVersion>
     <CrissCrossCoreTargetFrameworks>netstandard2.0;net8.0;net9.0</CrissCrossCoreTargetFrameworks>
     <CrissCrossWinTargetFrameworks>net462;net472;net48;net8.0-windows10.0.17763.0;net9.0-windows10.0.17763.0</CrissCrossWinTargetFrameworks>
     <CrissCrossWebviewTargetFrameworks>net462;net472;net48;net8.0-windows;net9.0-windows</CrissCrossWebviewTargetFrameworks>
@@ -55,7 +55,7 @@
     <!--<Compile Update="**\*.cs" DependentUpon="I%(Filename).cs" />-->
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" PrivateAssets="all" Condition="!Exists('packages.config')" />
     <PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
-    <PackageReference Include="Roslynator.Analyzers" Version="4.12.11" PrivateAssets="All" />
+    <PackageReference Include="Roslynator.Analyzers" Version="4.13.0" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
   </ItemGroup>
 </Project>
diff --git a/build/_build.csproj b/build/_build.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
     <PackageReference Include="Nuke.Common" Version="9.0.4" />
     <PackageReference Include="CP.Nuke.BuildTools" Version="1.0.94" />
-    <PackageReference Include="System.Text.Json" Version="9.0.1" />
+    <PackageReference Include="System.Text.Json" Version="9.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CrissCross.Avalonia/CrissCross.Avalonia.csproj b/src/CrissCross.Avalonia/CrissCross.Avalonia.csproj
@@ -10,7 +10,6 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageReference Include="ReactiveUI" Version="$(ReactiveUIVersion)" />
-    <PackageReference Include="System.Text.Json" Version="9.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CrissCross.MAUI.Test/CrissCross.MAUI.Test.csproj b/src/CrissCross.MAUI.Test/CrissCross.MAUI.Test.csproj
@@ -51,9 +51,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.2" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.100" />
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.100" />
   </ItemGroup>
diff --git a/src/CrissCross.MAUI/CrissCross.MAUI.csproj b/src/CrissCross.MAUI/CrissCross.MAUI.csproj
@@ -18,8 +18,8 @@
   <ItemGroup>
     <PackageReference Include="CompiledBindings.MAUI" Version="1.0.18" />
     <PackageReference Include="ReactiveUI.Maui" Version="$(ReactiveUIVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.1" />    
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />    
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
     <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.100" />
diff --git a/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj b/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj
@@ -15,13 +15,12 @@
     <PackageReference Include="AppBarButton.WPF" Version="1.0.2" />
     <PackageReference Include="ReactiveList" Version="2.2.0" />
     <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
-    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.1" PrivateAssets="all" />
+    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.8" PrivateAssets="all" />
     <PackageReference Include="ScottPlot.WPF" Version="5.0.54" />
-    <PackageReference Include="System.Text.Json" Version="9.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <PackageReference Include="Polyfill" Version="7.14.0">
+    <PackageReference Include="Polyfill" Version="7.16.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/CrissCross.WPF.UI.CC_Nav.Test/CrissCross.WPF.UI.CC_Nav.Test.csproj b/src/CrissCross.WPF.UI.CC_Nav.Test/CrissCross.WPF.UI.CC_Nav.Test.csproj
@@ -16,10 +16,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
-    <PackageReference Include="System.Text.Json" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CrissCross.WPF.UI.Gallery/CrissCross.WPF.UI.Gallery.csproj b/src/CrissCross.WPF.UI.Gallery/CrissCross.WPF.UI.Gallery.csproj
@@ -16,7 +16,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.1" PrivateAssets="all" />
+    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.8" PrivateAssets="all" />
     <PackageReference Include="CompiledBindings.WPF" Version="1.0.18" />
   </ItemGroup>
 
diff --git a/src/CrissCross.WPF.UI.Test/CrissCross.WPF.UI.Test.csproj b/src/CrissCross.WPF.UI.Test/CrissCross.WPF.UI.Test.csproj
@@ -23,11 +23,10 @@
   
   <ItemGroup>
     <ProjectReference Include="..\CrissCross.WPF.UI\CrissCross.WPF.UI.csproj" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.2" />
     <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
-    <PackageReference Include="System.Text.Json" Version="9.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CrissCross.WPF.UI/Controls/AutoSuggestBox/AutoSuggestBox.cs b/src/CrissCross.WPF.UI/Controls/AutoSuggestBox/AutoSuggestBox.cs
@@ -4,9 +4,11 @@
 
 using System.Collections;
 using System.Drawing;
+using System.Reactive.Disposables;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
+using ReactiveMarbles.ObservableEvents;
 using ReactiveUI;
 
 namespace CrissCross.WPF.UI.Controls;
@@ -163,6 +165,8 @@ public partial class AutoSuggestBox : ItemsControl, IIconControl
     protected ListView? SuggestionsList;
 #pragma warning restore SA1401 // Fields should be private
 
+    private readonly CompositeDisposable? _disposables = [];
+
     private bool _changingTextAfterSuggestionChosen;
 
     private bool _isChangedTextOutSideOfTextBox;
@@ -176,19 +180,19 @@ public partial class AutoSuggestBox : ItemsControl, IIconControl
     /// </summary>
     public AutoSuggestBox()
     {
-        Loaded += static (sender, _) =>
+        _disposables.Add(
+            this.Events().Loaded.Subscribe(static e =>
         {
-            var self = (AutoSuggestBox)sender;
-
+            var self = (AutoSuggestBox)e.Source;
             self.AcquireTemplateResources();
-        };
+        }));
 
-        Unloaded += static (sender, _) =>
+        _disposables.Add(
+        this.Events().Unloaded.Subscribe(static e =>
         {
-            var self = (AutoSuggestBox)sender;
-
+            var self = (AutoSuggestBox)e.Source;
             self.ReleaseTemplateResources();
-        };
+        }));
 
         SetValue(FocusCommandProperty, ReactiveCommand.Create(Focus));
     }
diff --git a/src/CrissCross.WPF.UI/Controls/BreadcrumbBar/BreadcrumbBar.cs b/src/CrissCross.WPF.UI/Controls/BreadcrumbBar/BreadcrumbBar.cs
@@ -5,6 +5,7 @@
 using System.Collections.Specialized;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
+using ReactiveMarbles.ObservableEvents;
 using ReactiveUI;
 using ReactiveUI.SourceGenerators;
 
@@ -93,13 +94,13 @@ public ICommand Command
     public void SetupNavigation(string hostName)
     {
         _hostName = hostName;
-        ItemClicked += (s, e) =>
+        this.Events().ItemClicked.Subscribe(e =>
         {
-            if (e.Item is BreadcrumbBarItem item)
+            if (e.args.Item is BreadcrumbBarItem item)
             {
                 NavigateTo(item.NavigationType);
             }
-        };
+        });
     }
 
     /// <summary>
diff --git a/src/CrissCross.WPF.UI/Controls/FluentNavigationWindow/FluentNavigationWindow.cs b/src/CrissCross.WPF.UI/Controls/FluentNavigationWindow/FluentNavigationWindow.cs
@@ -98,6 +98,42 @@ public class FluentNavigationWindow : FluentWindow, ISetNavigation, IUseNavigati
         typeof(object),
         typeof(FluentNavigationWindow));
 
+    /// <summary>
+    /// Property for <see cref="ShowMaximize"/>.
+    /// </summary>
+    public static readonly DependencyProperty ShowMaximizeProperty = DependencyProperty.Register(
+        nameof(ShowMaximize),
+        typeof(bool),
+        typeof(FluentNavigationWindow),
+        new PropertyMetadata(true));
+
+    /// <summary>
+    /// Property for <see cref="ShowMinimize"/>.
+    /// </summary>
+    public static readonly DependencyProperty ShowMinimizeProperty = DependencyProperty.Register(
+        nameof(ShowMinimize),
+        typeof(bool),
+        typeof(FluentNavigationWindow),
+        new PropertyMetadata(true));
+
+    /// <summary>
+    /// Property for <see cref="ShowHelp"/>.
+    /// </summary>
+    public static readonly DependencyProperty ShowHelpProperty = DependencyProperty.Register(
+        nameof(ShowHelp),
+        typeof(bool),
+        typeof(FluentNavigationWindow),
+        new PropertyMetadata(false));
+
+    /// <summary>
+    /// Property for <see cref="ShowClose"/>.
+    /// </summary>
+    public static readonly DependencyProperty ShowCloseProperty = DependencyProperty.Register(
+        nameof(ShowClose),
+        typeof(bool),
+        typeof(FluentNavigationWindow),
+        new PropertyMetadata(true));
+
     static FluentNavigationWindow() => DefaultStyleKeyProperty.OverrideMetadata(
            typeof(FluentNavigationWindow),
            new FrameworkPropertyMetadata(typeof(FluentNavigationWindow)));
@@ -210,6 +246,42 @@ public object? TitleHeader
         set => SetValue(TitleHeaderProperty, value);
     }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether gets or sets information whether to show maximize button.
+    /// </summary>
+    public bool ShowMaximize
+    {
+        get => (bool)GetValue(ShowMaximizeProperty);
+        set => SetValue(ShowMaximizeProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether gets or sets information whether to show minimize button.
+    /// </summary>
+    public bool ShowMinimize
+    {
+        get => (bool)GetValue(ShowMinimizeProperty);
+        set => SetValue(ShowMinimizeProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether gets or sets information whether to show help button.
+    /// </summary>
+    public bool ShowHelp
+    {
+        get => (bool)GetValue(ShowHelpProperty);
+        set => SetValue(ShowHelpProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether gets or sets information whether to show close button.
+    /// </summary>
+    public bool ShowClose
+    {
+        get => (bool)GetValue(ShowCloseProperty);
+        set => SetValue(ShowCloseProperty, value);
+    }
+
     /// <summary>
     /// Gets the navigation frame.
     /// </summary>
diff --git a/src/CrissCross.WPF.UI/Controls/FluentNavigationWindow/FluentNavigationWindow.xaml b/src/CrissCross.WPF.UI/Controls/FluentNavigationWindow/FluentNavigationWindow.xaml
@@ -18,7 +18,6 @@
         <Setter Property="MinWidth" Value="518" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
-        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -48,6 +47,10 @@
                                     Title="{TemplateBinding Title}"
                                     Grid.Row="0"
                                     Header="{TemplateBinding TitleHeader}"
+                                    ShowClose="{TemplateBinding ShowClose}"
+                                    ShowHelp="{TemplateBinding ShowHelp}"
+                                    ShowMaximize="{TemplateBinding ShowMaximize}"
+                                    ShowMinimize="{TemplateBinding ShowMinimize}"
                                     TitleContent="{TemplateBinding TitleContent}">
                                     <controls:TitleBar.Icon>
                                         <controls:ImageIcon Source="{TemplateBinding TitleIcon}" />
diff --git a/src/CrissCross.WPF.UI/CrissCross.WPF.UI.csproj b/src/CrissCross.WPF.UI/CrissCross.WPF.UI.csproj
@@ -26,10 +26,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CP.Extensions.Hosting.ReactiveUI.Wpf" Version="2.1.4" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
+    <PackageReference Include="CP.Extensions.Hosting.ReactiveUI.Wpf" Version="2.1.8" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.2" />
     <PackageReference Include="ReactiveList" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" PrivateAssets="all" />
@@ -38,7 +38,7 @@
     <PackageReference Include="CP.Xaml.Converters" Version="1.0.2" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageReference Include="CompiledBindings.WPF" Version="1.0.18" />
-    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.1" PrivateAssets="all" />
+    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.1.8" PrivateAssets="all" />
     <PackageReference Include="PolySharp" Version="1.15.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/CrissCross.XamForms.Test/CrissCross.XamForms.Test/CrissCross.XamForms.Test.csproj b/src/CrissCross.XamForms.Test/CrissCross.XamForms.Test/CrissCross.XamForms.Test.csproj
@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
-    <PackageReference Include="System.Text.Json" Version="9.0.1" />
     <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
   </ItemGroup>
 
diff --git a/src/CrissCross/CrissCross.csproj b/src/CrissCross/CrissCross.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="ReactiveUI" Version="$(ReactiveUIVersion)" />
-    <PackageReference Include="System.Text.Json" Version="9.0.1" />
+    <PackageReference Include="System.Text.Json" Version="9.0.2" />
   </ItemGroup>
 
 </Project>
