Skip to content

housekeeping: Updated android versions. Moved some of the directory.build.props fil… #1840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 16, 2018
Merged

housekeeping: Updated android versions. Moved some of the directory.build.props fil… #1840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
<Project>
<PropertyGroup>
<Authors>.NET Foundation and Contributors</Authors>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)reactiveui.ruleset</CodeAnalysisRuleSet>
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
<PackageLicenseUrl>https://opensource.org/licenses/mit</PackageLicenseUrl>
<PackageProjectUrl>https://reactiveui.net</PackageProjectUrl>
<PackageIconUrl>https://i.imgur.com/7WDbqSy.png</PackageIconUrl>
<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>
<RepositoryUrl>https://github.com/reactiveui/reactiveui</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

Expand Down
11 changes: 0 additions & 11 deletions src/Directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
<Project>
<PropertyGroup>
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
<PackageLicenseUrl>https://opensource.org/licenses/mit</PackageLicenseUrl>
<PackageProjectUrl>https://reactiveui.net</PackageProjectUrl>
<PackageIconUrl>https://i.imgur.com/7WDbqSy.png</PackageIconUrl>
<Authors>.NET Foundation and Contributors</Authors>
<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>
<RepositoryUrl>https://github.com/reactiveui/reactiveui</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<NoWarn>$(NoWarn);1591;1701;1702;1705</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion src/EventBuilder/Platforms/Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">

<PropertyGroup>
<TargetFrameworks>MonoAndroid80</TargetFrameworks>
<TargetFrameworks>MonoAndroid81</TargetFrameworks>
<AssemblyName>ReactiveUI.AndroidSupport</AssemblyName>
<RootNamespace>ReactiveUI.AndroidSupport</RootNamespace>
<Description>ReactiveUI extensions for the Android Support Library</Description>
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI.Events/ReactiveUI.Events.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80;tizen40</TargetFrameworks>
<TargetFrameworks>uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;tizen40</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>
Expand Down Expand Up @@ -32,7 +32,7 @@
<Compile Include="Events_MAC.cs" Condition="Exists('Events_MAC.cs')" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid80' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid81' ">
<Compile Include="Events_ANDROID.cs" Condition="Exists('Events_ANDROID.cs')" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;netcoreapp2.0</TargetFrameworks>
<AssemblyName>ReactiveUI.Fody.Helpers</AssemblyName>
<RootNamespace>ReactiveUI.Fody.Helpers</RootNamespace>
<Description>Fody extension to generate RaisePropertyChange notifications for properties and ObservableAsPropertyHelper properties.</Description>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.Testing/ReactiveUI.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netcoreapp2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81</TargetFrameworks>
<AssemblyName>ReactiveUI.Testing</AssemblyName>
<RootNamespace>ReactiveUI.Testing</RootNamespace>
<Description>A library to aid in writing unit tests for ReactiveUI projects</Description>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI/ReactiveUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80;netcoreapp2.0;tizen40</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;netcoreapp2.0;tizen40</TargetFrameworks>
<AssemblyName>ReactiveUI</AssemblyName>
<RootNamespace>ReactiveUI</RootNamespace>
<Description>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).</Description>
Expand Down