From 60d8d837bfc1834e5a581ace55ebbe68636936c2 Mon Sep 17 00:00:00 2001
From: Chris Pulman <chris.pulman@yahoo.com>
Date: Fri, 3 Sep 2021 00:33:36 +0100
Subject: [PATCH] fix build and test (#762)

---
 .../NinjectReactiveUIDependencyTests.cs           |  3 ---
 .../ReactiveUI.DI.Tests.csproj                    | 15 ++++++---------
 .../RaygunFeatureUsageTrackingSession.cs          |  6 +++---
 src/Splat.Raygun/Splat.Raygun.csproj              |  8 ++++----
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/ReactiveUI.DI.Tests/NinjectReactiveUIDependencyTests.cs b/src/ReactiveUI.DI.Tests/NinjectReactiveUIDependencyTests.cs
index 363157c41..b1abee4aa 100644
--- a/src/ReactiveUI.DI.Tests/NinjectReactiveUIDependencyTests.cs
+++ b/src/ReactiveUI.DI.Tests/NinjectReactiveUIDependencyTests.cs
@@ -3,13 +3,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.Linq;
-using Autofac;
 using FluentAssertions;
 using Ninject;
 using Splat;
-using Splat.Autofac;
 using Splat.Ninject;
 using Xunit;
 
diff --git a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj
index f7405e060..5f956d81d 100644
--- a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj
+++ b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net462;net472;netcoreapp3;net5.0;</TargetFrameworks>
@@ -14,6 +14,7 @@
         <Compile Remove="AutoFacReactiveUIDependencyTests.cs" />
         <Compile Remove="NinjectReactiveUIDependencyTests.cs" />
         <Compile Remove="SimpleInjectorReactiveUIDependencyTests.cs" />
+        <ProjectReference Include="..\Splat.DryIoc\Splat.DryIoc.csproj" />
       </ItemGroup>
     </When>
     <When Condition="$(TargetFramework.StartsWith('net472'))">
@@ -22,6 +23,7 @@
         <!--<Compile Remove="AutoFacReactiveUIDependencyTests.cs" />-->
         <Compile Remove="NinjectReactiveUIDependencyTests.cs" />
         <Compile Remove="SimpleInjectorReactiveUIDependencyTests.cs" />
+        <ProjectReference Include="..\Splat.Autofac\Splat.Autofac.csproj" />
       </ItemGroup>
     </When>
     <When Condition="$(TargetFramework.StartsWith('netcoreapp3'))">
@@ -30,6 +32,7 @@
         <Compile Remove="AutoFacReactiveUIDependencyTests.cs" />
         <!--<Compile Remove="NinjectReactiveUIDependencyTests.cs" />-->
         <Compile Remove="SimpleInjectorReactiveUIDependencyTests.cs" />
+        <ProjectReference Include="..\Splat.Ninject\Splat.Ninject.csproj" />
       </ItemGroup>
     </When>
     <When Condition="$(TargetFramework.StartsWith('net5.0'))">
@@ -38,19 +41,13 @@
         <Compile Remove="AutoFacReactiveUIDependencyTests.cs" />
         <Compile Remove="NinjectReactiveUIDependencyTests.cs" />
         <!--<Compile Remove="SimpleInjectorReactiveUIDependencyTests.cs" />-->
+        <ProjectReference Include="..\Splat.SimpleInjector\Splat.SimpleInjector.csproj" />
       </ItemGroup>
     </When>
   </Choose>
 
   <ItemGroup>
-    <PackageReference Include="ReactiveUI" Version="15.1.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Splat.Autofac\Splat.Autofac.csproj" />
-    <ProjectReference Include="..\Splat.DryIoc\Splat.DryIoc.csproj" />
-    <ProjectReference Include="..\Splat.Ninject\Splat.Ninject.csproj" />
-    <ProjectReference Include="..\Splat.SimpleInjector\Splat.SimpleInjector.csproj" />
+    <PackageReference Include="ReactiveUI" Version="16.2.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Splat.Raygun/RaygunFeatureUsageTrackingSession.cs b/src/Splat.Raygun/RaygunFeatureUsageTrackingSession.cs
index 8153a8806..8b523c6f8 100644
--- a/src/Splat.Raygun/RaygunFeatureUsageTrackingSession.cs
+++ b/src/Splat.Raygun/RaygunFeatureUsageTrackingSession.cs
@@ -66,10 +66,10 @@ internal RaygunFeatureUsageTrackingSession(
 
             // keep an eye on
             // https://raygun.com/forums/thread/92182
-#if NETSTANDARD2_0 || NET5_0 || NET6_0
-            var messageBuilder = RaygunMessageBuilder.New(raygunSettings)
-#else
+#if NET461
             var messageBuilder = RaygunMessageBuilder.New
+#else
+            var messageBuilder = RaygunMessageBuilder.New(raygunSettings)
 #endif
                 .SetClientDetails()
                 .SetEnvironmentDetails()
diff --git a/src/Splat.Raygun/Splat.Raygun.csproj b/src/Splat.Raygun/Splat.Raygun.csproj
index dff04d59e..32d892658 100644
--- a/src/Splat.Raygun/Splat.Raygun.csproj
+++ b/src/Splat.Raygun/Splat.Raygun.csproj
@@ -11,21 +11,21 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-
+  
   <Choose>
     <When Condition=" $(TargetFramework.StartsWith('net5'))">
       <ItemGroup>
-        <PackageReference Include="Mindscape.Raygun4Net.NetCore" Version="6.3.1" />
+        <PackageReference Include="Mindscape.Raygun4Net.NetCore" Version="6.4.1" />
       </ItemGroup>
     </When>
     <When Condition=" $(TargetFramework.StartsWith('net6'))">
       <ItemGroup>
-        <PackageReference Include="Mindscape.Raygun4Net.NetCore" Version="6.3.1" />
+        <PackageReference Include="Mindscape.Raygun4Net.NetCore" Version="6.4.1" />
       </ItemGroup>
     </When>
     <When Condition=" $(TargetFramework.StartsWith('netstandard')) ">
       <ItemGroup>
-        <PackageReference Include="Mindscape.Raygun4Net.NetCore" Version="6.3.1" />
+        <PackageReference Include="Mindscape.Raygun4Net.NetCore" Version="6.4.1" />
       </ItemGroup>
     </When>
     <When Condition=" $(TargetFramework.StartsWith('net4')) ">