housekeeping: Fix the build

src/ReactiveUI.Events.WPF/ReactiveUI.Events.WPF.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows;net5.0-windows10.0.19041</TargetFrameworks>
     <RootNamespace>ReactiveUI.Events</RootNamespace>
     <PackageDescription>Provides Observable-based events API for WPF UI controls &amp; event handlers</PackageDescription>
     <PackageId>ReactiveUI.Events.WPF</PackageId>
@@ -47,7 +47,7 @@
     <Compile Include="Events_netcoreapp3.1.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework) == 'net5.0-windows' ">
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net5.0')) ">
     <Compile Include="Events_net5.0.cs" />
   </ItemGroup>
 

src/ReactiveUI.Events.Winforms/ReactiveUI.Events.Winforms.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows;net5.0-windows10.0.19041</TargetFrameworks>
     <AssemblyName>ReactiveUI.Events.Winforms</AssemblyName>
     <RootNamespace>ReactiveUI.Events</RootNamespace>
     <PackageDescription> Provides Observable-based events API for Win Forms UI controls &amp;	event handlers</PackageDescription>
@@ -47,7 +47,7 @@
     <Compile Include="Events_netcoreapp3.1.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework) == 'net5.0-windows' ">
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net5.0')) ">
     <Compile Include="Events_net5.0.cs" />
   </ItemGroup>
 

src/ReactiveUI.Fody.Analyzer.Test/Helpers/CodeFixVerifier.Helper.cs

@@ -3,6 +3,7 @@
 // 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;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -80,6 +81,12 @@ private static string GetStringFromDocument(Document document)
         {
             var simplifiedDoc = Simplifier.ReduceAsync(document, Simplifier.Annotation).Result;
             var root = simplifiedDoc.GetSyntaxRootAsync().Result;
+
+            if (root is null)
+            {
+                throw new InvalidOperationException("The root node for the document is null.");
+            }
+
             root = Formatter.Format(root, Formatter.Annotation, simplifiedDoc.Project.Solution.Workspace);
             return root.GetText().ToString();
         }

src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt

@@ -197,12 +197,10 @@ namespace ReactiveUI
     {
         System.IDisposable BindInteraction<TViewModel, TView, TInput, TOutput>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, ReactiveUI.Interaction<TInput, TOutput>>> propertyName, System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.Threading.Tasks.Task> handler)
             where TViewModel :  class
-            where TView :  class, ReactiveUI.IViewFor
-        ;
+            where TView :  class, ReactiveUI.IViewFor;
         System.IDisposable BindInteraction<TViewModel, TView, TInput, TOutput, TDontCare>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, ReactiveUI.Interaction<TInput, TOutput>>> propertyName, System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.IObservable<TDontCare>> handler)
             where TViewModel :  class
-            where TView :  class, ReactiveUI.IViewFor
-        ;
+            where TView :  class, ReactiveUI.IViewFor;
     }
     public interface IMessageBus : Splat.IEnableLogger
     {
@@ -232,26 +230,21 @@ namespace ReactiveUI
                 "isViewModel"})]
         ReactiveUI.IReactiveBinding<TView, System.ValueTuple<object?, bool>> Bind<TViewModel, TView, TVMProp, TVProp, TDontCare>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TVMProp>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TVProp>> viewProperty, System.IObservable<TDontCare>? signalViewUpdate, System.Func<TVMProp, TVProp> vmToViewConverter, System.Func<TVProp, TVMProp> viewToVmConverter)
             where TViewModel :  class
-            where TView :  class, ReactiveUI.IViewFor
-        ;
+            where TView :  class, ReactiveUI.IViewFor;
         [return: System.Runtime.CompilerServices.TupleElementNames(new string?[]?[] {
                 "view",
                 "isViewModel"})]
         ReactiveUI.IReactiveBinding<TView, System.ValueTuple<object?, bool>> Bind<TViewModel, TView, TVMProp, TVProp, TDontCare>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TVMProp>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TVProp>> viewProperty, System.IObservable<TDontCare>? signalViewUpdate, object? conversionHint, ReactiveUI.IBindingTypeConverter? vmToViewConverterOverride = null, ReactiveUI.IBindingTypeConverter? viewToVMConverterOverride = null)
             where TViewModel :  class
-            where TView :  class, ReactiveUI.IViewFor
-        ;
+            where TView :  class, ReactiveUI.IViewFor;
         System.IDisposable BindTo<TValue, TTarget, TTValue>(System.IObservable<TValue> observedChange, TTarget target, System.Linq.Expressions.Expression<System.Func<TTarget, TTValue>> propertyExpression, object? conversionHint, ReactiveUI.IBindingTypeConverter? vmToViewConverterOverride = null)
-            where TTarget :  class
-        ;
+            where TTarget :  class;
         ReactiveUI.IReactiveBinding<TView, TOut> OneWayBind<TViewModel, TView, TProp, TOut>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TProp>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TOut>> viewProperty, System.Func<TProp, TOut> selector)
             where TViewModel :  class
-            where TView :  class, ReactiveUI.IViewFor
-        ;
+            where TView :  class, ReactiveUI.IViewFor;
         ReactiveUI.IReactiveBinding<TView, TVProp> OneWayBind<TViewModel, TView, TVMProp, TVProp>(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TVMProp>> vmProperty, System.Linq.Expressions.Expression<System.Func<TView, TVProp>> viewProperty, object? conversionHint, ReactiveUI.IBindingTypeConverter? vmToViewConverterOverride = null)
             where TViewModel :  class
-            where TView :  class, ReactiveUI.IViewFor
-        ;
+            where TView :  class, ReactiveUI.IViewFor;
     }
     public interface IPropertyBindingHook
     {

src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj

@@ -28,11 +28,6 @@
       <SubType>UserControl</SubType>
       <DependentUpon>RoutedViewHost.cs</DependentUpon>
     </Compile>
-    <Compile Update="ViewModelViewHost.Designer.cs">
-      <SubType>UserControl</SubType>
-      <DependentUpon>ViewModelViewHost.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <Compile Update="ReactiveUserControl.Designer.cs">
       <SubType>UserControl</SubType>
       <DependentUpon>ReactiveUserControl.cs</DependentUpon>

src/global.json

@@ -1,5 +1,5 @@
 {
     "msbuild-sdks": {
-        "MSBuild.Sdk.Extras": "2.1.2"
+        "MSBuild.Sdk.Extras": "3.0.22"
     }
 }