From f0899494dea2f43b9eaa3cb3c53249e81f75956e Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Thu, 15 Nov 2018 19:35:21 -0800 Subject: [PATCH] Updated android versions. Moved some of the directory.build.props files around --- directory.build.props | 11 +++++++++++ src/Directory.build.props | 11 ----------- src/EventBuilder/Platforms/Android.cs | 2 +- .../ReactiveUI.AndroidSupport.csproj | 2 +- src/ReactiveUI.Events/ReactiveUI.Events.csproj | 4 ++-- .../ReactiveUI.Fody.Helpers.csproj | 2 +- src/ReactiveUI.Testing/ReactiveUI.Testing.csproj | 2 +- src/ReactiveUI/ReactiveUI.csproj | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/directory.build.props b/directory.build.props index 23ae10a974..6ebaf4e328 100644 --- a/directory.build.props +++ b/directory.build.props @@ -1,6 +1,17 @@ + .NET Foundation and Contributors $(MSBuildThisFileDirectory)reactiveui.ruleset + Copyright (c) .NET Foundation and Contributors + https://opensource.org/licenses/mit + https://reactiveui.net + https://i.imgur.com/7WDbqSy.png + xpaulbettsx;ghuntley + ReactiveUI ($(TargetFramework)) + 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 + https://reactiveui.net/blog/ + https://github.com/reactiveui/reactiveui + git true diff --git a/src/Directory.build.props b/src/Directory.build.props index 254d3a1fca..d22ac479bb 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -1,16 +1,5 @@ - Copyright (c) .NET Foundation and Contributors - https://opensource.org/licenses/mit - https://reactiveui.net - https://i.imgur.com/7WDbqSy.png - .NET Foundation and Contributors - xpaulbettsx;ghuntley - ReactiveUI ($(TargetFramework)) - 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 - https://reactiveui.net/blog/ - https://github.com/reactiveui/reactiveui - git true true $(NoWarn);1591;1701;1702;1705 diff --git a/src/EventBuilder/Platforms/Android.cs b/src/EventBuilder/Platforms/Android.cs index 1f9bff0768..c95a52f189 100644 --- a/src/EventBuilder/Platforms/Android.cs +++ b/src/EventBuilder/Platforms/Android.cs @@ -44,7 +44,7 @@ public Android(string referenceAssembliesLocation) SearchOption.AllDirectories); // Pin to a particular framework version https://github.com/reactiveui/ReactiveUI/issues/1517 - var latestVersion = assemblies.Last(x => x.Contains("v8")); + var latestVersion = assemblies.Last(x => x.Contains("v8.1")); Assemblies.Add(latestVersion); CecilSearchDirectories.Add(Path.GetDirectoryName(latestVersion)); diff --git a/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj b/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj index 521e4d0270..99ef5baa24 100644 --- a/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj +++ b/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj @@ -1,7 +1,7 @@  - MonoAndroid80 + MonoAndroid81 ReactiveUI.AndroidSupport ReactiveUI.AndroidSupport ReactiveUI extensions for the Android Support Library diff --git a/src/ReactiveUI.Events/ReactiveUI.Events.csproj b/src/ReactiveUI.Events/ReactiveUI.Events.csproj index 2c9a1226f6..111c103fca 100644 --- a/src/ReactiveUI.Events/ReactiveUI.Events.csproj +++ b/src/ReactiveUI.Events/ReactiveUI.Events.csproj @@ -1,6 +1,6 @@  - uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80;tizen40 + uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;tizen40 ReactiveUI.Events ReactiveUI.Events 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. @@ -32,7 +32,7 @@ - + diff --git a/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj b/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj index 6c10c17709..a7aba4fad6 100644 --- a/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj +++ b/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80;netcoreapp2.0 + netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;netcoreapp2.0 ReactiveUI.Fody.Helpers ReactiveUI.Fody.Helpers Fody extension to generate RaisePropertyChange notifications for properties and ObservableAsPropertyHelper properties. diff --git a/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj b/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj index e0fd7dd637..dd9e710c8d 100644 --- a/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj +++ b/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj @@ -1,6 +1,6 @@  - netstandard2.0;netcoreapp2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80 + netstandard2.0;netcoreapp2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81 ReactiveUI.Testing ReactiveUI.Testing A library to aid in writing unit tests for ReactiveUI projects diff --git a/src/ReactiveUI/ReactiveUI.csproj b/src/ReactiveUI/ReactiveUI.csproj index 3969a75dea..23f9058006 100644 --- a/src/ReactiveUI/ReactiveUI.csproj +++ b/src/ReactiveUI/ReactiveUI.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80;netcoreapp2.0;tizen40 + netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;netcoreapp2.0;tizen40 ReactiveUI ReactiveUI A MVVM framework that integrates with the Reactive Extensions for .NET to create elegant, testable User Interfaces that run on any mobile or desktop platform. Supports Xamarin.iOS, Xamarin.Android, Xamarin.Mac, Xamarin Forms, WPF, Windows Forms, Windows Phone 8.1, Windows Store and Universal Windows Platform (UWP).