Merge pull request #219 from reactivemarbles/RemoveXamarin

Remove Xamarin.Forms test projects and update dependencies

Author: ChrisPulman

.github/workflows/BuildDeploy.yml

@@ -59,14 +59,14 @@ jobs:
            **/global.json
            **/nuget.config
 
-      - 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: 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 (explicit)'
         shell: bash

.github/workflows/BuildOnly.yml

@@ -53,14 +53,14 @@ jobs:
            **/global.json
            **/nuget.config
 
-      - 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: 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 (explicit)'
         shell: bash

Directory.Build.props

@@ -14,7 +14,7 @@
     <Nullable>enable</Nullable>
     <PackageIcon>CrissCross.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageReleaseNotes>Compatability with Net 8/9/10 and netstandard2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>Compatability with Net 8/9/10 and net4.7.2 / net4.8</PackageReleaseNotes>
     <PackageTags>ReactiveUI;Navigation;wpf;avalonia;winforms;maui;xamforms;webview2;rx;reactive;extensions;observable;LINQ;net;netstandard</PackageTags>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
@@ -32,7 +32,6 @@
     <AvaloniaVersion>11.3.10</AvaloniaVersion>
     <SplatVersion>17.1.1</SplatVersion>
     <ReactiveUIVersion>22.3.1</ReactiveUIVersion>
-    <XamarinReactiveUIVersion>19.6.12</XamarinReactiveUIVersion>
     <WebViewVersion>1.0.3650.58</WebViewVersion>
     <CoreNetVersion>9.0.11</CoreNetVersion>
     <CrissCrossCoreTargetFrameworks>net8.0;net9.0;net10.0</CrissCrossCoreTargetFrameworks>
@@ -41,7 +40,7 @@
     <CrissCrossWebviewTargetFrameworks>net472;net48;net8.0-windows;net9.0-windows;net10.0-windows</CrissCrossWebviewTargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
-    <CrissCrossCoreTargetFrameworks>$(CrissCrossCoreTargetFrameworks);net472;net48</CrissCrossCoreTargetFrameworks>
+    <CrissCrossCoreTargetFrameworks>$(CrissCrossCoreTargetFrameworks);$(CrissCrossWinTargetFrameworks)</CrissCrossCoreTargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

src/CrissCross.Avalonia.UI/Controls/CardControl/CardControl.cs

@@ -7,26 +7,25 @@
 namespace CrissCross.Avalonia.UI.Controls;
 
 /// <summary>
-/// Inherited from the <see cref="Avalonia.Controls.Primitives.ButtonBase"/> control which displays an additional control on the right side of the card.
+/// Represents a button control that displays a header, an optional icon, and supports customizable corner radius.
 /// </summary>
 public class CardControl : global::Avalonia.Controls.Button, IIconControl
 {
     /// <summary>
     /// Property for <see cref="Header"/>.
     /// </summary>
-    public static readonly StyledProperty<object> HeaderProperty = AvaloniaProperty.Register<CardControl, object>(
-        nameof(Header), null);
+    public static readonly StyledProperty<object> HeaderProperty = AvaloniaProperty.Register<CardControl, object>(nameof(Header));
 
     /// <summary>
     /// Property for <see cref="Icon"/>.
     /// </summary>
-    public static readonly StyledProperty<object> IconProperty = AvaloniaProperty.Register<CardControl, object>(
+    public static readonly StyledProperty<object?> IconProperty = AvaloniaProperty.Register<CardControl, object?>(
         nameof(Icon), null);
 
     /// <summary>
     /// Property for <see cref="CornerRadius"/>.
     /// </summary>
-    public static readonly StyledProperty<CornerRadius> CornerRadiusProperty = AvaloniaProperty.Register<CardControl, CornerRadius>(
+    public static new readonly StyledProperty<CornerRadius> CornerRadiusProperty = AvaloniaProperty.Register<CardControl, CornerRadius>(
         nameof(CornerRadius), new CornerRadius(0));
 
     /// <summary>
@@ -50,7 +49,7 @@ public object? Icon
     /// <summary>
     /// Gets or sets the corner radius of the control.
     /// </summary>
-    public CornerRadius CornerRadius
+    public new CornerRadius CornerRadius
     {
         get => GetValue(CornerRadiusProperty);
         set => SetValue(CornerRadiusProperty, value);

src/CrissCross.Avalonia.UI/Controls/IconElement/IconElement.cs

@@ -16,7 +16,7 @@ public abstract class IconElement : Control
     /// <summary>
     /// Property for <see cref="Foreground"/>.
     /// </summary>
-    public static new readonly StyledProperty<IBrush?> ForegroundProperty = AvaloniaProperty.Register<IconElement, IBrush?>(
+    public static readonly StyledProperty<IBrush?> ForegroundProperty = AvaloniaProperty.Register<IconElement, IBrush?>(
         nameof(Foreground), defaultValue: Brushes.Black);
 
     static IconElement()
@@ -27,7 +27,7 @@ static IconElement()
     /// <summary>
     /// Gets or sets the foreground brush.
     /// </summary>
-    public new IBrush? Foreground
+    public IBrush? Foreground
     {
         get => GetValue(ForegroundProperty);
         set => SetValue(ForegroundProperty, value);

src/CrissCross.Avalonia.UI/Controls/SplitButton/SplitButton.cs

@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for full license information.
 
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 
 namespace CrissCross.Avalonia.UI.Controls;
 
@@ -16,13 +14,13 @@ public class SplitButton : global::Avalonia.Controls.SplitButton
     /// <summary>
     /// Property for <see cref="CornerRadius"/>.
     /// </summary>
-    public static readonly StyledProperty<CornerRadius> CornerRadiusProperty =
+    public static new readonly StyledProperty<CornerRadius> CornerRadiusProperty =
         AvaloniaProperty.Register<SplitButton, CornerRadius>(nameof(CornerRadius));
 
     /// <summary>
     /// Gets or sets the corner radius.
     /// </summary>
-    public CornerRadius CornerRadius
+    public new CornerRadius CornerRadius
     {
         get => GetValue(CornerRadiusProperty);
         set => SetValue(CornerRadiusProperty, value);

src/CrissCross.Avalonia.UI/Controls/TimePicker/TimePicker.cs

@@ -27,7 +27,7 @@ public class TimePicker : global::Avalonia.Controls.TimePicker
     /// <summary>
     /// Property for <see cref="ClockIdentifier"/>.
     /// </summary>
-    public static readonly StyledProperty<ClockIdentifier> ClockIdentifierProperty = AvaloniaProperty.Register<TimePicker, ClockIdentifier>(
+    public static new readonly StyledProperty<ClockIdentifier> ClockIdentifierProperty = AvaloniaProperty.Register<TimePicker, ClockIdentifier>(
         nameof(ClockIdentifier), ClockIdentifier.Clock24Hour);
 
     /// <summary>
@@ -74,7 +74,7 @@ public TimeSpan Time
     /// <summary>
     /// Gets or sets the clock system to use (12-hour or 24-hour).
     /// </summary>
-    public ClockIdentifier ClockIdentifier
+    public new ClockIdentifier ClockIdentifier
     {
         get => GetValue(ClockIdentifierProperty);
         set => SetValue(ClockIdentifierProperty, value);

src/CrissCross.Avalonia.UI/CrissCross.Avalonia.UI.csproj

@@ -41,10 +41,8 @@
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
     <PackageReference Include="ReactiveUI" Version="$(ReactiveUIVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.*" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.*" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.*" />
-    <PackageReference Include="ReactiveList" Version="3.0.2" />
+    <PackageReference Include="ReactiveList" Version="3.0.5" />
     <PackageReference Include="AngleSharp" Version="1.4.0" />
     <PackageReference Include="Markdig" Version="0.44.0" />
     <!-- Source generators / analyzers isolated from consumers -->

src/CrissCross.Avalonia/CrissCross.Avalonia.csproj

@@ -4,7 +4,6 @@
     <TargetFrameworks>$(CrissCrossAvaloniaTargetFrameworks);</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>

src/CrissCross.MAUI/CrissCross.MAUI.csproj

@@ -6,7 +6,6 @@
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
     <ImplicitUsings>enable</ImplicitUsings>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>