Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

C1 CMS v6.10 #760

Merged
merged 22 commits into from
Oct 5, 2020
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
149b25c
Usage of JsonConvert.SerializeObject should not rely on default JsonS…
burningice2866 Apr 14, 2020
61630fa
Fixed spelling
burningice2866 Apr 14, 2020
beea1e1
Formatting
burningice2866 Apr 14, 2020
63497ef
Change hardcoded usage of Microsoft.CSharp.CSharpProvider to instanti…
burningice2866 Apr 24, 2020
b7b9eef
Tidying and fixing Cachable -> Cacheable spelling mistakte
burningice2866 Apr 24, 2020
dd56f8e
Function provider for simple methods registration as C1 functions (#737)
vadym-hyryn May 20, 2020
2d341e5
CodeBasedFunctionProvider object creation enhancement
burningice2866 May 29, 2020
ea73776
CmsPageHttpHandler fixing public caching not being disabled when a fu…
napernik Jun 16, 2020
5a08a19
Customizable page route (#748)
napernik Jun 16, 2020
a9d4822
Get actions from IElementActionProvider loaded via DependencyInjectio…
neexite Jul 23, 2020
0f62fc5
DataReferenceTreeSelector:Take data for PageReference from SitemapNav…
neexite Aug 5, 2020
08133eb
ResxEditor: (#753)
neexite Aug 5, 2020
aef1d3c
Fix #751 Adding page dialog crashes during position selection if one …
napernik Sep 10, 2020
246a920
Making PageRenderer respect PreventFunctionOutputCaching property
napernik Sep 10, 2020
189613f
Fixing page object cache functionality in PageRenderer; refactoring f…
napernik Sep 16, 2020
8668c64
Merge pull request #736 from burningice2866/features/735
napernik Sep 30, 2020
8faaad6
Fix [Bug] C1 CMS 6.9: {body}#xD; added to TextArea parameter value in…
neexite Sep 30, 2020
a02d026
Bump node-fetch from 1.6.0 to 2.6.1 in /Website
dependabot[bot] Sep 10, 2020
74152ea
Merge pull request #734 from burningice2866/fix/733
napernik Oct 1, 2020
b6f0e14
A more informative exception when user data providers are misconfigur…
napernik Oct 2, 2020
6304778
Updating version number to 6.10
napernik Oct 2, 2020
8ca9f26
Addressing compilation warnings
napernik Oct 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Usage of JsonConvert.SerializeObject should not rely on default JsonS…
…erializerSettings

Fixes Issue 733
  • Loading branch information
burningice2866 committed Apr 14, 2020
commit 149b25c3ea9f2e11e61d36bf1f9a32c2bb1c36ca
10 changes: 6 additions & 4 deletions Composite/Core/Serialization/CompositeJsonSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static string Serialize(object obj)
{
TypeNameAssemblyFormat = System.Runtime.Serialization.Formatters.FormatterAssemblyStyle.Simple,
TypeNameHandling = TypeNameHandling.Auto,
Converters = {new JsonTypeConverter()},
Converters = { new JsonTypeConverter() },
Binder = CompositeSerializationBinder.Instance
});

Expand All @@ -59,7 +59,7 @@ public static string SerializeObject(object obj)
TypeNameAssemblyFormat = System.Runtime.Serialization.Formatters.FormatterAssemblyStyle.Simple,
TypeNameHandling = TypeNameHandling.Objects,
Formatting = Formatting.None,
Converters = {new JsonTypeConverter()},
Converters = { new JsonTypeConverter() },
Binder = CompositeSerializationBinder.Instance
});

Expand All @@ -79,8 +79,10 @@ public static string SerializePartial(object obj, IEnumerable<string> propertyNa
return SerializeObject(obj);
}

var serializedData =
JsonConvert.SerializeObject(obj, new PartialJsonConvertor(propertyNames, obj.GetType()));
var serializedData = JsonConvert.SerializeObject(obj, new JsonSerializerSettings
{
Converters = { new PartialJsonConvertor(propertyNames, obj.GetType()) }
});

return serializedData;
}
Expand Down