diff --git a/Firely.Fhir.Packages.Tests/FhirPackageSourceTest.cs b/Firely.Fhir.Packages.Tests/FhirPackageSourceTest.cs index 474529b..0d42839 100644 --- 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 index 40850ae..1fc5dc3 100644 --- a/Firely.Fhir.Packages.Tests/TestHelper.cs +++ b/Firely.Fhir.Packages.Tests/TestHelper.cs @@ -102,7 +102,7 @@ static IEnumerable 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 index 977b71b..22619c7 100644 --- 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[] { "hl7.fhir.r3.core@3.0.2", "hl7.fhir.r3.expansions@3.0.2" }), FhirRelease.R4 => new FhirPackageSource(provider, packageServer, new string[] { "hl7.fhir.r4.core@4.0.1", "hl7.fhir.r4.expansions@4.0.1", "hl7.fhir.uv.extensions.r4@1.0.0" }), FhirRelease.R4B => new FhirPackageSource(provider, packageServer, new string[] { "hl7.fhir.r4b.core@4.3.0", "hl7.fhir.r4b.expansions@4.3.0", "hl7.fhir.uv.extensions.r4@1.0.0" }), - FhirRelease.R5 => new FhirPackageSource(provider, packageServer, new string[] { "hl7.fhir.r5.core@5.0.0", "hl7.fhir.r5.expansions@5.0.0", "hl7.fhir.uv.extensions.r5@1.0.0" }), + FhirRelease.R5 => new FhirPackageSource(provider, packageServer, new string[] { "hl7.fhir.r5.core@5.0.0", "hl7.fhir.r5.expansions@5.0.0", "hl7.fhir.uv.extensions.r5@1.0.0", "hl7.fhir.uv.tools@<=1.0.0" }), _ => null, }; } @@ -95,7 +95,7 @@ static IEnumerable 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); } }