Prepare 3.0 (#1723)

* Prepare 3.0 * Upgrade manual test apps * Upgrade Win32 project * Upgrade UWP as well
realm · Apr 25, 2018 · df403d1 · df403d1
1 parent 9fcfd05
commit df403d1
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-3.0.0 (TBD)
+3.0.0 (2018-04-16)
 ------------------
 
 ### Enhancements

diff --git a/Manual Tests/NuGetReleaseTests/Tests.Android/Tests.Android.csproj b/Manual Tests/NuGetReleaseTests/Tests.Android/Tests.Android.csproj
@@ -152,10 +152,10 @@
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="Realm">
-      <HintPath>..\packages\Realm.Database.2.2.0\lib\netstandard1.4\Realm.dll</HintPath>
+      <HintPath>..\packages\Realm.Database.3.0.0\lib\netstandard1.4\Realm.dll</HintPath>
     </Reference>
     <Reference Include="Realm.Sync">
-      <HintPath>..\packages\Realm.2.2.0\lib\netstandard1.4\Realm.Sync.dll</HintPath>
+      <HintPath>..\packages\Realm.3.0.0\lib\netstandard1.4\Realm.Sync.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -212,7 +212,7 @@
   <Import Project="..\packages\Xamarin.Forms.2.3.4.224\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.4.224\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
   <Import Project="..\packages\Fody.2.4.6\build\Fody.targets" Condition="Exists('..\packages\Fody.2.4.6\build\Fody.targets')" />
-  <Import Project="..\packages\Realm.Database.2.2.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.2.2.0\build\Realm.Database.targets')" />
-  <Import Project="..\packages\Realm.2.2.0\build\Realm.targets" Condition="Exists('..\packages\Realm.2.2.0\build\Realm.targets')" />
   <Import Project="..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets" Condition="Exists('..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets')" />
+  <Import Project="..\packages\Realm.Database.3.0.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.3.0.0\build\Realm.Database.targets')" />
+  <Import Project="..\packages\Realm.3.0.0\build\Realm.targets" Condition="Exists('..\packages\Realm.3.0.0\build\Realm.targets')" />
 </Project>
diff --git a/Manual Tests/NuGetReleaseTests/Tests.Android/packages.config b/Manual Tests/NuGetReleaseTests/Tests.Android/packages.config
@@ -11,8 +11,8 @@
   <package id="Nito.Disposables" version="1.0.0" targetFramework="monoandroid71" />
   <package id="NUnit" version="3.6.1" targetFramework="monoandroid60" />
   <package id="PCLStorage" version="1.0.2" targetFramework="monoandroid60" />
-  <package id="Realm" version="2.2.0" targetFramework="monoandroid81" />
-  <package id="Realm.Database" version="2.2.0" targetFramework="monoandroid81" />
+  <package id="Realm" version="3.0.0" targetFramework="monoandroid81" />
+  <package id="Realm.Database" version="3.0.0" targetFramework="monoandroid81" />
   <package id="Realm.DataBinding" version="1.2.0" targetFramework="monoandroid80" />
   <package id="Remotion.Linq" version="2.1.2" targetFramework="monoandroid80" />
   <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="monoandroid81" developmentDependency="true" />

diff --git a/Manual Tests/NuGetReleaseTests/Tests.NetCore/Tests.NetCore.csproj b/Manual Tests/NuGetReleaseTests/Tests.NetCore/Tests.NetCore.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="System.Reactive" Version="3.1.1" />
     <PackageReference Include="NUnitLite" Version="3.7.1" />
     <PackageReference Include="NUnit" Version="3.7.1" />
-    <PackageReference Include="Realm" Version="2.2.0" />
+    <PackageReference Include="Realm" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Manual Tests/NuGetReleaseTests/Tests.UWP/Tests.UWP.csproj b/Manual Tests/NuGetReleaseTests/Tests.UWP/Tests.UWP.csproj
@@ -136,7 +136,7 @@
       <Version>1.0.2</Version>
     </PackageReference>
     <PackageReference Include="Realm">
-      <Version>2.2.0</Version>
+      <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.Diagnostics.TraceSource">
       <Version>4.3.0</Version>

diff --git a/Manual Tests/NuGetReleaseTests/Tests.Win32/Tests.Win32.csproj b/Manual Tests/NuGetReleaseTests/Tests.Win32/Tests.Win32.csproj
@@ -53,14 +53,14 @@
     <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="Realm, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Realm.Database.2.2.0\lib\netstandard1.4\Realm.dll</HintPath>
+    <Reference Include="Realm, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Realm.Database.3.0.0\lib\netstandard1.4\Realm.dll</HintPath>
     </Reference>
     <Reference Include="Realm.DataBinding, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Realm.DataBinding.1.2.0\lib\netstandard1.0\Realm.DataBinding.dll</HintPath>
     </Reference>
-    <Reference Include="Realm.Sync, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Realm.2.2.0\lib\netstandard1.4\Realm.Sync.dll</HintPath>
+    <Reference Include="Realm.Sync, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Realm.3.0.0\lib\netstandard1.4\Realm.Sync.dll</HintPath>
     </Reference>
     <Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
       <HintPath>..\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
@@ -175,13 +175,13 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
     <Error Condition="!Exists('..\packages\Fody.2.4.6\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.4.6\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Realm.Database.2.2.0\build\Realm.Database.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Realm.Database.2.2.0\build\Realm.Database.targets'))" />
-    <Error Condition="!Exists('..\packages\Realm.2.2.0\build\Realm.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Realm.2.2.0\build\Realm.targets'))" />
     <Error Condition="!Exists('..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets'))" />
+    <Error Condition="!Exists('..\packages\Realm.Database.3.0.0\build\Realm.Database.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Realm.Database.3.0.0\build\Realm.Database.targets'))" />
+    <Error Condition="!Exists('..\packages\Realm.3.0.0\build\Realm.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Realm.3.0.0\build\Realm.targets'))" />
   </Target>
   <Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
   <Import Project="..\packages\Fody.2.4.6\build\Fody.targets" Condition="Exists('..\packages\Fody.2.4.6\build\Fody.targets')" />
-  <Import Project="..\packages\Realm.Database.2.2.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.2.2.0\build\Realm.Database.targets')" />
-  <Import Project="..\packages\Realm.2.2.0\build\Realm.targets" Condition="Exists('..\packages\Realm.2.2.0\build\Realm.targets')" />
   <Import Project="..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets" Condition="Exists('..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets')" />
+  <Import Project="..\packages\Realm.Database.3.0.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.3.0.0\build\Realm.Database.targets')" />
+  <Import Project="..\packages\Realm.3.0.0\build\Realm.targets" Condition="Exists('..\packages\Realm.3.0.0\build\Realm.targets')" />
 </Project>
diff --git a/Manual Tests/NuGetReleaseTests/Tests.Win32/packages.config b/Manual Tests/NuGetReleaseTests/Tests.Win32/packages.config
@@ -9,8 +9,8 @@
   <package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net46" />
   <package id="Nito.Disposables" version="1.0.0" targetFramework="net46" />
   <package id="NUnit" version="3.8.1" targetFramework="net462" />
-  <package id="Realm" version="2.2.0" targetFramework="net462" />
-  <package id="Realm.Database" version="2.2.0" targetFramework="net462" />
+  <package id="Realm" version="3.0.0" targetFramework="net462" />
+  <package id="Realm.Database" version="3.0.0" targetFramework="net462" />
   <package id="Realm.DataBinding" version="1.2.0" targetFramework="net462" />
   <package id="Remotion.Linq" version="2.1.2" targetFramework="net462" />
   <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net462" developmentDependency="true" />

diff --git a/Manual Tests/NuGetReleaseTests/Tests.XamarinMac/Tests.XamarinMac.csproj b/Manual Tests/NuGetReleaseTests/Tests.XamarinMac/Tests.XamarinMac.csproj
@@ -30,6 +30,7 @@
     <HttpClientHandler>NSUrlSessionHandler</HttpClientHandler>
     <LinkMode>None</LinkMode>
     <XamMacArch></XamMacArch>
+    <AOTMode>None</AOTMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType></DebugType>
@@ -47,9 +48,10 @@
     <LinkMode>None</LinkMode>
     <HttpClientHandler>NSUrlSessionHandler</HttpClientHandler>
     <XamMacArch></XamMacArch>
+    <AOTMode>None</AOTMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
-    <StartArguments>--headless --labels=On</StartArguments>
+    <StartArguments>--labels=On</StartArguments>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -101,10 +103,10 @@
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="Realm">
-      <HintPath>..\packages\Realm.Database.2.2.0\lib\netstandard1.4\Realm.dll</HintPath>
+      <HintPath>..\packages\Realm.Database.3.0.0\lib\netstandard1.4\Realm.dll</HintPath>
     </Reference>
     <Reference Include="Realm.Sync">
-      <HintPath>..\packages\Realm.2.2.0\lib\netstandard1.4\Realm.Sync.dll</HintPath>
+      <HintPath>..\packages\Realm.3.0.0\lib\netstandard1.4\Realm.Sync.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -167,6 +169,6 @@
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
   <Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
   <Import Project="..\packages\Fody.2.4.6\build\Fody.targets" Condition="Exists('..\packages\Fody.2.4.6\build\Fody.targets')" />
-  <Import Project="..\packages\Realm.Database.2.2.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.2.2.0\build\Realm.Database.targets')" />
-  <Import Project="..\packages\Realm.2.2.0\build\Realm.targets" Condition="Exists('..\packages\Realm.2.2.0\build\Realm.targets')" />
+  <Import Project="..\packages\Realm.Database.3.0.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.3.0.0\build\Realm.Database.targets')" />
+  <Import Project="..\packages\Realm.3.0.0\build\Realm.targets" Condition="Exists('..\packages\Realm.3.0.0\build\Realm.targets')" />
 </Project>
diff --git a/Manual Tests/NuGetReleaseTests/Tests.XamarinMac/packages.config b/Manual Tests/NuGetReleaseTests/Tests.XamarinMac/packages.config
@@ -11,8 +11,8 @@
   <package id="Nito.Disposables" version="1.0.0" targetFramework="xamarinmac20" />
   <package id="NUnit" version="3.6.1" targetFramework="xamarinmac20" />
   <package id="NUnitLite" version="3.7.1" targetFramework="xamarinmac20" />
-  <package id="Realm" version="2.2.0" targetFramework="xamarinmac20" />
-  <package id="Realm.Database" version="2.2.0" targetFramework="xamarinmac20" />
+  <package id="Realm" version="3.0.0" targetFramework="xamarinmac20" />
+  <package id="Realm.Database" version="3.0.0" targetFramework="xamarinmac20" />
   <package id="Realm.DataBinding" version="1.2.0" targetFramework="xamarinmac20" />
   <package id="Remotion.Linq" version="2.1.2" targetFramework="xamarinmac20" />
   <package id="System.AppContext" version="4.3.0" targetFramework="xamarinmac20" />

diff --git a/Manual Tests/NuGetReleaseTests/Tests.iOS/Tests.iOS.csproj b/Manual Tests/NuGetReleaseTests/Tests.iOS/Tests.iOS.csproj
@@ -74,6 +74,7 @@
     <CodesignEntitlements></CodesignEntitlements>
     <MtouchLink>Full</MtouchLink>
     <MtouchExtraArgs>--linkskip=nunit.runner.iOS</MtouchExtraArgs>
+    <CodesignProvision>Visual Studio: NuGet Tests Development</CodesignProvision>
   </PropertyGroup>
   <ItemGroup>
     <None Include="Info.plist" />
@@ -167,10 +168,10 @@
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="Realm">
-      <HintPath>..\packages\Realm.Database.2.2.0\lib\netstandard1.4\Realm.dll</HintPath>
+      <HintPath>..\packages\Realm.Database.3.0.0\lib\netstandard1.4\Realm.dll</HintPath>
     </Reference>
     <Reference Include="Realm.Sync">
-      <HintPath>..\packages\Realm.2.2.0\lib\netstandard1.4\Realm.Sync.dll</HintPath>
+      <HintPath>..\packages\Realm.3.0.0\lib\netstandard1.4\Realm.Sync.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -198,7 +199,7 @@
   <Import Project="..\packages\Xamarin.Forms.2.3.4.224\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.4.224\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
   <Import Project="..\packages\Fody.2.4.6\build\Fody.targets" Condition="Exists('..\packages\Fody.2.4.6\build\Fody.targets')" />
-  <Import Project="..\packages\Realm.Database.2.2.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.2.2.0\build\Realm.Database.targets')" />
-  <Import Project="..\packages\Realm.2.2.0\build\Realm.targets" Condition="Exists('..\packages\Realm.2.2.0\build\Realm.targets')" />
   <Import Project="..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets" Condition="Exists('..\packages\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.targets')" />
+  <Import Project="..\packages\Realm.Database.3.0.0\build\Realm.Database.targets" Condition="Exists('..\packages\Realm.Database.3.0.0\build\Realm.Database.targets')" />
+  <Import Project="..\packages\Realm.3.0.0\build\Realm.targets" Condition="Exists('..\packages\Realm.3.0.0\build\Realm.targets')" />
 </Project>
diff --git a/Manual Tests/NuGetReleaseTests/Tests.iOS/packages.config b/Manual Tests/NuGetReleaseTests/Tests.iOS/packages.config
@@ -12,8 +12,8 @@
   <package id="Nito.Disposables" version="1.0.0" targetFramework="xamarinios10" />
   <package id="NUnit" version="3.6.1" targetFramework="xamarinios10" />
   <package id="PCLStorage" version="1.0.2" targetFramework="xamarinios10" />
-  <package id="Realm" version="2.2.0" targetFramework="xamarinios10" />
-  <package id="Realm.Database" version="2.2.0" targetFramework="xamarinios10" />
+  <package id="Realm" version="3.0.0" targetFramework="xamarinios10" />
+  <package id="Realm.Database" version="3.0.0" targetFramework="xamarinios10" />
   <package id="Realm.DataBinding" version="1.2.0" targetFramework="xamarinios10" />
   <package id="Remotion.Linq" version="2.1.2" targetFramework="xamarinios10" />
   <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="xamarinios10" developmentDependency="true" />

diff --git a/RealmAssemblyInfo.cs b/RealmAssemblyInfo.cs
@@ -23,8 +23,8 @@
 [assembly: AssemblyCompany("Realm Inc.")]
 [assembly: AssemblyProduct("Realm C#")]
 
-[assembly: AssemblyVersion("2.3.0.0")]
-[assembly: AssemblyFileVersion("2.3.0.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]
 
 #if DEBUG
 [assembly: AssemblyConfiguration("Debug")]

diff --git a/Tests/Tests.Shared/CollectionTests.cs b/Tests/Tests.Shared/CollectionTests.cs
@@ -433,7 +433,7 @@ public void Results_GetFiltered_List()
                             new Dog
                             {
                                 Name = $"Dog {2 * i + 1}",
-                                Vaccinated = (2 * i + 1) % 5 == 0
+                                Vaccinated = ((2 * i) + 1) % 5 == 0
                             }
                         }
                     };

diff --git a/Tests/Tests.Shared/InstanceTests.cs b/Tests/Tests.Shared/InstanceTests.cs
@@ -245,7 +245,7 @@ public void RealmObjectClassesOnlyAllowRealmObjects()
         [TestCase(false)]
         public void ShouldCompact_IsInvokedAfterOpening(bool shouldCompact)
         {
-            var config = ((RealmConfiguration)RealmConfiguration.DefaultConfiguration);
+            var config = (RealmConfiguration)RealmConfiguration.DefaultConfiguration;
 
             using (var realm = Realm.GetInstance(config))
             {

diff --git a/Tests/Tests.Sync.Shared/ObjectLevelPermissionsTests.cs b/Tests/Tests.Sync.Shared/ObjectLevelPermissionsTests.cs
@@ -105,10 +105,8 @@ public void Test_RealmUpdate()
                 {
                     var subscription = await SubscribeToObjectsAsync(realm);
                     AssertRealmPrivileges(realm, RealmPrivileges.Read | RealmPrivileges.Update);
-                    AssertClassPrivileges(realm, ClassPrivileges.Read | ClassPrivileges.Subscribe |
-                                          ClassPrivileges.Create | ClassPrivileges.SetPermissions | ClassPrivileges.Update);
-                    AssertObjectPrivileges(realm, ObjectPrivileges.Read | ObjectPrivileges.Delete |
-                                           ObjectPrivileges.SetPermissions | ObjectPrivileges.Update);
+                    AssertClassPrivileges(realm, ClassPrivileges.Read | ClassPrivileges.Subscribe | ClassPrivileges.Create | ClassPrivileges.SetPermissions | ClassPrivileges.Update);
+                    AssertObjectPrivileges(realm, ObjectPrivileges.Read | ObjectPrivileges.Delete | ObjectPrivileges.SetPermissions | ObjectPrivileges.Update);
 
                     Assert.That(subscription.Results.Count(), Is.EqualTo(3));
                     AddObjectsToRealm(realm, new[] { 4, 5, 6 });
@@ -293,7 +291,6 @@ public void Test_ClassCreate()
                     Assert.That(subscription.Results.Count(), Is.EqualTo(9));
                     await WaitForSyncAsync(realm);
                     Assert.That(subscription.Results.Count(), Is.EqualTo(6));
-
                 }
             });
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -433,7 +433,7 @@ public void Results_GetFiltered_List() @@
                                 new Dog
                                 {
                                     Name = $"Dog {2 * i + 1}",
-                                    Vaccinated = (2 * i + 1) % 5 == 0
+                                    Vaccinated = ((2 * i) + 1) % 5 == 0
                                 }
                             }
                         };
@@ Expand Down @@