Set MergeOption to PreserveChanges

Mine02C4 · Apr 2, 2018 · 236f425 · 236f425
1 parent 5e8dbf7
commit 236f425
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/HiyoshiCfhClient/Client.cs b/HiyoshiCfhClient/Client.cs
@@ -52,7 +52,7 @@ internal void ResetContext()
         {
             Context = new Container(new Uri("https://hiyoshicfhweb.azurewebsites.net/odata"));
             GC.Collect();
-            Context.MergeOption = MergeOption.NoTracking;
+            Context.MergeOption = MergeOption.PreserveChanges;
             if (TokenType != null && AccessToken != null)
             {
                 Context.SendingRequest2 += (sender, eventArgs) =>

diff --git a/HiyoshiCfhClient/HiyoshiCfhClient.csproj b/HiyoshiCfhClient/HiyoshiCfhClient.csproj
@@ -70,21 +70,17 @@
     <Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\LivetCask.1.3.1.0\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.OData.Client, Version=7.4.1.20214, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\odata.net\bin\AnyCPU\Debug\Product\Desktop\Microsoft.OData.Client.dll</HintPath>
+    <Reference Include="Microsoft.OData.Client, Version=7.4.3.20321, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.OData.Client.7.4.3\lib\net45\Microsoft.OData.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.OData.Core, Version=7.4.1.20214, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\odata.net\bin\AnyCPU\Debug\Product\Desktop\Microsoft.OData.Core.dll</HintPath>
+    <Reference Include="Microsoft.OData.Core, Version=7.4.3.20321, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.OData.Core.7.4.3\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.OData.Edm, Version=7.4.1.20214, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\odata.net\bin\AnyCPU\Debug\Product\Desktop\Microsoft.OData.Edm.dll</HintPath>
+    <Reference Include="Microsoft.OData.Edm, Version=7.4.3.20321, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.OData.Edm.7.4.3\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Spatial, Version=7.4.1.20214, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\odata.net\bin\AnyCPU\Debug\Product\Desktop\Microsoft.Spatial.dll</HintPath>
+    <Reference Include="Microsoft.Spatial, Version=7.4.3.20321, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Spatial.7.4.3\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll</HintPath>
     </Reference>
     <Reference Include="Nekoxy, Version=1.5.3.21, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Nekoxy.1.5.3.21\lib\net45\Nekoxy.dll</HintPath>

diff --git a/HiyoshiCfhClient/packages.config b/HiyoshiCfhClient/packages.config
@@ -14,6 +14,10 @@
   <package id="MetroRadiance.Core" version="2.2.1" targetFramework="net46" />
   <package id="MetroTrilithon" version="0.2.0" targetFramework="net46" />
   <package id="MetroTrilithon.Desktop" version="0.2.3" targetFramework="net46" />
+  <package id="Microsoft.OData.Client" version="7.4.3" targetFramework="net46" />
+  <package id="Microsoft.OData.Core" version="7.4.3" targetFramework="net46" />
+  <package id="Microsoft.OData.Edm" version="7.4.3" targetFramework="net46" />
+  <package id="Microsoft.Spatial" version="7.4.3" targetFramework="net46" />
   <package id="Nekoxy" version="1.5.3.21" targetFramework="net46" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net46" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net46" />