Skip to content
Browse files

Changes for DataServices 5.0. Upgraded NuGet dependencies.

  • Loading branch information...
1 parent 5e2868a commit 7aad7e6ee69aa0293980327df1f05ba5d3ac1bac @object object committed May 28, 2012
View
6 CommonAssemblyInfo.cs
@@ -19,6 +19,6 @@
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("0.2.2.0")]
-[assembly: AssemblyFileVersion("0.2.2.0")]
-[assembly: AssemblyInformationalVersion("0.2.2.0")]
+[assembly: AssemblyVersion("0.2.3.0")]
+[assembly: AssemblyFileVersion("0.2.3.0")]
+[assembly: AssemblyInformationalVersion("0.2.3.0")]
View
6 Simple.Data.Azure.IntegrationTest/Simple.Data.Azure.IntegrationTest.csproj
@@ -33,13 +33,13 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Simple.Data">
- <HintPath>..\packages\Simple.Data.Core.0.16.0.0\lib\net40\Simple.Data.dll</HintPath>
+ <Reference Include="Simple.Data, Version=0.16.2.1, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Core.0.16.2.1\lib\net40\Simple.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
View
2 Simple.Data.Azure.IntegrationTest/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Simple.Data.Core" version="0.16.0.0" />
+ <package id="Simple.Data.Core" version="0.16.2.1" />
<package id="xunit" version="1.9.0.1566" />
</packages>
View
6 Simple.Data.Azure.Test/Simple.Data.Azure.Test.csproj
@@ -33,13 +33,13 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Simple.Data">
- <HintPath>..\packages\Simple.Data.Core.0.16.0.0\lib\net40\Simple.Data.dll</HintPath>
+ <Reference Include="Simple.Data, Version=0.16.2.1, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Core.0.16.2.1\lib\net40\Simple.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
View
2 Simple.Data.Azure.Test/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Simple.Data.Core" version="0.16.0.0" />
+ <package id="Simple.Data.Core" version="0.16.2.1" />
<package id="xunit" version="1.9.0.1566" />
</packages>
View
6 Simple.Data.Azure/Simple.Data.Azure.csproj
@@ -36,16 +36,16 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
- <Reference Include="Simple.Data">
- <HintPath>..\packages\Simple.Data.Core.0.16.0.0\lib\net40\Simple.Data.dll</HintPath>
+ <Reference Include="Simple.Data, Version=0.16.2.1, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Core.0.16.2.1\lib\net40\Simple.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
View
2 Simple.Data.Azure/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Simple.Data.Core" version="0.16.0.0" />
+ <package id="Simple.Data.Core" version="0.16.2.1" />
</packages>
View
6 Simple.Data.OData.IntegrationTest/Simple.Data.OData.IntegrationTest.csproj
@@ -33,8 +33,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Simple.Data">
- <HintPath>..\packages\Simple.Data.Core.0.16.0.0\lib\net40\Simple.Data.dll</HintPath>
+ <Reference Include="Simple.Data, Version=0.16.2.1, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Core.0.16.2.1\lib\net40\Simple.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -46,7 +47,6 @@
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel.Web" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
View
2 Simple.Data.OData.IntegrationTest/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Simple.Data.Core" version="0.16.0.0" />
+ <package id="Simple.Data.Core" version="0.16.2.1" />
<package id="xunit" version="1.9.0.1566" />
</packages>
View
1 Simple.Data.OData.NorthwindModel/Simple.Data.OData.NorthwindModel.csproj
@@ -40,7 +40,6 @@
<Reference Include="System.Data.Services" />
<Reference Include="System.Data.Services.Client" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
View
6 Simple.Data.OData/Simple.Data.OData.csproj
@@ -33,15 +33,15 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Simple.Data">
- <HintPath>..\packages\Simple.Data.Core.0.16.0.0\lib\net40\Simple.Data.dll</HintPath>
+ <Reference Include="Simple.Data, Version=0.16.2.1, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Core.0.16.2.1\lib\net40\Simple.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
View
2 Simple.Data.OData/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Simple.Data.Core" version="0.16.0.0" />
+ <package id="Simple.Data.Core" version="0.16.2.1" />
</packages>
View
1 Simple.NExtLib.Tests/Simple.NExtLib.Tests.csproj
@@ -37,7 +37,6 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="xunit, Version=1.9.0.1566, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
View
1 Simple.NExtLib.Unit/Simple.NExtLib.Unit.csproj
@@ -37,7 +37,6 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="xunit, Version=1.9.0.1566, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
View
1 Simple.NExtLib/Simple.NExtLib.csproj
@@ -40,7 +40,6 @@
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel.Web" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
View
6 Simple.OData.Test/Simple.OData.Test.csproj
@@ -33,13 +33,13 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Simple.Data">
- <HintPath>..\packages\Simple.Data.Core.0.16.0.0\lib\net40\Simple.Data.dll</HintPath>
+ <Reference Include="Simple.Data, Version=0.16.2.1, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Core.0.16.2.1\lib\net40\Simple.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
View
2 Simple.OData.Test/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Simple.Data.Core" version="0.16.0.0" />
+ <package id="Simple.Data.Core" version="0.16.2.1" />
<package id="xunit" version="1.9.0.1566" />
</packages>
View
14 Simple.OData/DataServicesHelper.cs
@@ -189,7 +189,7 @@ private static IEnumerable<EdmEntityContainer> ParseEntityContainers(IEnumerable
select new EdmEntityContainer()
{
Name = e.Attribute("Name").Value,
- IsDefaulEntityContainer = bool.Parse(e.Attribute("m", "IsDefaultEntityContainer").Value),
+ IsDefaulEntityContainer = ParseAttribute(e.Attribute("m", "IsDefaultEntityContainer")),
EntitySets = (from s in e.Descendants(null, "EntitySet")
select new EdmEntitySet()
{
@@ -225,7 +225,7 @@ private static EdmProperty ParseProperty(XElement element, IEnumerable<EdmComple
{
Name = element.Attribute("Name").Value,
Type = EdmPropertyType.Parse(element.Attribute("Type").Value, complexTypes),
- Nullable = bool.Parse(element.Attribute("Nullable").Value),
+ Nullable = ParseAttribute(element.Attribute("Nullable")),
};
}
@@ -238,6 +238,16 @@ select p.Attribute("Name").Value).ToArray()
};
}
+ private static bool ParseAttribute(XAttribute attribute)
+ {
+ bool result = false;
+ if (attribute != null)
+ {
+ bool.TryParse(attribute.Value, out result);
+ }
+ return result;
+ }
+
public static XElement CreateDataElement(IDictionary<string, object> row)
{
var entry = CreateEmptyEntryWithNamespaces();
View
6 Simple.OData/Simple.OData.csproj
@@ -33,14 +33,14 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Simple.Data">
- <HintPath>..\packages\Simple.Data.Core.0.16.0.0\lib\net40\Simple.Data.dll</HintPath>
+ <Reference Include="Simple.Data, Version=0.16.2.1, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Simple.Data.Core.0.16.2.1\lib\net40\Simple.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
View
2 Simple.OData/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Simple.Data.Core" version="0.16.0.0" />
+ <package id="Simple.Data.Core" version="0.16.2.1" />
</packages>

0 comments on commit 7aad7e6

Please sign in to comment.
Something went wrong with that request. Please try again.