From c3f8cc7d6ec237e80f199660ef9762c8c3e29d12 Mon Sep 17 00:00:00 2001 From: Shimmy Weitzhandler Date: Fri, 27 Jan 2017 00:55:46 +0200 Subject: [PATCH 1/3] Cleaned up some namespaces. --- FamilySearch.Api/DiscussionState.cs | 1 + FamilySearch.Api/DiscussionsState.cs | 1 + .../FamilySearchCollectionState.cs | 1 + .../FamilySearchPlaceDescriptionState.cs | 1 + FamilySearch.Api/FamilySearchPlaceState.cs | 1 + FamilySearch.Api/FamilySearchPlaces.cs | 1 + .../FamilySearchSourceDescriptionState.cs | 1 + FamilySearch.Api/FamilySearchStateFactory.cs | 1 + FamilySearch.Api/Ft/ChangeHistoryState.cs | 1 + .../Ft/ChildAndParentsRelationshipState.cs | 1 + FamilySearch.Api/Ft/FamilySearchFamilyTree.cs | 1 + .../Ft/FamilyTreePersonChildrenState.cs | 1 + .../Ft/FamilyTreePersonParentsState.cs | 1 + FamilySearch.Api/Ft/FamilyTreePersonState.cs | 1 + .../Ft/FamilyTreeRelationshipState.cs | 1 + .../Ft/FamilyTreeRelationshipsState.cs | 1 + FamilySearch.Api/Ft/FamilyTreeStateFactory.cs | 1 + .../Memories/FamilySearchMemories.cs | 1 + FamilySearch.Api/PersonMatchResultsState.cs | 1 + FamilySearch.Api/PersonMergeState.cs | 1 + FamilySearch.Api/PersonNonMatchesState.cs | 1 + FamilySearch.Api/Rel.cs | 1 + FamilySearch.Api/UserHistoryState.cs | 1 + FamilySearch.Api/UserState.cs | 1 + FamilySearch.Api/Util/ChangeEntry.cs | 1 + FamilySearch.Api/Util/ChangeHistoryPage.cs | 1 + FamilySearch.Api/Util/ExperimentsFilter.cs | 1 + FamilySearch.Api/Util/FamilySearchOptions.cs | 1 + FamilySearch.Api/Util/MergeAnalysisFilter.cs | 1 + FamilySearch.Api/Util/RequestUtil.cs | 1 + FamilySearch.Api/app.config | 10 ++-- GEDCOM X Date/GedcomxDate.cs | 1 + GEDCOM X Date/GedcomxDateApproximate.cs | 1 + GEDCOM X Date/GedcomxDateDuration.cs | 1 + GEDCOM X Date/GedcomxDateException.cs | 1 + GEDCOM X Date/GedcomxDateRange.cs | 1 + GEDCOM X Date/GedcomxDateRecurring.cs | 1 + GEDCOM X Date/GedcomxDateSimple.cs | 1 + GEDCOM X Date/GedcomxDateType.cs | 1 + GEDCOM X Date/GedcomxDateUtil.cs | 1 + GEDCOM X File/DefaultJsonSerialization.cs | 1 + GEDCOM X File/DefaultXMLSerialization.cs | 2 +- GEDCOM X File/GedcomNamespaceManager.cs | 2 +- GEDCOM X File/GedcomxFile.cs | 1 + GEDCOM X File/GedcomxFileEntry.cs | 1 + GEDCOM X File/GedcomxOutputStream.cs | 1 + GEDCOM X File/IGedcomxEntryDeserializer.cs | 1 + GEDCOM X File/IGedcomxEntrySerializer.cs | 1 + GEDCOM X File/ManifestAttribute.cs | 1 + GEDCOM X File/ManifestAttributes.cs | 1 + GEDCOM X Support/MediaTypes.cs | 1 + Gedcomx.CLI/RecordSetToCSV.cs | 2 + Gedcomx.CLI/RecordSetTransformer.cs | 2 +- Gedcomx.Model.Fs/ArtifactMetadata.cs | 8 ++-- Gedcomx.Model.Fs/ArtifactType.cs | 2 + Gedcomx.Model.Fs/ChangeInfo.cs | 8 ++-- Gedcomx.Model.Fs/ChangeObjectModifier.cs | 2 + Gedcomx.Model.Fs/ChangeObjectType.cs | 2 + Gedcomx.Model.Fs/ChangeOperation.cs | 2 + .../ChildAndParentsRelationship.cs | 15 +++--- Gedcomx.Model.Fs/Comment.cs | 6 ++- Gedcomx.Model.Fs/Ct/MatchCollection.cs | 1 + Gedcomx.Model.Fs/Discussion.cs | 13 ++--- Gedcomx.Model.Fs/Error.cs | 8 ++-- Gedcomx.Model.Fs/FamilySearchPlatform.cs | 31 ++++++------ Gedcomx.Model.Fs/Feature.cs | 6 ++- Gedcomx.Model.Fs/HealthConfig.cs | 8 ++-- Gedcomx.Model.Fs/MatchInfo.cs | 8 ++-- Gedcomx.Model.Fs/MatchResolution.cs | 2 + Gedcomx.Model.Fs/MatchSystem.cs | 2 + Gedcomx.Model.Fs/Merge.cs | 16 ++++--- Gedcomx.Model.Fs/MergeAnalysis.cs | 20 ++++---- Gedcomx.Model.Fs/MergeConflict.cs | 8 ++-- ...ilySearchPlatformLocalReferenceResolver.cs | 1 + .../FamilySearchPlatformModelVisitorBase.cs | 1 + .../Rt/IFamilySearchPlatformModelVisitor.cs | 1 + Gedcomx.Model.Fs/User.cs | 8 ++-- Gedcomx.Model.Rs/Category.cs | 6 ++- Gedcomx.Model.Rs/CommonAttributes.cs | 6 ++- Gedcomx.Model.Rs/Content.cs | 6 ++- Gedcomx.Model.Rs/Entry.cs | 23 ++++----- Gedcomx.Model.Rs/ExtensibleElement.cs | 5 +- Gedcomx.Model.Rs/Feed.cs | 27 ++++++----- Gedcomx.Model.Rs/Generator.cs | 6 ++- Gedcomx.Model.Rs/Person.cs | 6 ++- Gedcomx.Model.Rs/ResultConfidence.cs | 2 + Gedcomx.Model/Address.cs | 5 +- Gedcomx.Model/Agent.cs | 31 ++++++------ Gedcomx.Model/Attribution.cs | 7 +-- Gedcomx.Model/CitationField.cs | 6 ++- Gedcomx.Model/Collection.cs | 11 +++-- Gedcomx.Model/CollectionContent.cs | 8 ++-- Gedcomx.Model/Conclusion.cs | 13 ++--- Gedcomx.Model/ConfidenceLevel.cs | 2 + Gedcomx.Model/Coverage.cs | 8 ++-- Gedcomx.Model/DateInfo.cs | 13 ++--- Gedcomx.Model/DiscussionReference.cs | 8 ++-- Gedcomx.Model/DisplayProperties.cs | 6 ++- Gedcomx.Model/Document.cs | 8 ++-- Gedcomx.Model/DocumentType.cs | 2 + Gedcomx.Model/Event.cs | 11 +++-- Gedcomx.Model/EventRole.cs | 6 ++- Gedcomx.Model/EventRoleType.cs | 2 + Gedcomx.Model/EventType.cs | 2 + Gedcomx.Model/EvidenceReference.cs | 8 ++-- Gedcomx.Model/ExtensibleData.cs | 5 +- Gedcomx.Model/Facet.cs | 14 +++--- Gedcomx.Model/FacetType.cs | 2 + Gedcomx.Model/FacetValue.cs | 6 ++- Gedcomx.Model/Fact.cs | 15 +++--- Gedcomx.Model/FactQualifierType.cs | 1 + Gedcomx.Model/FactType.cs | 2 + Gedcomx.Model/Field.cs | 9 ++-- Gedcomx.Model/FieldDescriptor.cs | 13 ++--- Gedcomx.Model/FieldType.cs | 2 + Gedcomx.Model/FieldValue.cs | 6 ++- Gedcomx.Model/FieldValueDescriptor.cs | 10 ++-- Gedcomx.Model/FieldValueType.cs | 2 + Gedcomx.Model/Gedcomx.cs | 47 ++++++++++--------- Gedcomx.Model/Gender.cs | 11 +++-- Gedcomx.Model/GenderType.cs | 2 + Gedcomx.Model/HypermediaEnabledData.cs | 9 ++-- Gedcomx.Model/IAttributable.cs | 1 + Gedcomx.Model/ISupportsLinks.cs | 1 + Gedcomx.Model/Identifier.cs | 6 ++- Gedcomx.Model/IdentifierType.cs | 2 + Gedcomx.Model/Link.cs | 8 ++-- Gedcomx.Model/Name.cs | 11 +++-- Gedcomx.Model/NameForm.cs | 13 ++--- Gedcomx.Model/NamePart.cs | 13 ++--- Gedcomx.Model/NamePartQualifierType.cs | 1 + Gedcomx.Model/NamePartType.cs | 2 + Gedcomx.Model/NameType.cs | 2 + Gedcomx.Model/Note.cs | 8 ++-- Gedcomx.Model/OnlineAccount.cs | 6 ++- Gedcomx.Model/Person.cs | 25 +++++----- Gedcomx.Model/PlaceDescription.cs | 9 ++-- Gedcomx.Model/PlaceDisplayProperties.cs | 6 ++- Gedcomx.Model/PlaceReference.cs | 13 ++--- Gedcomx.Model/Qualifier.cs | 4 +- Gedcomx.Model/RecordDescriptor.cs | 10 ++-- Gedcomx.Model/RecordSet.cs | 11 +++-- Gedcomx.Model/RecordType.cs | 2 + Gedcomx.Model/Relationship.cs | 15 +++--- Gedcomx.Model/RelationshipType.cs | 2 + Gedcomx.Model/ResourceReference.cs | 8 ++-- Gedcomx.Model/ResourceType.cs | 2 + .../Rt/GedcomxLocalReferenceResolver.cs | 1 + Gedcomx.Model/Rt/IGedcomxModelVisitor.cs | 1 + Gedcomx.Model/SourceCitation.cs | 9 ++-- Gedcomx.Model/SourceDescription.cs | 43 ++++++++--------- Gedcomx.Model/SourceReference.cs | 15 +++--- Gedcomx.Model/Subject.cs | 17 +++---- Gedcomx.Model/Tag.cs | 7 +-- Gedcomx.Model/TextValue.cs | 6 ++- .../Util/JsonHypermediaLinksConverter.cs | 1 + .../Util/JsonIdentifiersConverter.cs | 1 + .../Util/JsonUnixTimestampConverter.cs | 1 + Gedcomx.Model/Util/XmlQNameEnumUtil.cs | 3 +- Gedcomx.Model/VocabElement.cs | 1 + Gedcomx.Model/VocabElementList.cs | 1 + Gedcomx.Rs.Api.Test/AuthenticationTests.cs | 1 + Gedcomx.Rs.Api.Test/AuthoritiesTests.cs | 1 + Gedcomx.Rs.Api.Test/ChangeHistoryTests.cs | 1 + Gedcomx.Rs.Api.Test/DiscoveryTests.cs | 1 + Gedcomx.Rs.Api.Test/DiscussionsTests.cs | 1 + .../Examples/EmmaBocockExampleTest.cs | 1 + .../GeorgeMarthaWashingtonExampleTest.cs | 1 + .../Examples/MiscellaneousFactsExampleTest.cs | 1 + .../Examples/NamesExampleTest.cs | 1 + .../Examples/SamuelHamExampleTest.cs | 1 + .../Examples/WongAloiauExampleTest.cs | 1 + Gedcomx.Rs.Api.Test/GedcomxFileTests.cs | 1 + Gedcomx.Rs.Api.Test/MemoriesTests.cs | 1 + Gedcomx.Rs.Api.Test/NotesTests.cs | 1 + Gedcomx.Rs.Api.Test/OrdinancesTests.cs | 1 + Gedcomx.Rs.Api.Test/ParentsAndChildrenTest.cs | 1 + Gedcomx.Rs.Api.Test/PedigreeTests.cs | 1 + Gedcomx.Rs.Api.Test/PersonSearchTests.cs | 1 + Gedcomx.Rs.Api.Test/PersonTests.cs | 1 + Gedcomx.Rs.Api.Test/PlacesTests.cs | 1 + Gedcomx.Rs.Api.Test/RelationshipTests.cs | 1 + Gedcomx.Rs.Api.Test/Resources.Designer.cs | 2 + Gedcomx.Rs.Api.Test/SearchAndMatchTests.cs | 1 + Gedcomx.Rs.Api.Test/SourceBoxTests.cs | 1 + Gedcomx.Rs.Api.Test/SourcesTests.cs | 1 + Gedcomx.Rs.Api.Test/SpouseTests.cs | 1 + Gedcomx.Rs.Api.Test/TestBacking.cs | 1 + Gedcomx.Rs.Api.Test/UserTests.cs | 1 + Gedcomx.Rs.Api.Test/UtilitiesTests.cs | 1 + Gedcomx.Rs.Api.Test/VocabulariesTests.cs | 1 + Gedcomx.Rs.Api/AgentState.cs | 1 + Gedcomx.Rs.Api/AncestryResultsState.cs | 1 + Gedcomx.Rs.Api/CollectionState.cs | 1 + Gedcomx.Rs.Api/CollectionsState.cs | 1 + Gedcomx.Rs.Api/DescendancyResultsState.cs | 1 + Gedcomx.Rs.Api/GedcomxApplicationException.cs | 1 + Gedcomx.Rs.Api/GedcomxApplicationState.cs | 3 +- Gedcomx.Rs.Api/IPreferredRelationshipState.cs | 1 + Gedcomx.Rs.Api/IStateTransitionOption.cs | 1 + Gedcomx.Rs.Api/Options/CacheDirectives.cs | 1 + Gedcomx.Rs.Api/Options/HeaderParameter.cs | 1 + Gedcomx.Rs.Api/Options/Preconditions.cs | 1 + Gedcomx.Rs.Api/Options/QueryParameter.cs | 1 + Gedcomx.Rs.Api/PersonChildrenState.cs | 1 + Gedcomx.Rs.Api/PersonParentsState.cs | 1 + Gedcomx.Rs.Api/PersonSearchResultsState.cs | 1 + Gedcomx.Rs.Api/PersonSpousesState.cs | 1 + Gedcomx.Rs.Api/PersonState.cs | 1 + Gedcomx.Rs.Api/PersonsState.cs | 1 + Gedcomx.Rs.Api/PlaceDescriptionState.cs | 1 + Gedcomx.Rs.Api/PlaceDescriptionsState.cs | 1 + Gedcomx.Rs.Api/PlaceGroupState.cs | 1 + Gedcomx.Rs.Api/PlaceSearchResultsState.cs | 1 + Gedcomx.Rs.Api/RecordState.cs | 1 + Gedcomx.Rs.Api/RecordsState.cs | 1 + Gedcomx.Rs.Api/Rel.cs | 1 + Gedcomx.Rs.Api/RelationshipState.cs | 1 + Gedcomx.Rs.Api/RelationshipsState.cs | 1 + Gedcomx.Rs.Api/SourceDescriptionState.cs | 1 + Gedcomx.Rs.Api/SourceDescriptionsState.cs | 1 + Gedcomx.Rs.Api/StateFactory.cs | 1 + Gedcomx.Rs.Api/Util/AncestryTree.cs | 1 + Gedcomx.Rs.Api/Util/BasicDataSource.cs | 1 + Gedcomx.Rs.Api/Util/DescendancyTree.cs | 1 + Gedcomx.Rs.Api/Util/EmbeddedLinkLoader.cs | 1 + Gedcomx.Rs.Api/Util/FileDataSource.cs | 1 + Gedcomx.Rs.Api/Util/FilterableRestClient.cs | 1 + .../Util/GedcomxBaseSearchQueryBuilder.cs | 1 + .../Util/GedcomxPersonSearchQueryBuilder.cs | 1 + .../Util/GedcomxPlaceSearchQueryBuilder.cs | 1 + Gedcomx.Rs.Api/Util/HttpWarning.cs | 1 + .../Util/HypermediaEnabledDataExtensions.cs | 1 + Gedcomx.Rs.Api/Util/IDataSource.cs | 1 + Gedcomx.Rs.Api/Util/IFilter.cs | 1 + Gedcomx.Rs.Api/Util/IFilterableRestClient.cs | 1 + Gedcomx.Rs.Api/Util/LinkParserExtensions.cs | 1 + Gedcomx.Rs.Api/Util/Log4NetLoggingFilter.cs | 1 + Gedcomx.Rs.Api/Util/PagedFeedEnumerator.cs | 1 + Gedcomx.Rs.Api/Util/RdfExtensions.cs | 1 + .../Util/RedirectableRestRequest.cs | 1 + Gedcomx.Rs.Api/Util/RestClientExtensions.cs | 1 + Gedcomx.Rs.Api/Util/ServiceHelper.cs | 1 + Gedcomx.Rs.Api/Util/UriExtensions.cs | 1 + Gedcomx.Rs.Api/Util/UriTemplateExtensions.cs | 2 +- Gedcomx.Rs.Api/Util/VocabConstants.cs | 1 + Gedcomx.Rs.Api/VocabElementListState.cs | 1 + Gedcomx.Rs.Api/VocabElementState.cs | 1 + Gedcomx.Util/GedcomxIdDictionary.cs | 2 +- Gedcomx.Util/GedcomxModelVisitorBase.cs | 2 + Gedcomx.Util/IGedcomxModelVisitor.cs | 2 + Gedcomx.Util/RecordHelper.cs | 1 + 252 files changed, 668 insertions(+), 363 deletions(-) diff --git a/FamilySearch.Api/DiscussionState.cs b/FamilySearch.Api/DiscussionState.cs index bd597b4..5cf7982 100644 --- a/FamilySearch.Api/DiscussionState.cs +++ b/FamilySearch.Api/DiscussionState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/DiscussionsState.cs b/FamilySearch.Api/DiscussionsState.cs index 27ee185..46990f1 100644 --- a/FamilySearch.Api/DiscussionsState.cs +++ b/FamilySearch.Api/DiscussionsState.cs @@ -2,6 +2,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchCollectionState.cs b/FamilySearch.Api/FamilySearchCollectionState.cs index e629b84..2c7cb47 100644 --- a/FamilySearch.Api/FamilySearchCollectionState.cs +++ b/FamilySearch.Api/FamilySearchCollectionState.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchPlaceDescriptionState.cs b/FamilySearch.Api/FamilySearchPlaceDescriptionState.cs index d5d0c1d..a2046eb 100644 --- a/FamilySearch.Api/FamilySearchPlaceDescriptionState.cs +++ b/FamilySearch.Api/FamilySearchPlaceDescriptionState.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchPlaceState.cs b/FamilySearch.Api/FamilySearchPlaceState.cs index 891dc62..174ed71 100644 --- a/FamilySearch.Api/FamilySearchPlaceState.cs +++ b/FamilySearch.Api/FamilySearchPlaceState.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchPlaces.cs b/FamilySearch.Api/FamilySearchPlaces.cs index 1a551d7..d323237 100644 --- a/FamilySearch.Api/FamilySearchPlaces.cs +++ b/FamilySearch.Api/FamilySearchPlaces.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchSourceDescriptionState.cs b/FamilySearch.Api/FamilySearchSourceDescriptionState.cs index f18f4ab..9a07e60 100644 --- a/FamilySearch.Api/FamilySearchSourceDescriptionState.cs +++ b/FamilySearch.Api/FamilySearchSourceDescriptionState.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchStateFactory.cs b/FamilySearch.Api/FamilySearchStateFactory.cs index ef919a0..c43acc0 100644 --- a/FamilySearch.Api/FamilySearchStateFactory.cs +++ b/FamilySearch.Api/FamilySearchStateFactory.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/ChangeHistoryState.cs b/FamilySearch.Api/Ft/ChangeHistoryState.cs index 5144901..b6f08e2 100644 --- a/FamilySearch.Api/Ft/ChangeHistoryState.cs +++ b/FamilySearch.Api/Ft/ChangeHistoryState.cs @@ -2,6 +2,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/ChildAndParentsRelationshipState.cs b/FamilySearch.Api/Ft/ChildAndParentsRelationshipState.cs index 0a14483..ab83a8e 100644 --- a/FamilySearch.Api/Ft/ChildAndParentsRelationshipState.cs +++ b/FamilySearch.Api/Ft/ChildAndParentsRelationshipState.cs @@ -2,6 +2,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/FamilySearchFamilyTree.cs b/FamilySearch.Api/Ft/FamilySearchFamilyTree.cs index d3f47a9..57053c8 100644 --- a/FamilySearch.Api/Ft/FamilySearchFamilyTree.cs +++ b/FamilySearch.Api/Ft/FamilySearchFamilyTree.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/FamilyTreePersonChildrenState.cs b/FamilySearch.Api/Ft/FamilyTreePersonChildrenState.cs index 38e92ee..708b8d5 100644 --- a/FamilySearch.Api/Ft/FamilyTreePersonChildrenState.cs +++ b/FamilySearch.Api/Ft/FamilyTreePersonChildrenState.cs @@ -5,6 +5,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/FamilySearch.Api/Ft/FamilyTreePersonParentsState.cs b/FamilySearch.Api/Ft/FamilyTreePersonParentsState.cs index 8c8e5b6..af9cdf2 100644 --- a/FamilySearch.Api/Ft/FamilyTreePersonParentsState.cs +++ b/FamilySearch.Api/Ft/FamilyTreePersonParentsState.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/FamilyTreePersonState.cs b/FamilySearch.Api/Ft/FamilyTreePersonState.cs index 5bb1a72..ff29bad 100644 --- a/FamilySearch.Api/Ft/FamilyTreePersonState.cs +++ b/FamilySearch.Api/Ft/FamilyTreePersonState.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/FamilyTreeRelationshipState.cs b/FamilySearch.Api/Ft/FamilyTreeRelationshipState.cs index e6b3143..b19c812 100644 --- a/FamilySearch.Api/Ft/FamilyTreeRelationshipState.cs +++ b/FamilySearch.Api/Ft/FamilyTreeRelationshipState.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/FamilyTreeRelationshipsState.cs b/FamilySearch.Api/Ft/FamilyTreeRelationshipsState.cs index 4fe11d0..534be0a 100644 --- a/FamilySearch.Api/Ft/FamilyTreeRelationshipsState.cs +++ b/FamilySearch.Api/Ft/FamilyTreeRelationshipsState.cs @@ -3,6 +3,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/FamilySearch.Api/Ft/FamilyTreeStateFactory.cs b/FamilySearch.Api/Ft/FamilyTreeStateFactory.cs index 2c1f8c1..d71f912 100644 --- a/FamilySearch.Api/Ft/FamilyTreeStateFactory.cs +++ b/FamilySearch.Api/Ft/FamilyTreeStateFactory.cs @@ -2,6 +2,7 @@ using Gx.Rs.Api.Util; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Memories/FamilySearchMemories.cs b/FamilySearch.Api/Memories/FamilySearchMemories.cs index d49a758..a35eae5 100644 --- a/FamilySearch.Api/Memories/FamilySearchMemories.cs +++ b/FamilySearch.Api/Memories/FamilySearchMemories.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/PersonMatchResultsState.cs b/FamilySearch.Api/PersonMatchResultsState.cs index 8df4e06..aa031bb 100644 --- a/FamilySearch.Api/PersonMatchResultsState.cs +++ b/FamilySearch.Api/PersonMatchResultsState.cs @@ -2,6 +2,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/PersonMergeState.cs b/FamilySearch.Api/PersonMergeState.cs index 1400b14..7ac87da 100644 --- a/FamilySearch.Api/PersonMergeState.cs +++ b/FamilySearch.Api/PersonMergeState.cs @@ -2,6 +2,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/FamilySearch.Api/PersonNonMatchesState.cs b/FamilySearch.Api/PersonNonMatchesState.cs index 13f7928..bafbd1e 100644 --- a/FamilySearch.Api/PersonNonMatchesState.cs +++ b/FamilySearch.Api/PersonNonMatchesState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Rel.cs b/FamilySearch.Api/Rel.cs index 9798f6b..6aeaf20 100644 --- a/FamilySearch.Api/Rel.cs +++ b/FamilySearch.Api/Rel.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/UserHistoryState.cs b/FamilySearch.Api/UserHistoryState.cs index a83c4c8..6d63bc0 100644 --- a/FamilySearch.Api/UserHistoryState.cs +++ b/FamilySearch.Api/UserHistoryState.cs @@ -3,6 +3,7 @@ using Gx.Source; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/FamilySearch.Api/UserState.cs b/FamilySearch.Api/UserState.cs index 46c2943..9ce42be 100644 --- a/FamilySearch.Api/UserState.cs +++ b/FamilySearch.Api/UserState.cs @@ -2,6 +2,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/ChangeEntry.cs b/FamilySearch.Api/Util/ChangeEntry.cs index 48c1d41..8449559 100644 --- a/FamilySearch.Api/Util/ChangeEntry.cs +++ b/FamilySearch.Api/Util/ChangeEntry.cs @@ -3,6 +3,7 @@ using Gx.Fs.Rt; using Gx.Fs.Tree; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/ChangeHistoryPage.cs b/FamilySearch.Api/Util/ChangeHistoryPage.cs index a1f5f58..a7d6d09 100644 --- a/FamilySearch.Api/Util/ChangeHistoryPage.cs +++ b/FamilySearch.Api/Util/ChangeHistoryPage.cs @@ -1,6 +1,7 @@ using Gx.Atom; using Gx.Fs.Tree; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/ExperimentsFilter.cs b/FamilySearch.Api/Util/ExperimentsFilter.cs index 3511f42..b732340 100644 --- a/FamilySearch.Api/Util/ExperimentsFilter.cs +++ b/FamilySearch.Api/Util/ExperimentsFilter.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api.Util; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/FamilySearchOptions.cs b/FamilySearch.Api/Util/FamilySearchOptions.cs index 51441ab..9f0f8fb 100644 --- a/FamilySearch.Api/Util/FamilySearchOptions.cs +++ b/FamilySearch.Api/Util/FamilySearchOptions.cs @@ -5,6 +5,7 @@ using Gx.Rs.Api.Options; using Gx.Types; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/MergeAnalysisFilter.cs b/FamilySearch.Api/Util/MergeAnalysisFilter.cs index 5e5cb83..58323b0 100644 --- a/FamilySearch.Api/Util/MergeAnalysisFilter.cs +++ b/FamilySearch.Api/Util/MergeAnalysisFilter.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/RequestUtil.cs b/FamilySearch.Api/Util/RequestUtil.cs index 7f0a9d7..5603254 100644 --- a/FamilySearch.Api/Util/RequestUtil.cs +++ b/FamilySearch.Api/Util/RequestUtil.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/app.config b/FamilySearch.Api/app.config index 5089342..173e181 100644 --- a/FamilySearch.Api/app.config +++ b/FamilySearch.Api/app.config @@ -1,14 +1,14 @@ - + - - + + - - + + diff --git a/GEDCOM X Date/GedcomxDate.cs b/GEDCOM X Date/GedcomxDate.cs index 9695b88..dc15f46 100644 --- a/GEDCOM X Date/GedcomxDate.cs +++ b/GEDCOM X Date/GedcomxDate.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X Date/GedcomxDateApproximate.cs b/GEDCOM X Date/GedcomxDateApproximate.cs index 8a19e17..97a76cc 100644 --- a/GEDCOM X Date/GedcomxDateApproximate.cs +++ b/GEDCOM X Date/GedcomxDateApproximate.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X Date/GedcomxDateDuration.cs b/GEDCOM X Date/GedcomxDateDuration.cs index 4a92c67..cc223c3 100644 --- a/GEDCOM X Date/GedcomxDateDuration.cs +++ b/GEDCOM X Date/GedcomxDateDuration.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X Date/GedcomxDateException.cs b/GEDCOM X Date/GedcomxDateException.cs index a913860..0cadf24 100644 --- a/GEDCOM X Date/GedcomxDateException.cs +++ b/GEDCOM X Date/GedcomxDateException.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; diff --git a/GEDCOM X Date/GedcomxDateRange.cs b/GEDCOM X Date/GedcomxDateRange.cs index 0cc07e5..2ee8653 100644 --- a/GEDCOM X Date/GedcomxDateRange.cs +++ b/GEDCOM X Date/GedcomxDateRange.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X Date/GedcomxDateRecurring.cs b/GEDCOM X Date/GedcomxDateRecurring.cs index 4e97786..3cb4c34 100644 --- a/GEDCOM X Date/GedcomxDateRecurring.cs +++ b/GEDCOM X Date/GedcomxDateRecurring.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X Date/GedcomxDateSimple.cs b/GEDCOM X Date/GedcomxDateSimple.cs index a202d91..cb6241b 100644 --- a/GEDCOM X Date/GedcomxDateSimple.cs +++ b/GEDCOM X Date/GedcomxDateSimple.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Globalization; using System.Linq; diff --git a/GEDCOM X Date/GedcomxDateType.cs b/GEDCOM X Date/GedcomxDateType.cs index c0be38c..8dda66e 100644 --- a/GEDCOM X Date/GedcomxDateType.cs +++ b/GEDCOM X Date/GedcomxDateType.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X Date/GedcomxDateUtil.cs b/GEDCOM X Date/GedcomxDateUtil.cs index da1b60b..f90b9e3 100644 --- a/GEDCOM X Date/GedcomxDateUtil.cs +++ b/GEDCOM X Date/GedcomxDateUtil.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X File/DefaultJsonSerialization.cs b/GEDCOM X File/DefaultJsonSerialization.cs index e33ccef..be50ce0 100644 --- a/GEDCOM X File/DefaultJsonSerialization.cs +++ b/GEDCOM X File/DefaultJsonSerialization.cs @@ -1,6 +1,7 @@ using Gedcomx.Support; using Newtonsoft.Json; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/GEDCOM X File/DefaultXMLSerialization.cs b/GEDCOM X File/DefaultXMLSerialization.cs index 2bacba5..a8b564c 100644 --- a/GEDCOM X File/DefaultXMLSerialization.cs +++ b/GEDCOM X File/DefaultXMLSerialization.cs @@ -1,11 +1,11 @@ using Gedcomx.Support; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; using System.Xml; -using System.Xml.Serialization; namespace Gedcomx.File { diff --git a/GEDCOM X File/GedcomNamespaceManager.cs b/GEDCOM X File/GedcomNamespaceManager.cs index e8b9190..f337e24 100644 --- a/GEDCOM X File/GedcomNamespaceManager.cs +++ b/GEDCOM X File/GedcomNamespaceManager.cs @@ -1,8 +1,8 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; -using System.Xml.Serialization; namespace Gedcomx.File { diff --git a/GEDCOM X File/GedcomxFile.cs b/GEDCOM X File/GedcomxFile.cs index a9f73d7..e039add 100644 --- a/GEDCOM X File/GedcomxFile.cs +++ b/GEDCOM X File/GedcomxFile.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.IO.Compression; diff --git a/GEDCOM X File/GedcomxFileEntry.cs b/GEDCOM X File/GedcomxFileEntry.cs index c505180..734d445 100644 --- a/GEDCOM X File/GedcomxFileEntry.cs +++ b/GEDCOM X File/GedcomxFileEntry.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO.Compression; using System.Linq; diff --git a/GEDCOM X File/GedcomxOutputStream.cs b/GEDCOM X File/GedcomxOutputStream.cs index 823db66..b5e4676 100644 --- a/GEDCOM X File/GedcomxOutputStream.cs +++ b/GEDCOM X File/GedcomxOutputStream.cs @@ -1,5 +1,6 @@ using Gedcomx.Support; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.IO.Compression; diff --git a/GEDCOM X File/IGedcomxEntryDeserializer.cs b/GEDCOM X File/IGedcomxEntryDeserializer.cs index e33bee5..5fb91ba 100644 --- a/GEDCOM X File/IGedcomxEntryDeserializer.cs +++ b/GEDCOM X File/IGedcomxEntryDeserializer.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/GEDCOM X File/IGedcomxEntrySerializer.cs b/GEDCOM X File/IGedcomxEntrySerializer.cs index d72df26..8078919 100644 --- a/GEDCOM X File/IGedcomxEntrySerializer.cs +++ b/GEDCOM X File/IGedcomxEntrySerializer.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/GEDCOM X File/ManifestAttribute.cs b/GEDCOM X File/ManifestAttribute.cs index f712e63..70786ca 100644 --- a/GEDCOM X File/ManifestAttribute.cs +++ b/GEDCOM X File/ManifestAttribute.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X File/ManifestAttributes.cs b/GEDCOM X File/ManifestAttributes.cs index 751ff3a..17fe729 100644 --- a/GEDCOM X File/ManifestAttributes.cs +++ b/GEDCOM X File/ManifestAttributes.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.IO.Compression; diff --git a/GEDCOM X Support/MediaTypes.cs b/GEDCOM X Support/MediaTypes.cs index f8e5ea2..ea7d24c 100644 --- a/GEDCOM X Support/MediaTypes.cs +++ b/GEDCOM X Support/MediaTypes.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.CLI/RecordSetToCSV.cs b/Gedcomx.CLI/RecordSetToCSV.cs index 5be4cba..ed29054 100644 --- a/Gedcomx.CLI/RecordSetToCSV.cs +++ b/Gedcomx.CLI/RecordSetToCSV.cs @@ -1,4 +1,6 @@ using System; +using System.Xml.Serialization; +using System.Collections.Generic; using NDesk.Options; namespace Gx.CLI diff --git a/Gedcomx.CLI/RecordSetTransformer.cs b/Gedcomx.CLI/RecordSetTransformer.cs index 5ad2589..ee598ee 100644 --- a/Gedcomx.CLI/RecordSetTransformer.cs +++ b/Gedcomx.CLI/RecordSetTransformer.cs @@ -1,9 +1,9 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.Linq; using Gx.Records; -using System.Xml.Serialization; using Gx.Util; using System.Data; diff --git a/Gedcomx.Model.Fs/ArtifactMetadata.cs b/Gedcomx.Model.Fs/ArtifactMetadata.cs index 02754ff..505624b 100644 --- a/Gedcomx.Model.Fs/ArtifactMetadata.cs +++ b/Gedcomx.Model.Fs/ArtifactMetadata.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Artifacts { @@ -15,9 +17,9 @@ namespace Gx.Fs.Artifacts /// /// FamilySearch-specific metadata about an artifact. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "ArtifactMetadata")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "artifactMetadata")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "ArtifactMetadata")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "artifactMetadata")] public partial class ArtifactMetadata { diff --git a/Gedcomx.Model.Fs/ArtifactType.cs b/Gedcomx.Model.Fs/ArtifactType.cs index 6b36e65..42a2d9d 100644 --- a/Gedcomx.Model.Fs/ArtifactType.cs +++ b/Gedcomx.Model.Fs/ArtifactType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Artifacts { diff --git a/Gedcomx.Model.Fs/ChangeInfo.cs b/Gedcomx.Model.Fs/ChangeInfo.cs index df7313d..eff536b 100644 --- a/Gedcomx.Model.Fs/ChangeInfo.cs +++ b/Gedcomx.Model.Fs/ChangeInfo.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Tree { @@ -15,9 +17,9 @@ namespace Gx.Fs.Tree /// /// Information about a change. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "ChangeInfo")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "changeInfo")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "ChangeInfo")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "changeInfo")] public partial class ChangeInfo { diff --git a/Gedcomx.Model.Fs/ChangeObjectModifier.cs b/Gedcomx.Model.Fs/ChangeObjectModifier.cs index fb11ba9..564d46e 100644 --- a/Gedcomx.Model.Fs/ChangeObjectModifier.cs +++ b/Gedcomx.Model.Fs/ChangeObjectModifier.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Tree { diff --git a/Gedcomx.Model.Fs/ChangeObjectType.cs b/Gedcomx.Model.Fs/ChangeObjectType.cs index 3e22b07..654e086 100644 --- a/Gedcomx.Model.Fs/ChangeObjectType.cs +++ b/Gedcomx.Model.Fs/ChangeObjectType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Tree { diff --git a/Gedcomx.Model.Fs/ChangeOperation.cs b/Gedcomx.Model.Fs/ChangeOperation.cs index bf8f3c0..1f72fcc 100644 --- a/Gedcomx.Model.Fs/ChangeOperation.cs +++ b/Gedcomx.Model.Fs/ChangeOperation.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Tree { diff --git a/Gedcomx.Model.Fs/ChildAndParentsRelationship.cs b/Gedcomx.Model.Fs/ChildAndParentsRelationship.cs index d5bc0ba..790c5ac 100644 --- a/Gedcomx.Model.Fs/ChildAndParentsRelationship.cs +++ b/Gedcomx.Model.Fs/ChildAndParentsRelationship.cs @@ -7,6 +7,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Fs.Tree @@ -18,17 +19,17 @@ namespace Gx.Fs.Tree /// /// The FamilySearch-proprietary model for a relationship between a child and a pair of parents. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "ChildAndParentsRelationship")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "childAndParentsRelationship")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "ChildAndParentsRelationship")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "childAndParentsRelationship")] public partial class ChildAndParentsRelationship : Gx.Conclusion.Subject { private Gx.Common.ResourceReference _father; private Gx.Common.ResourceReference _mother; private Gx.Common.ResourceReference _child; - private System.Collections.Generic.List _fatherFacts; - private System.Collections.Generic.List _motherFacts; + private List _fatherFacts; + private List _motherFacts; /// /// The father of the child. /// @@ -82,7 +83,7 @@ public Gx.Common.ResourceReference Child /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "fatherFact", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("fatherFacts")] - public System.Collections.Generic.List FatherFacts + public List FatherFacts { get { @@ -98,7 +99,7 @@ public System.Collections.Generic.List FatherFacts /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "motherFact", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("motherFacts")] - public System.Collections.Generic.List MotherFacts + public List MotherFacts { get { diff --git a/Gedcomx.Model.Fs/Comment.cs b/Gedcomx.Model.Fs/Comment.cs index 1225bc5..e3ac586 100644 --- a/Gedcomx.Model.Fs/Comment.cs +++ b/Gedcomx.Model.Fs/Comment.cs @@ -7,6 +7,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Discussions { @@ -17,8 +19,8 @@ namespace Gx.Fs.Discussions /// /// /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "Comment")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "Comment")] public partial class Comment : Gx.Links.HypermediaEnabledData { diff --git a/Gedcomx.Model.Fs/Ct/MatchCollection.cs b/Gedcomx.Model.Fs/Ct/MatchCollection.cs index 4efb528..b07f3eb 100644 --- a/Gedcomx.Model.Fs/Ct/MatchCollection.cs +++ b/Gedcomx.Model.Fs/Ct/MatchCollection.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model.Fs/Discussion.cs b/Gedcomx.Model.Fs/Discussion.cs index 8a04cc9..61719ed 100644 --- a/Gedcomx.Model.Fs/Discussion.cs +++ b/Gedcomx.Model.Fs/Discussion.cs @@ -4,10 +4,11 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; using Gx.Fs; using Gx.Fs.Rt; using Gx.Common; -using System.Collections.Generic; using Gedcomx.Model.Util; namespace Gx.Fs.Discussions @@ -19,9 +20,9 @@ namespace Gx.Fs.Discussions /// /// A discussion. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "Discussion")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "discussion")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "Discussion")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "discussion")] public partial class Discussion : Gx.Links.HypermediaEnabledData { @@ -34,7 +35,7 @@ public partial class Discussion : Gx.Links.HypermediaEnabledData private bool _modifiedSpecified; private int? _numberOfComments; private bool _numberOfCommentsSpecified; - private System.Collections.Generic.List _comments; + private List _comments; /// /// the one-line summary text /// @@ -198,7 +199,7 @@ public bool NumberOfCommentsSpecified /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "comment", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("comments")] - public System.Collections.Generic.List Comments + public List Comments { get { diff --git a/Gedcomx.Model.Fs/Error.cs b/Gedcomx.Model.Fs/Error.cs index bca0ebe..faab851 100644 --- a/Gedcomx.Model.Fs/Error.cs +++ b/Gedcomx.Model.Fs/Error.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs { @@ -14,9 +16,9 @@ namespace Gx.Fs /// /// A common representation of an error on the FamilySearch platform. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "Error")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "error")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "Error")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "error")] public partial class Error { diff --git a/Gedcomx.Model.Fs/FamilySearchPlatform.cs b/Gedcomx.Model.Fs/FamilySearchPlatform.cs index 56f18f1..bac50b7 100644 --- a/Gedcomx.Model.Fs/FamilySearchPlatform.cs +++ b/Gedcomx.Model.Fs/FamilySearchPlatform.cs @@ -8,6 +8,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Fs @@ -23,9 +24,9 @@ namespace Gx.Fs /// data formats are extensions of the <a href="http://gedcomx.org">GEDCOM X</a> media types and provide concepts and data types /// that are specific to FamilySearch and therefore haven't been adopted into a formal, more general specification.</p> /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "FamilySearch")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "familysearch")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "FamilySearch")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "familysearch")] public partial class FamilySearchPlatform : Gx.Gedcomx { public static readonly String PROJECT_ID = "fs-platform"; @@ -33,18 +34,18 @@ public partial class FamilySearchPlatform : Gx.Gedcomx public static readonly String XML_MEDIA_TYPE = "application/x-fs-v1+xml"; public static readonly String JSON_MEDIA_TYPE = "application/x-fs-v1+json"; - private System.Collections.Generic.List _childAndParentsRelationships; - private System.Collections.Generic.List _discussions; - private System.Collections.Generic.List _users; - private System.Collections.Generic.List _merges; - private System.Collections.Generic.List _mergeAnalyses; - private System.Collections.Generic.List _features; + private List _childAndParentsRelationships; + private List _discussions; + private List _users; + private List _merges; + private List _mergeAnalyses; + private List _features; /// /// The child-and-parents relationships for this data set. /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "childAndParentsRelationship", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("childAndParentsRelationships")] - public System.Collections.Generic.List ChildAndParentsRelationships + public List ChildAndParentsRelationships { get { @@ -60,7 +61,7 @@ public System.Collections.Generic.List C /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "discussion", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("discussions")] - public System.Collections.Generic.List Discussions + public List Discussions { get { @@ -76,7 +77,7 @@ public System.Collections.Generic.List Discussions /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "user", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("users")] - public System.Collections.Generic.List Users + public List Users { get { @@ -92,7 +93,7 @@ public System.Collections.Generic.List Users /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "merge", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("merges")] - public System.Collections.Generic.List Merges + public List Merges { get { @@ -108,7 +109,7 @@ public System.Collections.Generic.List Merges /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "mergeAnalysis", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("mergeAnalyses")] - public System.Collections.Generic.List MergeAnalyses + public List MergeAnalyses { get { @@ -124,7 +125,7 @@ public System.Collections.Generic.List MergeAnalyses /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "feature", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("features")] - public System.Collections.Generic.List Features + public List Features { get { diff --git a/Gedcomx.Model.Fs/Feature.cs b/Gedcomx.Model.Fs/Feature.cs index 0ae3d5f..abf680f 100644 --- a/Gedcomx.Model.Fs/Feature.cs +++ b/Gedcomx.Model.Fs/Feature.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs { @@ -15,8 +17,8 @@ namespace Gx.Fs /// /// A description of a FamilySearch feature. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "FeatureSet")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "FeatureSet")] public partial class Feature { diff --git a/Gedcomx.Model.Fs/HealthConfig.cs b/Gedcomx.Model.Fs/HealthConfig.cs index 8f50a06..c70527a 100644 --- a/Gedcomx.Model.Fs/HealthConfig.cs +++ b/Gedcomx.Model.Fs/HealthConfig.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs { @@ -14,9 +16,9 @@ namespace Gx.Fs /// /// /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "HealthConfig")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "healthConfig")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "HealthConfig")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "healthConfig")] public partial class HealthConfig { diff --git a/Gedcomx.Model.Fs/MatchInfo.cs b/Gedcomx.Model.Fs/MatchInfo.cs index 5acc1d5..b4ddf27 100644 --- a/Gedcomx.Model.Fs/MatchInfo.cs +++ b/Gedcomx.Model.Fs/MatchInfo.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Tree { @@ -15,9 +17,9 @@ namespace Gx.Fs.Tree /// /// Information about a match. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "MatchInfo")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "matchInfo")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "MatchInfo")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "matchInfo")] public partial class MatchInfo { diff --git a/Gedcomx.Model.Fs/MatchResolution.cs b/Gedcomx.Model.Fs/MatchResolution.cs index 9dc0be6..ed0a9f9 100644 --- a/Gedcomx.Model.Fs/MatchResolution.cs +++ b/Gedcomx.Model.Fs/MatchResolution.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Tree { diff --git a/Gedcomx.Model.Fs/MatchSystem.cs b/Gedcomx.Model.Fs/MatchSystem.cs index c61a69b..ffaa77f 100644 --- a/Gedcomx.Model.Fs/MatchSystem.cs +++ b/Gedcomx.Model.Fs/MatchSystem.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Tree { diff --git a/Gedcomx.Model.Fs/Merge.cs b/Gedcomx.Model.Fs/Merge.cs index ec6d86e..a2a4b43 100644 --- a/Gedcomx.Model.Fs/Merge.cs +++ b/Gedcomx.Model.Fs/Merge.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Tree { @@ -15,20 +17,20 @@ namespace Gx.Fs.Tree /// /// /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "Merge")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "merge")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "Merge")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "merge")] public partial class Merge { - private System.Collections.Generic.List _resourcesToDelete; - private System.Collections.Generic.List _resourcesToCopy; + private List _resourcesToDelete; + private List _resourcesToCopy; /// /// List of resources to remove from the survivor person. /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "resourceToDelete", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("resourcesToDelete")] - public System.Collections.Generic.List ResourcesToDelete + public List ResourcesToDelete { get { @@ -44,7 +46,7 @@ public System.Collections.Generic.List ResourcesToD /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "resourceToCopy", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("resourcesToCopy")] - public System.Collections.Generic.List ResourcesToCopy + public List ResourcesToCopy { get { diff --git a/Gedcomx.Model.Fs/MergeAnalysis.cs b/Gedcomx.Model.Fs/MergeAnalysis.cs index b1d3a9a..b5ee29d 100644 --- a/Gedcomx.Model.Fs/MergeAnalysis.cs +++ b/Gedcomx.Model.Fs/MergeAnalysis.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Tree { @@ -15,15 +17,15 @@ namespace Gx.Fs.Tree /// /// /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "MergeAnalysis")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "mergeAnalysis")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "MergeAnalysis")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "mergeAnalysis")] public partial class MergeAnalysis { - private System.Collections.Generic.List _survivorResources; - private System.Collections.Generic.List _duplicateResources; - private System.Collections.Generic.List _conflictingResources; + private List _survivorResources; + private List _duplicateResources; + private List _conflictingResources; private Gx.Common.ResourceReference _survivor; private Gx.Common.ResourceReference _duplicate; /// @@ -31,7 +33,7 @@ public partial class MergeAnalysis /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "survivorResource", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("survivorResources")] - public System.Collections.Generic.List SurvivorResources + public List SurvivorResources { get { @@ -47,7 +49,7 @@ public System.Collections.Generic.List SurvivorReso /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "duplicateResource", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("duplicateResources")] - public System.Collections.Generic.List DuplicateResources + public List DuplicateResources { get { @@ -63,7 +65,7 @@ public System.Collections.Generic.List DuplicateRes /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "conflictingResource", Namespace = "http://familysearch.org/v1/")] [Newtonsoft.Json.JsonProperty("conflictingResources")] - public System.Collections.Generic.List ConflictingResources + public List ConflictingResources { get { diff --git a/Gedcomx.Model.Fs/MergeConflict.cs b/Gedcomx.Model.Fs/MergeConflict.cs index a9b2cce..e68babc 100644 --- a/Gedcomx.Model.Fs/MergeConflict.cs +++ b/Gedcomx.Model.Fs/MergeConflict.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; + namespace Gx.Fs.Tree { @@ -14,9 +16,9 @@ namespace Gx.Fs.Tree /// /// /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "MergeConflict")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "mergeConflict")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "MergeConflict")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "mergeConflict")] public partial class MergeConflict { diff --git a/Gedcomx.Model.Fs/Rt/FamilySearchPlatformLocalReferenceResolver.cs b/Gedcomx.Model.Fs/Rt/FamilySearchPlatformLocalReferenceResolver.cs index a843171..b5fc0bd 100644 --- a/Gedcomx.Model.Fs/Rt/FamilySearchPlatformLocalReferenceResolver.cs +++ b/Gedcomx.Model.Fs/Rt/FamilySearchPlatformLocalReferenceResolver.cs @@ -6,6 +6,7 @@ using Gx.Records; using Gx.Source; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model.Fs/Rt/FamilySearchPlatformModelVisitorBase.cs b/Gedcomx.Model.Fs/Rt/FamilySearchPlatformModelVisitorBase.cs index db6242a..c48a18a 100644 --- a/Gedcomx.Model.Fs/Rt/FamilySearchPlatformModelVisitorBase.cs +++ b/Gedcomx.Model.Fs/Rt/FamilySearchPlatformModelVisitorBase.cs @@ -4,6 +4,7 @@ using Gx.Fs.Tree; using Gx.Fs.Users; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model.Fs/Rt/IFamilySearchPlatformModelVisitor.cs b/Gedcomx.Model.Fs/Rt/IFamilySearchPlatformModelVisitor.cs index d838450..252d410 100644 --- a/Gedcomx.Model.Fs/Rt/IFamilySearchPlatformModelVisitor.cs +++ b/Gedcomx.Model.Fs/Rt/IFamilySearchPlatformModelVisitor.cs @@ -3,6 +3,7 @@ using Gx.Fs.Tree; using Gx.Fs.Users; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model.Fs/User.cs b/Gedcomx.Model.Fs/User.cs index 53b8e85..50a2de9 100644 --- a/Gedcomx.Model.Fs/User.cs +++ b/Gedcomx.Model.Fs/User.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Fs.Users { @@ -15,9 +17,9 @@ namespace Gx.Fs.Users /// /// Family Tree User Service User /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "User")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "user")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "User")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "user")] public partial class User : Gx.Links.HypermediaEnabledData { diff --git a/Gedcomx.Model.Rs/Category.cs b/Gedcomx.Model.Rs/Category.cs index 1c69b5c..1cf2682 100644 --- a/Gedcomx.Model.Rs/Category.cs +++ b/Gedcomx.Model.Rs/Category.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Atom { @@ -14,8 +16,8 @@ namespace Gx.Atom /// /// conveys information about a category associated with an entry or feed. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Category")] + [Serializable] + [XmlType(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Category")] public sealed partial class Category : Gx.Atom.CommonAttributes { diff --git a/Gedcomx.Model.Rs/CommonAttributes.cs b/Gedcomx.Model.Rs/CommonAttributes.cs index bb8d615..1b2553c 100644 --- a/Gedcomx.Model.Rs/CommonAttributes.cs +++ b/Gedcomx.Model.Rs/CommonAttributes.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Atom { @@ -14,8 +16,8 @@ namespace Gx.Atom /// /// /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://www.w3.org/2005/Atom", TypeName = "CommonAttributes")] + [Serializable] + [XmlType(Namespace = "http://www.w3.org/2005/Atom", TypeName = "CommonAttributes")] public abstract partial class CommonAttributes { diff --git a/Gedcomx.Model.Rs/Content.cs b/Gedcomx.Model.Rs/Content.cs index 4067282..b1ebd62 100644 --- a/Gedcomx.Model.Rs/Content.cs +++ b/Gedcomx.Model.Rs/Content.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Atom { @@ -14,8 +16,8 @@ namespace Gx.Atom /// /// /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Content")] + [Serializable] + [XmlType(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Content")] public sealed partial class Content { diff --git a/Gedcomx.Model.Rs/Entry.cs b/Gedcomx.Model.Rs/Entry.cs index e2aee22..f7a7391 100644 --- a/Gedcomx.Model.Rs/Entry.cs +++ b/Gedcomx.Model.Rs/Entry.cs @@ -7,6 +7,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using Gedcomx.Model.Util; @@ -20,19 +21,19 @@ namespace Gx.Atom /// /// The "atom:entry" element represents an individual entry, acting as a container for metadata and data associated with the entry. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Entry")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://www.w3.org/2005/Atom", ElementName = "entry")] + [Serializable] + [XmlType(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Entry")] + [XmlRoot(Namespace = "http://www.w3.org/2005/Atom", ElementName = "entry")] public partial class Entry : Gx.Atom.ExtensibleElement, ISupportsLinks { - private System.Collections.Generic.List _authors; - private System.Collections.Generic.List _categories; + private List _authors; + private List _categories; private Gx.Search.ResultConfidence _confidence; private Gx.Atom.Content _content; - private System.Collections.Generic.List _contributors; + private List _contributors; private string _id; - private System.Collections.Generic.List _links; + private List _links; private DateTime? _published; private bool _publishedSpecified; private string _rights; @@ -47,7 +48,7 @@ public partial class Entry : Gx.Atom.ExtensibleElement, ISupportsLinks /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "author", Namespace = "http://www.w3.org/2005/Atom")] [Newtonsoft.Json.JsonProperty("authors")] - public System.Collections.Generic.List Authors + public List Authors { get { @@ -63,7 +64,7 @@ public System.Collections.Generic.List Authors /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "category", Namespace = "http://www.w3.org/2005/Atom")] [Newtonsoft.Json.JsonProperty("categories")] - public System.Collections.Generic.List Categories + public List Categories { get { @@ -132,7 +133,7 @@ public Gx.Atom.Content Content /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "contributor", Namespace = "http://www.w3.org/2005/Atom")] [Newtonsoft.Json.JsonProperty("contributors")] - public System.Collections.Generic.List Contributors + public List Contributors { get { @@ -165,7 +166,7 @@ public string Id [System.Xml.Serialization.XmlElementAttribute(ElementName = "link", Namespace = "http://www.w3.org/2005/Atom")] [Newtonsoft.Json.JsonProperty("links")] [JsonConverter(typeof(JsonHypermediaLinksConverter))] - public System.Collections.Generic.List Links + public List Links { get { diff --git a/Gedcomx.Model.Rs/ExtensibleElement.cs b/Gedcomx.Model.Rs/ExtensibleElement.cs index b4993ef..9d3c8cf 100644 --- a/Gedcomx.Model.Rs/ExtensibleElement.cs +++ b/Gedcomx.Model.Rs/ExtensibleElement.cs @@ -5,6 +5,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Atom @@ -16,8 +17,8 @@ namespace Gx.Atom /// /// /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://www.w3.org/2005/Atom", TypeName = "ExtensibleElement")] + [Serializable] + [XmlType(Namespace = "http://www.w3.org/2005/Atom", TypeName = "ExtensibleElement")] public abstract partial class ExtensibleElement : Gx.Atom.CommonAttributes { diff --git a/Gedcomx.Model.Rs/Feed.cs b/Gedcomx.Model.Rs/Feed.cs index 693240f..ec54b31 100644 --- a/Gedcomx.Model.Rs/Feed.cs +++ b/Gedcomx.Model.Rs/Feed.cs @@ -7,6 +7,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using Gedcomx.Model.Util; @@ -24,14 +25,14 @@ namespace Gx.Atom /// <a href="http://tools.ietf.org/html/rfc4287#section-4">RFC 4287</a>. The JSON data format is specific to GEDCOM X and is a /// translation to JSON from the XML.</p> /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Feed")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://www.w3.org/2005/Atom", ElementName = "feed")] + [Serializable] + [XmlType(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Feed")] + [XmlRoot(Namespace = "http://www.w3.org/2005/Atom", ElementName = "feed")] public partial class Feed : Gx.Atom.ExtensibleElement, ISupportsLinks { - private System.Collections.Generic.List _authors; - private System.Collections.Generic.List _contributors; + private List _authors; + private List _contributors; private Gx.Atom.Generator _generator; private string _icon; private string _id; @@ -39,21 +40,21 @@ public partial class Feed : Gx.Atom.ExtensibleElement, ISupportsLinks private bool _resultsSpecified; private int? _index; private bool _indexSpecified; - private System.Collections.Generic.List _links; + private List _links; private string _logo; private string _rights; private string _subtitle; private string _title; private DateTime? _updated; private bool _updatedSpecified; - private System.Collections.Generic.List _entries; - private System.Collections.Generic.List _facets; + private List _entries; + private List _facets; /// /// The author of the feed. /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "author", Namespace = "http://www.w3.org/2005/Atom")] [Newtonsoft.Json.JsonProperty("authors")] - public System.Collections.Generic.List Authors + public List Authors { get { @@ -69,7 +70,7 @@ public System.Collections.Generic.List Authors /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "contributor", Namespace = "http://www.w3.org/2005/Atom")] [Newtonsoft.Json.JsonProperty("contributors")] - public System.Collections.Generic.List Contributors + public List Contributors { get { @@ -206,7 +207,7 @@ public bool IndexSpecified [System.Xml.Serialization.XmlElementAttribute(ElementName = "link", Namespace = "http://www.w3.org/2005/Atom")] [Newtonsoft.Json.JsonProperty("links")] [JsonConverter(typeof(JsonHypermediaLinksConverter))] - public System.Collections.Generic.List Links + public List Links { get { @@ -323,7 +324,7 @@ public bool UpdatedSpecified /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "entry", Namespace = "http://www.w3.org/2005/Atom")] [Newtonsoft.Json.JsonProperty("entries")] - public System.Collections.Generic.List Entries + public List Entries { get { @@ -339,7 +340,7 @@ public System.Collections.Generic.List Entries /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "facet", Namespace = "http://www.w3.org/2005/Atom")] [Newtonsoft.Json.JsonProperty("facets")] - public System.Collections.Generic.List Facets + public List Facets { get { diff --git a/Gedcomx.Model.Rs/Generator.cs b/Gedcomx.Model.Rs/Generator.cs index fe3459f..75091c5 100644 --- a/Gedcomx.Model.Rs/Generator.cs +++ b/Gedcomx.Model.Rs/Generator.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Atom { @@ -14,8 +16,8 @@ namespace Gx.Atom /// /// identifies the agent used to generate a feed, for debugging and other purposes. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Generator")] + [Serializable] + [XmlType(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Generator")] public sealed partial class Generator { diff --git a/Gedcomx.Model.Rs/Person.cs b/Gedcomx.Model.Rs/Person.cs index 95921f3..e8b0046 100644 --- a/Gedcomx.Model.Rs/Person.cs +++ b/Gedcomx.Model.Rs/Person.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Atom { @@ -14,8 +16,8 @@ namespace Gx.Atom /// /// A Person construct is an element that describes a person, corporation, or similar entity /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Person")] + [Serializable] + [XmlType(Namespace = "http://www.w3.org/2005/Atom", TypeName = "Person")] public sealed partial class Person : Gx.Atom.ExtensibleElement { diff --git a/Gedcomx.Model.Rs/ResultConfidence.cs b/Gedcomx.Model.Rs/ResultConfidence.cs index 2ff8222..7121713 100644 --- a/Gedcomx.Model.Rs/ResultConfidence.cs +++ b/Gedcomx.Model.Rs/ResultConfidence.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Search { diff --git a/Gedcomx.Model/Address.cs b/Gedcomx.Model/Address.cs index 434b20f..5478cd9 100644 --- a/Gedcomx.Model/Address.cs +++ b/Gedcomx.Model/Address.cs @@ -4,6 +4,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; namespace Gx.Agent { @@ -14,8 +15,8 @@ namespace Gx.Agent /// /// An address. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Address")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Address")] [Newtonsoft.Json.JsonObject("")] public partial class Address : Gx.Common.ExtensibleData { diff --git a/Gedcomx.Model/Agent.cs b/Gedcomx.Model/Agent.cs index 4f9ac66..acaac5e 100644 --- a/Gedcomx.Model/Agent.cs +++ b/Gedcomx.Model/Agent.cs @@ -9,6 +9,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Agent @@ -22,25 +23,25 @@ namespace Gx.Agent /// An agent, e.g. person, organization, or group. In genealogical research, an agent often /// takes the role of a contributor. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Agent")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "agent")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Agent")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "agent")] public partial class Agent : Gx.Links.HypermediaEnabledData { - private System.Collections.Generic.List _accounts; - private System.Collections.Generic.List _addresses; - private System.Collections.Generic.List _emails; + private List _accounts; + private List _addresses; + private List _emails; private Gx.Common.ResourceReference _homepage; - private System.Collections.Generic.List _identifiers; - private System.Collections.Generic.List _names; + private List _identifiers; + private List _names; private Gx.Common.ResourceReference _openid; - private System.Collections.Generic.List _phones; + private List _phones; /// /// The accounts that belong to this person or organization. /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "account", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("accounts")] - public System.Collections.Generic.List Accounts + public List Accounts { get { @@ -56,7 +57,7 @@ public System.Collections.Generic.List Accounts /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "address", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("addresses")] - public System.Collections.Generic.List Addresses + public List Addresses { get { @@ -72,7 +73,7 @@ public System.Collections.Generic.List Addresses /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "email", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("emails")] - public System.Collections.Generic.List Emails + public List Emails { get { @@ -105,7 +106,7 @@ public Gx.Common.ResourceReference Homepage [System.Xml.Serialization.XmlElementAttribute(ElementName = "identifier", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("identifiers")] [JsonConverter(typeof(JsonIdentifiersConverter))] - public System.Collections.Generic.List Identifiers + public List Identifiers { get { @@ -121,7 +122,7 @@ public System.Collections.Generic.List Identifiers /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("names")] - public System.Collections.Generic.List Names + public List Names { get { @@ -153,7 +154,7 @@ public Gx.Common.ResourceReference Openid /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "phone", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("phones")] - public System.Collections.Generic.List Phones + public List Phones { get { diff --git a/Gedcomx.Model/Attribution.cs b/Gedcomx.Model/Attribution.cs index b2e5cda..091043a 100644 --- a/Gedcomx.Model/Attribution.cs +++ b/Gedcomx.Model/Attribution.cs @@ -6,6 +6,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; namespace Gx.Common { @@ -20,9 +21,9 @@ namespace Gx.Common /// information, <strong>when</strong> they contributed it, and <strong>why</strong> they are making the /// contribution/modification. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Attribution")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "attribution")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Attribution")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "attribution")] public sealed partial class Attribution : Gx.Common.ExtensibleData { diff --git a/Gedcomx.Model/CitationField.cs b/Gedcomx.Model/CitationField.cs index d4194dc..d657594 100644 --- a/Gedcomx.Model/CitationField.cs +++ b/Gedcomx.Model/CitationField.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Source { @@ -14,8 +16,8 @@ namespace Gx.Source /// /// Represents a citation field -- its name and value. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "CitationField")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "CitationField")] public partial class CitationField { diff --git a/Gedcomx.Model/Collection.cs b/Gedcomx.Model/Collection.cs index f882798..8ca8c6d 100644 --- a/Gedcomx.Model/Collection.cs +++ b/Gedcomx.Model/Collection.cs @@ -6,6 +6,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Records @@ -17,9 +18,9 @@ namespace Gx.Records /// /// A collection of genealogical resources. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Collection")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "collection")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Collection")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "collection")] public partial class Collection : Gx.Links.HypermediaEnabledData, IAttributable { @@ -27,7 +28,7 @@ public partial class Collection : Gx.Links.HypermediaEnabledData, IAttributable private string _title; private int? _size; private bool _sizeSpecified; - private System.Collections.Generic.List _content; + private List _content; private Gx.Common.Attribution _attribution; /// /// The language of this description of the collection @@ -102,7 +103,7 @@ public bool SizeSpecified /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "content", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("content")] - public System.Collections.Generic.List Content + public List Content { get { diff --git a/Gedcomx.Model/CollectionContent.cs b/Gedcomx.Model/CollectionContent.cs index 9b8a606..7a9675d 100644 --- a/Gedcomx.Model/CollectionContent.cs +++ b/Gedcomx.Model/CollectionContent.cs @@ -6,6 +6,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Records { @@ -16,9 +18,9 @@ namespace Gx.Records /// /// A description of the content of a collection by resource type. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "CollectionContent")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "collectionContent")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "CollectionContent")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "collectionContent")] public partial class CollectionContent : Gx.Links.HypermediaEnabledData { diff --git a/Gedcomx.Model/Conclusion.cs b/Gedcomx.Model/Conclusion.cs index c1e475f..12a9fa3 100644 --- a/Gedcomx.Model/Conclusion.cs +++ b/Gedcomx.Model/Conclusion.cs @@ -8,6 +8,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -19,17 +20,17 @@ namespace Gx.Conclusion /// /// A genealogical conclusion. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Conclusion")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Conclusion")] public abstract partial class Conclusion : Gx.Links.HypermediaEnabledData, IAttributable { private string _confidence; private string _sortKey; private string _lang; private Gx.Common.Attribution _attribution; - private System.Collections.Generic.List _sources; + private List _sources; private Gx.Common.ResourceReference _analysis; - private System.Collections.Generic.List _notes; + private List _notes; /// /// The level of confidence the contributor has about the data. /// @@ -116,7 +117,7 @@ public Gx.Common.Attribution Attribution /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "source", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("sources")] - public System.Collections.Generic.List Sources + public List Sources { get { @@ -148,7 +149,7 @@ public Gx.Common.ResourceReference Analysis /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "note", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("notes")] - public System.Collections.Generic.List Notes + public List Notes { get { diff --git a/Gedcomx.Model/ConfidenceLevel.cs b/Gedcomx.Model/ConfidenceLevel.cs index 686cd1f..43805b6 100644 --- a/Gedcomx.Model/ConfidenceLevel.cs +++ b/Gedcomx.Model/ConfidenceLevel.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/Coverage.cs b/Gedcomx.Model/Coverage.cs index e1f6374..73babe2 100644 --- a/Gedcomx.Model/Coverage.cs +++ b/Gedcomx.Model/Coverage.cs @@ -7,6 +7,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Source { @@ -17,9 +19,9 @@ namespace Gx.Source /// /// A description of the coverage of a resource. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Coverage")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "coverage")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Coverage")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "coverage")] public partial class Coverage : Gx.Links.HypermediaEnabledData { diff --git a/Gedcomx.Model/DateInfo.cs b/Gedcomx.Model/DateInfo.cs index 1cb673c..226efb1 100644 --- a/Gedcomx.Model/DateInfo.cs +++ b/Gedcomx.Model/DateInfo.cs @@ -7,6 +7,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -18,15 +19,15 @@ namespace Gx.Conclusion /// /// A concluded genealogical date. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Date")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Date")] public partial class DateInfo : Gx.Common.ExtensibleData { private string _original; private string _formal; - private System.Collections.Generic.List _normalizedExtensions; - private System.Collections.Generic.List _fields; + private List _normalizedExtensions; + private List _fields; /// /// The original text as supplied by the user. /// @@ -65,7 +66,7 @@ public string Formal /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "normalized", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("normalized")] - public System.Collections.Generic.List NormalizedExtensions + public List NormalizedExtensions { get { @@ -81,7 +82,7 @@ public System.Collections.Generic.List NormalizedExtensions /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { diff --git a/Gedcomx.Model/DiscussionReference.cs b/Gedcomx.Model/DiscussionReference.cs index 242f6e5..8b72f39 100644 --- a/Gedcomx.Model/DiscussionReference.cs +++ b/Gedcomx.Model/DiscussionReference.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Source { @@ -16,9 +18,9 @@ namespace Gx.Source /// /// // TODO: Create attribute equivalent to JsonWrapper (for each call to FindExtensionsOfType() and FindExtensionOfType()) - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "DiscussionReference")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "discussion-reference")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "DiscussionReference")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "discussion-reference")] public sealed partial class DiscussionReference : Gx.Links.HypermediaEnabledData { diff --git a/Gedcomx.Model/DisplayProperties.cs b/Gedcomx.Model/DisplayProperties.cs index d98901f..bf68b83 100644 --- a/Gedcomx.Model/DisplayProperties.cs +++ b/Gedcomx.Model/DisplayProperties.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Conclusion { @@ -19,8 +21,8 @@ namespace Gx.Conclusion /// a Web-based application. All display properties are provided in the default locale for the current /// application context and are NOT considered canonical for the purposes of data exchange. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "DisplayProperties")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "DisplayProperties")] public partial class DisplayProperties : Gx.Common.ExtensibleData { diff --git a/Gedcomx.Model/Document.cs b/Gedcomx.Model/Document.cs index 778221d..f3a1d11 100644 --- a/Gedcomx.Model/Document.cs +++ b/Gedcomx.Model/Document.cs @@ -8,6 +8,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Conclusion { @@ -18,9 +20,9 @@ namespace Gx.Conclusion /// /// An abstract document that contains derived (conclusionary) text -- for example, a transcription or researcher analysis. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Document")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "document")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Document")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "document")] [Newtonsoft.Json.JsonObject("documents")] public partial class Document : Gx.Conclusion.Conclusion, IAttributable { diff --git a/Gedcomx.Model/DocumentType.cs b/Gedcomx.Model/DocumentType.cs index bfbf340..ed408cd 100644 --- a/Gedcomx.Model/DocumentType.cs +++ b/Gedcomx.Model/DocumentType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/Event.cs b/Gedcomx.Model/Event.cs index 9976a41..569d83d 100644 --- a/Gedcomx.Model/Event.cs +++ b/Gedcomx.Model/Event.cs @@ -6,6 +6,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -17,16 +18,16 @@ namespace Gx.Conclusion /// /// A historical event. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Event")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "event")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Event")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "event")] [Newtonsoft.Json.JsonObject("events")] public partial class Event : Gx.Conclusion.Subject { private string _type; private Gx.Conclusion.DateInfo _date; private Gx.Conclusion.PlaceReference _place; - private System.Collections.Generic.List _roles; + private List _roles; /** * Create an event. @@ -129,7 +130,7 @@ public Gx.Conclusion.PlaceReference Place /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "role", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("roles")] - public System.Collections.Generic.List Roles + public List Roles { get { diff --git a/Gedcomx.Model/EventRole.cs b/Gedcomx.Model/EventRole.cs index 483b9e9..fcac50c 100644 --- a/Gedcomx.Model/EventRole.cs +++ b/Gedcomx.Model/EventRole.cs @@ -8,6 +8,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Conclusion { @@ -18,8 +20,8 @@ namespace Gx.Conclusion /// /// A role that a specific person plays in an event. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "EventRole")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "EventRole")] public partial class EventRole : Gx.Conclusion.Conclusion { diff --git a/Gedcomx.Model/EventRoleType.cs b/Gedcomx.Model/EventRoleType.cs index a939101..d1f7f17 100644 --- a/Gedcomx.Model/EventRoleType.cs +++ b/Gedcomx.Model/EventRoleType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/EventType.cs b/Gedcomx.Model/EventType.cs index 1ee05bc..ec534d8 100644 --- a/Gedcomx.Model/EventType.cs +++ b/Gedcomx.Model/EventType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/EvidenceReference.cs b/Gedcomx.Model/EvidenceReference.cs index f1ef8d7..4488193 100644 --- a/Gedcomx.Model/EvidenceReference.cs +++ b/Gedcomx.Model/EvidenceReference.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Common { @@ -15,9 +17,9 @@ namespace Gx.Common /// /// A reference to a resource that is being used as evidence. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "EvidenceReference")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "evidenceReference")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "EvidenceReference")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "evidenceReference")] public sealed partial class EvidenceReference : Gx.Links.HypermediaEnabledData, IAttributable { private string _resourceId; diff --git a/Gedcomx.Model/ExtensibleData.cs b/Gedcomx.Model/ExtensibleData.cs index 2489f51..a9425da 100644 --- a/Gedcomx.Model/ExtensibleData.cs +++ b/Gedcomx.Model/ExtensibleData.cs @@ -5,6 +5,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; @@ -17,8 +18,8 @@ namespace Gx.Common /// /// A set of data that supports extension elements. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "ExtensibleData")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "ExtensibleData")] public abstract partial class ExtensibleData { private string _id; diff --git a/Gedcomx.Model/Facet.cs b/Gedcomx.Model/Facet.cs index b50284b..16d5548 100644 --- a/Gedcomx.Model/Facet.cs +++ b/Gedcomx.Model/Facet.cs @@ -6,6 +6,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Records { @@ -16,16 +18,16 @@ namespace Gx.Records /// /// <p>A <tt>facet</tt> is a logical grouping of resources by specific criteria, used for convenience in browsing a collection or a set of search results.</p> /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Facet")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Facet")] public partial class Facet : Gx.Links.HypermediaEnabledData { private string _type; private string _title; private string _key; - private System.Collections.Generic.List _facets; - private System.Collections.Generic.List _values; + private List _facets; + private List _values; /// /// The type of the facet. /// @@ -96,7 +98,7 @@ public string Key /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "facet", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("facets")] - public System.Collections.Generic.List Facets + public List Facets { get { @@ -112,7 +114,7 @@ public System.Collections.Generic.List Facets /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("values")] - public System.Collections.Generic.List Values + public List Values { get { diff --git a/Gedcomx.Model/FacetType.cs b/Gedcomx.Model/FacetType.cs index 66358ea..f08bf76 100644 --- a/Gedcomx.Model/FacetType.cs +++ b/Gedcomx.Model/FacetType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/FacetValue.cs b/Gedcomx.Model/FacetValue.cs index 74bd757..7b62c87 100644 --- a/Gedcomx.Model/FacetValue.cs +++ b/Gedcomx.Model/FacetValue.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Records { @@ -14,8 +16,8 @@ namespace Gx.Records /// /// <p>A facet value is the value that is used by a facet to group related resources.</p> /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "FacetValue")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "FacetValue")] public partial class FacetValue : Gx.Links.HypermediaEnabledData { diff --git a/Gedcomx.Model/Fact.cs b/Gedcomx.Model/Fact.cs index 6ec0fcc..dfcb7ad 100644 --- a/Gedcomx.Model/Fact.cs +++ b/Gedcomx.Model/Fact.cs @@ -9,6 +9,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -19,9 +20,9 @@ namespace Gx.Conclusion /// /// A conclusion about a fact applicable to a person or relationship. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Fact")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "fact")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Fact")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "fact")] public partial class Fact : Gx.Conclusion.Conclusion { private bool? _primary; @@ -30,8 +31,8 @@ public partial class Fact : Gx.Conclusion.Conclusion private Gx.Conclusion.DateInfo _date; private Gx.Conclusion.PlaceReference _place; private string _value; - private System.Collections.Generic.List _qualifiers; - private System.Collections.Generic.List _fields; + private List _qualifiers; + private List _fields; public Fact() { @@ -183,7 +184,7 @@ public string Value /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "qualifier", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("qualifiers")] - public System.Collections.Generic.List Qualifiers + public List Qualifiers { get { @@ -199,7 +200,7 @@ public System.Collections.Generic.List Qualifiers /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { diff --git a/Gedcomx.Model/FactQualifierType.cs b/Gedcomx.Model/FactQualifierType.cs index 5bce1fc..26474a9 100644 --- a/Gedcomx.Model/FactQualifierType.cs +++ b/Gedcomx.Model/FactQualifierType.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/FactType.cs b/Gedcomx.Model/FactType.cs index 0c8a0f3..ab1a3bc 100644 --- a/Gedcomx.Model/FactType.cs +++ b/Gedcomx.Model/FactType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/Field.cs b/Gedcomx.Model/Field.cs index b707a76..6a2499b 100644 --- a/Gedcomx.Model/Field.cs +++ b/Gedcomx.Model/Field.cs @@ -7,6 +7,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Records @@ -18,13 +19,13 @@ namespace Gx.Records /// /// A field of a record. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Field")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Field")] public partial class Field : Gx.Links.HypermediaEnabledData { private string _type; - private System.Collections.Generic.List _values; + private List _values; /// /// The type of the gender. /// @@ -63,7 +64,7 @@ public Gx.Types.FieldType KnownType /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("values")] - public System.Collections.Generic.List Values + public List Values { get { diff --git a/Gedcomx.Model/FieldDescriptor.cs b/Gedcomx.Model/FieldDescriptor.cs index 617d190..2538c25 100644 --- a/Gedcomx.Model/FieldDescriptor.cs +++ b/Gedcomx.Model/FieldDescriptor.cs @@ -5,6 +5,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Records @@ -16,14 +17,14 @@ namespace Gx.Records /// /// A description of a field in a record. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "FieldDescriptor")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "FieldDescriptor")] public partial class FieldDescriptor : Gx.Links.HypermediaEnabledData { private string _originalLabel; - private System.Collections.Generic.List _descriptions; - private System.Collections.Generic.List _values; + private List _descriptions; + private List _values; /// /// The original label for the field, as stated on the original record. /// @@ -45,7 +46,7 @@ public string OriginalLabel /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "description", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("descriptions")] - public System.Collections.Generic.List Descriptions + public List Descriptions { get { @@ -61,7 +62,7 @@ public System.Collections.Generic.List Descriptions /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("values")] - public System.Collections.Generic.List Values + public List Values { get { diff --git a/Gedcomx.Model/FieldType.cs b/Gedcomx.Model/FieldType.cs index 6d259f5..1d84a92 100644 --- a/Gedcomx.Model/FieldType.cs +++ b/Gedcomx.Model/FieldType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/FieldValue.cs b/Gedcomx.Model/FieldValue.cs index b2b2a13..4b62fa9 100644 --- a/Gedcomx.Model/FieldValue.cs +++ b/Gedcomx.Model/FieldValue.cs @@ -7,6 +7,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Records { @@ -17,8 +19,8 @@ namespace Gx.Records /// /// An element representing a value in a record field. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "FieldValue")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "FieldValue")] public sealed partial class FieldValue : Gx.Conclusion.Conclusion { diff --git a/Gedcomx.Model/FieldValueDescriptor.cs b/Gedcomx.Model/FieldValueDescriptor.cs index 07ca64c..12109c9 100644 --- a/Gedcomx.Model/FieldValueDescriptor.cs +++ b/Gedcomx.Model/FieldValueDescriptor.cs @@ -6,6 +6,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Records { @@ -16,8 +18,8 @@ namespace Gx.Records /// /// A way a field is to be displayed to a user. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "FieldValueDescriptor")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "FieldValueDescriptor")] public partial class FieldValueDescriptor : Gx.Links.HypermediaEnabledData { @@ -25,7 +27,7 @@ public partial class FieldValueDescriptor : Gx.Links.HypermediaEnabledData private bool _optionalSpecified; private string _type; private string _labelId; - private System.Collections.Generic.List _displayLabels; + private List _displayLabels; /// /// Whether the treatment of the field value is optional. Used to determine whether it should be displayed even if the value is empty. /// @@ -116,7 +118,7 @@ public string LabelId /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "label", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("labels")] - public System.Collections.Generic.List DisplayLabels + public List DisplayLabels { get { diff --git a/Gedcomx.Model/FieldValueType.cs b/Gedcomx.Model/FieldValueType.cs index 6bf933d..954dd70 100644 --- a/Gedcomx.Model/FieldValueType.cs +++ b/Gedcomx.Model/FieldValueType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/Gedcomx.cs b/Gedcomx.Model/Gedcomx.cs index cc6d63d..86943ed 100644 --- a/Gedcomx.Model/Gedcomx.cs +++ b/Gedcomx.Model/Gedcomx.cs @@ -10,6 +10,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx @@ -39,9 +40,9 @@ namespace Gx /// /// <p>This documentation is provided as a non-normative reference guide.</p> /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Gedcomx")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "gedcomx")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Gedcomx")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "gedcomx")] public partial class Gedcomx : Gx.Links.HypermediaEnabledData { @@ -49,16 +50,16 @@ public partial class Gedcomx : Gx.Links.HypermediaEnabledData private string _descriptionRef; private string _profile; private Gx.Common.Attribution _attribution; - private System.Collections.Generic.List _persons; - private System.Collections.Generic.List _relationships; - private System.Collections.Generic.List _sourceDescriptions; - private System.Collections.Generic.List _agents; - private System.Collections.Generic.List _events; - private System.Collections.Generic.List _places; - private System.Collections.Generic.List _documents; - private System.Collections.Generic.List _collections; - private System.Collections.Generic.List _fields; - private System.Collections.Generic.List _recordDescriptors; + private List _persons; + private List _relationships; + private List _sourceDescriptions; + private List _agents; + private List _events; + private List _places; + private List _documents; + private List _collections; + private List _fields; + private List _recordDescriptors; /// /// The language of the genealogical data. /// @@ -128,7 +129,7 @@ public Gx.Common.Attribution Attribution /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "person", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("persons")] - public System.Collections.Generic.List Persons + public List Persons { get { @@ -144,7 +145,7 @@ public System.Collections.Generic.List Persons /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "relationship", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("relationships")] - public System.Collections.Generic.List Relationships + public List Relationships { get { @@ -160,7 +161,7 @@ public System.Collections.Generic.List Relationships /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "sourceDescription", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("sourceDescriptions")] - public System.Collections.Generic.List SourceDescriptions + public List SourceDescriptions { get { @@ -176,7 +177,7 @@ public System.Collections.Generic.List SourceDescri /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "agent", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("agents")] - public System.Collections.Generic.List Agents + public List Agents { get { @@ -192,7 +193,7 @@ public System.Collections.Generic.List Agents /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "event", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("events")] - public System.Collections.Generic.List Events + public List Events { get { @@ -208,7 +209,7 @@ public System.Collections.Generic.List Events /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "place", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("places")] - public System.Collections.Generic.List Places + public List Places { get { @@ -224,7 +225,7 @@ public System.Collections.Generic.List Places /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "document", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("documents")] - public System.Collections.Generic.List Documents + public List Documents { get { @@ -240,7 +241,7 @@ public System.Collections.Generic.List Documents /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "collection", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("collections")] - public System.Collections.Generic.List Collections + public List Collections { get { @@ -256,7 +257,7 @@ public System.Collections.Generic.List Collections /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { @@ -272,7 +273,7 @@ public System.Collections.Generic.List Fields /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "recordDescriptor", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("recordDescriptors")] - public System.Collections.Generic.List RecordDescriptors + public List RecordDescriptors { get { diff --git a/Gedcomx.Model/Gender.cs b/Gedcomx.Model/Gender.cs index 751c1fa..863f7f1 100644 --- a/Gedcomx.Model/Gender.cs +++ b/Gedcomx.Model/Gender.cs @@ -8,6 +8,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -19,13 +20,13 @@ namespace Gx.Conclusion /// /// A gender conclusion. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Gender")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "gender")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Gender")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "gender")] public partial class Gender : Gx.Conclusion.Conclusion { private string _type; - private System.Collections.Generic.List _fields; + private List _fields; public Gender() { @@ -74,7 +75,7 @@ public Gx.Types.GenderType KnownType /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { diff --git a/Gedcomx.Model/GenderType.cs b/Gedcomx.Model/GenderType.cs index fc0f215..6c0681d 100644 --- a/Gedcomx.Model/GenderType.cs +++ b/Gedcomx.Model/GenderType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/HypermediaEnabledData.cs b/Gedcomx.Model/HypermediaEnabledData.cs index 0ef2e4c..d3f03c1 100644 --- a/Gedcomx.Model/HypermediaEnabledData.cs +++ b/Gedcomx.Model/HypermediaEnabledData.cs @@ -7,6 +7,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; @@ -19,19 +20,19 @@ namespace Gx.Links /// /// An data type that supports hypermedia controls (i.e. links). /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "HypermediaEnabledData")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "HypermediaEnabledData")] public abstract partial class HypermediaEnabledData : Gx.Common.ExtensibleData, ISupportsLinks { - private System.Collections.Generic.List _links; + private List _links; /// /// The list of hypermedia links. Links are not specified by GEDCOM X core, but as extension elements by GEDCOM X RS. /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "link", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("links")] [JsonConverter(typeof(JsonHypermediaLinksConverter))] - public System.Collections.Generic.List Links + public List Links { get { diff --git a/Gedcomx.Model/IAttributable.cs b/Gedcomx.Model/IAttributable.cs index 52b05f7..8185b72 100644 --- a/Gedcomx.Model/IAttributable.cs +++ b/Gedcomx.Model/IAttributable.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/ISupportsLinks.cs b/Gedcomx.Model/ISupportsLinks.cs index 3b99629..13e21d8 100644 --- a/Gedcomx.Model/ISupportsLinks.cs +++ b/Gedcomx.Model/ISupportsLinks.cs @@ -1,6 +1,7 @@ using Gx.Links; using Newtonsoft.Json; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/Identifier.cs b/Gedcomx.Model/Identifier.cs index 5d845af..a59c682 100644 --- a/Gedcomx.Model/Identifier.cs +++ b/Gedcomx.Model/Identifier.cs @@ -7,6 +7,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Conclusion { @@ -17,8 +19,8 @@ namespace Gx.Conclusion /// /// An identifier for a resource. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Identifier")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Identifier")] [JsonConverter(typeof(JsonIdentifiersConverter))] public sealed partial class Identifier { diff --git a/Gedcomx.Model/IdentifierType.cs b/Gedcomx.Model/IdentifierType.cs index 758b70f..32cb362 100644 --- a/Gedcomx.Model/IdentifierType.cs +++ b/Gedcomx.Model/IdentifierType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/Link.cs b/Gedcomx.Model/Link.cs index b695907..a621942 100644 --- a/Gedcomx.Model/Link.cs +++ b/Gedcomx.Model/Link.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Links { @@ -14,9 +16,9 @@ namespace Gx.Links /// /// A hypermedia link, used to drive the state of a hypermedia-enabled genealogical data application. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Link")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "link")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Link")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "link")] public partial class Link { diff --git a/Gedcomx.Model/Name.cs b/Gedcomx.Model/Name.cs index 66d45fb..25f96af 100644 --- a/Gedcomx.Model/Name.cs +++ b/Gedcomx.Model/Name.cs @@ -7,6 +7,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; @@ -19,16 +20,16 @@ namespace Gx.Conclusion /// /// A name conclusion. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Name")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "name")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Name")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "name")] public partial class Name : Gx.Conclusion.Conclusion { private string _type; private bool? _preferred; private bool _preferredSpecified; private Gx.Conclusion.DateInfo _date; - private System.Collections.Generic.List _nameForms; + private List _nameForms; public Name() { @@ -129,7 +130,7 @@ public Gx.Conclusion.DateInfo Date /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "nameForm", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("nameForms")] - public System.Collections.Generic.List NameForms + public List NameForms { get { diff --git a/Gedcomx.Model/NameForm.cs b/Gedcomx.Model/NameForm.cs index 6156aeb..5bce5c7 100644 --- a/Gedcomx.Model/NameForm.cs +++ b/Gedcomx.Model/NameForm.cs @@ -7,6 +7,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -18,14 +19,14 @@ namespace Gx.Conclusion /// /// A form of a name. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "NameForm")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "NameForm")] public partial class NameForm : Gx.Common.ExtensibleData { private string _lang; private string _fullText; - private System.Collections.Generic.List _parts; - private System.Collections.Generic.List _fields; + private List _parts; + private List _fields; public NameForm() { @@ -77,7 +78,7 @@ public string FullText /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "part", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("parts")] - public System.Collections.Generic.List Parts + public List Parts { get { @@ -93,7 +94,7 @@ public System.Collections.Generic.List Parts /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { diff --git a/Gedcomx.Model/NamePart.cs b/Gedcomx.Model/NamePart.cs index f601e3b..9939ebb 100644 --- a/Gedcomx.Model/NamePart.cs +++ b/Gedcomx.Model/NamePart.cs @@ -9,6 +9,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -20,15 +21,15 @@ namespace Gx.Conclusion /// /// A part of a name. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "NamePart")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "NamePart")] public sealed partial class NamePart : Gx.Common.ExtensibleData { private string _value; private string _type; - private System.Collections.Generic.List _fields; - private System.Collections.Generic.List _qualifiers; + private List _fields; + private List _qualifiers; public NamePart() : this(default(NamePartType), null) @@ -98,7 +99,7 @@ public Gx.Types.NamePartType KnownType /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { @@ -114,7 +115,7 @@ public System.Collections.Generic.List Fields /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "qualifier", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("qualifiers")] - public System.Collections.Generic.List Qualifiers + public List Qualifiers { get { diff --git a/Gedcomx.Model/NamePartQualifierType.cs b/Gedcomx.Model/NamePartQualifierType.cs index 1d16ec3..dcebef3 100644 --- a/Gedcomx.Model/NamePartQualifierType.cs +++ b/Gedcomx.Model/NamePartQualifierType.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/NamePartType.cs b/Gedcomx.Model/NamePartType.cs index adbe99a..499b798 100644 --- a/Gedcomx.Model/NamePartType.cs +++ b/Gedcomx.Model/NamePartType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/NameType.cs b/Gedcomx.Model/NameType.cs index 567b9ff..25f835d 100644 --- a/Gedcomx.Model/NameType.cs +++ b/Gedcomx.Model/NameType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/Note.cs b/Gedcomx.Model/Note.cs index 5de6839..5a160d6 100644 --- a/Gedcomx.Model/Note.cs +++ b/Gedcomx.Model/Note.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Common { @@ -15,9 +17,9 @@ namespace Gx.Common /// /// A note about a genealogical resource (e.g. conclusion or source). /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Note")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "note")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Note")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "note")] public partial class Note : Gx.Links.HypermediaEnabledData, IAttributable { diff --git a/Gedcomx.Model/OnlineAccount.cs b/Gedcomx.Model/OnlineAccount.cs index 9f2dbc8..81bd5cd 100644 --- a/Gedcomx.Model/OnlineAccount.cs +++ b/Gedcomx.Model/OnlineAccount.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Agent { @@ -15,8 +17,8 @@ namespace Gx.Agent /// /// An online account for a web application. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "OnlineAccount")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "OnlineAccount")] public partial class OnlineAccount : Gx.Common.ExtensibleData { diff --git a/Gedcomx.Model/Person.cs b/Gedcomx.Model/Person.cs index e30bbea..a153778 100644 --- a/Gedcomx.Model/Person.cs +++ b/Gedcomx.Model/Person.cs @@ -8,6 +8,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -19,9 +20,9 @@ namespace Gx.Conclusion /// /// A person. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Person")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "person")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Person")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "person")] public partial class Person : Gx.Conclusion.Subject { private bool? _principal; @@ -31,12 +32,12 @@ public partial class Person : Gx.Conclusion.Subject private bool? _living; private bool _livingSpecified; private Gx.Conclusion.Gender _gender; - private System.Collections.Generic.List _names; - private System.Collections.Generic.List _facts; - private System.Collections.Generic.List _media; - private System.Collections.Generic.List _fields; + private List _names; + private List _facts; + private List _media; + private List _fields; private Gx.Conclusion.DisplayProperties _displayExtension; - private System.Collections.Generic.List _discussionreference; + private List _discussionreference; /// /// Whether this person is the "principal" person extracted from the record. /// @@ -166,7 +167,7 @@ public Gx.Conclusion.Gender Gender /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("names")] - public System.Collections.Generic.List Names + public List Names { get { @@ -182,7 +183,7 @@ public System.Collections.Generic.List Names /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "fact", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("facts")] - public System.Collections.Generic.List Facts + public List Facts { get { @@ -198,7 +199,7 @@ public System.Collections.Generic.List Facts /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { @@ -230,7 +231,7 @@ public Gx.Conclusion.DisplayProperties DisplayExtension /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "discussion-references", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("discussion-references")] - public System.Collections.Generic.List DiscussionReferences + public List DiscussionReferences { get { diff --git a/Gedcomx.Model/PlaceDescription.cs b/Gedcomx.Model/PlaceDescription.cs index bfb29f1..b44ae85 100644 --- a/Gedcomx.Model/PlaceDescription.cs +++ b/Gedcomx.Model/PlaceDescription.cs @@ -6,6 +6,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -21,13 +22,13 @@ namespace Gx.Conclusion /// and possibly its type, time period, and/or a geospatial description -- a description /// of a place as a snapshot in time. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "PlaceDescription")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "PlaceDescription")] public partial class PlaceDescription : Gx.Conclusion.Subject { private string _type; - private System.Collections.Generic.List _names; + private List _names; private Gx.Conclusion.DateInfo _temporalDescription; private double? _latitude; private bool _latitudeSpecified; @@ -58,7 +59,7 @@ public string Type /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("names")] - public System.Collections.Generic.List Names + public List Names { get { diff --git a/Gedcomx.Model/PlaceDisplayProperties.cs b/Gedcomx.Model/PlaceDisplayProperties.cs index 788aff9..c5a96d6 100644 --- a/Gedcomx.Model/PlaceDisplayProperties.cs +++ b/Gedcomx.Model/PlaceDisplayProperties.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Conclusion { @@ -18,8 +20,8 @@ namespace Gx.Conclusion /// a Web-based application. All display properties are provided in the default locale for the current /// application context and are NOT considered canonical for the purposes of data exchange. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "PlaceDisplayProperties")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "PlaceDisplayProperties")] public partial class PlaceDisplayProperties : Gx.Common.ExtensibleData { diff --git a/Gedcomx.Model/PlaceReference.cs b/Gedcomx.Model/PlaceReference.cs index 9ff31d6..84890a9 100644 --- a/Gedcomx.Model/PlaceReference.cs +++ b/Gedcomx.Model/PlaceReference.cs @@ -6,6 +6,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -17,15 +18,15 @@ namespace Gx.Conclusion /// /// A reference to genealogical place. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "PlaceReference")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "PlaceReference")] public partial class PlaceReference : Gx.Common.ExtensibleData { private string _descriptionRef; private string _original; - private System.Collections.Generic.List _normalizedExtensions; - private System.Collections.Generic.List _fields; + private List _normalizedExtensions; + private List _fields; /// /// A reference to a description of the place being referenced. /// @@ -64,7 +65,7 @@ public string Original /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "normalized", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("normalized")] - public System.Collections.Generic.List NormalizedExtensions + public List NormalizedExtensions { get { @@ -80,7 +81,7 @@ public System.Collections.Generic.List NormalizedExtensions /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { diff --git a/Gedcomx.Model/Qualifier.cs b/Gedcomx.Model/Qualifier.cs index 8cf4703..8221105 100644 --- a/Gedcomx.Model/Qualifier.cs +++ b/Gedcomx.Model/Qualifier.cs @@ -17,8 +17,8 @@ namespace Gx.Common /// /// A data qualifier. Qualifiers are used to "qualify" certain data elements to provide additional context, information, or details. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Qualifier")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Qualifier")] public sealed class Qualifier { private string _name; diff --git a/Gedcomx.Model/RecordDescriptor.cs b/Gedcomx.Model/RecordDescriptor.cs index 41703af..df33007 100644 --- a/Gedcomx.Model/RecordDescriptor.cs +++ b/Gedcomx.Model/RecordDescriptor.cs @@ -5,6 +5,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Records { @@ -15,13 +17,13 @@ namespace Gx.Records /// /// A descriptor for a common set of records. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "RecordDescriptor")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "RecordDescriptor")] public partial class RecordDescriptor : Gx.Links.HypermediaEnabledData { private string _lang; - private System.Collections.Generic.List _fields; + private List _fields; /// /// The language of this record description. /// @@ -43,7 +45,7 @@ public string Lang /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { diff --git a/Gedcomx.Model/RecordSet.cs b/Gedcomx.Model/RecordSet.cs index 01c7119..27cfe89 100644 --- a/Gedcomx.Model/RecordSet.cs +++ b/Gedcomx.Model/RecordSet.cs @@ -4,6 +4,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Records @@ -15,15 +16,15 @@ namespace Gx.Records /// /// The GEDCOM X bulk record data formats are used to exchange bulk genealogical data sets, grouped into records. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "RecordSet")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "records")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "RecordSet")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "records")] public partial class RecordSet : Gx.Links.HypermediaEnabledData { private string _lang; private Gx.Gedcomx _metadata; - private System.Collections.Generic.List _records; + private List _records; /// /// The language of the genealogical data. /// @@ -61,7 +62,7 @@ public Gx.Gedcomx Metadata /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "record", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("records")] - public System.Collections.Generic.List Records + public List Records { get { diff --git a/Gedcomx.Model/RecordType.cs b/Gedcomx.Model/RecordType.cs index edaa01e..55bd51e 100644 --- a/Gedcomx.Model/RecordType.cs +++ b/Gedcomx.Model/RecordType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/Relationship.cs b/Gedcomx.Model/Relationship.cs index a05fa0a..b229015 100644 --- a/Gedcomx.Model/Relationship.cs +++ b/Gedcomx.Model/Relationship.cs @@ -9,6 +9,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -20,17 +21,17 @@ namespace Gx.Conclusion /// /// A relationship between two or more persons. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Relationship")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "relationship")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Relationship")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "relationship")] public partial class Relationship : Gx.Conclusion.Subject { private string _type; private Gx.Common.ResourceReference _person1; private Gx.Common.ResourceReference _person2; - private System.Collections.Generic.List _facts; - private System.Collections.Generic.List _fields; + private List _facts; + private List _fields; /// /// The type of this relationship. /// @@ -105,7 +106,7 @@ public Gx.Common.ResourceReference Person2 /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "fact", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("facts")] - public System.Collections.Generic.List Facts + public List Facts { get { @@ -121,7 +122,7 @@ public System.Collections.Generic.List Facts /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { diff --git a/Gedcomx.Model/RelationshipType.cs b/Gedcomx.Model/RelationshipType.cs index 9989640..7b66052 100644 --- a/Gedcomx.Model/RelationshipType.cs +++ b/Gedcomx.Model/RelationshipType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/ResourceReference.cs b/Gedcomx.Model/ResourceReference.cs index 707d113..1c3db8a 100644 --- a/Gedcomx.Model/ResourceReference.cs +++ b/Gedcomx.Model/ResourceReference.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Common { @@ -14,9 +16,9 @@ namespace Gx.Common /// /// A generic reference to a resource. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "ResourceReference")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "resourceReference")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "ResourceReference")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "resourceReference")] public sealed partial class ResourceReference { public ResourceReference() diff --git a/Gedcomx.Model/ResourceType.cs b/Gedcomx.Model/ResourceType.cs index 7f5486b..99e80ad 100644 --- a/Gedcomx.Model/ResourceType.cs +++ b/Gedcomx.Model/ResourceType.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Types { diff --git a/Gedcomx.Model/Rt/GedcomxLocalReferenceResolver.cs b/Gedcomx.Model/Rt/GedcomxLocalReferenceResolver.cs index 9beb84d..63550ef 100644 --- a/Gedcomx.Model/Rt/GedcomxLocalReferenceResolver.cs +++ b/Gedcomx.Model/Rt/GedcomxLocalReferenceResolver.cs @@ -4,6 +4,7 @@ using Gx.Records; using Gx.Source; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/Rt/IGedcomxModelVisitor.cs b/Gedcomx.Model/Rt/IGedcomxModelVisitor.cs index 7e30f2c..5ab70d2 100644 --- a/Gedcomx.Model/Rt/IGedcomxModelVisitor.cs +++ b/Gedcomx.Model/Rt/IGedcomxModelVisitor.cs @@ -4,6 +4,7 @@ using Gx.Records; using Gx.Source; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/SourceCitation.cs b/Gedcomx.Model/SourceCitation.cs index b79cb1e..baff014 100644 --- a/Gedcomx.Model/SourceCitation.cs +++ b/Gedcomx.Model/SourceCitation.cs @@ -6,6 +6,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Source @@ -17,14 +18,14 @@ namespace Gx.Source /// /// Represents a source citation. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "SourceCitation")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "SourceCitation")] public partial class SourceCitation : Gx.Links.HypermediaEnabledData { private string _lang; private Gx.Common.ResourceReference _citationTemplate; - private System.Collections.Generic.List _fields; + private List _fields; private string _value; /// /// The language of the note. @@ -63,7 +64,7 @@ public Gx.Common.ResourceReference CitationTemplate /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { diff --git a/Gedcomx.Model/SourceDescription.cs b/Gedcomx.Model/SourceDescription.cs index 069b338..05b45ea 100644 --- a/Gedcomx.Model/SourceDescription.cs +++ b/Gedcomx.Model/SourceDescription.cs @@ -11,6 +11,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Source @@ -22,9 +23,9 @@ namespace Gx.Source /// /// Represents a description of a source. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "SourceDescription")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "sourceDescription")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "SourceDescription")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "sourceDescription")] public partial class SourceDescription : Gx.Links.HypermediaEnabledData, IAttributable { private string _about; @@ -32,24 +33,24 @@ public partial class SourceDescription : Gx.Links.HypermediaEnabledData, IAttrib private string _mediaType; private string _sortKey; private string _resourceType; - private System.Collections.Generic.List _citations; + private List _citations; private Gx.Common.ResourceReference _mediator; - private System.Collections.Generic.List _sources; + private List _sources; private Gx.Common.ResourceReference _analysis; private Gx.Source.SourceReference _componentOf; - private System.Collections.Generic.List _titles; + private List _titles; private Gx.Common.TextValue _titleLabel; - private System.Collections.Generic.List _notes; + private List _notes; private Gx.Common.Attribution _attribution; - private System.Collections.Generic.List _descriptions; - private System.Collections.Generic.List _identifiers; + private List _descriptions; + private List _identifiers; private DateTime? _created; private bool _createdSpecified; private DateTime? _modified; private bool _modifiedSpecified; - private System.Collections.Generic.List _coverage; - private System.Collections.Generic.List _rights; - private System.Collections.Generic.List _fields; + private List _coverage; + private List _rights; + private List _fields; private Gx.Common.ResourceReference _repository; private Gx.Common.ResourceReference _descriptorRef; /// @@ -154,7 +155,7 @@ public Gx.Types.ResourceType KnownResourceType /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "citation", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("citations")] - public System.Collections.Generic.List Citations + public List Citations { get { @@ -186,7 +187,7 @@ public Gx.Common.ResourceReference Mediator /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "source", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("sources")] - public System.Collections.Generic.List Sources + public List Sources { get { @@ -234,7 +235,7 @@ public Gx.Source.SourceReference ComponentOf /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "title", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("titles")] - public System.Collections.Generic.List Titles + public List Titles { get { @@ -266,7 +267,7 @@ public Gx.Common.TextValue TitleLabel /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "note", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("notes")] - public System.Collections.Generic.List Notes + public List Notes { get { @@ -298,7 +299,7 @@ public Gx.Common.Attribution Attribution /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "description", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("descriptions")] - public System.Collections.Generic.List Descriptions + public List Descriptions { get { @@ -315,7 +316,7 @@ public System.Collections.Generic.List Descriptions [System.Xml.Serialization.XmlElementAttribute(ElementName = "identifier", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("identifiers")] [JsonConverter(typeof(JsonIdentifiersConverter))] - public System.Collections.Generic.List Identifiers + public List Identifiers { get { @@ -405,7 +406,7 @@ public bool ModifiedSpecified /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "coverage", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("coverage")] - public System.Collections.Generic.List Coverage + public List Coverage { get { @@ -421,7 +422,7 @@ public System.Collections.Generic.List Coverage /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "rights", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("rights")] - public System.Collections.Generic.List Rights + public List Rights { get { @@ -437,7 +438,7 @@ public System.Collections.Generic.List Rights /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("fields")] - public System.Collections.Generic.List Fields + public List Fields { get { diff --git a/Gedcomx.Model/SourceReference.cs b/Gedcomx.Model/SourceReference.cs index b963d75..090b44d 100644 --- a/Gedcomx.Model/SourceReference.cs +++ b/Gedcomx.Model/SourceReference.cs @@ -7,6 +7,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Source @@ -18,16 +19,16 @@ namespace Gx.Source /// /// An attributable reference to a description of a source. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "SourceReference")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://gedcomx.org/v1/", ElementName = "sourceReference")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "SourceReference")] + [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "sourceReference")] public partial class SourceReference : Gx.Links.HypermediaEnabledData, IAttributable { private string _descriptionRef; private Gx.Common.Attribution _attribution; - private System.Collections.Generic.List _qualifiers; - private System.Collections.Generic.List _tags; + private List _qualifiers; + private List _tags; /// /// A reference to a description of the source being referenced. /// @@ -65,7 +66,7 @@ public Gx.Common.Attribution Attribution /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "qualifier", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("qualifiers")] - public System.Collections.Generic.List Qualifiers + public List Qualifiers { get { @@ -81,7 +82,7 @@ public System.Collections.Generic.List Qualifiers /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "tags", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("tags")] - public System.Collections.Generic.List Tags + public List Tags { get { diff --git a/Gedcomx.Model/Subject.cs b/Gedcomx.Model/Subject.cs index 2cf68fa..c1981d4 100644 --- a/Gedcomx.Model/Subject.cs +++ b/Gedcomx.Model/Subject.cs @@ -8,6 +8,7 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; using System.Collections.Generic; namespace Gx.Conclusion @@ -25,16 +26,16 @@ namespace Gx.Conclusion /// <em>conclusions</em>, e.g. for a person: things like name, birth date, age, address, etc. We aggregate these supporting <em>conclusions</em> to form an /// apparently-unique identity by which we can distinguish our <em>subject</em> from all other possible <em>subjects</em>. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "Subject")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Subject")] public abstract partial class Subject : Gx.Conclusion.Conclusion, IAttributable { private bool? _extracted; private bool _extractedSpecified; - private System.Collections.Generic.List _evidence; - private System.Collections.Generic.List _media; - private System.Collections.Generic.List _identifiers; + private List _evidence; + private List _media; + private List _identifiers; /// /// Whether this subject has been identified as "extracted". /// @@ -76,7 +77,7 @@ public bool ExtractedSpecified /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "evidence", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("evidence")] - public System.Collections.Generic.List Evidence + public List Evidence { get { @@ -92,7 +93,7 @@ public System.Collections.Generic.List Evidence /// [System.Xml.Serialization.XmlElementAttribute(ElementName = "media", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("media")] - public System.Collections.Generic.List Media + public List Media { get { @@ -109,7 +110,7 @@ public System.Collections.Generic.List Media [System.Xml.Serialization.XmlElementAttribute(ElementName = "identifier", Namespace = "http://gedcomx.org/v1/")] [Newtonsoft.Json.JsonProperty("identifiers")] [JsonConverter(typeof(JsonIdentifiersConverter))] - public System.Collections.Generic.List Identifiers + public List Identifiers { get { diff --git a/Gedcomx.Model/Tag.cs b/Gedcomx.Model/Tag.cs index fc9d174..17ba5a7 100644 --- a/Gedcomx.Model/Tag.cs +++ b/Gedcomx.Model/Tag.cs @@ -1,5 +1,6 @@ using Gedcomx.Model.Util; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; @@ -13,9 +14,9 @@ namespace Gx.Source /// /// A tag in the FamilySearch system. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://familysearch.org/v1/", TypeName = "Tag")] - [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://familysearch.org/v1/", ElementName = "tag")] + [Serializable] + [XmlType(Namespace = "http://familysearch.org/v1/", TypeName = "Tag")] + [XmlRoot(Namespace = "http://familysearch.org/v1/", ElementName = "tag")] public partial class Tag { private string _resource; diff --git a/Gedcomx.Model/TextValue.cs b/Gedcomx.Model/TextValue.cs index 43c2215..32559d9 100644 --- a/Gedcomx.Model/TextValue.cs +++ b/Gedcomx.Model/TextValue.cs @@ -4,6 +4,8 @@ // Generated by Enunciate. // using System; +using System.Xml.Serialization; +using System.Collections.Generic; namespace Gx.Common { @@ -14,8 +16,8 @@ namespace Gx.Common /// /// An element representing a text value that may be in a specific language. /// - [System.SerializableAttribute()] - [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://gedcomx.org/v1/", TypeName = "TextValue")] + [Serializable] + [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "TextValue")] public partial class TextValue { private string _lang; diff --git a/Gedcomx.Model/Util/JsonHypermediaLinksConverter.cs b/Gedcomx.Model/Util/JsonHypermediaLinksConverter.cs index 5ff4247..518c6f7 100644 --- a/Gedcomx.Model/Util/JsonHypermediaLinksConverter.cs +++ b/Gedcomx.Model/Util/JsonHypermediaLinksConverter.cs @@ -2,6 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/Util/JsonIdentifiersConverter.cs b/Gedcomx.Model/Util/JsonIdentifiersConverter.cs index 995fb8d..207aa7b 100644 --- a/Gedcomx.Model/Util/JsonIdentifiersConverter.cs +++ b/Gedcomx.Model/Util/JsonIdentifiersConverter.cs @@ -2,6 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/Util/JsonUnixTimestampConverter.cs b/Gedcomx.Model/Util/JsonUnixTimestampConverter.cs index d61a1a6..ca709f3 100644 --- a/Gedcomx.Model/Util/JsonUnixTimestampConverter.cs +++ b/Gedcomx.Model/Util/JsonUnixTimestampConverter.cs @@ -2,6 +2,7 @@ using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/Util/XmlQNameEnumUtil.cs b/Gedcomx.Model/Util/XmlQNameEnumUtil.cs index 0e3ff3c..c0dc6e7 100644 --- a/Gedcomx.Model/Util/XmlQNameEnumUtil.cs +++ b/Gedcomx.Model/Util/XmlQNameEnumUtil.cs @@ -1,10 +1,9 @@ using System; -using System.Collections.Generic; +using System.Xml.Serialization; using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; -using System.Xml.Serialization; namespace Gedcomx.Model.Util { diff --git a/Gedcomx.Model/VocabElement.cs b/Gedcomx.Model/VocabElement.cs index 3c8135e..a757b2c 100644 --- a/Gedcomx.Model/VocabElement.cs +++ b/Gedcomx.Model/VocabElement.cs @@ -1,5 +1,6 @@ using Gx.Common; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/VocabElementList.cs b/Gedcomx.Model/VocabElementList.cs index edab166..9b8416c 100644 --- a/Gedcomx.Model/VocabElementList.cs +++ b/Gedcomx.Model/VocabElementList.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/AuthenticationTests.cs b/Gedcomx.Rs.Api.Test/AuthenticationTests.cs index 394fe2c..fee6d4f 100644 --- a/Gedcomx.Rs.Api.Test/AuthenticationTests.cs +++ b/Gedcomx.Rs.Api.Test/AuthenticationTests.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/AuthoritiesTests.cs b/Gedcomx.Rs.Api.Test/AuthoritiesTests.cs index ca7455d..0f0c076 100644 --- a/Gedcomx.Rs.Api.Test/AuthoritiesTests.cs +++ b/Gedcomx.Rs.Api.Test/AuthoritiesTests.cs @@ -3,6 +3,7 @@ using Gx.Conclusion; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/ChangeHistoryTests.cs b/Gedcomx.Rs.Api.Test/ChangeHistoryTests.cs index 2858010..d694eec 100644 --- a/Gedcomx.Rs.Api.Test/ChangeHistoryTests.cs +++ b/Gedcomx.Rs.Api.Test/ChangeHistoryTests.cs @@ -4,6 +4,7 @@ using Gx.Rs.Api.Options; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/DiscoveryTests.cs b/Gedcomx.Rs.Api.Test/DiscoveryTests.cs index 44633d1..0ed68b5 100644 --- a/Gedcomx.Rs.Api.Test/DiscoveryTests.cs +++ b/Gedcomx.Rs.Api.Test/DiscoveryTests.cs @@ -2,6 +2,7 @@ using Gx.Rs.Api; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/DiscussionsTests.cs b/Gedcomx.Rs.Api.Test/DiscussionsTests.cs index dad5472..6ef54df 100644 --- a/Gedcomx.Rs.Api.Test/DiscussionsTests.cs +++ b/Gedcomx.Rs.Api.Test/DiscussionsTests.cs @@ -4,6 +4,7 @@ using Gx.Rs.Api; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/Examples/EmmaBocockExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/EmmaBocockExampleTest.cs index e04fb6a..c560189 100644 --- a/Gedcomx.Rs.Api.Test/Examples/EmmaBocockExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/EmmaBocockExampleTest.cs @@ -6,6 +6,7 @@ using Gx.Types; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Examples/GeorgeMarthaWashingtonExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/GeorgeMarthaWashingtonExampleTest.cs index d984ae6..425ea49 100644 --- a/Gedcomx.Rs.Api.Test/Examples/GeorgeMarthaWashingtonExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/GeorgeMarthaWashingtonExampleTest.cs @@ -6,6 +6,7 @@ using Gx.Types; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Examples/MiscellaneousFactsExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/MiscellaneousFactsExampleTest.cs index 0a5dc4f..19c1fab 100644 --- a/Gedcomx.Rs.Api.Test/Examples/MiscellaneousFactsExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/MiscellaneousFactsExampleTest.cs @@ -4,6 +4,7 @@ using Gx.Types; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Examples/NamesExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/NamesExampleTest.cs index be2f3e5..0a5a947 100644 --- a/Gedcomx.Rs.Api.Test/Examples/NamesExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/NamesExampleTest.cs @@ -4,6 +4,7 @@ using Gx.Types; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Examples/SamuelHamExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/SamuelHamExampleTest.cs index 2e93e2d..2ca2154 100644 --- a/Gedcomx.Rs.Api.Test/Examples/SamuelHamExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/SamuelHamExampleTest.cs @@ -6,6 +6,7 @@ using Gx.Types; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Examples/WongAloiauExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/WongAloiauExampleTest.cs index 6443f5d..0cc78df 100644 --- a/Gedcomx.Rs.Api.Test/Examples/WongAloiauExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/WongAloiauExampleTest.cs @@ -6,6 +6,7 @@ using Gx.Types; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/GedcomxFileTests.cs b/Gedcomx.Rs.Api.Test/GedcomxFileTests.cs index 551cd4a..f570135 100644 --- a/Gedcomx.Rs.Api.Test/GedcomxFileTests.cs +++ b/Gedcomx.Rs.Api.Test/GedcomxFileTests.cs @@ -2,6 +2,7 @@ using KellermanSoftware.CompareNetObjects; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Drawing; using System.IO; diff --git a/Gedcomx.Rs.Api.Test/MemoriesTests.cs b/Gedcomx.Rs.Api.Test/MemoriesTests.cs index f88eb16..990f0b6 100644 --- a/Gedcomx.Rs.Api.Test/MemoriesTests.cs +++ b/Gedcomx.Rs.Api.Test/MemoriesTests.cs @@ -6,6 +6,7 @@ using NUnit.Framework; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Drawing; using System.IO; diff --git a/Gedcomx.Rs.Api.Test/NotesTests.cs b/Gedcomx.Rs.Api.Test/NotesTests.cs index 6e653bf..bf386fe 100644 --- a/Gedcomx.Rs.Api.Test/NotesTests.cs +++ b/Gedcomx.Rs.Api.Test/NotesTests.cs @@ -3,6 +3,7 @@ using Gx.Rs.Api; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/OrdinancesTests.cs b/Gedcomx.Rs.Api.Test/OrdinancesTests.cs index 5caef28..493e69a 100644 --- a/Gedcomx.Rs.Api.Test/OrdinancesTests.cs +++ b/Gedcomx.Rs.Api.Test/OrdinancesTests.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/ParentsAndChildrenTest.cs b/Gedcomx.Rs.Api.Test/ParentsAndChildrenTest.cs index 858fd05..791336a 100644 --- a/Gedcomx.Rs.Api.Test/ParentsAndChildrenTest.cs +++ b/Gedcomx.Rs.Api.Test/ParentsAndChildrenTest.cs @@ -5,6 +5,7 @@ using Gx.Types; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/PedigreeTests.cs b/Gedcomx.Rs.Api.Test/PedigreeTests.cs index dee7234..1471986 100644 --- a/Gedcomx.Rs.Api.Test/PedigreeTests.cs +++ b/Gedcomx.Rs.Api.Test/PedigreeTests.cs @@ -5,6 +5,7 @@ using Gx.Rs.Api.Util; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/PersonSearchTests.cs b/Gedcomx.Rs.Api.Test/PersonSearchTests.cs index 0fc3b57..9bf4e30 100644 --- a/Gedcomx.Rs.Api.Test/PersonSearchTests.cs +++ b/Gedcomx.Rs.Api.Test/PersonSearchTests.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/PersonTests.cs b/Gedcomx.Rs.Api.Test/PersonTests.cs index 9ce44b3..5343c87 100644 --- a/Gedcomx.Rs.Api.Test/PersonTests.cs +++ b/Gedcomx.Rs.Api.Test/PersonTests.cs @@ -12,6 +12,7 @@ using Gx.Source; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Drawing; using System.Linq; diff --git a/Gedcomx.Rs.Api.Test/PlacesTests.cs b/Gedcomx.Rs.Api.Test/PlacesTests.cs index 87595aa..868dc72 100644 --- a/Gedcomx.Rs.Api.Test/PlacesTests.cs +++ b/Gedcomx.Rs.Api.Test/PlacesTests.cs @@ -5,6 +5,7 @@ using Gx.Rs.Api.Util; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/RelationshipTests.cs b/Gedcomx.Rs.Api.Test/RelationshipTests.cs index e085b03..0ec1cef 100644 --- a/Gedcomx.Rs.Api.Test/RelationshipTests.cs +++ b/Gedcomx.Rs.Api.Test/RelationshipTests.cs @@ -2,6 +2,7 @@ using Gx.Rs.Api; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Resources.Designer.cs b/Gedcomx.Rs.Api.Test/Resources.Designer.cs index 0e3abcf..6d17e5b 100644 --- a/Gedcomx.Rs.Api.Test/Resources.Designer.cs +++ b/Gedcomx.Rs.Api.Test/Resources.Designer.cs @@ -10,6 +10,8 @@ namespace Gedcomx.Rs.Api.Test { using System; +using System.Xml.Serialization; +using System.Collections.Generic; /// diff --git a/Gedcomx.Rs.Api.Test/SearchAndMatchTests.cs b/Gedcomx.Rs.Api.Test/SearchAndMatchTests.cs index 3a116d1..4ae6620 100644 --- a/Gedcomx.Rs.Api.Test/SearchAndMatchTests.cs +++ b/Gedcomx.Rs.Api.Test/SearchAndMatchTests.cs @@ -6,6 +6,7 @@ using Gx.Rs.Api.Util; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Net; using System.Threading; diff --git a/Gedcomx.Rs.Api.Test/SourceBoxTests.cs b/Gedcomx.Rs.Api.Test/SourceBoxTests.cs index 2ad5da2..703c2c6 100644 --- a/Gedcomx.Rs.Api.Test/SourceBoxTests.cs +++ b/Gedcomx.Rs.Api.Test/SourceBoxTests.cs @@ -3,6 +3,7 @@ using Gx.Source; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/SourcesTests.cs b/Gedcomx.Rs.Api.Test/SourcesTests.cs index f958484..e79cfe5 100644 --- a/Gedcomx.Rs.Api.Test/SourcesTests.cs +++ b/Gedcomx.Rs.Api.Test/SourcesTests.cs @@ -4,6 +4,7 @@ using Gx.Rs.Api.Util; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/SpouseTests.cs b/Gedcomx.Rs.Api.Test/SpouseTests.cs index d5544a8..b5dee07 100644 --- a/Gedcomx.Rs.Api.Test/SpouseTests.cs +++ b/Gedcomx.Rs.Api.Test/SpouseTests.cs @@ -4,6 +4,7 @@ using Gx.Rs.Api.Options; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/TestBacking.cs b/Gedcomx.Rs.Api.Test/TestBacking.cs index d14b6a3..e5f9364 100644 --- a/Gedcomx.Rs.Api.Test/TestBacking.cs +++ b/Gedcomx.Rs.Api.Test/TestBacking.cs @@ -9,6 +9,7 @@ using iTextSharp.text.pdf; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Drawing; using System.IO; diff --git a/Gedcomx.Rs.Api.Test/UserTests.cs b/Gedcomx.Rs.Api.Test/UserTests.cs index 2cdcd2d..796a7af 100644 --- a/Gedcomx.Rs.Api.Test/UserTests.cs +++ b/Gedcomx.Rs.Api.Test/UserTests.cs @@ -3,6 +3,7 @@ using Gx.Rs.Api.Options; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/UtilitiesTests.cs b/Gedcomx.Rs.Api.Test/UtilitiesTests.cs index 2e489a5..2bafd70 100644 --- a/Gedcomx.Rs.Api.Test/UtilitiesTests.cs +++ b/Gedcomx.Rs.Api.Test/UtilitiesTests.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/VocabulariesTests.cs b/Gedcomx.Rs.Api.Test/VocabulariesTests.cs index 8612acf..2e4b297 100644 --- a/Gedcomx.Rs.Api.Test/VocabulariesTests.cs +++ b/Gedcomx.Rs.Api.Test/VocabulariesTests.cs @@ -4,6 +4,7 @@ using Gx.Rs.Api; using NUnit.Framework; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/AgentState.cs b/Gedcomx.Rs.Api/AgentState.cs index c6128b1..cc27715 100644 --- a/Gedcomx.Rs.Api/AgentState.cs +++ b/Gedcomx.Rs.Api/AgentState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/AncestryResultsState.cs b/Gedcomx.Rs.Api/AncestryResultsState.cs index 5bceaae..cdfebe5 100644 --- a/Gedcomx.Rs.Api/AncestryResultsState.cs +++ b/Gedcomx.Rs.Api/AncestryResultsState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/CollectionState.cs b/Gedcomx.Rs.Api/CollectionState.cs index 25179aa..add7eb3 100644 --- a/Gedcomx.Rs.Api/CollectionState.cs +++ b/Gedcomx.Rs.Api/CollectionState.cs @@ -9,6 +9,7 @@ using RestSharp; using RestSharp.Deserializers; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Gedcomx.Rs.Api/CollectionsState.cs b/Gedcomx.Rs.Api/CollectionsState.cs index eed0b7f..834324d 100644 --- a/Gedcomx.Rs.Api/CollectionsState.cs +++ b/Gedcomx.Rs.Api/CollectionsState.cs @@ -4,6 +4,7 @@ using Gx.Source; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/DescendancyResultsState.cs b/Gedcomx.Rs.Api/DescendancyResultsState.cs index 7c0eb09..8b61e34 100644 --- a/Gedcomx.Rs.Api/DescendancyResultsState.cs +++ b/Gedcomx.Rs.Api/DescendancyResultsState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/GedcomxApplicationException.cs b/Gedcomx.Rs.Api/GedcomxApplicationException.cs index ac1cbc0..3f98398 100644 --- a/Gedcomx.Rs.Api/GedcomxApplicationException.cs +++ b/Gedcomx.Rs.Api/GedcomxApplicationException.cs @@ -2,6 +2,7 @@ using Newtonsoft.Json.Linq; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; diff --git a/Gedcomx.Rs.Api/GedcomxApplicationState.cs b/Gedcomx.Rs.Api/GedcomxApplicationState.cs index b8f4fda..6eca83b 100644 --- a/Gedcomx.Rs.Api/GedcomxApplicationState.cs +++ b/Gedcomx.Rs.Api/GedcomxApplicationState.cs @@ -1,7 +1,8 @@ using System; +using System.Xml.Serialization; +using System.Collections.Generic; using RestSharp; using System.Text; -using System.Collections.Generic; using Gx.Conclusion; using Gx.Rs.Api.Util; using Gx.Links; diff --git a/Gedcomx.Rs.Api/IPreferredRelationshipState.cs b/Gedcomx.Rs.Api/IPreferredRelationshipState.cs index b1c2c5e..125b7f9 100644 --- a/Gedcomx.Rs.Api/IPreferredRelationshipState.cs +++ b/Gedcomx.Rs.Api/IPreferredRelationshipState.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/IStateTransitionOption.cs b/Gedcomx.Rs.Api/IStateTransitionOption.cs index 7e1641b..57393d9 100644 --- a/Gedcomx.Rs.Api/IStateTransitionOption.cs +++ b/Gedcomx.Rs.Api/IStateTransitionOption.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Options/CacheDirectives.cs b/Gedcomx.Rs.Api/Options/CacheDirectives.cs index 78ef00f..2cf7686 100644 --- a/Gedcomx.Rs.Api/Options/CacheDirectives.cs +++ b/Gedcomx.Rs.Api/Options/CacheDirectives.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api.Util; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Options/HeaderParameter.cs b/Gedcomx.Rs.Api/Options/HeaderParameter.cs index f138ce9..9813dbc 100644 --- a/Gedcomx.Rs.Api/Options/HeaderParameter.cs +++ b/Gedcomx.Rs.Api/Options/HeaderParameter.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Options/Preconditions.cs b/Gedcomx.Rs.Api/Options/Preconditions.cs index 67d649e..785eb30 100644 --- a/Gedcomx.Rs.Api/Options/Preconditions.cs +++ b/Gedcomx.Rs.Api/Options/Preconditions.cs @@ -1,6 +1,7 @@ using Gx.Rs.Api.Util; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Options/QueryParameter.cs b/Gedcomx.Rs.Api/Options/QueryParameter.cs index 91b2eca..e2aee8a 100644 --- a/Gedcomx.Rs.Api/Options/QueryParameter.cs +++ b/Gedcomx.Rs.Api/Options/QueryParameter.cs @@ -1,6 +1,7 @@ using Flurl; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonChildrenState.cs b/Gedcomx.Rs.Api/PersonChildrenState.cs index f62e371..f7f6e57 100644 --- a/Gedcomx.Rs.Api/PersonChildrenState.cs +++ b/Gedcomx.Rs.Api/PersonChildrenState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonParentsState.cs b/Gedcomx.Rs.Api/PersonParentsState.cs index ca7ff5b..24f338d 100644 --- a/Gedcomx.Rs.Api/PersonParentsState.cs +++ b/Gedcomx.Rs.Api/PersonParentsState.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonSearchResultsState.cs b/Gedcomx.Rs.Api/PersonSearchResultsState.cs index 278e0a0..96cd6e6 100644 --- a/Gedcomx.Rs.Api/PersonSearchResultsState.cs +++ b/Gedcomx.Rs.Api/PersonSearchResultsState.cs @@ -3,6 +3,7 @@ using Gx.Links; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonSpousesState.cs b/Gedcomx.Rs.Api/PersonSpousesState.cs index 8ced184..8d26d4a 100644 --- a/Gedcomx.Rs.Api/PersonSpousesState.cs +++ b/Gedcomx.Rs.Api/PersonSpousesState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonState.cs b/Gedcomx.Rs.Api/PersonState.cs index 65c6d69..daa44af 100644 --- a/Gedcomx.Rs.Api/PersonState.cs +++ b/Gedcomx.Rs.Api/PersonState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonsState.cs b/Gedcomx.Rs.Api/PersonsState.cs index 9f954b5..952b0d5 100644 --- a/Gedcomx.Rs.Api/PersonsState.cs +++ b/Gedcomx.Rs.Api/PersonsState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PlaceDescriptionState.cs b/Gedcomx.Rs.Api/PlaceDescriptionState.cs index 3626d57..ba38b55 100644 --- a/Gedcomx.Rs.Api/PlaceDescriptionState.cs +++ b/Gedcomx.Rs.Api/PlaceDescriptionState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PlaceDescriptionsState.cs b/Gedcomx.Rs.Api/PlaceDescriptionsState.cs index 45f0828..1ebaceb 100644 --- a/Gedcomx.Rs.Api/PlaceDescriptionsState.cs +++ b/Gedcomx.Rs.Api/PlaceDescriptionsState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PlaceGroupState.cs b/Gedcomx.Rs.Api/PlaceGroupState.cs index 3aea834..9b6cf03 100644 --- a/Gedcomx.Rs.Api/PlaceGroupState.cs +++ b/Gedcomx.Rs.Api/PlaceGroupState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PlaceSearchResultsState.cs b/Gedcomx.Rs.Api/PlaceSearchResultsState.cs index ee7ca1c..3da61b8 100644 --- a/Gedcomx.Rs.Api/PlaceSearchResultsState.cs +++ b/Gedcomx.Rs.Api/PlaceSearchResultsState.cs @@ -1,6 +1,7 @@ using Gx.Atom; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/RecordState.cs b/Gedcomx.Rs.Api/RecordState.cs index 6cd564a..ee941de 100644 --- a/Gedcomx.Rs.Api/RecordState.cs +++ b/Gedcomx.Rs.Api/RecordState.cs @@ -2,6 +2,7 @@ using Gx.Links; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/RecordsState.cs b/Gedcomx.Rs.Api/RecordsState.cs index 3509aa3..8a985a5 100644 --- a/Gedcomx.Rs.Api/RecordsState.cs +++ b/Gedcomx.Rs.Api/RecordsState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Rel.cs b/Gedcomx.Rs.Api/Rel.cs index 651d7fd..061632a 100644 --- a/Gedcomx.Rs.Api/Rel.cs +++ b/Gedcomx.Rs.Api/Rel.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/RelationshipState.cs b/Gedcomx.Rs.Api/RelationshipState.cs index f59b74a..a31b3ad 100644 --- a/Gedcomx.Rs.Api/RelationshipState.cs +++ b/Gedcomx.Rs.Api/RelationshipState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/RelationshipsState.cs b/Gedcomx.Rs.Api/RelationshipsState.cs index a62d43b..5acc66e 100644 --- a/Gedcomx.Rs.Api/RelationshipsState.cs +++ b/Gedcomx.Rs.Api/RelationshipsState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/SourceDescriptionState.cs b/Gedcomx.Rs.Api/SourceDescriptionState.cs index 6af8b06..f65227a 100644 --- a/Gedcomx.Rs.Api/SourceDescriptionState.cs +++ b/Gedcomx.Rs.Api/SourceDescriptionState.cs @@ -2,6 +2,7 @@ using Gx.Links; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/SourceDescriptionsState.cs b/Gedcomx.Rs.Api/SourceDescriptionsState.cs index 21025bb..60df472 100644 --- a/Gedcomx.Rs.Api/SourceDescriptionsState.cs +++ b/Gedcomx.Rs.Api/SourceDescriptionsState.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/StateFactory.cs b/Gedcomx.Rs.Api/StateFactory.cs index 578e95f..c045631 100644 --- a/Gedcomx.Rs.Api/StateFactory.cs +++ b/Gedcomx.Rs.Api/StateFactory.cs @@ -1,6 +1,7 @@ using Gx.Atom; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/AncestryTree.cs b/Gedcomx.Rs.Api/Util/AncestryTree.cs index d2d4942..9512e16 100644 --- a/Gedcomx.Rs.Api/Util/AncestryTree.cs +++ b/Gedcomx.Rs.Api/Util/AncestryTree.cs @@ -1,5 +1,6 @@ using Gx.Conclusion; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/BasicDataSource.cs b/Gedcomx.Rs.Api/Util/BasicDataSource.cs index 551b8e3..78e217b 100644 --- a/Gedcomx.Rs.Api/Util/BasicDataSource.cs +++ b/Gedcomx.Rs.Api/Util/BasicDataSource.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Gedcomx.Rs.Api/Util/DescendancyTree.cs b/Gedcomx.Rs.Api/Util/DescendancyTree.cs index 1c84823..8301d1f 100644 --- a/Gedcomx.Rs.Api/Util/DescendancyTree.cs +++ b/Gedcomx.Rs.Api/Util/DescendancyTree.cs @@ -1,5 +1,6 @@ using Gx.Conclusion; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/EmbeddedLinkLoader.cs b/Gedcomx.Rs.Api/Util/EmbeddedLinkLoader.cs index ad9cd31..bf1de3e 100644 --- a/Gedcomx.Rs.Api/Util/EmbeddedLinkLoader.cs +++ b/Gedcomx.Rs.Api/Util/EmbeddedLinkLoader.cs @@ -1,6 +1,7 @@ using Gx.Conclusion; using Gx.Links; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/FileDataSource.cs b/Gedcomx.Rs.Api/Util/FileDataSource.cs index 315d3e9..ba49de5 100644 --- a/Gedcomx.Rs.Api/Util/FileDataSource.cs +++ b/Gedcomx.Rs.Api/Util/FileDataSource.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Gedcomx.Rs.Api/Util/FilterableRestClient.cs b/Gedcomx.Rs.Api/Util/FilterableRestClient.cs index a9277c2..b6cb755 100644 --- a/Gedcomx.Rs.Api/Util/FilterableRestClient.cs +++ b/Gedcomx.Rs.Api/Util/FilterableRestClient.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/GedcomxBaseSearchQueryBuilder.cs b/Gedcomx.Rs.Api/Util/GedcomxBaseSearchQueryBuilder.cs index 2514b9b..bad5eff 100644 --- a/Gedcomx.Rs.Api/Util/GedcomxBaseSearchQueryBuilder.cs +++ b/Gedcomx.Rs.Api/Util/GedcomxBaseSearchQueryBuilder.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/GedcomxPersonSearchQueryBuilder.cs b/Gedcomx.Rs.Api/Util/GedcomxPersonSearchQueryBuilder.cs index b30c476..ae67ebc 100644 --- a/Gedcomx.Rs.Api/Util/GedcomxPersonSearchQueryBuilder.cs +++ b/Gedcomx.Rs.Api/Util/GedcomxPersonSearchQueryBuilder.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/GedcomxPlaceSearchQueryBuilder.cs b/Gedcomx.Rs.Api/Util/GedcomxPlaceSearchQueryBuilder.cs index 2d4698a..a8247c4 100644 --- a/Gedcomx.Rs.Api/Util/GedcomxPlaceSearchQueryBuilder.cs +++ b/Gedcomx.Rs.Api/Util/GedcomxPlaceSearchQueryBuilder.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/HttpWarning.cs b/Gedcomx.Rs.Api/Util/HttpWarning.cs index 16df7e2..25b9ce9 100644 --- a/Gedcomx.Rs.Api/Util/HttpWarning.cs +++ b/Gedcomx.Rs.Api/Util/HttpWarning.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/HypermediaEnabledDataExtensions.cs b/Gedcomx.Rs.Api/Util/HypermediaEnabledDataExtensions.cs index 53ee062..c71a65b 100644 --- a/Gedcomx.Rs.Api/Util/HypermediaEnabledDataExtensions.cs +++ b/Gedcomx.Rs.Api/Util/HypermediaEnabledDataExtensions.cs @@ -1,5 +1,6 @@ using Gx.Links; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/IDataSource.cs b/Gedcomx.Rs.Api/Util/IDataSource.cs index 73cac64..afbd6e4 100644 --- a/Gedcomx.Rs.Api/Util/IDataSource.cs +++ b/Gedcomx.Rs.Api/Util/IDataSource.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Gedcomx.Rs.Api/Util/IFilter.cs b/Gedcomx.Rs.Api/Util/IFilter.cs index 0e54dda..bf71e0e 100644 --- a/Gedcomx.Rs.Api/Util/IFilter.cs +++ b/Gedcomx.Rs.Api/Util/IFilter.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/IFilterableRestClient.cs b/Gedcomx.Rs.Api/Util/IFilterableRestClient.cs index 3e61e55..4398201 100644 --- a/Gedcomx.Rs.Api/Util/IFilterableRestClient.cs +++ b/Gedcomx.Rs.Api/Util/IFilterableRestClient.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/LinkParserExtensions.cs b/Gedcomx.Rs.Api/Util/LinkParserExtensions.cs index c7be3e3..00b9ef7 100644 --- a/Gedcomx.Rs.Api/Util/LinkParserExtensions.cs +++ b/Gedcomx.Rs.Api/Util/LinkParserExtensions.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/Log4NetLoggingFilter.cs b/Gedcomx.Rs.Api/Util/Log4NetLoggingFilter.cs index b477425..c94fa92 100644 --- a/Gedcomx.Rs.Api/Util/Log4NetLoggingFilter.cs +++ b/Gedcomx.Rs.Api/Util/Log4NetLoggingFilter.cs @@ -2,6 +2,7 @@ using log4net.Core; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/PagedFeedEnumerator.cs b/Gedcomx.Rs.Api/Util/PagedFeedEnumerator.cs index 1b9b7c3..1abb56a 100644 --- a/Gedcomx.Rs.Api/Util/PagedFeedEnumerator.cs +++ b/Gedcomx.Rs.Api/Util/PagedFeedEnumerator.cs @@ -3,6 +3,7 @@ using Gx.Links; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api/Util/RdfExtensions.cs b/Gedcomx.Rs.Api/Util/RdfExtensions.cs index a515e63..1adb75b 100644 --- a/Gedcomx.Rs.Api/Util/RdfExtensions.cs +++ b/Gedcomx.Rs.Api/Util/RdfExtensions.cs @@ -1,5 +1,6 @@ using JsonLD.Core; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/RedirectableRestRequest.cs b/Gedcomx.Rs.Api/Util/RedirectableRestRequest.cs index bd3ae59..a18bb76 100644 --- a/Gedcomx.Rs.Api/Util/RedirectableRestRequest.cs +++ b/Gedcomx.Rs.Api/Util/RedirectableRestRequest.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/RestClientExtensions.cs b/Gedcomx.Rs.Api/Util/RestClientExtensions.cs index bdc4bf9..bc5d7c4 100644 --- a/Gedcomx.Rs.Api/Util/RestClientExtensions.cs +++ b/Gedcomx.Rs.Api/Util/RestClientExtensions.cs @@ -1,5 +1,6 @@ using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/ServiceHelper.cs b/Gedcomx.Rs.Api/Util/ServiceHelper.cs index c0f1b1f..ca6cb8e 100644 --- a/Gedcomx.Rs.Api/Util/ServiceHelper.cs +++ b/Gedcomx.Rs.Api/Util/ServiceHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/UriExtensions.cs b/Gedcomx.Rs.Api/Util/UriExtensions.cs index 04d39fc..2df15e0 100644 --- a/Gedcomx.Rs.Api/Util/UriExtensions.cs +++ b/Gedcomx.Rs.Api/Util/UriExtensions.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/UriTemplateExtensions.cs b/Gedcomx.Rs.Api/Util/UriTemplateExtensions.cs index 691e7fc..47bc360 100644 --- a/Gedcomx.Rs.Api/Util/UriTemplateExtensions.cs +++ b/Gedcomx.Rs.Api/Util/UriTemplateExtensions.cs @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Xml.Serialization; using System.Linq; using System.Text; using Tavis.UriTemplates; diff --git a/Gedcomx.Rs.Api/Util/VocabConstants.cs b/Gedcomx.Rs.Api/Util/VocabConstants.cs index 2891ae6..fa76fab 100644 --- a/Gedcomx.Rs.Api/Util/VocabConstants.cs +++ b/Gedcomx.Rs.Api/Util/VocabConstants.cs @@ -1,4 +1,5 @@ using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/VocabElementListState.cs b/Gedcomx.Rs.Api/VocabElementListState.cs index 8aeffd0..20e6bc2 100644 --- a/Gedcomx.Rs.Api/VocabElementListState.cs +++ b/Gedcomx.Rs.Api/VocabElementListState.cs @@ -5,6 +5,7 @@ using Newtonsoft.Json.Linq; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/VocabElementState.cs b/Gedcomx.Rs.Api/VocabElementState.cs index 1de28e8..4205a17 100644 --- a/Gedcomx.Rs.Api/VocabElementState.cs +++ b/Gedcomx.Rs.Api/VocabElementState.cs @@ -5,6 +5,7 @@ using Newtonsoft.Json.Linq; using RestSharp; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Util/GedcomxIdDictionary.cs b/Gedcomx.Util/GedcomxIdDictionary.cs index ad3bce7..db13f06 100644 --- a/Gedcomx.Util/GedcomxIdDictionary.cs +++ b/Gedcomx.Util/GedcomxIdDictionary.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using Gx; using Gx.Agent; using Gx.Common; @@ -7,7 +8,6 @@ using Gx.Records; using Gx.Source; using Gx.Types; -using System.Collections.Generic; namespace Gx.Util { diff --git a/Gedcomx.Util/GedcomxModelVisitorBase.cs b/Gedcomx.Util/GedcomxModelVisitorBase.cs index 909c353..b24495b 100644 --- a/Gedcomx.Util/GedcomxModelVisitorBase.cs +++ b/Gedcomx.Util/GedcomxModelVisitorBase.cs @@ -1,4 +1,6 @@ using System; +using System.Xml.Serialization; +using System.Collections.Generic; using Gx; using Gx.Agent; using Gx.Common; diff --git a/Gedcomx.Util/IGedcomxModelVisitor.cs b/Gedcomx.Util/IGedcomxModelVisitor.cs index d794c6a..9378b48 100644 --- a/Gedcomx.Util/IGedcomxModelVisitor.cs +++ b/Gedcomx.Util/IGedcomxModelVisitor.cs @@ -1,4 +1,6 @@ using System; +using System.Xml.Serialization; +using System.Collections.Generic; using Gx; using Gx.Agent; using Gx.Common; diff --git a/Gedcomx.Util/RecordHelper.cs b/Gedcomx.Util/RecordHelper.cs index bebc68f..087627c 100644 --- a/Gedcomx.Util/RecordHelper.cs +++ b/Gedcomx.Util/RecordHelper.cs @@ -3,6 +3,7 @@ using Gx.Source; using Gx.Types; using System; +using System.Xml.Serialization; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Data; From e0dfeacd8f68892f3eef3ede9b901d4567dff219 Mon Sep 17 00:00:00 2001 From: Shimmy Weitzhandler Date: Fri, 27 Jan 2017 01:27:00 +0200 Subject: [PATCH 2/3] Some more namespace and attribute name cleanup --- FamilySearch.Api/DiscussionState.cs | 1 + FamilySearch.Api/DiscussionsState.cs | 1 + .../FamilySearchCollectionState.cs | 1 + .../FamilySearchPlaceDescriptionState.cs | 1 + FamilySearch.Api/FamilySearchPlaceState.cs | 1 + FamilySearch.Api/FamilySearchPlaces.cs | 1 + .../FamilySearchSourceDescriptionState.cs | 1 + FamilySearch.Api/FamilySearchStateFactory.cs | 1 + FamilySearch.Api/Ft/ChangeHistoryState.cs | 1 + .../Ft/ChildAndParentsRelationshipState.cs | 1 + FamilySearch.Api/Ft/FamilySearchFamilyTree.cs | 1 + .../Ft/FamilyTreePersonChildrenState.cs | 1 + .../Ft/FamilyTreePersonParentsState.cs | 1 + FamilySearch.Api/Ft/FamilyTreePersonState.cs | 1 + .../Ft/FamilyTreeRelationshipState.cs | 1 + .../Ft/FamilyTreeRelationshipsState.cs | 1 + FamilySearch.Api/Ft/FamilyTreeStateFactory.cs | 1 + .../Memories/FamilySearchMemories.cs | 1 + FamilySearch.Api/PersonMatchResultsState.cs | 1 + FamilySearch.Api/PersonMergeState.cs | 1 + FamilySearch.Api/PersonNonMatchesState.cs | 1 + FamilySearch.Api/Rel.cs | 1 + FamilySearch.Api/UserHistoryState.cs | 1 + FamilySearch.Api/UserState.cs | 1 + FamilySearch.Api/Util/ChangeEntry.cs | 1 + FamilySearch.Api/Util/ChangeHistoryPage.cs | 1 + FamilySearch.Api/Util/ExperimentsFilter.cs | 1 + FamilySearch.Api/Util/FamilySearchOptions.cs | 1 + FamilySearch.Api/Util/MergeAnalysisFilter.cs | 1 + FamilySearch.Api/Util/RequestUtil.cs | 1 + GEDCOM X Date/GedcomxDate.cs | 2 - GEDCOM X Date/GedcomxDateApproximate.cs | 2 - GEDCOM X Date/GedcomxDateDuration.cs | 1 - GEDCOM X Date/GedcomxDateException.cs | 2 - GEDCOM X Date/GedcomxDateRange.cs | 2 - GEDCOM X Date/GedcomxDateRecurring.cs | 2 - GEDCOM X Date/GedcomxDateSimple.cs | 2 - GEDCOM X Date/GedcomxDateType.cs | 2 - GEDCOM X Date/GedcomxDateUtil.cs | 2 - GEDCOM X File/DefaultJsonSerialization.cs | 1 - GEDCOM X File/DefaultXMLSerialization.cs | 1 + GEDCOM X File/GedcomNamespaceManager.cs | 1 + GEDCOM X File/GedcomxFile.cs | 1 + GEDCOM X File/GedcomxFileEntry.cs | 1 + GEDCOM X File/GedcomxOutputStream.cs | 1 + GEDCOM X File/IGedcomxEntryDeserializer.cs | 1 + GEDCOM X File/IGedcomxEntrySerializer.cs | 1 + GEDCOM X File/ManifestAttribute.cs | 1 + GEDCOM X File/ManifestAttributes.cs | 1 + GEDCOM X Support/MediaTypes.cs | 2 - Gedcomx.CLI/RecordSetToCSV.cs | 2 - Gedcomx.Model.Fs/ArtifactMetadata.cs | 34 ++-- Gedcomx.Model.Fs/ArtifactType.cs | 17 +- Gedcomx.Model.Fs/ChangeInfo.cs | 45 ++--- Gedcomx.Model.Fs/ChangeObjectModifier.cs | 9 +- Gedcomx.Model.Fs/ChangeObjectType.cs | 103 +++++------ Gedcomx.Model.Fs/ChangeOperation.cs | 17 +- .../ChildAndParentsRelationship.cs | 21 +-- Gedcomx.Model.Fs/Comment.cs | 22 +-- Gedcomx.Model.Fs/Ct/MatchCollection.cs | 11 +- Gedcomx.Model.Fs/Discussion.cs | 52 +++--- Gedcomx.Model.Fs/Error.cs | 24 +-- Gedcomx.Model.Fs/FamilySearchPlatform.cs | 25 +-- Gedcomx.Model.Fs/Feature.cs | 32 ++-- Gedcomx.Model.Fs/HealthConfig.cs | 17 +- Gedcomx.Model.Fs/MatchInfo.cs | 13 +- Gedcomx.Model.Fs/MatchResolution.cs | 9 +- Gedcomx.Model.Fs/MatchStatus.cs | 10 +- Gedcomx.Model.Fs/MatchSystem.cs | 13 +- Gedcomx.Model.Fs/Merge.cs | 9 +- Gedcomx.Model.Fs/MergeAnalysis.cs | 21 +-- Gedcomx.Model.Fs/MergeConflict.cs | 9 +- ...ilySearchPlatformLocalReferenceResolver.cs | 1 + .../FamilySearchPlatformModelVisitorBase.cs | 1 + .../Rt/IFamilySearchPlatformModelVisitor.cs | 1 + Gedcomx.Model.Fs/User.cs | 76 ++++---- Gedcomx.Model.Rs/Category.cs | 13 +- Gedcomx.Model.Rs/CommonAttributes.cs | 9 +- Gedcomx.Model.Rs/Content.cs | 9 +- Gedcomx.Model.Rs/Entry.cs | 75 ++++---- Gedcomx.Model.Rs/ExtensibleElement.cs | 9 +- Gedcomx.Model.Rs/Feed.cs | 79 ++++---- Gedcomx.Model.Rs/Generator.cs | 21 +-- Gedcomx.Model.Rs/Person.cs | 13 +- Gedcomx.Model.Rs/ResultConfidence.cs | 13 +- Gedcomx.Model/Address.cs | 47 ++--- Gedcomx.Model/Agent.cs | 32 ++-- Gedcomx.Model/Attribution.cs | 19 +- Gedcomx.Model/CitationField.cs | 9 +- Gedcomx.Model/Collection.cs | 28 +-- Gedcomx.Model/CollectionContent.cs | 30 ++-- Gedcomx.Model/Conclusion.cs | 33 ++-- Gedcomx.Model/ConfidenceLevel.cs | 11 +- Gedcomx.Model/Coverage.cs | 17 +- Gedcomx.Model/DateInfo.cs | 17 +- Gedcomx.Model/DiscussionReference.cs | 13 +- Gedcomx.Model/DisplayProperties.cs | 45 ++--- Gedcomx.Model/Document.cs | 30 ++-- Gedcomx.Model/DocumentType.cs | 13 +- Gedcomx.Model/Event.cs | 23 +-- Gedcomx.Model/EventRole.cs | 17 +- Gedcomx.Model/EventRoleType.cs | 13 +- Gedcomx.Model/EventType.cs | 73 ++++---- Gedcomx.Model/EvidenceReference.cs | 13 +- Gedcomx.Model/ExtensibleData.cs | 13 +- Gedcomx.Model/Facet.cs | 25 +-- Gedcomx.Model/FacetType.cs | 31 ++-- Gedcomx.Model/FacetValue.cs | 20 ++- Gedcomx.Model/Fact.cs | 40 +++-- Gedcomx.Model/FactQualifierType.cs | 9 +- Gedcomx.Model/FactType.cs | 169 +++++++++--------- Gedcomx.Model/Field.cs | 13 +- Gedcomx.Model/FieldDescriptor.cs | 13 +- Gedcomx.Model/FieldType.cs | 151 ++++++++-------- Gedcomx.Model/FieldValue.cs | 25 +-- Gedcomx.Model/FieldValueDescriptor.cs | 28 +-- Gedcomx.Model/FieldValueType.cs | 9 +- Gedcomx.Model/Gedcomx.cs | 57 +++--- Gedcomx.Model/Gender.cs | 13 +- Gedcomx.Model/GenderType.cs | 11 +- Gedcomx.Model/HypermediaEnabledData.cs | 4 +- Gedcomx.Model/IAttributable.cs | 1 + Gedcomx.Model/ISupportsLinks.cs | 1 - Gedcomx.Model/Identifier.cs | 13 +- Gedcomx.Model/IdentifierType.cs | 13 +- Gedcomx.Model/Link.cs | 64 +++---- Gedcomx.Model/Name.cs | 32 ++-- Gedcomx.Model/NameForm.cs | 17 +- Gedcomx.Model/NamePart.cs | 21 +-- Gedcomx.Model/NamePartQualifierType.cs | 33 ++-- Gedcomx.Model/NamePartType.cs | 13 +- Gedcomx.Model/NameType.cs | 21 +-- Gedcomx.Model/Note.cs | 17 +- Gedcomx.Model/OnlineAccount.cs | 9 +- Gedcomx.Model/Person.cs | 127 ++++++------- Gedcomx.Model/PlaceDescription.cs | 50 +++--- Gedcomx.Model/PlaceDisplayProperties.cs | 13 +- Gedcomx.Model/PlaceReference.cs | 17 +- Gedcomx.Model/Qualifier.cs | 9 +- Gedcomx.Model/RecordDescriptor.cs | 9 +- Gedcomx.Model/RecordSet.cs | 13 +- Gedcomx.Model/RecordType.cs | 95 +++++----- Gedcomx.Model/Relationship.cs | 25 +-- Gedcomx.Model/RelationshipType.cs | 9 +- Gedcomx.Model/ResourceReference.cs | 9 +- Gedcomx.Model/ResourceType.cs | 15 +- .../Rt/GedcomxLocalReferenceResolver.cs | 1 + Gedcomx.Model/Rt/IGedcomxModelVisitor.cs | 1 + Gedcomx.Model/SourceCitation.cs | 17 +- Gedcomx.Model/SourceDescription.cs | 109 +++++------ Gedcomx.Model/SourceReference.cs | 14 +- Gedcomx.Model/Subject.cs | 23 +-- Gedcomx.Model/Tag.cs | 5 +- Gedcomx.Model/TextValue.cs | 9 +- .../Util/JsonHypermediaLinksConverter.cs | 1 - .../Util/JsonIdentifiersConverter.cs | 1 - .../Util/JsonUnixTimestampConverter.cs | 2 - Gedcomx.Model/Util/XmlQNameEnumUtil.cs | 1 + Gedcomx.Model/VocabElement.cs | 9 +- Gedcomx.Model/VocabElementList.cs | 1 + Gedcomx.Rs.Api.Test/AuthenticationTests.cs | 1 + Gedcomx.Rs.Api.Test/AuthoritiesTests.cs | 1 + Gedcomx.Rs.Api.Test/ChangeHistoryTests.cs | 1 + Gedcomx.Rs.Api.Test/DiscoveryTests.cs | 1 + Gedcomx.Rs.Api.Test/DiscussionsTests.cs | 1 + .../Examples/EmmaBocockExampleTest.cs | 1 + .../GeorgeMarthaWashingtonExampleTest.cs | 1 + .../Examples/MiscellaneousFactsExampleTest.cs | 1 + .../Examples/NamesExampleTest.cs | 1 + .../Examples/SamuelHamExampleTest.cs | 1 + .../Examples/WongAloiauExampleTest.cs | 1 + Gedcomx.Rs.Api.Test/GedcomxFileTests.cs | 1 + Gedcomx.Rs.Api.Test/MemoriesTests.cs | 1 + Gedcomx.Rs.Api.Test/NotesTests.cs | 1 + Gedcomx.Rs.Api.Test/OrdinancesTests.cs | 1 + Gedcomx.Rs.Api.Test/ParentsAndChildrenTest.cs | 1 + Gedcomx.Rs.Api.Test/PedigreeTests.cs | 1 + Gedcomx.Rs.Api.Test/PersonSearchTests.cs | 1 + Gedcomx.Rs.Api.Test/PersonTests.cs | 1 + Gedcomx.Rs.Api.Test/PlacesTests.cs | 1 + Gedcomx.Rs.Api.Test/RelationshipTests.cs | 1 + Gedcomx.Rs.Api.Test/Resources.Designer.cs | 1 + Gedcomx.Rs.Api.Test/SearchAndMatchTests.cs | 1 + Gedcomx.Rs.Api.Test/SourceBoxTests.cs | 1 + Gedcomx.Rs.Api.Test/SourcesTests.cs | 1 + Gedcomx.Rs.Api.Test/SpouseTests.cs | 1 + Gedcomx.Rs.Api.Test/TestBacking.cs | 1 + Gedcomx.Rs.Api.Test/UserTests.cs | 1 + Gedcomx.Rs.Api.Test/UtilitiesTests.cs | 2 +- Gedcomx.Rs.Api.Test/VocabulariesTests.cs | 1 + Gedcomx.Rs.Api/AgentState.cs | 1 + Gedcomx.Rs.Api/AncestryResultsState.cs | 1 + Gedcomx.Rs.Api/CollectionState.cs | 1 + Gedcomx.Rs.Api/CollectionsState.cs | 1 + Gedcomx.Rs.Api/DescendancyResultsState.cs | 1 + Gedcomx.Rs.Api/GedcomxApplicationException.cs | 1 + Gedcomx.Rs.Api/GedcomxApplicationState.cs | 3 +- Gedcomx.Rs.Api/IPreferredRelationshipState.cs | 1 + Gedcomx.Rs.Api/IStateTransitionOption.cs | 1 + Gedcomx.Rs.Api/Options/CacheDirectives.cs | 1 + Gedcomx.Rs.Api/Options/HeaderParameter.cs | 1 + Gedcomx.Rs.Api/Options/Preconditions.cs | 1 + Gedcomx.Rs.Api/Options/QueryParameter.cs | 1 + Gedcomx.Rs.Api/PersonChildrenState.cs | 1 + Gedcomx.Rs.Api/PersonParentsState.cs | 1 + Gedcomx.Rs.Api/PersonSearchResultsState.cs | 1 + Gedcomx.Rs.Api/PersonSpousesState.cs | 1 + Gedcomx.Rs.Api/PersonState.cs | 1 + Gedcomx.Rs.Api/PersonsState.cs | 1 + Gedcomx.Rs.Api/PlaceDescriptionState.cs | 1 + Gedcomx.Rs.Api/PlaceDescriptionsState.cs | 1 + Gedcomx.Rs.Api/PlaceGroupState.cs | 1 + Gedcomx.Rs.Api/PlaceSearchResultsState.cs | 1 + Gedcomx.Rs.Api/RecordState.cs | 1 + Gedcomx.Rs.Api/RecordsState.cs | 1 + Gedcomx.Rs.Api/Rel.cs | 1 + Gedcomx.Rs.Api/RelationshipState.cs | 1 + Gedcomx.Rs.Api/RelationshipsState.cs | 1 + Gedcomx.Rs.Api/SourceDescriptionState.cs | 1 + Gedcomx.Rs.Api/SourceDescriptionsState.cs | 1 + Gedcomx.Rs.Api/StateFactory.cs | 1 + Gedcomx.Rs.Api/Util/AncestryTree.cs | 1 + Gedcomx.Rs.Api/Util/BasicDataSource.cs | 1 + Gedcomx.Rs.Api/Util/DescendancyTree.cs | 1 + Gedcomx.Rs.Api/Util/EmbeddedLinkLoader.cs | 1 + Gedcomx.Rs.Api/Util/FileDataSource.cs | 1 + Gedcomx.Rs.Api/Util/FilterableRestClient.cs | 1 + .../Util/GedcomxBaseSearchQueryBuilder.cs | 1 + .../Util/GedcomxPersonSearchQueryBuilder.cs | 1 + .../Util/GedcomxPlaceSearchQueryBuilder.cs | 1 + Gedcomx.Rs.Api/Util/HttpWarning.cs | 1 + .../Util/HypermediaEnabledDataExtensions.cs | 1 + Gedcomx.Rs.Api/Util/IDataSource.cs | 1 + Gedcomx.Rs.Api/Util/IFilter.cs | 1 + Gedcomx.Rs.Api/Util/IFilterableRestClient.cs | 1 + Gedcomx.Rs.Api/Util/LinkParserExtensions.cs | 1 + Gedcomx.Rs.Api/Util/Log4NetLoggingFilter.cs | 1 + Gedcomx.Rs.Api/Util/PagedFeedEnumerator.cs | 1 + Gedcomx.Rs.Api/Util/RdfExtensions.cs | 1 + .../Util/RedirectableRestRequest.cs | 1 + Gedcomx.Rs.Api/Util/RestClientExtensions.cs | 2 - Gedcomx.Rs.Api/Util/ServiceHelper.cs | 1 + Gedcomx.Rs.Api/Util/UriExtensions.cs | 1 + Gedcomx.Rs.Api/Util/UriTemplateExtensions.cs | 1 + Gedcomx.Rs.Api/Util/VocabConstants.cs | 1 + Gedcomx.Rs.Api/VocabElementListState.cs | 1 + Gedcomx.Rs.Api/VocabElementState.cs | 1 + Gedcomx.Util/GedcomxModelVisitorBase.cs | 2 - Gedcomx.Util/IGedcomxModelVisitor.cs | 2 - Gedcomx.Util/RecordHelper.cs | 13 +- 250 files changed, 1581 insertions(+), 1375 deletions(-) diff --git a/FamilySearch.Api/DiscussionState.cs b/FamilySearch.Api/DiscussionState.cs index 5cf7982..fcf6b12 100644 --- a/FamilySearch.Api/DiscussionState.cs +++ b/FamilySearch.Api/DiscussionState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/DiscussionsState.cs b/FamilySearch.Api/DiscussionsState.cs index 46990f1..584605f 100644 --- a/FamilySearch.Api/DiscussionsState.cs +++ b/FamilySearch.Api/DiscussionsState.cs @@ -3,6 +3,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchCollectionState.cs b/FamilySearch.Api/FamilySearchCollectionState.cs index 2c7cb47..bbb9e13 100644 --- a/FamilySearch.Api/FamilySearchCollectionState.cs +++ b/FamilySearch.Api/FamilySearchCollectionState.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchPlaceDescriptionState.cs b/FamilySearch.Api/FamilySearchPlaceDescriptionState.cs index a2046eb..3d2712b 100644 --- a/FamilySearch.Api/FamilySearchPlaceDescriptionState.cs +++ b/FamilySearch.Api/FamilySearchPlaceDescriptionState.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchPlaceState.cs b/FamilySearch.Api/FamilySearchPlaceState.cs index 174ed71..4f007f3 100644 --- a/FamilySearch.Api/FamilySearchPlaceState.cs +++ b/FamilySearch.Api/FamilySearchPlaceState.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchPlaces.cs b/FamilySearch.Api/FamilySearchPlaces.cs index d323237..8cd9a85 100644 --- a/FamilySearch.Api/FamilySearchPlaces.cs +++ b/FamilySearch.Api/FamilySearchPlaces.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchSourceDescriptionState.cs b/FamilySearch.Api/FamilySearchSourceDescriptionState.cs index 9a07e60..6b95ef5 100644 --- a/FamilySearch.Api/FamilySearchSourceDescriptionState.cs +++ b/FamilySearch.Api/FamilySearchSourceDescriptionState.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/FamilySearchStateFactory.cs b/FamilySearch.Api/FamilySearchStateFactory.cs index c43acc0..7dcf169 100644 --- a/FamilySearch.Api/FamilySearchStateFactory.cs +++ b/FamilySearch.Api/FamilySearchStateFactory.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/ChangeHistoryState.cs b/FamilySearch.Api/Ft/ChangeHistoryState.cs index b6f08e2..f88328c 100644 --- a/FamilySearch.Api/Ft/ChangeHistoryState.cs +++ b/FamilySearch.Api/Ft/ChangeHistoryState.cs @@ -3,6 +3,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/ChildAndParentsRelationshipState.cs b/FamilySearch.Api/Ft/ChildAndParentsRelationshipState.cs index ab83a8e..5932880 100644 --- a/FamilySearch.Api/Ft/ChildAndParentsRelationshipState.cs +++ b/FamilySearch.Api/Ft/ChildAndParentsRelationshipState.cs @@ -3,6 +3,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/FamilySearchFamilyTree.cs b/FamilySearch.Api/Ft/FamilySearchFamilyTree.cs index 57053c8..0638314 100644 --- a/FamilySearch.Api/Ft/FamilySearchFamilyTree.cs +++ b/FamilySearch.Api/Ft/FamilySearchFamilyTree.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/FamilyTreePersonChildrenState.cs b/FamilySearch.Api/Ft/FamilyTreePersonChildrenState.cs index 708b8d5..e3c5a76 100644 --- a/FamilySearch.Api/Ft/FamilyTreePersonChildrenState.cs +++ b/FamilySearch.Api/Ft/FamilyTreePersonChildrenState.cs @@ -6,6 +6,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/FamilySearch.Api/Ft/FamilyTreePersonParentsState.cs b/FamilySearch.Api/Ft/FamilyTreePersonParentsState.cs index af9cdf2..c4a8258 100644 --- a/FamilySearch.Api/Ft/FamilyTreePersonParentsState.cs +++ b/FamilySearch.Api/Ft/FamilyTreePersonParentsState.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/FamilyTreePersonState.cs b/FamilySearch.Api/Ft/FamilyTreePersonState.cs index ff29bad..0aae87f 100644 --- a/FamilySearch.Api/Ft/FamilyTreePersonState.cs +++ b/FamilySearch.Api/Ft/FamilyTreePersonState.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/FamilyTreeRelationshipState.cs b/FamilySearch.Api/Ft/FamilyTreeRelationshipState.cs index b19c812..9340cd4 100644 --- a/FamilySearch.Api/Ft/FamilyTreeRelationshipState.cs +++ b/FamilySearch.Api/Ft/FamilyTreeRelationshipState.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Ft/FamilyTreeRelationshipsState.cs b/FamilySearch.Api/Ft/FamilyTreeRelationshipsState.cs index 534be0a..ba9ccf9 100644 --- a/FamilySearch.Api/Ft/FamilyTreeRelationshipsState.cs +++ b/FamilySearch.Api/Ft/FamilyTreeRelationshipsState.cs @@ -4,6 +4,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/FamilySearch.Api/Ft/FamilyTreeStateFactory.cs b/FamilySearch.Api/Ft/FamilyTreeStateFactory.cs index d71f912..fdb2d38 100644 --- a/FamilySearch.Api/Ft/FamilyTreeStateFactory.cs +++ b/FamilySearch.Api/Ft/FamilyTreeStateFactory.cs @@ -3,6 +3,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Memories/FamilySearchMemories.cs b/FamilySearch.Api/Memories/FamilySearchMemories.cs index a35eae5..5f42c0d 100644 --- a/FamilySearch.Api/Memories/FamilySearchMemories.cs +++ b/FamilySearch.Api/Memories/FamilySearchMemories.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/PersonMatchResultsState.cs b/FamilySearch.Api/PersonMatchResultsState.cs index aa031bb..fcdb14b 100644 --- a/FamilySearch.Api/PersonMatchResultsState.cs +++ b/FamilySearch.Api/PersonMatchResultsState.cs @@ -3,6 +3,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/PersonMergeState.cs b/FamilySearch.Api/PersonMergeState.cs index 7ac87da..407cc3f 100644 --- a/FamilySearch.Api/PersonMergeState.cs +++ b/FamilySearch.Api/PersonMergeState.cs @@ -3,6 +3,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/FamilySearch.Api/PersonNonMatchesState.cs b/FamilySearch.Api/PersonNonMatchesState.cs index bafbd1e..c85eddb 100644 --- a/FamilySearch.Api/PersonNonMatchesState.cs +++ b/FamilySearch.Api/PersonNonMatchesState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Rel.cs b/FamilySearch.Api/Rel.cs index 6aeaf20..36949db 100644 --- a/FamilySearch.Api/Rel.cs +++ b/FamilySearch.Api/Rel.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/UserHistoryState.cs b/FamilySearch.Api/UserHistoryState.cs index 6d63bc0..bf28f68 100644 --- a/FamilySearch.Api/UserHistoryState.cs +++ b/FamilySearch.Api/UserHistoryState.cs @@ -4,6 +4,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/FamilySearch.Api/UserState.cs b/FamilySearch.Api/UserState.cs index 9ce42be..78aa02b 100644 --- a/FamilySearch.Api/UserState.cs +++ b/FamilySearch.Api/UserState.cs @@ -3,6 +3,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/ChangeEntry.cs b/FamilySearch.Api/Util/ChangeEntry.cs index 8449559..e73d4c5 100644 --- a/FamilySearch.Api/Util/ChangeEntry.cs +++ b/FamilySearch.Api/Util/ChangeEntry.cs @@ -4,6 +4,7 @@ using Gx.Fs.Tree; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/ChangeHistoryPage.cs b/FamilySearch.Api/Util/ChangeHistoryPage.cs index a7d6d09..f0a09aa 100644 --- a/FamilySearch.Api/Util/ChangeHistoryPage.cs +++ b/FamilySearch.Api/Util/ChangeHistoryPage.cs @@ -2,6 +2,7 @@ using Gx.Fs.Tree; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/ExperimentsFilter.cs b/FamilySearch.Api/Util/ExperimentsFilter.cs index b732340..6746af9 100644 --- a/FamilySearch.Api/Util/ExperimentsFilter.cs +++ b/FamilySearch.Api/Util/ExperimentsFilter.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/FamilySearchOptions.cs b/FamilySearch.Api/Util/FamilySearchOptions.cs index 9f0f8fb..ece9bd8 100644 --- a/FamilySearch.Api/Util/FamilySearchOptions.cs +++ b/FamilySearch.Api/Util/FamilySearchOptions.cs @@ -6,6 +6,7 @@ using Gx.Types; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/MergeAnalysisFilter.cs b/FamilySearch.Api/Util/MergeAnalysisFilter.cs index 58323b0..384f6a9 100644 --- a/FamilySearch.Api/Util/MergeAnalysisFilter.cs +++ b/FamilySearch.Api/Util/MergeAnalysisFilter.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/FamilySearch.Api/Util/RequestUtil.cs b/FamilySearch.Api/Util/RequestUtil.cs index 5603254..84b409b 100644 --- a/FamilySearch.Api/Util/RequestUtil.cs +++ b/FamilySearch.Api/Util/RequestUtil.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X Date/GedcomxDate.cs b/GEDCOM X Date/GedcomxDate.cs index dc15f46..9feb3b1 100644 --- a/GEDCOM X Date/GedcomxDate.cs +++ b/GEDCOM X Date/GedcomxDate.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/GEDCOM X Date/GedcomxDateApproximate.cs b/GEDCOM X Date/GedcomxDateApproximate.cs index 97a76cc..6173723 100644 --- a/GEDCOM X Date/GedcomxDateApproximate.cs +++ b/GEDCOM X Date/GedcomxDateApproximate.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/GEDCOM X Date/GedcomxDateDuration.cs b/GEDCOM X Date/GedcomxDateDuration.cs index cc223c3..4a92c67 100644 --- a/GEDCOM X Date/GedcomxDateDuration.cs +++ b/GEDCOM X Date/GedcomxDateDuration.cs @@ -1,5 +1,4 @@ using System; -using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X Date/GedcomxDateException.cs b/GEDCOM X Date/GedcomxDateException.cs index 0cadf24..dc7d942 100644 --- a/GEDCOM X Date/GedcomxDateException.cs +++ b/GEDCOM X Date/GedcomxDateException.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; using System.Text; diff --git a/GEDCOM X Date/GedcomxDateRange.cs b/GEDCOM X Date/GedcomxDateRange.cs index 2ee8653..c3f6283 100644 --- a/GEDCOM X Date/GedcomxDateRange.cs +++ b/GEDCOM X Date/GedcomxDateRange.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X Date/GedcomxDateRecurring.cs b/GEDCOM X Date/GedcomxDateRecurring.cs index 3cb4c34..5f37ff9 100644 --- a/GEDCOM X Date/GedcomxDateRecurring.cs +++ b/GEDCOM X Date/GedcomxDateRecurring.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X Date/GedcomxDateSimple.cs b/GEDCOM X Date/GedcomxDateSimple.cs index cb6241b..202ee39 100644 --- a/GEDCOM X Date/GedcomxDateSimple.cs +++ b/GEDCOM X Date/GedcomxDateSimple.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Text; diff --git a/GEDCOM X Date/GedcomxDateType.cs b/GEDCOM X Date/GedcomxDateType.cs index 8dda66e..a355837 100644 --- a/GEDCOM X Date/GedcomxDateType.cs +++ b/GEDCOM X Date/GedcomxDateType.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/GEDCOM X Date/GedcomxDateUtil.cs b/GEDCOM X Date/GedcomxDateUtil.cs index f90b9e3..78a4d5a 100644 --- a/GEDCOM X Date/GedcomxDateUtil.cs +++ b/GEDCOM X Date/GedcomxDateUtil.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/GEDCOM X File/DefaultJsonSerialization.cs b/GEDCOM X File/DefaultJsonSerialization.cs index be50ce0..e33ccef 100644 --- a/GEDCOM X File/DefaultJsonSerialization.cs +++ b/GEDCOM X File/DefaultJsonSerialization.cs @@ -1,7 +1,6 @@ using Gedcomx.Support; using Newtonsoft.Json; using System; -using System.Xml.Serialization; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/GEDCOM X File/DefaultXMLSerialization.cs b/GEDCOM X File/DefaultXMLSerialization.cs index a8b564c..eb2f634 100644 --- a/GEDCOM X File/DefaultXMLSerialization.cs +++ b/GEDCOM X File/DefaultXMLSerialization.cs @@ -1,6 +1,7 @@ using Gedcomx.Support; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/GEDCOM X File/GedcomNamespaceManager.cs b/GEDCOM X File/GedcomNamespaceManager.cs index f337e24..59c322e 100644 --- a/GEDCOM X File/GedcomNamespaceManager.cs +++ b/GEDCOM X File/GedcomNamespaceManager.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X File/GedcomxFile.cs b/GEDCOM X File/GedcomxFile.cs index e039add..c5bba37 100644 --- a/GEDCOM X File/GedcomxFile.cs +++ b/GEDCOM X File/GedcomxFile.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.IO; using System.IO.Compression; diff --git a/GEDCOM X File/GedcomxFileEntry.cs b/GEDCOM X File/GedcomxFileEntry.cs index 734d445..0e7883e 100644 --- a/GEDCOM X File/GedcomxFileEntry.cs +++ b/GEDCOM X File/GedcomxFileEntry.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.IO.Compression; using System.Linq; diff --git a/GEDCOM X File/GedcomxOutputStream.cs b/GEDCOM X File/GedcomxOutputStream.cs index b5e4676..7121747 100644 --- a/GEDCOM X File/GedcomxOutputStream.cs +++ b/GEDCOM X File/GedcomxOutputStream.cs @@ -1,6 +1,7 @@ using Gedcomx.Support; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.IO; using System.IO.Compression; diff --git a/GEDCOM X File/IGedcomxEntryDeserializer.cs b/GEDCOM X File/IGedcomxEntryDeserializer.cs index 5fb91ba..25e96ad 100644 --- a/GEDCOM X File/IGedcomxEntryDeserializer.cs +++ b/GEDCOM X File/IGedcomxEntryDeserializer.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/GEDCOM X File/IGedcomxEntrySerializer.cs b/GEDCOM X File/IGedcomxEntrySerializer.cs index 8078919..f7de52c 100644 --- a/GEDCOM X File/IGedcomxEntrySerializer.cs +++ b/GEDCOM X File/IGedcomxEntrySerializer.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/GEDCOM X File/ManifestAttribute.cs b/GEDCOM X File/ManifestAttribute.cs index 70786ca..4fdecdb 100644 --- a/GEDCOM X File/ManifestAttribute.cs +++ b/GEDCOM X File/ManifestAttribute.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/GEDCOM X File/ManifestAttributes.cs b/GEDCOM X File/ManifestAttributes.cs index 17fe729..861304a 100644 --- a/GEDCOM X File/ManifestAttributes.cs +++ b/GEDCOM X File/ManifestAttributes.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.IO; using System.IO.Compression; diff --git a/GEDCOM X Support/MediaTypes.cs b/GEDCOM X Support/MediaTypes.cs index ea7d24c..52650f5 100644 --- a/GEDCOM X Support/MediaTypes.cs +++ b/GEDCOM X Support/MediaTypes.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/Gedcomx.CLI/RecordSetToCSV.cs b/Gedcomx.CLI/RecordSetToCSV.cs index ed29054..5be4cba 100644 --- a/Gedcomx.CLI/RecordSetToCSV.cs +++ b/Gedcomx.CLI/RecordSetToCSV.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using NDesk.Options; namespace Gx.CLI diff --git a/Gedcomx.Model.Fs/ArtifactMetadata.cs b/Gedcomx.Model.Fs/ArtifactMetadata.cs index 505624b..39abf37 100644 --- a/Gedcomx.Model.Fs/ArtifactMetadata.cs +++ b/Gedcomx.Model.Fs/ArtifactMetadata.cs @@ -6,7 +6,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Fs.Artifacts { @@ -32,8 +34,8 @@ public partial class ArtifactMetadata /// /// The type of the gender. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "artifactType")] - [Newtonsoft.Json.JsonProperty("artifactType")] + [XmlAttribute(AttributeName = "artifactType")] + [JsonProperty("artifactType")] public string ArtifactType { get @@ -49,8 +51,8 @@ public string ArtifactType /// /// Convenience property for treating ArtifactType as an enum. See Gx.Fs.Artifacts.ArtifactTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Fs.Artifacts.ArtifactType KnownArtifactType { get @@ -65,8 +67,8 @@ public Gx.Fs.Artifacts.ArtifactType KnownArtifactType /// /// The original filename of the memories item. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "filename", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("filename")] + [XmlElement(ElementName = "filename", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("filename")] public string Filename { get @@ -81,8 +83,8 @@ public string Filename /// /// The height of the artifact (presumably an image). /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "height", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("height")] + [XmlElement(ElementName = "height", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("height")] public int Height { get @@ -99,9 +101,9 @@ public int Height /// /// Property for the XML serializer indicating whether the "Height" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool HeightSpecified { get @@ -117,8 +119,8 @@ public bool HeightSpecified /// /// The width of the artifact (presumably an image). /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "width", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("width")] + [XmlElement(ElementName = "width", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("width")] public int Width { get @@ -135,9 +137,9 @@ public int Width /// /// Property for the XML serializer indicating whether the "Width" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool WidthSpecified { get diff --git a/Gedcomx.Model.Fs/ArtifactType.cs b/Gedcomx.Model.Fs/ArtifactType.cs index 42a2d9d..e3f2f44 100644 --- a/Gedcomx.Model.Fs/ArtifactType.cs +++ b/Gedcomx.Model.Fs/ArtifactType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs.Artifacts @@ -22,49 +23,49 @@ public enum ArtifactType /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name = "__NULL__")] + [XmlEnumAttribute(Name = "__NULL__")] NULL, /// /// The artifact is an audio. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Audio")] + [XmlEnum("http://familysearch.org/v1/Audio")] Audio, /// /// The artifact is an image of a document. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Document")] + [XmlEnum("http://familysearch.org/v1/Document")] Document, /// /// The artifact is an image. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Image")] + [XmlEnum("http://familysearch.org/v1/Image")] Image, /// /// The artifact is a portrait. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Portrait")] + [XmlEnum("http://familysearch.org/v1/Portrait")] Portrait, /// /// The artifact is a story. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Story")] + [XmlEnum("http://familysearch.org/v1/Story")] Story, /// /// The artifact is a video. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Video")] + [XmlEnum("http://familysearch.org/v1/Video")] Video, /// /// Custom /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model.Fs/ChangeInfo.cs b/Gedcomx.Model.Fs/ChangeInfo.cs index eff536b..96d5242 100644 --- a/Gedcomx.Model.Fs/ChangeInfo.cs +++ b/Gedcomx.Model.Fs/ChangeInfo.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs.Tree @@ -34,8 +35,8 @@ public partial class ChangeInfo /// /// An optional modifier for the object to which the operation applies. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "objectModifier")] - [Newtonsoft.Json.JsonProperty("objectModifier")] + [XmlAttribute(AttributeName = "objectModifier")] + [JsonProperty("objectModifier")] public string ObjectModifier { get @@ -51,8 +52,8 @@ public string ObjectModifier /// /// Convenience property for treating ObjectModifier as an enum. See Gx.Fs.Tree.ChangeObjectModifierQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Fs.Tree.ChangeObjectModifier KnownObjectModifier { get @@ -67,8 +68,8 @@ public Gx.Fs.Tree.ChangeObjectModifier KnownObjectModifier /// /// The operation of the change. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "operation")] - [Newtonsoft.Json.JsonProperty("operation")] + [XmlAttribute(AttributeName = "operation")] + [JsonProperty("operation")] public string Operation { get @@ -84,8 +85,8 @@ public string Operation /// /// Convenience property for treating Operation as an enum. See Gx.Fs.Tree.ChangeOperationQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Fs.Tree.ChangeOperation KnownOperation { get @@ -100,8 +101,8 @@ public Gx.Fs.Tree.ChangeOperation KnownOperation /// /// The reason for the change. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "reason")] - [Newtonsoft.Json.JsonProperty("reason")] + [XmlAttribute(AttributeName = "reason")] + [JsonProperty("reason")] public string Reason { get @@ -116,8 +117,8 @@ public string Reason /// /// The type of the object to which the operation applies. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "objectType")] - [Newtonsoft.Json.JsonProperty("objectType")] + [XmlAttribute(AttributeName = "objectType")] + [JsonProperty("objectType")] public string ObjectType { get @@ -133,8 +134,8 @@ public string ObjectType /// /// Convenience property for treating ObjectType as an enum. See Gx.Fs.Tree.ChangeObjectTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Fs.Tree.ChangeObjectType KnownObjectType { get @@ -149,8 +150,8 @@ public Gx.Fs.Tree.ChangeObjectType KnownObjectType /// /// The subject representing the original value(s) that existed before the change. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "original", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("original")] + [XmlElement(ElementName = "original", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("original")] public Gx.Common.ResourceReference Original { get @@ -165,8 +166,8 @@ public Gx.Common.ResourceReference Original /// /// The parent change that triggered, caused, or included this change. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "parent", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("parent")] + [XmlElement(ElementName = "parent", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("parent")] public Gx.Common.ResourceReference Parent { get @@ -181,8 +182,8 @@ public Gx.Common.ResourceReference Parent /// /// The subject representing the removed value(s) that existed before the change. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "removed", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("removed")] + [XmlElement(ElementName = "removed", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("removed")] public Gx.Common.ResourceReference Removed { get @@ -197,8 +198,8 @@ public Gx.Common.ResourceReference Removed /// /// The subject representing the result of the change. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "resulting", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("resulting")] + [XmlElement(ElementName = "resulting", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("resulting")] public Gx.Common.ResourceReference Resulting { get diff --git a/Gedcomx.Model.Fs/ChangeObjectModifier.cs b/Gedcomx.Model.Fs/ChangeObjectModifier.cs index 564d46e..e15604f 100644 --- a/Gedcomx.Model.Fs/ChangeObjectModifier.cs +++ b/Gedcomx.Model.Fs/ChangeObjectModifier.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs.Tree { @@ -20,25 +21,25 @@ public enum ChangeObjectModifier { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// The person. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Person")] + [XmlEnum("http://gedcomx.org/Person")] Person, /// /// The couple. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Couple")] + [XmlEnum("http://gedcomx.org/Couple")] Couple, /// /// The child-and-parents relationship. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/ChildAndParentsRelationship")] + [XmlEnum("http://familysearch.org/v1/ChildAndParentsRelationship")] ChildAndParentsRelationship } } diff --git a/Gedcomx.Model.Fs/ChangeObjectType.cs b/Gedcomx.Model.Fs/ChangeObjectType.cs index 654e086..743a2db 100644 --- a/Gedcomx.Model.Fs/ChangeObjectType.cs +++ b/Gedcomx.Model.Fs/ChangeObjectType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs.Tree { @@ -20,307 +21,307 @@ public enum ChangeObjectType { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// A person was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Person")] + [XmlEnum("http://gedcomx.org/Person")] Person, /// /// A couple relationship was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Couple")] + [XmlEnum("http://gedcomx.org/Couple")] Couple, /// /// A child-and-parents relationship was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/ChildAndParentsRelationship")] + [XmlEnum("http://familysearch.org/v1/ChildAndParentsRelationship")] ChildAndParentsRelationship, /// /// The man in a couple relationship was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Man")] + [XmlEnum("http://familysearch.org/v1/Man")] Man, /// /// The man in a couple relationship was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Woman")] + [XmlEnum("http://familysearch.org/v1/Woman")] Woman, /// /// The father in a couple-child relationship was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Father")] + [XmlEnum("http://familysearch.org/v1/Father")] Father, /// /// The mother in a couple-child relationship was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Mother")] + [XmlEnum("http://familysearch.org/v1/Mother")] Mother, /// /// The child in a couple-child relationship was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Child")] + [XmlEnum("http://familysearch.org/v1/Child")] Child, /// /// A source reference was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/SourceReference")] + [XmlEnum("http://gedcomx.org/SourceReference")] SourceReference, /// /// A discussion reference was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/DiscussionReference")] + [XmlEnum("http://familysearch.org/v1/DiscussionReference")] DiscussionReference, /// /// An evidence reference was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/EvidenceReference")] + [XmlEnum("http://familysearch.org/v1/EvidenceReference")] EvidenceReference, /// /// An affiliation fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Affiliation")] + [XmlEnum("http://familysearch.org/v1/Affiliation")] Affiliation, /// /// An annulment fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Annulment")] + [XmlEnum("http://gedcomx.org/Annulment")] Annulment, /// /// A bar mitzvah was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/BarMitzvah")] + [XmlEnum("http://gedcomx.org/BarMitzvah")] BarMitzvah, /// /// A bar mitzvah was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/BatMitzvah")] + [XmlEnum("http://gedcomx.org/BatMitzvah")] BatMitzvah, /// /// A birth fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Birth")] + [XmlEnum("http://gedcomx.org/Birth")] Birth, /// /// A burial fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Burial")] + [XmlEnum("http://gedcomx.org/Burial")] Burial, /// /// A christening fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Christening")] + [XmlEnum("http://gedcomx.org/Christening")] Christening, /// /// A cremation fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Cremation")] + [XmlEnum("http://gedcomx.org/Cremation")] Cremation, /// /// A common law marriage fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/CommonLawMarriage")] + [XmlEnum("http://gedcomx.org/CommonLawMarriage")] CommonLawMarriage, /// /// A death fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Death")] + [XmlEnum("http://gedcomx.org/Death")] Death, /// /// A divorce fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Divorce")] + [XmlEnum("http://gedcomx.org/Divorce")] Divorce, /// /// A marriage fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Marriage")] + [XmlEnum("http://gedcomx.org/Marriage")] Marriage, /// /// A military service fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MilitaryService")] + [XmlEnum("http://gedcomx.org/MilitaryService")] MilitaryService, /// /// A naturalization fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Naturalization")] + [XmlEnum("http://gedcomx.org/Naturalization")] Naturalization, /// /// An occupation fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Occupation")] + [XmlEnum("http://gedcomx.org/Occupation")] Occupation, /// /// A religion fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Religion")] + [XmlEnum("http://gedcomx.org/Religion")] Religion, /// /// A residence fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Residence")] + [XmlEnum("http://gedcomx.org/Residence")] Residence, /// /// A stillbirth fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Stillbirth")] + [XmlEnum("http://gedcomx.org/Stillbirth")] Stillbirth, /// /// A fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Fact")] + [XmlEnum("http://gedcomx.org/Fact")] Fact, /// /// A caste fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Caste")] + [XmlEnum("http://gedcomx.org/Caste")] Caste, /// /// A clan fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Clan")] + [XmlEnum("http://gedcomx.org/Clan")] Clan, /// /// A national id fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/NationalId")] + [XmlEnum("http://gedcomx.org/NationalId")] NationalId, /// /// A nationality fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Nationality")] + [XmlEnum("http://gedcomx.org/Nationality")] Nationality, /// /// A physical description fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/PhysicalDescription")] + [XmlEnum("http://gedcomx.org/PhysicalDescription")] PhysicalDescription, /// /// An ethnicity fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Ethnicity")] + [XmlEnum("http://gedcomx.org/Ethnicity")] Ethnicity, /// /// A gender was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Gender")] + [XmlEnum("http://gedcomx.org/Gender")] Gender, /// /// A note was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Note")] + [XmlEnum("http://gedcomx.org/Note")] Note, /// /// Name was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Name")] + [XmlEnum("http://gedcomx.org/Name")] Name, /// /// A birth name was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/BirthName")] + [XmlEnum("http://gedcomx.org/BirthName")] BirthName, /// /// An AKA name was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/AlsoKnownAs")] + [XmlEnum("http://gedcomx.org/AlsoKnownAs")] AlsoKnownAs, /// /// An married name was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriedName")] + [XmlEnum("http://gedcomx.org/MarriedName")] MarriedName, /// /// An nickname was changed. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Nickname")] + [XmlEnum("http://gedcomx.org/Nickname")] Nickname, /// /// A died before eight fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/DiedBeforeEight")] + [XmlEnum("http://familysearch.org/v1/DiedBeforeEight")] DiedBeforeEight, /// /// A tribe name fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/TribeName")] + [XmlEnum("http://familysearch.org/v1/TribeName")] TribeName, /// /// A birth order fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/BirthOrder")] + [XmlEnum("http://familysearch.org/v1/BirthOrder")] BirthOrder, /// /// A life sketch was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/LifeSketch")] + [XmlEnum("http://familysearch.org/v1/LifeSketch")] LifeSketch, /// /// A living status was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/LivingStatus")] + [XmlEnum("http://familysearch.org/v1/LivingStatus")] LivingStatus, /// /// A title of nobility fact was changed. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/TitleOfNobility")] + [XmlEnum("http://familysearch.org/v1/TitleOfNobility")] TitleOfNobility, /// /// A not-a-match declaration /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/NotAMatch")] + [XmlEnum("http://familysearch.org/v1/NotAMatch")] NotAMatch } } diff --git a/Gedcomx.Model.Fs/ChangeOperation.cs b/Gedcomx.Model.Fs/ChangeOperation.cs index 1f72fcc..80969e1 100644 --- a/Gedcomx.Model.Fs/ChangeOperation.cs +++ b/Gedcomx.Model.Fs/ChangeOperation.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs.Tree @@ -22,49 +23,49 @@ public enum ChangeOperation /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name = "__NULL__")] + [XmlEnumAttribute(Name = "__NULL__")] NULL, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Create")] + [XmlEnum("http://familysearch.org/v1/Create")] Create, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Read")] + [XmlEnum("http://familysearch.org/v1/Read")] Read, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Update")] + [XmlEnum("http://familysearch.org/v1/Update")] Update, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Delete")] + [XmlEnum("http://familysearch.org/v1/Delete")] Delete, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Merge")] + [XmlEnum("http://familysearch.org/v1/Merge")] Merge, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Unmerge")] + [XmlEnum("http://familysearch.org/v1/Unmerge")] Unmerge, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Restore")] + [XmlEnum("http://familysearch.org/v1/Restore")] Restore } } diff --git a/Gedcomx.Model.Fs/ChildAndParentsRelationship.cs b/Gedcomx.Model.Fs/ChildAndParentsRelationship.cs index 790c5ac..6b75b8f 100644 --- a/Gedcomx.Model.Fs/ChildAndParentsRelationship.cs +++ b/Gedcomx.Model.Fs/ChildAndParentsRelationship.cs @@ -8,6 +8,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs.Tree @@ -33,8 +34,8 @@ public partial class ChildAndParentsRelationship : Gx.Conclusion.Subject /// /// The father of the child. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "father", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("father")] + [XmlElement(ElementName = "father", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("father")] public Gx.Common.ResourceReference Father { get @@ -49,8 +50,8 @@ public Gx.Common.ResourceReference Father /// /// The mother of the child. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "mother", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("mother")] + [XmlElement(ElementName = "mother", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("mother")] public Gx.Common.ResourceReference Mother { get @@ -65,8 +66,8 @@ public Gx.Common.ResourceReference Mother /// /// child in the relationship. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "child", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("child")] + [XmlElement(ElementName = "child", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("child")] public Gx.Common.ResourceReference Child { get @@ -81,8 +82,8 @@ public Gx.Common.ResourceReference Child /// /// The fact conclusions for the father. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "fatherFact", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("fatherFacts")] + [XmlElement(ElementName = "fatherFact", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("fatherFacts")] public List FatherFacts { get @@ -97,8 +98,8 @@ public List FatherFacts /// /// The fact conclusions for the mother. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "motherFact", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("motherFacts")] + [XmlElement(ElementName = "motherFact", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("motherFacts")] public List MotherFacts { get diff --git a/Gedcomx.Model.Fs/Comment.cs b/Gedcomx.Model.Fs/Comment.cs index e3ac586..4bdc5b7 100644 --- a/Gedcomx.Model.Fs/Comment.cs +++ b/Gedcomx.Model.Fs/Comment.cs @@ -8,7 +8,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Fs.Discussions { @@ -31,8 +33,8 @@ public partial class Comment : Gx.Links.HypermediaEnabledData /// /// The text or "message body" of the comment /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "text", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("text")] + [XmlElement(ElementName = "text", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("text")] public string Text { get @@ -47,9 +49,9 @@ public string Text /// /// date of creation /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "created", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("created")] - [Newtonsoft.Json.JsonConverter(typeof(JsonUnixTimestampConverter))] + [XmlElement(ElementName = "created", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("created")] + [JsonConverter(typeof(JsonUnixTimestampConverter))] public DateTime Created { get @@ -66,9 +68,9 @@ public DateTime Created /// /// Property for the XML serializer indicating whether the "Created" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool CreatedSpecified { get @@ -84,8 +86,8 @@ public bool CreatedSpecified /// /// contributor of comment /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "contributor", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("contributor")] + [XmlElement(ElementName = "contributor", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("contributor")] public Gx.Common.ResourceReference Contributor { get diff --git a/Gedcomx.Model.Fs/Ct/MatchCollection.cs b/Gedcomx.Model.Fs/Ct/MatchCollection.cs index b07f3eb..de15412 100644 --- a/Gedcomx.Model.Fs/Ct/MatchCollection.cs +++ b/Gedcomx.Model.Fs/Ct/MatchCollection.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; @@ -12,29 +13,29 @@ public enum MatchCollection /** * The FamilySearch Family Tree. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Tree")] + [XmlEnum("http://gedcomx.org/Tree")] Tree, /** * The FamilySearch Record Set. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Records")] + [XmlEnum("http://gedcomx.org/Records")] Records, /** * The FamilySearch User-Submitted Trees. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Trees")] + [XmlEnum("http://gedcomx.org/Trees")] Lls, /** * The FamilySearch Temple System. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Temple")] + [XmlEnum("http://gedcomx.org/Temple")] Tss, // TODO: @XmlUnknownQNameEnumValue - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER, } } diff --git a/Gedcomx.Model.Fs/Discussion.cs b/Gedcomx.Model.Fs/Discussion.cs index 61719ed..bca945f 100644 --- a/Gedcomx.Model.Fs/Discussion.cs +++ b/Gedcomx.Model.Fs/Discussion.cs @@ -5,11 +5,13 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using Gx.Fs; using Gx.Fs.Rt; using Gx.Common; using Gedcomx.Model.Util; +using System.ComponentModel; namespace Gx.Fs.Discussions { @@ -39,8 +41,8 @@ public partial class Discussion : Gx.Links.HypermediaEnabledData /// /// the one-line summary text /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "title", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("title")] + [XmlElement(ElementName = "title", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("title")] public string Title { get @@ -55,8 +57,8 @@ public string Title /// /// The text or "message body" of the discussion /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "details", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("details")] + [XmlElement(ElementName = "details", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("details")] public string Details { get @@ -71,9 +73,9 @@ public string Details /// /// date of creation /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "created", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("created")] - [Newtonsoft.Json.JsonConverter(typeof(JsonUnixTimestampConverter))] + [XmlElement(ElementName = "created", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("created")] + [JsonConverter(typeof(JsonUnixTimestampConverter))] public DateTime Created { get @@ -90,9 +92,9 @@ public DateTime Created /// /// Property for the XML serializer indicating whether the "Created" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool CreatedSpecified { get @@ -108,8 +110,8 @@ public bool CreatedSpecified /// /// contributor of discussion /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "contributor", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("contributor")] + [XmlElement(ElementName = "contributor", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("contributor")] public Gx.Common.ResourceReference Contributor { get @@ -124,9 +126,9 @@ public Gx.Common.ResourceReference Contributor /// /// Date of last modification /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "modified", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("modified")] - [Newtonsoft.Json.JsonConverter(typeof(JsonUnixTimestampConverter))] + [XmlElement(ElementName = "modified", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("modified")] + [JsonConverter(typeof(JsonUnixTimestampConverter))] public DateTime Modified { get @@ -143,9 +145,9 @@ public DateTime Modified /// /// Property for the XML serializer indicating whether the "Modified" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool ModifiedSpecified { get @@ -161,8 +163,8 @@ public bool ModifiedSpecified /// /// Number of comments /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "numberOfComments", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("numberOfComments")] + [XmlElement(ElementName = "numberOfComments", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("numberOfComments")] public int NumberOfComments { get @@ -179,9 +181,9 @@ public int NumberOfComments /// /// Property for the XML serializer indicating whether the "NumberOfComments" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool NumberOfCommentsSpecified { get @@ -197,8 +199,8 @@ public bool NumberOfCommentsSpecified /// /// The comments on this discussion. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "comment", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("comments")] + [XmlElement(ElementName = "comment", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("comments")] public List Comments { get diff --git a/Gedcomx.Model.Fs/Error.cs b/Gedcomx.Model.Fs/Error.cs index faab851..c6b237a 100644 --- a/Gedcomx.Model.Fs/Error.cs +++ b/Gedcomx.Model.Fs/Error.cs @@ -5,7 +5,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Fs { @@ -30,8 +32,8 @@ public partial class Error /// /// The error code. Intepreted per <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html">RFC 2616, Section 10 (HTTP Status Code Definitions)</a>. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "code", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("code")] + [XmlElement(ElementName = "code", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("code")] public int Code { get @@ -48,9 +50,9 @@ public int Code /// /// Property for the XML serializer indicating whether the "Code" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool CodeSpecified { get @@ -66,8 +68,8 @@ public bool CodeSpecified /// /// A text label associated with the error code. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "label", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("label")] + [XmlElement(ElementName = "label", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("label")] public string Label { get @@ -82,8 +84,8 @@ public string Label /// /// A message associated with the error. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "message", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("message")] + [XmlElement(ElementName = "message", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("message")] public string Message { get @@ -98,8 +100,8 @@ public string Message /// /// The back-end stack trace associated with the error, useful for debugging. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "stacktrace", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("stacktrace")] + [XmlElement(ElementName = "stacktrace", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("stacktrace")] public string Stacktrace { get diff --git a/Gedcomx.Model.Fs/FamilySearchPlatform.cs b/Gedcomx.Model.Fs/FamilySearchPlatform.cs index bac50b7..2320f56 100644 --- a/Gedcomx.Model.Fs/FamilySearchPlatform.cs +++ b/Gedcomx.Model.Fs/FamilySearchPlatform.cs @@ -9,6 +9,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs @@ -43,8 +44,8 @@ public partial class FamilySearchPlatform : Gx.Gedcomx /// /// The child-and-parents relationships for this data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "childAndParentsRelationship", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("childAndParentsRelationships")] + [XmlElement(ElementName = "childAndParentsRelationship", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("childAndParentsRelationships")] public List ChildAndParentsRelationships { get @@ -59,8 +60,8 @@ public List ChildAndParentsRelationships /// /// The discussions included in this data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "discussion", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("discussions")] + [XmlElement(ElementName = "discussion", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("discussions")] public List Discussions { get @@ -75,8 +76,8 @@ public List Discussions /// /// The users included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "user", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("users")] + [XmlElement(ElementName = "user", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("users")] public List Users { get @@ -91,8 +92,8 @@ public List Users /// /// The merges for this data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "merge", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("merges")] + [XmlElement(ElementName = "merge", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("merges")] public List Merges { get @@ -107,8 +108,8 @@ public List Merges /// /// The merge analysis results for this data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "mergeAnalysis", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("mergeAnalyses")] + [XmlElement(ElementName = "mergeAnalysis", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("mergeAnalyses")] public List MergeAnalyses { get @@ -123,8 +124,8 @@ public List MergeAnalyses /// /// The set of features defined in the platform API. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "feature", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("features")] + [XmlElement(ElementName = "feature", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("features")] public List Features { get diff --git a/Gedcomx.Model.Fs/Feature.cs b/Gedcomx.Model.Fs/Feature.cs index abf680f..dae223a 100644 --- a/Gedcomx.Model.Fs/Feature.cs +++ b/Gedcomx.Model.Fs/Feature.cs @@ -6,7 +6,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Fs { @@ -31,8 +33,8 @@ public partial class Feature /// /// The name of the feature. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "name", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("name")] + [XmlElement(ElementName = "name", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("name")] public string Name { get @@ -47,8 +49,8 @@ public string Name /// /// A description of the feature. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "description", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("description")] + [XmlElement(ElementName = "description", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("description")] public string Description { get @@ -63,8 +65,8 @@ public string Description /// /// Whether the feature is enabled for the current request. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "enabled", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("enabled")] + [XmlElement(ElementName = "enabled", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("enabled")] public bool Enabled { get @@ -81,9 +83,9 @@ public bool Enabled /// /// Property for the XML serializer indicating whether the "Enabled" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool EnabledSpecified { get @@ -99,9 +101,9 @@ public bool EnabledSpecified /// /// The date that this feature is scheduled to activate permanently. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "activationDate", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("activationDate")] - [Newtonsoft.Json.JsonConverter(typeof(JsonUnixTimestampConverter))] + [XmlElement(ElementName = "activationDate", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("activationDate")] + [JsonConverter(typeof(JsonUnixTimestampConverter))] public DateTime ActivationDate { get @@ -118,9 +120,9 @@ public DateTime ActivationDate /// /// Property for the XML serializer indicating whether the "ActivationDate" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool ActivationDateSpecified { get diff --git a/Gedcomx.Model.Fs/HealthConfig.cs b/Gedcomx.Model.Fs/HealthConfig.cs index c70527a..6e9c120 100644 --- a/Gedcomx.Model.Fs/HealthConfig.cs +++ b/Gedcomx.Model.Fs/HealthConfig.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs @@ -29,8 +30,8 @@ public partial class HealthConfig /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "buildDate", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("buildDate")] + [XmlElement(ElementName = "buildDate", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("buildDate")] public string BuildDate { get @@ -45,8 +46,8 @@ public string BuildDate /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "buildVersion", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("buildVersion")] + [XmlElement(ElementName = "buildVersion", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("buildVersion")] public string BuildVersion { get @@ -61,8 +62,8 @@ public string BuildVersion /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "databaseVersion", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("databaseVersion")] + [XmlElement(ElementName = "databaseVersion", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("databaseVersion")] public string DatabaseVersion { get @@ -77,8 +78,8 @@ public string DatabaseVersion /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "platformVersion", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("platformVersion")] + [XmlElement(ElementName = "platformVersion", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("platformVersion")] public string PlatformVersion { get diff --git a/Gedcomx.Model.Fs/MatchInfo.cs b/Gedcomx.Model.Fs/MatchInfo.cs index b4ddf27..aef3b5a 100644 --- a/Gedcomx.Model.Fs/MatchInfo.cs +++ b/Gedcomx.Model.Fs/MatchInfo.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs.Tree @@ -28,8 +29,8 @@ public partial class MatchInfo /// /// The way this match has been resolved. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "status")] - [Newtonsoft.Json.JsonProperty("status")] + [XmlAttribute(AttributeName = "status")] + [JsonProperty("status")] public string Status { get @@ -45,8 +46,8 @@ public string Status /// /// Convenience property for treating Status as an enum. See Gx.Fs.Tree.MatchStatusQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Fs.Tree.MatchStatus KnownStatus { get @@ -61,8 +62,8 @@ public Gx.Fs.Tree.MatchStatus KnownStatus /// /// The collection in which this match was found. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "collection")] - [Newtonsoft.Json.JsonProperty("collection")] + [XmlAttribute(AttributeName = "collection")] + [JsonProperty("collection")] public string Collection { get diff --git a/Gedcomx.Model.Fs/MatchResolution.cs b/Gedcomx.Model.Fs/MatchResolution.cs index ed0a9f9..2e7b3cd 100644 --- a/Gedcomx.Model.Fs/MatchResolution.cs +++ b/Gedcomx.Model.Fs/MatchResolution.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs.Tree @@ -22,25 +23,25 @@ public enum MatchResolution /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name = "__NULL__")] + [XmlEnumAttribute(Name = "__NULL__")] NULL, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Unset")] + [XmlEnum("http://familysearch.org/v1/Unset")] Unset, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Positive")] + [XmlEnum("http://familysearch.org/v1/Positive")] Positive, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Negative")] + [XmlEnum("http://familysearch.org/v1/Negative")] Negative } } diff --git a/Gedcomx.Model.Fs/MatchStatus.cs b/Gedcomx.Model.Fs/MatchStatus.cs index eec6a3d..cb03b4a 100644 --- a/Gedcomx.Model.Fs/MatchStatus.cs +++ b/Gedcomx.Model.Fs/MatchStatus.cs @@ -3,6 +3,8 @@ // // Generated by Enunciate. // +using System.Xml.Serialization; + namespace Gx.Fs.Tree { @@ -18,25 +20,25 @@ public enum MatchStatus /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name = "__NULL__")] + [XmlEnum(Name = "__NULL__")] NULL, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Pending")] + [XmlEnum("http://familysearch.org/v1/Pending")] Pending, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Accepted")] + [XmlEnum("http://familysearch.org/v1/Accepted")] Accepted, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/Rejected")] + [XmlEnum("http://familysearch.org/v1/Rejected")] Rejected } } diff --git a/Gedcomx.Model.Fs/MatchSystem.cs b/Gedcomx.Model.Fs/MatchSystem.cs index ffaa77f..6583404 100644 --- a/Gedcomx.Model.Fs/MatchSystem.cs +++ b/Gedcomx.Model.Fs/MatchSystem.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs.Tree @@ -22,37 +23,37 @@ public enum MatchSystem /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name = "__NULL__")] + [XmlEnumAttribute(Name = "__NULL__")] NULL, /// /// The FamilySearch Family Tree. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/tree")] + [XmlEnum("http://familysearch.org/v1/tree")] tree, /// /// The FamilySearch Record Set. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/records")] + [XmlEnum("http://familysearch.org/v1/records")] records, /// /// The FamilySearch User-Submitted Trees. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/trees")] + [XmlEnum("http://familysearch.org/v1/trees")] lls, /// /// The FamilySearch Temple System. /// - [System.Xml.Serialization.XmlEnum("http://familysearch.org/v1/temple")] + [XmlEnum("http://familysearch.org/v1/temple")] tss, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model.Fs/Merge.cs b/Gedcomx.Model.Fs/Merge.cs index a2a4b43..afaef58 100644 --- a/Gedcomx.Model.Fs/Merge.cs +++ b/Gedcomx.Model.Fs/Merge.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs.Tree @@ -28,8 +29,8 @@ public partial class Merge /// /// List of resources to remove from the survivor person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "resourceToDelete", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("resourcesToDelete")] + [XmlElement(ElementName = "resourceToDelete", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("resourcesToDelete")] public List ResourcesToDelete { get @@ -44,8 +45,8 @@ public List ResourcesToDelete /// /// List of resources to copy from the duplicate person to survivor person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "resourceToCopy", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("resourcesToCopy")] + [XmlElement(ElementName = "resourceToCopy", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("resourcesToCopy")] public List ResourcesToCopy { get diff --git a/Gedcomx.Model.Fs/MergeAnalysis.cs b/Gedcomx.Model.Fs/MergeAnalysis.cs index b5ee29d..ec701cf 100644 --- a/Gedcomx.Model.Fs/MergeAnalysis.cs +++ b/Gedcomx.Model.Fs/MergeAnalysis.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Fs.Tree @@ -31,8 +32,8 @@ public partial class MergeAnalysis /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "survivorResource", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("survivorResources")] + [XmlElement(ElementName = "survivorResource", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("survivorResources")] public List SurvivorResources { get @@ -47,8 +48,8 @@ public List SurvivorResources /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "duplicateResource", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("duplicateResources")] + [XmlElement(ElementName = "duplicateResource", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("duplicateResources")] public List DuplicateResources { get @@ -63,8 +64,8 @@ public List DuplicateResources /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "conflictingResource", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("conflictingResources")] + [XmlElement(ElementName = "conflictingResource", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("conflictingResources")] public List ConflictingResources { get @@ -79,8 +80,8 @@ public List ConflictingResources /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "survivor", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("survivor")] + [XmlElement(ElementName = "survivor", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("survivor")] public Gx.Common.ResourceReference Survivor { get @@ -95,8 +96,8 @@ public Gx.Common.ResourceReference Survivor /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "duplicate", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("duplicate")] + [XmlElement(ElementName = "duplicate", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("duplicate")] public Gx.Common.ResourceReference Duplicate { get diff --git a/Gedcomx.Model.Fs/MergeConflict.cs b/Gedcomx.Model.Fs/MergeConflict.cs index e68babc..817ffe2 100644 --- a/Gedcomx.Model.Fs/MergeConflict.cs +++ b/Gedcomx.Model.Fs/MergeConflict.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; namespace Gx.Fs.Tree @@ -27,8 +28,8 @@ public partial class MergeConflict /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "survivorResource", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("survivorResource")] + [XmlElement(ElementName = "survivorResource", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("survivorResource")] public Gx.Common.ResourceReference SurvivorResource { get @@ -43,8 +44,8 @@ public Gx.Common.ResourceReference SurvivorResource /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "duplicateResource", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("duplicateResource")] + [XmlElement(ElementName = "duplicateResource", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("duplicateResource")] public Gx.Common.ResourceReference DuplicateResource { get diff --git a/Gedcomx.Model.Fs/Rt/FamilySearchPlatformLocalReferenceResolver.cs b/Gedcomx.Model.Fs/Rt/FamilySearchPlatformLocalReferenceResolver.cs index b5fc0bd..8b3533a 100644 --- a/Gedcomx.Model.Fs/Rt/FamilySearchPlatformLocalReferenceResolver.cs +++ b/Gedcomx.Model.Fs/Rt/FamilySearchPlatformLocalReferenceResolver.cs @@ -7,6 +7,7 @@ using Gx.Source; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model.Fs/Rt/FamilySearchPlatformModelVisitorBase.cs b/Gedcomx.Model.Fs/Rt/FamilySearchPlatformModelVisitorBase.cs index c48a18a..036aa25 100644 --- a/Gedcomx.Model.Fs/Rt/FamilySearchPlatformModelVisitorBase.cs +++ b/Gedcomx.Model.Fs/Rt/FamilySearchPlatformModelVisitorBase.cs @@ -5,6 +5,7 @@ using Gx.Fs.Users; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model.Fs/Rt/IFamilySearchPlatformModelVisitor.cs b/Gedcomx.Model.Fs/Rt/IFamilySearchPlatformModelVisitor.cs index 252d410..9370423 100644 --- a/Gedcomx.Model.Fs/Rt/IFamilySearchPlatformModelVisitor.cs +++ b/Gedcomx.Model.Fs/Rt/IFamilySearchPlatformModelVisitor.cs @@ -4,6 +4,7 @@ using Gx.Fs.Users; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model.Fs/User.cs b/Gedcomx.Model.Fs/User.cs index 50a2de9..13fc7cc 100644 --- a/Gedcomx.Model.Fs/User.cs +++ b/Gedcomx.Model.Fs/User.cs @@ -6,7 +6,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Fs.Users { @@ -44,8 +46,8 @@ public partial class User : Gx.Links.HypermediaEnabledData /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "alternateEmail", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("alternateEmail")] + [XmlElement(ElementName = "alternateEmail", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("alternateEmail")] public string AlternateEmail { get @@ -60,8 +62,8 @@ public string AlternateEmail /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "birthDate", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("birthDate")] + [XmlElement(ElementName = "birthDate", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("birthDate")] public string BirthDate { get @@ -76,8 +78,8 @@ public string BirthDate /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "contactName", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("contactName")] + [XmlElement(ElementName = "contactName", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("contactName")] public string ContactName { get @@ -92,8 +94,8 @@ public string ContactName /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "country", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("country")] + [XmlElement(ElementName = "country", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("country")] public string Country { get @@ -108,8 +110,8 @@ public string Country /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "displayName", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("displayName")] + [XmlElement(ElementName = "displayName", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("displayName")] public string DisplayName { get @@ -124,8 +126,8 @@ public string DisplayName /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "email", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("email")] + [XmlElement(ElementName = "email", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("email")] public string Email { get @@ -140,8 +142,8 @@ public string Email /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "familyName", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("familyName")] + [XmlElement(ElementName = "familyName", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("familyName")] public string FamilyName { get @@ -156,8 +158,8 @@ public string FamilyName /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "fullName", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("fullName")] + [XmlElement(ElementName = "fullName", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("fullName")] public string FullName { get @@ -172,8 +174,8 @@ public string FullName /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "gender", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("gender")] + [XmlElement(ElementName = "gender", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("gender")] public string Gender { get @@ -188,8 +190,8 @@ public string Gender /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "givenName", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("givenName")] + [XmlElement(ElementName = "givenName", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("givenName")] public string GivenName { get @@ -204,8 +206,8 @@ public string GivenName /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "helperAccessPin", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("helperAccessPin")] + [XmlElement(ElementName = "helperAccessPin", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("helperAccessPin")] public string HelperAccessPin { get @@ -220,8 +222,8 @@ public string HelperAccessPin /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "ldsMemberAccount", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("ldsMemberAccount")] + [XmlElement(ElementName = "ldsMemberAccount", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("ldsMemberAccount")] public bool LdsMemberAccount { get @@ -238,9 +240,9 @@ public bool LdsMemberAccount /// /// Property for the XML serializer indicating whether the "LdsMemberAccount" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool LdsMemberAccountSpecified { get @@ -256,8 +258,8 @@ public bool LdsMemberAccountSpecified /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "mailingAddress", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("mailingAddress")] + [XmlElement(ElementName = "mailingAddress", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("mailingAddress")] public string MailingAddress { get @@ -272,8 +274,8 @@ public string MailingAddress /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "personId", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("personId")] + [XmlElement(ElementName = "personId", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("personId")] public string PersonId { get @@ -288,8 +290,8 @@ public string PersonId /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "phoneNumber", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("phoneNumber")] + [XmlElement(ElementName = "phoneNumber", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("phoneNumber")] public string PhoneNumber { get @@ -304,8 +306,8 @@ public string PhoneNumber /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "preferredLanguage", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("preferredLanguage")] + [XmlElement(ElementName = "preferredLanguage", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("preferredLanguage")] public string PreferredLanguage { get @@ -320,8 +322,8 @@ public string PreferredLanguage /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "treeUserId", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("treeUserId")] + [XmlElement(ElementName = "treeUserId", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("treeUserId")] public string TreeUserId { get diff --git a/Gedcomx.Model.Rs/Category.cs b/Gedcomx.Model.Rs/Category.cs index 1cf2682..07be51b 100644 --- a/Gedcomx.Model.Rs/Category.cs +++ b/Gedcomx.Model.Rs/Category.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Atom @@ -27,8 +28,8 @@ public sealed partial class Category : Gx.Atom.CommonAttributes /// /// identifies a categorization scheme /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "scheme")] - [Newtonsoft.Json.JsonProperty("scheme")] + [XmlAttribute(AttributeName = "scheme")] + [JsonProperty("scheme")] public string Scheme { get @@ -43,8 +44,8 @@ public string Scheme /// /// identifies the category to which the entry or feed belongs /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "term")] - [Newtonsoft.Json.JsonProperty("term")] + [XmlAttribute(AttributeName = "term")] + [JsonProperty("term")] public string Term { get @@ -59,8 +60,8 @@ public string Term /// /// a human-readable label for display in end-user applications /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "label")] - [Newtonsoft.Json.JsonProperty("label")] + [XmlAttribute(AttributeName = "label")] + [JsonProperty("label")] public string Label { get diff --git a/Gedcomx.Model.Rs/CommonAttributes.cs b/Gedcomx.Model.Rs/CommonAttributes.cs index 1b2553c..9282ed1 100644 --- a/Gedcomx.Model.Rs/CommonAttributes.cs +++ b/Gedcomx.Model.Rs/CommonAttributes.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Atom @@ -26,8 +27,8 @@ public abstract partial class CommonAttributes /// /// The base. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "base")] - [Newtonsoft.Json.JsonProperty("base")] + [XmlAttribute(AttributeName = "base")] + [JsonProperty("base")] public string Base { get @@ -42,8 +43,8 @@ public string Base /// /// The language. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get diff --git a/Gedcomx.Model.Rs/Content.cs b/Gedcomx.Model.Rs/Content.cs index b1ebd62..c98743d 100644 --- a/Gedcomx.Model.Rs/Content.cs +++ b/Gedcomx.Model.Rs/Content.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Atom @@ -26,8 +27,8 @@ public sealed partial class Content /// /// The type of the content. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -42,8 +43,8 @@ public string Type /// /// The genealogical data associated with this entry. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "gedcomx", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("gedcomx")] + [XmlElement(ElementName = "gedcomx", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("gedcomx")] public Gx.Gedcomx Gedcomx { get diff --git a/Gedcomx.Model.Rs/Entry.cs b/Gedcomx.Model.Rs/Entry.cs index f7a7391..8e08b9b 100644 --- a/Gedcomx.Model.Rs/Entry.cs +++ b/Gedcomx.Model.Rs/Entry.cs @@ -11,6 +11,7 @@ using System.Collections.Generic; using System.Linq; using Gedcomx.Model.Util; +using System.ComponentModel; namespace Gx.Atom { @@ -46,8 +47,8 @@ public partial class Entry : Gx.Atom.ExtensibleElement, ISupportsLinks /// /// The author of the entry. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "author", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("authors")] + [XmlElement(ElementName = "author", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("authors")] public List Authors { get @@ -62,8 +63,8 @@ public List Authors /// /// information about a category associated with an entry. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "category", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("categories")] + [XmlElement(ElementName = "category", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("categories")] public List Categories { get @@ -78,8 +79,8 @@ public List Categories /// /// The confidence of the result, if this entry represents a search result. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "confidence", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("confidence")] + [XmlElement(ElementName = "confidence", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("confidence")] public Gx.Search.ResultConfidence Confidence { get @@ -95,9 +96,9 @@ public Gx.Search.ResultConfidence Confidence /// /// Property for the XML serializer indicating whether the "Confidence" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool ConfidenceSpecified { get @@ -115,8 +116,8 @@ public bool ConfidenceSpecified /// /// The content of the entry. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "content", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("content")] + [XmlElement(ElementName = "content", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("content")] public Gx.Atom.Content Content { get @@ -131,8 +132,8 @@ public Gx.Atom.Content Content /// /// information about a category associated with the entry /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "contributor", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("contributors")] + [XmlElement(ElementName = "contributor", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("contributors")] public List Contributors { get @@ -147,8 +148,8 @@ public List Contributors /// /// a permanent, universally unique identifier for the entry. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "id", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("id")] + [XmlElement(ElementName = "id", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("id")] public string Id { get @@ -163,8 +164,8 @@ public string Id /// /// a reference from a entry to a Web resource. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "link", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("links")] + [XmlElement(ElementName = "link", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("links")] [JsonConverter(typeof(JsonHypermediaLinksConverter))] public List Links { @@ -180,8 +181,8 @@ public List Links /// /// instant in time associated with an event early in the life cycle of the entry. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "published", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("published")] + [XmlElement(ElementName = "published", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("published")] public DateTime Published { get @@ -198,9 +199,9 @@ public DateTime Published /// /// Property for the XML serializer indicating whether the "Published" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool PublishedSpecified { get @@ -216,8 +217,8 @@ public bool PublishedSpecified /// /// information about rights held in and over the entry. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "rights", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("rights")] + [XmlElement(ElementName = "rights", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("rights")] public string Rights { get @@ -232,8 +233,8 @@ public string Rights /// /// The relevance score. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "score", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("score")] + [XmlElement(ElementName = "score", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("score")] public float Score { get @@ -250,9 +251,9 @@ public float Score /// /// Property for the XML serializer indicating whether the "Score" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool ScoreSpecified { get @@ -268,8 +269,8 @@ public bool ScoreSpecified /// /// a human-readable title for the entry /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "title", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("title")] + [XmlElement(ElementName = "title", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("title")] public string Title { get @@ -284,8 +285,8 @@ public string Title /// /// the most recent instant in time when the entry was modified in a way the publisher considers significant. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "updated", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("updated")] + [XmlElement(ElementName = "updated", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("updated")] [JsonConverter(typeof(JsonUnixTimestampConverter))] public DateTime Updated { @@ -303,9 +304,9 @@ public DateTime Updated /// /// Property for the XML serializer indicating whether the "Updated" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool UpdatedSpecified { get @@ -322,7 +323,7 @@ public bool UpdatedSpecified /// /// The other attributes. /// - [System.Xml.Serialization.XmlAnyAttributeAttribute()] + [XmlAnyAttributeAttribute()] public System.Xml.XmlAttribute[] OtherAttributes { get diff --git a/Gedcomx.Model.Rs/ExtensibleElement.cs b/Gedcomx.Model.Rs/ExtensibleElement.cs index 9d3c8cf..cc6c86e 100644 --- a/Gedcomx.Model.Rs/ExtensibleElement.cs +++ b/Gedcomx.Model.Rs/ExtensibleElement.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Atom @@ -28,8 +29,8 @@ public abstract partial class ExtensibleElement : Gx.Atom.CommonAttributes /// /// Custom extension elements. /// - [System.Xml.Serialization.XmlAnyElementAttribute()] - [Newtonsoft.Json.JsonIgnore] + [XmlAnyElementAttribute()] + [JsonIgnore] public List ExtensionElementsXml { get @@ -45,8 +46,8 @@ public List ExtensionElementsXml /// /// Custom extension elements. /// - [System.Xml.Serialization.XmlIgnore()] - [Newtonsoft.Json.JsonExtensionData] + [XmlIgnore()] + [JsonExtensionData] public Dictionary ExtensionElementsJson { get diff --git a/Gedcomx.Model.Rs/Feed.cs b/Gedcomx.Model.Rs/Feed.cs index ec54b31..72766eb 100644 --- a/Gedcomx.Model.Rs/Feed.cs +++ b/Gedcomx.Model.Rs/Feed.cs @@ -11,6 +11,7 @@ using System.Collections.Generic; using System.Linq; using Gedcomx.Model.Util; +using System.ComponentModel; namespace Gx.Atom { @@ -52,8 +53,8 @@ public partial class Feed : Gx.Atom.ExtensibleElement, ISupportsLinks /// /// The author of the feed. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "author", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("authors")] + [XmlElement(ElementName = "author", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("authors")] public List Authors { get @@ -68,8 +69,8 @@ public List Authors /// /// information about a category associated with the feed /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "contributor", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("contributors")] + [XmlElement(ElementName = "contributor", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("contributors")] public List Contributors { get @@ -84,8 +85,8 @@ public List Contributors /// /// identifies the agent used to generate the feed /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "generator", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("generator")] + [XmlElement(ElementName = "generator", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("generator")] public Gx.Atom.Generator Generator { get @@ -100,8 +101,8 @@ public Gx.Atom.Generator Generator /// /// identifies an image that provides iconic visual identification for the feed. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "icon", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("icon")] + [XmlElement(ElementName = "icon", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("icon")] public string Icon { get @@ -116,8 +117,8 @@ public string Icon /// /// a permanent, universally unique identifier for the feed. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "id", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("id")] + [XmlElement(ElementName = "id", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("id")] public string Id { get @@ -132,8 +133,8 @@ public string Id /// /// The total number of results available, if this feed is supplying a subset of results, such as for a query. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "results", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("results")] + [XmlElement(ElementName = "results", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("results")] public int Results { get @@ -150,9 +151,9 @@ public int Results /// /// Property for the XML serializer indicating whether the "Results" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool ResultsSpecified { get @@ -168,8 +169,8 @@ public bool ResultsSpecified /// /// The index of the first entry in this page of data, if this feed is supplying a page of data. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "index", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("index")] + [XmlElement(ElementName = "index", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("index")] public int Index { get @@ -186,9 +187,9 @@ public int Index /// /// Property for the XML serializer indicating whether the "Index" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool IndexSpecified { get @@ -204,8 +205,8 @@ public bool IndexSpecified /// /// a reference from a feed to a Web resource. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "link", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("links")] + [XmlElement(ElementName = "link", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("links")] [JsonConverter(typeof(JsonHypermediaLinksConverter))] public List Links { @@ -221,8 +222,8 @@ public List Links /// /// identifies an image that provides visual identification for the feed. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "logo", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("logo")] + [XmlElement(ElementName = "logo", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("logo")] public string Logo { get @@ -237,8 +238,8 @@ public string Logo /// /// information about rights held in and over the feed. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "rights", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("rights")] + [XmlElement(ElementName = "rights", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("rights")] public string Rights { get @@ -253,8 +254,8 @@ public string Rights /// /// a human-readable description or subtitle for the feed. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "subtitle", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("subtitle")] + [XmlElement(ElementName = "subtitle", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("subtitle")] public string Subtitle { get @@ -269,8 +270,8 @@ public string Subtitle /// /// a human-readable title for the feed /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "title", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("title")] + [XmlElement(ElementName = "title", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("title")] public string Title { get @@ -285,8 +286,8 @@ public string Title /// /// the most recent instant in time when the feed was modified in a way the publisher considers significant. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "updated", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("updated")] + [XmlElement(ElementName = "updated", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("updated")] [JsonConverter(typeof(JsonUnixTimestampConverter))] public DateTime Updated { @@ -304,9 +305,9 @@ public DateTime Updated /// /// Property for the XML serializer indicating whether the "Updated" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool UpdatedSpecified { get @@ -322,8 +323,8 @@ public bool UpdatedSpecified /// /// The entries in the feed. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "entry", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("entries")] + [XmlElement(ElementName = "entry", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("entries")] public List Entries { get @@ -338,8 +339,8 @@ public List Entries /// /// The list of facets for the feed, used for convenience in browsing and filtering. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "facet", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("facets")] + [XmlElement(ElementName = "facet", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("facets")] public List Facets { get diff --git a/Gedcomx.Model.Rs/Generator.cs b/Gedcomx.Model.Rs/Generator.cs index 75091c5..e6a08b9 100644 --- a/Gedcomx.Model.Rs/Generator.cs +++ b/Gedcomx.Model.Rs/Generator.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Atom @@ -29,8 +30,8 @@ public sealed partial class Generator /// /// The base. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "base")] - [Newtonsoft.Json.JsonProperty("base")] + [XmlAttribute(AttributeName = "base")] + [JsonProperty("base")] public string Base { get @@ -45,8 +46,8 @@ public string Base /// /// link to a representation that is relevant to the generating agent. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "uri")] - [Newtonsoft.Json.JsonProperty("uri")] + [XmlAttribute(AttributeName = "uri")] + [JsonProperty("uri")] public string Uri { get @@ -61,8 +62,8 @@ public string Uri /// /// The language. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get @@ -77,8 +78,8 @@ public string Lang /// /// the version of the generating agent /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "version")] - [Newtonsoft.Json.JsonProperty("version")] + [XmlAttribute(AttributeName = "version")] + [JsonProperty("version")] public string Version { get @@ -93,8 +94,8 @@ public string Version /// /// human-readable name for the generating agent /// - [System.Xml.Serialization.XmlTextAttribute()] - [Newtonsoft.Json.JsonProperty("value")] + [XmlTextAttribute()] + [JsonProperty("value")] public string Value { get diff --git a/Gedcomx.Model.Rs/Person.cs b/Gedcomx.Model.Rs/Person.cs index e8b0046..8fe62f9 100644 --- a/Gedcomx.Model.Rs/Person.cs +++ b/Gedcomx.Model.Rs/Person.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Atom @@ -27,8 +28,8 @@ public sealed partial class Person : Gx.Atom.ExtensibleElement /// /// a human-readable name for the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "name", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("name")] + [XmlElement(ElementName = "name", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("name")] public string Name { get @@ -43,8 +44,8 @@ public string Name /// /// an IRI associated with the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "uri", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("uri")] + [XmlElement(ElementName = "uri", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("uri")] public string Uri { get @@ -59,8 +60,8 @@ public string Uri /// /// an e-mail address associated with the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "email", Namespace = "http://www.w3.org/2005/Atom")] - [Newtonsoft.Json.JsonProperty("email")] + [XmlElement(ElementName = "email", Namespace = "http://www.w3.org/2005/Atom")] + [JsonProperty("email")] public string Email { get diff --git a/Gedcomx.Model.Rs/ResultConfidence.cs b/Gedcomx.Model.Rs/ResultConfidence.cs index 7121713..644baa1 100644 --- a/Gedcomx.Model.Rs/ResultConfidence.cs +++ b/Gedcomx.Model.Rs/ResultConfidence.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Search { @@ -20,37 +21,37 @@ public enum ResultConfidence { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// Result confidence level 1 (lowest). /// - [System.Xml.Serialization.XmlEnumAttribute(Name="1")] + [XmlEnumAttribute(Name="1")] one, /// /// Result confidence level 2. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="2")] + [XmlEnumAttribute(Name="2")] two, /// /// Result confidence level 3. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="3")] + [XmlEnumAttribute(Name="3")] three, /// /// Result confidence level 4. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="4")] + [XmlEnumAttribute(Name="4")] four, /// /// Result confidence level 5 (highest). /// - [System.Xml.Serialization.XmlEnumAttribute(Name="5")] + [XmlEnumAttribute(Name="5")] five } diff --git a/Gedcomx.Model/Address.cs b/Gedcomx.Model/Address.cs index 5478cd9..f6a5ad7 100644 --- a/Gedcomx.Model/Address.cs +++ b/Gedcomx.Model/Address.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; namespace Gx.Agent { @@ -17,7 +18,7 @@ namespace Gx.Agent /// [Serializable] [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Address")] - [Newtonsoft.Json.JsonObject("")] + [JsonObject("")] public partial class Address : Gx.Common.ExtensibleData { @@ -35,8 +36,8 @@ public partial class Address : Gx.Common.ExtensibleData /// /// The city. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "city", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("city")] + [XmlElement(ElementName = "city", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("city")] public string City { get @@ -51,8 +52,8 @@ public string City /// /// The country. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "country", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("country")] + [XmlElement(ElementName = "country", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("country")] public string Country { get @@ -67,8 +68,8 @@ public string Country /// /// The postal code. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "postalCode", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("postalCode")] + [XmlElement(ElementName = "postalCode", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("postalCode")] public string PostalCode { get @@ -83,8 +84,8 @@ public string PostalCode /// /// The state or province. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "stateOrProvince", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("stateOrProvince")] + [XmlElement(ElementName = "stateOrProvince", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("stateOrProvince")] public string StateOrProvince { get @@ -99,8 +100,8 @@ public string StateOrProvince /// /// The street. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "street", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("street")] + [XmlElement(ElementName = "street", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("street")] public string Street { get @@ -115,8 +116,8 @@ public string Street /// /// Additional street information. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "street2", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("street2")] + [XmlElement(ElementName = "street2", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("street2")] public string Street2 { get @@ -131,8 +132,8 @@ public string Street2 /// /// Additional street information. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "street3", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("street3")] + [XmlElement(ElementName = "street3", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("street3")] public string Street3 { get @@ -147,8 +148,8 @@ public string Street3 /// /// Additional street information. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "street4", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("street4")] + [XmlElement(ElementName = "street4", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("street4")] public string Street4 { get @@ -163,8 +164,8 @@ public string Street4 /// /// Additional street information. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "street5", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("street5")] + [XmlElement(ElementName = "street5", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("street5")] public string Street5 { get @@ -179,8 +180,8 @@ public string Street5 /// /// Additional street information. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "street6", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("street6")] + [XmlElement(ElementName = "street6", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("street6")] public string Street6 { get @@ -195,8 +196,8 @@ public string Street6 /// /// The value of the property. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("value")] + [XmlElement(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("value")] public string Value { get diff --git a/Gedcomx.Model/Agent.cs b/Gedcomx.Model/Agent.cs index acaac5e..d4e33c8 100644 --- a/Gedcomx.Model/Agent.cs +++ b/Gedcomx.Model/Agent.cs @@ -39,8 +39,8 @@ public partial class Agent : Gx.Links.HypermediaEnabledData /// /// The accounts that belong to this person or organization. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "account", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("accounts")] + [XmlElement(ElementName = "account", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("accounts")] public List Accounts { get @@ -55,8 +55,8 @@ public List Accounts /// /// The addresses that belong to this person or organization. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "address", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("addresses")] + [XmlElement(ElementName = "address", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("addresses")] public List Addresses { get @@ -71,8 +71,8 @@ public List Addresses /// /// The emails that belong to this person or organization. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "email", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("emails")] + [XmlElement(ElementName = "email", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("emails")] public List Emails { get @@ -87,8 +87,8 @@ public List Emails /// /// The homepage. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "homepage", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("homepage")] + [XmlElement(ElementName = "homepage", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("homepage")] public Gx.Common.ResourceReference Homepage { get @@ -103,8 +103,8 @@ public Gx.Common.ResourceReference Homepage /// /// The list of identifiers for the agent. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "identifier", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("identifiers")] + [XmlElement(ElementName = "identifier", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("identifiers")] [JsonConverter(typeof(JsonIdentifiersConverter))] public List Identifiers { @@ -120,8 +120,8 @@ public List Identifiers /// /// The list of names for the agent. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("names")] + [XmlElement(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("names")] public List Names { get @@ -136,8 +136,8 @@ public List Names /// /// The <a href="http://openid.net/">openid</a> of the person or organization. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "openid", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("openid")] + [XmlElement(ElementName = "openid", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("openid")] public Gx.Common.ResourceReference Openid { get @@ -152,8 +152,8 @@ public Gx.Common.ResourceReference Openid /// /// The phones that belong to this person or organization. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "phone", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("phones")] + [XmlElement(ElementName = "phone", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("phones")] public List Phones { get diff --git a/Gedcomx.Model/Attribution.cs b/Gedcomx.Model/Attribution.cs index 091043a..ff77d94 100644 --- a/Gedcomx.Model/Attribution.cs +++ b/Gedcomx.Model/Attribution.cs @@ -6,6 +6,7 @@ // Generated by Enunciate. // using System; +using System.ComponentModel; using System.Xml.Serialization; namespace Gx.Common @@ -34,8 +35,8 @@ public sealed partial class Attribution : Gx.Common.ExtensibleData /// /// Reference to the contributor of the attributed data. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "contributor", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("contributor")] + [XmlElement(ElementName = "contributor", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("contributor")] public Gx.Common.ResourceReference Contributor { get @@ -50,8 +51,8 @@ public Gx.Common.ResourceReference Contributor /// /// The modified timestamp for the attributed data. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "modified", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("modified")] + [XmlElement(ElementName = "modified", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("modified")] [JsonConverter(typeof(JsonUnixTimestampConverter))] public DateTime Modified { @@ -69,9 +70,9 @@ public DateTime Modified /// /// Property for the XML serializer indicating whether the "Modified" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool ModifiedSpecified { get @@ -87,8 +88,8 @@ public bool ModifiedSpecified /// /// The "change message" for the attributed data provided by the contributor. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "changeMessage", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("changeMessage")] + [XmlElement(ElementName = "changeMessage", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("changeMessage")] public string ChangeMessage { get diff --git a/Gedcomx.Model/CitationField.cs b/Gedcomx.Model/CitationField.cs index d657594..1f55ce5 100644 --- a/Gedcomx.Model/CitationField.cs +++ b/Gedcomx.Model/CitationField.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Source @@ -26,8 +27,8 @@ public partial class CitationField /// /// The citation field's name. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "name")] - [Newtonsoft.Json.JsonProperty("name")] + [XmlAttribute(AttributeName = "name")] + [JsonProperty("name")] public string Name { get @@ -42,8 +43,8 @@ public string Name /// /// The citation field's value. /// - [System.Xml.Serialization.XmlTextAttribute()] - [Newtonsoft.Json.JsonProperty("value")] + [XmlTextAttribute()] + [JsonProperty("value")] public string Value { get diff --git a/Gedcomx.Model/Collection.cs b/Gedcomx.Model/Collection.cs index 8ca8c6d..af12426 100644 --- a/Gedcomx.Model/Collection.cs +++ b/Gedcomx.Model/Collection.cs @@ -7,7 +7,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Records { @@ -33,8 +35,8 @@ public partial class Collection : Gx.Links.HypermediaEnabledData, IAttributable /// /// The language of this description of the collection /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get @@ -49,8 +51,8 @@ public string Lang /// /// A title for the collection. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "title", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("title")] + [XmlElement(ElementName = "title", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("title")] public string Title { get @@ -65,8 +67,8 @@ public string Title /// /// The size of the collection, in terms of the number of items in this collection. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "size", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("size")] + [XmlElement(ElementName = "size", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("size")] public int Size { get @@ -83,9 +85,9 @@ public int Size /// /// Property for the XML serializer indicating whether the "Size" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool SizeSpecified { get @@ -101,8 +103,8 @@ public bool SizeSpecified /// /// Descriptions of the content of this collection. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "content", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("content")] + [XmlElement(ElementName = "content", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("content")] public List Content { get @@ -117,8 +119,8 @@ public List Content /// /// Attribution metadata for this collection. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("attribution")] + [XmlElement(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("attribution")] public Gx.Common.Attribution Attribution { get diff --git a/Gedcomx.Model/CollectionContent.cs b/Gedcomx.Model/CollectionContent.cs index 7a9675d..e2e04a8 100644 --- a/Gedcomx.Model/CollectionContent.cs +++ b/Gedcomx.Model/CollectionContent.cs @@ -7,7 +7,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Records { @@ -32,8 +34,8 @@ public partial class CollectionContent : Gx.Links.HypermediaEnabledData /// /// A completeness factor for this content aspect, a value between 0 and 1. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "completeness", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("completeness")] + [XmlElement(ElementName = "completeness", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("completeness")] public float Completeness { get @@ -50,9 +52,9 @@ public float Completeness /// /// Property for the XML serializer indicating whether the "Completeness" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool CompletenessSpecified { get @@ -68,8 +70,8 @@ public bool CompletenessSpecified /// /// The count of the items applicable to this content aspect. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "count", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("count")] + [XmlElement(ElementName = "count", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("count")] public int Count { get @@ -86,9 +88,9 @@ public int Count /// /// Property for the XML serializer indicating whether the "Count" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool CountSpecified { get @@ -104,8 +106,8 @@ public bool CountSpecified /// /// The type of resource being covered in this collection. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "resourceType", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("resourceType")] + [XmlElement(ElementName = "resourceType", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("resourceType")] public string ResourceType { get @@ -124,8 +126,8 @@ public string ResourceType * @return this. */ - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.ResourceType KnownResourceType { get diff --git a/Gedcomx.Model/Conclusion.cs b/Gedcomx.Model/Conclusion.cs index 12a9fa3..5cf6516 100644 --- a/Gedcomx.Model/Conclusion.cs +++ b/Gedcomx.Model/Conclusion.cs @@ -9,6 +9,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Conclusion @@ -34,8 +35,8 @@ public abstract partial class Conclusion : Gx.Links.HypermediaEnabledData, IAttr /// /// The level of confidence the contributor has about the data. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "confidence")] - [Newtonsoft.Json.JsonProperty("confidence")] + [XmlAttribute(AttributeName = "confidence")] + [JsonProperty("confidence")] public string Confidence { get @@ -51,8 +52,8 @@ public string Confidence /// /// Convenience property for treating Confidence as an enum. See Gx.Types.ConfidenceLevelQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.ConfidenceLevel KnownConfidence { get @@ -67,8 +68,8 @@ public Gx.Types.ConfidenceLevel KnownConfidence /// /// A sort key in relation to other facts for display purposes. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "sortKey")] - [Newtonsoft.Json.JsonProperty("sortKey")] + [XmlAttribute(AttributeName = "sortKey")] + [JsonProperty("sortKey")] public string SortKey { get @@ -83,8 +84,8 @@ public string SortKey /// /// The language of the conclusion. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get @@ -99,8 +100,8 @@ public string Lang /// /// Attribution metadata for a conclusion. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("attribution")] + [XmlElement(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("attribution")] public Gx.Common.Attribution Attribution { get @@ -115,8 +116,8 @@ public Gx.Common.Attribution Attribution /// /// The source references for a conclusion. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "source", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("sources")] + [XmlElement(ElementName = "source", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("sources")] public List Sources { get @@ -131,8 +132,8 @@ public List Sources /// /// A reference to the analysis document explaining the analysis that went into this conclusion. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "analysis", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("analysis")] + [XmlElement(ElementName = "analysis", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("analysis")] public Gx.Common.ResourceReference Analysis { get @@ -147,8 +148,8 @@ public Gx.Common.ResourceReference Analysis /// /// Notes about a person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "note", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("notes")] + [XmlElement(ElementName = "note", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("notes")] public List Notes { get diff --git a/Gedcomx.Model/ConfidenceLevel.cs b/Gedcomx.Model/ConfidenceLevel.cs index 43805b6..c91c0d9 100644 --- a/Gedcomx.Model/ConfidenceLevel.cs +++ b/Gedcomx.Model/ConfidenceLevel.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types @@ -22,31 +23,31 @@ public enum ConfidenceLevel /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name = "__NULL__")] + [XmlEnumAttribute(Name = "__NULL__")] NULL, /// /// High of confidence. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/High")] + [XmlEnum("http://gedcomx.org/High")] High, /// /// Medium of confidence. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Medium")] + [XmlEnum("http://gedcomx.org/Medium")] Medium, /// /// Low of confidence. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Low")] + [XmlEnum("http://gedcomx.org/Low")] Low, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/Coverage.cs b/Gedcomx.Model/Coverage.cs index 73babe2..cd2e91f 100644 --- a/Gedcomx.Model/Coverage.cs +++ b/Gedcomx.Model/Coverage.cs @@ -8,6 +8,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Source @@ -31,8 +32,8 @@ public partial class Coverage : Gx.Links.HypermediaEnabledData /// /// The type of record being covered. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "recordType", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("recordType")] + [XmlElement(ElementName = "recordType", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("recordType")] public string RecordType { get @@ -48,8 +49,8 @@ public string RecordType /// /// Convenience property for treating RecordType as an enum. See Gx.Types.RecordTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.RecordType KnownRecordType { get @@ -64,8 +65,8 @@ public Gx.Types.RecordType KnownRecordType /// /// Spatial coverage. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "spatial", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("spatial")] + [XmlElement(ElementName = "spatial", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("spatial")] public Gx.Conclusion.PlaceReference Spatial { get @@ -80,8 +81,8 @@ public Gx.Conclusion.PlaceReference Spatial /// /// Temporal coverage. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "temporal", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("temporal")] + [XmlElement(ElementName = "temporal", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("temporal")] public Gx.Conclusion.DateInfo Temporal { get diff --git a/Gedcomx.Model/DateInfo.cs b/Gedcomx.Model/DateInfo.cs index 226efb1..835d2a1 100644 --- a/Gedcomx.Model/DateInfo.cs +++ b/Gedcomx.Model/DateInfo.cs @@ -8,6 +8,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Conclusion @@ -31,8 +32,8 @@ public partial class DateInfo : Gx.Common.ExtensibleData /// /// The original text as supplied by the user. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "original", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("original")] + [XmlElement(ElementName = "original", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("original")] public string Original { get @@ -47,8 +48,8 @@ public string Original /// /// The formal value. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "formal", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("formal")] + [XmlElement(ElementName = "formal", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("formal")] public string Formal { get @@ -64,8 +65,8 @@ public string Formal /// The list of normalized values for the date, provided for display purposes by the application. Normalized values /// are not specified by GEDCOM X core, but as extension elements by GEDCOM X RS. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "normalized", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("normalized")] + [XmlElement(ElementName = "normalized", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("normalized")] public List NormalizedExtensions { get @@ -80,8 +81,8 @@ public List NormalizedExtensions /// /// The references to the record fields being used as evidence. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] public List Fields { get diff --git a/Gedcomx.Model/DiscussionReference.cs b/Gedcomx.Model/DiscussionReference.cs index 8b72f39..e419039 100644 --- a/Gedcomx.Model/DiscussionReference.cs +++ b/Gedcomx.Model/DiscussionReference.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Source @@ -30,8 +31,8 @@ public sealed partial class DiscussionReference : Gx.Links.HypermediaEnabledData /// /// The id of the discussion being referenced. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "resourceId")] - [Newtonsoft.Json.JsonProperty("resourceId")] + [XmlAttribute(AttributeName = "resourceId")] + [JsonProperty("resourceId")] public string ResourceId { get @@ -46,8 +47,8 @@ public string ResourceId /// /// The URI to the resource. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "resource")] - [Newtonsoft.Json.JsonProperty("resource")] + [XmlAttribute(AttributeName = "resource")] + [JsonProperty("resource")] public string Resource { get @@ -62,8 +63,8 @@ public string Resource /// /// The attribution metadata for this discussion reference. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "attribution", Namespace = "http://familysearch.org/v1/")] - [Newtonsoft.Json.JsonProperty("attribution")] + [XmlElement(ElementName = "attribution", Namespace = "http://familysearch.org/v1/")] + [JsonProperty("attribution")] public Gx.Common.Attribution Attribution { get diff --git a/Gedcomx.Model/DisplayProperties.cs b/Gedcomx.Model/DisplayProperties.cs index bf68b83..d0d80a6 100644 --- a/Gedcomx.Model/DisplayProperties.cs +++ b/Gedcomx.Model/DisplayProperties.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Conclusion @@ -40,8 +41,8 @@ public partial class DisplayProperties : Gx.Common.ExtensibleData /// /// The context-specific ascendancy number for the person in relation to the other persons in the request. The ancestry number is defined using the Ahnentafel numbering system. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "ascendancyNumber", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("ascendancyNumber")] + [XmlElement(ElementName = "ascendancyNumber", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("ascendancyNumber")] public string AscendancyNumber { get @@ -56,8 +57,8 @@ public string AscendancyNumber /// /// The displayable label for the birth date of the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "birthDate", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("birthDate")] + [XmlElement(ElementName = "birthDate", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("birthDate")] public string BirthDate { get @@ -72,8 +73,8 @@ public string BirthDate /// /// The displayable label for the birth place of the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "birthPlace", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("birthPlace")] + [XmlElement(ElementName = "birthPlace", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("birthPlace")] public string BirthPlace { get @@ -88,8 +89,8 @@ public string BirthPlace /// /// The displayable label for the death date of the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "deathDate", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("deathDate")] + [XmlElement(ElementName = "deathDate", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("deathDate")] public string DeathDate { get @@ -104,8 +105,8 @@ public string DeathDate /// /// The displayable label for the death place of the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "deathPlace", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("deathPlace")] + [XmlElement(ElementName = "deathPlace", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("deathPlace")] public string DeathPlace { get @@ -120,8 +121,8 @@ public string DeathPlace /// /// The context-specific descendancy number for the person in relation to the other persons in the request. The descendancy number is defined using the d'Aboville numbering system. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "descendancyNumber", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("descendancyNumber")] + [XmlElement(ElementName = "descendancyNumber", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("descendancyNumber")] public string DescendancyNumber { get @@ -136,8 +137,8 @@ public string DescendancyNumber /// /// The displayable label for the gender of the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "gender", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("gender")] + [XmlElement(ElementName = "gender", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("gender")] public string Gender { get @@ -152,8 +153,8 @@ public string Gender /// /// The displayable label for the lifespan of the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "lifespan", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("lifespan")] + [XmlElement(ElementName = "lifespan", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("lifespan")] public string Lifespan { get @@ -168,8 +169,8 @@ public string Lifespan /// /// The displayable label for the marriage date of the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "marriageDate", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("marriageDate")] + [XmlElement(ElementName = "marriageDate", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("marriageDate")] public string MarriageDate { get @@ -184,8 +185,8 @@ public string MarriageDate /// /// The displayable label for the marriage place of the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "marriagePlace", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("marriagePlace")] + [XmlElement(ElementName = "marriagePlace", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("marriagePlace")] public string MarriagePlace { get @@ -200,8 +201,8 @@ public string MarriagePlace /// /// The displayable name of the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("name")] + [XmlElement(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("name")] public string Name { get diff --git a/Gedcomx.Model/Document.cs b/Gedcomx.Model/Document.cs index f3a1d11..0b0745a 100644 --- a/Gedcomx.Model/Document.cs +++ b/Gedcomx.Model/Document.cs @@ -9,7 +9,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Conclusion { @@ -23,7 +25,7 @@ namespace Gx.Conclusion [Serializable] [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Document")] [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "document")] - [Newtonsoft.Json.JsonObject("documents")] + [JsonObject("documents")] public partial class Document : Gx.Conclusion.Conclusion, IAttributable { @@ -35,8 +37,8 @@ public partial class Document : Gx.Conclusion.Conclusion, IAttributable /// /// The text type of the document. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "textType")] - [Newtonsoft.Json.JsonProperty("textType")] + [XmlAttribute(AttributeName = "textType")] + [JsonProperty("textType")] public string TextType { get @@ -51,8 +53,8 @@ public string TextType /// /// Whether this document has been identified as "extracted". /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "extracted")] - [Newtonsoft.Json.JsonProperty("extracted")] + [XmlAttribute(AttributeName = "extracted")] + [JsonProperty("extracted")] public bool Extracted { get @@ -69,9 +71,9 @@ public bool Extracted /// /// Property for the XML serializer indicating whether the "Extracted" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool ExtractedSpecified { get @@ -87,8 +89,8 @@ public bool ExtractedSpecified /// /// The type of the document. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -104,8 +106,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.DocumentTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.DocumentType KnownType { get @@ -120,8 +122,8 @@ public Gx.Types.DocumentType KnownType /// /// The document text. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "text", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("text")] + [XmlElement(ElementName = "text", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("text")] public string Text { get diff --git a/Gedcomx.Model/DocumentType.cs b/Gedcomx.Model/DocumentType.cs index ed408cd..5e71db4 100644 --- a/Gedcomx.Model/DocumentType.cs +++ b/Gedcomx.Model/DocumentType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types @@ -22,37 +23,37 @@ public enum DocumentType /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name = "__NULL__")] + [XmlEnumAttribute(Name = "__NULL__")] NULL, /// /// The document is an abstract of a record or document. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Abstract")] + [XmlEnum("http://gedcomx.org/Abstract")] Abstract, /// /// The document is a translation of a record or document. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Translation")] + [XmlEnum("http://gedcomx.org/Translation")] Translation, /// /// The document is a transcription (full or partial) of a record or document. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Transcription")] + [XmlEnum("http://gedcomx.org/Transcription")] Transcription, /// /// The document is an analysis done by a researcher, often used as a genealogical proof statement. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Analysis")] + [XmlEnum("http://gedcomx.org/Analysis")] Analysis, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/Event.cs b/Gedcomx.Model/Event.cs index 569d83d..cd2faf4 100644 --- a/Gedcomx.Model/Event.cs +++ b/Gedcomx.Model/Event.cs @@ -7,6 +7,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Conclusion @@ -21,7 +22,7 @@ namespace Gx.Conclusion [Serializable] [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Event")] [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "event")] - [Newtonsoft.Json.JsonObject("events")] + [JsonObject("events")] public partial class Event : Gx.Conclusion.Subject { private string _type; @@ -63,8 +64,8 @@ public Event(EventType EventType, DateInfo date, PlaceReference place) /// /// The type of the event. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -80,8 +81,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.EventTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.EventType KnownType { get @@ -96,8 +97,8 @@ public Gx.Types.EventType KnownType /// /// The date of this event. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "date", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("date")] + [XmlElement(ElementName = "date", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("date")] public Gx.Conclusion.DateInfo Date { get @@ -112,8 +113,8 @@ public Gx.Conclusion.DateInfo Date /// /// The place of this event. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "place", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("place")] + [XmlElement(ElementName = "place", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("place")] public Gx.Conclusion.PlaceReference Place { get @@ -128,8 +129,8 @@ public Gx.Conclusion.PlaceReference Place /// /// The roles played in this event. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "role", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("roles")] + [XmlElement(ElementName = "role", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("roles")] public List Roles { get diff --git a/Gedcomx.Model/EventRole.cs b/Gedcomx.Model/EventRole.cs index fcac50c..bd68f18 100644 --- a/Gedcomx.Model/EventRole.cs +++ b/Gedcomx.Model/EventRole.cs @@ -9,6 +9,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Conclusion @@ -31,8 +32,8 @@ public partial class EventRole : Gx.Conclusion.Conclusion /// /// The role type. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -48,8 +49,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.EventRoleTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.EventRoleType KnownType { get @@ -64,8 +65,8 @@ public Gx.Types.EventRoleType KnownType /// /// Reference to the person playing the role in the event. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "person", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("person")] + [XmlElement(ElementName = "person", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("person")] public Gx.Common.ResourceReference Person { get @@ -80,8 +81,8 @@ public Gx.Common.ResourceReference Person /// /// Details about the role of the person in the event. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "details", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("details")] + [XmlElement(ElementName = "details", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("details")] public string Details { get diff --git a/Gedcomx.Model/EventRoleType.cs b/Gedcomx.Model/EventRoleType.cs index d1f7f17..6327ea2 100644 --- a/Gedcomx.Model/EventRoleType.cs +++ b/Gedcomx.Model/EventRoleType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types @@ -22,37 +23,37 @@ public enum EventRoleType /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name = "__NULL__")] + [XmlEnumAttribute(Name = "__NULL__")] NULL, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Principal")] + [XmlEnum("http://gedcomx.org/Principal")] Principal, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Participant")] + [XmlEnum("http://gedcomx.org/Participant")] Participant, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Official")] + [XmlEnum("http://gedcomx.org/Official")] Official, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Witness")] + [XmlEnum("http://gedcomx.org/Witness")] Witness, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/EventType.cs b/Gedcomx.Model/EventType.cs index ec534d8..286179f 100644 --- a/Gedcomx.Model/EventType.cs +++ b/Gedcomx.Model/EventType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types { @@ -20,217 +21,217 @@ public enum EventType { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// An adoption event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Adoption")] + [XmlEnum("http://gedcomx.org/Adoption")] Adoption, /// /// An adult christening event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/AdultChristening")] + [XmlEnum("http://gedcomx.org/AdultChristening")] AdultChristening, /// /// An annulment event of a marriage. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Annulment")] + [XmlEnum("http://gedcomx.org/Annulment")] Annulment, /// /// A baptism event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Baptism")] + [XmlEnum("http://gedcomx.org/Baptism")] Baptism, /// /// A bar mitzvah event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/BarMitzvah")] + [XmlEnum("http://gedcomx.org/BarMitzvah")] BarMitzvah, /// /// A bat mitzvah event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/BatMitzvah")] + [XmlEnum("http://gedcomx.org/BatMitzvah")] BatMitzvah, /// /// A birth event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Birth")] + [XmlEnum("http://gedcomx.org/Birth")] Birth, /// /// A an official blessing event, such as at the hands of a clergy member or at another religious rite. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Blessing")] + [XmlEnum("http://gedcomx.org/Blessing")] Blessing, /// /// A burial event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Burial")] + [XmlEnum("http://gedcomx.org/Burial")] Burial, /// /// A census event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Census")] + [XmlEnum("http://gedcomx.org/Census")] Census, /// /// A christening event *at birth*. Note: use `AdultChristening` for a christening event as an adult. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Christening")] + [XmlEnum("http://gedcomx.org/Christening")] Christening, /// /// A circumcision event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Circumcision")] + [XmlEnum("http://gedcomx.org/Circumcision")] Circumcision, /// /// A confirmation event (or other rite of initiation) in a church or religion. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Confirmation")] + [XmlEnum("http://gedcomx.org/Confirmation")] Confirmation, /// /// A cremation event after death. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Cremation")] + [XmlEnum("http://gedcomx.org/Cremation")] Cremation, /// /// A death event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Death")] + [XmlEnum("http://gedcomx.org/Death")] Death, /// /// A divorce event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Divorce")] + [XmlEnum("http://gedcomx.org/Divorce")] Divorce, /// /// A divorce filing event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/DivorceFiling")] + [XmlEnum("http://gedcomx.org/DivorceFiling")] DivorceFiling, /// /// A education or an educational achievement event (e.g. diploma, graduation, scholarship, etc.). /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Education")] + [XmlEnum("http://gedcomx.org/Education")] Education, /// /// An engagement to be married event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Engagement")] + [XmlEnum("http://gedcomx.org/Engagement")] Engagement, /// /// An emigration event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Emigration")] + [XmlEnum("http://gedcomx.org/Emigration")] Emigration, /// /// An excommunication event from a church. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Excommunication")] + [XmlEnum("http://gedcomx.org/Excommunication")] Excommunication, /// /// A first communion event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/FirstCommunion")] + [XmlEnum("http://gedcomx.org/FirstCommunion")] FirstCommunion, /// /// A funeral event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Funeral")] + [XmlEnum("http://gedcomx.org/Funeral")] Funeral, /// /// An immigration event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Immigration")] + [XmlEnum("http://gedcomx.org/Immigration")] Immigration, /// /// A land transaction event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/LandTransaction")] + [XmlEnum("http://gedcomx.org/LandTransaction")] LandTransaction, /// /// A marriage event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Marriage")] + [XmlEnum("http://gedcomx.org/Marriage")] Marriage, /// /// A military award event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MilitaryAward")] + [XmlEnum("http://gedcomx.org/MilitaryAward")] MilitaryAward, /// /// A military discharge event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MilitaryDischarge")] + [XmlEnum("http://gedcomx.org/MilitaryDischarge")] MilitaryDischarge, /// /// A mission event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Mission")] + [XmlEnum("http://gedcomx.org/Mission")] Mission, /// /// An event of a move (i.e. change of residence) from a location. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MoveFrom")] + [XmlEnum("http://gedcomx.org/MoveFrom")] MoveFrom, /// /// An event of a move (i.e. change of residence) to a location. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MoveTo")] + [XmlEnum("http://gedcomx.org/MoveTo")] MoveTo, /// /// A naturalization event (i.e. acquisition of citizenship and nationality). /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Naturalization")] + [XmlEnum("http://gedcomx.org/Naturalization")] Naturalization, /// /// An ordination event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Ordination")] + [XmlEnum("http://gedcomx.org/Ordination")] Ordination, /// /// A retirement event. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Retirement")] + [XmlEnum("http://gedcomx.org/Retirement")] Retirement, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } diff --git a/Gedcomx.Model/EvidenceReference.cs b/Gedcomx.Model/EvidenceReference.cs index 4488193..45373f0 100644 --- a/Gedcomx.Model/EvidenceReference.cs +++ b/Gedcomx.Model/EvidenceReference.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Common @@ -38,8 +39,8 @@ public EvidenceReference(String resource) /// /// The resource id of the resource being referenced. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "resourceId")] - [Newtonsoft.Json.JsonProperty("resourceId")] + [XmlAttribute(AttributeName = "resourceId")] + [JsonProperty("resourceId")] public string ResourceId { get @@ -54,8 +55,8 @@ public string ResourceId /// /// The URI to the resource. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "resource")] - [Newtonsoft.Json.JsonProperty("resource")] + [XmlAttribute(AttributeName = "resource")] + [JsonProperty("resource")] public string Resource { get @@ -70,8 +71,8 @@ public string Resource /// /// Attribution metadata for evidence reference. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("attribution")] + [XmlElement(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("attribution")] public Gx.Common.Attribution Attribution { get diff --git a/Gedcomx.Model/ExtensibleData.cs b/Gedcomx.Model/ExtensibleData.cs index a9425da..cae5853 100644 --- a/Gedcomx.Model/ExtensibleData.cs +++ b/Gedcomx.Model/ExtensibleData.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; @@ -29,8 +30,8 @@ public abstract partial class ExtensibleData /// /// A local, context-specific id for the data. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "id", DataType = "ID")] - [Newtonsoft.Json.JsonProperty("id")] + [XmlAttribute(AttributeName = "id", DataType = "ID")] + [JsonProperty("id")] public string Id { get @@ -46,8 +47,8 @@ public string Id /// /// Custom extension elements for a conclusion. /// - [System.Xml.Serialization.XmlAnyElementAttribute()] - [Newtonsoft.Json.JsonIgnore] + [XmlAnyElementAttribute()] + [JsonIgnore] public List ExtensionElementsXml { get @@ -63,8 +64,8 @@ public List ExtensionElementsXml /// /// Custom extension elements for a conclusion. /// - [System.Xml.Serialization.XmlIgnore] - [Newtonsoft.Json.JsonExtensionData] + [XmlIgnore] + [JsonExtensionData] public Dictionary ExtensionElementsJson { get diff --git a/Gedcomx.Model/Facet.cs b/Gedcomx.Model/Facet.cs index 16d5548..99b44e1 100644 --- a/Gedcomx.Model/Facet.cs +++ b/Gedcomx.Model/Facet.cs @@ -7,6 +7,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Records @@ -31,8 +32,8 @@ public partial class Facet : Gx.Links.HypermediaEnabledData /// /// The type of the facet. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -48,8 +49,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.FacetTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.FacetType KnownType { get @@ -64,8 +65,8 @@ public Gx.Types.FacetType KnownType /// /// A title for the facet. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "title", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("title")] + [XmlElement(ElementName = "title", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("title")] public string Title { get @@ -80,8 +81,8 @@ public string Title /// /// A key unique within the context of this facet, used to apply the facet. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "key", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("key")] + [XmlElement(ElementName = "key", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("key")] public string Key { get @@ -96,8 +97,8 @@ public string Key /// /// The set of sub-facets of this facet. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "facet", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("facets")] + [XmlElement(ElementName = "facet", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("facets")] public List Facets { get @@ -112,8 +113,8 @@ public List Facets /// /// The set of values for the field. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("values")] + [XmlElement(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("values")] public List Values { get diff --git a/Gedcomx.Model/FacetType.cs b/Gedcomx.Model/FacetType.cs index f08bf76..5d15321 100644 --- a/Gedcomx.Model/FacetType.cs +++ b/Gedcomx.Model/FacetType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types { @@ -20,91 +21,91 @@ public enum FacetType { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// A year. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Year")] + [XmlEnum("http://gedcomx.org/Year")] Year, /// /// A (geographic) state. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/State")] + [XmlEnum("http://gedcomx.org/State")] State, /// /// A province. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Province")] + [XmlEnum("http://gedcomx.org/Province")] Province, /// /// A country. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Country")] + [XmlEnum("http://gedcomx.org/Country")] Country, /// /// A city. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/City")] + [XmlEnum("http://gedcomx.org/City")] City, /// /// A parish /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Parish")] + [XmlEnum("http://gedcomx.org/Parish")] Parish, /// /// A township. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Township")] + [XmlEnum("http://gedcomx.org/Township")] Township, /// /// A page. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Page")] + [XmlEnum("http://gedcomx.org/Page")] Page, /// /// A volume. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Volume")] + [XmlEnum("http://gedcomx.org/Volume")] Volume, /// /// A date. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Date")] + [XmlEnum("http://gedcomx.org/Date")] Date, /// /// A place. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Place")] + [XmlEnum("http://gedcomx.org/Place")] Place, /// /// A name. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Name")] + [XmlEnum("http://gedcomx.org/Name")] Name, /// /// A gender. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Gender")] + [XmlEnum("http://gedcomx.org/Gender")] Gender, /// /// Custom /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/FacetValue.cs b/Gedcomx.Model/FacetValue.cs index 7b62c87..c94d52d 100644 --- a/Gedcomx.Model/FacetValue.cs +++ b/Gedcomx.Model/FacetValue.cs @@ -5,7 +5,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Records { @@ -28,8 +30,8 @@ public partial class FacetValue : Gx.Links.HypermediaEnabledData /// /// A title for the facet value. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "title", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("title")] + [XmlElement(ElementName = "title", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("title")] public string Title { get @@ -44,8 +46,8 @@ public string Title /// /// The value. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("value")] + [XmlElement(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("value")] public string Value { get @@ -60,8 +62,8 @@ public string Value /// /// The number of resources applicable to this value. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "count", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("count")] + [XmlElement(ElementName = "count", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("count")] public int Count { get @@ -78,9 +80,9 @@ public int Count /// /// Property for the XML serializer indicating whether the "Count" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool CountSpecified { get diff --git a/Gedcomx.Model/Fact.cs b/Gedcomx.Model/Fact.cs index dfcb7ad..d3b087d 100644 --- a/Gedcomx.Model/Fact.cs +++ b/Gedcomx.Model/Fact.cs @@ -10,7 +10,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Conclusion { @@ -65,8 +67,8 @@ public Fact(FactType factType, DateInfo date, PlaceReference place, String value /// /// Whether this fact is the primary fact of the record from which the subject was extracted. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "primary")] - [Newtonsoft.Json.JsonProperty("primary")] + [XmlAttribute(AttributeName = "primary")] + [JsonProperty("primary")] public bool Primary { get @@ -83,9 +85,9 @@ public bool Primary /// /// Property for the XML serializer indicating whether the "Primary" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool PrimarySpecified { get @@ -101,8 +103,8 @@ public bool PrimarySpecified /// /// The type of the fact. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -118,8 +120,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.FactTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.FactType KnownType { get @@ -134,8 +136,8 @@ public Gx.Types.FactType KnownType /// /// The date of applicability of this fact. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "date", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("date")] + [XmlElement(ElementName = "date", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("date")] public Gx.Conclusion.DateInfo Date { get @@ -150,8 +152,8 @@ public Gx.Conclusion.DateInfo Date /// /// The place of applicability of this fact. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "place", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("place")] + [XmlElement(ElementName = "place", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("place")] public Gx.Conclusion.PlaceReference Place { get @@ -166,8 +168,8 @@ public Gx.Conclusion.PlaceReference Place /// /// The value as supplied by the user. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("value")] + [XmlElement(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("value")] public string Value { get @@ -182,8 +184,8 @@ public string Value /// /// The qualifiers associated with this fact. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "qualifier", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("qualifiers")] + [XmlElement(ElementName = "qualifier", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("qualifiers")] public List Qualifiers { get @@ -198,8 +200,8 @@ public List Qualifiers /// /// The references to the record fields being used as evidence. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] public List Fields { get diff --git a/Gedcomx.Model/FactQualifierType.cs b/Gedcomx.Model/FactQualifierType.cs index 26474a9..9f44f9a 100644 --- a/Gedcomx.Model/FactQualifierType.cs +++ b/Gedcomx.Model/FactQualifierType.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; @@ -13,22 +14,22 @@ public enum FactQualifierType /** * The age of a person at the event described by the fact. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Age")] + [XmlEnum("http://gedcomx.org/Age")] Age, /** * The cause of a specific fact, such as the cause of death. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Cause")] + [XmlEnum("http://gedcomx.org/Cause")] Cause, /** * The religion associated with a religious event such as a baptism or excommunication. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Religion")] + [XmlEnum("http://gedcomx.org/Religion")] Religion, - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER, } } diff --git a/Gedcomx.Model/FactType.cs b/Gedcomx.Model/FactType.cs index ab1a3bc..63dfac6 100644 --- a/Gedcomx.Model/FactType.cs +++ b/Gedcomx.Model/FactType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types @@ -22,506 +23,506 @@ public enum FactType /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name = "__NULL__")] + [XmlEnumAttribute(Name = "__NULL__")] NULL, /// /// A fact of a person's adoption. In the context of a parent-child relationship, it describes a fact of the adoption of a child by a parent. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Adoption")] + [XmlEnum("http://gedcomx.org/Adoption")] Adoption, /// /// A fact of a person's christening as an adult. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/AdultChristening")] + [XmlEnum("http://gedcomx.org/AdultChristening")] AdultChristening, /// /// A fact of a person's amnesty. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Amnesty")] + [XmlEnum("http://gedcomx.org/Amnesty")] Amnesty, /// /// A fact of a person's apprenticeship. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Apprenticeship")] + [XmlEnum("http://gedcomx.org/Apprenticeship")] Apprenticeship, /// /// A fact of a person's arrest. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Arrest")] + [XmlEnum("http://gedcomx.org/Arrest")] Arrest, /// /// A fact of a person's baptism. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Baptism")] + [XmlEnum("http://gedcomx.org/Baptism")] Baptism, /// /// A fact of a person's bar mitzvah. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/BarMitzvah")] + [XmlEnum("http://gedcomx.org/BarMitzvah")] BarMitzvah, /// /// A fact of a person's bat mitzvah. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/BatMitzvah")] + [XmlEnum("http://gedcomx.org/BatMitzvah")] BatMitzvah, /// /// A fact of a person's birth. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Birth")] + [XmlEnum("http://gedcomx.org/Birth")] Birth, /// /// A fact of an official blessing received by a person, such as at the hands of a clergy member or at another religious rite. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Blessing")] + [XmlEnum("http://gedcomx.org/Blessing")] Blessing, /// /// A fact of the burial of person's body after death. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Burial")] + [XmlEnum("http://gedcomx.org/Burial")] Burial, /// /// A fact of a person's caste. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Caste")] + [XmlEnum("http://gedcomx.org/Caste")] Caste, /// /// A fact of a person's participation in a census. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Census")] + [XmlEnum("http://gedcomx.org/Census")] Census, /// /// A fact of a person's christening *at birth*. Note: use `AdultChristening` for the christening as an adult. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Christening")] + [XmlEnum("http://gedcomx.org/Christening")] Christening, /// /// A fact of a person's circumcision. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Circumcision")] + [XmlEnum("http://gedcomx.org/Circumcision")] Circumcision, /// /// A fact of a person's clan. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Clan")] + [XmlEnum("http://gedcomx.org/Clan")] Clan, /// /// A fact of a person's confirmation (or other rite of initiation) in a church or religion. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Confirmation")] + [XmlEnum("http://gedcomx.org/Confirmation")] Confirmation, /// /// A fact of the cremation of person's body after death. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Cremation")] + [XmlEnum("http://gedcomx.org/Cremation")] Cremation, /// /// A fact of the death of a person. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Death")] + [XmlEnum("http://gedcomx.org/Death")] Death, /// /// A fact of an education of a person. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Education")] + [XmlEnum("http://gedcomx.org/Education")] Education, /// /// A fact of a person's enrollment in an educational program or institution. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/EducationEnrollment")] + [XmlEnum("http://gedcomx.org/EducationEnrollment")] EducationEnrollment, /// /// A fact of the emigration of a person. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Emigration")] + [XmlEnum("http://gedcomx.org/Emigration")] Emigration, /// /// A fact of a person's ethnicity or race. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Ethnicity")] + [XmlEnum("http://gedcomx.org/Ethnicity")] Ethnicity, /// /// A fact of a person's excommunication from a church. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Excommunication")] + [XmlEnum("http://gedcomx.org/Excommunication")] Excommunication, /// /// A fact of a person's first communion in a church. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/FirstCommunion")] + [XmlEnum("http://gedcomx.org/FirstCommunion")] FirstCommunion, /// /// A fact of a person's funeral. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Funeral")] + [XmlEnum("http://gedcomx.org/Funeral")] Funeral, /// /// A fact of a person's gender change. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/GenderChange")] + [XmlEnum("http://gedcomx.org/GenderChange")] GenderChange, /// /// A fact of a person's graduation from a scholastic institution. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Graduation")] + [XmlEnum("http://gedcomx.org/Graduation")] Graduation, /// /// A fact of a person's immigration. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Immigration")] + [XmlEnum("http://gedcomx.org/Immigration")] Immigration, /// /// A fact of a person's imprisonment. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Imprisonment")] + [XmlEnum("http://gedcomx.org/Imprisonment")] Imprisonment, /// /// A fact of a land transaction enacted by a person. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/LandTransaction")] + [XmlEnum("http://gedcomx.org/LandTransaction")] LandTransaction, /// /// A fact of a language spoken by a person. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Language")] + [XmlEnum("http://gedcomx.org/Language")] Language, /// /// A fact of a record of a person's living for a specific period. This is designed to include "flourish", defined to mean the time period /// in an adult's life where he was most productive, perhaps as a writer or member of the state assembly. It does not reflect the person's birth and death dates. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Living")] + [XmlEnum("http://gedcomx.org/Living")] Living, /// /// A fact of a person's marital status. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MaritalStatus")] + [XmlEnum("http://gedcomx.org/MaritalStatus")] MaritalStatus, /// /// A fact of a person's medical record, such as for an illness or hospital stay. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Medical")] + [XmlEnum("http://gedcomx.org/Medical")] Medical, /// /// A fact of a person's military award. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MilitaryAward")] + [XmlEnum("http://gedcomx.org/MilitaryAward")] MilitaryAward, /// /// A fact of a person's military discharge. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MilitaryDischarge")] + [XmlEnum("http://gedcomx.org/MilitaryDischarge")] MilitaryDischarge, /// /// A fact of a person's registration for a military draft. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MilitaryDraftRegistration")] + [XmlEnum("http://gedcomx.org/MilitaryDraftRegistration")] MilitaryDraftRegistration, /// /// A fact of a person's military induction. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MilitaryInduction")] + [XmlEnum("http://gedcomx.org/MilitaryInduction")] MilitaryInduction, /// /// A fact of a person's militray service. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MilitaryService")] + [XmlEnum("http://gedcomx.org/MilitaryService")] MilitaryService, /// /// A fact of a person's church mission. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Mission")] + [XmlEnum("http://gedcomx.org/Mission")] Mission, /// /// A fact of a person's move (i.e. change of residence) from a location. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MoveFrom")] + [XmlEnum("http://gedcomx.org/MoveFrom")] MoveFrom, /// /// A fact of a person's move (i.e. change of residence) to a new location. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MoveTo")] + [XmlEnum("http://gedcomx.org/MoveTo")] MoveTo, /// /// A fact that a person was born as part of a multiple birth (e.g. twin, triplet, etc.) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MultipleBirth")] + [XmlEnum("http://gedcomx.org/MultipleBirth")] MultipleBirth, /// /// A fact of a person's national id (e.g. social security number). /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/NationalId")] + [XmlEnum("http://gedcomx.org/NationalId")] NationalId, /// /// A fact of a person's nationality. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Nationality")] + [XmlEnum("http://gedcomx.org/Nationality")] Nationality, /// /// A fact of a person's naturalization (i.e. acquisition of citizenship and nationality). /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Naturalization")] + [XmlEnum("http://gedcomx.org/Naturalization")] Naturalization, /// /// A fact of a person's number of marriages. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/NumberOfMarriages")] + [XmlEnum("http://gedcomx.org/NumberOfMarriages")] NumberOfMarriages, /// /// A fact of a person's occupation or employment. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Occupation")] + [XmlEnum("http://gedcomx.org/Occupation")] Occupation, /// /// A fact of a person's ordination to a stewardship in a church. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Ordination")] + [XmlEnum("http://gedcomx.org/Ordination")] Ordination, /// /// A fact of a person's legal pardon. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Pardon")] + [XmlEnum("http://gedcomx.org/Pardon")] Pardon, /// /// A fact of a person's physical description. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/PhysicalDescription")] + [XmlEnum("http://gedcomx.org/PhysicalDescription")] PhysicalDescription, /// /// A fact of a receipt of probate of a person's property. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Probate")] + [XmlEnum("http://gedcomx.org/Probate")] Probate, /// /// A fact of a person's property or possessions. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Property")] + [XmlEnum("http://gedcomx.org/Property")] Property, /// /// A fact of a person's religion. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Religion")] + [XmlEnum("http://gedcomx.org/Religion")] Religion, /// /// A fact of a person's residence. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Residence")] + [XmlEnum("http://gedcomx.org/Residence")] Residence, /// /// A fact of a person's retirement. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Retirement")] + [XmlEnum("http://gedcomx.org/Retirement")] Retirement, /// /// A fact of a person's stillbirth. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Stillbirth")] + [XmlEnum("http://gedcomx.org/Stillbirth")] Stillbirth, /// /// A fact of a person's tax assessment. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/TaxAssessment")] + [XmlEnum("http://gedcomx.org/TaxAssessment")] TaxAssessment, /// /// A fact of a person's will. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Will")] + [XmlEnum("http://gedcomx.org/Will")] Will, /// /// A fact of a person's visit to a place different from the person's residence. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Visit")] + [XmlEnum("http://gedcomx.org/Visit")] Visit, /// /// A fact of a person's _yahrzeit_ date. A person's yahzeit is the anniversary of their death as measured by the Hebrew calendar. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Yahrzeit")] + [XmlEnum("http://gedcomx.org/Yahrzeit")] Yahrzeit, /// /// The fact of an annulment of a marriage. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Annulment")] + [XmlEnum("http://gedcomx.org/Annulment")] Annulment, /// /// The fact of a marriage by common law. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/CommonLawMarriage")] + [XmlEnum("http://gedcomx.org/CommonLawMarriage")] CommonLawMarriage, /// /// The fact of a civil union. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/CivilUnion")] + [XmlEnum("http://gedcomx.org/CivilUnion")] CivilUnion, /// /// The fact of a divorce of a couple. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Divorce")] + [XmlEnum("http://gedcomx.org/Divorce")] Divorce, /// /// The fact of a filing for divorce. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/DivorceFiling")] + [XmlEnum("http://gedcomx.org/DivorceFiling")] DivorceFiling, /// /// The fact of a domestic partnership. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/DomesticPartnership")] + [XmlEnum("http://gedcomx.org/DomesticPartnership")] DomesticPartnership, /// /// The fact of an engagement to be married. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Engagement")] + [XmlEnum("http://gedcomx.org/Engagement")] Engagement, /// /// The fact of a marriage. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Marriage")] + [XmlEnum("http://gedcomx.org/Marriage")] Marriage, /// /// The fact of a marriage banns. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriageBanns")] + [XmlEnum("http://gedcomx.org/MarriageBanns")] MarriageBanns, /// /// The fact of a marriage contract. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriageContract")] + [XmlEnum("http://gedcomx.org/MarriageContract")] MarriageContract, /// /// The fact of a marriage license. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriageLicense")] + [XmlEnum("http://gedcomx.org/MarriageLicense")] MarriageLicense, /// /// The fact of a marriage notice. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriageNotice")] + [XmlEnum("http://gedcomx.org/MarriageNotice")] MarriageNotice, /// /// A fact of the number of children of a person or relationship. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/NumberOfChildren")] + [XmlEnum("http://gedcomx.org/NumberOfChildren")] NumberOfChildren, /// /// A fact of a couple's separation. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Separation")] + [XmlEnum("http://gedcomx.org/Separation")] Separation, /// /// A fact about an adoptive relationship between a parent an a child. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/AdoptiveParent")] + [XmlEnum("http://gedcomx.org/AdoptiveParent")] AdoptiveParent, /// /// A fact the biological relationship between a parent and a child. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/BiologicalParent")] + [XmlEnum("http://gedcomx.org/BiologicalParent")] BiologicalParent, /// /// A fact about a foster relationship between a foster parent and a child. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/FosterParent")] + [XmlEnum("http://gedcomx.org/FosterParent")] FosterParent, /// /// A fact about a legal guardianship between a parent and a child. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/GuardianParent")] + [XmlEnum("http://gedcomx.org/GuardianParent")] GuardianParent, /// /// A fact about the step relationship between a parent and a child. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/StepParent")] + [XmlEnum("http://gedcomx.org/StepParent")] StepParent, /// /// A fact about a sociological relationship between a parent and a child, but not definable in typical legal or biological terms. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/SociologicalParent")] + [XmlEnum("http://gedcomx.org/SociologicalParent")] SociologicalParent, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/Field.cs b/Gedcomx.Model/Field.cs index 6a2499b..bdb1363 100644 --- a/Gedcomx.Model/Field.cs +++ b/Gedcomx.Model/Field.cs @@ -8,6 +8,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Records @@ -29,8 +30,8 @@ public partial class Field : Gx.Links.HypermediaEnabledData /// /// The type of the gender. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -46,8 +47,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.FieldTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.FieldType KnownType { get @@ -62,8 +63,8 @@ public Gx.Types.FieldType KnownType /// /// The set of values for the field. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("values")] + [XmlElement(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("values")] public List Values { get diff --git a/Gedcomx.Model/FieldDescriptor.cs b/Gedcomx.Model/FieldDescriptor.cs index 2538c25..07de2ad 100644 --- a/Gedcomx.Model/FieldDescriptor.cs +++ b/Gedcomx.Model/FieldDescriptor.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Records @@ -28,8 +29,8 @@ public partial class FieldDescriptor : Gx.Links.HypermediaEnabledData /// /// The original label for the field, as stated on the original record. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "originalLabel", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("originalLabel")] + [XmlElement(ElementName = "originalLabel", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("originalLabel")] public string OriginalLabel { get @@ -44,8 +45,8 @@ public string OriginalLabel /// /// The description of the field. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "description", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("descriptions")] + [XmlElement(ElementName = "description", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("descriptions")] public List Descriptions { get @@ -60,8 +61,8 @@ public List Descriptions /// /// Descriptors of the values that are applicable to the field. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("values")] + [XmlElement(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("values")] public List Values { get diff --git a/Gedcomx.Model/FieldType.cs b/Gedcomx.Model/FieldType.cs index 1d84a92..7e5a600 100644 --- a/Gedcomx.Model/FieldType.cs +++ b/Gedcomx.Model/FieldType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types { @@ -20,451 +21,451 @@ public enum FieldType { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Age")] + [XmlEnum("http://gedcomx.org/Age")] Age, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Date")] + [XmlEnum("http://gedcomx.org/Date")] Date, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Place")] + [XmlEnum("http://gedcomx.org/Place")] Place, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Gender")] + [XmlEnum("http://gedcomx.org/Gender")] Gender, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Name")] + [XmlEnum("http://gedcomx.org/Name")] Name, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Role")] + [XmlEnum("http://gedcomx.org/Role")] Role, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Years")] + [XmlEnum("http://gedcomx.org/Years")] Years, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Months")] + [XmlEnum("http://gedcomx.org/Months")] Months, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Days")] + [XmlEnum("http://gedcomx.org/Days")] Days, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Hours")] + [XmlEnum("http://gedcomx.org/Hours")] Hours, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Minutes")] + [XmlEnum("http://gedcomx.org/Minutes")] Minutes, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Year")] + [XmlEnum("http://gedcomx.org/Year")] Year, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Month")] + [XmlEnum("http://gedcomx.org/Month")] Month, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Day")] + [XmlEnum("http://gedcomx.org/Day")] Day, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Hour")] + [XmlEnum("http://gedcomx.org/Hour")] Hour, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Minute")] + [XmlEnum("http://gedcomx.org/Minute")] Minute, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Address")] + [XmlEnum("http://gedcomx.org/Address")] Address, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Cemetery")] + [XmlEnum("http://gedcomx.org/Cemetery")] Cemetery, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/City")] + [XmlEnum("http://gedcomx.org/City")] City, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Church")] + [XmlEnum("http://gedcomx.org/Church")] Church, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/County")] + [XmlEnum("http://gedcomx.org/County")] County, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Country")] + [XmlEnum("http://gedcomx.org/Country")] Country, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/District")] + [XmlEnum("http://gedcomx.org/District")] District, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Hospital")] + [XmlEnum("http://gedcomx.org/Hospital")] Hospital, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Island")] + [XmlEnum("http://gedcomx.org/Island")] Island, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MilitaryBase")] + [XmlEnum("http://gedcomx.org/MilitaryBase")] MilitaryBase, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Mortuary")] + [XmlEnum("http://gedcomx.org/Mortuary")] Mortuary, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Parish")] + [XmlEnum("http://gedcomx.org/Parish")] Parish, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/PlotNumber")] + [XmlEnum("http://gedcomx.org/PlotNumber")] PlotNumber, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/PostOffice")] + [XmlEnum("http://gedcomx.org/PostOffice")] PostOffice, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/PostalCode")] + [XmlEnum("http://gedcomx.org/PostalCode")] PostalCode, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Prison")] + [XmlEnum("http://gedcomx.org/Prison")] Prison, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Province")] + [XmlEnum("http://gedcomx.org/Province")] Province, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Section")] + [XmlEnum("http://gedcomx.org/Section")] Section, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Ship")] + [XmlEnum("http://gedcomx.org/Ship")] Ship, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/State")] + [XmlEnum("http://gedcomx.org/State")] State, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Territory")] + [XmlEnum("http://gedcomx.org/Territory")] Territory, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Town")] + [XmlEnum("http://gedcomx.org/Town")] Town, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Township")] + [XmlEnum("http://gedcomx.org/Township")] Township, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Ward")] + [XmlEnum("http://gedcomx.org/Ward")] Ward, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Prefix")] + [XmlEnum("http://gedcomx.org/Prefix")] Prefix, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Suffix")] + [XmlEnum("http://gedcomx.org/Suffix")] Suffix, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Given")] + [XmlEnum("http://gedcomx.org/Given")] Given, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Surname")] + [XmlEnum("http://gedcomx.org/Surname")] Surname, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Abusua")] + [XmlEnum("http://gedcomx.org/Abusua")] Abusua, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/BatchNumber")] + [XmlEnum("http://gedcomx.org/BatchNumber")] BatchNumber, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Caste")] + [XmlEnum("http://gedcomx.org/Caste")] Caste, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Clan")] + [XmlEnum("http://gedcomx.org/Clan")] Clan, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/CommonLawMarriage")] + [XmlEnum("http://gedcomx.org/CommonLawMarriage")] CommonLawMarriage, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Education")] + [XmlEnum("http://gedcomx.org/Education")] Education, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Ethnicity")] + [XmlEnum("http://gedcomx.org/Ethnicity")] Ethnicity, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/FatherBirthPlace")] + [XmlEnum("http://gedcomx.org/FatherBirthPlace")] FatherBirthPlace, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/NeverHadChildren")] + [XmlEnum("http://gedcomx.org/NeverHadChildren")] NeverHadChildren, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/NeverMarried")] + [XmlEnum("http://gedcomx.org/NeverMarried")] NeverMarried, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/NumberOfChildren")] + [XmlEnum("http://gedcomx.org/NumberOfChildren")] NumberOfChildren, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/NumberOfMarriages")] + [XmlEnum("http://gedcomx.org/NumberOfMarriages")] NumberOfMarriages, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Household")] + [XmlEnum("http://gedcomx.org/Household")] Household, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/IsHeadOfHousehold")] + [XmlEnum("http://gedcomx.org/IsHeadOfHousehold")] IsHeadOfHousehold, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MaritalStatus")] + [XmlEnum("http://gedcomx.org/MaritalStatus")] MaritalStatus, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MotherBirthPlace")] + [XmlEnum("http://gedcomx.org/MotherBirthPlace")] MotherBirthPlace, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MultipleBirth")] + [XmlEnum("http://gedcomx.org/MultipleBirth")] MultipleBirth, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/NameSake")] + [XmlEnum("http://gedcomx.org/NameSake")] NameSake, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/NationalId")] + [XmlEnum("http://gedcomx.org/NationalId")] NationalId, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Nationality")] + [XmlEnum("http://gedcomx.org/Nationality")] Nationality, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Occupation")] + [XmlEnum("http://gedcomx.org/Occupation")] Occupation, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/PhysicalDescription")] + [XmlEnum("http://gedcomx.org/PhysicalDescription")] PhysicalDescription, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Property")] + [XmlEnum("http://gedcomx.org/Property")] Property, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Race")] + [XmlEnum("http://gedcomx.org/Race")] Race, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Religion")] + [XmlEnum("http://gedcomx.org/Religion")] Religion, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/RelationshipToHead")] + [XmlEnum("http://gedcomx.org/RelationshipToHead")] RelationshipToHead, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Stillbirth")] + [XmlEnum("http://gedcomx.org/Stillbirth")] Stillbirth, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/TitleOfNobility")] + [XmlEnum("http://gedcomx.org/TitleOfNobility")] TitleOfNobility, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Tribe")] + [XmlEnum("http://gedcomx.org/Tribe")] Tribe, /// /// Custom /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/FieldValue.cs b/Gedcomx.Model/FieldValue.cs index 4b62fa9..8a4f141 100644 --- a/Gedcomx.Model/FieldValue.cs +++ b/Gedcomx.Model/FieldValue.cs @@ -8,6 +8,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Records @@ -32,8 +33,8 @@ public sealed partial class FieldValue : Gx.Conclusion.Conclusion /// /// URI that resolves to the value of the field. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "resource")] - [Newtonsoft.Json.JsonProperty("resource")] + [XmlAttribute(AttributeName = "resource")] + [JsonProperty("resource")] public string Resource { get @@ -48,8 +49,8 @@ public string Resource /// /// The datatype of the text value of the field. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "datatype")] - [Newtonsoft.Json.JsonProperty("datatype")] + [XmlAttribute(AttributeName = "datatype")] + [JsonProperty("datatype")] public string Datatype { get @@ -64,8 +65,8 @@ public string Datatype /// /// The type of the field value. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -81,8 +82,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.FieldValueTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.FieldValueType KnownType { get @@ -97,8 +98,8 @@ public Gx.Types.FieldValueType KnownType /// /// The id of the label applicable to this field value. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "labelId")] - [Newtonsoft.Json.JsonProperty("labelId")] + [XmlAttribute(AttributeName = "labelId")] + [JsonProperty("labelId")] public string LabelId { get @@ -113,8 +114,8 @@ public string LabelId /// /// The text value. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "text", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("text")] + [XmlElement(ElementName = "text", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("text")] public string Text { get diff --git a/Gedcomx.Model/FieldValueDescriptor.cs b/Gedcomx.Model/FieldValueDescriptor.cs index 12109c9..44aa980 100644 --- a/Gedcomx.Model/FieldValueDescriptor.cs +++ b/Gedcomx.Model/FieldValueDescriptor.cs @@ -7,7 +7,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Records { @@ -31,8 +33,8 @@ public partial class FieldValueDescriptor : Gx.Links.HypermediaEnabledData /// /// Whether the treatment of the field value is optional. Used to determine whether it should be displayed even if the value is empty. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "optional")] - [Newtonsoft.Json.JsonProperty("optional")] + [XmlAttribute(AttributeName = "optional")] + [JsonProperty("optional")] public bool Optional { get @@ -49,9 +51,9 @@ public bool Optional /// /// Property for the XML serializer indicating whether the "Optional" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool OptionalSpecified { get @@ -67,8 +69,8 @@ public bool OptionalSpecified /// /// The type of the field value. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -84,8 +86,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.FieldValueTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.FieldValueType KnownType { get @@ -100,8 +102,8 @@ public Gx.Types.FieldValueType KnownType /// /// The id of the label applicable to the field value /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "labelId")] - [Newtonsoft.Json.JsonProperty("labelId")] + [XmlAttribute(AttributeName = "labelId")] + [JsonProperty("labelId")] public string LabelId { get @@ -116,8 +118,8 @@ public string LabelId /// /// The labels to be used for display purposes. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "label", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("labels")] + [XmlElement(ElementName = "label", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("labels")] public List DisplayLabels { get diff --git a/Gedcomx.Model/FieldValueType.cs b/Gedcomx.Model/FieldValueType.cs index 954dd70..7710df3 100644 --- a/Gedcomx.Model/FieldValueType.cs +++ b/Gedcomx.Model/FieldValueType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types { @@ -20,25 +21,25 @@ public enum FieldValueType { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// The field value is original, extracted directly from the record. What you see is what you get, including misspellings and other errors in the record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Original")] + [XmlEnum("http://gedcomx.org/Original")] Original, /// /// The field value is interpreted, meaning a user or other automated process applied some reasoning to interpret the value. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Interpreted")] + [XmlEnum("http://gedcomx.org/Interpreted")] Interpreted, /// /// Custom /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/Gedcomx.cs b/Gedcomx.Model/Gedcomx.cs index 86943ed..f1d9c0f 100644 --- a/Gedcomx.Model/Gedcomx.cs +++ b/Gedcomx.Model/Gedcomx.cs @@ -11,6 +11,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx @@ -63,8 +64,8 @@ public partial class Gedcomx : Gx.Links.HypermediaEnabledData /// /// The language of the genealogical data. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get @@ -79,8 +80,8 @@ public string Lang /// /// A reference to a description of this data set. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "description")] - [Newtonsoft.Json.JsonProperty("description")] + [XmlAttribute(AttributeName = "description")] + [JsonProperty("description")] public string DescriptionRef { get @@ -95,8 +96,8 @@ public string DescriptionRef /// /// A reference to the profile that describes this data set. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "profile")] - [Newtonsoft.Json.JsonProperty("profile")] + [XmlAttribute(AttributeName = "profile")] + [JsonProperty("profile")] public string Profile { get @@ -111,8 +112,8 @@ public string Profile /// /// The attribution of this genealogical data. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("attribution")] + [XmlElement(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("attribution")] public Gx.Common.Attribution Attribution { get @@ -127,8 +128,8 @@ public Gx.Common.Attribution Attribution /// /// The persons included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "person", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("persons")] + [XmlElement(ElementName = "person", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("persons")] public List Persons { get @@ -143,8 +144,8 @@ public List Persons /// /// The relationships included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "relationship", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("relationships")] + [XmlElement(ElementName = "relationship", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("relationships")] public List Relationships { get @@ -159,8 +160,8 @@ public List Relationships /// /// The descriptions of sources included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "sourceDescription", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("sourceDescriptions")] + [XmlElement(ElementName = "sourceDescription", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("sourceDescriptions")] public List SourceDescriptions { get @@ -175,8 +176,8 @@ public List SourceDescriptions /// /// The agents included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "agent", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("agents")] + [XmlElement(ElementName = "agent", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("agents")] public List Agents { get @@ -191,8 +192,8 @@ public List Agents /// /// The events included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "event", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("events")] + [XmlElement(ElementName = "event", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("events")] public List Events { get @@ -207,8 +208,8 @@ public List Events /// /// The places included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "place", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("places")] + [XmlElement(ElementName = "place", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("places")] public List Places { get @@ -223,8 +224,8 @@ public List Places /// /// The documents included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "document", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("documents")] + [XmlElement(ElementName = "document", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("documents")] public List Documents { get @@ -239,8 +240,8 @@ public List Documents /// /// The collections included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "collection", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("collections")] + [XmlElement(ElementName = "collection", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("collections")] public List Collections { get @@ -255,8 +256,8 @@ public List Collections /// /// The extracted fields included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] public List Fields { get @@ -271,8 +272,8 @@ public List Fields /// /// The record descriptors included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "recordDescriptor", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("recordDescriptors")] + [XmlElement(ElementName = "recordDescriptor", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("recordDescriptors")] public List RecordDescriptors { get diff --git a/Gedcomx.Model/Gender.cs b/Gedcomx.Model/Gender.cs index 863f7f1..87cd23a 100644 --- a/Gedcomx.Model/Gender.cs +++ b/Gedcomx.Model/Gender.cs @@ -9,6 +9,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Conclusion @@ -40,8 +41,8 @@ public Gender(GenderType type) /// /// The type of the gender. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -57,8 +58,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.GenderTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.GenderType KnownType { get @@ -73,8 +74,8 @@ public Gx.Types.GenderType KnownType /// /// The references to the record fields being used as evidence. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] public List Fields { get diff --git a/Gedcomx.Model/GenderType.cs b/Gedcomx.Model/GenderType.cs index 6c0681d..85060e6 100644 --- a/Gedcomx.Model/GenderType.cs +++ b/Gedcomx.Model/GenderType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types { @@ -20,32 +21,32 @@ public enum GenderType { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// Male. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Male")] + [XmlEnum("http://gedcomx.org/Male")] Male, /// /// Female. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Female")] + [XmlEnum("http://gedcomx.org/Female")] Female, /// /// Unknown. Note that this should be used strictly as "unknown" and not to /// indicate a type that is not set or not understood. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Unknown")] + [XmlEnum("http://gedcomx.org/Unknown")] Unknown, /// /// Custom /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/HypermediaEnabledData.cs b/Gedcomx.Model/HypermediaEnabledData.cs index d3f03c1..42a523b 100644 --- a/Gedcomx.Model/HypermediaEnabledData.cs +++ b/Gedcomx.Model/HypermediaEnabledData.cs @@ -29,8 +29,8 @@ public abstract partial class HypermediaEnabledData : Gx.Common.ExtensibleData, /// /// The list of hypermedia links. Links are not specified by GEDCOM X core, but as extension elements by GEDCOM X RS. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "link", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("links")] + [XmlElement(ElementName = "link", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("links")] [JsonConverter(typeof(JsonHypermediaLinksConverter))] public List Links { diff --git a/Gedcomx.Model/IAttributable.cs b/Gedcomx.Model/IAttributable.cs index 8185b72..e8bfeaa 100644 --- a/Gedcomx.Model/IAttributable.cs +++ b/Gedcomx.Model/IAttributable.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/ISupportsLinks.cs b/Gedcomx.Model/ISupportsLinks.cs index 13e21d8..3b99629 100644 --- a/Gedcomx.Model/ISupportsLinks.cs +++ b/Gedcomx.Model/ISupportsLinks.cs @@ -1,7 +1,6 @@ using Gx.Links; using Newtonsoft.Json; using System; -using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/Identifier.cs b/Gedcomx.Model/Identifier.cs index a59c682..e41a9e3 100644 --- a/Gedcomx.Model/Identifier.cs +++ b/Gedcomx.Model/Identifier.cs @@ -8,7 +8,6 @@ // using System; using System.Xml.Serialization; -using System.Collections.Generic; namespace Gx.Conclusion { @@ -30,8 +29,8 @@ public sealed partial class Identifier /// /// The type of the id. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -47,8 +46,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.IdentifierTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.IdentifierType KnownType { get @@ -63,8 +62,8 @@ public Gx.Types.IdentifierType KnownType /// /// The id value. /// - [System.Xml.Serialization.XmlTextAttribute()] - [Newtonsoft.Json.JsonProperty("value")] + [XmlTextAttribute()] + [JsonProperty("value")] public string Value { get diff --git a/Gedcomx.Model/IdentifierType.cs b/Gedcomx.Model/IdentifierType.cs index 32cb362..89e6724 100644 --- a/Gedcomx.Model/IdentifierType.cs +++ b/Gedcomx.Model/IdentifierType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types { @@ -20,13 +21,13 @@ public enum IdentifierType { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// The primary identifier for the resource. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Primary")] + [XmlEnum("http://gedcomx.org/Primary")] Primary, /// @@ -37,7 +38,7 @@ public enum IdentifierType { /// (working) person conclusion identifies the evidence used to support the conclusion by including /// each evidence identifier in the list of identifiers for the person. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Evidence")] + [XmlEnum("http://gedcomx.org/Evidence")] Evidence, /// @@ -45,7 +46,7 @@ public enum IdentifierType { /// identifier is commonly used as the result of a merge when what was once a primary /// identifier for a person is no longer primary. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Deprecated")] + [XmlEnum("http://gedcomx.org/Deprecated")] Deprecated, /// @@ -53,13 +54,13 @@ public enum IdentifierType { /// that provide persistent identifiers are claiming that links to the resource using the identifier /// won't break. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Persistent")] + [XmlEnum("http://gedcomx.org/Persistent")] Persistent, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/Link.cs b/Gedcomx.Model/Link.cs index a621942..773afb8 100644 --- a/Gedcomx.Model/Link.cs +++ b/Gedcomx.Model/Link.cs @@ -5,7 +5,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Links { @@ -52,8 +54,8 @@ public Link(String rel, String href) /// A URI template per <a href="http://tools.ietf.org/html/rfc6570">RFC 6570</a>, used to link to a range of /// URIs, such as for the purpose of linking to a query. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "template")] - [Newtonsoft.Json.JsonProperty("template")] + [XmlAttribute(AttributeName = "template")] + [JsonProperty("template")] public string Template { get @@ -68,8 +70,8 @@ public string Template /// /// Metadata about the available media type(s) of the resource being linked to. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "allow")] - [Newtonsoft.Json.JsonProperty("allow")] + [XmlAttribute(AttributeName = "allow")] + [JsonProperty("allow")] public string Allow { get @@ -84,8 +86,8 @@ public string Allow /// /// The number of elements in the page, if this link refers to a page of resources. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "count")] - [Newtonsoft.Json.JsonProperty("count")] + [XmlAttribute(AttributeName = "count")] + [JsonProperty("count")] public int Count { get @@ -102,9 +104,9 @@ public int Count /// /// Property for the XML serializer indicating whether the "Count" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool CountSpecified { get @@ -120,8 +122,8 @@ public bool CountSpecified /// /// Metadata about the available media type(s) of the resource being linked to. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "accept")] - [Newtonsoft.Json.JsonProperty("accept")] + [XmlAttribute(AttributeName = "accept")] + [JsonProperty("accept")] public string Accept { get @@ -136,8 +138,8 @@ public string Accept /// /// Metadata about the available media type(s) of the resource being linked to. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -152,8 +154,8 @@ public string Type /// /// The language of the resource being linked to. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "hreflang")] - [Newtonsoft.Json.JsonProperty("hreflang")] + [XmlAttribute(AttributeName = "hreflang")] + [JsonProperty("hreflang")] public string Hreflang { get @@ -168,8 +170,8 @@ public string Hreflang /// /// Human-readable information about the link. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "title")] - [Newtonsoft.Json.JsonProperty("title")] + [XmlAttribute(AttributeName = "title")] + [JsonProperty("title")] public string Title { get @@ -184,8 +186,8 @@ public string Title /// /// The total number of results in the page to which this links, if this link refers to a page of resources. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "results")] - [Newtonsoft.Json.JsonProperty("results")] + [XmlAttribute(AttributeName = "results")] + [JsonProperty("results")] public int Results { get @@ -202,9 +204,9 @@ public int Results /// /// Property for the XML serializer indicating whether the "Results" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool ResultsSpecified { get @@ -220,8 +222,8 @@ public bool ResultsSpecified /// /// The link relationship. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "rel")] - [Newtonsoft.Json.JsonProperty("rel")] + [XmlAttribute(AttributeName = "rel")] + [JsonProperty("rel")] public string Rel { get @@ -236,8 +238,8 @@ public string Rel /// /// The index of the offset of the page, if this link refers to a page of resources. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "offset")] - [Newtonsoft.Json.JsonProperty("offset")] + [XmlAttribute(AttributeName = "offset")] + [JsonProperty("offset")] public int Offset { get @@ -254,9 +256,9 @@ public int Offset /// /// Property for the XML serializer indicating whether the "Offset" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool OffsetSpecified { get @@ -272,8 +274,8 @@ public bool OffsetSpecified /// /// The target IRI of the link. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "href")] - [Newtonsoft.Json.JsonProperty("href")] + [XmlAttribute(AttributeName = "href")] + [JsonProperty("href")] public String Href { get diff --git a/Gedcomx.Model/Name.cs b/Gedcomx.Model/Name.cs index 25f96af..9810769 100644 --- a/Gedcomx.Model/Name.cs +++ b/Gedcomx.Model/Name.cs @@ -8,8 +8,10 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; +using System.ComponentModel; namespace Gx.Conclusion { @@ -43,8 +45,8 @@ public Name(String fullText, params NamePart[] parts) /// /// The type of the name. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -60,8 +62,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.NameTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.NameType KnownType { get @@ -76,8 +78,8 @@ public Gx.Types.NameType KnownType /// /// Whether the conclusion is preferred above other conclusions of the same type. Useful, for example, for display purposes. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "preferred", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("preferred")] + [XmlElement(ElementName = "preferred", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("preferred")] public bool Preferred { get @@ -94,9 +96,9 @@ public bool Preferred /// /// Property for the XML serializer indicating whether the "Preferred" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool PreferredSpecified { get @@ -112,8 +114,8 @@ public bool PreferredSpecified /// /// The date the name was first applied or adopted. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "date", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("date")] + [XmlElement(ElementName = "date", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("date")] public Gx.Conclusion.DateInfo Date { get @@ -128,8 +130,8 @@ public Gx.Conclusion.DateInfo Date /// /// Alternate forms of the name, such as the romanized form of a non-latin name. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "nameForm", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("nameForms")] + [XmlElement(ElementName = "nameForm", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("nameForms")] public List NameForms { get @@ -142,8 +144,8 @@ public List NameForms } } - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public NameForm NameForm { get diff --git a/Gedcomx.Model/NameForm.cs b/Gedcomx.Model/NameForm.cs index 5bce5c7..19a9985 100644 --- a/Gedcomx.Model/NameForm.cs +++ b/Gedcomx.Model/NameForm.cs @@ -8,6 +8,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Conclusion @@ -44,8 +45,8 @@ public NameForm(String fullText, params NamePart[] parts) /// /// The language of the conclusion. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get @@ -60,8 +61,8 @@ public string Lang /// /// The full text of the name form. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "fullText", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fullText")] + [XmlElement(ElementName = "fullText", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fullText")] public string FullText { get @@ -76,8 +77,8 @@ public string FullText /// /// The different parts of the name form. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "part", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("parts")] + [XmlElement(ElementName = "part", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("parts")] public List Parts { get @@ -92,8 +93,8 @@ public List Parts /// /// The references to the record fields being used as evidence. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] public List Fields { get diff --git a/Gedcomx.Model/NamePart.cs b/Gedcomx.Model/NamePart.cs index 9939ebb..c2af17c 100644 --- a/Gedcomx.Model/NamePart.cs +++ b/Gedcomx.Model/NamePart.cs @@ -10,6 +10,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Conclusion @@ -48,8 +49,8 @@ public NamePart(NamePartType type, String text) /// /// The value of the name part. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "value")] - [Newtonsoft.Json.JsonProperty("value")] + [XmlAttribute(AttributeName = "value")] + [JsonProperty("value")] public string Value { get @@ -64,8 +65,8 @@ public string Value /// /// The type of the name part. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -81,8 +82,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.NamePartTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.NamePartType KnownType { get @@ -97,8 +98,8 @@ public Gx.Types.NamePartType KnownType /// /// The references to the record fields being used as evidence. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] public List Fields { get @@ -113,8 +114,8 @@ public List Fields /// /// The qualifiers associated with this name part. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "qualifier", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("qualifiers")] + [XmlElement(ElementName = "qualifier", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("qualifiers")] public List Qualifiers { get diff --git a/Gedcomx.Model/NamePartQualifierType.cs b/Gedcomx.Model/NamePartQualifierType.cs index dcebef3..7698017 100644 --- a/Gedcomx.Model/NamePartQualifierType.cs +++ b/Gedcomx.Model/NamePartQualifierType.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; @@ -15,85 +16,85 @@ public enum NamePartQualifierType * ranks (e.g. Colonel, General, Knight, Esquire), * positions (e.g. Count, Chief, Father, King) or other titles (e.g., PhD, MD) */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Title")] + [XmlEnum("http://gedcomx.org/Title")] Title, /** * A designation for the name of most prominent in importance among the names of that type (e.g., the primary given name). */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Primary")] + [XmlEnum("http://gedcomx.org/Primary")] Primary, /** * A designation for a name that is not primary in its importance among the names of that type (e.g., a secondary given name). */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Secondary")] + [XmlEnum("http://gedcomx.org/Secondary")] Secondary, /** * A designation useful for cultures that designate a middle name that is distinct from a given name and a surname. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Middle")] + [XmlEnum("http://gedcomx.org/Middle")] Middle, /** * A designation for one's familiar name. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Familiar")] + [XmlEnum("http://gedcomx.org/Familiar")] Familiar, /** * A designation for a name given for religious purposes. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Religious")] + [XmlEnum("http://gedcomx.org/Religious")] Religious, /** * A name that associates a person with a group, such as a clan, tribe, or patriarchal hierarchy. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Family")] + [XmlEnum("http://gedcomx.org/Family")] Family, /** * A designation given by women to their original surname after they adopt a new surname upon marriage. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Maiden")] + [XmlEnum("http://gedcomx.org/Maiden")] Maiden, /** * A name derived from a father or paternal ancestor. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Patronymic")] + [XmlEnum("http://gedcomx.org/Patronymic")] Patronymic, /** * A name derived from a mother or maternal ancestor. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Matronymic")] + [XmlEnum("http://gedcomx.org/Matronymic")] Matronymic, /** * A name derived from associated geography. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Geographic")] + [XmlEnum("http://gedcomx.org/Geographic")] Geographic, /** * A name derived from one's occupation. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Occupational")] + [XmlEnum("http://gedcomx.org/Occupational")] Occupational, /** * A name derived from a characteristic. */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Characteristic")] + [XmlEnum("http://gedcomx.org/Characteristic")] Characteristic, /** * A name mandedated by law populations from Congo Free State / Belgian Congo / Congo / Democratic Republic of Congo (formerly Zaire). */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Postnom")] + [XmlEnum("http://gedcomx.org/Postnom")] Postnom, /** @@ -103,10 +104,10 @@ public enum NamePartQualifierType * comparators (e.g. Junior, Senior, younger, little), ordinals (e.g. III, eighth), * and conjunctions (e.g. and, or, nee, ou, y, o, ne, &). */ - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Particle")] + [XmlEnum("http://gedcomx.org/Particle")] Particle, - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/NamePartType.cs b/Gedcomx.Model/NamePartType.cs index 499b798..470a2d0 100644 --- a/Gedcomx.Model/NamePartType.cs +++ b/Gedcomx.Model/NamePartType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types { @@ -20,37 +21,37 @@ public enum NamePartType { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Prefix")] + [XmlEnum("http://gedcomx.org/Prefix")] Prefix, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Suffix")] + [XmlEnum("http://gedcomx.org/Suffix")] Suffix, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Given")] + [XmlEnum("http://gedcomx.org/Given")] Given, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Surname")] + [XmlEnum("http://gedcomx.org/Surname")] Surname, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/NameType.cs b/Gedcomx.Model/NameType.cs index 25f835d..62fd9eb 100644 --- a/Gedcomx.Model/NameType.cs +++ b/Gedcomx.Model/NameType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types { @@ -20,61 +21,61 @@ public enum NameType { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// Name given at birth. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/BirthName")] + [XmlEnum("http://gedcomx.org/BirthName")] BirthName, /// /// Name used at the time of death. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/DeathName")] + [XmlEnum("http://gedcomx.org/DeathName")] DeathName, /// /// Name accepted at marriage. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriedName")] + [XmlEnum("http://gedcomx.org/MarriedName")] MarriedName, /// /// "Also known as" name. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/AlsoKnownAs")] + [XmlEnum("http://gedcomx.org/AlsoKnownAs")] AlsoKnownAs, /// /// Nickname. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Nickname")] + [XmlEnum("http://gedcomx.org/Nickname")] Nickname, /// /// Name given at adoption. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/AdoptiveName")] + [XmlEnum("http://gedcomx.org/AdoptiveName")] AdoptiveName, /// /// A formal name, usually given to distinguish it from a name more commonly used. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/FormalName")] + [XmlEnum("http://gedcomx.org/FormalName")] FormalName, /// /// A name given at a religious rite or ceremony. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/ReligiousName")] + [XmlEnum("http://gedcomx.org/ReligiousName")] ReligiousName, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/Note.cs b/Gedcomx.Model/Note.cs index 5a160d6..ab28cea 100644 --- a/Gedcomx.Model/Note.cs +++ b/Gedcomx.Model/Note.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Common @@ -30,8 +31,8 @@ public partial class Note : Gx.Links.HypermediaEnabledData, IAttributable /// /// The language of the note. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get @@ -46,8 +47,8 @@ public string Lang /// /// The subject of the note. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "subject", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("subject")] + [XmlElement(ElementName = "subject", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("subject")] public string Subject { get @@ -62,8 +63,8 @@ public string Subject /// /// The text of the note. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "text", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("text")] + [XmlElement(ElementName = "text", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("text")] public string Text { get @@ -78,8 +79,8 @@ public string Text /// /// Attribution metadata for a note. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("attribution")] + [XmlElement(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("attribution")] public Gx.Common.Attribution Attribution { get diff --git a/Gedcomx.Model/OnlineAccount.cs b/Gedcomx.Model/OnlineAccount.cs index 81bd5cd..9439103 100644 --- a/Gedcomx.Model/OnlineAccount.cs +++ b/Gedcomx.Model/OnlineAccount.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Agent @@ -27,8 +28,8 @@ public partial class OnlineAccount : Gx.Common.ExtensibleData /// /// The name associated the holder of this account with the account. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "accountName", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("accountName")] + [XmlElement(ElementName = "accountName", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("accountName")] public string AccountName { get @@ -43,8 +44,8 @@ public string AccountName /// /// The homepage of the service that provides this account. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "serviceHomepage", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("serviceHomepage")] + [XmlElement(ElementName = "serviceHomepage", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("serviceHomepage")] public Gx.Common.ResourceReference ServiceHomepage { get diff --git a/Gedcomx.Model/Person.cs b/Gedcomx.Model/Person.cs index a153778..85767cd 100644 --- a/Gedcomx.Model/Person.cs +++ b/Gedcomx.Model/Person.cs @@ -9,7 +9,10 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using Gx.Source; +using System.ComponentModel; namespace Gx.Conclusion { @@ -23,7 +26,7 @@ namespace Gx.Conclusion [Serializable] [XmlType(Namespace = "http://gedcomx.org/v1/", TypeName = "Person")] [XmlRoot(Namespace = "http://gedcomx.org/v1/", ElementName = "person")] - public partial class Person : Gx.Conclusion.Subject + public partial class Person : Subject { private bool? _principal; private bool _principalSpecified; @@ -31,18 +34,18 @@ public partial class Person : Gx.Conclusion.Subject private bool _privateSpecified; private bool? _living; private bool _livingSpecified; - private Gx.Conclusion.Gender _gender; - private List _names; - private List _facts; - private List _media; - private List _fields; - private Gx.Conclusion.DisplayProperties _displayExtension; - private List _discussionreference; - /// - /// Whether this person is the "principal" person extracted from the record. - /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "principal")] - [Newtonsoft.Json.JsonProperty("principal")] + private Gender _gender; + private List _names; + private List _facts; + //private List _media; + private List _fields; + private DisplayProperties _displayExtension; + private List _discussionreference; + /// + /// Whether this person is the "principal" person extracted from the record. + /// + [XmlAttribute(AttributeName = "principal")] + [JsonProperty("principal")] public bool Principal { get @@ -59,9 +62,9 @@ public bool Principal /// /// Property for the XML serializer indicating whether the "Principal" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool PrincipalSpecified { get @@ -77,8 +80,8 @@ public bool PrincipalSpecified /// /// Whether this person has been designated for limited distribution or display. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "private")] - [Newtonsoft.Json.JsonProperty("private")] + [XmlAttribute(AttributeName = "private")] + [JsonProperty("private")] public bool Private { get @@ -95,9 +98,9 @@ public bool Private /// /// Property for the XML serializer indicating whether the "Private" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool PrivateSpecified { get @@ -113,8 +116,8 @@ public bool PrivateSpecified /// /// Living status of the person as treated by the system. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "living", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("living")] + [XmlElement(ElementName = "living", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("living")] public bool Living { get @@ -131,9 +134,9 @@ public bool Living /// /// Property for the XML serializer indicating whether the "Living" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool LivingSpecified { get @@ -149,9 +152,9 @@ public bool LivingSpecified /// /// The gender conclusion for the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "gender", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("gender")] - public Gx.Conclusion.Gender Gender + [XmlElement(ElementName = "gender", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("gender")] + public Gender Gender { get { @@ -165,9 +168,9 @@ public Gx.Conclusion.Gender Gender /// /// The name conclusions for the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("names")] - public List Names + [XmlElement(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("names")] + public List Names { get { @@ -181,9 +184,9 @@ public List Names /// /// The fact conclusions for the person. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "fact", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("facts")] - public List Facts + [XmlElement(ElementName = "fact", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("facts")] + public List Facts { get { @@ -197,9 +200,9 @@ public List Facts /// /// The references to the record fields being used as evidence. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] - public List Fields + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] + public List Fields { get { @@ -213,9 +216,9 @@ public List Fields /// /// Display properties for the person. Display properties are not specified by GEDCOM X core, but as extension elements by GEDCOM X RS. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "display", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("display")] - public Gx.Conclusion.DisplayProperties DisplayExtension + [XmlElement(ElementName = "display", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("display")] + public DisplayProperties DisplayExtension { get { @@ -226,28 +229,28 @@ public Gx.Conclusion.DisplayProperties DisplayExtension this._displayExtension = value; } } - /// - /// Discussion References properties for the person. - /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "discussion-references", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("discussion-references")] - public List DiscussionReferences - { - get - { - return this._discussionreference; - } - set - { - this._discussionreference = value; - } - } + /// + /// Discussion References properties for the person. + /// + [XmlElement(ElementName = "discussion-references", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("discussion-references")] + public List DiscussionReferences + { + get + { + return this._discussionreference; + } + set + { + this._discussionreference = value; + } + } - /// - /// Embed the specified person into this one. - /// - /// The person to embed. - public void Embed(Person person) + /// + /// Embed the specified person into this one. + /// + /// The person to embed. + public void Embed(Person person) { this._private = this._private == null ? person._private : this._private; this._living = this._living == null ? person._living : this._living; diff --git a/Gedcomx.Model/PlaceDescription.cs b/Gedcomx.Model/PlaceDescription.cs index b44ae85..f111c2c 100644 --- a/Gedcomx.Model/PlaceDescription.cs +++ b/Gedcomx.Model/PlaceDescription.cs @@ -7,7 +7,9 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Conclusion { @@ -41,8 +43,8 @@ public partial class PlaceDescription : Gx.Conclusion.Subject /// /// An implementation-specific uniform resource identifier (URI) used to identify the type of a place (e.g., address, city, county, province, state, country, etc.). /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -57,8 +59,8 @@ public string Type /// /// An ordered list of standardized (or normalized), fully-qualified (in terms of what is known of the applicable jurisdictional hierarchy) names for this place that are applicable to this description of this place. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("names")] + [XmlElement(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("names")] public List Names { get @@ -73,8 +75,8 @@ public List Names /// /// A description of the time period to which this place description is relevant. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "temporalDescription", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("temporalDescription")] + [XmlElement(ElementName = "temporalDescription", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("temporalDescription")] public Gx.Conclusion.DateInfo TemporalDescription { get @@ -89,8 +91,8 @@ public Gx.Conclusion.DateInfo TemporalDescription /// /// Degrees north or south of the Equator. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "latitude", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("latitude")] + [XmlElement(ElementName = "latitude", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("latitude")] public double Latitude { get @@ -107,9 +109,9 @@ public double Latitude /// /// Property for the XML serializer indicating whether the "Latitude" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool LatitudeSpecified { get @@ -125,8 +127,8 @@ public bool LatitudeSpecified /// /// Angular distance in degrees, relative to the Prime Meridian. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "longitude", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("longitude")] + [XmlElement(ElementName = "longitude", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("longitude")] public double Longitude { get @@ -143,9 +145,9 @@ public double Longitude /// /// Property for the XML serializer indicating whether the "Longitude" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool LongitudeSpecified { get @@ -161,8 +163,8 @@ public bool LongitudeSpecified /// /// A reference to a geospatial description of this place. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "spatialDescription", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("spatialDescription")] + [XmlElement(ElementName = "spatialDescription", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("spatialDescription")] public Gx.Common.ResourceReference SpatialDescription { get @@ -177,8 +179,8 @@ public Gx.Common.ResourceReference SpatialDescription /// /// A reference to the place being described. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "place", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("place")] + [XmlElement(ElementName = "place", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("place")] public Gx.Common.ResourceReference Place { get @@ -193,8 +195,8 @@ public Gx.Common.ResourceReference Place /// /// A reference to a description of the jurisdiction this place. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "jurisdiction", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("jurisdiction")] + [XmlElement(ElementName = "jurisdiction", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("jurisdiction")] public Gx.Common.ResourceReference Jurisdiction { get @@ -209,8 +211,8 @@ public Gx.Common.ResourceReference Jurisdiction /// /// Display properties for the place. Display properties are not specified by GEDCOM X core, but as extension elements by GEDCOM X RS. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "display", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("display")] + [XmlElement(ElementName = "display", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("display")] public Gx.Conclusion.PlaceDisplayProperties DisplayExtension { get diff --git a/Gedcomx.Model/PlaceDisplayProperties.cs b/Gedcomx.Model/PlaceDisplayProperties.cs index c5a96d6..5719117 100644 --- a/Gedcomx.Model/PlaceDisplayProperties.cs +++ b/Gedcomx.Model/PlaceDisplayProperties.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Conclusion @@ -31,8 +32,8 @@ public partial class PlaceDisplayProperties : Gx.Common.ExtensibleData /// /// The displayable full name of the place. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "fullName", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fullName")] + [XmlElement(ElementName = "fullName", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fullName")] public string FullName { get @@ -47,8 +48,8 @@ public string FullName /// /// The displayable name of the place. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("name")] + [XmlElement(ElementName = "name", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("name")] public string Name { get @@ -63,8 +64,8 @@ public string Name /// /// The displayable type of the place. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "type", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlElement(ElementName = "type", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("type")] public string Type { get diff --git a/Gedcomx.Model/PlaceReference.cs b/Gedcomx.Model/PlaceReference.cs index 84890a9..80978df 100644 --- a/Gedcomx.Model/PlaceReference.cs +++ b/Gedcomx.Model/PlaceReference.cs @@ -7,6 +7,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Conclusion @@ -30,8 +31,8 @@ public partial class PlaceReference : Gx.Common.ExtensibleData /// /// A reference to a description of the place being referenced. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "description")] - [Newtonsoft.Json.JsonProperty("description")] + [XmlAttribute(AttributeName = "description")] + [JsonProperty("description")] public string DescriptionRef { get @@ -46,8 +47,8 @@ public string DescriptionRef /// /// The original value as supplied by the user. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "original", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("original")] + [XmlElement(ElementName = "original", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("original")] public string Original { get @@ -63,8 +64,8 @@ public string Original /// The list of normalized values for the place, provided for display purposes by the application. Normalized values /// are not specified by GEDCOM X core, but as extension elements by GEDCOM X RS. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "normalized", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("normalized")] + [XmlElement(ElementName = "normalized", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("normalized")] public List NormalizedExtensions { get @@ -79,8 +80,8 @@ public List NormalizedExtensions /// /// The references to the record fields being used as evidence. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] public List Fields { get diff --git a/Gedcomx.Model/Qualifier.cs b/Gedcomx.Model/Qualifier.cs index 8221105..b03ff6e 100644 --- a/Gedcomx.Model/Qualifier.cs +++ b/Gedcomx.Model/Qualifier.cs @@ -7,6 +7,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; namespace Gx.Common { @@ -50,8 +51,8 @@ public Qualifier(Enum name) SetName(XmlQNameEnumUtil.GetNameValue(name)); } - [System.Xml.Serialization.XmlAttribute(AttributeName = "name", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("name")] + [XmlAttribute(AttributeName = "name", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("name")] public string Name { get @@ -67,8 +68,8 @@ public string Name /// /// The value of the qualifier. /// - [System.Xml.Serialization.XmlTextAttribute()] - [Newtonsoft.Json.JsonProperty("value")] + [XmlTextAttribute()] + [JsonProperty("value")] public string Value { get diff --git a/Gedcomx.Model/RecordDescriptor.cs b/Gedcomx.Model/RecordDescriptor.cs index df33007..f4cbbbe 100644 --- a/Gedcomx.Model/RecordDescriptor.cs +++ b/Gedcomx.Model/RecordDescriptor.cs @@ -6,6 +6,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Records @@ -27,8 +28,8 @@ public partial class RecordDescriptor : Gx.Links.HypermediaEnabledData /// /// The language of this record description. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get @@ -43,8 +44,8 @@ public string Lang /// /// Descriptors of the fields that are applicable to this record. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] public List Fields { get diff --git a/Gedcomx.Model/RecordSet.cs b/Gedcomx.Model/RecordSet.cs index 27cfe89..12f2cb1 100644 --- a/Gedcomx.Model/RecordSet.cs +++ b/Gedcomx.Model/RecordSet.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Records @@ -28,8 +29,8 @@ public partial class RecordSet : Gx.Links.HypermediaEnabledData /// /// The language of the genealogical data. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get @@ -44,8 +45,8 @@ public string Lang /// /// Metadata about this record set; shared among all records in the set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "metadata", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("metadata")] + [XmlElement(ElementName = "metadata", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("metadata")] public Gx.Gedcomx Metadata { get @@ -60,8 +61,8 @@ public Gx.Gedcomx Metadata /// /// The records included in this genealogical data set. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "record", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("records")] + [XmlElement(ElementName = "record", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("records")] public List Records { get diff --git a/Gedcomx.Model/RecordType.cs b/Gedcomx.Model/RecordType.cs index 55bd51e..b27bc8e 100644 --- a/Gedcomx.Model/RecordType.cs +++ b/Gedcomx.Model/RecordType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types @@ -22,283 +23,283 @@ public enum RecordType /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name = "__NULL__")] + [XmlEnumAttribute(Name = "__NULL__")] NULL, /// /// A record of a person's admission to an institution, society, or other association. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Admission")] + [XmlEnum("http://gedcomx.org/Admission")] Admission, /// /// A record of an adoption. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Adoption")] + [XmlEnum("http://gedcomx.org/Adoption")] Adoption, /// /// An affidavit. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Affidavit")] + [XmlEnum("http://gedcomx.org/Affidavit")] Affidavit, /// /// A person's application to an institution, society or other association. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Application")] + [XmlEnum("http://gedcomx.org/Application")] Application, /// /// A record of a person's arrival at a certain place. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Arrival")] + [XmlEnum("http://gedcomx.org/Arrival")] Arrival, /// /// A bank record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Bank")] + [XmlEnum("http://gedcomx.org/Bank")] Bank, /// /// A record of a person's baptism. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Baptism")] + [XmlEnum("http://gedcomx.org/Baptism")] Baptism, /// /// A record of a birth. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Birth")] + [XmlEnum("http://gedcomx.org/Birth")] Birth, /// /// A record of a person's burial or interment. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Burial")] + [XmlEnum("http://gedcomx.org/Burial")] Burial, /// /// todo: document this type. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Business")] + [XmlEnum("http://gedcomx.org/Business")] Business, /// /// todo: document this type. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Cemetery")] + [XmlEnum("http://gedcomx.org/Cemetery")] Cemetery, /// /// A census record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Census")] + [XmlEnum("http://gedcomx.org/Census")] Census, /// /// A record of a person's christening. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Christening")] + [XmlEnum("http://gedcomx.org/Christening")] Christening, /// /// A record of a person's confirmation. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Confirmation")] + [XmlEnum("http://gedcomx.org/Confirmation")] Confirmation, /// /// todo: document this type. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Correspondence")] + [XmlEnum("http://gedcomx.org/Correspondence")] Correspondence, /// /// A death record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Death")] + [XmlEnum("http://gedcomx.org/Death")] Death, /// /// A record of a person's departure from a certain place. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Departure")] + [XmlEnum("http://gedcomx.org/Departure")] Departure, /// /// A divorce record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Divorce")] + [XmlEnum("http://gedcomx.org/Divorce")] Divorce, /// /// todo: document this type. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Duplicate")] + [XmlEnum("http://gedcomx.org/Duplicate")] Duplicate, /// /// A draft record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Draft")] + [XmlEnum("http://gedcomx.org/Draft")] Draft, /// /// todo: document this type. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Estate")] + [XmlEnum("http://gedcomx.org/Estate")] Estate, /// /// todo: document this type. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Index")] + [XmlEnum("http://gedcomx.org/Index")] Index, /// /// todo: document this type. what's the difference between this an MarrigeBanns? /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/IntendedMarriage")] + [XmlEnum("http://gedcomx.org/IntendedMarriage")] IntendedMarriage, /// /// A land record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Land")] + [XmlEnum("http://gedcomx.org/Land")] Land, /// /// A legal record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Legal")] + [XmlEnum("http://gedcomx.org/Legal")] Legal, /// /// A marriage record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Marriage")] + [XmlEnum("http://gedcomx.org/Marriage")] Marriage, /// /// A marriage affadavit. todo: is this distinguishment necessary? why not just use Marriage? /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriageAffidavit")] + [XmlEnum("http://gedcomx.org/MarriageAffidavit")] MarriageAffidavit, /// /// todo: document this type. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriageAmendment")] + [XmlEnum("http://gedcomx.org/MarriageAmendment")] MarriageAmendment, /// /// A record of a person's banns of marriage. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriageBanns")] + [XmlEnum("http://gedcomx.org/MarriageBanns")] MarriageBanns, /// /// todo: document this type. why not just use marriage banns? /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriageConsent")] + [XmlEnum("http://gedcomx.org/MarriageConsent")] MarriageConsent, /// /// todo: document this type. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriageDuplicate")] + [XmlEnum("http://gedcomx.org/MarriageDuplicate")] MarriageDuplicate, /// /// A marriage license. todo: is this distinguishment necessary? why not just use Marriage? /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriageLicense")] + [XmlEnum("http://gedcomx.org/MarriageLicense")] MarriageLicense, /// /// todo: document this type. is this distinguishment necessary? why not just use Marriage? /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/MarriageReturns")] + [XmlEnum("http://gedcomx.org/MarriageReturns")] MarriageReturns, /// /// todo: document this type. is this distinguishment necessary? /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Membership")] + [XmlEnum("http://gedcomx.org/Membership")] Membership, /// /// A migration record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Migration")] + [XmlEnum("http://gedcomx.org/Migration")] Migration, /// /// A military record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Military")] + [XmlEnum("http://gedcomx.org/Military")] Military, /// /// A naturalization record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Naturalization")] + [XmlEnum("http://gedcomx.org/Naturalization")] Naturalization, /// /// A passenger record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Passenger")] + [XmlEnum("http://gedcomx.org/Passenger")] Passenger, /// /// A pension record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Pension")] + [XmlEnum("http://gedcomx.org/Pension")] Pension, /// /// A probate record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Probate")] + [XmlEnum("http://gedcomx.org/Probate")] Probate, /// /// todo: document this type. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/RelatedDocument")] + [XmlEnum("http://gedcomx.org/RelatedDocument")] RelatedDocument, /// /// todo: document this type. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/ReligiousCreeds")] + [XmlEnum("http://gedcomx.org/ReligiousCreeds")] ReligiousCreeds, /// /// A roll. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Roll")] + [XmlEnum("http://gedcomx.org/Roll")] Roll, /// /// A tax record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Tax")] + [XmlEnum("http://gedcomx.org/Tax")] Tax, /// /// A vital record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Vital")] + [XmlEnum("http://gedcomx.org/Vital")] Vital, /// /// Custom /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/Relationship.cs b/Gedcomx.Model/Relationship.cs index b229015..4231c4c 100644 --- a/Gedcomx.Model/Relationship.cs +++ b/Gedcomx.Model/Relationship.cs @@ -10,6 +10,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Conclusion @@ -35,8 +36,8 @@ public partial class Relationship : Gx.Conclusion.Subject /// /// The type of this relationship. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "type")] - [Newtonsoft.Json.JsonProperty("type")] + [XmlAttribute(AttributeName = "type")] + [JsonProperty("type")] public string Type { get @@ -52,8 +53,8 @@ public string Type /// /// Convenience property for treating Type as an enum. See Gx.Types.RelationshipTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.RelationshipType KnownType { get @@ -70,8 +71,8 @@ public Gx.Types.RelationshipType KnownType /// the other person in this relationship and implies neither order nor role. When the relationship type /// implies direction, it goes from "person1" to "person2". /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "person1", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("person1")] + [XmlElement(ElementName = "person1", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("person1")] public Gx.Common.ResourceReference Person1 { get @@ -88,8 +89,8 @@ public Gx.Common.ResourceReference Person1 /// the other person in this relationship and implies neither order nor role. When the relationship type /// implies direction, it goes from "person1" to "person2". /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "person2", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("person2")] + [XmlElement(ElementName = "person2", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("person2")] public Gx.Common.ResourceReference Person2 { get @@ -104,8 +105,8 @@ public Gx.Common.ResourceReference Person2 /// /// The fact conclusions for the relationship. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "fact", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("facts")] + [XmlElement(ElementName = "fact", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("facts")] public List Facts { get @@ -120,8 +121,8 @@ public List Facts /// /// The references to the record fields being used as evidence. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] public List Fields { get diff --git a/Gedcomx.Model/RelationshipType.cs b/Gedcomx.Model/RelationshipType.cs index 7b66052..b5efb2d 100644 --- a/Gedcomx.Model/RelationshipType.cs +++ b/Gedcomx.Model/RelationshipType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types { @@ -20,25 +21,25 @@ public enum RelationshipType { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Couple")] + [XmlEnum("http://gedcomx.org/Couple")] Couple, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/ParentChild")] + [XmlEnum("http://gedcomx.org/ParentChild")] ParentChild, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/ResourceReference.cs b/Gedcomx.Model/ResourceReference.cs index 1c3db8a..cb948d7 100644 --- a/Gedcomx.Model/ResourceReference.cs +++ b/Gedcomx.Model/ResourceReference.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Common @@ -36,8 +37,8 @@ public ResourceReference(string resource) /// /// The resource id of the resource being referenced. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "resourceId")] - [Newtonsoft.Json.JsonProperty("resourceId")] + [XmlAttribute(AttributeName = "resourceId")] + [JsonProperty("resourceId")] public string ResourceId { get @@ -52,8 +53,8 @@ public string ResourceId /// /// The URI to the resource. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "resource")] - [Newtonsoft.Json.JsonProperty("resource")] + [XmlAttribute(AttributeName = "resource")] + [JsonProperty("resource")] public string Resource { get diff --git a/Gedcomx.Model/ResourceType.cs b/Gedcomx.Model/ResourceType.cs index 99e80ad..a08d0db 100644 --- a/Gedcomx.Model/ResourceType.cs +++ b/Gedcomx.Model/ResourceType.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Types { @@ -20,43 +21,43 @@ public enum ResourceType { /// /// Unspecified enum value. /// - [System.Xml.Serialization.XmlEnumAttribute(Name="__NULL__")] + [XmlEnumAttribute(Name="__NULL__")] NULL, /// /// A historical record. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Record")] + [XmlEnum("http://gedcomx.org/Record")] Record, /// /// A collection. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Collection")] + [XmlEnum("http://gedcomx.org/Collection")] Collection, /// /// A digital artifact, such as a digital image or video. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/DigitalArtifact")] + [XmlEnum("http://gedcomx.org/DigitalArtifact")] DigitalArtifact, /// /// A physical artifact. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/PhysicalArtifact")] + [XmlEnum("http://gedcomx.org/PhysicalArtifact")] PhysicalArtifact, /// /// A person. /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/Person")] + [XmlEnum("http://gedcomx.org/Person")] Person, /// /// (no documentation provided) /// - [System.Xml.Serialization.XmlEnum("http://gedcomx.org/OTHER")] + [XmlEnum("http://gedcomx.org/OTHER")] OTHER } } diff --git a/Gedcomx.Model/Rt/GedcomxLocalReferenceResolver.cs b/Gedcomx.Model/Rt/GedcomxLocalReferenceResolver.cs index 63550ef..2cedcf1 100644 --- a/Gedcomx.Model/Rt/GedcomxLocalReferenceResolver.cs +++ b/Gedcomx.Model/Rt/GedcomxLocalReferenceResolver.cs @@ -5,6 +5,7 @@ using Gx.Source; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/Rt/IGedcomxModelVisitor.cs b/Gedcomx.Model/Rt/IGedcomxModelVisitor.cs index 5ab70d2..689f6b7 100644 --- a/Gedcomx.Model/Rt/IGedcomxModelVisitor.cs +++ b/Gedcomx.Model/Rt/IGedcomxModelVisitor.cs @@ -5,6 +5,7 @@ using Gx.Source; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/SourceCitation.cs b/Gedcomx.Model/SourceCitation.cs index baff014..df0a824 100644 --- a/Gedcomx.Model/SourceCitation.cs +++ b/Gedcomx.Model/SourceCitation.cs @@ -7,6 +7,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Source @@ -30,8 +31,8 @@ public partial class SourceCitation : Gx.Links.HypermediaEnabledData /// /// The language of the note. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get @@ -46,8 +47,8 @@ public string Lang /// /// A reference to the citation template for this citation. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "citationTemplate", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("citationTemplate")] + [XmlElement(ElementName = "citationTemplate", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("citationTemplate")] public Gx.Common.ResourceReference CitationTemplate { get @@ -62,8 +63,8 @@ public Gx.Common.ResourceReference CitationTemplate /// /// The list of citation fields. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] public List Fields { get @@ -78,8 +79,8 @@ public List Fields /// /// A rendering (as a string) of a source citation. This rendering should be the most complete rendering available. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("value")] + [XmlElement(ElementName = "value", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("value")] public string Value { get diff --git a/Gedcomx.Model/SourceDescription.cs b/Gedcomx.Model/SourceDescription.cs index 05b45ea..f67dbbc 100644 --- a/Gedcomx.Model/SourceDescription.cs +++ b/Gedcomx.Model/SourceDescription.cs @@ -13,6 +13,7 @@ using System; using System.Xml.Serialization; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Source { @@ -56,8 +57,8 @@ public partial class SourceDescription : Gx.Links.HypermediaEnabledData, IAttrib /// /// The URI (if applicable) of the actual source. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "about")] - [Newtonsoft.Json.JsonProperty("about")] + [XmlAttribute(AttributeName = "about")] + [JsonProperty("about")] public string About { get @@ -72,8 +73,8 @@ public string About /// /// The language of the genealogical data. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get @@ -88,8 +89,8 @@ public string Lang /// /// Hint about the media (MIME) type of the resource being described. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "mediaType")] - [Newtonsoft.Json.JsonProperty("mediaType")] + [XmlAttribute(AttributeName = "mediaType")] + [JsonProperty("mediaType")] public string MediaType { get @@ -104,8 +105,8 @@ public string MediaType /// /// A sort key to be used in determining the position of this source relative to other sources in the same collection. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "sortKey")] - [Newtonsoft.Json.JsonProperty("sortKey")] + [XmlAttribute(AttributeName = "sortKey")] + [JsonProperty("sortKey")] public string SortKey { get @@ -120,8 +121,8 @@ public string SortKey /// /// The type of the resource being described. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "resourceType")] - [Newtonsoft.Json.JsonProperty("resourceType")] + [XmlAttribute(AttributeName = "resourceType")] + [JsonProperty("resourceType")] public string ResourceType { get @@ -137,8 +138,8 @@ public string ResourceType /// /// Convenience property for treating ResourceType as an enum. See Gx.Types.ResourceTypeQNameUtil for details on getter/setter functionality. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Gx.Types.ResourceType KnownResourceType { get @@ -153,8 +154,8 @@ public Gx.Types.ResourceType KnownResourceType /// /// The bibliographic citations for this source. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "citation", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("citations")] + [XmlElement(ElementName = "citation", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("citations")] public List Citations { get @@ -169,8 +170,8 @@ public List Citations /// /// A reference to the entity that mediates access to the described source. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "mediator", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("mediator")] + [XmlElement(ElementName = "mediator", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("mediator")] public Gx.Common.ResourceReference Mediator { get @@ -185,8 +186,8 @@ public Gx.Common.ResourceReference Mediator /// /// References to any sources to which this source is related (usually applicable to sources that are derived from or contained in another source). /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "source", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("sources")] + [XmlElement(ElementName = "source", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("sources")] public List Sources { get @@ -201,8 +202,8 @@ public List Sources /// /// A reference to the analysis document explaining the analysis that went into this description of the source. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "analysis", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("analysis")] + [XmlElement(ElementName = "analysis", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("analysis")] public Gx.Common.ResourceReference Analysis { get @@ -217,8 +218,8 @@ public Gx.Common.ResourceReference Analysis /// /// A reference to the source that contains this source. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "componentOf", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("componentOf")] + [XmlElement(ElementName = "componentOf", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("componentOf")] public Gx.Source.SourceReference ComponentOf { get @@ -233,8 +234,8 @@ public Gx.Source.SourceReference ComponentOf /// /// A list of titles for this source. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "title", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("titles")] + [XmlElement(ElementName = "title", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("titles")] public List Titles { get @@ -249,8 +250,8 @@ public List Titles /// /// A label for the title of this description. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "titleLabel", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("titleLabel")] + [XmlElement(ElementName = "titleLabel", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("titleLabel")] public Gx.Common.TextValue TitleLabel { get @@ -265,8 +266,8 @@ public Gx.Common.TextValue TitleLabel /// /// Notes about a source. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "note", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("notes")] + [XmlElement(ElementName = "note", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("notes")] public List Notes { get @@ -281,8 +282,8 @@ public List Notes /// /// The attribution metadata for this source description. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("attribution")] + [XmlElement(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("attribution")] public Gx.Common.Attribution Attribution { get @@ -297,8 +298,8 @@ public Gx.Common.Attribution Attribution /// /// Human-readable descriptions of the source. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "description", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("descriptions")] + [XmlElement(ElementName = "description", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("descriptions")] public List Descriptions { get @@ -313,8 +314,8 @@ public List Descriptions /// /// The list of identifiers for the source. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "identifier", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("identifiers")] + [XmlElement(ElementName = "identifier", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("identifiers")] [JsonConverter(typeof(JsonIdentifiersConverter))] public List Identifiers { @@ -330,8 +331,8 @@ public List Identifiers /// /// The date the source was created. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "created", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("created")] + [XmlElement(ElementName = "created", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("created")] [JsonConverter(typeof(JsonUnixTimestampConverter))] public DateTime Created { @@ -349,9 +350,9 @@ public DateTime Created /// /// Property for the XML serializer indicating whether the "Created" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool CreatedSpecified { get @@ -367,8 +368,8 @@ public bool CreatedSpecified /// /// The date the source was last modified. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "modified", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("modified")] + [XmlElement(ElementName = "modified", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("modified")] [JsonConverter(typeof(JsonUnixTimestampConverter))] public DateTime Modified { @@ -386,9 +387,9 @@ public DateTime Modified /// /// Property for the XML serializer indicating whether the "Modified" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool ModifiedSpecified { get @@ -404,8 +405,8 @@ public bool ModifiedSpecified /// /// Declarations of the coverage of the source. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "coverage", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("coverage")] + [XmlElement(ElementName = "coverage", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("coverage")] public List Coverage { get @@ -420,8 +421,8 @@ public List Coverage /// /// The rights for this source. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "rights", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("rights")] + [XmlElement(ElementName = "rights", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("rights")] public List Rights { get @@ -436,8 +437,8 @@ public List Rights /// /// The fields that are applicable to the resource being described. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("fields")] + [XmlElement(ElementName = "field", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("fields")] public List Fields { get @@ -452,8 +453,8 @@ public List Fields /// /// Reference to an agent describing the repository in which the source is found. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "repository", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("repository")] + [XmlElement(ElementName = "repository", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("repository")] public Gx.Common.ResourceReference Repository { get @@ -468,8 +469,8 @@ public Gx.Common.ResourceReference Repository /// /// Reference to a descriptor of fields and type of data that can be expected to be extracted from the source. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "descriptor", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("descriptor")] + [XmlElement(ElementName = "descriptor", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("descriptor")] public Gx.Common.ResourceReference DescriptorRef { get diff --git a/Gedcomx.Model/SourceReference.cs b/Gedcomx.Model/SourceReference.cs index 090b44d..48de551 100644 --- a/Gedcomx.Model/SourceReference.cs +++ b/Gedcomx.Model/SourceReference.cs @@ -32,7 +32,7 @@ public partial class SourceReference : Gx.Links.HypermediaEnabledData, IAttribut /// /// A reference to a description of the source being referenced. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "description")] + [XmlAttribute(AttributeName = "description")] [JsonProperty("description")] public string DescriptionRef { @@ -48,8 +48,8 @@ public string DescriptionRef /// /// The attribution metadata for this source reference. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("attribution")] + [XmlElement(ElementName = "attribution", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("attribution")] public Gx.Common.Attribution Attribution { get @@ -64,8 +64,8 @@ public Gx.Common.Attribution Attribution /// /// The qualifiers associated with this source reference. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "qualifier", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("qualifiers")] + [XmlElement(ElementName = "qualifier", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("qualifiers")] public List Qualifiers { get @@ -80,8 +80,8 @@ public List Qualifiers /// /// The tags associated with this source reference. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "tags", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("tags")] + [XmlElement(ElementName = "tags", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("tags")] public List Tags { get diff --git a/Gedcomx.Model/Subject.cs b/Gedcomx.Model/Subject.cs index c1981d4..6a88024 100644 --- a/Gedcomx.Model/Subject.cs +++ b/Gedcomx.Model/Subject.cs @@ -10,6 +10,7 @@ using System; using System.Xml.Serialization; using System.Collections.Generic; +using System.ComponentModel; namespace Gx.Conclusion { @@ -39,8 +40,8 @@ public abstract partial class Subject : Gx.Conclusion.Conclusion, IAttributable /// /// Whether this subject has been identified as "extracted". /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "extracted")] - [Newtonsoft.Json.JsonProperty("extracted")] + [XmlAttribute(AttributeName = "extracted")] + [JsonProperty("extracted")] public bool Extracted { get @@ -57,9 +58,9 @@ public bool Extracted /// /// Property for the XML serializer indicating whether the "Extracted" property should be included in the output. /// - [System.Xml.Serialization.XmlIgnoreAttribute] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [EditorBrowsable(EditorBrowsableState.Never)] + [JsonIgnore] public bool ExtractedSpecified { get @@ -75,8 +76,8 @@ public bool ExtractedSpecified /// /// References to the evidence being referenced. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "evidence", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("evidence")] + [XmlElement(ElementName = "evidence", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("evidence")] public List Evidence { get @@ -91,8 +92,8 @@ public List Evidence /// /// References to multimedia resources associated with this subject. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "media", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("media")] + [XmlElement(ElementName = "media", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("media")] public List Media { get @@ -107,8 +108,8 @@ public List Media /// /// The list of identifiers for the subject. /// - [System.Xml.Serialization.XmlElementAttribute(ElementName = "identifier", Namespace = "http://gedcomx.org/v1/")] - [Newtonsoft.Json.JsonProperty("identifiers")] + [XmlElement(ElementName = "identifier", Namespace = "http://gedcomx.org/v1/")] + [JsonProperty("identifiers")] [JsonConverter(typeof(JsonIdentifiersConverter))] public List Identifiers { diff --git a/Gedcomx.Model/Tag.cs b/Gedcomx.Model/Tag.cs index 17ba5a7..3479d49 100644 --- a/Gedcomx.Model/Tag.cs +++ b/Gedcomx.Model/Tag.cs @@ -1,6 +1,7 @@ using Gedcomx.Model.Util; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; @@ -33,8 +34,8 @@ public Tag(Enum value) /// /// A reference to the value of the tag. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "resource")] - [Newtonsoft.Json.JsonProperty("resource")] + [XmlAttribute(AttributeName = "resource")] + [JsonProperty("resource")] public string Resource { get diff --git a/Gedcomx.Model/TextValue.cs b/Gedcomx.Model/TextValue.cs index 32559d9..5bb9c1a 100644 --- a/Gedcomx.Model/TextValue.cs +++ b/Gedcomx.Model/TextValue.cs @@ -5,6 +5,7 @@ // using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; namespace Gx.Common @@ -35,8 +36,8 @@ public TextValue(String value) /// /// The language of the text value. /// - [System.Xml.Serialization.XmlAttributeAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] - [Newtonsoft.Json.JsonProperty("lang")] + [XmlAttribute(AttributeName = "lang", Namespace = "http://www.w3.org/XML/1998/namespace")] + [JsonProperty("lang")] public string Lang { get @@ -51,8 +52,8 @@ public string Lang /// /// The text value. /// - [System.Xml.Serialization.XmlTextAttribute()] - [Newtonsoft.Json.JsonProperty("value")] + [XmlTextAttribute()] + [JsonProperty("value")] public string Value { get diff --git a/Gedcomx.Model/Util/JsonHypermediaLinksConverter.cs b/Gedcomx.Model/Util/JsonHypermediaLinksConverter.cs index 518c6f7..5ff4247 100644 --- a/Gedcomx.Model/Util/JsonHypermediaLinksConverter.cs +++ b/Gedcomx.Model/Util/JsonHypermediaLinksConverter.cs @@ -2,7 +2,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; -using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/Util/JsonIdentifiersConverter.cs b/Gedcomx.Model/Util/JsonIdentifiersConverter.cs index 207aa7b..995fb8d 100644 --- a/Gedcomx.Model/Util/JsonIdentifiersConverter.cs +++ b/Gedcomx.Model/Util/JsonIdentifiersConverter.cs @@ -2,7 +2,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; -using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/Util/JsonUnixTimestampConverter.cs b/Gedcomx.Model/Util/JsonUnixTimestampConverter.cs index ca709f3..49739bd 100644 --- a/Gedcomx.Model/Util/JsonUnixTimestampConverter.cs +++ b/Gedcomx.Model/Util/JsonUnixTimestampConverter.cs @@ -2,8 +2,6 @@ using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; using System; -using System.Xml.Serialization; -using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/Gedcomx.Model/Util/XmlQNameEnumUtil.cs b/Gedcomx.Model/Util/XmlQNameEnumUtil.cs index c0dc6e7..f1e1ad1 100644 --- a/Gedcomx.Model/Util/XmlQNameEnumUtil.cs +++ b/Gedcomx.Model/Util/XmlQNameEnumUtil.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.IO; using System.Linq; using System.Text; diff --git a/Gedcomx.Model/VocabElement.cs b/Gedcomx.Model/VocabElement.cs index a757b2c..ba49369 100644 --- a/Gedcomx.Model/VocabElement.cs +++ b/Gedcomx.Model/VocabElement.cs @@ -1,6 +1,7 @@ using Gx.Common; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; @@ -71,8 +72,8 @@ public String Type } } - [System.Xml.Serialization.XmlIgnore] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public String SortName { get @@ -125,8 +126,8 @@ public String Sublist } } - [System.Xml.Serialization.XmlIgnore] - [Newtonsoft.Json.JsonIgnore] + [XmlIgnore] + [JsonIgnore] public Int32? Position { get diff --git a/Gedcomx.Model/VocabElementList.cs b/Gedcomx.Model/VocabElementList.cs index 9b8416c..b291feb 100644 --- a/Gedcomx.Model/VocabElementList.cs +++ b/Gedcomx.Model/VocabElementList.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/AuthenticationTests.cs b/Gedcomx.Rs.Api.Test/AuthenticationTests.cs index fee6d4f..5673551 100644 --- a/Gedcomx.Rs.Api.Test/AuthenticationTests.cs +++ b/Gedcomx.Rs.Api.Test/AuthenticationTests.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/AuthoritiesTests.cs b/Gedcomx.Rs.Api.Test/AuthoritiesTests.cs index 0f0c076..d7b0f70 100644 --- a/Gedcomx.Rs.Api.Test/AuthoritiesTests.cs +++ b/Gedcomx.Rs.Api.Test/AuthoritiesTests.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/ChangeHistoryTests.cs b/Gedcomx.Rs.Api.Test/ChangeHistoryTests.cs index d694eec..c834fb4 100644 --- a/Gedcomx.Rs.Api.Test/ChangeHistoryTests.cs +++ b/Gedcomx.Rs.Api.Test/ChangeHistoryTests.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/DiscoveryTests.cs b/Gedcomx.Rs.Api.Test/DiscoveryTests.cs index 0ed68b5..fad0c48 100644 --- a/Gedcomx.Rs.Api.Test/DiscoveryTests.cs +++ b/Gedcomx.Rs.Api.Test/DiscoveryTests.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/DiscussionsTests.cs b/Gedcomx.Rs.Api.Test/DiscussionsTests.cs index 6ef54df..5ff5eff 100644 --- a/Gedcomx.Rs.Api.Test/DiscussionsTests.cs +++ b/Gedcomx.Rs.Api.Test/DiscussionsTests.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/Examples/EmmaBocockExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/EmmaBocockExampleTest.cs index c560189..c57b1c4 100644 --- a/Gedcomx.Rs.Api.Test/Examples/EmmaBocockExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/EmmaBocockExampleTest.cs @@ -7,6 +7,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Examples/GeorgeMarthaWashingtonExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/GeorgeMarthaWashingtonExampleTest.cs index 425ea49..b400ef4 100644 --- a/Gedcomx.Rs.Api.Test/Examples/GeorgeMarthaWashingtonExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/GeorgeMarthaWashingtonExampleTest.cs @@ -7,6 +7,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Examples/MiscellaneousFactsExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/MiscellaneousFactsExampleTest.cs index 19c1fab..8c78364 100644 --- a/Gedcomx.Rs.Api.Test/Examples/MiscellaneousFactsExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/MiscellaneousFactsExampleTest.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Examples/NamesExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/NamesExampleTest.cs index 0a5a947..9b1f43c 100644 --- a/Gedcomx.Rs.Api.Test/Examples/NamesExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/NamesExampleTest.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Examples/SamuelHamExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/SamuelHamExampleTest.cs index 2ca2154..82264c3 100644 --- a/Gedcomx.Rs.Api.Test/Examples/SamuelHamExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/SamuelHamExampleTest.cs @@ -7,6 +7,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Examples/WongAloiauExampleTest.cs b/Gedcomx.Rs.Api.Test/Examples/WongAloiauExampleTest.cs index 0cc78df..a163a49 100644 --- a/Gedcomx.Rs.Api.Test/Examples/WongAloiauExampleTest.cs +++ b/Gedcomx.Rs.Api.Test/Examples/WongAloiauExampleTest.cs @@ -7,6 +7,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/GedcomxFileTests.cs b/Gedcomx.Rs.Api.Test/GedcomxFileTests.cs index f570135..1d0a488 100644 --- a/Gedcomx.Rs.Api.Test/GedcomxFileTests.cs +++ b/Gedcomx.Rs.Api.Test/GedcomxFileTests.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Drawing; using System.IO; diff --git a/Gedcomx.Rs.Api.Test/MemoriesTests.cs b/Gedcomx.Rs.Api.Test/MemoriesTests.cs index 990f0b6..397dea6 100644 --- a/Gedcomx.Rs.Api.Test/MemoriesTests.cs +++ b/Gedcomx.Rs.Api.Test/MemoriesTests.cs @@ -7,6 +7,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Drawing; using System.IO; diff --git a/Gedcomx.Rs.Api.Test/NotesTests.cs b/Gedcomx.Rs.Api.Test/NotesTests.cs index bf386fe..d62061b 100644 --- a/Gedcomx.Rs.Api.Test/NotesTests.cs +++ b/Gedcomx.Rs.Api.Test/NotesTests.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/OrdinancesTests.cs b/Gedcomx.Rs.Api.Test/OrdinancesTests.cs index 493e69a..20fe7dc 100644 --- a/Gedcomx.Rs.Api.Test/OrdinancesTests.cs +++ b/Gedcomx.Rs.Api.Test/OrdinancesTests.cs @@ -6,6 +6,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/ParentsAndChildrenTest.cs b/Gedcomx.Rs.Api.Test/ParentsAndChildrenTest.cs index 791336a..769a114 100644 --- a/Gedcomx.Rs.Api.Test/ParentsAndChildrenTest.cs +++ b/Gedcomx.Rs.Api.Test/ParentsAndChildrenTest.cs @@ -6,6 +6,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/PedigreeTests.cs b/Gedcomx.Rs.Api.Test/PedigreeTests.cs index 1471986..62e640a 100644 --- a/Gedcomx.Rs.Api.Test/PedigreeTests.cs +++ b/Gedcomx.Rs.Api.Test/PedigreeTests.cs @@ -6,6 +6,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/PersonSearchTests.cs b/Gedcomx.Rs.Api.Test/PersonSearchTests.cs index 9bf4e30..9c6a312 100644 --- a/Gedcomx.Rs.Api.Test/PersonSearchTests.cs +++ b/Gedcomx.Rs.Api.Test/PersonSearchTests.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/PersonTests.cs b/Gedcomx.Rs.Api.Test/PersonTests.cs index 5343c87..06cf152 100644 --- a/Gedcomx.Rs.Api.Test/PersonTests.cs +++ b/Gedcomx.Rs.Api.Test/PersonTests.cs @@ -13,6 +13,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Drawing; using System.Linq; diff --git a/Gedcomx.Rs.Api.Test/PlacesTests.cs b/Gedcomx.Rs.Api.Test/PlacesTests.cs index 868dc72..3239746 100644 --- a/Gedcomx.Rs.Api.Test/PlacesTests.cs +++ b/Gedcomx.Rs.Api.Test/PlacesTests.cs @@ -6,6 +6,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/RelationshipTests.cs b/Gedcomx.Rs.Api.Test/RelationshipTests.cs index 0ec1cef..9e1dc55 100644 --- a/Gedcomx.Rs.Api.Test/RelationshipTests.cs +++ b/Gedcomx.Rs.Api.Test/RelationshipTests.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api.Test/Resources.Designer.cs b/Gedcomx.Rs.Api.Test/Resources.Designer.cs index 6d17e5b..66e9bd3 100644 --- a/Gedcomx.Rs.Api.Test/Resources.Designer.cs +++ b/Gedcomx.Rs.Api.Test/Resources.Designer.cs @@ -11,6 +11,7 @@ namespace Gedcomx.Rs.Api.Test { using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; diff --git a/Gedcomx.Rs.Api.Test/SearchAndMatchTests.cs b/Gedcomx.Rs.Api.Test/SearchAndMatchTests.cs index 4ae6620..b8699c1 100644 --- a/Gedcomx.Rs.Api.Test/SearchAndMatchTests.cs +++ b/Gedcomx.Rs.Api.Test/SearchAndMatchTests.cs @@ -7,6 +7,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Net; using System.Threading; diff --git a/Gedcomx.Rs.Api.Test/SourceBoxTests.cs b/Gedcomx.Rs.Api.Test/SourceBoxTests.cs index 703c2c6..53e61c1 100644 --- a/Gedcomx.Rs.Api.Test/SourceBoxTests.cs +++ b/Gedcomx.Rs.Api.Test/SourceBoxTests.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/SourcesTests.cs b/Gedcomx.Rs.Api.Test/SourcesTests.cs index e79cfe5..1cdd336 100644 --- a/Gedcomx.Rs.Api.Test/SourcesTests.cs +++ b/Gedcomx.Rs.Api.Test/SourcesTests.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/SpouseTests.cs b/Gedcomx.Rs.Api.Test/SpouseTests.cs index b5dee07..6e2b3ef 100644 --- a/Gedcomx.Rs.Api.Test/SpouseTests.cs +++ b/Gedcomx.Rs.Api.Test/SpouseTests.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/TestBacking.cs b/Gedcomx.Rs.Api.Test/TestBacking.cs index e5f9364..8a2e166 100644 --- a/Gedcomx.Rs.Api.Test/TestBacking.cs +++ b/Gedcomx.Rs.Api.Test/TestBacking.cs @@ -10,6 +10,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Drawing; using System.IO; diff --git a/Gedcomx.Rs.Api.Test/UserTests.cs b/Gedcomx.Rs.Api.Test/UserTests.cs index 796a7af..16e5d5e 100644 --- a/Gedcomx.Rs.Api.Test/UserTests.cs +++ b/Gedcomx.Rs.Api.Test/UserTests.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api.Test/UtilitiesTests.cs b/Gedcomx.Rs.Api.Test/UtilitiesTests.cs index 2bafd70..a62e0c9 100644 --- a/Gedcomx.Rs.Api.Test/UtilitiesTests.cs +++ b/Gedcomx.Rs.Api.Test/UtilitiesTests.cs @@ -4,6 +4,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; @@ -12,7 +13,6 @@ using Gedcomx.Support; using Newtonsoft.Json.Linq; using FamilySearch.Api.Ft; -using Newtonsoft.Json; using System.Net; using Gx.Fs; diff --git a/Gedcomx.Rs.Api.Test/VocabulariesTests.cs b/Gedcomx.Rs.Api.Test/VocabulariesTests.cs index 2e4b297..0358a23 100644 --- a/Gedcomx.Rs.Api.Test/VocabulariesTests.cs +++ b/Gedcomx.Rs.Api.Test/VocabulariesTests.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/AgentState.cs b/Gedcomx.Rs.Api/AgentState.cs index cc27715..36a08c9 100644 --- a/Gedcomx.Rs.Api/AgentState.cs +++ b/Gedcomx.Rs.Api/AgentState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/AncestryResultsState.cs b/Gedcomx.Rs.Api/AncestryResultsState.cs index cdfebe5..ba9f6ab 100644 --- a/Gedcomx.Rs.Api/AncestryResultsState.cs +++ b/Gedcomx.Rs.Api/AncestryResultsState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/CollectionState.cs b/Gedcomx.Rs.Api/CollectionState.cs index add7eb3..8f970f0 100644 --- a/Gedcomx.Rs.Api/CollectionState.cs +++ b/Gedcomx.Rs.Api/CollectionState.cs @@ -10,6 +10,7 @@ using RestSharp.Deserializers; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Gedcomx.Rs.Api/CollectionsState.cs b/Gedcomx.Rs.Api/CollectionsState.cs index 834324d..87bbddb 100644 --- a/Gedcomx.Rs.Api/CollectionsState.cs +++ b/Gedcomx.Rs.Api/CollectionsState.cs @@ -5,6 +5,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/DescendancyResultsState.cs b/Gedcomx.Rs.Api/DescendancyResultsState.cs index 8b61e34..ac4620d 100644 --- a/Gedcomx.Rs.Api/DescendancyResultsState.cs +++ b/Gedcomx.Rs.Api/DescendancyResultsState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/GedcomxApplicationException.cs b/Gedcomx.Rs.Api/GedcomxApplicationException.cs index 3f98398..f14fcaa 100644 --- a/Gedcomx.Rs.Api/GedcomxApplicationException.cs +++ b/Gedcomx.Rs.Api/GedcomxApplicationException.cs @@ -3,6 +3,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; diff --git a/Gedcomx.Rs.Api/GedcomxApplicationState.cs b/Gedcomx.Rs.Api/GedcomxApplicationState.cs index 6eca83b..ae34bcd 100644 --- a/Gedcomx.Rs.Api/GedcomxApplicationState.cs +++ b/Gedcomx.Rs.Api/GedcomxApplicationState.cs @@ -1,5 +1,5 @@ using System; -using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using RestSharp; using System.Text; @@ -8,7 +8,6 @@ using Gx.Links; using System.Net; using System.Linq; -using Newtonsoft.Json; using Gx.Records; using Gx.Common; using Gedcomx.Model; diff --git a/Gedcomx.Rs.Api/IPreferredRelationshipState.cs b/Gedcomx.Rs.Api/IPreferredRelationshipState.cs index 125b7f9..2bb1c70 100644 --- a/Gedcomx.Rs.Api/IPreferredRelationshipState.cs +++ b/Gedcomx.Rs.Api/IPreferredRelationshipState.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/IStateTransitionOption.cs b/Gedcomx.Rs.Api/IStateTransitionOption.cs index 57393d9..7488acf 100644 --- a/Gedcomx.Rs.Api/IStateTransitionOption.cs +++ b/Gedcomx.Rs.Api/IStateTransitionOption.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Options/CacheDirectives.cs b/Gedcomx.Rs.Api/Options/CacheDirectives.cs index 2cf7686..b94e1b6 100644 --- a/Gedcomx.Rs.Api/Options/CacheDirectives.cs +++ b/Gedcomx.Rs.Api/Options/CacheDirectives.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Options/HeaderParameter.cs b/Gedcomx.Rs.Api/Options/HeaderParameter.cs index 9813dbc..03bf742 100644 --- a/Gedcomx.Rs.Api/Options/HeaderParameter.cs +++ b/Gedcomx.Rs.Api/Options/HeaderParameter.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Options/Preconditions.cs b/Gedcomx.Rs.Api/Options/Preconditions.cs index 785eb30..908083c 100644 --- a/Gedcomx.Rs.Api/Options/Preconditions.cs +++ b/Gedcomx.Rs.Api/Options/Preconditions.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Options/QueryParameter.cs b/Gedcomx.Rs.Api/Options/QueryParameter.cs index e2aee8a..93701a6 100644 --- a/Gedcomx.Rs.Api/Options/QueryParameter.cs +++ b/Gedcomx.Rs.Api/Options/QueryParameter.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonChildrenState.cs b/Gedcomx.Rs.Api/PersonChildrenState.cs index f7f6e57..5d2ed1c 100644 --- a/Gedcomx.Rs.Api/PersonChildrenState.cs +++ b/Gedcomx.Rs.Api/PersonChildrenState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonParentsState.cs b/Gedcomx.Rs.Api/PersonParentsState.cs index 24f338d..0bf00c9 100644 --- a/Gedcomx.Rs.Api/PersonParentsState.cs +++ b/Gedcomx.Rs.Api/PersonParentsState.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonSearchResultsState.cs b/Gedcomx.Rs.Api/PersonSearchResultsState.cs index 96cd6e6..f11e1b8 100644 --- a/Gedcomx.Rs.Api/PersonSearchResultsState.cs +++ b/Gedcomx.Rs.Api/PersonSearchResultsState.cs @@ -4,6 +4,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonSpousesState.cs b/Gedcomx.Rs.Api/PersonSpousesState.cs index 8d26d4a..55cf7f2 100644 --- a/Gedcomx.Rs.Api/PersonSpousesState.cs +++ b/Gedcomx.Rs.Api/PersonSpousesState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonState.cs b/Gedcomx.Rs.Api/PersonState.cs index daa44af..00c446e 100644 --- a/Gedcomx.Rs.Api/PersonState.cs +++ b/Gedcomx.Rs.Api/PersonState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PersonsState.cs b/Gedcomx.Rs.Api/PersonsState.cs index 952b0d5..73edda2 100644 --- a/Gedcomx.Rs.Api/PersonsState.cs +++ b/Gedcomx.Rs.Api/PersonsState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PlaceDescriptionState.cs b/Gedcomx.Rs.Api/PlaceDescriptionState.cs index ba38b55..4e6c7fe 100644 --- a/Gedcomx.Rs.Api/PlaceDescriptionState.cs +++ b/Gedcomx.Rs.Api/PlaceDescriptionState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PlaceDescriptionsState.cs b/Gedcomx.Rs.Api/PlaceDescriptionsState.cs index 1ebaceb..59c4b3d 100644 --- a/Gedcomx.Rs.Api/PlaceDescriptionsState.cs +++ b/Gedcomx.Rs.Api/PlaceDescriptionsState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PlaceGroupState.cs b/Gedcomx.Rs.Api/PlaceGroupState.cs index 9b6cf03..394edf1 100644 --- a/Gedcomx.Rs.Api/PlaceGroupState.cs +++ b/Gedcomx.Rs.Api/PlaceGroupState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/PlaceSearchResultsState.cs b/Gedcomx.Rs.Api/PlaceSearchResultsState.cs index 3da61b8..8040cf1 100644 --- a/Gedcomx.Rs.Api/PlaceSearchResultsState.cs +++ b/Gedcomx.Rs.Api/PlaceSearchResultsState.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/RecordState.cs b/Gedcomx.Rs.Api/RecordState.cs index ee941de..b26f096 100644 --- a/Gedcomx.Rs.Api/RecordState.cs +++ b/Gedcomx.Rs.Api/RecordState.cs @@ -3,6 +3,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/RecordsState.cs b/Gedcomx.Rs.Api/RecordsState.cs index 8a985a5..9f4577d 100644 --- a/Gedcomx.Rs.Api/RecordsState.cs +++ b/Gedcomx.Rs.Api/RecordsState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Rel.cs b/Gedcomx.Rs.Api/Rel.cs index 061632a..9abb8dc 100644 --- a/Gedcomx.Rs.Api/Rel.cs +++ b/Gedcomx.Rs.Api/Rel.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/RelationshipState.cs b/Gedcomx.Rs.Api/RelationshipState.cs index a31b3ad..298d5b8 100644 --- a/Gedcomx.Rs.Api/RelationshipState.cs +++ b/Gedcomx.Rs.Api/RelationshipState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/RelationshipsState.cs b/Gedcomx.Rs.Api/RelationshipsState.cs index 5acc66e..ecf511d 100644 --- a/Gedcomx.Rs.Api/RelationshipsState.cs +++ b/Gedcomx.Rs.Api/RelationshipsState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/SourceDescriptionState.cs b/Gedcomx.Rs.Api/SourceDescriptionState.cs index f65227a..531576d 100644 --- a/Gedcomx.Rs.Api/SourceDescriptionState.cs +++ b/Gedcomx.Rs.Api/SourceDescriptionState.cs @@ -3,6 +3,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/SourceDescriptionsState.cs b/Gedcomx.Rs.Api/SourceDescriptionsState.cs index 60df472..278e0cc 100644 --- a/Gedcomx.Rs.Api/SourceDescriptionsState.cs +++ b/Gedcomx.Rs.Api/SourceDescriptionsState.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/StateFactory.cs b/Gedcomx.Rs.Api/StateFactory.cs index c045631..52fc92a 100644 --- a/Gedcomx.Rs.Api/StateFactory.cs +++ b/Gedcomx.Rs.Api/StateFactory.cs @@ -2,6 +2,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/AncestryTree.cs b/Gedcomx.Rs.Api/Util/AncestryTree.cs index 9512e16..b02e126 100644 --- a/Gedcomx.Rs.Api/Util/AncestryTree.cs +++ b/Gedcomx.Rs.Api/Util/AncestryTree.cs @@ -1,6 +1,7 @@ using Gx.Conclusion; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/BasicDataSource.cs b/Gedcomx.Rs.Api/Util/BasicDataSource.cs index 78e217b..298b454 100644 --- a/Gedcomx.Rs.Api/Util/BasicDataSource.cs +++ b/Gedcomx.Rs.Api/Util/BasicDataSource.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Gedcomx.Rs.Api/Util/DescendancyTree.cs b/Gedcomx.Rs.Api/Util/DescendancyTree.cs index 8301d1f..146e7ec 100644 --- a/Gedcomx.Rs.Api/Util/DescendancyTree.cs +++ b/Gedcomx.Rs.Api/Util/DescendancyTree.cs @@ -1,6 +1,7 @@ using Gx.Conclusion; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/EmbeddedLinkLoader.cs b/Gedcomx.Rs.Api/Util/EmbeddedLinkLoader.cs index bf1de3e..f569c39 100644 --- a/Gedcomx.Rs.Api/Util/EmbeddedLinkLoader.cs +++ b/Gedcomx.Rs.Api/Util/EmbeddedLinkLoader.cs @@ -2,6 +2,7 @@ using Gx.Links; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/FileDataSource.cs b/Gedcomx.Rs.Api/Util/FileDataSource.cs index ba49de5..5c508e9 100644 --- a/Gedcomx.Rs.Api/Util/FileDataSource.cs +++ b/Gedcomx.Rs.Api/Util/FileDataSource.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Gedcomx.Rs.Api/Util/FilterableRestClient.cs b/Gedcomx.Rs.Api/Util/FilterableRestClient.cs index b6cb755..546b3d9 100644 --- a/Gedcomx.Rs.Api/Util/FilterableRestClient.cs +++ b/Gedcomx.Rs.Api/Util/FilterableRestClient.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/GedcomxBaseSearchQueryBuilder.cs b/Gedcomx.Rs.Api/Util/GedcomxBaseSearchQueryBuilder.cs index bad5eff..189c4c5 100644 --- a/Gedcomx.Rs.Api/Util/GedcomxBaseSearchQueryBuilder.cs +++ b/Gedcomx.Rs.Api/Util/GedcomxBaseSearchQueryBuilder.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/GedcomxPersonSearchQueryBuilder.cs b/Gedcomx.Rs.Api/Util/GedcomxPersonSearchQueryBuilder.cs index ae67ebc..76fce58 100644 --- a/Gedcomx.Rs.Api/Util/GedcomxPersonSearchQueryBuilder.cs +++ b/Gedcomx.Rs.Api/Util/GedcomxPersonSearchQueryBuilder.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/GedcomxPlaceSearchQueryBuilder.cs b/Gedcomx.Rs.Api/Util/GedcomxPlaceSearchQueryBuilder.cs index a8247c4..5ce4f5c 100644 --- a/Gedcomx.Rs.Api/Util/GedcomxPlaceSearchQueryBuilder.cs +++ b/Gedcomx.Rs.Api/Util/GedcomxPlaceSearchQueryBuilder.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/HttpWarning.cs b/Gedcomx.Rs.Api/Util/HttpWarning.cs index 25b9ce9..5a5fa56 100644 --- a/Gedcomx.Rs.Api/Util/HttpWarning.cs +++ b/Gedcomx.Rs.Api/Util/HttpWarning.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/HypermediaEnabledDataExtensions.cs b/Gedcomx.Rs.Api/Util/HypermediaEnabledDataExtensions.cs index c71a65b..4003733 100644 --- a/Gedcomx.Rs.Api/Util/HypermediaEnabledDataExtensions.cs +++ b/Gedcomx.Rs.Api/Util/HypermediaEnabledDataExtensions.cs @@ -1,6 +1,7 @@ using Gx.Links; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/IDataSource.cs b/Gedcomx.Rs.Api/Util/IDataSource.cs index afbd6e4..47b6498 100644 --- a/Gedcomx.Rs.Api/Util/IDataSource.cs +++ b/Gedcomx.Rs.Api/Util/IDataSource.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/Gedcomx.Rs.Api/Util/IFilter.cs b/Gedcomx.Rs.Api/Util/IFilter.cs index bf71e0e..bc4c033 100644 --- a/Gedcomx.Rs.Api/Util/IFilter.cs +++ b/Gedcomx.Rs.Api/Util/IFilter.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/IFilterableRestClient.cs b/Gedcomx.Rs.Api/Util/IFilterableRestClient.cs index 4398201..d40922f 100644 --- a/Gedcomx.Rs.Api/Util/IFilterableRestClient.cs +++ b/Gedcomx.Rs.Api/Util/IFilterableRestClient.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/LinkParserExtensions.cs b/Gedcomx.Rs.Api/Util/LinkParserExtensions.cs index 00b9ef7..3244f40 100644 --- a/Gedcomx.Rs.Api/Util/LinkParserExtensions.cs +++ b/Gedcomx.Rs.Api/Util/LinkParserExtensions.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/Log4NetLoggingFilter.cs b/Gedcomx.Rs.Api/Util/Log4NetLoggingFilter.cs index c94fa92..08f1347 100644 --- a/Gedcomx.Rs.Api/Util/Log4NetLoggingFilter.cs +++ b/Gedcomx.Rs.Api/Util/Log4NetLoggingFilter.cs @@ -3,6 +3,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/PagedFeedEnumerator.cs b/Gedcomx.Rs.Api/Util/PagedFeedEnumerator.cs index 1abb56a..e2dda04 100644 --- a/Gedcomx.Rs.Api/Util/PagedFeedEnumerator.cs +++ b/Gedcomx.Rs.Api/Util/PagedFeedEnumerator.cs @@ -4,6 +4,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Net; diff --git a/Gedcomx.Rs.Api/Util/RdfExtensions.cs b/Gedcomx.Rs.Api/Util/RdfExtensions.cs index 1adb75b..f9e8c28 100644 --- a/Gedcomx.Rs.Api/Util/RdfExtensions.cs +++ b/Gedcomx.Rs.Api/Util/RdfExtensions.cs @@ -1,6 +1,7 @@ using JsonLD.Core; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/RedirectableRestRequest.cs b/Gedcomx.Rs.Api/Util/RedirectableRestRequest.cs index a18bb76..bd657b3 100644 --- a/Gedcomx.Rs.Api/Util/RedirectableRestRequest.cs +++ b/Gedcomx.Rs.Api/Util/RedirectableRestRequest.cs @@ -1,6 +1,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/RestClientExtensions.cs b/Gedcomx.Rs.Api/Util/RestClientExtensions.cs index bc5d7c4..0ad93aa 100644 --- a/Gedcomx.Rs.Api/Util/RestClientExtensions.cs +++ b/Gedcomx.Rs.Api/Util/RestClientExtensions.cs @@ -1,11 +1,9 @@ using RestSharp; using System; -using System.Xml.Serialization; using System.Collections.Generic; using System.Linq; using System.Text; using RestSharp.Extensions; -using Newtonsoft.Json; using Gedcomx.Model.Util; using System.IO; using Gedcomx.File; diff --git a/Gedcomx.Rs.Api/Util/ServiceHelper.cs b/Gedcomx.Rs.Api/Util/ServiceHelper.cs index ca6cb8e..940feda 100644 --- a/Gedcomx.Rs.Api/Util/ServiceHelper.cs +++ b/Gedcomx.Rs.Api/Util/ServiceHelper.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/UriExtensions.cs b/Gedcomx.Rs.Api/Util/UriExtensions.cs index 2df15e0..99d836f 100644 --- a/Gedcomx.Rs.Api/Util/UriExtensions.cs +++ b/Gedcomx.Rs.Api/Util/UriExtensions.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/Util/UriTemplateExtensions.cs b/Gedcomx.Rs.Api/Util/UriTemplateExtensions.cs index 47bc360..560cd65 100644 --- a/Gedcomx.Rs.Api/Util/UriTemplateExtensions.cs +++ b/Gedcomx.Rs.Api/Util/UriTemplateExtensions.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using System.Text; using Tavis.UriTemplates; diff --git a/Gedcomx.Rs.Api/Util/VocabConstants.cs b/Gedcomx.Rs.Api/Util/VocabConstants.cs index fa76fab..4fdf578 100644 --- a/Gedcomx.Rs.Api/Util/VocabConstants.cs +++ b/Gedcomx.Rs.Api/Util/VocabConstants.cs @@ -1,5 +1,6 @@ using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/VocabElementListState.cs b/Gedcomx.Rs.Api/VocabElementListState.cs index 20e6bc2..bd8e5b5 100644 --- a/Gedcomx.Rs.Api/VocabElementListState.cs +++ b/Gedcomx.Rs.Api/VocabElementListState.cs @@ -6,6 +6,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Rs.Api/VocabElementState.cs b/Gedcomx.Rs.Api/VocabElementState.cs index 4205a17..b75609d 100644 --- a/Gedcomx.Rs.Api/VocabElementState.cs +++ b/Gedcomx.Rs.Api/VocabElementState.cs @@ -6,6 +6,7 @@ using RestSharp; using System; using System.Xml.Serialization; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Gedcomx.Util/GedcomxModelVisitorBase.cs b/Gedcomx.Util/GedcomxModelVisitorBase.cs index b24495b..909c353 100644 --- a/Gedcomx.Util/GedcomxModelVisitorBase.cs +++ b/Gedcomx.Util/GedcomxModelVisitorBase.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using Gx; using Gx.Agent; using Gx.Common; diff --git a/Gedcomx.Util/IGedcomxModelVisitor.cs b/Gedcomx.Util/IGedcomxModelVisitor.cs index 9378b48..d794c6a 100644 --- a/Gedcomx.Util/IGedcomxModelVisitor.cs +++ b/Gedcomx.Util/IGedcomxModelVisitor.cs @@ -1,6 +1,4 @@ using System; -using System.Xml.Serialization; -using System.Collections.Generic; using Gx; using Gx.Agent; using Gx.Common; diff --git a/Gedcomx.Util/RecordHelper.cs b/Gedcomx.Util/RecordHelper.cs index 087627c..d587f63 100644 --- a/Gedcomx.Util/RecordHelper.cs +++ b/Gedcomx.Util/RecordHelper.cs @@ -3,7 +3,6 @@ using Gx.Source; using Gx.Types; using System; -using System.Xml.Serialization; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Data; @@ -205,12 +204,12 @@ public override void VisitSourceDescription(SourceDescription sourceDescription) _currentRecord["IMAGE_URI"] = sourceDescription.About; } - if (sourceDescription.KnownResourceType == ResourceType.Record) - { - var identifyer = sourceDescription.Identifiers.Where(p => p.KnownType == IdentifierType.Persistent).FirstOrDefault(); - _columnNames.Add("RECORD_IDENTIFER"); - _currentRecord["RECORD_IDENTIFER"] = identifyer != null ? identifyer.Value : ""; - } + if (sourceDescription.KnownResourceType == ResourceType.Record) + { + var identifyer = sourceDescription.Identifiers.Where(p => p.KnownType == IdentifierType.Persistent).FirstOrDefault(); + _columnNames.Add("RECORD_IDENTIFER"); + _currentRecord["RECORD_IDENTIFER"] = identifyer != null ? identifyer.Value : ""; + } base.VisitSourceDescription(sourceDescription); } From 08013564ec7ec9001d4cfc22b53f01b4b012612c Mon Sep 17 00:00:00 2001 From: Shimmy Weitzhandler Date: Fri, 27 Jan 2017 02:13:23 +0200 Subject: [PATCH 3/3] A bit more cleanup to the Person file. --- Gedcomx.Model/Person.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gedcomx.Model/Person.cs b/Gedcomx.Model/Person.cs index 85767cd..2ae9e66 100644 --- a/Gedcomx.Model/Person.cs +++ b/Gedcomx.Model/Person.cs @@ -234,7 +234,7 @@ public DisplayProperties DisplayExtension /// [XmlElement(ElementName = "discussion-references", Namespace = "http://gedcomx.org/v1/")] [JsonProperty("discussion-references")] - public List DiscussionReferences + public List DiscussionReferences { get {