Skip to content

Commit d130e29

Browse files
ig-robstoffersig-robstoffers
committed
added summary support to the OData and SQLite virtual datasources
1 parent 4f7e110 commit d130e29

40 files changed

Lines changed: 4511 additions & 462 deletions

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

Lines changed: 14 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,29 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{2D978939-4120-4ABF-B13D-84D63075E61A}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>DataSource.DataProviders.OData.Core</RootNamespace>
12-
<AssemblyName>DataSource.DataProviders.OData.Core</AssemblyName>
13-
<DefaultLanguage>en-US</DefaultLanguage>
14-
<FileAlignment>512</FileAlignment>
15-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
16-
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
17-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
18-
<NuGetPackageImportStamp>
19-
</NuGetPackageImportStamp>
4+
<TargetFramework>netstandard2.0</TargetFramework>
205
</PropertyGroup>
21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
22-
<DebugSymbols>true</DebugSymbols>
23-
<DebugType>full</DebugType>
24-
<Optimize>false</Optimize>
25-
<OutputPath>bin\Debug\</OutputPath>
26-
<DefineConstants>TRACE;DEBUG;PCL</DefineConstants>
27-
<ErrorReport>prompt</ErrorReport>
28-
<WarningLevel>4</WarningLevel>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31-
<DebugType>pdbonly</DebugType>
32-
<Optimize>true</Optimize>
33-
<OutputPath>bin\Release\</OutputPath>
6+
7+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
348
<DefineConstants>TRACE;PCL</DefineConstants>
35-
<ErrorReport>prompt</ErrorReport>
36-
<WarningLevel>4</WarningLevel>
379
</PropertyGroup>
10+
3811
<ItemGroup>
39-
<Compile Include="Properties\AssemblyInfo.cs" />
12+
<PackageReference Include="Simple.OData.Client" Version="5.10.0.1" />
4013
</ItemGroup>
14+
4115
<ItemGroup>
4216
<Reference Include="Infragistics.Core">
43-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.2\Source\Build\Infragistics.Core.dll</HintPath>
17+
<HintPath>..\..\..\..\work\NetAdvantage\DEV\Xamarin\2019.2\Source\Build\netstandard2.0\Infragistics.Core.dll</HintPath>
4418
</Reference>
4519
<Reference Include="Infragistics.Core.DataVisualization">
46-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.2\Source\Build\Infragistics.Core.DataVisualization.dll</HintPath>
20+
<HintPath>..\..\..\..\work\NetAdvantage\DEV\Xamarin\2019.2\Source\Build\netstandard2.0\Infragistics.Core.DataVisualization.dll</HintPath>
4721
</Reference>
4822
<Reference Include="Infragistics.Core.Platform">
49-
<HintPath>..\..\..\..\..\..\..\work\NetAdvantage\DEV\Xamarin\2017.2\Source\Build\Infragistics.Core.Platform.dll</HintPath>
50-
</Reference>
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>
53-
<Private>True</Private>
54-
</Reference>
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>
57-
<Private>True</Private>
58-
</Reference>
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>
61-
<Private>True</Private>
62-
</Reference>
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>
65-
<Private>True</Private>
66-
</Reference>
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>
69-
<Private>True</Private>
70-
</Reference>
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>
73-
<Private>True</Private>
74-
</Reference>
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>
77-
<Private>True</Private>
78-
</Reference>
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>
81-
<Private>True</Private>
23+
<HintPath>..\..\..\..\work\NetAdvantage\DEV\Xamarin\2019.2\Source\Build\netstandard2.0\Infragistics.Core.Platform.dll</HintPath>
8224
</Reference>
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>
93-
<Private>True</Private>
94-
</Reference>
95-
<Reference Include="System.Net.Http.Extensions, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
96-
<HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll</HintPath>
97-
<Private>True</Private>
98-
</Reference>
99-
<Reference Include="System.Net.Http.Primitives, Version=4.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
100-
<HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll</HintPath>
101-
<Private>True</Private>
102-
</Reference>
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>
105-
<Private>True</Private>
106-
</Reference>
107-
</ItemGroup>
108-
<ItemGroup>
109-
<None Include="packages.config">
110-
<SubType>Designer</SubType>
111-
</None>
11225
</ItemGroup>
26+
11327
<Import Project="..\..\ODataDataProvider\ODataDataProvider.projitems" Label="Shared" />
114-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
115-
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
116-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
117-
<PropertyGroup>
118-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
119-
</PropertyGroup>
120-
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
121-
</Target>
122-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
123-
Other similar extension points exist, see Microsoft.Common.targets.
124-
<Target Name="BeforeBuild">
125-
</Target>
126-
<Target Name="AfterBuild">
127-
</Target>
128-
-->
129-
</Project>
28+
29+
</Project>

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

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎DataSource.DataProviders.OData/DataSource.DataProviders.OData.sln‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28307.705
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSource.DataProviders.OData", "DataSource.DataProviders.OData\DataSource.DataProviders.OData.csproj", "{4CB59ADF-F59D-4310-9EB9-0BCDFD4CECE2}"
77
EndProject
88
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ODataDataProvider", "..\ODataDataProvider\ODataDataProvider.shproj", "{15C5CA79-0CDA-4D3D-833D-48EBD0F31915}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODataSampleApp", "ODataSampleApp\ODataSampleApp.csproj", "{16509F04-894A-4ABB-9821-8A1ED93D266C}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODataSampleApp", "ODataSampleApp\ODataSampleApp.csproj", "{391831F9-A5FC-4D6A-B28F-F3B0425DACC9}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSource.DataProviders.OData.Core", "DataSource.DataProviders.OData.Core\DataSource.DataProviders.OData.Core.csproj", "{2D978939-4120-4ABF-B13D-84D63075E61A}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODataSampleWebService", "ODataSampleWebService\ODataSampleWebService.csproj", "{85649AA6-A500-4875-82CA-F7BF34F02A5D}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSource.DataProviders.OData.Core", "DataSource.DataProviders.OData.Core\DataSource.DataProviders.OData.Core.csproj", "{C455A840-2FE1-4273-8DB7-C605EB1299B3}"
1315
EndProject
1416
Global
1517
GlobalSection(SharedMSBuildProjectFiles) = preSolution
1618
..\ODataDataProvider\ODataDataProvider.projitems*{15c5ca79-0cda-4d3d-833d-48ebd0f31915}*SharedItemsImports = 13
17-
..\ODataDataProvider\ODataDataProvider.projitems*{2d978939-4120-4abf-b13d-84d63075e61a}*SharedItemsImports = 4
1819
..\ODataDataProvider\ODataDataProvider.projitems*{4cb59adf-f59d-4310-9eb9-0bcdfd4cece2}*SharedItemsImports = 4
1920
EndGlobalSection
2021
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,16 +27,23 @@ Global
2627
{4CB59ADF-F59D-4310-9EB9-0BCDFD4CECE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
2728
{4CB59ADF-F59D-4310-9EB9-0BCDFD4CECE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
2829
{4CB59ADF-F59D-4310-9EB9-0BCDFD4CECE2}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{16509F04-894A-4ABB-9821-8A1ED93D266C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{16509F04-894A-4ABB-9821-8A1ED93D266C}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{16509F04-894A-4ABB-9821-8A1ED93D266C}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{16509F04-894A-4ABB-9821-8A1ED93D266C}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{2D978939-4120-4ABF-B13D-84D63075E61A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{2D978939-4120-4ABF-B13D-84D63075E61A}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{2D978939-4120-4ABF-B13D-84D63075E61A}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{2D978939-4120-4ABF-B13D-84D63075E61A}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{391831F9-A5FC-4D6A-B28F-F3B0425DACC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{391831F9-A5FC-4D6A-B28F-F3B0425DACC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{391831F9-A5FC-4D6A-B28F-F3B0425DACC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{391831F9-A5FC-4D6A-B28F-F3B0425DACC9}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{85649AA6-A500-4875-82CA-F7BF34F02A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{85649AA6-A500-4875-82CA-F7BF34F02A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{85649AA6-A500-4875-82CA-F7BF34F02A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{85649AA6-A500-4875-82CA-F7BF34F02A5D}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{C455A840-2FE1-4273-8DB7-C605EB1299B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{C455A840-2FE1-4273-8DB7-C605EB1299B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{C455A840-2FE1-4273-8DB7-C605EB1299B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{C455A840-2FE1-4273-8DB7-C605EB1299B3}.Release|Any CPU.Build.0 = Release|Any CPU
3742
EndGlobalSection
3843
GlobalSection(SolutionProperties) = preSolution
3944
HideSolutionNode = FALSE
4045
EndGlobalSection
46+
GlobalSection(ExtensibilityGlobals) = postSolution
47+
SolutionGuid = {ABDE6E8F-20DA-4AFA-A9B4-AAB5865FF381}
48+
EndGlobalSection
4149
EndGlobal

0 commit comments

Comments
 (0)