Skip to content

Commit 43c8403

Browse files
gmurray81gmurray81
committed
updates for grouping support.
1 parent aedfe7a commit 43c8403

11 files changed

Lines changed: 431 additions & 113 deletions

File tree

‎DataSource.DataProviders.OData/DataSource.DataProviders.OData.Core/DataSource.DataProviders.OData.Core.csproj‎

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -48,40 +48,48 @@
4848
<Reference Include="Infragistics.Core.Platform">
4949
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.2\Source\Build\Infragistics.Core.Platform.dll</HintPath>
5050
</Reference>
51-
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\portable-net45+wp8+win8+wpa\Microsoft.Data.Edm.dll</HintPath>
51+
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Microsoft.Data.Edm.5.8.2\lib\portable-net45+wp8+win8+wpa\Microsoft.Data.Edm.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
55-
<Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Microsoft.Data.OData.5.6.4\lib\portable-net45+wp8+win8+wpa\Microsoft.Data.OData.dll</HintPath>
55+
<Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Microsoft.Data.OData.5.8.2\lib\portable-net45+wp8+win8+wpa\Microsoft.Data.OData.dll</HintPath>
5757
<Private>True</Private>
5858
</Reference>
59-
<Reference Include="Microsoft.OData.Core, Version=6.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\packages\Microsoft.OData.Core.6.11.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.OData.Core.dll</HintPath>
59+
<Reference Include="Microsoft.OData.Core, Version=6.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Microsoft.OData.Core.6.17.0\lib\portable-net45+win+wpa81\Microsoft.OData.Core.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
63-
<Reference Include="Microsoft.OData.Edm, Version=6.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Microsoft.OData.Edm.6.11.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.OData.Edm.dll</HintPath>
63+
<Reference Include="Microsoft.OData.Edm, Version=6.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Microsoft.OData.Edm.6.17.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll</HintPath>
6565
<Private>True</Private>
6666
</Reference>
67-
<Reference Include="Microsoft.Spatial, Version=6.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\packages\Microsoft.Spatial.6.11.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.Spatial.dll</HintPath>
67+
<Reference Include="Microsoft.Spatial, Version=6.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<HintPath>..\packages\Microsoft.Spatial.6.17.0\lib\portable-net45+win+wpa81\Microsoft.Spatial.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
71-
<Reference Include="Simple.OData.Client.Core, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Simple.OData.Client.4.13.0\lib\portable-net45+win8+wp8+wpa81\Simple.OData.Client.Core.dll</HintPath>
71+
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
75-
<Reference Include="Simple.OData.Client.Dynamic, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL">
76-
<HintPath>..\packages\Simple.OData.Client.4.13.0\lib\portable-net45+win8+wp8+wpa81\Simple.OData.Client.Dynamic.dll</HintPath>
75+
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
76+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
7777
<Private>True</Private>
7878
</Reference>
79-
<Reference Include="Simple.OData.Client.V3.Adapter, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL">
80-
<HintPath>..\packages\Simple.OData.Client.4.13.0\lib\portable-net45+win8+wp8+wpa81\Simple.OData.Client.V3.Adapter.dll</HintPath>
79+
<Reference Include="Simple.OData.Client.Core, Version=4.27.0.0, Culture=neutral, processorArchitecture=MSIL">
80+
<HintPath>..\packages\Simple.OData.Client.4.27.0.1\lib\portable-net45+win8+wp8+wpa81\Simple.OData.Client.Core.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
83-
<Reference Include="Simple.OData.Client.V4.Adapter, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Simple.OData.Client.4.13.0\lib\portable-net45+win8+wp8+wpa81\Simple.OData.Client.V4.Adapter.dll</HintPath>
83+
<Reference Include="Simple.OData.Client.Dynamic, Version=4.27.0.0, Culture=neutral, processorArchitecture=MSIL">
84+
<HintPath>..\packages\Simple.OData.Client.4.27.0.1\lib\portable-net45+win8+wp8+wpa81\Simple.OData.Client.Dynamic.dll</HintPath>
85+
<Private>True</Private>
86+
</Reference>
87+
<Reference Include="Simple.OData.Client.V3.Adapter, Version=4.27.0.0, Culture=neutral, processorArchitecture=MSIL">
88+
<HintPath>..\packages\Simple.OData.Client.4.27.0.1\lib\portable-net45+win8+wp8+wpa81\Simple.OData.Client.V3.Adapter.dll</HintPath>
89+
<Private>True</Private>
90+
</Reference>
91+
<Reference Include="Simple.OData.Client.V4.Adapter, Version=4.27.0.0, Culture=neutral, processorArchitecture=MSIL">
92+
<HintPath>..\packages\Simple.OData.Client.4.27.0.1\lib\portable-net45+win8+wp8+wpa81\Simple.OData.Client.V4.Adapter.dll</HintPath>
8593
<Private>True</Private>
8694
</Reference>
8795
<Reference Include="System.Net.Http.Extensions, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -92,13 +100,15 @@
92100
<HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll</HintPath>
93101
<Private>True</Private>
94102
</Reference>
95-
<Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96-
<HintPath>..\packages\System.Spatial.5.6.4\lib\portable-net45+wp8+win8+wpa\System.Spatial.dll</HintPath>
103+
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
104+
<HintPath>..\packages\System.Spatial.5.8.2\lib\portable-net45+wp8+win8+wpa\System.Spatial.dll</HintPath>
97105
<Private>True</Private>
98106
</Reference>
99107
</ItemGroup>
100108
<ItemGroup>
101-
<None Include="packages.config" />
109+
<None Include="packages.config">
110+
<SubType>Designer</SubType>
111+
</None>
102112
</ItemGroup>
103113
<Import Project="..\..\ODataDataProvider\ODataDataProvider.projitems" Label="Shared" />
104114
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />

‎DataSource.DataProviders.OData/DataSource.DataProviders.OData.Core/packages.config‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="portable45-net45+win8+wpa81" />
4+
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="portable45-net45+win8+wpa81" />
45
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable45-net45+win8+wpa81" />
5-
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="portable45-net45+win8+wpa81" />
6-
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="portable45-net45+win8+wpa81" />
6+
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="portable45-net45+win8+wpa81" />
7+
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="portable45-net45+win8+wpa81" />
78
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="portable45-net45+win8+wpa81" />
8-
<package id="Microsoft.OData.Core" version="6.11.0" targetFramework="portable45-net45+win8+wpa81" />
9-
<package id="Microsoft.OData.Edm" version="6.11.0" targetFramework="portable45-net45+win8+wpa81" />
10-
<package id="Microsoft.Spatial" version="6.11.0" targetFramework="portable45-net45+win8+wpa81" />
11-
<package id="Simple.OData.Client" version="4.13.0" targetFramework="portable45-net45+win8+wpa81" />
12-
<package id="System.Spatial" version="5.6.4" targetFramework="portable45-net45+win8+wpa81" />
9+
<package id="Microsoft.OData.Core" version="6.17.0" targetFramework="portable45-net45+win8+wpa81" />
10+
<package id="Microsoft.OData.Edm" version="6.17.0" targetFramework="portable45-net45+win8+wpa81" />
11+
<package id="Microsoft.Spatial" version="6.17.0" targetFramework="portable45-net45+win8+wpa81" />
12+
<package id="Simple.OData.Client" version="4.27.0.1" targetFramework="portable45-net45+win8+wpa81" />
13+
<package id="System.Spatial" version="5.8.2" targetFramework="portable45-net45+win8+wpa81" />
1314
</packages>

‎DataSource.DataProviders.OData/DataSource.DataProviders.OData/DataSource.DataProviders.OData.csproj‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,24 @@
4040
<SpecificVersion>False</SpecificVersion>
4141
<HintPath>c:\work\NetAdvantage\DEV\XAML\2017.2\Source\Build\InfragisticsWPF4.v17.2.dll</HintPath>
4242
</Reference>
43-
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
43+
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
47-
<Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
47+
<Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
51-
<Reference Include="Microsoft.OData.Core, Version=6.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Microsoft.OData.Core.6.11.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.OData.Core.dll</HintPath>
51+
<Reference Include="Microsoft.OData.Core, Version=6.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Microsoft.OData.Core.6.17.0\lib\portable-net45+win+wpa81\Microsoft.OData.Core.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
55-
<Reference Include="Microsoft.OData.Edm, Version=6.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Microsoft.OData.Edm.6.11.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.OData.Edm.dll</HintPath>
55+
<Reference Include="Microsoft.OData.Edm, Version=6.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Microsoft.OData.Edm.6.17.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll</HintPath>
5757
<Private>True</Private>
5858
</Reference>
59-
<Reference Include="Microsoft.Spatial, Version=6.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\packages\Microsoft.Spatial.6.11.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.Spatial.dll</HintPath>
59+
<Reference Include="Microsoft.Spatial, Version=6.17.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Microsoft.Spatial.6.17.0\lib\portable-net45+win+wpa81\Microsoft.Spatial.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -72,8 +72,8 @@
7272
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
75-
<Reference Include="Simple.OData.Client.Net40, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL">
76-
<HintPath>..\packages\Simple.OData.Client.4.13.0\lib\net40\Simple.OData.Client.Net40.dll</HintPath>
75+
<Reference Include="Simple.OData.Client.Net40, Version=4.27.0.0, Culture=neutral, processorArchitecture=MSIL">
76+
<HintPath>..\packages\Simple.OData.Client.4.27.0.1\lib\net40\Simple.OData.Client.Net40.dll</HintPath>
7777
<Private>True</Private>
7878
</Reference>
7979
<Reference Include="System" />
@@ -88,8 +88,8 @@
8888
<Private>True</Private>
8989
</Reference>
9090
<Reference Include="System.Net.Http.WebRequest" />
91-
<Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92-
<HintPath>..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
91+
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92+
<HintPath>..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
9393
<Private>True</Private>
9494
</Reference>
9595
<Reference Include="System.Xml.Linq" />
@@ -104,7 +104,9 @@
104104
<Compile Include="Properties\AssemblyInfo.cs" />
105105
</ItemGroup>
106106
<ItemGroup>
107-
<None Include="packages.config" />
107+
<None Include="packages.config">
108+
<SubType>Designer</SubType>
109+
</None>
108110
</ItemGroup>
109111
<Import Project="..\..\ODataDataProvider\ODataDataProvider.projitems" Label="Shared" />
110112
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎DataSource.DataProviders.OData/DataSource.DataProviders.OData/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />
44
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
55
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
6-
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net452" />
7-
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net452" />
6+
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
7+
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />
88
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net452" />
9-
<package id="Microsoft.OData.Core" version="6.11.0" targetFramework="net452" />
10-
<package id="Microsoft.OData.Edm" version="6.11.0" targetFramework="net452" />
11-
<package id="Microsoft.Spatial" version="6.11.0" targetFramework="net452" />
12-
<package id="Simple.OData.Client" version="4.13.0" targetFramework="net452" />
13-
<package id="System.Spatial" version="5.6.4" targetFramework="net452" />
9+
<package id="Microsoft.OData.Core" version="6.17.0" targetFramework="net452" />
10+
<package id="Microsoft.OData.Edm" version="6.17.0" targetFramework="net452" />
11+
<package id="Microsoft.Spatial" version="6.17.0" targetFramework="net452" />
12+
<package id="Simple.OData.Client" version="4.27.0.1" targetFramework="net452" />
13+
<package id="System.Spatial" version="5.8.2" targetFramework="net452" />
1414
</packages>

‎DataSource.DataProviders.OData/ODataSampleApp/App.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
55
</startup>
6+
67
</configuration>

0 commit comments

Comments
 (0)