diff --git a/src/ReactiveUI.Events.WPF/ReactiveUI.Events.WPF.csproj b/src/ReactiveUI.Events.WPF/ReactiveUI.Events.WPF.csproj index 73cc3485f1..d4a63496b7 100644 --- a/src/ReactiveUI.Events.WPF/ReactiveUI.Events.WPF.csproj +++ b/src/ReactiveUI.Events.WPF/ReactiveUI.Events.WPF.csproj @@ -1,6 +1,6 @@  - net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows + net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows;net5.0-windows10.0.19041 ReactiveUI.Events Provides Observable-based events API for WPF UI controls & event handlers ReactiveUI.Events.WPF @@ -47,7 +47,7 @@ - + diff --git a/src/ReactiveUI.Events.Winforms/ReactiveUI.Events.Winforms.csproj b/src/ReactiveUI.Events.Winforms/ReactiveUI.Events.Winforms.csproj index d0847f58e0..011a0241f3 100644 --- a/src/ReactiveUI.Events.Winforms/ReactiveUI.Events.Winforms.csproj +++ b/src/ReactiveUI.Events.Winforms/ReactiveUI.Events.Winforms.csproj @@ -1,6 +1,6 @@  - net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows + net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows;net5.0-windows10.0.19041 ReactiveUI.Events.Winforms ReactiveUI.Events Provides Observable-based events API for Win Forms UI controls & event handlers @@ -47,7 +47,7 @@ - + diff --git a/src/ReactiveUI.Fody.Analyzer.Test/Helpers/CodeFixVerifier.Helper.cs b/src/ReactiveUI.Fody.Analyzer.Test/Helpers/CodeFixVerifier.Helper.cs index d537bc618e..5dc958927c 100644 --- a/src/ReactiveUI.Fody.Analyzer.Test/Helpers/CodeFixVerifier.Helper.cs +++ b/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(); } diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt index a083f562a8..77a59c8ec4 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt @@ -197,12 +197,10 @@ namespace ReactiveUI { System.IDisposable BindInteraction(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression>> propertyName, System.Func, System.Threading.Tasks.Task> handler) where TViewModel : class - where TView : class, ReactiveUI.IViewFor - ; + where TView : class, ReactiveUI.IViewFor; System.IDisposable BindInteraction(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression>> propertyName, System.Func, System.IObservable> 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> Bind(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression> vmProperty, System.Linq.Expressions.Expression> viewProperty, System.IObservable? signalViewUpdate, System.Func vmToViewConverter, System.Func 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> Bind(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression> vmProperty, System.Linq.Expressions.Expression> viewProperty, System.IObservable? 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(System.IObservable observedChange, TTarget target, System.Linq.Expressions.Expression> propertyExpression, object? conversionHint, ReactiveUI.IBindingTypeConverter? vmToViewConverterOverride = null) - where TTarget : class - ; + where TTarget : class; ReactiveUI.IReactiveBinding OneWayBind(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression> vmProperty, System.Linq.Expressions.Expression> viewProperty, System.Func selector) where TViewModel : class - where TView : class, ReactiveUI.IViewFor - ; + where TView : class, ReactiveUI.IViewFor; ReactiveUI.IReactiveBinding OneWayBind(TViewModel? viewModel, TView view, System.Linq.Expressions.Expression> vmProperty, System.Linq.Expressions.Expression> viewProperty, object? conversionHint, ReactiveUI.IBindingTypeConverter? vmToViewConverterOverride = null) where TViewModel : class - where TView : class, ReactiveUI.IViewFor - ; + where TView : class, ReactiveUI.IViewFor; } public interface IPropertyBindingHook { diff --git a/src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj b/src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj index ce07bb0c09..045959a153 100644 --- a/src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj +++ b/src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj @@ -28,11 +28,6 @@ UserControl RoutedViewHost.cs - - UserControl - ViewModelViewHost.resx - True - UserControl ReactiveUserControl.cs diff --git a/src/ReactiveUI.Winforms/ViewModelViewHost.Designer.cs b/src/ReactiveUI.Winforms/ViewModelViewHost.Designer.cs index 2e6df19fa4..e35ef24c23 100644 --- a/src/ReactiveUI.Winforms/ViewModelViewHost.Designer.cs +++ b/src/ReactiveUI.Winforms/ViewModelViewHost.Designer.cs @@ -1,4 +1,14 @@ -namespace ReactiveUI.Winforms +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace ReactiveUI.Winforms { partial class ViewModelControlHost { diff --git a/src/ReactiveUI.Winforms/ViewModelViewHost.resx b/src/ReactiveUI.Winforms/ViewModelViewHost.resx deleted file mode 100644 index 1af7de150c..0000000000 --- a/src/ReactiveUI.Winforms/ViewModelViewHost.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/src/global.json b/src/global.json index f8f6c586df..554be86427 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "MSBuild.Sdk.Extras": "2.1.2" + "MSBuild.Sdk.Extras": "3.0.22" } }