diff --git a/Hl7.Fhir.sln b/Hl7.Fhir.sln index 2725b40cc3..fad31c0056 100644 --- a/Hl7.Fhir.sln +++ b/Hl7.Fhir.sln @@ -1,16 +1,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28729.10 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31808.319 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2836B1CC-7AAF-46AB-BEA8-98DFEA170414}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig common\src\firely-net-common-tests.props = common\src\firely-net-common-tests.props common\src\firely-net-common.props = common\src\firely-net-common.props - common\src\firely-net-common.targets = common\src\firely-net-common.targets src\firely-net-sdk-tests.props = src\firely-net-sdk-tests.props src\firely-net-sdk.props = src\firely-net-sdk.props - src\firely-net-sdk.targets = src\firely-net-sdk.targets EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{7089FA86-6527-4DFA-8018-AFEF25D74A48}" diff --git a/build/build-variables.yml b/build/build-variables.yml index c0d69fe96d..40edd2174d 100644 --- a/build/build-variables.yml +++ b/build/build-variables.yml @@ -3,7 +3,7 @@ # Variables used during builds. variables: - NET_CORE_SDK: 5.0.x + NET_CORE_SDK: 6.0.x DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - TEST_TARGETFRAMEWORK: net5.0 + TEST_TARGETFRAMEWORK: net6.0 buildConfiguration: Release \ No newline at end of file diff --git a/build/templates/test-job-template.yml b/build/templates/test-job-template.yml index 50bef117a7..85060e6a1a 100644 --- a/build/templates/test-job-template.yml +++ b/build/templates/test-job-template.yml @@ -6,6 +6,10 @@ parameters: - name: projects steps: +- task: UseDotNet@2 + displayName: 'Use .NET Core sdk $(NET_CORE_SDK)' + inputs: + version: $(NET_CORE_SDK) - task: DownloadPipelineArtifact@2 inputs: displayName: Download Build artifacts diff --git a/common b/common index 2af3bd023d..f8137957e7 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 2af3bd023d5204c397ee94e7c24c3da065a70e53 +Subproject commit f8137957e727c305264c6ab9ad8fe36d30512d97 diff --git a/src/Benchmarks/Benchmarks.csproj b/src/Benchmarks/Benchmarks.csproj index 18c6bc7777..91087db3e5 100644 --- a/src/Benchmarks/Benchmarks.csproj +++ b/src/Benchmarks/Benchmarks.csproj @@ -2,14 +2,14 @@ Exe - net5.0 + net6.0 Benchmarks Firely.Sdk.Benchmarks Firely.Sdk.Benchmarks - + diff --git a/src/Hl7.Fhir.Core.Tests/Hl7.Fhir.Core.Tests.csproj b/src/Hl7.Fhir.Core.Tests/Hl7.Fhir.Core.Tests.csproj index d8e1b64d86..fc8e28443d 100644 --- a/src/Hl7.Fhir.Core.Tests/Hl7.Fhir.Core.Tests.csproj +++ b/src/Hl7.Fhir.Core.Tests/Hl7.Fhir.Core.Tests.csproj @@ -1,7 +1,5 @@  - - @@ -40,7 +38,4 @@ - - - \ No newline at end of file diff --git a/src/Hl7.Fhir.Core/Hl7.Fhir.Core.csproj b/src/Hl7.Fhir.Core/Hl7.Fhir.Core.csproj index 9ebf131684..deec9019f2 100644 --- a/src/Hl7.Fhir.Core/Hl7.Fhir.Core.csproj +++ b/src/Hl7.Fhir.Core/Hl7.Fhir.Core.csproj @@ -1,13 +1,8 @@  - - net5.0;net452;netstandard2.0 - - - Hl7.Fhir.STU3 HL7 FHIR Core support SDK for STU3 @@ -24,7 +19,7 @@ - + @@ -33,7 +28,5 @@ - - - + \ No newline at end of file diff --git a/src/Hl7.Fhir.ElementModel.Tests/Hl7.Fhir.ElementModel.Tests.csproj b/src/Hl7.Fhir.ElementModel.Tests/Hl7.Fhir.ElementModel.Tests.csproj index ae2b123d39..af7ad56589 100644 --- a/src/Hl7.Fhir.ElementModel.Tests/Hl7.Fhir.ElementModel.Tests.csproj +++ b/src/Hl7.Fhir.ElementModel.Tests/Hl7.Fhir.ElementModel.Tests.csproj @@ -1,7 +1,5 @@  - - @@ -33,7 +31,4 @@ - - - \ No newline at end of file diff --git a/src/Hl7.Fhir.Serialization.Tests/Hl7.Fhir.Serialization.Tests.csproj b/src/Hl7.Fhir.Serialization.Tests/Hl7.Fhir.Serialization.Tests.csproj index e07faf0e2c..b530c467eb 100644 --- a/src/Hl7.Fhir.Serialization.Tests/Hl7.Fhir.Serialization.Tests.csproj +++ b/src/Hl7.Fhir.Serialization.Tests/Hl7.Fhir.Serialization.Tests.csproj @@ -1,7 +1,5 @@  - - @@ -49,7 +47,4 @@ - - - \ No newline at end of file diff --git a/src/Hl7.Fhir.Specification.Tests/Hl7.Fhir.Specification.Tests.csproj b/src/Hl7.Fhir.Specification.Tests/Hl7.Fhir.Specification.Tests.csproj index 2b1c3bac03..7935d3e280 100644 --- a/src/Hl7.Fhir.Specification.Tests/Hl7.Fhir.Specification.Tests.csproj +++ b/src/Hl7.Fhir.Specification.Tests/Hl7.Fhir.Specification.Tests.csproj @@ -1,7 +1,5 @@ - + - - @@ -23,10 +21,6 @@ - - - - PreserveNewest @@ -45,12 +39,4 @@ - - \ No newline at end of file diff --git a/src/Hl7.Fhir.Specification/Hl7.Fhir.Specification.csproj b/src/Hl7.Fhir.Specification/Hl7.Fhir.Specification.csproj index c4a92a8eda..1cc7fb3bae 100644 --- a/src/Hl7.Fhir.Specification/Hl7.Fhir.Specification.csproj +++ b/src/Hl7.Fhir.Specification/Hl7.Fhir.Specification.csproj @@ -1,10 +1,6 @@  - - net5.0;net452;netstandard2.0 - - Hl7.Fhir.Specification.STU3 @@ -29,32 +25,23 @@ + - - - - - - - PreserveNewest + + specification.zip + Always contentFiles\any\any true true - - + + - - - - - - - + \ No newline at end of file diff --git a/src/firely-net-sdk-tests.props b/src/firely-net-sdk-tests.props index f83ed02096..9433988fb0 100644 --- a/src/firely-net-sdk-tests.props +++ b/src/firely-net-sdk-tests.props @@ -1,6 +1,6 @@ - net5.0 + net6.0 @@ -18,15 +18,15 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -34,6 +34,15 @@ ..\..\lib\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll - + + + + True + true + ..\FhirNetApi.publickey + False + + 1591 + diff --git a/src/firely-net-sdk.props b/src/firely-net-sdk.props index fa0b7a7b13..3f5e92e6ec 100644 --- a/src/firely-net-sdk.props +++ b/src/firely-net-sdk.props @@ -1,55 +1,61 @@ - - - - 4.0.0 - alpha - Firely (info@fire.ly) and contributors - Firely (https://fire.ly) - Copyright 2013-2021 Firely. Contains materials (C) HL7 International - https://github.com/FirelyTeam/firely-net-sdk - https://github.com/FirelyTeam/firely-net-sdk - git - icon-fhir-32.png - See https://github.com/FirelyTeam/firely-net-sdk/releases - LICENSE - false - - - - + + 4.0.0 + alpha + Firely (info@fire.ly) and contributors + Firely (https://fire.ly) + Copyright 2013-2021 Firely. Contains materials (C) HL7 International + https://github.com/FirelyTeam/firely-net-sdk + https://github.com/FirelyTeam/firely-net-sdk + git + icon-fhir-32.png + See https://github.com/FirelyTeam/firely-net-sdk/releases + LICENSE + README.md + false + + + + - CS4014 - - - - - - - - - - 9.0 - True - Debug;Release;FullDebug - - - - portable - True - 1591 - false - $(DefineConstants);DEBUG;TRACE - - - - True - true - ..\FhirNetApi.publickey - True - False - snupkg - 1591 - + CS4014 + + + + + + + + + + + 9.0 + True + Debug;Release;FullDebug + + + + portable + True + 1591 + false + $(DefineConstants);DEBUG;TRACE + + + + True + true + ..\FhirNetApi.publickey + True + False + snupkg + 1591 + diff --git a/src/firely-net-sdk.targets b/src/firely-net-sdk.targets deleted file mode 100644 index 4a43d147a6..0000000000 --- a/src/firely-net-sdk.targets +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - /logger:Appveyor - /TestCaseFilter:"TestCategory!=IntegrationTest&TestCategory!=FhirClient" - - - - - - - <_TestTargetFramework Include="$(TargetFrameworks)" /> - - - - - - - - - - - - - <_VSTestFramework>%(_TestTargetFramework.Identity) - - - <_VSTestFrameworkString>.NETFramework,Version=v4.5 - - - <_VSTestFrameworkString>.NETFramework,Version=v4.5.2 - - - <_VSTestFrameworkString>.NETFramework,Version=v4.0 - - - <_VSTestFrameworkString>.NETCoreApp,Version=v2.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file