Forward merge develop #3068
Merged
Forward merge develop #3068
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) and [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json). These dependencies needed to be updated together. Updates `Microsoft.NET.Test.Sdk` from 17.12.0 to 17.13.0 - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](microsoft/vstest@v17.12.0...v17.13.0) Updates `Newtonsoft.Json` from 13.0.3 to 13.0.1 - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](JamesNK/Newtonsoft.Json@13.0.3...13.0.1) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Newtonsoft.Json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ement-format-mimetype-validations Allow code "xml", "json", and "ttl" as valid mimetypes
Start development phase 5.11.5
…5c01b Bump Microsoft.NET.Test.Sdk
Bumps [MSTest.TestAdapter](https://github.com/microsoft/testfx) from 3.6.2 to 3.8.0. - [Release notes](https://github.com/microsoft/testfx/releases) - [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md) - [Commits](microsoft/testfx@v3.6.2...v3.8.0) --- updated-dependencies: - dependency-name: MSTest.TestAdapter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [MSTest.TestFramework](https://github.com/microsoft/testfx) from 3.6.2 to 3.8.0. - [Release notes](https://github.com/microsoft/testfx/releases) - [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md) - [Commits](microsoft/testfx@v3.6.2...v3.8.0) --- updated-dependencies: - dependency-name: MSTest.TestFramework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [System.Threading.Tasks.Dataflow](https://github.com/dotnet/runtime) from 9.0.1 to 9.0.2. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](dotnet/runtime@v9.0.1...v9.0.2) --- updated-dependencies: - dependency-name: System.Threading.Tasks.Dataflow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Fix typo in LocalTerminologyService
…Adapter-3.8.0 Bump MSTest.TestAdapter from 3.6.2 to 3.8.0
…Framework-3.8.0 Bump MSTest.TestFramework from 3.6.2 to 3.8.0
…ading.Tasks.Dataflow-9.0.2 Bump System.Threading.Tasks.Dataflow from 9.0.1 to 9.0.2
Use version `v1` (base version) of the Firely Azure templates (FirelyTeam/azure-pipeline-templates).
DEVOPS-354: Use v1 of Firely Azure templates
…s-on-funcs #2960 Made sure focus/params with just an empty primitive also propagate null.
# Conflicts: # src/Hl7.Fhir.Base/FhirPath/EvaluationContext.cs # src/Hl7.Fhir.Base/FhirPath/Expressions/Invokee.cs # src/Hl7.Fhir.Base/FhirPath/Expressions/SymbolTable.cs # src/Hl7.Fhir.Base/FhirPath/Expressions/SymbolTableInit.cs # src/Hl7.Fhir.Base/FhirPath/Functions/StringOperators.cs # src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathParallelTest.cs # src/Hl7.FhirPath.Tests/Functions/StringFunctionsTests.cs # src/firely-net-sdk-tests.props # src/firely-net-sdk.props
…ard-merge-develop
ewoutkramer
approved these changes
Mar 4, 2025
This was referenced Oct 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Forward merge develop 5 to develop 6