Skip to content

Commit ee7db5d

Browse files
committed
Merge branch 'master' into ni/queryable-list
* master: (89 commits) Prepare for 4.0.1 (#1876) Fix iOS device builds (#1875) Prepare for 4.0.0 (#1868) Refactor packaging (#1849) Update CHANGELOG.md (#1828) Add session.stop/start methods (#1839) Prepare for 3.4.0 (#1826) Ensure GetInstanceAsync works with QBS config (#1827) Add ability to define custom log function (#1824) Add support for user agents (#1819) Bump Sync to 3.10.1 (#1772) Update ISSUE_TEMPLATE.md Release 3.3.0 (#1808) Expose SyncConfiguration.OnProgress (#1807) Throw an error when trying to call async subscription methods on background threads (#1783) Update CHANGELOG.md (#1777) Prepare for 3.2.1 (#1775) Fix subscription state size (#1774) Release 3.2.0 (#1769) Add ShouldCompactOnLaunch to the PCL RealmConfig (#1768) ... # Conflicts: # Platform.PCL/Realm.PCL/Extensions/CollectionNotificationsExtensionsPCL.cs # Tests/Tests.Shared/CollectionTests.cs
2 parents 39b2fcb + 8307a86 commit ee7db5d

File tree

478 files changed

+14488
-16576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

478 files changed

+14488
-16576
lines changed

.github/ISSUE_TEMPLATE.md

+3-5
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@
3636

3737
## Version of Realm and Tooling
3838

39-
- Realm Object Server Version: ?
39+
- Realm Object Server Version: ? (you can see this as well in Studio once connected to a Realm instance)
4040
- Flavor:
41-
- [ ] Developer
42-
- [ ] Professional
43-
- [ ] Enterprise
41+
- [ ] Realm Cloud
42+
- [ ] Self-Hosted
4443
- Server OS & Version: ? (e.g. CentOS 6)
4544
- Client SDK Version: ?
4645
- Client OS & Version: ?
47-

.gitignore

+1-19
Original file line numberDiff line numberDiff line change
@@ -181,30 +181,12 @@ Network Trash Folder
181181
Temporary Items
182182
.apdisk
183183
# Misc.
184-
packages
185-
Tools/RealmWeaver.Fody.dll
186-
wrappers/DerivedData
187-
wrappers/core
188-
wrappers/core-android
189-
wrappers/realm-core*.bz2
190-
wrappers/realm-core-android*.gz
191-
wrappers/realm-*.xz
192184
wrappers/cmake
193185
doxyout*
194-
RealmNetWeaver.Fody.dll
195-
NuGetBuild
196-
realm-core-android-*.tar.gz
197-
*.so
198186
NDependOut
199187
*.realm.lock
200188
*.realm.log_a
201189
*.realm.log_b
202-
RealmWeaver.Fody.dll
203-
wrappers/libs-dbg
204190
*.xam
205191
Resource.designer.cs
206-
*.gz
207-
Mono.Cecil.dll
208-
Realm.BuildTasks.dll
209-
*.nuget.targets
210-
*.nuget.props
192+
FodyWeavers.xsd

.nuget/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.5.0" />
77
<package id="NUnit.Extension.VSProjectLoader" version="3.5.0" />
88
<package id="NUnit.Runners" version="3.7.0" />
9-
<package id="NUnit.Extension.TeamCityEventListener " version="1.0.2" />
9+
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" />
1010
</packages>

.runsettings

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RunSettings>
3+
<MSTest>
4+
<Parallelize>
5+
<Workers>0</Workers>
6+
<Scope>ClassLevel</Scope>
7+
</Parallelize>
8+
</MSTest>
9+
</RunSettings>

CHANGELOG.md

+279-18
Large diffs are not rendered by default.

DataBinding/Realm.DataBinding.Android/Properties/AssemblyInfo.cs

-21
This file was deleted.

DataBinding/Realm.DataBinding.Android/Realm.DataBinding.Android.csproj

-66
This file was deleted.

DataBinding/Realm.DataBinding.Android/packages.config

-4
This file was deleted.

DataBinding/Realm.DataBinding.Mac/Properties/AssemblyInfo.cs

-21
This file was deleted.

DataBinding/Realm.DataBinding.Mac/Realm.DataBinding.Mac.csproj

-66
This file was deleted.

DataBinding/Realm.DataBinding.PCL/Properties/AssemblyInfo.cs

-22
This file was deleted.

DataBinding/Realm.DataBinding.PCL/Realm.DataBinding.PCL.csproj

-57
This file was deleted.

DataBinding/Realm.DataBinding.PCL/TypeInfoHelper.cs

-33
This file was deleted.

DataBinding/Realm.DataBinding.PCL/project.json

-10
This file was deleted.

0 commit comments

Comments
 (0)