Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
Merge master into main (#308)
Browse files Browse the repository at this point in the history
* GH-221: Add iOS SecAccessible properties (#223)

* Address #221, use AfterFirstUnlockThisDeviceOnly to match other platforms. Although allow a platform specific override to set accessible state.

* Add tests

* Added iOS specific prop to set SecAccessible

* Default to AfterFirstUnlock on iOS SecureStorage

* A few fixes for the release. (#228)

* Setting the correct flags for Chrome Tabs. Fixes #225

* Make sure that there is data to decrypt before starting. Fixes #226

* Fixes for TTS. Fixes #227

* A bit of the fixes for emails on iOS. Relates to #224

* Update the email bit for iOS #224

* Cleaning up the code #224

* Make sure to set the email properties. Fixes #229

* Update SDK Extras

This fixes a lot of references that were required on android that aren't.

* Update Readme with Installation information. (#237)

* Update Readme with Installation information.

* Update README.md

* Update README.md

* Adding the initial work to get Tizen started. #23

* Revert "Adding the initial work to get Tizen started. #23"

This reverts commit 58b6041.

* Update the docs with the latest APIs (#233)

Add docs for SecAccessible

* GH-245: Add Orientation Sensor (#249)

* Add Orientation Sensor

* Add Orientation Sensor

* Remove .csproj clutter

* "orientationsensor" --> "orientation sensor" or just "orientation"

* GH-192: Added DateTime to Preferences (#232)

* Added DateTime to preferences. Fixes #192
 - also properly using overloads

* Added some unit tests

* Added the docs for the new Preferences APIs

* Update Readme with Device Display Information

Added link to Current Features for Device Display Information

* Fixes #258 and Fixes #255 (#259)

* Fixes #258
* put vectors nuget everywhere.
* NuGet is broken - https://developercommunity.visualstudio.com/content/problem/232996/warning-nu1603-runtimenativesystemiocompression-41.html
* The NuGet doesn't add the assembly references from the GAC
* We need to use a later version of the iOS SDK

* Fix typo (#274)

* Fix up null checks when getting lask known location.

* Additional Null checks

* GH-240 Add IsMainThread detection API (#277)

* Add IsMainThread detection API

* Add platform tests for main thread

* Update docs and add more platform tests

* iOS secure storage simulator tests (#247) (#278)

* iOS secure storage simulator tests (#247)

* Remove line that skips test on virtual devices

* Adding keychain-access-groups in Entitlements.plist

* Setting CodeSign entitlements for Debug configuration

* Making same entitlement.plist changes for iOS sample

* Removing specific code sign key

* Removing physical device trait for iOS SecureStorageTests

* Update DeviceTests.iOS.csproj

* Update Samples.iOS.csproj

* Add configs for codesign on release

* Fixes #181 Allowing setting of calibration for heading. (#282)

* GH-254 Update Support Packages, Forms, and Reference Vectors (#279)

* Update Support Packages, Forms, and Reference Vectors

* Bump targetsdk

* Fix android build :)

* Fix build
  • Loading branch information
jamesmontemagno committed Jun 21, 2018
1 parent 0c30bcf commit a09a031
Show file tree
Hide file tree
Showing 60 changed files with 1,472 additions and 225 deletions.
17 changes: 9 additions & 8 deletions DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<RootNamespace>DeviceTests.Droid</RootNamespace>
<AssemblyName>DeviceTests.Android</AssemblyName>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
Expand Down Expand Up @@ -53,13 +53,14 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="2.5.1.444934" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Forms" Version="3.0.0.530893" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="27.0.2" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.devices" Version="2.3.3" />
<PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0.1.0" package="com.xamarin.essentials.devicetests" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="26" />
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="27" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Geocoding_Tests.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Geolocation_Tests.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Permissions_Tests.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Platform_Tests.cs" />
<Compile Include="$(MSBuildThisFileDirectory)PhoneDialer_Tests.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ScreenLock_Tests.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Preferences_Tests.cs" />
Expand Down
27 changes: 27 additions & 0 deletions DeviceTests/DeviceTests.Shared/Platform_Tests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using System.Threading.Tasks;
using Xamarin.Essentials;
using Xunit;

namespace DeviceTests
{
public class Platform_Tests
{
[Fact]
public Task IsOnMainThread()
{
return Utils.OnMainThread(() =>
{
Assert.True(Platform.IsMainThread);
});
}

[Fact]
public Task IsNotOnMainThread()
{
return Task.Run(() =>
{
Assert.False(Platform.IsMainThread);
});
}
}
}
32 changes: 31 additions & 1 deletion DeviceTests/DeviceTests.Shared/Preferences_Tests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Xamarin.Essentials;
using System;
using Xamarin.Essentials;
using Xunit;

namespace DeviceTests
Expand All @@ -7,6 +8,18 @@ public class Preferences_Tests
{
const string sharedNameTestData = "Shared";

static DateTime testDateTime = new DateTime(2018, 05, 07);

[Theory]
[InlineData("datetime1", null)]
[InlineData("datetime1", sharedNameTestData)]
public void Set_Get_DateTime(string key, string sharedName)
{
Preferences.Set(key, testDateTime, sharedName);

Assert.Equal(testDateTime, Preferences.Get(key, DateTime.MinValue, sharedName));
}

[Theory]
[InlineData("string1", "TEST", null)]
[InlineData("string1", "TEST", sharedNameTestData)]
Expand Down Expand Up @@ -130,5 +143,22 @@ public void Not_ContainsKey(string sharedName)

Assert.False(Preferences.ContainsKey("NotContainsKey1", sharedName));
}

[Theory]
[InlineData(null, DateTimeKind.Utc)]
[InlineData(sharedNameTestData, DateTimeKind.Utc)]
[InlineData(null, DateTimeKind.Local)]
[InlineData(sharedNameTestData, DateTimeKind.Local)]
public void DateTimePreservesKind(string sharedName, DateTimeKind kind)
{
var date = new DateTime(2018, 05, 07, 8, 30, 0, kind);

Preferences.Set("datetime_utc", date, sharedName);

var get = Preferences.Get("datetime_utc", DateTime.MinValue, sharedName);

Assert.Equal(date, get);
Assert.Equal(kind, get.Kind);
}
}
}
13 changes: 6 additions & 7 deletions DeviceTests/DeviceTests.Shared/SecureStorage_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@ public class SecureStorage_Tests
[InlineData("test.txt2", "data2", false)]
[InlineData("noextension2", "data22", false)]
[InlineData("funny*&$%@!._/\\chars2", "data32", false)]
#if __IOS__
// TODO: the iOS simulators have issues with the way we set up our tests... we need to fix that
[Trait(Traits.DeviceType, Traits.DeviceTypes.Physical)]
#endif
public async Task Saves_And_Loads(string key, string data, bool emulatePreApi23)
{
#if __IOS__
// TODO: we don't know how to write iOS apps, it appears, so just skip for now
if (DeviceInfo.DeviceType == DeviceType.Virtual)
return;
// Try the new platform specific api
await SecureStorage.SetAsync(key, data, Security.SecAccessible.AfterFirstUnlock);

var b = await SecureStorage.GetAsync(key, Security.SecAccessible.AfterFirstUnlock);

Assert.Equal(data, b);
#endif

#if __ANDROID__
Expand Down
15 changes: 8 additions & 7 deletions DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<NoWarn>;2008;NU1603</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
Expand All @@ -35,7 +35,7 @@
<OutputPath>bin\ARM\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<NoWarn>;2008;NU1603</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
Expand All @@ -47,7 +47,7 @@
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<NoWarn>;2008;NU1603</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
Expand All @@ -58,7 +58,7 @@
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<NoWarn>;2008;NU1603</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
Expand All @@ -70,7 +70,7 @@
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<NoWarn>;2008;NU1603</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
Expand All @@ -81,7 +81,7 @@
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<NoWarn>;2008;NU1603</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
Expand All @@ -93,10 +93,11 @@
<PackageReference Include="UnitTests.HeadlessRunner">
<Version>2.0.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="2.5.1.444934" />
<PackageReference Include="Xamarin.Forms" Version="3.0.0.530893" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.devices" Version="2.3.3" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<SDKReference Include="WindowsMobile, Version=10.0.16299.0">
Expand Down
11 changes: 9 additions & 2 deletions DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
<MtouchArch>x86_64</MtouchArch>
<MtouchLink>None</MtouchLink>
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<CodesignKey />
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -37,6 +40,9 @@
<MtouchLink>SdkOnly</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
<ConsolePause>false</ConsolePause>
<CodesignKey>iPhone Developer</CodesignKey>
<CodesignKey />
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchExtraArgs>--linkskip=Xamarin.Forms.Platform.iOS --linkskip=Xamarin.Forms.Platform --linkskip=Xamarin.Forms.Core --linkskip=Xamarin.Forms.Xaml</MtouchExtraArgs>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
Expand Down Expand Up @@ -72,10 +78,11 @@
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="2.5.1.444934" />
<PackageReference Include="Xamarin.Forms" Version="3.0.0.530893" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.devices" Version="2.3.3" />
<PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Xamarin.Essentials\Xamarin.Essentials.csproj">
Expand Down Expand Up @@ -121,4 +128,4 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\DeviceTests.Shared\DeviceTests.Shared.projitems" Label="Shared" />
</Project>
</Project>
7 changes: 6 additions & 1 deletion DeviceTests/DeviceTests.iOS/Entitlements.plist
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
<dict>
<key>keychain-access-groups</key>
<array>
<string>com.xamarin.essentials.devicetests</string>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion DeviceTests/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
var TARGET = Argument("target", "Default");

var IOS_SIM_NAME = EnvironmentVariable("IOS_SIM_NAME") ?? "iPhone X";
var IOS_SIM_RUNTIME = EnvironmentVariable("IOS_SIM_RUNTIME") ?? "iOS 11.1";
var IOS_SIM_RUNTIME = EnvironmentVariable("IOS_SIM_RUNTIME") ?? "iOS 11.3";
var IOS_PROJ = "./DeviceTests.iOS/DeviceTests.iOS.csproj";
var IOS_BUNDLE_ID = "com.xamarin.essentials.devicetests";
var IOS_IPA_PATH = "./DeviceTests.iOS/bin/iPhoneSimulator/Release/Xamarin.EssentialsDeviceTestsiOS.app";
Expand Down
61 changes: 36 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Xamarin.Essentials gives developers essential cross-platform APIs for their mobi

iOS, Android, and UWP offer unique operating system and platform APIs that developers have access to all in C# leveraging Xamarin. It is great that developers have 100% API access in C# with Xamarin, but these APIs are different per platform. This means developers have to learn three different APIs to access platform specific features. With Xamarin.Essentials developers have a single cross-platform API that works with any iOS, Android, or UWP application that can be accessed from shared code no matter how the user interface is created.

[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/xamarin/Essentials)

## Build Status

| Build Server | Type | Platform | Status |
Expand All @@ -13,7 +15,15 @@ iOS, Android, and UWP offer unique operating system and platform APIs that devel
| Jenkins | Device Tests | macOS | [![Build Status](https://jenkins.mono-project.com/buildStatus/icon?job=Components-Essentials-DeviceTests-Mac)](https://jenkins.mono-project.com/job/Components-Essentials-DeviceTests-Mac) |

## Installation
Coming soon...
Xamarin.Essentials is available via:
* NuGet Official Releases: [![NuGet](https://img.shields.io/nuget/vpre/Xamarin.Essentials.svg?label=NuGet)](https://www.nuget.org/packages/Xamarin.Essentials)
* MyGet Development Feed: https://www.myget.org/F/xamarin-essentials/api/v3/index.json

Please read our [Getting Started with Xamarin.Essentials guide](https://docs.microsoft.com/xamarin/essentials/get-started) for full setup instructions.

## Documentation

Browse our [full documentation for Xamarin.Essentials](https://docs.microsoft.com/xamarin/essentials) including feature guides on how to use each feature.

## Supported Platforms
Xamarin.Essentials is focused on the following platforms for our first release:
Expand All @@ -23,30 +33,31 @@ Xamarin.Essentials is focused on the following platforms for our first release:

## Current Features:
The following cross-platform APIs are planned for our first release:
- [x] Accelerometer
- [X] App Information
- [x] Battery
- [x] Clipboard
- [x] Compass
- [x] Connectivity
- [x] Data Transfer
- [x] Device Information
- [x] File System Helpers
- [x] Email
- [x] Flashlight
- [x] Geocoding
- [x] Geolocation
- [x] Gyroscope
- [x] Magnetometer
- [x] Open Browser
- [x] Phone Dialer
- [x] Preferences
- [x] Screen Lock
- [x] Secure Storage
- [x] SMS
- [x] Text-to-Speech
- [x] Version Tracking
- [x] Vibrate
- [x] [Accelerometer](https://docs.microsoft.com/xamarin/essentials/accelerometer)
- [X] [App Information](https://docs.microsoft.com/xamarin/essentials/app-information)
- [x] [Battery](https://docs.microsoft.com/xamarin/essentials/battery)
- [x] [Clipboard](https://docs.microsoft.com/xamarin/essentials/clipboard)
- [x] [Compass](https://docs.microsoft.com/xamarin/essentials/compass)
- [x] [Connectivity](https://docs.microsoft.com/xamarin/essentials/connectivity)
- [x] [Data Transfer](https://docs.microsoft.com/xamarin/essentials/data-transfer)
- [x] [Device Display Information](https://docs.microsoft.com/en-us/xamarin/essentials/device-display)
- [x] [Device Information](https://docs.microsoft.com/xamarin/essentials/device-information)
- [x] [Email](https://docs.microsoft.com/xamarin/essentials/email)
- [x] [File System Helpers](https://docs.microsoft.com/xamarin/essentials/file-system-helpers)
- [x] [Flashlight](https://docs.microsoft.com/xamarin/essentials/flashlight)
- [x] [Geocoding](https://docs.microsoft.com/xamarin/essentials/geocoding)
- [x] [Geolocation](https://docs.microsoft.com/xamarin/essentials/geolocation)
- [x] [Gyroscope](https://docs.microsoft.com/xamarin/essentials/gyroscope)
- [x] [Magnetometer](https://docs.microsoft.com/xamarin/essentials/magnetometer)
- [x] [Open Browser](https://docs.microsoft.com/xamarin/essentials/open-browser)
- [x] [Phone Dialer](https://docs.microsoft.com/xamarin/essentials/phone-dialer)
- [x] [Preferences](https://docs.microsoft.com/xamarin/essentials/preferences)
- [x] [Screen Lock](https://docs.microsoft.com/xamarin/essentials/screen-lock)
- [x] [Secure Storage](https://docs.microsoft.com/xamarin/essentials/secure-storage)
- [x] [SMS](https://docs.microsoft.com/xamarin/essentials/sms)
- [x] [Text-to-Speech](https://docs.microsoft.com/xamarin/essentials/text-to-speech)
- [x] [Version Tracking](https://docs.microsoft.com/xamarin/essentials/version-tracking)
- [x] [Vibrate](https://docs.microsoft.com/xamarin/essentials/vibrate)

## Contributing
Please read through our [Contribution Guide](CONTRIBUTING.md). We are not accepting new PRs for full features, however any issue that is marked as `up for grabs` are open for community contributions. We encourage creating new issues for bugs found during usage that the team will triage. Additionally, we are open for code refactoring suggestions in PRs.
Expand Down
2 changes: 1 addition & 1 deletion Samples/Samples.Android/Properties/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.xamarin.essentials" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="26" />
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="27" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
17 changes: 9 additions & 8 deletions Samples/Samples.Android/Samples.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Samples.Droid</RootNamespace>
<AssemblyName>Samples.Android</AssemblyName>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
Expand Down Expand Up @@ -52,13 +52,14 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="2.5.1.444934" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Forms" Version="3.0.0.530893" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="27.0.2" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="27.0.2" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Xamarin.Essentials\Xamarin.Essentials.csproj">
Expand Down
Loading

0 comments on commit a09a031

Please sign in to comment.