-
Notifications
You must be signed in to change notification settings - Fork 143
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
Optionally support DataContract in Mono/Unity #61
Open
Esam-Bustaty
wants to merge
6
commits into
facebook-csharp-sdk:master
Choose a base branch
from
Esam-Bustaty:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
b0b2053
Optionally support DataContract in Mono/Unity
Esam-Bustaty c124e3f
Added Fork Purpose paragraph
Esam-Bustaty 88fb1bf
the definition now starts with SIMPLE_JSON_
Esam-Bustaty 55e27b5
Un-did adding fork-purpose
Esam-Bustaty 924ebd2
Clarified define description
Esam-Bustaty 98929dc
New constructor for DataMember and fixed scopes
Esam-Bustaty File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,6 +31,10 @@ | |
// NOTE: uncomment the following line to enable DataContract support. | ||
//#define SIMPLE_JSON_DATACONTRACT | ||
|
||
// NOTE: uncomment the following line to use alternate definitions of DataContract/DataMember/IgnoreDataMember. | ||
// define if you want to use DataContract with Mono, which does not implement all WCF classes. | ||
//#define SIMPLE_JSON_REDEFINE_DATACONTRACT_ATTRIBUTES | ||
|
||
// NOTE: uncomment the following line to enable IReadOnlyCollection<T> and IReadOnlyList<T> support. | ||
//#define SIMPLE_JSON_READONLY_COLLECTIONS | ||
|
||
|
@@ -486,6 +490,29 @@ public override IEnumerable<string> GetDynamicMemberNames() | |
|
||
namespace SimpleJson | ||
{ | ||
#region Alternate DataContract for Unity/Mono | ||
|
||
#if SIMPLE_JSON_REDEFINE_DATACONTRACT_ATTRIBUTES | ||
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum, Inherited = false, AllowMultiple = false)] | ||
public sealed class DataContractAttribute : Attribute | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add #if SIMPLE_JSON_INTERNAL
internal
#else
public
#endif There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And Done. |
||
{ | ||
public string Name { get; set; } | ||
} | ||
|
||
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, Inherited = false, AllowMultiple = false)] | ||
public sealed class DataMemberAttribute : Attribute | ||
{ | ||
public string Name { get; set; } | ||
} | ||
|
||
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, Inherited = false, AllowMultiple = false)] | ||
public sealed class IgnoreDataMemberAttribute : Attribute | ||
{ | ||
} | ||
#endif | ||
|
||
#endregion | ||
|
||
/// <summary> | ||
/// This class encodes and decodes JSON strings. | ||
/// Spec. details, see http://www.json.org/ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you add Unity/Mono
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done