Skip to content

Commit 6dd9957

Browse files
authored
Merge pull request #3068 from FirelyTeam/forward-merge-develop
Forward merge develop
2 parents ae88264 + bfa05d2 commit 6dd9957

File tree

38 files changed

+1155
-1091
lines changed

38 files changed

+1155
-1091
lines changed

build/azure-pipelines.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ resources:
3232
- repository: templates
3333
type: github
3434
name: FirelyTeam/azure-pipeline-templates
35-
endpoint: FirelyTeam
35+
endpoint: FirelyTeam
36+
ref: refs/tags/v1
37+
3638

3739
stages:
3840
- stage: build

release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
## Intro:
22

3-
A hotfix in the `Canonical` class to also allow fragment only canonicals.
3+
A hotfix in the MimeTypeTerminologyService to allow for the FHIR format types "xml", "json" and "ttl".

src/Hl7.Fhir.Base/FhirPath/EvaluationContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public EvaluationContext(PocoNode? resource, PocoNode? rootResource, IDictionary
6161
/// <summary>
6262
/// A delegate that handles the output for the <c>trace()</c> function.
6363
/// </summary>
64-
public Action<string, IEnumerable<PocoNode>>? Tracer { get; set; }
64+
public Action<string?, IEnumerable<PocoNode>>? Tracer { get; set; }
6565
}
6666

6767
public static class EvaluationContextExtensions

0 commit comments

Comments
 (0)