release

aritchie · Jul 18, 2015 · 8a5091e · 8a5091e
1 parent a362d7e
commit 8a5091e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 31 deletions.
diff --git 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
diff --git a/Samples/Samples/Samples.csproj b/Samples/Samples/Samples.csproj
@@ -74,18 +74,6 @@
     <Reference Include="Acr.XamForms">
       <HintPath>..\..\packages\Acr.XamForms.2.2.0\lib\portable-win+net45+wp8+win8+wpa81\Acr.XamForms.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Core, Version=2.2.5">
-      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.2.5">
-      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.2.5">
-      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.2.5">
-      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
-    </Reference>
     <Reference Include="Acr.UserDialogs">
       <HintPath>..\..\packages\Acr.UserDialogs.3.4.1\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.dll</HintPath>
     </Reference>

diff --git 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
         </releaseNotes>
         <dependencies>
-        	<dependency id="" version="[4.2.5, 5)" />
+        	<dependency id="Acr.Settings" version="[4.2.5, 5)" />
         </dependencies>
     </metadata>
     <files>
@@ -33,8 +34,8 @@ Initial Release
 
         <!-- android -->
         <file src="..\Estimotes.Droid\bin\Release\Estimotes.dll" target="lib\MonoAndroid10\Estimotes.dll" />
+        <file src="..\Estimotes.Droid\bin\Release\Estimotes.Android.Binding.dll" target="lib\MonoAndroid10\Estimotes.Android.Binding.dll" />
         <file src="..\Estimotes.Interface\bin\Release\Estimotes.Interface.dll" target="lib\MonoAndroid10\Estimotes.Interface.dll" />
-        <file src="..\Estimotes.Interface\bin\Release\Estimotes.Android.Binding.dll" target="lib\MonoAndroid10\Estimotes.Android.Binding.dll" />
         <!--<file src="..\Estimotes.Droid\bin\Release\Estimotes.Xamarin.Android.dll" target="lib\MonoAndroid10\Estimotes.Xamarin.Android.dll" />-->
 
         <!-- ios -->