Merge branch 'develop' into bugfix/handle-invalid-versions

FirelyTeam · Feb 20, 2024 · 6761bd0 · 6761bd0
2 parents b2334f2 + df24480
commit 6761bd0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,3 +9,14 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+    ignore:
+      - dependency-name: "xunit"
+        update-types: ["version-update:semver-patch"]
+      - dependency-name: "xunit.runner.visualstudio"
+        update-types: ["version-update:semver-patch"]
+      - dependency-name: Microsoft.NET.Test.Sdk
+        update-types: ["version-update:semver-patch"]
+      - dependency-name: MSTest.TestAdapter
+        update-types: ["version-update:semver-patch"]
+      - dependency-name: MSTest.TestFramework
+        update-types: ["version-update:semver-patch"]
diff --git a/Firely.Fhir.Packages.Tests/FhirPackageSourceTest.cs b/Firely.Fhir.Packages.Tests/FhirPackageSourceTest.cs
@@ -150,6 +150,13 @@ public async Task TestFhirCorePackages(FhirRelease release, string version, stri
             var extension = await packageSource!.ResolveByCanonicalUriAsyncAsString("http://hl7.org/fhir/StructureDefinition/patient-mothersMaidenName");
             extension.Should().NotBeNull();
             extension.Should().Contain("\"url\":\"http://hl7.org/fhir/StructureDefinition/patient-mothersMaidenName\"");
+
+            if (release == FhirRelease.R5)
+            {
+                var toolingextension = await packageSource!.ResolveByCanonicalUriAsyncAsString("http://hl7.org/fhir/tools/StructureDefinition/elementdefinition-date-format");
+                toolingextension.Should().NotBeNull();
+                toolingextension.Should().Contain("\"url\":\"http://hl7.org/fhir/tools/StructureDefinition/elementdefinition-date-format\"");
+            }
         }
     }
 }
diff --git a/Firely.Fhir.Packages.Tests/TestHelper.cs b/Firely.Fhir.Packages.Tests/TestHelper.cs
@@ -102,7 +102,7 @@ static IEnumerable<PackageDependency> createDependencies(string[] dependencies)
                         yield return new PackageDependency(dep, "latest");
                     else
                     {
-                        var versionDep = "=" + splitDependency[1];
+                        var versionDep = splitDependency[1];
                         yield return new PackageDependency(splitDependency[0], versionDep);
                     }
                 }

diff --git a/Firely.Fhir.Packages/Source/FhirPackageSource.cs b/Firely.Fhir.Packages/Source/FhirPackageSource.cs
@@ -52,7 +52,7 @@ public FhirPackageSource(ModelInspector provider, string packageServer, string[]
                 FhirRelease.STU3 => new FhirPackageSource(provider, packageServer, new string[] { "[email protected]", "[email protected]" }),
                 FhirRelease.R4 => new FhirPackageSource(provider, packageServer, new string[] { "[email protected]", "[email protected]", "[email protected]" }),
                 FhirRelease.R4B => new FhirPackageSource(provider, packageServer, new string[] { "[email protected]", "[email protected]", "[email protected]" }),
-                FhirRelease.R5 => new FhirPackageSource(provider, packageServer, new string[] { "[email protected]", "[email protected]", "[email protected]" }),
+                FhirRelease.R5 => new FhirPackageSource(provider, packageServer, new string[] { "[email protected]", "[email protected]", "[email protected]", "hl7.fhir.uv.tools@<=1.0.0" }),
                 _ => null,
             };
         }
@@ -95,7 +95,7 @@ static IEnumerable<PackageDependency> createDependencies(string[] dependencies)
                         yield return new PackageDependency(dep, "latest");
                     else
                     {
-                        var versionDep = "=" + splitDependency[1];
+                        var versionDep = splitDependency[1];
                         yield return new PackageDependency(splitDependency[0], versionDep);
                     }
                 }