Skip to content

Commit 5082957

Browse files
glennawatsonglennawatson
committed
housekeeping: Fix the build
1 parent c0279e4 commit 5082957

File tree

8 files changed

+30
-145
lines changed

8 files changed

+30
-145
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
3-
<TargetFrameworks>net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows;net5.0-windows10.0.19041</TargetFrameworks>
44
<RootNamespace>ReactiveUI.Events</RootNamespace>
55
<PackageDescription>Provides Observable-based events API for WPF UI controls &amp; event handlers</PackageDescription>
66
<PackageId>ReactiveUI.Events.WPF</PackageId>
@@ -47,7 +47,7 @@
4747
<Compile Include="Events_netcoreapp3.1.cs" />
4848
</ItemGroup>
4949

50-
<ItemGroup Condition=" $(TargetFramework) == 'net5.0-windows' ">
50+
<ItemGroup Condition=" $(TargetFramework.StartsWith('net5.0')) ">
5151
<Compile Include="Events_net5.0.cs" />
5252
</ItemGroup>
5353

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
3-
<TargetFrameworks>net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows;net5.0-windows10.0.19041</TargetFrameworks>
44
<AssemblyName>ReactiveUI.Events.Winforms</AssemblyName>
55
<RootNamespace>ReactiveUI.Events</RootNamespace>
66
<PackageDescription> Provides Observable-based events API for Win Forms UI controls &amp; event handlers</PackageDescription>
@@ -47,7 +47,7 @@
4747
<Compile Include="Events_netcoreapp3.1.cs" />
4848
</ItemGroup>
4949

50-
<ItemGroup Condition=" $(TargetFramework) == 'net5.0-windows' ">
50+
<ItemGroup Condition=" $(TargetFramework.StartsWith('net5.0')) ">
5151
<Compile Include="Events_net5.0.cs" />
5252
</ItemGroup>
5353

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// The .NET Foundation licenses this file to you under the MIT license.
44
// See the LICENSE file in the project root for full license information.
55

6+
using System;
67
using System.Collections.Generic;
78
using System.Linq;
89
using System.Threading;
@@ -80,6 +81,12 @@ private static string GetStringFromDocument(Document document)
8081
{
8182
var simplifiedDoc = Simplifier.ReduceAsync(document, Simplifier.Annotation).Result;
8283
var root = simplifiedDoc.GetSyntaxRootAsync().Result;
84+
85+
if (root is null)
86+
{
87+
throw new InvalidOperationException("The root node for the document is null.");
88+
}
89+
8390
root = Formatter.Format(root, Formatter.Annotation, simplifiedDoc.Project.Solution.Workspace);
8491
return root.GetText().ToString();
8592
}

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

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,10 @@ namespace ReactiveUI
197197
{
198198
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)
199199
where TViewModel : class
200-
where TView : class, ReactiveUI.IViewFor
201-
;
200+
where TView : class, ReactiveUI.IViewFor;
202201
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)
203202
where TViewModel : class
204-
where TView : class, ReactiveUI.IViewFor
205-
;
203+
where TView : class, ReactiveUI.IViewFor;
206204
}
207205
public interface IMessageBus : Splat.IEnableLogger
208206
{
@@ -232,26 +230,21 @@ namespace ReactiveUI
232230
"isViewModel"})]
233231
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)
234232
where TViewModel : class
235-
where TView : class, ReactiveUI.IViewFor
236-
;
233+
where TView : class, ReactiveUI.IViewFor;
237234
[return: System.Runtime.CompilerServices.TupleElementNames(new string?[]?[] {
238235
"view",
239236
"isViewModel"})]
240237
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)
241238
where TViewModel : class
242-
where TView : class, ReactiveUI.IViewFor
243-
;
239+
where TView : class, ReactiveUI.IViewFor;
244240
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)
245-
where TTarget : class
246-
;
241+
where TTarget : class;
247242
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)
248243
where TViewModel : class
249-
where TView : class, ReactiveUI.IViewFor
250-
;
244+
where TView : class, ReactiveUI.IViewFor;
251245
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)
252246
where TViewModel : class
253-
where TView : class, ReactiveUI.IViewFor
254-
;
247+
where TView : class, ReactiveUI.IViewFor;
255248
}
256249
public interface IPropertyBindingHook
257250
{

‎src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
<SubType>UserControl</SubType>
2929
<DependentUpon>RoutedViewHost.cs</DependentUpon>
3030
</Compile>
31-
<Compile Update="ViewModelViewHost.Designer.cs">
32-
<SubType>UserControl</SubType>
33-
<DependentUpon>ViewModelViewHost.resx</DependentUpon>
34-
<DesignTime>True</DesignTime>
35-
</Compile>
3631
<Compile Update="ReactiveUserControl.Designer.cs">
3732
<SubType>UserControl</SubType>
3833
<DependentUpon>ReactiveUserControl.cs</DependentUpon>

‎src/ReactiveUI.Winforms/ViewModelViewHost.Designer.cs‎

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ReactiveUI.Winforms/ViewModelViewHost.resx‎

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎src/global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"msbuild-sdks": {
3-
"MSBuild.Sdk.Extras": "2.1.2"
3+
"MSBuild.Sdk.Extras": "3.0.22"
44
}
55
}

0 commit comments

Comments
 (0)