Skip to content

Commit

Permalink
Merge pull request #42 from sushihangover/r110
Browse files Browse the repository at this point in the history
Update to Realm.Database 1.1.0
  • Loading branch information
sushihangover authored Mar 5, 2017
2 parents c12462e + 45f1c5d commit ccc8f02
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/RealmJson.Extensions.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.4" />
<dependency id="Realm.Database" version="1.1.0" />
<dependency id="AutoMapper" version="5.1.1" />
<dependency id="Newtonsoft.Json" version="9.0.0" />
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions src/RealmJson.Test.Droid/RealmJson.Test.Droid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.4\lib\MonoAndroid44\Realm.dll</HintPath>
<HintPath>..\packages\Realm.Database.1.1.0\lib\MonoAndroid44\Realm.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -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.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.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.1.1.0\build\Realm.Database.targets')" />
</Project>
2 changes: 1 addition & 1 deletion src/RealmJson.Test.Droid/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.4" targetFramework="monoandroid71" />
<package id="Realm.Database" version="1.1.0" 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" />
Expand Down
4 changes: 2 additions & 2 deletions src/RealmJson.Test.iOS/RealmJson.Test.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,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\Xamarin.iOS10\Realm.dll</HintPath>
<HintPath>..\packages\Realm.Database.1.1.0\lib\Xamarin.iOS10\Realm.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -140,5 +140,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.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.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.1.1.0\build\Realm.Database.targets')" />
</Project>
2 changes: 1 addition & 1 deletion src/RealmJson.Test.iOS/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.4" targetFramework="xamarinios10" />
<package id="Realm.Database" version="1.1.0" 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" />
Expand Down

0 comments on commit ccc8f02

Please sign in to comment.