FirelyTeam · marcovisserFurore · Dec 8, 2021 · Oct 19, 2021 · Oct 19, 2021 · Oct 19, 2021
diff --git 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}"
@@ -47,7 +45,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HL7.FhirPath.Tests", "commo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hl7.Fhir.Support.Poco.Tests", "common\src\Hl7.Fhir.Support.Poco.Tests\Hl7.Fhir.Support.Poco.Tests.csproj", "{88E59825-ADF2-4B46-892F-BCC95B68559F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarks", "src\Benchmarks\Benchmarks.csproj", "{B28A75F1-AC9A-4CC9-9F6B-3DB78BAF7D8E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "src\Benchmarks\Benchmarks.csproj", "{B28A75F1-AC9A-4CC9-9F6B-3DB78BAF7D8E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git 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
diff --git 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
diff --git a/src/Benchmarks/Benchmarks.csproj b/src/Benchmarks/Benchmarks.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
 
-  <Import Project="..\firely-net-sdk.props" />
-  <Import Project="..\firely-net-sdk.targets" />
   <Import Project="..\firely-net-sdk-tests.props" />
 
   <PropertyGroup>
@@ -40,7 +38,4 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
 </Project>
diff --git a/src/Hl7.Fhir.Core/Hl7.Fhir.Core.csproj b/src/Hl7.Fhir.Core/Hl7.Fhir.Core.csproj
@@ -1,13 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-	<PropertyGroup>
-		<TargetFrameworks>net5.0;net452;netstandard2.0</TargetFrameworks>
-	</PropertyGroup>
 
 	<Import Project="..\firely-net-sdk.props" />
-	<Import Project="..\firely-net-sdk.targets" />
 	<Import Project="..\platforms.props" />
 
-
 	<PropertyGroup>
 		<PackageId>Hl7.Fhir.STU3</PackageId>
 		<Title>HL7 FHIR Core support SDK for STU3</Title>
@@ -24,7 +19,7 @@
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net452'">
 		<Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Net.Http"/>
+    <Reference Include="System.Net.Http" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -33,7 +28,5 @@
 		<ProjectReference Include="..\..\common\src\Hl7.Fhir.Support.Poco\Hl7.Fhir.Support.Poco.csproj" />
 		<ProjectReference Include="..\..\common\src\Hl7.FhirPath\Hl7.FhirPath.csproj" />
 	</ItemGroup>
-	<ItemGroup>
-		<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-	</ItemGroup>
+
 </Project>
diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\firely-net-sdk.props" />
-  <Import Project="..\firely-net-sdk.targets" />
   <Import Project="..\firely-net-sdk-tests.props" />
 
   <PropertyGroup>
@@ -33,7 +31,4 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
 </Project>
diff --git 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\firely-net-sdk.props" />
-  <Import Project="..\firely-net-sdk.targets" />
   <Import Project="..\firely-net-sdk-tests.props" />
 
   <PropertyGroup>
@@ -49,7 +47,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
 </Project>
diff --git 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 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
 
-  <Import Project="..\firely-net-sdk.props" />
-  <Import Project="..\firely-net-sdk.targets" />
   <Import Project="..\firely-net-sdk-tests.props"/>
 
   <PropertyGroup>
@@ -23,10 +21,6 @@
       <PackageReference Include="System.AppContext" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="TestData\**\*.xml;TestData\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -45,12 +39,4 @@
     </Content>
   </ItemGroup>  
 
-  <!-- Necessary to make the Test Explorer find the tests in this assembly 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugType>pdbonly</DebugType>
-  </PropertyGroup> -->
-
 </Project>
diff --git a/src/Hl7.Fhir.Specification/Hl7.Fhir.Specification.csproj b/src/Hl7.Fhir.Specification/Hl7.Fhir.Specification.csproj
@@ -1,10 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-	<PropertyGroup>
-		<TargetFrameworks>net5.0;net452;netstandard2.0</TargetFrameworks>
-	</PropertyGroup>
 
 	<Import Project="..\firely-net-sdk.props" />
-	<Import Project="..\firely-net-sdk.targets" />
 
 	<PropertyGroup>
 		<PackageId>Hl7.Fhir.Specification.STU3</PackageId>
@@ -25,31 +21,22 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
-		<Reference Include="System.Net.Http"/>
-	</ItemGroup>
-
-	<ItemGroup>
-		<FhirConformance Include="data\*.*" />
+		<Reference Include="System.Net.Http" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<Content Include="specification.zip">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		<Content Include="$(BaseIntermediateOutputPath)\specification.zip" >
+			<Link>specification.zip</Link>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 			<PackagePath>contentFiles\any\any</PackagePath>
 			<PackageCopyToOutput>true</PackageCopyToOutput>
 			<PackageFlatten>true</PackageFlatten>
 		</Content>
 	</ItemGroup>
-
-	<Target Name="CreateSpecZip" Inputs="@(FhirConformance)" Outputs="specification.zip" BeforeTargets="Compile">
+	
+	<Target Name="CreateSpecZip" BeforeTargets="DispatchToInnerBuilds">
 		<Message Text="(Re)creating specification.zip" />
-		<Delete Files="specification.zip" />
-		<!-- <CleanSpecFiles DirectoryName="data" /> -->
-		<ZipDirectory SourceDirectory="data" DestinationFile="specification.zip" />
-	</Target>
-
-	<Target Name="CleanSpecZip" AfterTargets="Clean">
-		<Delete Files="specification.zip" />
+		<ZipDirectory SourceDirectory="data" DestinationFile="$(BaseIntermediateOutputPath)\specification.zip" Overwrite="true" />
 	</Target>
 
 </Project>
diff --git a/src/firely-net-sdk-tests.props b/src/firely-net-sdk-tests.props
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<TargetFrameworks>net5.0</TargetFrameworks>
+		<TargetFrameworks>net6.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -18,22 +18,31 @@
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' != 'net40'">
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-		<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+		<PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
+		<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
 		<PackageReference Include="xunit" Version="2.4.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="FluentAssertions" Version="5.10.3" />
+		<PackageReference Include="FluentAssertions" Version="6.1.0" />
 		<PackageReference Include="Moq" Version="4.16.1" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
 		<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
 			<HintPath>..\..\lib\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
 		</Reference>
-	</ItemGroup>	
+	</ItemGroup>
+
+	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+		<SignAssembly>True</SignAssembly>
+		<DelaySign>true</DelaySign>
+		<AssemblyOriginatorKeyFile>..\FhirNetApi.publickey</AssemblyOriginatorKeyFile>
+		<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+		<!-- Missing XML comments -->
+		<NoWarn>1591</NoWarn>
+	</PropertyGroup>
 </Project>
 
diff --git a/src/firely-net-sdk.props b/src/firely-net-sdk.props
@@ -1,55 +1,61 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- Solution-wide properties for NuGet packaging -->
-  <PropertyGroup>
-    <VersionPrefix>4.0.0</VersionPrefix>
-    <VersionSuffix>alpha</VersionSuffix>
-    <Authors>Firely (info@fire.ly) and contributors</Authors>
-    <Company>Firely (https://fire.ly)</Company>
-    <Copyright>Copyright 2013-2021 Firely.  Contains materials (C) HL7 International</Copyright>
-    <PackageProjectUrl>https://github.com/FirelyTeam/firely-net-sdk</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/FirelyTeam/firely-net-sdk</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageIcon>icon-fhir-32.png</PackageIcon>
-    <PackageReleaseNotes>See https://github.com/FirelyTeam/firely-net-sdk/releases</PackageReleaseNotes>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <RunFhirPathTests>false</RunFhirPathTests> <!-- Used for CI/CD pipelines -->
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- Error	CS4014	Because this call is not awaited, execution of the current method continues before the call is completed. 
+
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net452;netstandard2.0</TargetFrameworks>
+	</PropertyGroup>
+
+	<!-- Solution-wide properties for NuGet packaging -->
+	<PropertyGroup>
+		<VersionPrefix>4.0.0</VersionPrefix>
+		<VersionSuffix>alpha</VersionSuffix>
+		<Authors>Firely (info@fire.ly) and contributors</Authors>
+		<Company>Firely (https://fire.ly)</Company>
+		<Copyright>Copyright 2013-2021 Firely.  Contains materials (C) HL7 International</Copyright>
+		<PackageProjectUrl>https://github.com/FirelyTeam/firely-net-sdk</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/FirelyTeam/firely-net-sdk</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<PackageIcon>icon-fhir-32.png</PackageIcon>
+		<PackageReleaseNotes>See https://github.com/FirelyTeam/firely-net-sdk/releases</PackageReleaseNotes>
+		<PackageLicenseFile>LICENSE</PackageLicenseFile>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+        <RunFhirPathTests>false</RunFhirPathTests> <!-- Used for CI/CD pipelines -->
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<!-- Error	CS4014	Because this call is not awaited, execution of the current method continues before the call is completed. 
     Consider applying the 'await' operator to the result of the call.	-->
-    <WarningsAsErrors>CS4014</WarningsAsErrors>       
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="..\..\LICENSE" Pack="true" PackagePath=""/>
-    <None Include="..\..\icon-fhir-32.png" Pack="true" PackagePath=""/>
-  </ItemGroup>
-
-  <!-- Compiler settings -->
-  <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <Configurations>Debug;Release;FullDebug</Configurations>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'FullDebug'  ">
-     <DebugType>portable</DebugType>
-     <DebugSymbols>True</DebugSymbols>
-     <NoWarn>1591</NoWarn>
-     <Optimize>false</Optimize>
-     <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <SignAssembly>True</SignAssembly>
-    <DelaySign>true</DelaySign>
-    <AssemblyOriginatorKeyFile>..\FhirNetApi.publickey</AssemblyOriginatorKeyFile>
-    <IncludeSymbols>True</IncludeSymbols>
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <NoWarn>1591</NoWarn> <!-- Missing XML comments -->
-  </PropertyGroup>
+		<WarningsAsErrors>CS4014</WarningsAsErrors>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="..\..\LICENSE" Pack="true" PackagePath=""/>
+		<None Include="..\..\icon-fhir-32.png" Pack="true" PackagePath=""/>
+		<None Include="..\..\README.md" Pack="true" PackagePath=""/>
+	</ItemGroup>
+
+	<!-- Compiler settings -->
+	<PropertyGroup>
+		<LangVersion>9.0</LangVersion>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<Configurations>Debug;Release;FullDebug</Configurations>
+	</PropertyGroup>
+
+	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'FullDebug'  ">
+		<DebugType>portable</DebugType>
+		<DebugSymbols>True</DebugSymbols>
+		<NoWarn>1591</NoWarn>
+		<Optimize>false</Optimize>
+		<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
+	</PropertyGroup>
+
+	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+		<SignAssembly>True</SignAssembly>
+		<DelaySign>true</DelaySign>
+		<AssemblyOriginatorKeyFile>..\FhirNetApi.publickey</AssemblyOriginatorKeyFile>
+		<IncludeSymbols>True</IncludeSymbols>
+		<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <NoWarn>1591</NoWarn> <!-- Missing XML comments -->
+	</PropertyGroup>
 </Project>