Updated Simple.Data and xunit packages.

simplefx · Feb 20, 2012 · b75e241 · b75e241
1 parent f3c0f5c
commit b75e241
Show file tree

Hide file tree

Showing 20 changed files with 107 additions and 98 deletions.
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/Simple.Data.Azure.IntegrationTest/Simple.Data.Azure.IntegrationTest.csproj b/Simple.Data.Azure.IntegrationTest/Simple.Data.Azure.IntegrationTest.csproj
@@ -33,9 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Simple.Data, Version=0.14.0.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Simple.Data, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Simple.Data.Core.0.14.0.1\lib\net40\Simple.Data.dll</HintPath>
+      <HintPath>..\packages\Simple.Data.Core.1.0.0-beta1\lib\net40\Simple.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Simple.Data.Azure.IntegrationTest/packages.config b/Simple.Data.Azure.IntegrationTest/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Simple.Data.Core" version="0.14.0.1" />
+  <package id="Simple.Data.Core" version="1.0.0-beta1" />
   <package id="xunit" version="1.9.0.1566" />
 </packages>
diff --git a/Simple.Data.Azure.Test/Simple.Data.Azure.Test.csproj b/Simple.Data.Azure.Test/Simple.Data.Azure.Test.csproj
@@ -33,9 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Simple.Data, Version=0.14.0.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Simple.Data, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Simple.Data.Core.0.14.0.1\lib\net40\Simple.Data.dll</HintPath>
+      <HintPath>..\packages\Simple.Data.Core.1.0.0-beta1\lib\net40\Simple.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Simple.Data.Azure.Test/packages.config b/Simple.Data.Azure.Test/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Simple.Data.Core" version="0.14.0.1" />
+  <package id="Simple.Data.Core" version="1.0.0-beta1" />
   <package id="xunit" version="1.9.0.1566" />
 </packages>
diff --git a/Simple.Data.Azure/AzureTableAdapter.cs b/Simple.Data.Azure/AzureTableAdapter.cs
@@ -17,15 +17,25 @@ protected override void OnSetup()
         {
             base.OnSetup();
             _helper = new RequestBuilder { UrlBase = Settings.Url, SharedKey = Settings.Key, Account = Settings.Account };
-        }
-
+        }
+
         public override IEnumerable<IDictionary<string, object>> Find(string tableName, SimpleExpression criteria)
         {
             // TODO: initialize expression formatter with FindTable delegate
             var filter = new ExpressionFormatter(null).Format(criteria);
             var table = new AzureTable(tableName, _helper);
             return table.Query(filter);
-        }
+        }
+
+        public override IDictionary<string, object> GetKey(string tableName, IDictionary<string, object> record)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override IList<string> GetKeyNames(string tableName)
+        {
+            throw new NotImplementedException();
+        }
 
         public override IDictionary<string, object> Get(string tableName, params object[] keyValues)
         {
@@ -47,11 +57,6 @@ public override int Update(string tableName, IDictionary<string, object> data, S
             throw new NotImplementedException();
         }
 
-        public override int Update(string tableName, IDictionary<string, object> data)
-        {
-            throw new NotImplementedException();
-        }
-
         public override int Delete(string tableName, SimpleExpression criteria)
         {
             throw new NotImplementedException();

diff --git a/Simple.Data.Azure/Simple.Data.Azure.csproj b/Simple.Data.Azure/Simple.Data.Azure.csproj
@@ -36,9 +36,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Simple.Data, Version=0.14.0.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Simple.Data, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Simple.Data.Core.0.14.0.1\lib\net40\Simple.Data.dll</HintPath>
+      <HintPath>..\packages\Simple.Data.Core.1.0.0-beta1\lib\net40\Simple.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />

diff --git a/Simple.Data.Azure/packages.config b/Simple.Data.Azure/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Simple.Data.Core" version="0.14.0.1" />
+  <package id="Simple.Data.Core" version="1.0.0-beta1" />
 </packages>
diff --git a/Simple.Data.OData.InMemoryService/Simple.Data.OData.InMemoryService.csproj b/Simple.Data.OData.InMemoryService/Simple.Data.OData.InMemoryService.csproj
@@ -39,8 +39,9 @@
     <Reference Include="Elmah">
       <HintPath>..\packages\elmah.corelibrary.1.2\lib\Elmah.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.4.2.0.0\lib\net40\EntityFramework.dll</HintPath>
+    <Reference Include="EntityFramework, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\EntityFramework.4.3.0\lib\net40\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

diff --git a/Simple.Data.OData.InMemoryService/Web.config b/Simple.Data.OData.InMemoryService/Web.config
@@ -1,54 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <sectionGroup name="elmah">
-      <section name="security" requirePermission="false" type="Elmah.SecuritySectionHandler, Elmah" />
-      <section name="errorLog" requirePermission="false" type="Elmah.ErrorLogSectionHandler, Elmah" />
-      <section name="errorMail" requirePermission="false" type="Elmah.ErrorMailSectionHandler, Elmah" />
-      <section name="errorFilter" requirePermission="false" type="Elmah.ErrorFilterSectionHandler, Elmah" />
-    </sectionGroup>
-  </configSections>
-  <system.web>
-    <compilation debug="true" targetFramework="4.0" />
-    <httpModules>
-      <add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" />
-      <add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" />
-      <add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" />
-    </httpModules>
-    <httpHandlers>
-      <add verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" />
-    </httpHandlers>
-  </system.web>
-  <system.serviceModel>
-    <behaviors>
-      <serviceBehaviors>
-        <behavior>
-          <!-- To avoid disclosing metadata information, set the value below to false and remove the metadata endpoint above before deployment -->
-          <serviceMetadata httpGetEnabled="true" />
-          <!-- To receive exception details in faults for debugging purposes, set the value below to true.  Set to false before deployment to avoid disclosing exception information -->
-          <serviceDebug includeExceptionDetailInFaults="false" />
-        </behavior>
-      </serviceBehaviors>
-    </behaviors>
-    <serviceHostingEnvironment multipleSiteBindingsEnabled="true" aspNetCompatibilityEnabled="true" />
-  </system.serviceModel>
-  <system.webServer>
-    <modules runAllManagedModulesForAllRequests="true">
-      <add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" preCondition="managedHandler" />
-      <add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" preCondition="managedHandler" />
-      <add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler" />
-    </modules>
-    <validation validateIntegratedModeConfiguration="false" />
-    <handlers>
-      <add name="Elmah" verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" preCondition="integratedMode" />
-    </handlers>
-  </system.webServer>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.2.0.4000" newVersion="3.2.0.4000" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <sectionGroup name="elmah">
+      <section name="security" requirePermission="false" type="Elmah.SecuritySectionHandler, Elmah" />
+      <section name="errorLog" requirePermission="false" type="Elmah.ErrorLogSectionHandler, Elmah" />
+      <section name="errorMail" requirePermission="false" type="Elmah.ErrorMailSectionHandler, Elmah" />
+      <section name="errorFilter" requirePermission="false" type="Elmah.ErrorFilterSectionHandler, Elmah" />
+    </sectionGroup>
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  </configSections>
+  <system.web>
+    <compilation debug="true" targetFramework="4.0" />
+    <httpModules>
+      <add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" />
+      <add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" />
+      <add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" />
+    </httpModules>
+    <httpHandlers>
+      <add verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" />
+    </httpHandlers>
+  </system.web>
+  <system.serviceModel>
+    <behaviors>
+      <serviceBehaviors>
+        <behavior>
+          <!-- To avoid disclosing metadata information, set the value below to false and remove the metadata endpoint above before deployment -->
+          <serviceMetadata httpGetEnabled="true" />
+          <!-- To receive exception details in faults for debugging purposes, set the value below to true.  Set to false before deployment to avoid disclosing exception information -->
+          <serviceDebug includeExceptionDetailInFaults="false" />
+        </behavior>
+      </serviceBehaviors>
+    </behaviors>
+    <serviceHostingEnvironment multipleSiteBindingsEnabled="true" aspNetCompatibilityEnabled="true" />
+  </system.serviceModel>
+  <system.webServer>
+    <modules runAllManagedModulesForAllRequests="true">
+      <add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" preCondition="managedHandler" />
+      <add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" preCondition="managedHandler" />
+      <add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler" />
+    </modules>
+    <validation validateIntegratedModeConfiguration="false" />
+    <handlers>
+      <add name="Elmah" verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" preCondition="integratedMode" />
+    </handlers>
+  </system.webServer>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.4000" newVersion="3.2.0.4000" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/Simple.Data.OData.InMemoryService/packages.config b/Simple.Data.OData.InMemoryService/packages.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="elmah" version="1.2.0.1" />
-  <package id="elmah.corelibrary" version="1.2" />
-  <package id="EntityFramework" version="4.2.0.0" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="elmah" version="1.2.0.1" />
+  <package id="elmah.corelibrary" version="1.2" />
+  <package id="EntityFramework" version="4.3.0" />
 </packages>
diff --git a/Simple.Data.OData.IntegrationTest/Simple.Data.OData.IntegrationTest.csproj b/Simple.Data.OData.IntegrationTest/Simple.Data.OData.IntegrationTest.csproj
@@ -33,9 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Simple.Data, Version=0.14.0.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Simple.Data, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Simple.Data.Core.0.14.0.1\lib\net40\Simple.Data.dll</HintPath>
+      <HintPath>..\packages\Simple.Data.Core.1.0.0-beta1\lib\net40\Simple.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Simple.Data.OData.IntegrationTest/packages.config b/Simple.Data.OData.IntegrationTest/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Simple.Data.Core" version="0.14.0.1" />
+  <package id="Simple.Data.Core" version="1.0.0-beta1" />
   <package id="xunit" version="1.9.0.1566" />
 </packages>
diff --git a/Simple.Data.OData/ODataTableAdapter.cs b/Simple.Data.OData/ODataTableAdapter.cs
@@ -36,6 +36,16 @@ public override IEnumerable<IDictionary<string, object>> Find(string tableName,
             return new ODataTable(tableName, _requestBuilder).Query(criteria);
         }
 
+        public override IDictionary<string, object> GetKey(string tableName, IDictionary<string, object> record)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override IList<string> GetKeyNames(string tableName)
+        {
+            throw new NotImplementedException();
+        }
+
         public override IDictionary<string, object> Get(string tableName, params object[] keyValues)
         {
 //            return new Finder(_requestBuilder, _expressionFormatter).Get(tableName, keyValues);
@@ -79,14 +89,6 @@ public override int Update(string tableName, IDictionary<string, object> data, S
             return 0;
         }
 
-        public override int Update(string tableName, IDictionary<string, object> data)
-        {
-            string[] keyFieldNames = _schema.FindTable(tableName).PrimaryKey.AsEnumerable().ToArray();
-            if (keyFieldNames.Length == 0) 
-                throw new ODataAdapterException("No Primary Key found for implicit update");
-            return Update(tableName, data, GetCriteria(tableName, keyFieldNames, data));
-        }
-
         public override int Delete(string tableName, SimpleExpression criteria)
         {
             // TODO: optimize

diff --git a/Simple.Data.OData/Simple.Data.OData.csproj b/Simple.Data.OData/Simple.Data.OData.csproj
@@ -33,9 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Simple.Data, Version=0.14.0.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Simple.Data, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Simple.Data.Core.0.14.0.1\lib\net40\Simple.Data.dll</HintPath>
+      <HintPath>..\packages\Simple.Data.Core.1.0.0-beta1\lib\net40\Simple.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />

diff --git a/Simple.Data.OData/packages.config b/Simple.Data.OData/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Simple.Data.Core" version="0.14.0.1" />
+  <package id="Simple.Data.Core" version="1.0.0-beta1" />
 </packages>
diff --git a/Simple.OData.Test/Simple.OData.Test.csproj b/Simple.OData.Test/Simple.OData.Test.csproj
@@ -33,9 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Simple.Data, Version=0.14.0.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Simple.Data, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Simple.Data.Core.0.14.0.1\lib\net40\Simple.Data.dll</HintPath>
+      <HintPath>..\packages\Simple.Data.Core.1.0.0-beta1\lib\net40\Simple.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Simple.OData.Test/packages.config b/Simple.OData.Test/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Simple.Data.Core" version="0.14.0.1" />
+  <package id="Simple.Data.Core" version="1.0.0-beta1" />
   <package id="xunit" version="1.9.0.1566" />
 </packages>
diff --git a/Simple.OData/Simple.OData.csproj b/Simple.OData/Simple.OData.csproj
@@ -33,9 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Simple.Data, Version=0.14.0.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Simple.Data, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Simple.Data.Core.0.14.0.1\lib\net40\Simple.Data.dll</HintPath>
+      <HintPath>..\packages\Simple.Data.Core.1.0.0-beta1\lib\net40\Simple.Data.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Simple.OData/packages.config b/Simple.OData/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Simple.Data.Core" version="0.14.0.1" />
+  <package id="Simple.Data.Core" version="1.0.0-beta1" />
 </packages>