Merge pull request #47 from sushihangover/r111

Update to Realm.Database 1.1.1
sushihangover · Mar 16, 2017 · a5f9f63 · a5f9f63
2 parents d861cb0 + 99d501f
commit a5f9f63
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 18 deletions.
diff --git a/src/RealmJson.Extensions.nuspec b/src/RealmJson.Extensions.nuspec
@@ -14,7 +14,7 @@
     <licenseUrl>https://github.com/sushihangover/Realm.Json.Extensions</licenseUrl>
     <tags>Realm Xamarin Json Netwonsoft SushiHangover</tags>
   <dependencies>
-     <dependency id="Realm.Database" version="1.1.0" />
+     <dependency id="Realm.Database" version="1.1.1" />
      <dependency id="AutoMapper" version="5.1.1" />
      <dependency id="Newtonsoft.Json" version="9.0.0" />
  </dependencies>

diff --git a/src/RealmJson.Extensions/SushiHangover.RealmJson.csproj b/src/RealmJson.Extensions/SushiHangover.RealmJson.csproj
@@ -61,7 +61,7 @@
       <HintPath>..\packages\DotNetCross.Memory.Unsafe.0.2.3.4\lib\netstandard1.0\DotNetCross.Memory.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="Realm">
-      <HintPath>..\packages\Realm.Database.1.0.4\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+Xamarin.iOS10+monotouch+Xamarin.Mac\Realm.dll</HintPath>
+      <HintPath>..\packages\Realm.Database.1.1.1\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+Xamarin.iOS10+monotouch+Xamarin.Mac\Realm.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -74,5 +74,5 @@
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\.nuget\NuGet.targets" Condition="Exists('..\.nuget\NuGet.targets')" />
   <Import Project="..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
-  <Import Project="..\packages\Realm.Database.1.0.4\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.1.0.4\build\Realm.Database.targets')" />
+  <Import Project="..\packages\Realm.Database.1.1.1\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.1.1.1\build\Realm.Database.targets')" />
 </Project>
diff --git a/src/RealmJson.Extensions/packages.config b/src/RealmJson.Extensions/packages.config
@@ -4,7 +4,7 @@
   <package id="DotNetCross.Memory.Unsafe" version="0.2.3.4" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Fody" version="1.29.4" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="9.0.2-beta2" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Realm.Database" version="1.0.4" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Realm.Database" version="1.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Remotion.Linq" version="2.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="portable45-net45+win8+wpa81" />

diff --git a/src/RealmJson.Test.Droid/RealmJson.Test.Droid.csproj b/src/RealmJson.Test.Droid/RealmJson.Test.Droid.csproj
@@ -3060,7 +3060,7 @@
       <HintPath>..\packages\DotNetCross.Memory.Unsafe.0.2.3.4\lib\netstandard1.0\DotNetCross.Memory.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="Realm">
-      <HintPath>..\packages\Realm.Database.1.1.0\lib\MonoAndroid44\Realm.dll</HintPath>
+      <HintPath>..\packages\Realm.Database.1.1.1\lib\MonoAndroid44\Realm.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -3099,5 +3099,5 @@
 	<Target Name="RunTests" DependsOnTargets="_ValidateAndroidPackageProperties">
 	    <Exec Command="$(_AndroidPlatformToolsDirectory)adb $(AdbTarget) $(AdbOptions) shell am instrument -w $(_AndroidPackage)/app.tests.TestInstrumentation" />
 	</Target>
-	<Import Project="..\packages\Realm.Database.1.1.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.1.1.0\build\Realm.Database.targets')" />
+	<Import Project="..\packages\Realm.Database.1.1.1\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.1.1.1\build\Realm.Database.targets')" />
 </Project>
diff --git a/src/RealmJson.Test.Droid/packages.config b/src/RealmJson.Test.Droid/packages.config
@@ -5,7 +5,7 @@
   <package id="Fody" version="1.29.4" targetFramework="monoandroid70" developmentDependency="true" />
   <package id="Microsoft.CSharp" version="4.3.0" targetFramework="monoandroid71" />
   <package id="Newtonsoft.Json" version="9.0.2-beta2" targetFramework="monoandroid71" />
-  <package id="Realm.Database" version="1.1.0" targetFramework="monoandroid71" />
+  <package id="Realm.Database" version="1.1.1" targetFramework="monoandroid71" />
   <package id="Remotion.Linq" version="2.1.1" targetFramework="monoandroid70" />
   <package id="System.Collections" version="4.3.0" targetFramework="monoandroid71" />
   <package id="System.ComponentModel.TypeConverter" version="4.3.0" targetFramework="monoandroid71" />

diff --git a/src/RealmJson.Test.iOS/RealmJson.Test.iOS.csproj b/src/RealmJson.Test.iOS/RealmJson.Test.iOS.csproj
@@ -22,8 +22,6 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
     <MtouchFastDev>true</MtouchFastDev>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
@@ -39,8 +37,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignEntitlements></CodesignEntitlements>
     <MtouchLink>SdkOnly</MtouchLink>
@@ -56,8 +52,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchLink>SdkOnly</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
@@ -76,8 +70,6 @@
     <DeviceSpecificBuild>true</DeviceSpecificBuild>
     <MtouchDebug>true</MtouchDebug>
     <MtouchFastDev>true</MtouchFastDev>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>SdkOnly</MtouchLink>
@@ -107,7 +99,7 @@
       <HintPath>..\packages\DotNetCross.Memory.Unsafe.0.2.3.4\lib\netstandard1.0\DotNetCross.Memory.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="Realm">
-      <HintPath>..\packages\Realm.Database.1.1.0\lib\Xamarin.iOS10\Realm.dll</HintPath>
+      <HintPath>..\packages\Realm.Database.1.1.1\lib\Xamarin.iOS10\Realm.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -140,5 +132,5 @@
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
   <Import Project="..\packages\Realm.0.78.1\build\Realm.targets" Condition="Exists('..\packages\Realm.0.78.1\build\Realm.targets')" />
-  <Import Project="..\packages\Realm.Database.1.1.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.1.1.0\build\Realm.Database.targets')" />
+  <Import Project="..\packages\Realm.Database.1.1.1\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.1.1.1\build\Realm.Database.targets')" />
 </Project>
diff --git a/src/RealmJson.Test.iOS/packages.config b/src/RealmJson.Test.iOS/packages.config
@@ -5,7 +5,7 @@
   <package id="Fody" version="1.29.4" targetFramework="xamarinios10" developmentDependency="true" />
   <package id="Microsoft.CSharp" version="4.3.0" targetFramework="xamarinios10" />
   <package id="Newtonsoft.Json" version="9.0.2-beta2" targetFramework="xamarinios10" />
-  <package id="Realm.Database" version="1.1.0" targetFramework="xamarinios10" />
+  <package id="Realm.Database" version="1.1.1" targetFramework="xamarinios10" />
   <package id="Remotion.Linq" version="2.1.1" targetFramework="xamarinios10" />
   <package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" />
   <package id="System.ComponentModel.TypeConverter" version="4.3.0" targetFramework="xamarinios10" />