Skip to content

Commit

Permalink
Added support for .NET 4.0, Windows Phone, and Silverlight 4 & 5
Browse files Browse the repository at this point in the history
  • Loading branch information
sibartlett committed Sep 8, 2012
1 parent c4d8597 commit 23f8e8a
Show file tree
Hide file tree
Showing 31 changed files with 464 additions and 100 deletions.
107 changes: 107 additions & 0 deletions Geo.Raven.Silverlight4/Geo.Raven.Silverlight4.csproj
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{88367AA2-A54F-4C50-9264-BB2AFCA23C5C}</ProjectGuid>
<ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Geo.Raven.Silverlight4</RootNamespace>
<AssemblyName>Geo.Raven.Silverlight4</AssemblyName>
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
<SilverlightApplication>false</SilverlightApplication>
<ValidateXaml>true</ValidateXaml>
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<!-- This property group is only here to support building this project using the
MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs
to set the TargetFrameworkVersion to v3.5 -->
<PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Bin\Debug</OutputPath>
<DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
<NoStdLib>true</NoStdLib>
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>Bin\Release</OutputPath>
<DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
<NoStdLib>true</NoStdLib>
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AsyncCtpLibrary_Silverlight">
<HintPath>..\packages\RavenDB.Client.1.2.2078-Unstable\lib\sl40\AsyncCtpLibrary_Silverlight.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="Raven.Client.Silverlight-4">
<HintPath>..\packages\RavenDB.Client.1.2.2078-Unstable\lib\sl40\Raven.Client.Silverlight-4.dll</HintPath>
</Reference>
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core">
<HintPath>$(TargetFrameworkDirectory)System.Core.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Net" />
<Reference Include="System.Windows.Browser" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Geo.Raven\GeoContractResolver.cs">
<Link>GeoContractResolver.cs</Link>
</Compile>
<Compile Include="..\Geo.Raven\GeoIndexCreationTask.cs">
<Link>GeoIndexCreationTask.cs</Link>
</Compile>
<Compile Include="..\Geo.Raven\GeoRavenExtensions.cs">
<Link>GeoRavenExtensions.cs</Link>
</Compile>
<Compile Include="..\Geo.Raven\GeoValueProvider.cs">
<Link>GeoValueProvider.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Geo\Geo.csproj">
<Project>{b2e32781-a0ae-4803-8de0-92a95f218363}</Project>
<Name>Geo</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
<SilverlightProjectProperties />
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
34 changes: 34 additions & 0 deletions Geo.Raven.Silverlight4/Properties/AssemblyInfo.cs
@@ -0,0 +1,34 @@
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Geo.Raven.Silverlight")]
[assembly: AssemblyDescription("RavenDB Integration for Geo")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Geo.Raven.Silverlight")]
[assembly: AssemblyCopyright("Copyright © Simon Bartlett 2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("88367aa2-a54f-4c50-9264-bb2afca23c5c")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.3.0.0")]
[assembly: AssemblyFileVersion("0.3.0.0")]
4 changes: 4 additions & 0 deletions Geo.Raven.Silverlight4/packages.config
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="RavenDB.Client" version="1.2.2078-Unstable" targetFramework="sl40" />
</packages>
107 changes: 107 additions & 0 deletions Geo.Raven.Silverlight5/Geo.Raven.Silverlight5.csproj
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A3B76D9C-E0EF-4B8F-8477-00F406C11A3D}</ProjectGuid>
<ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Geo.Raven.Silverlight5</RootNamespace>
<AssemblyName>Geo.Raven.Silverlight5</AssemblyName>
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
<SilverlightApplication>false</SilverlightApplication>
<ValidateXaml>true</ValidateXaml>
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<!-- This property group is only here to support building this project using the
MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs
to set the TargetFrameworkVersion to v3.5 -->
<PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Bin\Debug</OutputPath>
<DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
<NoStdLib>true</NoStdLib>
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>Bin\Release</OutputPath>
<DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
<NoStdLib>true</NoStdLib>
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AsyncCtpLibrary_Silverlight5">
<HintPath>..\packages\RavenDB.Client.1.2.2078-Unstable\lib\sl50\AsyncCtpLibrary_Silverlight5.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="Raven.Client.Silverlight">
<HintPath>..\packages\RavenDB.Client.1.2.2078-Unstable\lib\sl50\Raven.Client.Silverlight.dll</HintPath>
</Reference>
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core">
<HintPath>$(TargetFrameworkDirectory)System.Core.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Net" />
<Reference Include="System.Windows.Browser" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Geo.Raven\GeoContractResolver.cs">
<Link>GeoContractResolver.cs</Link>
</Compile>
<Compile Include="..\Geo.Raven\GeoIndexCreationTask.cs">
<Link>GeoIndexCreationTask.cs</Link>
</Compile>
<Compile Include="..\Geo.Raven\GeoRavenExtensions.cs">
<Link>GeoRavenExtensions.cs</Link>
</Compile>
<Compile Include="..\Geo.Raven\GeoValueProvider.cs">
<Link>GeoValueProvider.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Geo\Geo.csproj">
<Project>{b2e32781-a0ae-4803-8de0-92a95f218363}</Project>
<Name>Geo</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
<SilverlightProjectProperties />
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
34 changes: 34 additions & 0 deletions Geo.Raven.Silverlight5/Properties/AssemblyInfo.cs
@@ -0,0 +1,34 @@
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Geo.Raven.Silverlight5")]
[assembly: AssemblyDescription("RavenDB Integration for Geo")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Geo.Raven.Silverlight5")]
[assembly: AssemblyCopyright("Copyright © Simon Bartlett 2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a3b76d9c-e0ef-4b8f-8477-00f406c11a3d")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.3.0.0")]
[assembly: AssemblyFileVersion("0.3.0.0")]
4 changes: 4 additions & 0 deletions Geo.Raven.Silverlight5/packages.config
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="RavenDB.Client" version="1.2.2078-Unstable" targetFramework="sl50" />
</packages>
3 changes: 2 additions & 1 deletion Geo.Raven/Geo.Raven.csproj
Expand Up @@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Geo.Raven</RootNamespace>
<AssemblyName>Geo.Raven</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
Binary file modified Geo.Raven/Geo.Raven.nuspec
Binary file not shown.
4 changes: 2 additions & 2 deletions Geo.Raven/Properties/AssemblyInfo.cs
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.2.0.0")]
[assembly: AssemblyFileVersion("0.2.0.0")]
[assembly: AssemblyVersion("0.3.0.0")]
[assembly: AssemblyFileVersion("0.3.0.0")]
2 changes: 1 addition & 1 deletion Geo.Tests/Geo.Tests.csproj
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Geo.Tests</RootNamespace>
<AssemblyName>Geo.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
Expand Down
9 changes: 5 additions & 4 deletions Geo.Tests/Gps/Serialization/GpxSerializerTests.cs
Expand Up @@ -17,15 +17,16 @@ public void CanParseAll()
{
using (var stream = new FileStream(fileInfo.FullName, FileMode.Open))
{
if (gpx10.CanDeSerialize(stream))
var streamWrapper = new StreamWrapper(stream);
if (gpx10.CanDeSerialize(streamWrapper))
{
var data = gpx10.DeSerialize(stream);
var data = gpx10.DeSerialize(streamWrapper);
data.ToGpx();
data.ToGpx(1);
}
else if (gpx11.CanDeSerialize(stream))
else if (gpx11.CanDeSerialize(streamWrapper))
{
var data = gpx11.DeSerialize(stream);
var data = gpx11.DeSerialize(streamWrapper);
data.ToGpx();
data.ToGpx(1);
}
Expand Down
5 changes: 3 additions & 2 deletions Geo.Tests/Gps/Serialization/IgcDeSerializerTests.cs
Expand Up @@ -14,9 +14,10 @@ public void igc2()
var file = GetReferenceFileDirectory("igc").GetFiles().First(x => x.Name == "igc2.igc");
using (var stream = new FileStream(file.FullName, FileMode.Open))
{
var streamWrapper = new StreamWrapper(stream);
var parser = new IgcDeSerializer();
var canParse = parser.CanDeSerialize(stream);
var result = parser.DeSerialize(stream);
var canParse = parser.CanDeSerialize(streamWrapper);
var result = parser.DeSerialize(streamWrapper);

Assert.That(canParse, Is.EqualTo(true));
Assert.That(result.Waypoints.Count, Is.EqualTo(0));
Expand Down
5 changes: 3 additions & 2 deletions Geo.Tests/Gps/Serialization/NmeaDeSerializerTests.cs
Expand Up @@ -14,9 +14,10 @@ public void Stockholm_Walk()
var file = GetReferenceFileDirectory("nmea").GetFiles().First(x => x.Name == "Stockholm_Walk.nmea");
using (var stream = new FileStream(file.FullName, FileMode.Open))
{
var streamWrapper = new StreamWrapper(stream);
var parser = new NmeaDeSerializer();
var canParse = parser.CanDeSerialize(stream);
var result = parser.DeSerialize(stream);
var canParse = parser.CanDeSerialize(streamWrapper);
var result = parser.DeSerialize(streamWrapper);

Assert.That(canParse, Is.EqualTo(true));
Assert.That(result.Waypoints.Count, Is.EqualTo(0));
Expand Down

0 comments on commit 23f8e8a

Please sign in to comment.