STU3: Behavior of PocoStuctureDefinitionSummaryProvider is now the same as StuctureDefinitionSummaryProvider

src/Hl7.Fhir.Core.Tests/Serialization/SummarySerializationTests.cs

@@ -354,7 +354,7 @@ public async T.Task TestResourceWithSummary()
                 var actualData = inJson ? await FhirJsonSerializer.SerializeToStringAsync(patientOne, mode) :
                                     await FhirXmlSerializer.SerializeToStringAsync(patientOne, mode);
                 var expectedData = TestDataHelper.ReadTestData(expectedFile);
-                Assert.AreEqual(expectedData, actualData);
+                Assert.AreEqual(expectedData, actualData, $"SummaryType.{mode} in file {pair.Key}");
             }
         }
 

src/Hl7.Fhir.Core/Model/Generated/Account.cs

@@ -426,7 +426,7 @@ public List<Hl7.Fhir.Model.Identifier> Identifier
     /// <summary>
     /// active | inactive | entered-in-error
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=100)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.Account.AccountStatus> StatusElement

src/Hl7.Fhir.Core/Model/Generated/ActivityDefinition.cs

@@ -594,7 +594,7 @@ public string Title
     /// <summary>
     /// draft | active | retired | unknown
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=140)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=140)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]
@@ -627,7 +627,7 @@ public Hl7.Fhir.Model.PublicationStatus? Status
     /// <summary>
     /// For testing purposes, not real usage
     /// </summary>
-    [FhirElement("experimental", InSummary=true, Order=150)]
+    [FhirElement("experimental", InSummary=true, IsModifier=true, Order=150)]
     [DataMember]
     public Hl7.Fhir.Model.FhirBoolean ExperimentalElement
     {

src/Hl7.Fhir.Core/Model/Generated/Address.cs

@@ -120,7 +120,7 @@ public enum AddressType
     /// <summary>
     /// home | work | temp | old - purpose of this address
     /// </summary>
-    [FhirElement("use", InSummary=true, Order=30)]
+    [FhirElement("use", InSummary=true, IsModifier=true, Order=30)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.Address.AddressUse> UseElement

src/Hl7.Fhir.Core/Model/Generated/AllergyIntolerance.cs

@@ -544,7 +544,7 @@ public List<Hl7.Fhir.Model.Identifier> Identifier
     /// <summary>
     /// active | inactive | resolved
     /// </summary>
-    [FhirElement("clinicalStatus", InSummary=true, Order=100)]
+    [FhirElement("clinicalStatus", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.AllergyIntolerance.AllergyIntoleranceClinicalStatus> ClinicalStatusElement
@@ -576,7 +576,7 @@ public Hl7.Fhir.Model.AllergyIntolerance.AllergyIntoleranceClinicalStatus? Clini
     /// <summary>
     /// unconfirmed | confirmed | refuted | entered-in-error
     /// </summary>
-    [FhirElement("verificationStatus", InSummary=true, Order=110)]
+    [FhirElement("verificationStatus", InSummary=true, IsModifier=true, Order=110)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]

src/Hl7.Fhir.Core/Model/Generated/Appointment.cs

@@ -375,7 +375,7 @@ public List<Hl7.Fhir.Model.Identifier> Identifier
     /// <summary>
     /// proposed | pending | booked | arrived | fulfilled | cancelled | noshow | entered-in-error
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=100)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]

src/Hl7.Fhir.Core/Model/Generated/AppointmentResponse.cs

@@ -179,7 +179,7 @@ public Hl7.Fhir.Model.ResourceReference Actor
     /// <summary>
     /// accepted | declined | tentative | in-process | completed | needs-action | entered-in-error
     /// </summary>
-    [FhirElement("participantStatus", InSummary=true, Order=150)]
+    [FhirElement("participantStatus", InSummary=true, IsModifier=true, Order=150)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]

src/Hl7.Fhir.Core/Model/Generated/Basic.cs

@@ -72,7 +72,7 @@ public List<Hl7.Fhir.Model.Identifier> Identifier
     /// <summary>
     /// Kind of Resource
     /// </summary>
-    [FhirElement("code", InSummary=true, Order=100)]
+    [FhirElement("code", InSummary=true, IsModifier=true, Order=100)]
     [Cardinality(Min=1,Max=1)]
     [DataMember]
     public Hl7.Fhir.Model.CodeableConcept Code

src/Hl7.Fhir.Core/Model/Generated/BodySite.cs

@@ -72,7 +72,7 @@ public List<Hl7.Fhir.Model.Identifier> Identifier
     /// <summary>
     /// Whether this body site record is in active use
     /// </summary>
-    [FhirElement("active", InSummary=true, Order=100)]
+    [FhirElement("active", InSummary=true, IsModifier=true, Order=100)]
     [DataMember]
     public Hl7.Fhir.Model.FhirBoolean ActiveElement
     {

src/Hl7.Fhir.Core/Model/Generated/CapabilityStatement.cs

@@ -4047,7 +4047,7 @@ public string Title
     /// <summary>
     /// draft | active | retired | unknown
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=130)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=130)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]
@@ -4080,7 +4080,7 @@ public Hl7.Fhir.Model.PublicationStatus? Status
     /// <summary>
     /// For testing purposes, not real usage
     /// </summary>
-    [FhirElement("experimental", InSummary=true, Order=140)]
+    [FhirElement("experimental", InSummary=true, IsModifier=true, Order=140)]
     [DataMember]
     public Hl7.Fhir.Model.FhirBoolean ExperimentalElement
     {

src/Hl7.Fhir.Core/Model/Generated/CarePlan.cs

@@ -501,7 +501,7 @@ public List<Hl7.Fhir.Model.ResourceReference> Goal
       /// <summary>
       /// not-started | scheduled | in-progress | on-hold | completed | cancelled | unknown
       /// </summary>
-      [FhirElement("status", InSummary=true, Order=100)]
+      [FhirElement("status", IsModifier=true, Order=100)]
       [DeclaredType(Type = typeof(Code))]
       [Cardinality(Min=1,Max=1)]
       [DataMember]
@@ -565,7 +565,7 @@ public string StatusReason
       /// <summary>
       /// Do NOT do
       /// </summary>
-      [FhirElement("prohibited", InSummary=true, Order=120)]
+      [FhirElement("prohibited", IsModifier=true, Order=120)]
       [DataMember]
       public Hl7.Fhir.Model.FhirBoolean ProhibitedElement
       {
@@ -1011,7 +1011,7 @@ public List<Hl7.Fhir.Model.ResourceReference> PartOf
     /// <summary>
     /// draft | active | suspended | completed | entered-in-error | cancelled | unknown
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=140)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=140)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]
@@ -1044,7 +1044,7 @@ public Hl7.Fhir.Model.CarePlan.CarePlanStatus? Status
     /// <summary>
     /// proposal | plan | order | option
     /// </summary>
-    [FhirElement("intent", InSummary=true, Order=150)]
+    [FhirElement("intent", InSummary=true, IsModifier=true, Order=150)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]

src/Hl7.Fhir.Core/Model/Generated/CareTeam.cs

@@ -291,7 +291,7 @@ public List<Hl7.Fhir.Model.Identifier> Identifier
     /// <summary>
     /// proposed | active | suspended | inactive | entered-in-error
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=100)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.CareTeam.CareTeamStatus> StatusElement

src/Hl7.Fhir.Core/Model/Generated/ChargeItem.cs

@@ -289,7 +289,7 @@ public IEnumerable<string> Definition
     /// <summary>
     /// planned | billable | not-billable | aborted | billed | entered-in-error | unknown
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=110)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=110)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]

src/Hl7.Fhir.Core/Model/Generated/Claim.cs

@@ -3211,7 +3211,7 @@ public List<Hl7.Fhir.Model.Identifier> Identifier
     /// <summary>
     /// active | cancelled | draft | entered-in-error
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=100)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.FinancialResourceStatusCodes> StatusElement

src/Hl7.Fhir.Core/Model/Generated/ClaimResponse.cs

@@ -2453,7 +2453,7 @@ public List<Hl7.Fhir.Model.Identifier> Identifier
     /// <summary>
     /// active | cancelled | draft | entered-in-error
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=100)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.FinancialResourceStatusCodes> StatusElement

src/Hl7.Fhir.Core/Model/Generated/ClinicalImpression.cs

@@ -388,7 +388,7 @@ public List<Hl7.Fhir.Model.Identifier> Identifier
     /// <summary>
     /// draft | completed | entered-in-error
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=100)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]

src/Hl7.Fhir.Core/Model/Generated/CodeSystem.cs

@@ -1430,7 +1430,7 @@ public string Title
     /// <summary>
     /// draft | active | retired | unknown
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=140)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=140)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]
@@ -1463,7 +1463,7 @@ public Hl7.Fhir.Model.PublicationStatus? Status
     /// <summary>
     /// For testing purposes, not real usage
     /// </summary>
-    [FhirElement("experimental", InSummary=true, Order=150)]
+    [FhirElement("experimental", InSummary=true, IsModifier=true, Order=150)]
     [DataMember]
     public Hl7.Fhir.Model.FhirBoolean ExperimentalElement
     {

src/Hl7.Fhir.Core/Model/Generated/Communication.cs

@@ -233,7 +233,7 @@ public List<Hl7.Fhir.Model.ResourceReference> PartOf
     /// <summary>
     /// preparation | in-progress | suspended | aborted | completed | entered-in-error
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=130)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=130)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]
@@ -266,7 +266,7 @@ public Hl7.Fhir.Model.EventStatus? Status
     /// <summary>
     /// Communication did not occur
     /// </summary>
-    [FhirElement("notDone", InSummary=true, Order=140)]
+    [FhirElement("notDone", InSummary=true, IsModifier=true, Order=140)]
     [DataMember]
     public Hl7.Fhir.Model.FhirBoolean NotDoneElement
     {

src/Hl7.Fhir.Core/Model/Generated/CommunicationRequest.cs

@@ -366,7 +366,7 @@ public Hl7.Fhir.Model.Identifier GroupIdentifier
     /// <summary>
     /// draft | active | suspended | cancelled | completed | entered-in-error | unknown
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=130)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=130)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]

src/Hl7.Fhir.Core/Model/Generated/CompartmentDefinition.cs

@@ -363,7 +363,7 @@ public string Title
     /// <summary>
     /// draft | active | retired | unknown
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=120)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=120)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]
@@ -396,7 +396,7 @@ public Hl7.Fhir.Model.PublicationStatus? Status
     /// <summary>
     /// For testing purposes, not real usage
     /// </summary>
-    [FhirElement("experimental", InSummary=true, Order=130)]
+    [FhirElement("experimental", InSummary=true, IsModifier=true, Order=130)]
     [DataMember]
     public Hl7.Fhir.Model.FhirBoolean ExperimentalElement
     {

src/Hl7.Fhir.Core/Model/Generated/Composition.cs

@@ -764,7 +764,7 @@ public Hl7.Fhir.Model.Narrative Text
       /// <summary>
       /// working | snapshot | changes
       /// </summary>
-      [FhirElement("mode", InSummary=true, Order=70)]
+      [FhirElement("mode", InSummary=true, IsModifier=true, Order=70)]
       [DeclaredType(Type = typeof(Code))]
       [DataMember]
       public Code<Hl7.Fhir.Model.ListMode> ModeElement
@@ -1011,7 +1011,7 @@ public Hl7.Fhir.Model.Identifier Identifier
     /// <summary>
     /// preliminary | final | amended | entered-in-error
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=100)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]
@@ -1182,7 +1182,7 @@ public string Title
     /// <summary>
     /// As defined by affinity domain
     /// </summary>
-    [FhirElement("confidentiality", InSummary=true, Order=180)]
+    [FhirElement("confidentiality", InSummary=true, IsModifier=true, Order=180)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.Composition.ConfidentialityClassification> ConfidentialityElement

src/Hl7.Fhir.Core/Model/Generated/ConceptMap.cs

@@ -713,7 +713,7 @@ public string Display
       /// <summary>
       /// relatedto | equivalent | equal | wider | subsumes | narrower | specializes | inexact | unmatched | disjoint
       /// </summary>
-      [FhirElement("equivalence", InSummary=true, Order=60)]
+      [FhirElement("equivalence", IsModifier=true, Order=60)]
       [DeclaredType(Type = typeof(Code))]
       [DataMember]
       public Code<Hl7.Fhir.Model.ConceptMap.ConceptMapEquivalence> EquivalenceElement
@@ -1567,7 +1567,7 @@ public string Title
     /// <summary>
     /// draft | active | retired | unknown
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=140)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=140)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]
@@ -1600,7 +1600,7 @@ public Hl7.Fhir.Model.PublicationStatus? Status
     /// <summary>
     /// For testing purposes, not real usage
     /// </summary>
-    [FhirElement("experimental", InSummary=true, Order=150)]
+    [FhirElement("experimental", InSummary=true, IsModifier=true, Order=150)]
     [DataMember]
     public Hl7.Fhir.Model.FhirBoolean ExperimentalElement
     {

src/Hl7.Fhir.Core/Model/Generated/Condition.cs

@@ -427,7 +427,7 @@ public List<Hl7.Fhir.Model.Identifier> Identifier
     /// <summary>
     /// active | recurrence | inactive | remission | resolved
     /// </summary>
-    [FhirElement("clinicalStatus", InSummary=true, Order=100)]
+    [FhirElement("clinicalStatus", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.Condition.ConditionClinicalStatusCodes> ClinicalStatusElement
@@ -459,7 +459,7 @@ public Hl7.Fhir.Model.Condition.ConditionClinicalStatusCodes? ClinicalStatus
     /// <summary>
     /// provisional | differential | confirmed | refuted | entered-in-error | unknown
     /// </summary>
-    [FhirElement("verificationStatus", InSummary=true, Order=110)]
+    [FhirElement("verificationStatus", InSummary=true, IsModifier=true, Order=110)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.Condition.ConditionVerificationStatus> VerificationStatusElement

src/Hl7.Fhir.Core/Model/Generated/Consent.cs

@@ -1252,7 +1252,7 @@ public Hl7.Fhir.Model.Identifier Identifier
     /// <summary>
     /// draft | proposed | active | rejected | inactive | entered-in-error
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=100)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]

src/Hl7.Fhir.Core/Model/Generated/Contract.cs

@@ -1996,7 +1996,7 @@ public Hl7.Fhir.Model.Identifier Identifier
     /// <summary>
     /// amended | appended | cancelled | disputed | entered-in-error | executable | executed | negotiable | offered | policy | rejected | renewed | revoked | resolved | terminated
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=100)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.Contract.ContractResourceStatusCodes> StatusElement

src/Hl7.Fhir.Core/Model/Generated/Coverage.cs

@@ -639,7 +639,7 @@ public List<Hl7.Fhir.Model.Identifier> Identifier
     /// <summary>
     /// active | cancelled | draft | entered-in-error
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=100)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.FinancialResourceStatusCodes> StatusElement

src/Hl7.Fhir.Core/Model/Generated/DataElement.cs

@@ -428,7 +428,7 @@ public string Version
     /// <summary>
     /// draft | active | retired | unknown
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=120)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=120)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]
@@ -461,7 +461,7 @@ public Hl7.Fhir.Model.PublicationStatus? Status
     /// <summary>
     /// For testing purposes, not real usage
     /// </summary>
-    [FhirElement("experimental", InSummary=true, Order=130)]
+    [FhirElement("experimental", InSummary=true, IsModifier=true, Order=130)]
     [DataMember]
     public Hl7.Fhir.Model.FhirBoolean ExperimentalElement
     {

src/Hl7.Fhir.Core/Model/Generated/DetectedIssue.cs

@@ -273,7 +273,7 @@ public Hl7.Fhir.Model.Identifier Identifier
     /// <summary>
     /// registered | preliminary | final | amended +
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=100)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=100)]
     [DeclaredType(Type = typeof(Code))]
     [Cardinality(Min=1,Max=1)]
     [DataMember]

src/Hl7.Fhir.Core/Model/Generated/Device.cs

@@ -533,7 +533,7 @@ public Hl7.Fhir.Model.Device.UdiComponent Udi
     /// <summary>
     /// active | inactive | entered-in-error | unknown
     /// </summary>
-    [FhirElement("status", InSummary=true, Order=110)]
+    [FhirElement("status", InSummary=true, IsModifier=true, Order=110)]
     [DeclaredType(Type = typeof(Code))]
     [DataMember]
     public Code<Hl7.Fhir.Model.Device.FHIRDeviceStatus> StatusElement