Skip to content

Commit a902be5

Browse files
stgatesstgates
committed
Merge branch 'development' of https://git01.codeplex.com/casablanca into json_unicode
2 parents 120dd0e + 83ee1d3 commit a902be5

File tree

11 files changed

+56
-66
lines changed

11 files changed

+56
-66
lines changed

‎Release/samples/BlackJack/BlackJack_UIClient/BlackJack_UIClient120.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
</ItemDefinitionGroup>
110110
<PropertyGroup>
111111
<OutDir>$(OutDir)\$(MSBuildProjectName)\</OutDir>
112-
<PackageCertificateThumbprint>5C945ED108BF1723994A90F9BAA4B7D93FBE0E47</PackageCertificateThumbprint>
112+
<PackageCertificateThumbprint>F21E91BD711D606106CD99CE5C2E090FD822956F</PackageCertificateThumbprint>
113113
</PropertyGroup>
114114
<ItemGroup>
115115
<ClInclude Include="CardShape.xaml.h">
@@ -141,6 +141,7 @@
141141
<AppxManifest Include="Package120.appxmanifest">
142142
<SubType>Designer</SubType>
143143
</AppxManifest>
144+
<None Include="BlackJack_UIClient120_TemporaryKey.pfx" />
144145
<None Include="BlackJack_UIClient_TemporaryKey.pfx" />
145146
</ItemGroup>
146147
<ItemGroup>

‎Release/samples/BlackJack/BlackJack_UIClient/BlackJack_UIClient_TemporaryKey.pfx

-24 Bytes
Binary file not shown.

‎Release/samples/BlackJack/BlackJack_UIClient/Package120.appxmanifest

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
3-
<Identity Name="64521d51-da30-445f-ba7b-d79f27cf8c7c" Publisher="CN=Microsoft Corporation" Version="1.0.0.0" />
2+
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
3+
<Identity Name="64521d51-da30-445f-ba7b-d79f27cf8c7c" Publisher="CN=stgates" Version="1.0.0.0" />
44
<Properties>
55
<DisplayName>Blackjack Client</DisplayName>
66
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
@@ -15,10 +15,14 @@
1515
</Resources>
1616
<Applications>
1717
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="Blackjack_Client.App">
18-
<VisualElements DisplayName="Blackjack Client" Logo="Assets\Logo.png" SmallLogo="Assets\SmallLogo.png" Description="Blackjack Client" ForegroundText="light" BackgroundColor="#464646">
19-
<DefaultTile ShowName="allLogos" />
20-
<SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="#008024" />
21-
</VisualElements>
18+
<m2:VisualElements DisplayName="Blackjack Client" Description="Blackjack Client" BackgroundColor="#464646" ForegroundText="light" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png">
19+
<m2:DefaultTile>
20+
<m2:ShowNameOnTiles>
21+
<m2:ShowOn Tile="square150x150Logo" />
22+
</m2:ShowNameOnTiles>
23+
</m2:DefaultTile>
24+
<m2:SplashScreen BackgroundColor="#008024" Image="Assets\SplashScreen.png" />
25+
</m2:VisualElements>
2226
</Application>
2327
</Applications>
2428
<Capabilities>

‎Release/samples/FacebookDemo/FacebookDemo120.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
</PropertyGroup>
7979
<PropertyGroup>
8080
<OutDir>$(OutDir)\$(MSBuildProjectName)\</OutDir>
81+
<PackageCertificateThumbprint>A2EB87D9E8F458456834BA935C38BCD7C389022E</PackageCertificateThumbprint>
8182
</PropertyGroup>
8283
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
8384
<ClCompile>
@@ -146,6 +147,7 @@
146147
<AppxManifest Include="Package120.appxmanifest">
147148
<SubType>Designer</SubType>
148149
</AppxManifest>
150+
<None Include="FacebookDemo120_TemporaryKey.pfx" />
149151
<None Include="FacebookDemo_TemporaryKey.pfx" />
150152
</ItemGroup>
151153
<ItemGroup>

‎Release/samples/FacebookDemo/FacebookDemo_TemporaryKey.pfx

8 Bytes
Binary file not shown.

‎Release/samples/FacebookDemo/Package120.appxmanifest

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
3-
4-
<Identity Name="2b173277-f2a9-4af1-905b-0da25a731def"
5-
Publisher="CN=Andy"
6-
Version="1.0.0.0" />
7-
2+
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
3+
<Identity Name="2b173277-f2a9-4af1-905b-0da25a731def" Publisher="CN=stgates" Version="1.0.0.0" />
84
<Properties>
95
<DisplayName>FacebookDemo</DisplayName>
106
<PublisherDisplayName>Andy</PublisherDisplayName>
117
<Logo>Assets\StoreLogo.png</Logo>
128
</Properties>
13-
149
<Prerequisites>
1510
<OSMinVersion>6.2.1</OSMinVersion>
1611
<OSMaxVersionTested>6.2.1</OSMaxVersionTested>
1712
</Prerequisites>
18-
1913
<Resources>
20-
<Resource Language="x-generate"/>
14+
<Resource Language="x-generate" />
2115
</Resources>
22-
2316
<Applications>
24-
<Application Id="App"
25-
Executable="$targetnametoken$.exe"
26-
EntryPoint="FacebookDemo.App">
27-
<VisualElements
28-
DisplayName="FacebookDemo"
29-
Logo="Assets\Logo.png"
30-
SmallLogo="Assets\SmallLogo.png"
31-
Description="FacebookDemo"
32-
ForegroundText="light"
33-
BackgroundColor="#464646">
34-
<DefaultTile ShowName="allLogos" />
35-
<SplashScreen Image="Assets\SplashScreen.png" />
36-
</VisualElements>
17+
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="FacebookDemo.App">
18+
<m2:VisualElements DisplayName="FacebookDemo" Description="FacebookDemo" BackgroundColor="#464646" ForegroundText="light" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png">
19+
<m2:DefaultTile>
20+
<m2:ShowNameOnTiles>
21+
<m2:ShowOn Tile="square150x150Logo" />
22+
</m2:ShowNameOnTiles>
23+
</m2:DefaultTile>
24+
<m2:SplashScreen Image="Assets\SplashScreen.png" />
25+
</m2:VisualElements>
3726
</Application>
3827
</Applications>
3928
<Capabilities>

‎Release/samples/WindowsLiveAuth/Package120.appxmanifest

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
3-
4-
<Identity Name="64521d51-da30-445f-ba7b-d79f27cf8c7c"
5-
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
6-
Version="1.0.0.0" />
7-
2+
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
3+
<Identity Name="64521d51-da30-445f-ba7b-d79f27cf8c7c" Publisher="CN=stgates" Version="1.0.0.0" />
84
<Properties>
95
<DisplayName>WindowsLiveAuth</DisplayName>
106
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
117
<Logo>Assets\StoreLogo.png</Logo>
128
</Properties>
13-
149
<Prerequisites>
1510
<OSMinVersion>6.2.1</OSMinVersion>
1611
<OSMaxVersionTested>6.2.1</OSMaxVersionTested>
1712
</Prerequisites>
18-
1913
<Resources>
20-
<Resource Language="x-generate"/>
14+
<Resource Language="x-generate" />
2115
</Resources>
22-
2316
<Applications>
24-
<Application Id="App"
25-
Executable="$targetnametoken$.exe"
26-
EntryPoint="WindowsLiveAuth.App">
27-
<VisualElements
28-
DisplayName="WindowsLiveAuth"
29-
Logo="Assets\Logo.png"
30-
SmallLogo="Assets\SmallLogo.png"
31-
Description="WindowsLiveAuth"
32-
ForegroundText="light"
33-
BackgroundColor="#464646">
34-
<DefaultTile ShowName="allLogos" />
35-
<SplashScreen Image="Assets\SplashScreen.png" />
36-
</VisualElements>
17+
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="WindowsLiveAuth.App">
18+
<m2:VisualElements DisplayName="WindowsLiveAuth" Description="WindowsLiveAuth" BackgroundColor="#464646" ForegroundText="light" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png">
19+
<m2:DefaultTile>
20+
<m2:ShowNameOnTiles>
21+
<m2:ShowOn Tile="square150x150Logo" />
22+
</m2:ShowNameOnTiles>
23+
</m2:DefaultTile>
24+
<m2:SplashScreen Image="Assets\SplashScreen.png" />
25+
</m2:VisualElements>
3726
</Application>
3827
</Applications>
3928
<Capabilities>

‎Release/samples/WindowsLiveAuth/WindowsLiveAuth120.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
</PropertyGroup>
129129
<PropertyGroup>
130130
<PackageCertificateKeyFile>WindowsLiveAuth_TemporaryKey.pfx</PackageCertificateKeyFile>
131+
<PackageCertificateThumbprint>D3342DAE1EC703934903364490A80C5BB06C929A</PackageCertificateThumbprint>
131132
</PropertyGroup>
132133
<ItemGroup>
133134
<ClInclude Include="live_connect.h" />

‎Release/samples/WindowsLiveAuth/WindowsLiveAuth_TemporaryKey.pfx

0 Bytes
Binary file not shown.

‎Release/src/json/json_parsing.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,15 @@ class JSON_Parser
189189
const typename std::char_traits<CharType>::int_type m_eof;
190190
size_t m_currentColumn;
191191
size_t m_currentParsingDepth;
192-
#ifndef __APPLE__
193-
static const size_t maxParsingDepth = 128;
192+
193+
// On APPLE debug overflow happens around 80.
194+
// The DEBUG macro is defined in XCode but we don't in our CMakeList
195+
// so for now we will keep the same on debug and release. In the future
196+
// this can be increase on release if necessary.
197+
#if defined(__APPLE__)
198+
static const size_t maxParsingDepth = 64;
194199
#else
195-
static const size_t maxParsingDepth = 32;
200+
static const size_t maxParsingDepth = 128;
196201
#endif
197202
};
198203

0 commit comments

Comments
 (0)