Skip to content

Commit 376ba0f

Browse files
author
moh.hassan
committed
Release V2.3.0
1 parent e8cfb39 commit 376ba0f

14 files changed

+51
-49
lines changed

OData2Poco.CommandLine.Test/OData2Poco.CommandLine.Test.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,12 @@
3939
</Reference>
4040
<Reference Include="MedallionShell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
4141
<HintPath>..\packages\MedallionShell.1.1.0\lib\net45\MedallionShell.dll</HintPath>
42-
<Private>True</Private>
4342
</Reference>
44-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
46-
<Private>True</Private>
43+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
4745
</Reference>
4846
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
4947
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
50-
<Private>True</Private>
5148
</Reference>
5249
<Reference Include="System" />
5350
<Reference Include="System.Core" />

OData2Poco.CommandLine.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<packages>
33
<package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
44
<package id="MedallionShell" version="1.1.0" targetFramework="net45" />
5-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
5+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
66
<package id="NUnit" version="2.6.4" targetFramework="net45" />
77
</packages>

OData2Poco.CommandLine/OData2Poco.CommandLine.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@
5656
<ItemGroup>
5757
<Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
5858
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
59-
<Private>True</Private>
59+
</Reference>
60+
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61+
<HintPath>..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
62+
</Reference>
63+
<Reference Include="Microsoft.OData.Edm, Version=6.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Microsoft.OData.Edm.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll</HintPath>
6065
</Reference>
6166
<Reference Include="System" />
6267
<Reference Include="System.Core" />
@@ -83,11 +88,11 @@
8388
</ItemGroup>
8489
<ItemGroup>
8590
<None Include="App.config" />
86-
<None Include="packages.config" />
8791
</ItemGroup>
8892
<ItemGroup>
8993
<Content Include="licence.txt" />
9094
<Content Include="ODataLogo-32.ico" />
95+
<None Include="packages.config" />
9196
<None Include="readme.md" />
9297
<Content Include="readme.txt" />
9398
</ItemGroup>

OData2Poco.CommandLine/OData2Poco.CommandLine.nuspec

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>OData2Poco.CommandLine</id>
5-
<version>2.2.1</version>
5+
<version>2.3.0</version>
66
<title>OData2Poco.CommandLine</title>
77
<authors>Mohamed Hassan</authors>
88
<owners>Mohamed Hassan</owners>
9-
<licenseUrl>http://odata2poco.codeplex.com/license</licenseUrl>
10-
<projectUrl>http://odata2poco.codeplex.com</projectUrl>
11-
<iconUrl>http://download-codeplex.sec.s-msft.com/Download?ProjectName=odata2poco&amp;DownloadId=1562224</iconUrl>
9+
<licenseUrl>https://github.com/moh-hassan/odata2poco/blob/master/license.txt</licenseUrl>
10+
<projectUrl>https://github.com/moh-hassan/odata2poco</projectUrl>
11+
<iconUrl>https://github.com/moh-hassan/odata2poco/blob/master/ODataLogo-32.ico </iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13-
<description>o2gen is a CommandLine tool for generating c# POCO classes from OData feeds. Project site: http://odata2poco.codeplex.com</description>
14-
<releaseNotes>
15-
Version: 2.2.1
16-
What is new:
17-
- Support Nullable Data type: DateTime (issue #3), DateTimeOffset, TimeSpan, Guid
18-
13+
<description>o2gen is a CommandLine tool for generating c# POCO classes from OData feeds.
14+
Project site: https://github.com/moh-hassan/odata2poco</description>
15+
<releaseNotes>
16+
Version: 2.3.0
17+
What is new:
18+
- adds inheritance support by default. Generated class follows inhertance hierarchy of OData feed (unless switched-off by -i option)
1919

20-
</releaseNotes>
21-
<copyright>© 2016 Mohamed Hassan</copyright>
20+
21+
</releaseNotes>
22+
<copyright>© 2016-2017 Mohamed Hassan</copyright>
2223
<tags>OData code generation</tags>
2324
<dependencies/>
2425
</metadata>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
4-
<package id="ilmerge" version="2.14.1208" targetFramework="net45" />
4+
<package id="ILMerge" version="2.14.1208" targetFramework="net45" />
55
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net45" />
66
<package id="Microsoft.OData.Edm" version="6.15.0" targetFramework="net45" />
77
</packages>

OData2Poco.Tests/OData2Poco.Tests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,15 @@
3838
<ItemGroup>
3939
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4040
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
41-
<Private>True</Private>
4241
</Reference>
4342
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
4443
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
45-
<Private>True</Private>
4644
</Reference>
4745
<Reference Include="System" />
4846
<Reference Include="System.ComponentModel.DataAnnotations" />
4947
<Reference Include="System.Core" />
5048
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5149
<HintPath>..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
52-
<Private>True</Private>
5350
</Reference>
5451
<Reference Include="System.Xml.Linq" />
5552
<Reference Include="System.Data.DataSetExtensions" />

OData2Poco.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
4-
<package id="NUnit" version="2.6.4" targetFramework="net451" />
4+
<package id="NUnit" version="2.6.4" targetFramework="net45" />
55
<package id="System.Spatial" version="5.8.2" targetFramework="net45" />
66
</packages>

OData2Poco.sln

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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.26730.15
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OData2Poco", "OData2PocoLib\OData2Poco.csproj", "{BCC5139D-A1C0-46E7-ABA7-72E9660607DE}"
77
EndProject
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1616
CommonTestData.cs = CommonTestData.cs
1717
OData2Poco.CommandLine\licence.txt = OData2Poco.CommandLine\licence.txt
1818
O2PTest.cs = O2PTest.cs
19+
OData2Poco.CommandLine\ODataLogo-32.ico = OData2Poco.CommandLine\ODataLogo-32.ico
1920
packages.config = packages.config
2021
README.md = README.md
2122
ReleaseNotes.md = ReleaseNotes.md
@@ -62,4 +63,7 @@ Global
6263
{3C05AB7B-2D2A-400A-AEDD-9DDE69566DF4} = {0D69DB09-904B-4145-A7CB-C8A448F9FDF8}
6364
{8B8935C5-5F10-4D96-9434-3A455A6BDAEA} = {0D69DB09-904B-4145-A7CB-C8A448F9FDF8}
6465
EndGlobalSection
66+
GlobalSection(ExtensibilityGlobals) = postSolution
67+
SolutionGuid = {77153E76-5117-4623-8854-8633BCF431BF}
68+
EndGlobalSection
6569
EndGlobal

OData2PocoLib/OData2Poco.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,12 @@
3737
<ItemGroup>
3838
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
3939
<HintPath>..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
40-
<Private>True</Private>
4140
</Reference>
4241
<Reference Include="Microsoft.OData.Edm, Version=6.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4342
<HintPath>..\packages\Microsoft.OData.Edm.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll</HintPath>
44-
<Private>True</Private>
4543
</Reference>
4644
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4745
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
48-
<Private>True</Private>
4946
</Reference>
5047
<Reference Include="System" />
5148
<Reference Include="System.Configuration" />
@@ -64,9 +61,7 @@
6461
<Compile Include="Properties\AssemblyInfo.cs" />
6562
</ItemGroup>
6663
<ItemGroup>
67-
<None Include="packages.config">
68-
<SubType>Designer</SubType>
69-
</None>
64+
<None Include="packages.config" />
7065
<None Include="ReleaseNotes.md" />
7166
<Content Include="..\license.txt">
7267
<Link>license.txt</Link>

OData2PocoLib/OData2Poco.nuspec

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>OData2Poco</id>
5-
<version>2.2.1</version>
5+
<version>2.3.0</version>
66
<title>OData2Poco</title>
77
<authors>Mohamed Hassan</authors>
88
<owners>Mohamed Hassan</owners>
9-
<licenseUrl>http://odata2poco.codeplex.com/license</licenseUrl>
10-
<projectUrl>http://odata2poco.codeplex.com</projectUrl>
11-
<iconUrl>http://download-codeplex.sec.s-msft.com/Download?ProjectName=odata2poco&amp;DownloadId=1562224</iconUrl>
9+
<licenseUrl>https://github.com/moh-hassan/odata2poco/blob/master/license.txt</licenseUrl>
10+
<projectUrl>https://github.com/moh-hassan/odata2poco</projectUrl>
11+
<iconUrl>https://github.com/moh-hassan/odata2poco/blob/master/ODataLogo-32.ico </iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<summary>OData2Poco is a class library supporting .NET 4.5 or higher with T4 Template to generate plain-old CLR objects (POCO) from OData feeds that implement both V1-3 and V4 OData protocol,based on the metadata of the service stored on the server.</summary>
1414
<description>
1515
OData2Poco is a class library supporting .NET 4.5 or higher with T4 Template to generate plain-old CLR objects (POCO) from OData feeds that implement both V1-3 and V4 OData protocol,based on the metadata of the service stored on the server. POCO classes can be used in typed RESTful client OData services
1616
</description>
17-
<releaseNotes>
18-
Version: 2.2.1
19-
What is new:
20-
- Support Nullable Data type: DateTime (issue #3), DateTimeOffset, TimeSpan, Guid.
21-
17+
<releaseNotes>
18+
Version: 2.3.0
19+
What is new:
20+
- adds inheritance support by default.
21+
Generated class follows inhertance hierarchy of OData feed (unless switched-off by -i option)
2222

23-
</releaseNotes>
24-
<copyright>© 2016 Mohamed Hassan</copyright>
23+
</releaseNotes>
24+
<copyright>© 2016-2017 Mohamed Hassan</copyright>
2525
<tags>OData2Poco Poco OData data Rest Net45 code-generation</tags>
2626
<dependencies>
2727
<dependency id="Microsoft.Data.Edm" version="5.7.0" />

0 commit comments

Comments
 (0)