Merge pull request #15 from hl7au/10-target-framework-net70-is-unsupported-upgrade

10 target framework net70 is unsupported upgrade

Author: ir4y

.github/workflows/dotnet.yml

@@ -43,7 +43,7 @@ jobs:
                --os ${{ matrix.os }} \
                --configuration Release \
                -p:PublishSingleFile=True \
-               --framework net70 \
+               --framework net80 \
                --self-contained true \
                --output "Sparked.${{ matrix.program }}-${{ matrix.os }}-${{ matrix.arch }}Output"
     - name: Archive production artifacts

.gitignore

@@ -9,5 +9,6 @@
 /*.log
 */dist/*
 /xls-converter/xls_converter/__pycache__/
+/out/
 Sparked.Csv2FhirMapping/test/Csv2FhirMapping-linux-arm64-binaries/*
 Sparked.Csv2FhirMapping/test/Csv2FhirMapping-linux-arm64.zip

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "fhir-net-mappinglanguage"]
-	path = fhir-net-mappinglanguage
-	url = https://github.com/brianpos/fhir-net-mappinglanguage.git
-	branch = develop-r4b

.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>au-fhir-test-data-utils</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

BuildCsvFhirMapping.bat

@@ -0,0 +1 @@
+dotnet publish Sparked.Csv2FhirMapping\Sparked.Csv2FhirMapping.csproj -r win-x64 -c Release -p:PublishSingleFile=True --self-contained false --output "out/Sparked.Csv2FhirMapping"

BuildTestDataClient.bat

@@ -0,0 +1 @@
+dotnet publish Sparked.TestDataClient\Sparked.TestDataClient.csproj -r win-x64 -c Release -p:PublishSingleFile=True --self-contained false --output "out/Sparked.TestDataClient"

Sparked.Csv2FhirMapping/Properties/launchSettings.json

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net70</TargetFramework>
+    <TargetFramework>net80</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
@@ -10,20 +10,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Hl7.Fhir.R4B" Version="5.3.0" />
-    <PackageReference Include="Hl7.Fhir.Specification.R4B" Version="5.3.0" />
-    <PackageReference Include="Hl7.Fhir.Validation.Legacy.R4B" Version="5.3.0" />
-    <PackageReference Include="Hl7.Fhir.Specification.Data.R4B" Version="5.3.0" />
-    <PackageReference Include="Firely.Fhir.Packages" Version="4.2.0" />
+    <PackageReference Include="Hl7.Fhir.R4B" Version="5.11.1" />
+    <PackageReference Include="Hl7.Fhir.Specification.R4B" Version="5.11.0" />
+    <PackageReference Include="Hl7.Fhir.Validation.Legacy.R4B" Version="5.11.0" />
+    <PackageReference Include="Hl7.Fhir.Specification.Data.R4B" Version="5.11.0" />
+    <PackageReference Include="Firely.Fhir.Packages" Version="4.9.0" />
+    <PackageReference Include="brianpos.Fhir.R4B.MappingLanguage" Version="5.10.2-beta3" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\fhir-net-mappinglanguage\Hl7.Fhir.MappingLanguage\Hl7.Fhir.MappingLanguage.csproj" />
-  </ItemGroup>
-
-
-  <ItemGroup>
-    <Content Update="C:\Users\heath\.nuget\packages\hl7.fhir.specification.data.r4b\5.3.0\contentFiles\any\any\specification.zip">
+    <Content Update="specification.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

Sparked.Csv2FhirMapping/Sparked.Csv2FhirMapping.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net70</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AssemblyName>TestDataClient</AssemblyName>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net80</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AssemblyName>TestDataClient</AssemblyName>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Hl7.Fhir.R4" Version="5.6.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Hl7.Fhir.R4B" Version="5.11.1" />
+    </ItemGroup>
 
 </Project>