Skip to content
Permalink
Browse files

housekeeping: Update to splat 9 (#2173)

  • Loading branch information...
glennawatson committed Sep 20, 2019
1 parent 721c4a2 commit eb2dff2611b762ae94d4f8762052a2c3e826ba03
Showing with 62 additions and 73 deletions.
  1. +1 −1 integrationtests/IntegrationTests.WPF/IntegrationTests.WPF.csproj
  2. +1 −1 integrationtests/IntegrationTests.WinForms/IntegrationTests.WinForms.csproj
  3. +4 −1 integrationtests/global.json
  4. +3 −5 src/ReactiveUI.Events.WPF/ReactiveUI.Events.WPF.csproj
  5. +2 −10 src/ReactiveUI.Events.Winforms/ReactiveUI.Events.Winforms.csproj
  6. +0 −1 src/ReactiveUI.Fody.Tests/FodyWeavers.xsd
  7. +3 −3 src/ReactiveUI.Splat.Tests/ReactiveUI.Splat.Tests.csproj
  8. +0 −1 src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net461.approved.txt
  9. +0 −1 src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp2.0.approved.txt
  10. +0 −1 src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.0.approved.txt
  11. +10 −3 src/ReactiveUI.Tests/Platforms/common-gui/ProductionMode.cs
  12. +4 −0 src/ReactiveUI.Uno/ReactiveUI.Uno.csproj
  13. +4 −0 src/ReactiveUI.Uno/Registrations.cs
  14. +4 −1 src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj
  15. +1 −0 src/ReactiveUI.Winforms/Registrations.cs
  16. +4 −1 src/ReactiveUI.Wpf/ReactiveUI.Wpf.csproj
  17. +2 −1 src/ReactiveUI.Wpf/Registrations.cs
  18. +2 −0 src/ReactiveUI/Platforms/android/PlatformRegistrations.cs
  19. +2 −0 src/ReactiveUI/Platforms/mac/PlatformRegistrations.cs
  20. +1 −0 src/ReactiveUI/Platforms/net4/PlatformRegistrations.cs
  21. +2 −0 src/ReactiveUI/Platforms/tizen/PlatformRegistrations.cs
  22. +2 −0 src/ReactiveUI/Platforms/uap/PlatformRegistrations.cs
  23. +2 −0 src/ReactiveUI/Platforms/uikit-common/PlatformRegistrations.cs
  24. +8 −1 src/ReactiveUI/ReactiveUI.csproj
  25. +0 −37 src/ReactiveUI/RxApp.cs
  26. +0 −4 tools/packages.config
@@ -3,7 +3,7 @@
<TargetFrameworks>net471</TargetFrameworks>
<Description>WPF specific example of IntegrationTests</Description>
<PackageId>IntegrationTests.WPF</PackageId>
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
<UseWpf>true</ExtrasEnableWpfProjectSetup>
<OutputType>WinExe</OutputType>
</PropertyGroup>

@@ -3,7 +3,7 @@
<TargetFrameworks>net471</TargetFrameworks>
<Description>Winforms specific example of IntegrationTests</Description>
<PackageId>IntegrationTests.WinForms</PackageId>
<ExtrasEnableWinFormsProjectSetup>true</ExtrasEnableWinFormsProjectSetup>
<UseWindowsForms>true</UseWindowsForms>
<OutputType>WinExe</OutputType>
</PropertyGroup>

@@ -1,5 +1,8 @@
{
"sdk": {
"version": "3.0.100-preview"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "1.6.65"
"MSBuild.Sdk.Extras": "2.0.43"
}
}
@@ -5,7 +5,7 @@
<Description>Provides Observable-based events API for WPF UI controls/eventhandlers. The contents of this package is automatically generated, please target pull-requests to the code generator.</Description>
<PackageId>ReactiveUI.Events.WPF</PackageId>
<UseWpf>true</UseWpf>
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
<UseWindowsForms>true</UseWindowsForms>
<NoWarn>$(NoWarn);CS1570;CA1812</NoWarn>
</PropertyGroup>

@@ -28,13 +28,11 @@
</Otherwise>
</Choose>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netcoreapp3')) ">
<PackageReference Include="Pharmacist.MsBuild" Version="1.*" PrivateAssets="all" />
<PackageReference Include="Microsoft.WindowsDesktop.App" Version="3.0.0-preview*" />
<ItemGroup>
<Compile Include="Events_WPF.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
<Compile Include="Events_WPF.cs" />
<Reference Include="System.Xaml" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
@@ -5,7 +5,6 @@
<RootNamespace>ReactiveUI.Events</RootNamespace>
<Description>Provides Observable-based events API for Winforms UI controls/eventhandlers. The contents of this package is automatically generated, please target pull-requests to the code generator.</Description>
<PackageId>ReactiveUI.Events.Winforms</PackageId>
<ExtrasEnableWinFormsProjectSetup>true</ExtrasEnableWinFormsProjectSetup>
<UseWindowsForms>true</UseWindowsForms>
<NoWarn>$(NoWarn);CS1570;CA1812</NoWarn>
</PropertyGroup>
@@ -29,20 +28,13 @@
</Otherwise>
</Choose>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netcoreapp3')) ">
<PackageReference Include="Pharmacist.MsBuild" Version="1.*" PrivateAssets="all" />
<PackageReference Include="Microsoft.WindowsDesktop.App" Version="3.0.0-preview.*" />
<ItemGroup>
<Compile Include="Events_Winforms.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
<Compile Include="Events_Winforms.cs" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.Drawing" />
<Reference Include="System.Messaging" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Forms.DataVisualization" />
<Reference Include="System.ServiceProcess" />
</ItemGroup>
</Project>
@@ -4,7 +4,6 @@
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<xs:element name="ReactiveUI.Fody.deps" minOccurs="0" maxOccurs="1" type="xs:anyType" />
<xs:element name="ReactiveUI" minOccurs="0" maxOccurs="1" type="xs:anyType" />
</xs:all>
<xs:attribute name="VerifyAssembly" type="xs:boolean">
@@ -8,9 +8,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Splat.Autofac" Version="8.*" />
<PackageReference Include="Splat.DryIoc" Version="8.*" />
<PackageReference Include="Splat.Ninject" Version="8.*" />
<PackageReference Include="Splat.Autofac" Version="9.*" />
<PackageReference Include="Splat.DryIoc" Version="9.*" />
<PackageReference Include="Splat.Ninject" Version="9.*" />
</ItemGroup>

<ItemGroup>
@@ -624,7 +624,6 @@ namespace ReactiveUI
public const int SmallCacheLimit = 64;
public static System.IObserver<System.Exception> DefaultExceptionHandler { get; set; }
public static System.Reactive.Concurrency.IScheduler MainThreadScheduler { get; set; }
public static bool SupportsRangeNotifications { get; set; }
public static bool SuppressViewCommandBindingMessage { get; set; }
public static ReactiveUI.ISuspensionHost SuspensionHost { get; set; }
public static System.Reactive.Concurrency.IScheduler TaskpoolScheduler { get; set; }
@@ -618,7 +618,6 @@ namespace ReactiveUI
public const int SmallCacheLimit = 64;
public static System.IObserver<System.Exception> DefaultExceptionHandler { get; set; }
public static System.Reactive.Concurrency.IScheduler MainThreadScheduler { get; set; }
public static bool SupportsRangeNotifications { get; set; }
public static bool SuppressViewCommandBindingMessage { get; set; }
public static ReactiveUI.ISuspensionHost SuspensionHost { get; set; }
public static System.Reactive.Concurrency.IScheduler TaskpoolScheduler { get; set; }
@@ -624,7 +624,6 @@ namespace ReactiveUI
public const int SmallCacheLimit = 64;
public static System.IObserver<System.Exception> DefaultExceptionHandler { get; set; }
public static System.Reactive.Concurrency.IScheduler MainThreadScheduler { get; set; }
public static bool SupportsRangeNotifications { get; set; }
public static bool SuppressViewCommandBindingMessage { get; set; }
public static ReactiveUI.ISuspensionHost SuspensionHost { get; set; }
public static System.Reactive.Concurrency.IScheduler TaskpoolScheduler { get; set; }
@@ -9,12 +9,19 @@

namespace ReactiveUI.Tests
{
internal class ProductionMode : IModeDetector
internal class ProductionMode : IModeDetector, IPlatformModeDetector
{
private static ProductionMode Instance = new ProductionMode();

public static IDisposable Set()
{
ModeDetector.OverrideModeDetector(new ProductionMode());
return Disposable.Create(() => ModeDetector.OverrideModeDetector(new PlatformModeDetector()));
PlatformModeDetector.OverrideModeDetector(Instance);
ModeDetector.OverrideModeDetector(Instance);
return Disposable.Create(() =>
{
PlatformModeDetector.OverrideModeDetector(new DefaultPlatformModeDetector());
ModeDetector.OverrideModeDetector(new DefaultModeDetector());
});
}

public bool? InUnitTestRunner()
@@ -13,6 +13,10 @@
<DefineConstants>HAS_UNO;WASM</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Splat.Drawing" Version="9.0.4" />
</ItemGroup>

<ItemGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
<PackageReference Include="Uno.UI" Version="1.*" />
</ItemGroup>
@@ -6,6 +6,7 @@
using System;
using System.Reactive.Concurrency;
using System.Reactive.PlatformServices;
using Splat;

namespace ReactiveUI.Uno
{
@@ -28,6 +29,9 @@ public void Register(Action<Func<object>, Type> registerFunction)
registerFunction(() => new DependencyObjectObservableForProperty(), typeof(ICreatesObservableForProperty));
registerFunction(() => new BooleanToVisibilityTypeConverter(), typeof(IBindingTypeConverter));
registerFunction(() => new AutoDataTemplateBindingHook(), typeof(IPropertyBindingHook));
#if !NETSTANDARD
registerFunction(() => new PlatformBitmapLoader(), typeof(IBitmapLoader));
#endif

// Re-enable once the obsolete code in Uno has been worked out.
////registerFunction(() => new WinRTAppDataDriver(), typeof(ISuspensionDriver));
@@ -7,14 +7,17 @@
<Description>Windows Forms specific extensions to ReactiveUI</Description>
<PackageId>ReactiveUI.WinForms</PackageId>
<UseWindowsForms>true</UseWindowsForms>
<ExtrasEnableWinFormsProjectSetup>true</ExtrasEnableWinFormsProjectSetup>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Splat.Drawing" Version="9.*" />
</ItemGroup>

<Choose>
<When Condition=" $(TargetFramework.StartsWith('netcoreapp3.0')) ">
<ItemGroup>
@@ -34,6 +34,7 @@ public void Register(Action<Func<object>, Type> registerFunction)
registerFunction(() => new PanelSetMethodBindingConverter(), typeof(ISetMethodBindingConverter));
registerFunction(() => new TableContentSetMethodBindingConverter(), typeof(ISetMethodBindingConverter));
registerFunction(() => new ComponentModelTypeConverter(), typeof(IBindingTypeConverter));
registerFunction(() => new PlatformBitmapLoader(), typeof(IBitmapLoader));

if (!ModeDetector.InUnitTestRunner())
{
@@ -4,7 +4,6 @@
<Description>WPF specific extensions to ReactiveUI</Description>
<PackageId>ReactiveUI.WPF</PackageId>
<UseWpf>true</UseWpf>
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
<LangVersion>latest</LangVersion>
</PropertyGroup>

@@ -13,6 +12,10 @@
<Compile Include="..\ReactiveUI\Platforms\windows-common\**\*.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Splat.Drawing" Version="9.*" />
</ItemGroup>

<Choose>
<When Condition=" $(TargetFramework.StartsWith('netcoreapp3.0')) ">
<ItemGroup>
@@ -5,8 +5,8 @@

using System;
using System.Reactive.Concurrency;

using ReactiveUI;
using Splat;

namespace ReactiveUI.Wpf
{
@@ -30,6 +30,7 @@ public void Register(Action<Func<object>, Type> registerFunction)
registerFunction(() => new BooleanToVisibilityTypeConverter(), typeof(IBindingTypeConverter));
registerFunction(() => new AutoDataTemplateBindingHook(), typeof(IPropertyBindingHook));
registerFunction(() => new ComponentModelTypeConverter(), typeof(IBindingTypeConverter));
registerFunction(() => new PlatformBitmapLoader(), typeof(IBitmapLoader));

RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;

@@ -5,6 +5,7 @@

using System;
using System.Reactive.Concurrency;
using Splat;

namespace ReactiveUI
{
@@ -29,6 +30,7 @@ public void Register(Action<Func<object>, Type> registerFunction)
RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
RxApp.MainThreadScheduler = HandlerScheduler.MainThreadScheduler;
registerFunction(() => new BundleSuspensionDriver(), typeof(ISuspensionDriver));
registerFunction(() => new PlatformBitmapLoader(), typeof(IBitmapLoader));
}
}
}
@@ -5,6 +5,7 @@

using System;
using System.Reactive.Concurrency;
using Splat;

namespace ReactiveUI
{
@@ -28,6 +29,7 @@ public void Register(Action<Func<object>, Type> registerFunction)
registerFunction(() => new TargetActionCommandBinder(), typeof(ICreatesCommandBinding));
registerFunction(() => new DateTimeNSDateConverter(), typeof(IBindingTypeConverter));
registerFunction(() => new KVOObservableForProperty(), typeof(ICreatesObservableForProperty));
registerFunction(() => new PlatformBitmapLoader(), typeof(IBitmapLoader));
RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(() => new NSRunloopScheduler());
registerFunction(() => new AppSupportJsonSuspensionDriver(), typeof(ISuspensionDriver));
@@ -5,6 +5,7 @@

using System;
using System.Reactive.Concurrency;
using Splat;

namespace ReactiveUI
{
@@ -5,6 +5,7 @@

using System;
using System.Reactive.Concurrency;
using Splat;

namespace ReactiveUI
{
@@ -24,6 +25,7 @@ public void Register(Action<Func<object>, Type> registerFunction)

registerFunction(() => new PlatformOperations(), typeof(IPlatformOperations));
registerFunction(() => new ComponentModelTypeConverter(), typeof(IBindingTypeConverter));
registerFunction(() => new PlatformBitmapLoader(), typeof(IBitmapLoader));
RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
RxApp.MainThreadScheduler = EcoreMainloopScheduler.MainThreadScheduler;
}
@@ -5,6 +5,7 @@

using System;
using System.Reactive.Concurrency;
using Splat;

namespace ReactiveUI
{
@@ -30,6 +31,7 @@ public void Register(Action<Func<object>, Type> registerFunction)
RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
RxApp.MainThreadScheduler = new SingleWindowDispatcherScheduler();
registerFunction(() => new WinRTAppDataDriver(), typeof(ISuspensionDriver));
registerFunction(() => new PlatformBitmapLoader(), typeof(IBitmapLoader));
}
}
}
@@ -5,6 +5,7 @@

using System;
using System.Reactive.Concurrency;
using Splat;

namespace ReactiveUI
{
@@ -31,6 +32,7 @@ public void Register(Action<Func<object>, Type> registerFunction)
RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(() => new NSRunloopScheduler());
registerFunction(() => new AppSupportJsonSuspensionDriver(), typeof(ISuspensionDriver));
registerFunction(() => new PlatformBitmapLoader(), typeof(IBitmapLoader));
}
}
}
@@ -12,7 +12,7 @@
<ItemGroup>
<Compile Remove="Platforms\**\*.cs" />
<None Include="Platforms\**\*.cs" />
<PackageReference Include="Splat" Version="8.*" />
<PackageReference Include="Splat" Version="9.*" />
<PackageReference Include="DynamicData" Version="6.*" />
<PackageReference Include="System.Reactive" Version="4.1.6" />
</ItemGroup>
@@ -28,6 +28,7 @@
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
<Compile Include="Platforms\net4\**\*.cs" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="Splat.Drawing" Version="9.*" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard2')) ">
@@ -37,6 +38,7 @@
<ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
<Compile Include="Platforms\windows-common\**\*.cs" />
<Compile Include="Platforms\uap\**\*.cs" />
<PackageReference Include="Splat.Drawing" Version="9.*" />
</ItemGroup>

<ItemGroup Label="Package" Condition=" $(TargetFramework.StartsWith('uap')) ">
@@ -49,6 +51,7 @@
<Compile Include="Platforms\uikit-common\**\*.cs" />
<Compile Include="Platforms\xamarin-common\**\*.cs" />
<Reference Include="System.Runtime.Serialization" />
<PackageReference Include="Splat.Drawing" Version="9.*" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">
@@ -57,6 +60,7 @@
<Compile Include="Platforms\xamarin-common\**\*.cs" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="netstandard" />
<PackageReference Include="Splat.Drawing" Version="9.*" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.TVOS')) ">
@@ -65,12 +69,14 @@
<Compile Include="Platforms\uikit-common\**\*.cs" />
<Compile Include="Platforms\xamarin-common\**\*.cs" />
<Reference Include="System.Runtime.Serialization" />
<PackageReference Include="Splat.Drawing" Version="9.*" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
<Compile Include="Platforms\android\**\*.cs" />
<Compile Include="Platforms\xamarin-common\**\*.cs" />
<Reference Include="System.Runtime.Serialization" />
<PackageReference Include="Splat.Drawing" Version="9.*" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netcoreapp2')) ">
@@ -96,6 +102,7 @@
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
<PackageReference Include="System.Threading" Version="4.3.0" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="Splat.Drawing" Version="9.*" />
</ItemGroup>

<ItemGroup>

0 comments on commit eb2dff2

Please sign in to comment.
You can’t perform that action at this time.