Merge pull request #1929 from LeRondPoint/JsonLocalizationResFix

Implemented correct behavior as for resource name generation
This commit is contained in:
Martijn van Dijk 2017-06-13 17:01:05 +02:00 коммит произвёл GitHub
Родитель 371a136883 481047a830
Коммит a0c46a5699
8 изменённых файлов: 579 добавлений и 197 удалений

Просмотреть файл

@ -31,7 +31,8 @@ namespace MvvmCross.Plugins.JsonLocalization
private string GetTextFromEmbeddedResource(string namespaceKey, string resourcePath)
{
var path = namespaceKey + "." + resourcePath.Replace("/", ".");
string path = namespaceKey + "." + GenerateResourceNameFromPath(resourcePath);
try
{
string text = null;

Просмотреть файл

@ -0,0 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MvvmCross.Plugins.ResourceLoader.Test</RootNamespace>
<AssemblyName>MvvmCross.Plugins.ResourceLoader.Test</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<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</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<Choose>
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
</When>
<Otherwise />
</Choose>
<ItemGroup>
<Compile Include="MvxResourceProviderTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MvvmCross.Plugins.ResourceLoader\MvvmCross.Plugins.ResourceLoader.csproj">
<Project>{75CA1824-C7F3-4827-93ED-E75B2C01CB2C}</Project>
<Name>MvvmCross.Plugins.ResourceLoader</Name>
</ProjectReference>
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
</ItemGroup>
</When>
</Choose>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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>

Просмотреть файл

@ -0,0 +1,78 @@
using Xunit;
namespace MvvmCross.Plugins.ResourceLoader.Test
{
public class MvxResourceProviderTest
{
private class MvxResourceProviderStub : MvxResourceProvider
{
public string GetResourceNameForPath(string path)
{
return GenerateResourceNameFromPath(path);
}
}
[Fact]
public void ICanGenerateResourceNameWithNumbers()
{
MvxResourceProviderStub stub = new MvxResourceProviderStub();
string numberPath = stub.GetResourceNameForPath("123");
Assert.Equal("_123", numberPath);
}
[Fact]
public void ICanGenerateResourceNameWithDots()
{
MvxResourceProviderStub stub = new MvxResourceProviderStub();
string numberPath = stub.GetResourceNameForPath("abc.def");
Assert.Equal("abc.def", numberPath);
}
[Fact]
public void ICanGenerateResourceNameWithSlashes()
{
MvxResourceProviderStub stub = new MvxResourceProviderStub();
string numberPath = stub.GetResourceNameForPath("abc/def");
Assert.Equal("abc.def", numberPath);
}
[Fact]
public void ICanGenerateResourceNameWithVersionNumbers()
{
MvxResourceProviderStub stub = new MvxResourceProviderStub();
string numberPath = stub.GetResourceNameForPath("abc1.2.3");
Assert.Equal("abc1._2._3", numberPath);
}
[Fact]
public void ICanGenerateResourceNameWithNumberFolders()
{
MvxResourceProviderStub stub = new MvxResourceProviderStub();
string numberPath = stub.GetResourceNameForPath("abc1/2/3");
Assert.Equal("abc1._2._3", numberPath);
}
[Fact]
public void ICanGenerateResourceNameWithInvalidCharacters()
{
MvxResourceProviderStub stub = new MvxResourceProviderStub();
string numberPath = stub.GetResourceNameForPath("abc1-2~3");
Assert.Equal("abc1_2_3", numberPath);
}
[Fact]
public void ICanGenerateResourceNameWithDoubleSlashes()
{
MvxResourceProviderStub stub = new MvxResourceProviderStub();
string numberPath = stub.GetResourceNameForPath("abc//def");
Assert.Equal("abc.def", numberPath);
}
}
}

Просмотреть файл

@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
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("MvvmCross.Plugins.ResourceLoader.Test")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("MvvmCross.Plugins.ResourceLoader.Test")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[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("4584c230-63f9-4d0f-a8c3-d63424ac9a1a")]
// 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 Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

Просмотреть файл

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="xunit" version="2.2.0" targetFramework="net452" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
</packages>

Просмотреть файл

@ -5,6 +5,9 @@
//
// Project Lead - Stuart Lodge, @slodge, me@slodge.com
using System.Linq;
using System.Text;
namespace MvvmCross.Plugins.ResourceLoader
{
public abstract class MvxResourceProvider
@ -18,5 +21,42 @@ namespace MvvmCross.Plugins.ResourceLoader
{
return $"{namespaceKey}|{typeKey}|{name}";
}
protected static string GenerateResourceNameFromPath(string path)
{
char[] invalidChars = { ' ', '\u00A0', '.', ',', ';',
'|', '~', '@', '#', '%',
'^', '&', '*', '+', '-',
'/', '\\', '<', '>', '?',
'[', ']', '(', ')', '{',
'}', '"', '\'', ':', '!' };
StringBuilder builder = new StringBuilder();
if (string.IsNullOrEmpty(path))
{
builder.Append("_");
}
else
{
string[] pathParts = path.Replace('/', '.').Split('.');
foreach (string part in pathParts)
{
if (part.Length > 0)
{
if (part[0] >= '0' && part[0] <= '9')
{
builder.Append('_');
}
builder.Append(string.Join("_", part.Split(invalidChars)));
builder.Append('.');
}
}
}
builder.Remove(builder.Length - 1, 1);
return builder.ToString();
}
}
}

Просмотреть файл

@ -407,8 +407,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCrossCodeAnalysis", "Co
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.CodeAnalysis.Test", "CodeAnalysis\MvvmCross.CodeAnalysis.Test\MvvmCross.CodeAnalysis.Test.csproj", "{067456C0-086C-46A8-B37F-1405717B7BFC}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "MvvmCross.CodeAnalysis.Vsix", "CodeAnalysis\MvvmCross.CodeAnalysis.Vsix\MvvmCross.CodeAnalysis.Vsix.csproj", "{ADEACF9C-9726-45BA-9E59-0C43ECDE2376}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Binding.Wpf", "MvvmCross\Binding\Wpf\MvvmCross.Binding.Wpf.csproj", "{11674474-0123-4D7D-9F01-EBAA8BD039BD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Wpf", "MvvmCross\Windows\Wpf\MvvmCross.Wpf.csproj", "{3786EA13-A491-4917-9B49-FBE76BA87FAB}"
@ -438,6 +436,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
AssemblyInfo.cs = AssemblyInfo.cs
EndProjectSection
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "MvvmCross.CodeAnalysis.Vsix", "CodeAnalysis\MvvmCross.CodeAnalysis.Vsix\MvvmCross.CodeAnalysis.Vsix.csproj", "{44DCCC0D-A1F3-46A5-8A40-813A83164F6E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Plugins.ResourceLoader.Test", "MvvmCross-Plugins\ResourceLoader\MvvmCross.Plugins.ResourceLoader.Test\MvvmCross.Plugins.ResourceLoader.Test.csproj", "{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@ -8083,6 +8085,62 @@ Global
{3BD0462A-71C0-4240-A780-0C0BD284A0D5}.Release|x64.Build.0 = Release|Any CPU
{3BD0462A-71C0-4240-A780-0C0BD284A0D5}.Release|x86.ActiveCfg = Release|Any CPU
{3BD0462A-71C0-4240-A780-0C0BD284A0D5}.Release|x86.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|x64.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|Any CPU.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|ARM.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|ARM.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|iPhone.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|x64.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|x64.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|x86.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|x86.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|ARM.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|ARM.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|iPhone.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|x64.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|x64.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|x86.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|x86.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|Any CPU.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|ARM.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|ARM.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|iPhone.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|iPhone.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|x64.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|x64.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|x86.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -8274,7 +8332,6 @@ Global
{3688D6FC-E7F4-485F-8B27-96C0A8C7EAED} = {CFC09D0C-4B82-4F63-8445-F58C3562EFE7}
{C8F9F6A5-4083-4C51-B84C-8AC1F27A8AA6} = {ADECD310-4AD0-4EAF-9C97-23A7095229E6}
{067456C0-086C-46A8-B37F-1405717B7BFC} = {ADECD310-4AD0-4EAF-9C97-23A7095229E6}
{ADEACF9C-9726-45BA-9E59-0C43ECDE2376} = {ADECD310-4AD0-4EAF-9C97-23A7095229E6}
{11674474-0123-4D7D-9F01-EBAA8BD039BD} = {FEDB5D19-7082-46BA-89BA-D50B334BD6C7}
{3786EA13-A491-4917-9B49-FBE76BA87FAB} = {80E14EC8-6E98-4AE9-B4F4-8DBE6642A0D0}
{BFD90EC2-CBDA-4198-81DA-1A13AD2803E1} = {7A8C484F-8F8F-4698-90E8-F37CCDE659EC}
@ -8287,5 +8344,7 @@ Global
{DD2571F4-5610-4F27-B6C3-39D4C32AD6CA} = {B508A72D-FCDE-4DB5-92E5-54469D4CA366}
{0B7F2A10-627B-4F94-A87C-631FD9AC337C} = {1A5811B5-DE52-4608-BE67-588A982574A6}
{3BD0462A-71C0-4240-A780-0C0BD284A0D5} = {C5DF51EF-15E4-4C74-B8CB-A48C45F0ADD6}
{44DCCC0D-A1F3-46A5-8A40-813A83164F6E} = {ADECD310-4AD0-4EAF-9C97-23A7095229E6}
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A} = {B508A72D-FCDE-4DB5-92E5-54469D4CA366}
EndGlobalSection
EndGlobal

Просмотреть файл

@ -113,12 +113,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.iOS.Support", "Mv
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.iOS.Support.XamarinSidebar", "MvvmCross-iOSSupport\MvvmCross.iOS.Support.XamarinSidebar\MvvmCross.iOS.Support.XamarinSidebar.csproj", "{29579644-AF3E-412F-86EF-FA413C5A08CA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Forms.Presenter.Core", "MvvmCross-Forms\MvvmCross.Forms.Presenter.Core\MvvmCross.Forms.Presenter.Core.csproj", "{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Forms.Presenter.Droid", "MvvmCross-Forms\MvvmCross.Forms.Presenter.Droid\MvvmCross.Forms.Presenter.Droid.csproj", "{F823EE03-AC94-4124-AB5B-91B69FE7B85A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Forms.Presenter.iOS", "MvvmCross-Forms\MvvmCross.Forms.Presenter.iOS\MvvmCross.Forms.Presenter.iOS.csproj", "{F2270784-C153-4B1C-BB04-15CB29F0F945}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.Compat", "MvvmCross-AndroidSupport\MvvmCross.Droid.Support.Compat\MvvmCross.Droid.Support.Compat.csproj", "{EA8563C7-102B-41D4-AF04-4C92B1DDD132}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.Core.UI", "MvvmCross-AndroidSupport\MvvmCross.Droid.Support.Core.UI\MvvmCross.Droid.Support.Core.UI.csproj", "{BA68B924-17C4-41F7-9B02-53C0DE9B8D4B}"
@ -291,8 +285,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Navigation", "Navigation",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingExample.Core", "TestProjects\Navigation\RoutingExample.Core\RoutingExample.Core.csproj", "{A7592333-79A2-41C1-BABE-E72023150D18}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingExample.Droid", "TestProjects\Navigation\RoutingExample.Droid\RoutingExample.Droid.csproj", "{BA02568B-FF99-4AFF-8FD6-F599AF31E750}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingExample.iOS", "TestProjects\Navigation\RoutingExample.iOS\RoutingExample.iOS.csproj", "{2A8B3B0D-DBED-48E7-85CD-F72F569FE73F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Example001CSharp", "Example001CSharp", "{7208FF2E-0713-4B26-BBAE-F4D9EA66D5DB}"
@ -335,6 +327,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground.Core", "TestProj
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground.iOS", "TestProjects\Playground\Playground.iOS\Playground.iOS.csproj", "{E5554BE9-91EA-42DF-8F2B-60667E51C51F}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "MvvmCross.Forms.Presenter.Core", "MvvmCross-Forms\MvvmCross.Forms.Presenter.Core\MvvmCross.Forms.Presenter.Core.csproj", "{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "MvvmCross.Forms.Presenter.Droid", "MvvmCross-Forms\MvvmCross.Forms.Presenter.Droid\MvvmCross.Forms.Presenter.Droid.csproj", "{6D8E998A-0C5B-485F-BC66-9113C6249F6B}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "MvvmCross.Forms.Presenter.iOS", "MvvmCross-Forms\MvvmCross.Forms.Presenter.iOS\MvvmCross.Forms.Presenter.iOS.csproj", "{AE421E25-A00B-4D2B-8213-D580F516FCE1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Plugins.ResourceLoader.Test", "MvvmCross-Plugins\ResourceLoader\MvvmCross.Plugins.ResourceLoader.Test\MvvmCross.Plugins.ResourceLoader.Test.csproj", "{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingExample.Droid", "TestProjects\Navigation\RoutingExample.Droid\RoutingExample.Droid.csproj", "{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@ -1379,138 +1381,6 @@ Global
{29579644-AF3E-412F-86EF-FA413C5A08CA}.Release|x64.Build.0 = Release|Any CPU
{29579644-AF3E-412F-86EF-FA413C5A08CA}.Release|x86.ActiveCfg = Release|Any CPU
{29579644-AF3E-412F-86EF-FA413C5A08CA}.Release|x86.Build.0 = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.AppStore|ARM.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.AppStore|iPhone.Build.0 = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.AppStore|x64.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.AppStore|x86.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|ARM.ActiveCfg = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|ARM.Build.0 = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|iPhone.Build.0 = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|x64.ActiveCfg = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|x64.Build.0 = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|x86.ActiveCfg = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Debug|x86.Build.0 = Debug|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|Any CPU.Build.0 = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|ARM.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|ARM.Build.0 = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|iPhone.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|iPhone.Build.0 = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|x64.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|x64.Build.0 = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|x86.ActiveCfg = Release|Any CPU
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69}.Release|x86.Build.0 = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.AppStore|ARM.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.AppStore|iPhone.Build.0 = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.AppStore|x64.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.AppStore|x86.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|ARM.Build.0 = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|iPhone.Build.0 = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|x64.ActiveCfg = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|x64.Build.0 = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|x86.ActiveCfg = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Debug|x86.Build.0 = Debug|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|Any CPU.Build.0 = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|ARM.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|ARM.Build.0 = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|iPhone.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|iPhone.Build.0 = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|x64.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|x64.Build.0 = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|x86.ActiveCfg = Release|Any CPU
{F823EE03-AC94-4124-AB5B-91B69FE7B85A}.Release|x86.Build.0 = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.AppStore|ARM.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.AppStore|iPhone.Build.0 = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.AppStore|x64.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.AppStore|x86.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|ARM.Build.0 = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|iPhone.Build.0 = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|x64.ActiveCfg = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|x64.Build.0 = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|x86.ActiveCfg = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Debug|x86.Build.0 = Debug|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|Any CPU.Build.0 = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|ARM.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|ARM.Build.0 = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|iPhone.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|iPhone.Build.0 = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|x64.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|x64.Build.0 = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|x86.ActiveCfg = Release|Any CPU
{F2270784-C153-4B1C-BB04-15CB29F0F945}.Release|x86.Build.0 = Release|Any CPU
{EA8563C7-102B-41D4-AF04-4C92B1DDD132}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{EA8563C7-102B-41D4-AF04-4C92B1DDD132}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{EA8563C7-102B-41D4-AF04-4C92B1DDD132}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
@ -4776,55 +4646,6 @@ Global
{A7592333-79A2-41C1-BABE-E72023150D18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{A7592333-79A2-41C1-BABE-E72023150D18}.Release|x64.ActiveCfg = Release|Any CPU
{A7592333-79A2-41C1-BABE-E72023150D18}.Release|x86.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|x64.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|Any CPU.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|ARM.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|ARM.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|iPhone.Build.0 = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|x64.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|x64.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|x86.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.AppStore|x86.Build.0 = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|ARM.ActiveCfg = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|ARM.Build.0 = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|iPhone.Build.0 = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|x64.ActiveCfg = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|x64.Build.0 = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|x86.ActiveCfg = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Debug|x86.Build.0 = Debug|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Release|ARM.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Release|iPhone.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Release|x64.ActiveCfg = Release|Any CPU
{BA02568B-FF99-4AFF-8FD6-F599AF31E750}.Release|x86.ActiveCfg = Release|Any CPU
{2A8B3B0D-DBED-48E7-85CD-F72F569FE73F}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
{2A8B3B0D-DBED-48E7-85CD-F72F569FE73F}.Ad-Hoc|Any CPU.Build.0 = Ad-Hoc|iPhone
{2A8B3B0D-DBED-48E7-85CD-F72F569FE73F}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
@ -5662,6 +5483,243 @@ Global
{E5554BE9-91EA-42DF-8F2B-60667E51C51F}.Release|x64.Build.0 = Release|iPhone
{E5554BE9-91EA-42DF-8F2B-60667E51C51F}.Release|x86.ActiveCfg = Release|iPhone
{E5554BE9-91EA-42DF-8F2B-60667E51C51F}.Release|x86.Build.0 = Release|iPhone
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.AppStore|ARM.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.AppStore|iPhone.Build.0 = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.AppStore|x64.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.AppStore|x86.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|ARM.ActiveCfg = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|ARM.Build.0 = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|iPhone.Build.0 = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|x64.ActiveCfg = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|x64.Build.0 = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|x86.ActiveCfg = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Debug|x86.Build.0 = Debug|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|Any CPU.Build.0 = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|ARM.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|ARM.Build.0 = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|iPhone.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|iPhone.Build.0 = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|x64.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|x64.Build.0 = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|x86.ActiveCfg = Release|Any CPU
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661}.Release|x86.Build.0 = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.AppStore|ARM.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.AppStore|iPhone.Build.0 = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.AppStore|x64.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.AppStore|x86.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|ARM.ActiveCfg = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|ARM.Build.0 = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|iPhone.Build.0 = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|x64.ActiveCfg = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|x64.Build.0 = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|x86.ActiveCfg = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Debug|x86.Build.0 = Debug|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|Any CPU.Build.0 = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|ARM.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|ARM.Build.0 = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|iPhone.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|iPhone.Build.0 = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|x64.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|x64.Build.0 = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|x86.ActiveCfg = Release|Any CPU
{6D8E998A-0C5B-485F-BC66-9113C6249F6B}.Release|x86.Build.0 = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.AppStore|ARM.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.AppStore|iPhone.Build.0 = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.AppStore|x64.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.AppStore|x86.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|ARM.ActiveCfg = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|ARM.Build.0 = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|iPhone.Build.0 = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|x64.ActiveCfg = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|x64.Build.0 = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|x86.ActiveCfg = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Debug|x86.Build.0 = Debug|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|Any CPU.Build.0 = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|ARM.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|ARM.Build.0 = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|iPhone.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|iPhone.Build.0 = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|x64.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|x64.Build.0 = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|x86.ActiveCfg = Release|Any CPU
{AE421E25-A00B-4D2B-8213-D580F516FCE1}.Release|x86.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|x64.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|Any CPU.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|ARM.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|ARM.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|iPhone.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|x64.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|x64.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|x86.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.AppStore|x86.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|ARM.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|ARM.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|iPhone.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|x64.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|x64.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|x86.ActiveCfg = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Debug|x86.Build.0 = Debug|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|Any CPU.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|ARM.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|ARM.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|iPhone.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|iPhone.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|x64.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|x64.Build.0 = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|x86.ActiveCfg = Release|Any CPU
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A}.Release|x86.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|x64.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|Any CPU.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|ARM.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|ARM.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|iPhone.Build.0 = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|x64.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|x64.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|x86.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.AppStore|x86.Build.0 = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|ARM.ActiveCfg = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|ARM.Build.0 = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|iPhone.Build.0 = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|x64.ActiveCfg = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|x64.Build.0 = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|x86.ActiveCfg = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Debug|x86.Build.0 = Debug|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Release|ARM.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Release|iPhone.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Release|x64.ActiveCfg = Release|Any CPU
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -5710,9 +5768,6 @@ Global
{64F42798-41EE-491E-926D-2F75AB666723} = {CFC09D0C-4B82-4F63-8445-F58C3562EFE7}
{E6A71CD5-82A0-49E9-A04D-166F9E8F76F9} = {8C1A81D6-A25A-4B32-9E61-44AC23041294}
{29579644-AF3E-412F-86EF-FA413C5A08CA} = {8C1A81D6-A25A-4B32-9E61-44AC23041294}
{0797D39C-C59B-4FE2-BB16-AB6FA0119C69} = {44DE2097-4130-45F1-AC00-C14228F6B5E6}
{F823EE03-AC94-4124-AB5B-91B69FE7B85A} = {44DE2097-4130-45F1-AC00-C14228F6B5E6}
{F2270784-C153-4B1C-BB04-15CB29F0F945} = {44DE2097-4130-45F1-AC00-C14228F6B5E6}
{EA8563C7-102B-41D4-AF04-4C92B1DDD132} = {4D96FBF4-CFD0-4F1A-A911-3079D68D4860}
{BA68B924-17C4-41F7-9B02-53C0DE9B8D4B} = {4D96FBF4-CFD0-4F1A-A911-3079D68D4860}
{61C1EB25-483E-4C77-89CD-CA202C82C6BF} = {4D96FBF4-CFD0-4F1A-A911-3079D68D4860}
@ -5798,7 +5853,6 @@ Global
{47C28B95-AEEB-434B-993B-B1010E2343C3} = {64CBD2B8-79F4-47FD-A0F2-0BECB32236CB}
{514AB389-ECED-4751-B1F2-CCD86304F232} = {E05687BD-69EB-4228-BD46-5D216CD68F01}
{A7592333-79A2-41C1-BABE-E72023150D18} = {514AB389-ECED-4751-B1F2-CCD86304F232}
{BA02568B-FF99-4AFF-8FD6-F599AF31E750} = {514AB389-ECED-4751-B1F2-CCD86304F232}
{2A8B3B0D-DBED-48E7-85CD-F72F569FE73F} = {514AB389-ECED-4751-B1F2-CCD86304F232}
{7208FF2E-0713-4B26-BBAE-F4D9EA66D5DB} = {42B62BED-FB84-4FD5-9BE5-7BB77D9F9C9B}
{2AB74840-32C8-4E07-923E-C9D6A09F81B2} = {7208FF2E-0713-4B26-BBAE-F4D9EA66D5DB}
@ -5820,5 +5874,10 @@ Global
{672BE1BB-5782-4052-80F2-BE27FF941D68} = {E05687BD-69EB-4228-BD46-5D216CD68F01}
{56CD2748-857D-442A-9268-95D99F552840} = {672BE1BB-5782-4052-80F2-BE27FF941D68}
{E5554BE9-91EA-42DF-8F2B-60667E51C51F} = {672BE1BB-5782-4052-80F2-BE27FF941D68}
{8F1D559F-2C10-4BEC-8CBC-E00B3B5B2661} = {44DE2097-4130-45F1-AC00-C14228F6B5E6}
{6D8E998A-0C5B-485F-BC66-9113C6249F6B} = {44DE2097-4130-45F1-AC00-C14228F6B5E6}
{AE421E25-A00B-4D2B-8213-D580F516FCE1} = {44DE2097-4130-45F1-AC00-C14228F6B5E6}
{4584C230-63F9-4D0F-A8C3-D63424AC9A1A} = {B508A72D-FCDE-4DB5-92E5-54469D4CA366}
{62EA1C90-E0F8-4D57-BF00-DB8D7AB46B18} = {514AB389-ECED-4751-B1F2-CCD86304F232}
EndGlobalSection
EndGlobal