From 8a5091ee782344cbaa938fa65d582ba4285a8673 Mon Sep 17 00:00:00 2001 From: Allan Ritchie Date: Sat, 18 Jul 2015 19:36:53 -0400 Subject: [PATCH] release --- Estimotes.Droid/BeaconManagerImpl.cs | 1 - .../Resources/Resource.Designer.cs | 31 +++++++++---------- Samples/Samples/Samples.csproj | 12 ------- nuspec/Estimotes.Xplat.nuspec | 5 +-- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/Estimotes.Droid/BeaconManagerImpl.cs b/Estimotes.Droid/BeaconManagerImpl.cs index 8e10e82..e3e048c 100644 --- a/Estimotes.Droid/BeaconManagerImpl.cs +++ b/Estimotes.Droid/BeaconManagerImpl.cs @@ -103,7 +103,6 @@ protected virtual Beacon FromNative(EstimoteSdk.Region region, EstimoteSdk.Beaco var prox = this.FromNative(Utils.ComputeProximity(native)); var beacon = new Beacon( native.ProximityUUID, - region.Identifier, prox, (ushort)native.Major, (ushort)native.Minor diff --git a/Samples/Samples.Droid/Resources/Resource.Designer.cs b/Samples/Samples.Droid/Resources/Resource.Designer.cs index b3d0e00..1f797d8 100644 --- a/Samples/Samples.Droid/Resources/Resource.Designer.cs +++ b/Samples/Samples.Droid/Resources/Resource.Designer.cs @@ -1,15 +1,15 @@ #pragma warning disable 1591 -// ------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Mono Runtime Version: 4.0.30319.17020 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ -[assembly: Android.Runtime.ResourceDesignerAttribute("Samples.Droid.Resource", IsApplication=true)] +[assembly: global::Android.Runtime.ResourceDesignerAttribute("Samples.Droid.Resource", IsApplication=true)] namespace Samples.Droid { @@ -26,8 +26,8 @@ static Resource() public static void UpdateIdValues() { - global::Xamarin.Forms.Platform.Resource.String.ApplicationName = global::Samples.Droid.Resource.String.ApplicationName; - global::Xamarin.Forms.Platform.Resource.String.Hello = global::Samples.Droid.Resource.String.Hello; + global::Acr.Notifications.Resource.String.ApplicationName = global::Samples.Droid.Resource.String.ApplicationName; + global::Acr.Notifications.Resource.String.Hello = global::Samples.Droid.Resource.String.Hello; global::AndroidHUD.Resource.Attribute.ahBarColor = global::Samples.Droid.Resource.Attribute.ahBarColor; global::AndroidHUD.Resource.Attribute.ahBarLength = global::Samples.Droid.Resource.Attribute.ahBarLength; global::AndroidHUD.Resource.Attribute.ahBarWidth = global::Samples.Droid.Resource.Attribute.ahBarWidth; @@ -65,8 +65,8 @@ public static void UpdateIdValues() global::AndroidHUD.Resource.Styleable.ProgressWheel_ahText = global::Samples.Droid.Resource.Styleable.ProgressWheel_ahText; global::AndroidHUD.Resource.Styleable.ProgressWheel_ahTextColor = global::Samples.Droid.Resource.Styleable.ProgressWheel_ahTextColor; global::AndroidHUD.Resource.Styleable.ProgressWheel_ahTextSize = global::Samples.Droid.Resource.Styleable.ProgressWheel_ahTextSize; - global::Acr.Notifications.Resource.String.ApplicationName = global::Samples.Droid.Resource.String.ApplicationName; - global::Acr.Notifications.Resource.String.Hello = global::Samples.Droid.Resource.String.Hello; + global::Xamarin.Forms.Platform.Resource.String.ApplicationName = global::Samples.Droid.Resource.String.ApplicationName; + global::Xamarin.Forms.Platform.Resource.String.Hello = global::Samples.Droid.Resource.String.Hello; } public partial class Attribute @@ -218,8 +218,7 @@ private String() public partial class Styleable { - public static int[] ProgressWheel = new int[] - { + public static int[] ProgressWheel = new int[] { 2130771968, 2130771969, 2130771970, diff --git a/Samples/Samples/Samples.csproj b/Samples/Samples/Samples.csproj index ec7d65b..2ffca68 100644 --- a/Samples/Samples/Samples.csproj +++ b/Samples/Samples/Samples.csproj @@ -74,18 +74,6 @@ ..\..\packages\Acr.XamForms.2.2.0\lib\portable-win+net45+wp8+win8+wpa81\Acr.XamForms.dll - - ..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll - - - ..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll - - - ..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll - - - ..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll - ..\..\packages\Acr.UserDialogs.3.4.1\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.dll diff --git a/nuspec/Estimotes.Xplat.nuspec b/nuspec/Estimotes.Xplat.nuspec index 982d3de..6b96a54 100644 --- a/nuspec/Estimotes.Xplat.nuspec +++ b/nuspec/Estimotes.Xplat.nuspec @@ -15,6 +15,7 @@ 1.1.0 [android] update estimote sdk libraries update libraries to use uuid, major, and minor in scanning +many other minor bugfixes 1.0.1 [android] fix initialization issues @@ -23,7 +24,7 @@ update libraries to use uuid, major, and minor in scanning Initial Release - + @@ -33,8 +34,8 @@ Initial Release + -