Fix for Verify.Xunit, Update Avalonia version (#1071)

reactiveui · Jan 23, 2024 · ce2685f · ce2685f
1 parent 9fca815
commit ce2685f
Show file tree

Hide file tree

Showing 30 changed files with 148 additions and 544 deletions.
diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -40,6 +40,7 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <SplatTargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</SplatTargetFrameworks>
     <SplatWindowsTargetFrameworks>net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</SplatWindowsTargetFrameworks>
+    <AvaloniaReactiveUIVersion>11.0.7</AvaloniaReactiveUIVersion>
   </PropertyGroup>
   <PropertyGroup Condition="$(IsTestProject) != 'true'">
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
@@ -56,17 +57,17 @@
 
   <ItemGroup Condition="$(IsTestProject) or $(MSBuildProjectName.Contains('TestRunner'))">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit" Version="2.6.6" />
     <PackageReference Include="Xunit.StaFact" Version="1.1.11" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.0" />
-    <PackageReference Include="PublicApiGenerator" Version="11.0.0" />
-    <PackageReference Include="Verify.Xunit" Version="22.5.0" />
+    <PackageReference Include="PublicApiGenerator" Version="11.1.0" />
+    <PackageReference Include="Verify.Xunit" Version="23.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="$(IsTestProject)">
-    <PackageReference Include="xunit.runner.console" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
+    <PackageReference Include="xunit.runner.console" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
     <PackageReference Include="coverlet.msbuild" Version="6.0.0" />
   </ItemGroup>
 

diff --git a/src/Splat.Avalonia.Autofac/Splat.Avalonia.Autofac.csproj b/src/Splat.Avalonia.Autofac/Splat.Avalonia.Autofac.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>$(SplatTargetFrameworks)</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.5" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaReactiveUIVersion)" />
     <PackageReference Include="Autofac" Version="7.*" />
     <ProjectReference Include="..\Splat\Splat.csproj" />
   </ItemGroup>

diff --git a/src/Splat.Avalonia.DryIoc/Splat.Avalonia.DryIoc.csproj b/src/Splat.Avalonia.DryIoc/Splat.Avalonia.DryIoc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>$(SplatTargetFrameworks)</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.5" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaReactiveUIVersion)" />
     <PackageReference Include="DryIoc.Dll" Version="5.4.3" />
     <ProjectReference Include="..\Splat\Splat.csproj" />
   </ItemGroup>

diff --git a/src/Splat.Avalonia.DryIoc1.Tests/Splat.Avalonia.DryIoc1.Tests.csproj b/src/Splat.Avalonia.DryIoc1.Tests/Splat.Avalonia.DryIoc1.Tests.csproj
@@ -42,10 +42,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Headless.XUnit" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Headless.XUnit" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaReactiveUIVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Splat.Avalonia.DryIoc2.Tests/Splat.Avalonia.DryIoc2.Tests.csproj b/src/Splat.Avalonia.DryIoc2.Tests/Splat.Avalonia.DryIoc2.Tests.csproj
@@ -49,10 +49,10 @@
     <!--
     <ProjectReference Include="..\ReactiveUI.Avalonia.Ninject\ReactiveUI.Avalonia.Ninject.csproj" />
     -->
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Headless.XUnit" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Headless.XUnit" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaReactiveUIVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/...nsions.DependencyInjection/Splat.Avalonia.Microsoft.Extensions.DependencyInjection.csproj b/...nsions.DependencyInjection/Splat.Avalonia.Microsoft.Extensions.DependencyInjection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>$(SplatTargetFrameworks)</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.5" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaReactiveUIVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <ProjectReference Include="..\Splat\Splat.csproj" />
   </ItemGroup>

diff --git a/src/Splat.Avalonia.Microsoft1.Tests/Splat.Avalonia.Microsoft1.Tests.csproj b/src/Splat.Avalonia.Microsoft1.Tests/Splat.Avalonia.Microsoft1.Tests.csproj
@@ -45,10 +45,10 @@
     <!--
     <ProjectReference Include="..\Splat.Avalonia.Ninject\ReactiveUI.Avalonia.Ninject.csproj" />
     -->
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Headless.XUnit" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Headless.XUnit" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaReactiveUIVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Splat.Avalonia.Microsoft2.Tests/Splat.Avalonia.Microsoft2.Tests.csproj b/src/Splat.Avalonia.Microsoft2.Tests/Splat.Avalonia.Microsoft2.Tests.csproj
@@ -47,10 +47,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Headless.XUnit" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Headless.XUnit" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaReactiveUIVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Splat.Avalonia.Ninject/Splat.Avalonia.Ninject.csproj b/src/Splat.Avalonia.Ninject/Splat.Avalonia.Ninject.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>$(SplatTargetFrameworks)</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.5" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaReactiveUIVersion)" />
     <PackageReference Include="Ninject" Version="3.3.6" />
     <ProjectReference Include="..\Splat\Splat.csproj" />
   </ItemGroup>

diff --git a/src/Splat.Avalonia.Tests/Splat.Avalonia.Tests.csproj b/src/Splat.Avalonia.Tests/Splat.Avalonia.Tests.csproj
@@ -19,10 +19,10 @@
     <!--
     <ProjectReference Include="..\ReactiveUI.Avalonia.Ninject\ReactiveUI.Avalonia.Ninject.csproj" />
     -->
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Headless.XUnit" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Headless.XUnit" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaReactiveUIVersion)" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaReactiveUIVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Splat.Drawing.Tests/API/ApiApprovalTests.cs b/src/Splat.Drawing.Tests/API/ApiApprovalTests.cs
@@ -13,7 +13,6 @@ namespace Splat.Tests;
 /// Tests to make sure that the API matches the approved ones.
 /// </summary>
 [ExcludeFromCodeCoverage]
-[UsesVerify]
 public class ApiApprovalTests
 {
     /// <summary>

diff --git a/src/Splat.Drawing/Platforms/Android/Bitmaps/PlatformBitmapLoader.cs b/src/Splat.Drawing/Platforms/Android/Bitmaps/PlatformBitmapLoader.cs
@@ -26,14 +26,7 @@ public class PlatformBitmapLoader : IBitmapLoader, IEnableLogger
     /// <inheritdoc />
     public async Task<IBitmap?> Load(Stream sourceStream, float? desiredWidth, float? desiredHeight)
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(sourceStream);
-#else
-        if (sourceStream == null)
-        {
-            throw new ArgumentNullException(nameof(sourceStream));
-        }
-#endif
+        sourceStream.ThrowArgumentNullExceptionIfNull(nameof(sourceStream));
 
         // this is a rough check to do with the termination check for #479
         if (sourceStream.Length < 2)

diff --git a/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs b/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs
@@ -16,14 +16,7 @@ public static class ServiceLocationDrawingInitialization
     /// <param name="resolver">The resolver to register against.</param>
     public static void RegisterPlatformBitmapLoader(this IMutableDependencyResolver resolver)
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(resolver);
-#else
-        if (resolver == null)
-        {
-            throw new ArgumentNullException(nameof(resolver));
-        }
-#endif
+        resolver.ThrowArgumentNullExceptionIfNull(nameof(resolver));
 
 #if !IS_SHARED_NET
         // not supported in netstandard or NET6 library

diff --git a/src/Splat.Tests/API/ApiApprovalTests.SplatProject.DotNet6_0.verified.txt b/src/Splat.Tests/API/ApiApprovalTests.SplatProject.DotNet6_0.verified.txt
@@ -1,4 +1,5 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Android")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Uwp")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Tests")]

diff --git a/src/Splat.Tests/API/ApiApprovalTests.SplatProject.DotNet7_0.verified.txt b/src/Splat.Tests/API/ApiApprovalTests.SplatProject.DotNet7_0.verified.txt
@@ -1,4 +1,5 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Android")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Uwp")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Tests")]

diff --git a/src/Splat.Tests/API/ApiApprovalTests.SplatProject.DotNet8_0.verified.txt b/src/Splat.Tests/API/ApiApprovalTests.SplatProject.DotNet8_0.verified.txt
@@ -1,4 +1,5 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Drawing.Tests")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Android")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Uwp")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Tests")]

diff --git a/src/Splat.Tests/API/ApiApprovalTests.cs b/src/Splat.Tests/API/ApiApprovalTests.cs
@@ -12,7 +12,6 @@ namespace Splat.Tests;
 /// Tests to make sure that the API matches the approved ones.
 /// </summary>
 [ExcludeFromCodeCoverage]
-[UsesVerify]
 public class ApiApprovalTests
 {
     /// <summary>

diff --git a/src/Splat/ApplicationPerformanceMonitoring/EnableFeatureUsageTrackingExtensions.cs b/src/Splat/ApplicationPerformanceMonitoring/EnableFeatureUsageTrackingExtensions.cs
@@ -42,14 +42,7 @@ public static void WithFeatureUsageTrackingSession(
         string featureName,
         Action<IFeatureUsageTrackingSession> action)
     {
-#if NETSTANDARD
-        if (action is null)
-        {
-            throw new ArgumentNullException(nameof(action));
-        }
-#else
-        ArgumentNullException.ThrowIfNull(action);
-#endif
+        action.ThrowArgumentNullExceptionIfNull(nameof(action));
 
         using var session = instance.FeatureUsageTrackingSession(featureName);
         try
@@ -74,20 +67,8 @@ public static void WithSubFeatureUsageTrackingSession(
         string featureName,
         Action<IFeatureUsageTrackingSession> action)
     {
-#if NETSTANDARD
-        if (instance is null)
-        {
-            throw new ArgumentNullException(nameof(instance));
-        }
-
-        if (action is null)
-        {
-            throw new ArgumentNullException(nameof(action));
-        }
-#else
-        ArgumentNullException.ThrowIfNull(instance);
-        ArgumentNullException.ThrowIfNull(action);
-#endif
+        instance.ThrowArgumentNullExceptionIfNull(nameof(instance));
+        action.ThrowArgumentNullExceptionIfNull(nameof(action));
 
         using var session = instance.SubFeature(featureName);
         try

diff --git a/src/Splat/Disposables/CompositeDisposable.cs b/src/Splat/Disposables/CompositeDisposable.cs
@@ -31,14 +31,7 @@ internal sealed class CompositeDisposable : IDisposable
     /// <exception cref="ArgumentOutOfRangeException"><paramref name="capacity"/> is less than zero.</exception>
     public CompositeDisposable(int capacity)
     {
-#if NET8_0_OR_GREATER
-        ArgumentOutOfRangeException.ThrowIfNegative(capacity);
-#else
-        if (capacity < 0)
-        {
-            throw new ArgumentOutOfRangeException(nameof(capacity));
-        }
-#endif
+        capacity.ThrowArgumentNullExceptionIfNull(nameof(capacity));
 
         _disposables = new(capacity);
     }
@@ -51,14 +44,7 @@ public CompositeDisposable(int capacity)
     /// <exception cref="ArgumentException">Any of the disposables in the <paramref name="disposables"/> collection is <c>null</c>.</exception>
     public CompositeDisposable(params IDisposable[] disposables)
     {
-#if NETSTANDARD
-        if (disposables is null)
-        {
-            throw new ArgumentNullException(nameof(disposables));
-        }
-#else
-        ArgumentNullException.ThrowIfNull(disposables);
-#endif
+        disposables.ThrowArgumentNullExceptionIfNull(nameof(disposables));
 
         _disposables = new(disposables.Length);
         Init(disposables);

diff --git a/src/Splat/ExceptionMixins.cs b/src/Splat/ExceptionMixins.cs
@@ -0,0 +1,38 @@
+// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+namespace Splat;
+
+internal static class ExceptionMixins
+{
+    /// <summary>
+    /// Throws the argument null exception if null.
+    /// </summary>
+    /// <typeparam name="T">Source Type.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <param name="name">The name.</param>
+    public static void ThrowArgumentNullExceptionIfNull<T>(this T? value, string name)
+    {
+        if (value is null)
+        {
+            throw new ArgumentNullException(name);
+        }
+    }
+
+    /// <summary>
+    /// Throws the argument null exception if null.
+    /// </summary>
+    /// <typeparam name="T">Source Type.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <param name="name">The name.</param>
+    /// <param name="message">The message.</param>
+    public static void ThrowArgumentNullExceptionIfNull<T>(this T? value, string name, string message)
+    {
+        if (value is null)
+        {
+            throw new ArgumentNullException(name, message);
+        }
+    }
+}