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

10 target framework net70 is unsupported upgrade #15

Merged
merged 5 commits into from
Feb 9, 2025
Merged
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 .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
[submodule "fhir-net-mappinglanguage"]
path = fhir-net-mappinglanguage
url = https://github.com/brianpos/fhir-net-mappinglanguage.git
branch = develop-r4b
11 changes: 11 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions BuildCsvFhirMapping.bat
Original file line number Diff line number Diff line change
@@ -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"
1 change: 1 addition & 0 deletions BuildTestDataClient.bat
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 0 additions & 8 deletions Sparked.Csv2FhirMapping/Properties/launchSettings.json

This file was deleted.

20 changes: 8 additions & 12 deletions Sparked.Csv2FhirMapping/Sparked.Csv2FhirMapping.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net70</TargetFramework>
<TargetFramework>net80</TargetFramework>

<IsPackable>false</IsPackable>
<OutputType>Exe</OutputType>
Expand All @@ -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>
Expand Down
39 changes: 0 additions & 39 deletions Sparked.Csv2FhirMapping/Sparked.Csv2FhirMapping.sln

This file was deleted.

8 changes: 0 additions & 8 deletions Sparked.TestDataClient/Properties/launchSettings.json

This file was deleted.

20 changes: 10 additions & 10 deletions Sparked.TestDataClient/Sparked.TestDataClient.csproj
Original file line number Diff line number Diff line change
@@ -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" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@heathfrankel could you please advice here?

May update to r4b cause some possible issues?
As far as I know au-core is based on r4.

</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion fhir-net-mappinglanguage
Submodule fhir-net-mappinglanguage deleted from 8a18a5
Loading