From 18eb08e629f298f0ef50c436507bb0cdff89abf6 Mon Sep 17 00:00:00 2001 From: Ewout Kramer Date: Tue, 3 Dec 2024 18:23:38 +0100 Subject: [PATCH 1/2] Some renames to types that were incorrect. --- .../Model/Generated/Narrative.cs | 4 ++-- .../ScopedNodeOnBaseTests.cs | 2 +- src/Hl7.Fhir.R4B/Model/Generated/Citation.cs | 20 +++++++++---------- src/Hl7.Fhir.R5/Model/Generated/Citation.cs | 20 +++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Hl7.Fhir.Base/Model/Generated/Narrative.cs b/src/Hl7.Fhir.Base/Model/Generated/Narrative.cs index 6c35d8e606..f1b0b5b5b2 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Narrative.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Narrative.cs @@ -96,7 +96,7 @@ public enum NarrativeStatus /// /// generated | extensions | additional | empty. /// - [FhirElement("status", InSummary=true, Order=30)] + [FhirElement("status", Order=30)] [DeclaredType(Type = typeof(Code))] [Binding("NarrativeStatus")] [Cardinality(Min=1,Max=1)] @@ -130,7 +130,7 @@ public Hl7.Fhir.Model.Narrative.NarrativeStatus? Status /// /// Limited xhtml content. /// - [FhirElement("div", XmlSerialization = XmlRepresentation.XHtml, InSummary=true, Order=40)] + [FhirElement("div", XmlSerialization = XmlRepresentation.XHtml, Order=40)] [Cardinality(Min=1,Max=1)] [DataMember] public Hl7.Fhir.Model.XHtml DivElement diff --git a/src/Hl7.Fhir.ElementModel.Shared.Tests/ScopedNodeOnBaseTests.cs b/src/Hl7.Fhir.ElementModel.Shared.Tests/ScopedNodeOnBaseTests.cs index 5862f64312..71a016c8ff 100644 --- a/src/Hl7.Fhir.ElementModel.Shared.Tests/ScopedNodeOnBaseTests.cs +++ b/src/Hl7.Fhir.ElementModel.Shared.Tests/ScopedNodeOnBaseTests.cs @@ -134,7 +134,7 @@ public void TestResolve() Assert.IsNull(inner7.Resolve("http://nu.nl/3", externalResolve)); Assert.AreEqual("http://nu.nl/3", lastUrlResolved); - IScopedNode? externalResolve(string url) + IScopedNode externalResolve(string url) { lastUrlResolved = url; return null; diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs b/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs index dce60d1ec8..ab1e2aedf2 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs @@ -3977,13 +3977,13 @@ public List [FhirElement("summary", Order=60)] [Cardinality(Min=0,Max=-1)] [DataMember] - public List Summary + public List Summary { - get { if(_Summary==null) _Summary = new List(); return _Summary; } + get { if(_Summary==null) _Summary = new List(); return _Summary; } set { _Summary = value; OnPropertyChanged("Summary"); } } - private List _Summary; + private List _Summary; public override IDeepCopyable CopyTo(IDeepCopyable other) { @@ -3997,7 +3997,7 @@ public override IDeepCopyable CopyTo(IDeepCopyable other) base.CopyTo(dest); if(CompleteElement != null) dest.CompleteElement = (Hl7.Fhir.Model.FhirBoolean)CompleteElement.DeepCopy(); if(Entry.Any()) dest.Entry = new List(Entry.DeepCopy()); - if(Summary.Any()) dest.Summary = new List(Summary.DeepCopy()); + if(Summary.Any()) dest.Summary = new List(Summary.DeepCopy()); return dest; } @@ -4063,7 +4063,7 @@ internal protected override Base SetValue(string key, object value) Entry = (List)value; return this; case "summary": - Summary = (List)value; + Summary = (List)value; return this; default: return base.SetValue(key, value); @@ -4859,7 +4859,7 @@ internal protected override IEnumerable> GetElement [Serializable] [DataContract] [FhirType("Citation.citedArtifact.contributorship.summary", IsBackboneType=true)] - public partial class CitedArtifactContributorshipSummaryComponent : Hl7.Fhir.Model.BackboneElement + public partial class ContributorshipSummaryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name @@ -4942,7 +4942,7 @@ public string Value public override IDeepCopyable CopyTo(IDeepCopyable other) { - var dest = other as CitedArtifactContributorshipSummaryComponent; + var dest = other as ContributorshipSummaryComponent; if (dest == null) { @@ -4959,13 +4959,13 @@ public override IDeepCopyable CopyTo(IDeepCopyable other) public override IDeepCopyable DeepCopy() { - return CopyTo(new CitedArtifactContributorshipSummaryComponent()); + return CopyTo(new ContributorshipSummaryComponent()); } /// public override bool Matches(IDeepComparable other) { - var otherT = other as CitedArtifactContributorshipSummaryComponent; + var otherT = other as ContributorshipSummaryComponent; if(otherT == null) return false; if(!base.Matches(otherT)) return false; @@ -4979,7 +4979,7 @@ public override bool Matches(IDeepComparable other) public override bool IsExactly(IDeepComparable other) { - var otherT = other as CitedArtifactContributorshipSummaryComponent; + var otherT = other as ContributorshipSummaryComponent; if(otherT == null) return false; if(!base.IsExactly(otherT)) return false; diff --git a/src/Hl7.Fhir.R5/Model/Generated/Citation.cs b/src/Hl7.Fhir.R5/Model/Generated/Citation.cs index 64d3e3e311..d31ef06a7a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Citation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Citation.cs @@ -3677,13 +3677,13 @@ public List [FhirElement("summary", Order=60)] [Cardinality(Min=0,Max=-1)] [DataMember] - public List Summary + public List Summary { - get { if(_Summary==null) _Summary = new List(); return _Summary; } + get { if(_Summary==null) _Summary = new List(); return _Summary; } set { _Summary = value; OnPropertyChanged("Summary"); } } - private List _Summary; + private List _Summary; public override IDeepCopyable CopyTo(IDeepCopyable other) { @@ -3697,7 +3697,7 @@ public override IDeepCopyable CopyTo(IDeepCopyable other) base.CopyTo(dest); if(CompleteElement != null) dest.CompleteElement = (Hl7.Fhir.Model.FhirBoolean)CompleteElement.DeepCopy(); if(Entry.Any()) dest.Entry = new List(Entry.DeepCopy()); - if(Summary.Any()) dest.Summary = new List(Summary.DeepCopy()); + if(Summary.Any()) dest.Summary = new List(Summary.DeepCopy()); return dest; } @@ -3763,7 +3763,7 @@ internal protected override Base SetValue(string key, object value) Entry = (List)value; return this; case "summary": - Summary = (List)value; + Summary = (List)value; return this; default: return base.SetValue(key, value); @@ -4263,7 +4263,7 @@ internal protected override IEnumerable> GetElement [Serializable] [DataContract] [FhirType("Citation.citedArtifact.contributorship.summary", IsBackboneType=true)] - public partial class CitedArtifactContributorshipSummaryComponent : Hl7.Fhir.Model.BackboneElement + public partial class ContributorshipSummaryComponent : Hl7.Fhir.Model.BackboneElement { /// /// FHIR Type Name @@ -4346,7 +4346,7 @@ public string Value public override IDeepCopyable CopyTo(IDeepCopyable other) { - var dest = other as CitedArtifactContributorshipSummaryComponent; + var dest = other as ContributorshipSummaryComponent; if (dest == null) { @@ -4363,13 +4363,13 @@ public override IDeepCopyable CopyTo(IDeepCopyable other) public override IDeepCopyable DeepCopy() { - return CopyTo(new CitedArtifactContributorshipSummaryComponent()); + return CopyTo(new ContributorshipSummaryComponent()); } /// public override bool Matches(IDeepComparable other) { - var otherT = other as CitedArtifactContributorshipSummaryComponent; + var otherT = other as ContributorshipSummaryComponent; if(otherT == null) return false; if(!base.Matches(otherT)) return false; @@ -4383,7 +4383,7 @@ public override bool Matches(IDeepComparable other) public override bool IsExactly(IDeepComparable other) { - var otherT = other as CitedArtifactContributorshipSummaryComponent; + var otherT = other as ContributorshipSummaryComponent; if(otherT == null) return false; if(!base.IsExactly(otherT)) return false; From 6fb339c4c5d8d6ed618b5c5bc723403d138b5b4e Mon Sep 17 00:00:00 2001 From: Ewout Kramer Date: Tue, 3 Dec 2024 18:30:08 +0100 Subject: [PATCH 2/2] compat suppressions --- src/Hl7.Fhir.R4B/CompatibilitySuppressions.xml | 14 ++++++++++++++ src/Hl7.Fhir.R5/CompatibilitySuppressions.xml | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/Hl7.Fhir.R4B/CompatibilitySuppressions.xml b/src/Hl7.Fhir.R4B/CompatibilitySuppressions.xml index ef7fd73f07..e9e418cdbe 100644 --- a/src/Hl7.Fhir.R4B/CompatibilitySuppressions.xml +++ b/src/Hl7.Fhir.R4B/CompatibilitySuppressions.xml @@ -1,6 +1,13 @@  + + CP0001 + T:Hl7.Fhir.Model.Citation.CitedArtifactContributorshipSummaryComponent + lib/net8.0/Hl7.Fhir.R4B.dll + lib/net8.0/Hl7.Fhir.R4B.dll + true + CP0002 M:Hl7.Fhir.FhirPath.FhirPathExtensions.ToFhirPathResolver(System.Func{System.String,Hl7.Fhir.Model.Resource}) @@ -8,6 +15,13 @@ lib/net8.0/Hl7.Fhir.R4B.dll true + + CP0002 + M:Hl7.Fhir.Model.Citation.CitedArtifactContributorshipComponent.get_Summary + lib/net8.0/Hl7.Fhir.R4B.dll + lib/net8.0/Hl7.Fhir.R4B.dll + true + PKV006 .NETStandard,Version=v2.0 diff --git a/src/Hl7.Fhir.R5/CompatibilitySuppressions.xml b/src/Hl7.Fhir.R5/CompatibilitySuppressions.xml index 5c2d177157..73392a2f11 100644 --- a/src/Hl7.Fhir.R5/CompatibilitySuppressions.xml +++ b/src/Hl7.Fhir.R5/CompatibilitySuppressions.xml @@ -1,6 +1,13 @@  + + CP0001 + T:Hl7.Fhir.Model.Citation.CitedArtifactContributorshipSummaryComponent + lib/net8.0/Hl7.Fhir.R5.dll + lib/net8.0/Hl7.Fhir.R5.dll + true + CP0002 M:Hl7.Fhir.FhirPath.FhirPathExtensions.ToFhirPathResolver(System.Func{System.String,Hl7.Fhir.Model.Resource}) @@ -8,6 +15,13 @@ lib/net8.0/Hl7.Fhir.R5.dll true + + CP0002 + M:Hl7.Fhir.Model.Citation.CitedArtifactContributorshipComponent.get_Summary + lib/net8.0/Hl7.Fhir.R5.dll + lib/net8.0/Hl7.Fhir.R5.dll + true + PKV006 .NETStandard,Version=v2.0