Skip to content

Commit b13003b

Browse files
glennawatsonglennawatson
authored
Updated android versions. Moved some of the directory.build.props files around (#1840)
1 parent 72e1e95 commit b13003b

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

‎directory.build.props‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
<Project>
22
<PropertyGroup>
3+
<Authors>.NET Foundation and Contributors</Authors>
34
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)reactiveui.ruleset</CodeAnalysisRuleSet>
5+
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
6+
<PackageLicenseUrl>https://opensource.org/licenses/mit</PackageLicenseUrl>
7+
<PackageProjectUrl>https://reactiveui.net</PackageProjectUrl>
8+
<PackageIconUrl>https://i.imgur.com/7WDbqSy.png</PackageIconUrl>
9+
<Owners>xpaulbettsx;ghuntley</Owners>
10+
<Product>ReactiveUI ($(TargetFramework))</Product>
11+
<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>
12+
<PackageReleaseNotes>https://reactiveui.net/blog/</PackageReleaseNotes>
13+
<RepositoryUrl>https://github.com/reactiveui/reactiveui</RepositoryUrl>
14+
<RepositoryType>git</RepositoryType>
415
<GenerateDocumentationFile>true</GenerateDocumentationFile>
516
</PropertyGroup>
617

‎src/Directory.build.props‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
4-
<PackageLicenseUrl>https://opensource.org/licenses/mit</PackageLicenseUrl>
5-
<PackageProjectUrl>https://reactiveui.net</PackageProjectUrl>
6-
<PackageIconUrl>https://i.imgur.com/7WDbqSy.png</PackageIconUrl>
7-
<Authors>.NET Foundation and Contributors</Authors>
8-
<Owners>xpaulbettsx;ghuntley</Owners>
9-
<Product>ReactiveUI ($(TargetFramework))</Product>
10-
<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>
11-
<PackageReleaseNotes>https://reactiveui.net/blog/</PackageReleaseNotes>
12-
<RepositoryUrl>https://github.com/reactiveui/reactiveui</RepositoryUrl>
13-
<RepositoryType>git</RepositoryType>
143
<EmbedUntrackedSources>true</EmbedUntrackedSources>
154
<PublishRepositoryUrl>true</PublishRepositoryUrl>
165
<NoWarn>$(NoWarn);1591;1701;1702;1705</NoWarn>

‎src/EventBuilder/Platforms/Android.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public Android(string referenceAssembliesLocation)
4444
SearchOption.AllDirectories);
4545

4646
// Pin to a particular framework version https://github.com/reactiveui/ReactiveUI/issues/1517
47-
var latestVersion = assemblies.Last(x => x.Contains("v8"));
47+
var latestVersion = assemblies.Last(x => x.Contains("v8.1"));
4848
Assemblies.Add(latestVersion);
4949

5050
CecilSearchDirectories.Add(Path.GetDirectoryName(latestVersion));

‎src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>MonoAndroid80</TargetFrameworks>
4+
<TargetFrameworks>MonoAndroid81</TargetFrameworks>
55
<AssemblyName>ReactiveUI.AndroidSupport</AssemblyName>
66
<RootNamespace>ReactiveUI.AndroidSupport</RootNamespace>
77
<Description>ReactiveUI extensions for the Android Support Library</Description>

‎src/ReactiveUI.Events/ReactiveUI.Events.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>uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80;tizen40</TargetFrameworks>
3+
<TargetFrameworks>uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;tizen40</TargetFrameworks>
44
<AssemblyName>ReactiveUI.Events</AssemblyName>
55
<RootNamespace>ReactiveUI.Events</RootNamespace>
66
<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>
@@ -32,7 +32,7 @@
3232
<Compile Include="Events_MAC.cs" Condition="Exists('Events_MAC.cs')" />
3333
</ItemGroup>
3434

35-
<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid80' ">
35+
<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid81' ">
3636
<Compile Include="Events_ANDROID.cs" Condition="Exists('Events_ANDROID.cs')" />
3737
</ItemGroup>
3838

‎src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80;netcoreapp2.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;netcoreapp2.0</TargetFrameworks>
44
<AssemblyName>ReactiveUI.Fody.Helpers</AssemblyName>
55
<RootNamespace>ReactiveUI.Fody.Helpers</RootNamespace>
66
<Description>Fody extension to generate RaisePropertyChange notifications for properties and ObservableAsPropertyHelper properties.</Description>

‎src/ReactiveUI.Testing/ReactiveUI.Testing.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;netcoreapp2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;netcoreapp2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81</TargetFrameworks>
44
<AssemblyName>ReactiveUI.Testing</AssemblyName>
55
<RootNamespace>ReactiveUI.Testing</RootNamespace>
66
<Description>A library to aid in writing unit tests for ReactiveUI projects</Description>

‎src/ReactiveUI/ReactiveUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid80;netcoreapp2.0;tizen40</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;netcoreapp2.0;tizen40</TargetFrameworks>
44
<AssemblyName>ReactiveUI</AssemblyName>
55
<RootNamespace>ReactiveUI</RootNamespace>
66
<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>

0 commit comments

Comments
 (0)