Merge pull request #2775 from FirelyTeam/release/5.8.0

Start development phase 5.8.2
FirelyTeam · May 2, 2024 · fb0d649 · fb0d649
2 parents 95ce7c1 + 253e8c8
commit fb0d649
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 346 deletions.
diff --git a/release-notes.md b/release-notes.md
@@ -1,5 +1,8 @@
 ## Intro:
 
-Highlights of this new release:
+Hotfix release:
 
-Many small improvements
+Reverted: https://github.com/FirelyTeam/firely-net-sdk/pull/2754
+
+This fix introduced behavioral changes we need to handle first before we can apply this. 
+This requires more time, so for now this has been reverted to be applied later again.
diff --git a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
@@ -7,284 +7,4 @@
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
   </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.ElementModel.Types.Decimal.#ctor</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Model.Time.ToTimeSpan</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirJsonConverter`1.#ctor(Hl7.Fhir.Introspection.ModelInspector,Hl7.Fhir.Serialization.FhirJsonPocoSerializerSettings,Hl7.Fhir.Serialization.FhirJsonPocoDeserializerSettings)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirJsonConverter`1.#ctor(System.Reflection.Assembly,Hl7.Fhir.Serialization.FhirJsonPocoSerializerSettings,Hl7.Fhir.Serialization.FhirJsonPocoDeserializerSettings)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirSerializationEngineFactory.BackwardsCompatible(Hl7.Fhir.Introspection.ModelInspector)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirSerializationEngineFactory.Ostrich(Hl7.Fhir.Introspection.ModelInspector)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirSerializationEngineFactory.Recoverable(Hl7.Fhir.Introspection.ModelInspector)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirSerializationEngineFactory.Strict(Hl7.Fhir.Introspection.ModelInspector)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.ElementModel.Types.Decimal.#ctor</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Model.Time.ToTimeSpan</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirJsonConverter`1.#ctor(Hl7.Fhir.Introspection.ModelInspector,Hl7.Fhir.Serialization.FhirJsonPocoSerializerSettings,Hl7.Fhir.Serialization.FhirJsonPocoDeserializerSettings)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirJsonConverter`1.#ctor(System.Reflection.Assembly,Hl7.Fhir.Serialization.FhirJsonPocoSerializerSettings,Hl7.Fhir.Serialization.FhirJsonPocoDeserializerSettings)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirSerializationEngineFactory.BackwardsCompatible(Hl7.Fhir.Introspection.ModelInspector)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirSerializationEngineFactory.Ostrich(Hl7.Fhir.Introspection.ModelInspector)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirSerializationEngineFactory.Recoverable(Hl7.Fhir.Introspection.ModelInspector)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Serialization.FhirSerializationEngineFactory.Strict(Hl7.Fhir.Introspection.ModelInspector)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Capabilities</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Create</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Delete</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.History</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Operation</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Patch</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Read</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Search</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Transaction</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Unspecified</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Update</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.VRead</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Capabilities</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Create</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Delete</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.History</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Operation</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Patch</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Read</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Search</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Transaction</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Unspecified</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.Update</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0011</DiagnosticId>
-    <Target>F:Hl7.Fhir.Rest.InteractionType.VRead</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
 </Suppressions>
diff --git a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs b/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs
@@ -143,15 +143,14 @@ private static IAsyncResourceResolver verifySource(IAsyncResourceResolver resolv
         /// <param name="structure">A <see cref="StructureDefinition"/> instance.</param>
         public async T.Task UpdateAsync(StructureDefinition structure)
         {
-                var result = await GenerateAsync(structure).ConfigureAwait(false);
-
-                if (result == null && structure.Snapshot?.Element != null) return;
-
-                structure.Snapshot = new StructureDefinition.SnapshotComponent { Element = result };
-                structure.Snapshot.SetCreatedBySnapshotGenerator();
+            structure.Snapshot = new StructureDefinition.SnapshotComponent()
+            {
+                Element = await GenerateAsync(structure).ConfigureAwait(false)
+            };
+            structure.Snapshot.SetCreatedBySnapshotGenerator();
 
-                // [WMR 20170209] TODO: also merge global StructureDefinition.Mapping components
-                // structure.Mappings = ElementDefnMerger.Merge(...)
+            // [WMR 20170209] TODO: also merge global StructureDefinition.Mapping components
+            // structure.Mappings = ElementDefnMerger.Merge(...)
         }
 
         /// <inheritdoc cref="UpdateAsync(StructureDefinition)"/>

diff --git a/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorTest.cs b/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorTest.cs
@@ -3194,42 +3194,6 @@ public async T.Task FindComplexTestExtensions()
             }
         };
 
-        private static StructureDefinition LogicalModelWithoutDiff => new()
-        {
-            Name = "MyLogicalModel",
-            Url = "http://example.org/fhir/StructureDefinition/MyLogicalModel",
-            Type = "http://foo.org/bar",
-            Derivation = StructureDefinition.TypeDerivationRule.Constraint,
-            BaseDefinition = "http://hl7.org/fhir/StructureDefinition/Base",
-            Kind = StructureDefinition.StructureDefinitionKind.Logical,
-            Snapshot = new()
-            {
-                Element = new()
-               {
-                   new()
-                   {
-                       ElementId = "logicalmodel",
-                       Path = "logicalmodel",
-                       Short = "root"
-
-                   },
-                    new()
-                   {
-                       ElementId = "logicalmodel.Identifier",
-                       Path = "logicalmodel.Identifier",
-                       Short = "Identifier",
-                       Min = 1,
-                       Max = "*",
-                       Type = new()
-                       {
-                           new() {Code = "Identifier"}
-                       }
-                   },
-               }
-            }
-
-        };
-
         [Conditional("DEBUG")]
         private void dumpElements(IEnumerable<ElementDefinition> elements, string header = null) => dumpElements(elements.ToList(), header);
 
@@ -3332,23 +3296,6 @@ public async T.Task TestMissingDifferential()
             expanded.Snapshot.Element.Dump();
         }
 
-        [TestMethod]
-        public async T.Task TestMissingDifferentialLogicalModel()
-        {
-            // Create a profile without a differential
-            var profile = LogicalModelWithoutDiff;
-
-            var resolver = new InMemoryResourceResolver(profile);
-            var multiResolver = new MultiResolver(_testResolver, resolver);
-            _generator = new SnapshotGenerator(multiResolver, _settings);
-
-            var (_, expanded) = await generateSnapshotAndCompare(profile);
-            Assert.IsNotNull(expanded);
-            Assert.IsTrue(expanded.HasSnapshot);
-
-            expanded.Snapshot.Element.Dump();
-        }
-
         [TestMethod]
         public async T.Task TestUnresolvedBaseProfile()
         {