Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update develop-r4b with develop-r4 #1753

Merged

Conversation

marcovisserFurore
Copy link
Member

No description provided.

mmsmits and others added 30 commits March 29, 2021 17:17
…d-check-parameters

# Conflicts:
#	src/Hl7.Fhir.Specification.Tests/Source/TerminologyTests.cs
#	src/Hl7.Fhir.Specification/Specification/Terminology/ExternalTerminologyService.cs
#	src/Hl7.Fhir.Specification/Specification/Terminology/ValidateCodeParameters.cs
…urn false outcomes instead of throwing exceptions.
Ewout Kramer and others added 28 commits May 31, 2021 15:29
…imezone-loss-in-FhirDateTime-ToDateTimeOffset
…-FhirDateTime-ToDateTimeOffset

Keep existing timezone by default in FhirDateTime.ToDateTimeOffset - STU3
Make sure the FhirPathTests for R4 run correctly.
…test-stu3

Devops: fixing pipeline, because a whole testproject did not run
…project

Devops: Publishing of Hl7.FhirPath.R4.Tests is now conditional
…ases-stu3

Adding R4B at the end of the enum FhirRelease but maintain the ordening
…e-develop-r4-with-develop-stu3

# Conflicts:
#	src/Hl7.Fhir.Core.Tests/Model/ModelTests.cs
#	src/Hl7.Fhir.Core/Model/Generated/Account.cs
#	src/Hl7.Fhir.Core/Model/Generated/ActivityDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/AdverseEvent.cs
#	src/Hl7.Fhir.Core/Model/Generated/AllergyIntolerance.cs
#	src/Hl7.Fhir.Core/Model/Generated/Annotation.cs
#	src/Hl7.Fhir.Core/Model/Generated/Appointment.cs
#	src/Hl7.Fhir.Core/Model/Generated/AuditEvent.cs
#	src/Hl7.Fhir.Core/Model/Generated/BodyStructure.cs
#	src/Hl7.Fhir.Core/Model/Generated/CapabilityStatement.cs
#	src/Hl7.Fhir.Core/Model/Generated/CarePlan.cs
#	src/Hl7.Fhir.Core/Model/Generated/ChargeItem.cs
#	src/Hl7.Fhir.Core/Model/Generated/Claim.cs
#	src/Hl7.Fhir.Core/Model/Generated/ClaimResponse.cs
#	src/Hl7.Fhir.Core/Model/Generated/ClinicalImpression.cs
#	src/Hl7.Fhir.Core/Model/Generated/Communication.cs
#	src/Hl7.Fhir.Core/Model/Generated/CommunicationRequest.cs
#	src/Hl7.Fhir.Core/Model/Generated/CompartmentDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/Composition.cs
#	src/Hl7.Fhir.Core/Model/Generated/ConceptMap.cs
#	src/Hl7.Fhir.Core/Model/Generated/Consent.cs
#	src/Hl7.Fhir.Core/Model/Generated/Contract.cs
#	src/Hl7.Fhir.Core/Model/Generated/Coverage.cs
#	src/Hl7.Fhir.Core/Model/Generated/CoverageEligibilityResponse.cs
#	src/Hl7.Fhir.Core/Model/Generated/DataElement.cs
#	src/Hl7.Fhir.Core/Model/Generated/DataRequirement.cs
#	src/Hl7.Fhir.Core/Model/Generated/Device.cs
#	src/Hl7.Fhir.Core/Model/Generated/DeviceComponent.cs
#	src/Hl7.Fhir.Core/Model/Generated/DeviceRequest.cs
#	src/Hl7.Fhir.Core/Model/Generated/DeviceUseStatement.cs
#	src/Hl7.Fhir.Core/Model/Generated/DocumentManifest.cs
#	src/Hl7.Fhir.Core/Model/Generated/Dosage.cs
#	src/Hl7.Fhir.Core/Model/Generated/ElementDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/EligibilityRequest.cs
#	src/Hl7.Fhir.Core/Model/Generated/EventDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/ExpansionProfile.cs
#	src/Hl7.Fhir.Core/Model/Generated/ExplanationOfBenefit.cs
#	src/Hl7.Fhir.Core/Model/Generated/FamilyMemberHistory.cs
#	src/Hl7.Fhir.Core/Model/Generated/Goal.cs
#	src/Hl7.Fhir.Core/Model/Generated/GraphDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/GuidanceResponse.cs
#	src/Hl7.Fhir.Core/Model/Generated/ImagingManifest.cs
#	src/Hl7.Fhir.Core/Model/Generated/ImagingStudy.cs
#	src/Hl7.Fhir.Core/Model/Generated/ImplementationGuide.cs
#	src/Hl7.Fhir.Core/Model/Generated/Library.cs
#	src/Hl7.Fhir.Core/Model/Generated/Measure.cs
#	src/Hl7.Fhir.Core/Model/Generated/Media.cs
#	src/Hl7.Fhir.Core/Model/Generated/Medication.cs
#	src/Hl7.Fhir.Core/Model/Generated/MedicationDispense.cs
#	src/Hl7.Fhir.Core/Model/Generated/MedicationRequest.cs
#	src/Hl7.Fhir.Core/Model/Generated/MedicationStatement.cs
#	src/Hl7.Fhir.Core/Model/Generated/MessageDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/MolecularSequence.cs
#	src/Hl7.Fhir.Core/Model/Generated/Money.cs
#	src/Hl7.Fhir.Core/Model/Generated/NamingSystem.cs
#	src/Hl7.Fhir.Core/Model/Generated/NutritionOrder.cs
#	src/Hl7.Fhir.Core/Model/Generated/Observation.cs
#	src/Hl7.Fhir.Core/Model/Generated/OperationDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/PaymentNotice.cs
#	src/Hl7.Fhir.Core/Model/Generated/PaymentReconciliation.cs
#	src/Hl7.Fhir.Core/Model/Generated/PlanDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/Procedure.cs
#	src/Hl7.Fhir.Core/Model/Generated/ProcessRequest.cs
#	src/Hl7.Fhir.Core/Model/Generated/ProcessResponse.cs
#	src/Hl7.Fhir.Core/Model/Generated/Provenance.cs
#	src/Hl7.Fhir.Core/Model/Generated/Questionnaire.cs
#	src/Hl7.Fhir.Core/Model/Generated/ReferralRequest.cs
#	src/Hl7.Fhir.Core/Model/Generated/RequestGroup.cs
#	src/Hl7.Fhir.Core/Model/Generated/RiskAssessment.cs
#	src/Hl7.Fhir.Core/Model/Generated/SearchParameter.cs
#	src/Hl7.Fhir.Core/Model/Generated/ServiceRequest.cs
#	src/Hl7.Fhir.Core/Model/Generated/Signature.cs
#	src/Hl7.Fhir.Core/Model/Generated/StructureDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/SupplyRequest.cs
#	src/Hl7.Fhir.Core/Model/Generated/Task.cs
#	src/Hl7.Fhir.Core/Model/Generated/TestScript.cs
#	src/Hl7.Fhir.Core/Model/Generated/Timing.cs
#	src/Hl7.Fhir.Core/Model/Generated/VisionPrescription.cs
#	src/Hl7.Fhir.Core/Model/ModelInfo.cs
#	src/Hl7.Fhir.Core/Properties/AssemblyInfo.cs
#	src/Hl7.Fhir.Specification.Tests/Source/TerminologyTests.cs
#	src/Hl7.Fhir.Specification.Tests/Validation/BindingValidationTests.cs
#	src/Hl7.Fhir.Specification/Validation/Validator.cs
…th-develop-stu3

Update develop-r4 with develop-stu3
…develop-r4B-with-develop-r4

# Conflicts:
#	src/Hl7.Fhir.Core/Model/Generated/ActivityDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/AdministrableProductDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/EffectEvidenceSynthesis.cs
#	src/Hl7.Fhir.Core/Model/Generated/Evidence.cs
#	src/Hl7.Fhir.Core/Model/Generated/EvidenceVariable.cs
#	src/Hl7.Fhir.Core/Model/Generated/Ingredient.cs
#	src/Hl7.Fhir.Core/Model/Generated/ManufacturedItemDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/MedicinalProductAuthorization.cs
#	src/Hl7.Fhir.Core/Model/Generated/MedicinalProductContraindication.cs
#	src/Hl7.Fhir.Core/Model/Generated/MedicinalProductDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/MedicinalProductIndication.cs
#	src/Hl7.Fhir.Core/Model/Generated/MedicinalProductInteraction.cs
#	src/Hl7.Fhir.Core/Model/Generated/MedicinalProductPackaged.cs
#	src/Hl7.Fhir.Core/Model/Generated/MedicinalProductUndesirableEffect.cs
#	src/Hl7.Fhir.Core/Model/Generated/PlanDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/RiskEvidenceSynthesis.cs
#	src/Hl7.Fhir.Core/Model/Generated/Substance.cs
#	src/Hl7.Fhir.Core/Model/Generated/SubstanceAmount.cs
#	src/Hl7.Fhir.Core/Model/Generated/SubstanceDefinition.cs
#	src/Hl7.Fhir.Core/Model/Generated/SubstanceNucleicAcid.cs
#	src/Hl7.Fhir.Core/Model/Generated/SubstancePolymer.cs
#	src/Hl7.Fhir.Core/Model/Generated/SubstanceProtein.cs
#	src/Hl7.Fhir.Core/Model/Generated/SubstanceReferenceInformation.cs
#	src/Hl7.Fhir.Core/Model/Generated/SubstanceSourceMaterial.cs
#	src/Hl7.Fhir.Core/Properties/AssemblyInfo.cs
#	src/Hl7.Fhir.Specification/Validation/Validator.cs
@marcovisserFurore marcovisserFurore merged commit 0753da5 into develop-r4B Jun 1, 2021
@marcovisserFurore marcovisserFurore deleted the feature/update-develop-r4B-with-develop-r4 branch June 1, 2021 15:35
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.

4 participants