Skip to content
Permalink
Browse files

housekeeping: Update to UAP 10.0.17763.0 (#1988)

housekeeping: Update to UAP 10.0.17763.0
Update to UAP 10.0.17763.0
Now using the generic conditions for the csproj.
Update various nuget packages in the Directory.Build.Props

This allows us to compile under visual studio 2019 on azure devops.
  • Loading branch information...
glennawatson committed Apr 20, 2019
1 parent 8f29899 commit 196433808c46cf8404502350664d70ccd7e4ebec
Showing with 354 additions and 27 deletions.
  1. +1 −1 .github/CODEOWNERS
  2. +5 −5 src/Directory.build.props
  3. +6 −0 src/Directory.build.targets
  4. +1 −1 src/EventBuilder/Platforms/UWP.cs
  5. +13 −0 src/ReactiveUI.AndroidSupport/ReactiveAppCompatActivity.cs
  6. +12 −0 src/ReactiveUI.AndroidSupport/ReactiveDialogFragment.cs
  7. +12 −0 src/ReactiveUI.AndroidSupport/ReactiveFragment.cs
  8. +13 −0 src/ReactiveUI.AndroidSupport/ReactiveFragmentActivity.cs
  9. +6 −1 src/ReactiveUI.AndroidSupport/ReactivePagerAdapter.cs
  10. +6 −1 src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewAdapter.cs
  11. 0 src/ReactiveUI.Blend/Platforms/{uap10.0.16299 → uap}/Behavior.cs
  12. 0 src/ReactiveUI.Blend/Platforms/{uap10.0.16299 → uap}/ObservableTriggerBehavior.cs
  13. +4 −4 src/ReactiveUI.Blend/ReactiveUI.Blend.csproj
  14. +3 −3 src/ReactiveUI.Events/ReactiveUI.Events.csproj
  15. +1 −1 src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj
  16. +0 −1 src/ReactiveUI.Fody.Tests/FodyWeavers.xsd
  17. +1 −1 src/ReactiveUI.Testing/ReactiveUI.Testing.csproj
  18. +1 −1 src/ReactiveUI.Tests/ReactiveUI.Tests.csproj
  19. +13 −0 src/ReactiveUI/Platforms/android/ReactiveActivity.cs
  20. +12 −0 src/ReactiveUI/Platforms/android/ReactiveFragment.cs
  21. +13 −0 src/ReactiveUI/Platforms/android/ReactivePreferenceActivity.cs
  22. +12 −0 src/ReactiveUI/Platforms/android/ReactivePreferenceFragment.cs
  23. +12 −0 src/ReactiveUI/Platforms/apple-common/ReactiveControl.cs
  24. +12 −0 src/ReactiveUI/Platforms/apple-common/ReactiveImageView.cs
  25. +12 −0 src/ReactiveUI/Platforms/apple-common/ReactiveSplitViewController.cs
  26. +12 −0 src/ReactiveUI/Platforms/apple-common/ReactiveView.cs
  27. +12 −0 src/ReactiveUI/Platforms/apple-common/ReactiveViewController.cs
  28. +1 −0 src/ReactiveUI/Platforms/mac/AutoSuspendHelper.cs
  29. +12 −0 src/ReactiveUI/Platforms/mac/ReactiveWindowController.cs
  30. 0 src/ReactiveUI/Platforms/{uap10.0.16299 → uap}/ActivationForViewFetcher.cs
  31. 0 src/ReactiveUI/Platforms/{uap10.0.16299 → uap}/AutoSuspendHelper.cs
  32. 0 src/ReactiveUI/Platforms/{uap10.0.16299 → uap}/DependencyObjectObservableForProperty.cs
  33. 0 src/ReactiveUI/Platforms/{uap10.0.16299 → uap}/PlatformRegistrations.cs
  34. 0 src/ReactiveUI/Platforms/{uap10.0.16299 → uap}/ReactiveUI.rd.xml
  35. 0 src/ReactiveUI/Platforms/{uap10.0.16299 → uap}/TransitioningContentControl.Empty.cs
  36. 0 src/ReactiveUI/Platforms/{uap10.0.16299 → uap}/WinRTAppDataDriver.cs
  37. +2 −1 src/ReactiveUI/Platforms/uikit-common/CommonReactiveSource.cs
  38. +12 −0 src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionReusableView.cs
  39. +12 −0 src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionView.cs
  40. +12 −0 src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewCell.cs
  41. +12 −0 src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewController.cs
  42. +2 −1 src/ReactiveUI/Platforms/uikit-common/ReactiveCollectionViewSource.cs
  43. +12 −0 src/ReactiveUI/Platforms/uikit-common/ReactiveNavigationController.cs
  44. +12 −0 src/ReactiveUI/Platforms/uikit-common/ReactivePageViewController.cs
  45. +12 −0 src/ReactiveUI/Platforms/uikit-common/ReactiveTabBarController.cs
  46. +12 −0 src/ReactiveUI/Platforms/uikit-common/ReactiveTableView.cs
  47. +12 −0 src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewCell.cs
  48. +12 −0 src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewController.cs
  49. +3 −1 src/ReactiveUI/Platforms/uikit-common/ReactiveTableViewSource.cs
  50. +11 −0 src/ReactiveUI/Platforms/uikit-common/RoutedViewHost.cs
  51. +3 −3 src/ReactiveUI/ReactiveUI.csproj
  52. +2 −0 src/ReactiveUI/Scheduler/ScheduledSubject.cs
  53. +2 −1 src/analyzers.ruleset
  54. +1 −0 src/analyzers.tests.ruleset
@@ -25,7 +25,7 @@ src/ReactiveUI/Platforms/ios/* @reactiveui/ios-team
src/ReactiveUI/Platforms/mac/* @reactiveui/mac-team
src/ReactiveUI/Platforms/net461/* @reactiveui/wpf-team @reactiveui/winforms-team
src/ReactiveUI/Platforms/netcoreapp2.0/* @reactiveui/dotnetcore-team @reactiveui/webassembly-team
src/ReactiveUI/Platforms/uap10.0.16299/* @reactiveui/uwp-team
src/ReactiveUI/Platforms/uap/* @reactiveui/uwp-team
src/ReactiveUI/Platforms/tizen/* @reactiveui/tizen-team
src/ReactiveUI/Platforms/tvos/* @reactiveui/tvos-team
src/ReactiveUI/Platforms/windows-common/* @reactiveui/wpf-team @reactiveui/winforms-team @reactiveui/uwp-team
@@ -1,7 +1,6 @@
<Project>
<PropertyGroup>
<Owners>xpaulbettsx;ghuntley</Owners>
<Product>ReactiveUI ($(TargetFramework))</Product>
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;ios;mac;forms;monodroid;monotouch;xamarin.android;xamarin.ios;xamarin.forms;xamarin.mac;xamarin.tvos;wpf;net;netstandard;net461;uwp;tizen</PackageTags>
<PackageReleaseNotes>https://reactiveui.net/blog/</PackageReleaseNotes>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -28,12 +27,12 @@
</PropertyGroup>

<ItemGroup Condition="$(IsTestProject)">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Xunit.StaFact" Version="0.3.13" />
<PackageReference Include="Shouldly" Version=" 3.0.2" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.0.0" />
<PackageReference Include="PublicApiGenerator" Version="8.1.0" />
</ItemGroup>
@@ -59,9 +58,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="stylecop.analyzers" Version="1.1.1-rc.94" PrivateAssets="all" />
<PackageReference Include="stylecop.analyzers" Version="1.1.1-rc.114" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3" PrivateAssets="all" />
<PackageReference Include="Roslynator.Analyzers" Version="2.0.0" PrivateAssets="All" />
<PackageReference Include="Roslynator.Analyzers" Version="2.1.0-rc" PrivateAssets="All" />
<PackageReference Condition="'$(OS)' == 'Windows_NT'" Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.2" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
@@ -1,4 +1,10 @@
<Project>
<!-- This props all need to be set in targets as they depend on the values set earlier -->

<PropertyGroup>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
<DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
</PropertyGroup>
@@ -25,7 +25,7 @@ public override Task Extract()
throw new NotSupportedException("Building events for UWP on Mac is not implemented yet.");
}

Assemblies.Add(@"C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd");
Assemblies.Add(@"C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd");

return Task.CompletedTask;
}
@@ -204,5 +204,18 @@ protected override void OnActivityResult(int requestCode, Result resultCode, Int
base.OnActivityResult(requestCode, resultCode, data);
_activityResult.OnNext(Tuple.Create(requestCode, resultCode, data));
}

/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
_activated?.Dispose();
_deactivated?.Dispose();
_activityResult?.Dispose();
}

base.Dispose(disposing);
}
}
}
@@ -126,5 +126,17 @@ public override void OnResume()
base.OnResume();
_activated.OnNext(Unit.Default);
}

/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
_activated?.Dispose();
_deactivated?.Dispose();
}

base.Dispose(disposing);
}
}
}
@@ -144,5 +144,17 @@ public override void OnResume()
base.OnResume();
_activated.OnNext(Unit.Default);
}

/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
_activated?.Dispose();
_deactivated?.Dispose();
}

base.Dispose(disposing);
}
}
}
@@ -189,5 +189,18 @@ protected override void OnActivityResult(int requestCode, Result resultCode, Int
base.OnActivityResult(requestCode, resultCode, data);
_activityResult.OnNext(Tuple.Create(requestCode, resultCode, data));
}

/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
_activated?.Dispose();
_deactivated?.Dispose();
_activityResult?.Dispose();
}

base.Dispose(disposing);
}
}
}
@@ -90,8 +90,13 @@ public override void DestroyItem(ViewGroup container, int position, Object @obje
/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
Interlocked.Exchange(ref _inner, Disposable.Empty).Dispose();
_list?.Dispose();
}

base.Dispose(disposing);
Interlocked.Exchange(ref _inner, Disposable.Empty).Dispose();
}
}

@@ -61,8 +61,13 @@ public override void OnBindViewHolder(RecyclerView.ViewHolder holder, int positi
/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
Interlocked.Exchange(ref _inner, Disposable.Empty).Dispose();
_list?.Dispose();
}

base.Dispose(disposing);
Interlocked.Exchange(ref _inner, Disposable.Empty).Dispose();
}

private void UpdateBindings(Change<TViewModel> change)
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">

<PropertyGroup>
<TargetFrameworks>net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks>net461;uap10.0.17763</TargetFrameworks>
<AssemblyName>ReactiveUI.Blend</AssemblyName>
<RootNamespace>ReactiveUI.Blend</RootNamespace>
<Description>Blend behaviors for ReactiveUI</Description>
@@ -13,7 +13,7 @@
<None Include="Platforms\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
<Compile Include="Platforms\net461\**\*.cs" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
@@ -23,8 +23,8 @@
<PackageReference Include="Expression.Blend.Sdk" Version="1.0.2" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0.16299' ">
<Compile Include="Platforms\uap10.0.16299\**\*.cs" />
<ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
<Compile Include="Platforms\uap\**\*.cs" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.0" />
</ItemGroup>

@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;tizen40</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.17763</TargetFrameworks>
<AssemblyName>ReactiveUI.Events</AssemblyName>
<RootNamespace>ReactiveUI.Events</RootNamespace>
<Description>Provides Observable-based events API for common UI controls/eventhandlers. The contents of this package is automatically generated, please target pull-requests to the code generator.</Description>
@@ -18,10 +18,10 @@

<ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
<Compile Include="Events_UWP.cs" Condition="Exists('Events_UWP.cs')" />
<SDKReference Include="WindowsDesktop, Version=10.0.16299.0">
<SDKReference Include="WindowsDesktop, Version=10.0.17763.0">
<Name>Windows Desktop Extensions for the UWP</Name>
</SDKReference>
<SDKReference Include="WindowsMobile, Version=10.0.16299.0">
<SDKReference Include="WindowsMobile, Version=10.0.17763.0">
<Name>Windows Mobile Extensions for the UWP</Name>
</SDKReference>
</ItemGroup>
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.17763</TargetFrameworks>
<Description>Fody extension to generate RaisePropertyChange notifications for properties and ObservableAsPropertyHelper properties.</Description>

<!-- Override FodyPackaging since project is named differently than expected -->
@@ -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">
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp2.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.17763</TargetFrameworks>
<AssemblyName>ReactiveUI.Testing</AssemblyName>
<RootNamespace>ReactiveUI.Testing</RootNamespace>
<Description>A library to aid in writing unit tests for ReactiveUI projects</Description>
@@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;uap10.0.17763</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
@@ -217,5 +217,18 @@ protected override void OnActivityResult(int requestCode, Result resultCode, Int
base.OnActivityResult(requestCode, resultCode, data);
_activityResult.OnNext(Tuple.Create(requestCode, resultCode, data));
}

/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
_activated?.Dispose();
_deactivated?.Dispose();
_activityResult?.Dispose();
}

base.Dispose(disposing);
}
}
}
@@ -157,5 +157,17 @@ public override void OnResume()
base.OnResume();
_activated.OnNext(Unit.Default);
}

/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
_activated?.Dispose();
_deactivated?.Dispose();
}

base.Dispose(disposing);
}
}
}
@@ -217,5 +217,18 @@ protected override void OnResume()
base.OnResume();
_activated.OnNext(Unit.Default);
}

/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
_activated?.Dispose();
_deactivated?.Dispose();
_activityResult?.Dispose();
}

base.Dispose(disposing);
}
}
}
@@ -145,5 +145,17 @@ public override void OnResume()
base.OnResume();
_activated.OnNext(Unit.Default);
}

/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
_activated?.Dispose();
_deactivated?.Dispose();
}

base.Dispose(disposing);
}
}
}
@@ -159,6 +159,18 @@ public IDisposable SuppressChangeNotifications()
{
return IReactiveObjectExtensions.SuppressChangeNotifications(this);
}

/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
_activated?.Dispose();
_deactivated?.Dispose();
}

base.Dispose(disposing);
}
}

/// <summary>
@@ -172,6 +172,18 @@ void ICanForceManualActivation.Activate(bool activate)
RxApp.MainThreadScheduler.Schedule(() =>
(activate ? _activated : _deactivated).OnNext(Unit.Default));
}

/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
_activated?.Dispose();
_deactivated?.Dispose();
}

base.Dispose(disposing);
}
}

/// <summary>
@@ -165,6 +165,18 @@ public override void ViewDidDisappear()
this.ActivateSubviews(false);
}
#endif

/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
_activated?.Dispose();
_deactivated?.Dispose();
}

base.Dispose(disposing);
}
}

/// <summary>
Oops, something went wrong.

0 comments on commit 1964338

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