Skip to content

Commit 47ede13

Browse files
gmurray81gmurray81
authored
Merge pull request #8 from Infragistics/igrob-aggregation-stuff
Igrob aggregation stuff
2 parents 4f7e110 + 6bbe0ef commit 47ede13

File tree

43 files changed

+4549
-522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+4549
-522
lines changed

‎DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/DataPresenter.DataSources.OData.SampleApp.csproj‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,11 @@
3939
<WarningLevel>4</WarningLevel>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<Reference Include="InfragisticsWPF4.Controls.Editors.XamColorPicker.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
43-
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.Controls.Editors.XamColorPicker.v16.1.dll</HintPath>
45-
</Reference>
46-
<Reference Include="InfragisticsWPF4.DataPresenter.DataSources.Async.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
47-
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.DataPresenter.DataSources.Async.v16.1.dll</HintPath>
49-
</Reference>
50-
<Reference Include="InfragisticsWPF4.DataPresenter.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
51-
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.DataPresenter.v16.1.dll</HintPath>
53-
</Reference>
54-
<Reference Include="InfragisticsWPF4.Editors.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
55-
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.Editors.v16.1.dll</HintPath>
57-
</Reference>
58-
<Reference Include="InfragisticsWPF4.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
59-
<SpecificVersion>False</SpecificVersion>
60-
<HintPath>..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.v16.1.dll</HintPath>
61-
</Reference>
42+
<Reference Include="InfragisticsWPF4.Controls.Editors.XamColorPicker.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL" />
43+
<Reference Include="InfragisticsWPF4.DataPresenter.DataSources.Async.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL" />
44+
<Reference Include="InfragisticsWPF4.DataPresenter.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL" />
45+
<Reference Include="InfragisticsWPF4.Editors.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL" />
46+
<Reference Include="InfragisticsWPF4.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL" />
6247
<Reference Include="System" />
6348
<Reference Include="System.Data" />
6449
<Reference Include="System.Xml" />

‎DataPresenter.DataSources.OData/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.csproj‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -32,37 +32,23 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="InfragisticsWPF4.DataPresenter.DataSources.Async.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
36-
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>c:\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.DataPresenter.DataSources.Async.v16.1.dll</HintPath>
35+
<Reference Include="InfragisticsWPF4.DataPresenter.DataSources.Async.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL" />
36+
<Reference Include="InfragisticsWPF4.DataVisualization.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL" />
37+
<Reference Include="InfragisticsWPF4.v19.2, Version=19.2.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL" />
38+
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
3840
</Reference>
39-
<Reference Include="InfragisticsWPF4.DataVisualization.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=1102135f7483647e, processorArchitecture=MSIL">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>c:\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.DataVisualization.v16.1.dll</HintPath>
41+
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
4243
</Reference>
43-
<Reference Include="InfragisticsWPF4.v16.1, Version=16.1.0.9000, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
44-
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>c:\work\NetAdvantage\DEV\XAML\2016.1\Source\Build\InfragisticsWPF4.v16.1.dll</HintPath>
44+
<Reference Include="Microsoft.OData.Core, Version=7.6.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Microsoft.OData.Core.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
49-
<Private>True</Private>
50-
</Reference>
51-
<Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
53-
<Private>True</Private>
47+
<Reference Include="Microsoft.OData.Edm, Version=7.6.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Microsoft.OData.Edm.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll</HintPath>
5449
</Reference>
55-
<Reference Include="Microsoft.OData.Core, Version=6.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Microsoft.OData.Core.6.11.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.OData.Core.dll</HintPath>
57-
<Private>True</Private>
58-
</Reference>
59-
<Reference Include="Microsoft.OData.Edm, Version=6.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\packages\Microsoft.OData.Edm.6.11.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.OData.Edm.dll</HintPath>
61-
<Private>True</Private>
62-
</Reference>
63-
<Reference Include="Microsoft.Spatial, Version=6.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Microsoft.Spatial.6.11.0\lib\portable-net40+sl5+wp8+win8+wpa\Microsoft.Spatial.dll</HintPath>
65-
<Private>True</Private>
50+
<Reference Include="Microsoft.Spatial, Version=7.6.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Microsoft.Spatial.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll</HintPath>
6652
</Reference>
6753
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6854
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -76,9 +62,17 @@
7662
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
7763
<Private>True</Private>
7864
</Reference>
79-
<Reference Include="Simple.OData.Client.Net40, Version=4.13.0.0, Culture=neutral, processorArchitecture=MSIL">
80-
<HintPath>..\packages\Simple.OData.Client.4.13.0\lib\net40\Simple.OData.Client.Net40.dll</HintPath>
81-
<Private>True</Private>
65+
<Reference Include="Simple.OData.Client.Core, Version=5.10.0.0, Culture=neutral, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Simple.OData.Client.5.10.0.1\lib\net452\Simple.OData.Client.Core.dll</HintPath>
67+
</Reference>
68+
<Reference Include="Simple.OData.Client.Dynamic, Version=5.10.0.0, Culture=neutral, processorArchitecture=MSIL">
69+
<HintPath>..\packages\Simple.OData.Client.5.10.0.1\lib\net452\Simple.OData.Client.Dynamic.dll</HintPath>
70+
</Reference>
71+
<Reference Include="Simple.OData.Client.V3.Adapter, Version=5.10.0.0, Culture=neutral, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Simple.OData.Client.5.10.0.1\lib\net452\Simple.OData.Client.V3.Adapter.dll</HintPath>
73+
</Reference>
74+
<Reference Include="Simple.OData.Client.V4.Adapter, Version=5.10.0.0, Culture=neutral, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Simple.OData.Client.5.10.0.1\lib\net452\Simple.OData.Client.V4.Adapter.dll</HintPath>
8276
</Reference>
8377
<Reference Include="System" />
8478
<Reference Include="System.Core" />
@@ -92,9 +86,8 @@
9286
<Private>True</Private>
9387
</Reference>
9488
<Reference Include="System.Net.Http.WebRequest" />
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\net40\System.Spatial.dll</HintPath>
97-
<Private>True</Private>
89+
<Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
90+
<HintPath>..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>
9891
</Reference>
9992
<Reference Include="System.Xml.Linq" />
10093
<Reference Include="System.Data.DataSetExtensions" />

‎DataPresenter.DataSources.OData/DataPresenter.DataSources.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.4" targetFramework="net452" />
7+
<package id="Microsoft.Data.OData" version="5.8.4" 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="7.6.1" targetFramework="net452" />
10+
<package id="Microsoft.OData.Edm" version="7.6.1" targetFramework="net452" />
11+
<package id="Microsoft.Spatial" version="7.6.1" targetFramework="net452" />
12+
<package id="Simple.OData.Client" version="5.10.0.1" targetFramework="net452" />
13+
<package id="System.Spatial" version="5.8.4" targetFramework="net452" />
1414
</packages>

0 commit comments

Comments
 (0)