MLIBZ-301 removing all references to linqextender, and adding remotio…

…n source also updated nuspec
Kinvey · Jun 2, 2015 · 654b7f0 · 654b7f0
1 parent c19ee5e
commit 654b7f0
Show file tree

Hide file tree

Showing 166 changed files with 2,484 additions and 8,510 deletions.
diff --git a/Android-Libtester/Android-Libtester.csproj b/Android-Libtester/Android-Libtester.csproj
@@ -46,9 +46,6 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Remotion.Linq">
-      <HintPath>..\packages\Remotion.Linq.2.0.0-alpha-003\lib\portable-net45+win+wpa81+wp80\Remotion.Linq.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
@@ -82,5 +79,9 @@
       <Project>{6644D98D-026B-48E9-95A3-61C4D98D82E7}</Project>
       <Name>Kinvey-Xamarin</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\thirdparty\csharp\Relinq\Core\Core.csproj">
+      <Project>{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}</Project>
+      <Name>Core</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/Android-Libtester/packages.config b/Android-Libtester/packages.config
@@ -2,5 +2,4 @@
 <packages>
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="MonoAndroid44" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="MonoAndroid50" />
-  <package id="Remotion.Linq" version="2.0.0-alpha-003" targetFramework="MonoAndroid50" />
 </packages>
diff --git a/Kinvey-Xamarin-Android/Kinvey-Xamarin-Android.nuspec b/Kinvey-Xamarin-Android/Kinvey-Xamarin-Android.nuspec
@@ -1,15 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package >
   <metadata>
-    <id>Kinvey-Android</id>
-    <version>1.2.0</version>
-    <title>Kinvey-Xamarin-Android</title>
-    <authors>Kinvey</authors>
-    <owners>Kinvey</owners>
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <authors>$author$</authors>
+    <owners>$author$</owners>
+    <licenseUrl>http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE</licenseUrl>
+    <projectUrl>http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE</projectUrl>
+    <iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Build Xamarin Android apps which leverage the power of Kinvey's BaaS, with support for  users, data, and files, with caching and offline.  Check out http://devcenter.kinvey.com/xamarin for guides, tutorials, and sample apps.  </description>
-    <releaseNotes>Initial Release with support for Push Notifications through GCM</releaseNotes>
+    <description>$description$</description>
+    <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
     <copyright>Copyright 2015</copyright>
-    <tags>Kinvey BaaS</tags>
+    <tags>Tag1 Tag2</tags>
   </metadata>
 </package>
diff --git a/Kinvey-Xamarin-iOS/Kinvey-Xamarin-iOS.nuspec b/Kinvey-Xamarin-iOS/Kinvey-Xamarin-iOS.nuspec
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package >
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <authors>$author$</authors>
+    <owners>$author$</owners>
+    <licenseUrl>http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE</licenseUrl>
+    <projectUrl>http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE</projectUrl>
+    <iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
+    <copyright>Copyright 2015</copyright>
+    <tags>Tag1 Tag2</tags>
+  </metadata>
+</package>
diff --git a/Kinvey-Xamarin.sln b/Kinvey-Xamarin.sln
@@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS-TestDrive", "..\..\ksam
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kinvey-Xamarin-iOS", "Kinvey-Xamarin-iOS\Kinvey-Xamarin-iOS.csproj", "{77548067-6F95-461C-A4D1-A051E20D30C5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "..\..\thirdparty\csharp\Relinq\Core\Core.csproj", "{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,6 +36,24 @@ Global
 		AppStore|iPhone = AppStore|iPhone
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Release|iPhone.Build.0 = Release|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{444456B1-5B55-48D6-9637-00ADCA92B7C9}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
 		{444456B1-5B55-48D6-9637-00ADCA92B7C9}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
 		{444456B1-5B55-48D6-9637-00ADCA92B7C9}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/Kinvey-Xamarin/AppData.cs b/Kinvey-Xamarin/AppData.cs
@@ -21,8 +21,6 @@
 using System.IO;
 using System.Linq.Expressions;
 using System.Collections;
-using LinqExtender;
-using Ast = LinqExtender.Ast;
 using Newtonsoft.Json.Linq;
 using Remotion.Linq.Parsing.Structure;
 using KinveyUtils;

diff --git a/Kinvey-Xamarin/Auth/KinveyAuthRequest.cs b/Kinvey-Xamarin/Auth/KinveyAuthRequest.cs
@@ -304,8 +304,12 @@ public Builder(AbstractKinveyClient transport, string appKey, string appSecret,
 			public Builder(AbstractKinveyClient transport, string appKey, string appSecret, string username, string password, User user)
                 : this(transport, appKey, appSecret, user)
             {
+				this.client = transport;
+				this.appKeyAuthentication = new HttpBasicAuthenticator(appKey, appSecret);
+				this.appKey = appKey;
                 this.username = username;
                 this.password = password;
+				this.user = user;
             }
 
 

diff --git a/Kinvey-Xamarin/DefaultContext.cs b/Kinvey-Xamarin/DefaultContext.cs
diff --git a/Kinvey-Xamarin/Kinvey-Xamarin.csproj b/Kinvey-Xamarin/Kinvey-Xamarin.csproj
@@ -68,8 +68,6 @@
     <Compile Include="Model\KinveyDeleteResponse.cs" />
     <Compile Include="Offline\BackgroundExecutor.cs" />
     <Compile Include="Auth\SQLiteCredentialStore.cs" />
-    <Compile Include="Query\ExpressionVisitor.cs" />
-    <Compile Include="Query\KinveyQueryContext.cs" />
     <Compile Include="Query\IQueryBuilder.cs" />
     <Compile Include="Query\StringQueryBuilder.cs" />
     <Compile Include="File.cs" />
@@ -89,7 +87,6 @@
     <Compile Include="Async\KinveyFileDelegate.cs" />
     <Compile Include="Async\KinveyMICDelegate.cs" />
     <Compile Include="AbstractPush.cs" />
-    <Compile Include="DefaultContext.cs" />
     <Compile Include="Query\KinveyQueryExecutor.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
@@ -117,9 +114,6 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\portable-net45+wp80+win8+wpa81+aspnetcore50\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="LinqExtender">
-      <HintPath>..\packages\LinqExtender.3.0.1\lib\LinqExtender.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net.Http">
       <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
     </Reference>
@@ -129,11 +123,14 @@
     <Reference Include="System.Net.Http.Extensions">
       <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Remotion.Linq">
-      <HintPath>..\packages\Remotion.Linq.2.0.0-alpha-003\lib\portable-net45+win+wpa81+wp80\Remotion.Linq.dll</HintPath>
+    <Reference Include="Microsoft.Threading.Tasks">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="ModernHttpClient">
-      <HintPath>..\packages\modernhttpclient.2.4.1\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll</HintPath>
+      <HintPath>..\packages\modernhttpclient.2.4.2\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -145,5 +142,9 @@
       <Project>{444456B1-5B55-48D6-9637-00ADCA92B7C9}</Project>
       <Name>Kinvey-Utils</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\thirdparty\csharp\Relinq\Core\Core.csproj">
+      <Project>{028E7899-0D5F-49C8-9EB6-8B051E02F1E0}</Project>
+      <Name>Core</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/Kinvey-Xamarin/Kinvey-Xamarin.nuspec b/Kinvey-Xamarin/Kinvey-Xamarin.nuspec
@@ -1,24 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package >
   <metadata>
     <id>Kinvey</id>
-    <version>//TODO</version>
+    <version>1.5.0</version>
+    <releaseNotes> * Full support for iOS, with release of Kinvey-Xamarin-ios library * Refactoring LINQ implementation * Updating SQLite dependencies </releaseNotes>
     <title>Kinvey-Xamarin</title>
     <authors>Kinvey</authors>
     <owners>Kinvey</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Build Xamarin apps which leverage the power of Kinvey's BaaS, with support for users, data, and files, with caching and offline.  Check out http://devcenter.kinvey.com/xamarin for guides, tutorials, and sample apps.  </description>
-    <releaseNotes>//TODO</releaseNotes>
     <copyright>Copyright 2015</copyright>
     <projectUrl>http://devcenter.kinvey.com/xamarin/</projectUrl>
     <tags>Kinvey BaaS</tags>
     <dependencies>
-        <dependency id="LinqExtender" version="3.0.1" />
+        <dependency id="Microsoft.Bcl" version="1.1.0" />
         <dependency id="Microsoft.Bcl.Async" version="1.0.168" />
+        <dependency id="Microsoft.Bcl.Build" version="1.0.21" />
         <dependency id="Microsoft.Net.Http" version="2.2.29" />
-        <dependency id="Newtonsoft.Json" version="6.0.7" />
-        <dependency id="SQLite.Net.Async-PCL" version="2.5" />
-        <dependency id="ModernHttpClient" version="2.4.0" />
+        <dependency id="ModernHttpClient" version="2.4.2" />
+        <dependency id="Newtonsoft.Json" version="6.0.8" />
+        <dependency id="Remotion.Linq" version="2.0.0-alpha-003" />
+        <dependency id="SQLite.Net.Async-PCL" version="3.0.5" />
+        <dependency id="SQLite.Net-PCL" version="3.0.5" />
     </dependencies>
     <frameworkAssemblies>
         <frameworkAssembly assemblyName="System.ServiceModel" />