Skip to content

Forward merge develop - #3068

Merged
ewoutkramer merged 36 commits into
develop-6.0from
forward-merge-develop
Mar 4, 2025
Merged

Forward merge develop#3068
ewoutkramer merged 36 commits into
develop-6.0from
forward-merge-develop

Conversation

@Kasdejong

Copy link
Copy Markdown
Member

Forward merge develop 5 to develop 6

dependabot Bot and others added 30 commits February 10, 2025 16:22
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
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
@Kasdejong
Kasdejong requested a review from ewoutkramer March 4, 2025 12:23
@ewoutkramer
ewoutkramer merged commit 6dd9957 into develop-6.0 Mar 4, 2025
@ewoutkramer
ewoutkramer deleted the forward-merge-develop branch March 4, 2025 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants