Skip to content

Commit

Permalink
Merge pull request #482 from realm/ad/release/0.74.1
Browse files Browse the repository at this point in the history
Ad/release/0.74.1
  • Loading branch information
AndyDentFree committed Apr 22, 2016
2 parents ec83198 + 259dbcf commit 629ffe3
Show file tree
Hide file tree
Showing 38 changed files with 227 additions and 280 deletions.
10 changes: 7 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
0.74.1 Private Beta IN PROGRESS
0.74.1 Private Beta (2016-04-16)
-------------------
Still requires installation from private copy of NuGet download.

### Minor Changes
### Minor Fixes
* Realms now refresh properly on Android when modified in other threads/processes.
* The `String.Contains(String)`, `String.StartsWith(String)`, and `String.EndsWith(String)` methods now support variable expressions. Previously they only worked with literal strings.
* Fixes crashes under heavy combinations of threaded reads and writes.

### Minor Changes
* The two `Realm` and `RealmWeaver` NuGet packages have been combined into a single `Realm` package.
* The `String.Contains(String)`, `String.StartsWith(String)`, and `String.EndsWith(String)` methods now support variable expressions. Previously they only worked with literal strings.
* `RealmResults<T>` now implements `INotifyCollectionChanged` by raising the `CollectionChanged` event with `NotifyCollectionChangedAction.Reset` when its underlying table or query result is changed by a write transaction.

0.74.0 Private Beta (2016-04-02)
Expand Down
4 changes: 4 additions & 0 deletions NuGet/NuGet.Library/FodyWeavers.xml.install.xdt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<Weavers xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<RealmWeaver xdt:Transform="Insert"/>
</Weavers>
4 changes: 4 additions & 0 deletions NuGet/NuGet.Library/FodyWeavers.xml.uninstall.xdt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<Weavers xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<RealmWeaver xdt:Transform="Remove" xdt:Locator="Match(name)"/>
</Weavers>
12 changes: 9 additions & 3 deletions NuGet/NuGet.Library/Realm.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,27 @@
<projectUrl>http://github.com/realm/realm-dotnet</projectUrl>
<iconUrl>http://realm.io/img/favicon-32x32.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Realm for Xamarin (private beta)</description>
<description>Realm for Xamarin: make descendants of RealmObject automatically persistent (private beta)</description>
<summary />
<language>en-US</language>
<tags>Realm</tags>
<dependencies>
<dependency id="RealmWeaver.Fody" version="0.74.0"/>
<dependency id="Fody" version="1.29.4"/>
</dependencies>
</metadata>
<files>
<!-- Built weaver needed by all targets -->
<file src="../../RealmWeaver/bin/Release/RealmWeaver.Fody.dll" target="tools"/>
<!-- Our XML config file for Fody -->
<file src="FodyWeavers.xml.install.xdt" target="content"/>
<file src="FodyWeavers.xml.uninstall.xdt" target="content"/>
<!-- PCL file -->
<file src="../../Realm.PCL/bin/Release/Realm.dll" target="lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+Xamarin.iOS10+monotouch+Xamarin.Mac" />
<!-- IOS file -->
<file src="../../Realm.XamarinIOS/bin/iPhone/Release/Realm.dll" target="lib\Xamarin.iOS10" />
<!-- Targets file adds copying step for RealmWeaver.Fody.dll to all targets and Android-specific libs -->
<file src="Realm.targets" target="build" />
<!-- Android files -->
<file src="Realm.targets" target="build\MonoAndroid44" />
<file src="../../Realm.XamarinAndroid/bin/Release/Realm.dll" target="lib\MonoAndroid44" />
<file src="../../wrappers/build/Release-android/armeabi-v7a/libwrappers.so" target="lib\MonoAndroid44\armeabi-v7a" />
<file src="../../wrappers/build/Release-android/arm64-v8a/libwrappers.so" target="lib\MonoAndroid44\arm64-v8a" />
Expand Down
36 changes: 22 additions & 14 deletions NuGet/NuGet.Library/Realm.targets
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.74.0/lib/MonoAndroid44/armeabi-v7a/libwrappers.so">
<Link>$(SolutionDir)packages/Realm.0.74.0/lib/MonoAndroid44/armeabi-v7a/libwrappers.so</Link>
</AndroidNativeLibrary>
<AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.74.0/lib/MonoAndroid44/x86/libwrappers.so">
<Link>$(SolutionDir)packages/Realm.0.74.0/lib/MonoAndroid44/x86/libwrappers.so</Link>
</AndroidNativeLibrary>
<!-- 64bit -->
<AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.74.0/lib/MonoAndroid44/arm64-v8a/libwrappers.so">
<Link>$(SolutionDir)packages/Realm.0.74.0/lib/MonoAndroid44/arm64-v8a/libwrappers.so</Link>
</AndroidNativeLibrary>
<AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.74.0/lib/MonoAndroid44/x86_64/libwrappers.so">
<Link>$(SolutionDir)packages/Realm.0.74.0/lib/MonoAndroid44/x86_64/libwrappers.so</Link>
</AndroidNativeLibrary>
<!-- Puts a copy of RealmWeaver.Fody.dll where it will be found by Fody -->
<Target Name="CopyRealmWeaver" BeforeTargets="FodyTarget">
<Message Text="CopyRealmWeaver" />
<Copy SourceFiles="$(SolutionDir)packages/Realm.0.74.1/tools/RealmWeaver.Fody.dll" DestinationFolder="$(SolutionDir)/Tools" />
</Target>
<ItemGroup>
<None Include="FodyWeavers.xml" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.74.1/lib/MonoAndroid44/armeabi-v7a/libwrappers.so">
<Link>$(SolutionDir)packages/Realm.0.74.1/lib/MonoAndroid44/armeabi-v7a/libwrappers.so</Link>
</AndroidNativeLibrary>
<AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.74.1/lib/MonoAndroid44/x86/libwrappers.so">
<Link>$(SolutionDir)packages/Realm.0.74.1/lib/MonoAndroid44/x86/libwrappers.so</Link>
</AndroidNativeLibrary>
<!-- 64bit -->
<AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.74.1/lib/MonoAndroid44/arm64-v8a/libwrappers.so">
<Link>$(SolutionDir)packages/Realm.0.74.1/lib/MonoAndroid44/arm64-v8a/libwrappers.so</Link>
</AndroidNativeLibrary>
<AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.74.1/lib/MonoAndroid44/x86_64/libwrappers.so">
<Link>$(SolutionDir)packages/Realm.0.74.1/lib/MonoAndroid44/x86_64/libwrappers.so</Link>
</AndroidNativeLibrary>
</ItemGroup>
</Project>
4 changes: 0 additions & 4 deletions NuGet/NuGet.Weaver/FodyWeavers.xml

This file was deleted.

56 changes: 0 additions & 56 deletions NuGet/NuGet.Weaver/Nuget.Weaver.csproj

This file was deleted.

25 changes: 0 additions & 25 deletions NuGet/NuGet.Weaver/RealmWeaver.Fody.nuspec

This file was deleted.

4 changes: 0 additions & 4 deletions NuGet/NuGet.Weaver/packages.config

This file was deleted.

1 change: 0 additions & 1 deletion NuGet/NuGet.Weaver/readme.txt

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Prerequisites:
* Building Realm documentation requires [Doxygen](http:/www.doxygen.org) and [Graphviz](http://www.graphviz.org)


We support the current Xamarin _Stable_ and _Beta_ update channels, at the time of release this corresponded to:
We support the current Xamarin _Stable_ update channel, at the time of release this corresponded to:

* Xamarin iOS version 9.6.1.9
* Xamarin Android version 6.0.3.5
Expand Down
4 changes: 2 additions & 2 deletions Realm.PCL/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("0.74.0.0")]
[assembly: AssemblyFileVersion("0.74.0.0")]
[assembly: AssemblyVersion("0.74.1.0")]
[assembly: AssemblyFileVersion("0.74.1.0")]
4 changes: 2 additions & 2 deletions Realm.Win32/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.74.0.0")]
[assembly: AssemblyFileVersion("0.74.0.0")]
[assembly: AssemblyVersion("0.74.1.0")]
[assembly: AssemblyFileVersion("0.74.1.0")]
4 changes: 2 additions & 2 deletions Realm.XamarinAndroid/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.74.0.0")]
[assembly: AssemblyFileVersion("0.74.0.0")]
[assembly: AssemblyVersion("0.74.1.0")]
[assembly: AssemblyFileVersion("0.74.1.0")]
4 changes: 2 additions & 2 deletions Realm.XamarinIOS/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("0.74.0.0")]
[assembly: AssemblyFileVersion("0.74.0.0")]
[assembly: AssemblyVersion("0.74.1.0")]
[assembly: AssemblyFileVersion("0.74.1.0")]
62 changes: 18 additions & 44 deletions Realm.sln
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Realm.Win32", "Realm.Win32\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Realm.XamarinIOS", "Realm.XamarinIOS\Realm.XamarinIOS.csproj", "{A55BD773-5A29-4B2A-9DB7-1AB1DD38B537}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wrappers", "wrappers\wrappers.vcxproj", "{A1E763AD-24B9-4D6B-AACA-282BB33E350F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Realm.XamarinAndroid", "Realm.XamarinAndroid\Realm.XamarinAndroid.csproj", "{2379D669-4F4B-4FF6-AF8A-49FEA981EFC3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RealmWeaver.Fody", "RealmWeaver\RealmWeaver.Fody.csproj", "{C3578A7B-09A6-4444-9383-0DEAFA4958BD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuget.Weaver", "NuGet\NuGet.Weaver\Nuget.Weaver.csproj", "{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Realm.PCL", "Realm.PCL\Realm.PCL.csproj", "{261C8EB6-9508-4D6A-9BED-39A544AA2736}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "wrappers", "wrappers\wrappers.vcxproj", "{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -94,46 +92,6 @@ Global
{261C8EB6-9508-4D6A-9BED-39A544AA2736}.Release|x64.Build.0 = Release|Any CPU
{261C8EB6-9508-4D6A-9BED-39A544AA2736}.Release|x86.ActiveCfg = Release|Any CPU
{261C8EB6-9508-4D6A-9BED-39A544AA2736}.Release|x86.Build.0 = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|ARM.ActiveCfg = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|ARM.Build.0 = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|iPhone.Build.0 = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|x64.ActiveCfg = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|x64.Build.0 = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|x86.ActiveCfg = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|x86.Build.0 = Debug|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|Any CPU.Build.0 = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|ARM.ActiveCfg = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|ARM.Build.0 = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|iPhone.ActiveCfg = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|iPhone.Build.0 = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|x64.ActiveCfg = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|x64.Build.0 = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|x86.ActiveCfg = Release|Any CPU
{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|x86.Build.0 = Release|Any CPU
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Debug|Any CPU.ActiveCfg = Debug|Win32
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Debug|ARM.ActiveCfg = Debug|Win32
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Debug|iPhone.ActiveCfg = Debug|Win32
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Win32
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Debug|x64.ActiveCfg = Debug|x64
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Debug|x64.Build.0 = Debug|x64
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Debug|x86.ActiveCfg = Debug|Win32
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Debug|x86.Build.0 = Debug|Win32
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Release|Any CPU.ActiveCfg = Release|Win32
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Release|ARM.ActiveCfg = Release|Win32
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Release|iPhone.ActiveCfg = Release|Win32
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Release|iPhoneSimulator.ActiveCfg = Release|Win32
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Release|x64.ActiveCfg = Release|x64
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Release|x64.Build.0 = Release|x64
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Release|x86.ActiveCfg = Release|Win32
{A1E763AD-24B9-4D6B-AACA-282BB33E350F}.Release|x86.Build.0 = Release|Win32
{A55BD773-5A29-4B2A-9DB7-1AB1DD38B537}.Debug|Any CPU.ActiveCfg = Debug|iPhone
{A55BD773-5A29-4B2A-9DB7-1AB1DD38B537}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator
{A55BD773-5A29-4B2A-9DB7-1AB1DD38B537}.Debug|iPhone.ActiveCfg = Debug|iPhone
Expand Down Expand Up @@ -318,6 +276,22 @@ Global
{ED17479C-2CFE-4E6D-A592-82C491FFBE4E}.Release|x64.Build.0 = Release|Any CPU
{ED17479C-2CFE-4E6D-A592-82C491FFBE4E}.Release|x86.ActiveCfg = Release|Any CPU
{ED17479C-2CFE-4E6D-A592-82C491FFBE4E}.Release|x86.Build.0 = Release|Any CPU
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Debug|Any CPU.ActiveCfg = Debug|Win32
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Debug|ARM.ActiveCfg = Debug|Win32
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Debug|iPhone.ActiveCfg = Debug|Win32
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Debug|iPhoneSimulator.ActiveCfg = Debug|Win32
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Debug|x64.ActiveCfg = Debug|x64
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Debug|x64.Build.0 = Debug|x64
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Debug|x86.ActiveCfg = Debug|Win32
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Debug|x86.Build.0 = Debug|Win32
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Release|Any CPU.ActiveCfg = Release|Win32
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Release|ARM.ActiveCfg = Release|Win32
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Release|iPhone.ActiveCfg = Release|Win32
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Release|iPhoneSimulator.ActiveCfg = Release|Win32
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Release|x64.ActiveCfg = Release|x64
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Release|x64.Build.0 = Release|x64
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Release|x86.ActiveCfg = Release|Win32
{0044E72D-3EFF-49B2-8E15-F3E8E4E19687}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{06146619-D21C-414C-BFE3-2F59ACBA412E} = {9F639E1B-3A3A-4AD0-B9B4-5B4B9A93A603}
Expand Down
4 changes: 2 additions & 2 deletions RealmWeaver/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
[assembly: AssemblyCopyright("Copyright © 2016 Realm")]
[assembly: AssemblyCompany("Realm Inc.")]

[assembly: AssemblyVersion("0.74.0.0")]
[assembly: AssemblyFileVersion("0.74.0.0")]
[assembly: AssemblyVersion("0.74.1.0")]
[assembly: AssemblyFileVersion("0.74.1.0")]
5 changes: 4 additions & 1 deletion Tests/IntegrationTests.Shared/NotificationTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
#if ENABLE_INTERNAL_NON_PCL_TESTS
using System;
using System.Linq;
using NUnit.Framework;
using Realms;
Expand Down Expand Up @@ -44,6 +45,7 @@ public void ShouldTriggerRealmChangedEvent()
Assert.That(wasNotified, "RealmChanged notification was not triggered");
}


[Test]
public async void ResultsShouldRaiseCollectionChangedReset()
{
Expand Down Expand Up @@ -74,3 +76,4 @@ private static async Task NotifyRealm(Realm realm)
}
}

#endif // #if ENABLE_INTERNAL_NON_PCL_TESTS
Loading

0 comments on commit 629ffe3

Please sign in to comment.