Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<RepositoryUrl>https://github.com/microsoft/fhir-server</RepositoryUrl>
<RunSettingsFilePath>$(MSBuildThisFileDirectory)\CodeCoverage.runsettings</RunSettingsFilePath>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors />
Expand Down
32 changes: 17 additions & 15 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,17 @@
<!-- Shared dependencies versions.-->
<PropertyGroup>
<HealthcareSharedPackageVersion>10.0.68</HealthcareSharedPackageVersion>
<Hl7FhirVersion>5.11.4</Hl7FhirVersion>
<Hl7FhirVersion>5.13.1</Hl7FhirVersion>
<!-- Legacy validation packages only available up to 5.11.0 (deprecated) -->
<Hl7FhirLegacyVersion>5.11.0</Hl7FhirLegacyVersion>
<DotNetSdkPackageVersion>9.0.6</DotNetSdkPackageVersion>
<DotNetSdkPackageVersion>9.0.12</DotNetSdkPackageVersion>
<OpenIddictPackageVersion>6.2.0</OpenIddictPackageVersion>
<IgnixaPackageVersion>0.0.163</IgnixaPackageVersion>
</PropertyGroup>
<!-- SDK Packages (net9.0 only) -->
<PropertyGroup>
<AspNetPackageVersion>9.0.3</AspNetPackageVersion>
</PropertyGroup>
<!-- SDK Packages -->
<Choose>
<When Condition="'$(TargetFramework)' == 'net8.0'">
<PropertyGroup>
<AspNetPackageVersion>8.0.14</AspNetPackageVersion>
</PropertyGroup>
</When>
<When Condition="'$(TargetFramework)' == 'net9.0'">
<PropertyGroup>
<AspNetPackageVersion>9.0.3</AspNetPackageVersion>
</PropertyGroup>
</When>
</Choose>
<ItemGroup Label="CVE Mitigation">
<!--Please include the CGA id if possible-->
<PackageVersion Include="System.Security.Cryptography.Xml" Version="$(DotNetSdkPackageVersion)" />
Expand Down Expand Up @@ -142,5 +135,14 @@
<PackageVersion Include="System.Drawing.Common" Version="8.0.8" />
<PackageVersion Include="Moq" Version="4.20.69" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<!-- Ignixa FHIR SDK packages -->
<PackageVersion Include="Ignixa.Abstractions" Version="$(IgnixaPackageVersion)" />
<PackageVersion Include="Ignixa.Serialization" Version="$(IgnixaPackageVersion)" />
<PackageVersion Include="Ignixa.Extensions.FirelySdk5" Version="$(IgnixaPackageVersion)" />
<PackageVersion Include="Ignixa.Extensions.FirelySdk6" Version="$(IgnixaPackageVersion)" />
<PackageVersion Include="Ignixa.Specification" Version="$(IgnixaPackageVersion)" />
<PackageVersion Include="Ignixa.Search" Version="$(IgnixaPackageVersion)" />
<PackageVersion Include="Ignixa.FhirPath" Version="$(IgnixaPackageVersion)" />
<PackageVersion Include="Ignixa.Validation" Version="$(IgnixaPackageVersion)" />
</ItemGroup>
</Project>
586 changes: 586 additions & 0 deletions Microsoft.Health.Fhir.sln

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions R4.slnf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
{
"solution": {
"path": "Microsoft.Health.Fhir.sln",
"projects": [
"samples\\apps\\SmartLauncher\\SmartLauncher.csproj",
"src\\Microsoft.Health.Extensions.Xunit\\Microsoft.Health.Extensions.Xunit.csproj",
"src\\Microsoft.Health.Fhir.Api.OpenIddict\\Microsoft.Health.Fhir.Api.OpenIddict.csproj",
"src\\Microsoft.Health.Fhir.Api.UnitTests\\Microsoft.Health.Fhir.R4.Api.UnitTests.csproj",
"src\\Microsoft.Health.Fhir.Api\\Microsoft.Health.Fhir.Api.csproj",
"src\\Microsoft.Health.Fhir.Api.OpenIddict\\Microsoft.Health.Fhir.Api.OpenIddict.csproj",
"src\\Microsoft.Health.Fhir.Azure.UnitTests\\Microsoft.Health.Fhir.Azure.UnitTests.csproj",
"src\\Microsoft.Health.Fhir.Azure\\Microsoft.Health.Fhir.Azure.csproj",
"src\\Microsoft.Health.Fhir.Core.UnitTests\\Microsoft.Health.Fhir.Core.UnitTests.csproj",
Expand All @@ -16,6 +16,8 @@
"src\\Microsoft.Health.Fhir.CosmosDb.Initialization\\Microsoft.Health.Fhir.CosmosDb.Initialization.csproj",
"src\\Microsoft.Health.Fhir.CosmosDb.UnitTests\\Microsoft.Health.Fhir.CosmosDb.UnitTests.csproj",
"src\\Microsoft.Health.Fhir.CosmosDb\\Microsoft.Health.Fhir.CosmosDb.csproj",
"src\\Microsoft.Health.Fhir.Ignixa\\Microsoft.Health.Fhir.Ignixa.csproj",
"src\\Microsoft.Health.Fhir.Ignixa.UnitTests\\Microsoft.Health.Fhir.Ignixa.UnitTests.csproj",
"src\\Microsoft.Health.Fhir.R4.Api\\Microsoft.Health.Fhir.R4.Api.csproj",
"src\\Microsoft.Health.Fhir.R4.Client\\Microsoft.Health.Fhir.R4.Client.csproj",
"src\\Microsoft.Health.Fhir.R4.Core.UnitTests\\Microsoft.Health.Fhir.R4.Core.UnitTests.csproj",
Expand All @@ -31,8 +33,6 @@
"src\\Microsoft.Health.Fhir.SqlServer.UnitTests\\Microsoft.Health.Fhir.SqlServer.UnitTests.csproj",
"src\\Microsoft.Health.Fhir.SqlServer\\Microsoft.Health.Fhir.SqlServer.csproj",
"src\\Microsoft.Health.Fhir.Tests.Common\\Microsoft.Health.Fhir.Tests.Common.csproj",
"src\\Microsoft.Health.TaskManagement\\Microsoft.Health.TaskManagement.csproj",
"src\\Microsoft.Health.TaskManagement.UnitTests\\Microsoft.Health.TaskManagement.UnitTests.csproj",
"src\\Microsoft.Health.Fhir.ValueSets\\Microsoft.Health.Fhir.ValueSets.csproj",
"src\\Microsoft.Health.TaskManagement.UnitTests\\Microsoft.Health.TaskManagement.UnitTests.csproj",
"src\\Microsoft.Health.TaskManagement\\Microsoft.Health.TaskManagement.csproj",
Expand All @@ -44,4 +44,4 @@
"test\\Microsoft.Health.Fhir.Shared.Tests.Integration\\Microsoft.Health.Fhir.Shared.Tests.Integration.shproj"
]
}
}
}
2 changes: 2 additions & 0 deletions R5.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
"src\\Microsoft.Health.Fhir.CosmosDb.Initialization\\Microsoft.Health.Fhir.CosmosDb.Initialization.csproj",
"src\\Microsoft.Health.Fhir.CosmosDb.UnitTests\\Microsoft.Health.Fhir.CosmosDb.UnitTests.csproj",
"src\\Microsoft.Health.Fhir.CosmosDb\\Microsoft.Health.Fhir.CosmosDb.csproj",
"src\\Microsoft.Health.Fhir.Ignixa\\Microsoft.Health.Fhir.Ignixa.csproj",
"src\\Microsoft.Health.Fhir.Ignixa.UnitTests\\Microsoft.Health.Fhir.Ignixa.UnitTests.csproj",
"src\\Microsoft.Health.Fhir.R5.Api\\Microsoft.Health.Fhir.R5.Api.csproj",
"src\\Microsoft.Health.Fhir.R5.Client\\Microsoft.Health.Fhir.R5.Client.csproj",
"src\\Microsoft.Health.Fhir.R5.Core.UnitTests\\Microsoft.Health.Fhir.R5.Core.UnitTests.csproj",
Expand Down
2 changes: 1 addition & 1 deletion build/.vsts-PRInternalChecks-azureBuild-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
displayName: dotnet build
inputs:
projects: '**/*.sln'
arguments: --configuration ${{ parameters.BuildConfiguration }} --version-suffix $(build.buildnumber) /warnaserror -f net8.0
arguments: --configuration ${{ parameters.BuildConfiguration }} --version-suffix $(build.buildnumber) /warnaserror -f net9.0
- task: AutoApplicability@1
displayName: Run AutoApplicability
continueOnError: True
Expand Down
8 changes: 0 additions & 8 deletions build/ci-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@ stages:
targetBuildFramework: $(defaultBuildFramework)
unitTest: false
codeCoverage: true
- job: Linux_dotnet8
pool:
name: '$(DefaultLinuxPool)'
vmImage: '$(LinuxVmImage)'
steps:
- template: ./jobs/build.yml
parameters:
targetBuildFramework: 'net8.0'

- stage: BuildArtifacts
displayName: 'Build artifacts'
Expand Down
3 changes: 3 additions & 0 deletions build/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ COPY ./src/Microsoft.Health.Fhir.SqlServer/Microsoft.Health.Fhir.SqlServer.cspro
COPY ./src/Microsoft.Health.Fhir.Api.OpenIddict/Microsoft.Health.Fhir.Api.OpenIddict.csproj \
./src/Microsoft.Health.Fhir.Api.OpenIddict/Microsoft.Health.Fhir.Api.OpenIddict.csproj

COPY ./src/Microsoft.Health.Fhir.Ignixa/Microsoft.Health.Fhir.Ignixa.csproj \
./src/Microsoft.Health.Fhir.Ignixa/Microsoft.Health.Fhir.Ignixa.csproj

COPY ./src/Microsoft.Health.Fhir.Api/Microsoft.Health.Fhir.Api.csproj \
./src/Microsoft.Health.Fhir.Api/Microsoft.Health.Fhir.Api.csproj

Expand Down
8 changes: 0 additions & 8 deletions build/pr-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,6 @@ stages:
targetBuildFramework: $(defaultBuildFramework)
unitTest: false
codeCoverage: true
- job: Linux_dotnet8
pool:
name: '$(DefaultLinuxPool)'
vmImage: '$(LinuxVmImage)'
steps:
- template: ./jobs/build.yml
parameters:
targetBuildFramework: 'net8.0'

- stage: BuildArtifacts
displayName: 'Build artifacts'
Expand Down
Loading
Loading