Skip to content

Commit e771387

Browse files
milkshakeukmilkshakeuk
authored
Merge pull request #222 from nHapiNET/v3-prep
Preparation for V3 release
2 parents 7858f88 + 15cb4ff commit e771387

File tree

23 files changed

+274
-126
lines changed

23 files changed

+274
-126
lines changed

‎.github/workflows/build-status.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET Core
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: 3.1.409
18+
dotnet-version: 5.0.301
1919

2020
- name: Restore nHapi
2121
run: |
@@ -46,7 +46,7 @@ jobs:
4646
- name: Setup .NET Core
4747
uses: actions/setup-dotnet@v1
4848
with:
49-
dotnet-version: 3.1.409
49+
dotnet-version: 5.0.301
5050

5151
- name: Restore nHapi
5252
run: |

‎.github/workflows/receive-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup .NET Core
1414
uses: actions/setup-dotnet@v1
1515
with:
16-
dotnet-version: 3.1.409
16+
dotnet-version: 5.0.301
1717
- name: Restore nHapi
1818
run: |
1919
dotnet restore nHapi.sln --configfile build\.nuget\NuGet.config
@@ -56,7 +56,7 @@ jobs:
5656
- name: Setup .NET Core
5757
uses: actions/setup-dotnet@v1
5858
with:
59-
dotnet-version: 3.1.409
59+
dotnet-version: 5.0.301
6060

6161
- name: Restore nHapi
6262
run: |

‎build/default.ps1‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ properties {
99
"NHapi.Base",
1010
"NHapi.Model.V21",
1111
"NHapi.Model.V22",
12-
"NHapi.Model.V22_ZSegments",
1312
"NHapi.Model.V23",
1413
"NHapi.Model.V24",
1514
"NHapi.Model.V25",
@@ -85,7 +84,11 @@ Task Package -depends Build {
8584
Copy-Item "..\src\$project\bin\Release\netstandard2.0\*.xml" ..\dist\netstandard2.0
8685
}
8786

88-
Exec { .nuget\nuget pack .\nHapi.v2.nuspec -OutputDirectory ..\dist }
87+
Exec { .nuget\nuget pack .\nHapi.v3.nuspec -OutputDirectory ..\dist }
88+
89+
foreach($project in $projects) {
90+
Exec { dotnet pack "..\src\$project\$project.csproj" -c Release --no-build --no-restore -o "..\dist" }
91+
}
8992
}
9093

9194
Task Deploy -depends Package {

build/nHapi.v2.nuspec renamed to build/nHapi.v3.nuspec

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>nHapi</id>
5-
<version>3.0.0-preview.3</version>
5+
<version>3.0.0</version>
66
<authors>Chad Chenoweth, Duane Edwards</authors>
77
<license type="expression">MPL-2.0</license>
88
<projectUrl>https://github.com/nHapiNET/nHapi</projectUrl>
@@ -13,21 +13,22 @@
1313
NHapi allows Microsoft .NET developers to easily use an HL7 2.x object model. This object model allows for parsing and encoding HL7 2.x data to/from Pipe Delimited or XML formats. A very handy program for use in the health care industry.
1414

1515
This project is NOT affiliated with the HL7 organization. This software just conforms to the HL7 2.x specifications.</description>
16-
<releaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v3.0.0-preview.3</releaseNotes>
16+
<releaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v3.0.0</releaseNotes>
1717
<tags>HL7 parsing healthcare HAPI xml</tags>
1818
<readme>docs\README.md</readme>
19-
<dependencies>
20-
<group targetFramework=".NETStandard2.0">
21-
<dependency id="NETStandard.Library" version="2.0.0" />
22-
<dependency id="System.Configuration.ConfigurationManager" version="5.0.0" />
23-
</group>
24-
<group targetFramework=".NETFramework3.5" />
25-
</dependencies>
19+
<dependencies>
20+
<group targetFramework=".NETStandard2.0">
21+
<dependency id="System.Configuration.ConfigurationManager" version="5.0.0" />
22+
</group>
23+
<group targetFramework=".NETFramework3.5" />
24+
</dependencies>
25+
<frameworkAssemblies>
26+
<frameworkAssembly assemblyName="System.Configuration" targetFramework=".NETFramework3.5" />
27+
</frameworkAssemblies>
2628
</metadata>
2729
<files>
28-
<file src="..\dist\netstandard2.0\*.*" target="lib\netstandard2.0" />
29-
<file src="..\dist\net35\*.*" target="lib\net35" />
30+
<file src="..\dist\netstandard2.0\*.*" exclude="*V22_ZSegments.*" target="lib\netstandard2.0" />
31+
<file src="..\dist\net35\*.*" exclude="*V22_ZSegments.*" target="lib\net35" />
3032
<file src="..\README.md" target="docs\" />
31-
<file src="..\CHANGELOG.md" target="docs\" />
3233
</files>
3334
</package>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "3.1.409",
3+
"version": "5.0.301",
44
"rollForward": "latestFeature"
55
},
66
"projects": []

‎src/ModelGenerator/ModelGenerator.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net35;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net35;net5.0</TargetFrameworks>
66
<AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
</PropertyGroup>
@@ -47,14 +47,14 @@
4747
</ItemGroup>
4848

4949
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
50-
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
50+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net35" Version="1.0.2">
51+
<PrivateAssets>all</PrivateAssets>
52+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
53+
</PackageReference>
5154
</ItemGroup>
5255

5356
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
54-
<Reference Include="System" />
5557
<Reference Include="System.configuration" />
56-
<Reference Include="System.Data" />
57-
<Reference Include="System.Xml" />
5858
</ItemGroup>
5959

6060
</Project>

‎src/NHapi.Base/NHapi.Base.csproj‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
<PropertyGroup>
44
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
6+
<PackageId>nHapi.Base</PackageId>
7+
<PackageVersion>3.0.0</PackageVersion>
8+
<Authors>Chad Chenoweth;Duane Edwards</Authors>
9+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10+
<PackageProjectUrl>https://github.com/nHapiNET/nHapi</PackageProjectUrl>
11+
<RepositoryUrl>https://github.com/nHapiNET/nHapi.git</RepositoryUrl>
12+
<Description>The core components for parsing/encoding HL7 messages. Contains the base classes and interfaces for datatypes, segments, and messages.</Description>
13+
<PackageTags>HL7;parsing;healthcare;HAPI;xml</PackageTags>
14+
<PackageReleaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v3.0.0</PackageReleaseNotes>
15+
<PackageReadmeFile>docs\README.md</PackageReadmeFile>
616
<AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
717
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
818
<NoWarn>1591</NoWarn>
@@ -16,6 +26,10 @@
1626
<None Include="..\..\NHapi.snk" Link="NHapi.snk" />
1727
</ItemGroup>
1828

29+
<ItemGroup>
30+
<None Include="..\..\README.md" Pack="true" PackagePath="\docs\" />
31+
</ItemGroup>
32+
1933
<ItemGroup>
2034
<Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
2135
</ItemGroup>
@@ -25,14 +39,14 @@
2539
</ItemGroup>
2640

2741
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
28-
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
42+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net35" Version="1.0.2">
43+
<PrivateAssets>all</PrivateAssets>
44+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
45+
</PackageReference>
2946
</ItemGroup>
3047

3148
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
32-
<Reference Include="System" />
3349
<Reference Include="System.Configuration" />
34-
<Reference Include="System.Data" />
35-
<Reference Include="System.Xml" />
3650
</ItemGroup>
3751

3852
<ItemGroup>

‎src/NHapi.Model.V21/NHapi.Model.V21.csproj‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
<PropertyGroup>
44
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
6+
<PackageId>nHapi.Model.V21</PackageId>
7+
<PackageVersion>3.0.0</PackageVersion>
8+
<Authors>Chad Chenoweth;Duane Edwards</Authors>
9+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10+
<PackageProjectUrl>https://github.com/nHapiNET/nHapi</PackageProjectUrl>
11+
<RepositoryUrl>https://github.com/nHapiNET/nHapi.git</RepositoryUrl>
12+
<Description>Contains the data types, segments, and messages that follow the HL7 2.1 schema.</Description>
13+
<PackageTags>HL7;parsing;healthcare;HAPI;xml</PackageTags>
14+
<PackageReleaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v3.0.0</PackageReleaseNotes>
15+
<PackageReadmeFile>docs\README.md</PackageReadmeFile>
616
<AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
717
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
818
<NoWarn>1591</NoWarn>
@@ -12,6 +22,10 @@
1222
<None Include="..\..\NHapi.snk" Link="NHapi.snk" />
1323
</ItemGroup>
1424

25+
<ItemGroup>
26+
<None Include="..\..\README.md" Pack="true" PackagePath="\docs\" />
27+
</ItemGroup>
28+
1529
<ItemGroup>
1630
<Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
1731
</ItemGroup>
@@ -25,13 +39,10 @@
2539
</ItemGroup>
2640

2741
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
28-
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
29-
</ItemGroup>
30-
31-
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
32-
<Reference Include="System" />
33-
<Reference Include="System.Data" />
34-
<Reference Include="System.Xml" />
42+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net35" Version="1.0.2">
43+
<PrivateAssets>all</PrivateAssets>
44+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
45+
</PackageReference>
3546
</ItemGroup>
3647

3748
</Project>

‎src/NHapi.Model.V22/NHapi.Model.V22.csproj‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
<PropertyGroup>
44
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
6+
<PackageId>nHapi.Model.V22</PackageId>
7+
<PackageVersion>3.0.0</PackageVersion>
8+
<Authors>Chad Chenoweth;Duane Edwards</Authors>
9+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10+
<PackageProjectUrl>https://github.com/nHapiNET/nHapi</PackageProjectUrl>
11+
<RepositoryUrl>https://github.com/nHapiNET/nHapi.git</RepositoryUrl>
12+
<Description>Contains the data types, segments, and messages that follow the HL7 2.2 schema.</Description>
13+
<PackageTags>HL7;parsing;healthcare;HAPI;xml</PackageTags>
14+
<PackageReleaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v3.0.0</PackageReleaseNotes>
15+
<PackageReadmeFile>docs\README.md</PackageReadmeFile>
616
<AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
717
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
818
<NoWarn>1591</NoWarn>
@@ -12,6 +22,10 @@
1222
<None Include="..\..\NHapi.snk" Link="NHapi.snk" />
1323
</ItemGroup>
1424

25+
<ItemGroup>
26+
<None Include="..\..\README.md" Pack="true" PackagePath="\docs\" />
27+
</ItemGroup>
28+
1529
<ItemGroup>
1630
<Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
1731
</ItemGroup>
@@ -25,13 +39,10 @@
2539
</ItemGroup>
2640

2741
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
28-
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
29-
</ItemGroup>
30-
31-
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
32-
<Reference Include="System" />
33-
<Reference Include="System.Data" />
34-
<Reference Include="System.Xml" />
42+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net35" Version="1.0.2">
43+
<PrivateAssets>all</PrivateAssets>
44+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
45+
</PackageReference>
3546
</ItemGroup>
3647

3748
</Project>

‎src/NHapi.Model.V22_ZSegments/NHapi.Model.V22_ZSegments.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@
1818
</ItemGroup>
1919

2020
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
21-
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" />
22-
</ItemGroup>
23-
24-
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
25-
<Reference Include="System" />
26-
<Reference Include="System.Data" />
27-
<Reference Include="System.Xml" />
21+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net35" Version="1.0.2">
22+
<PrivateAssets>all</PrivateAssets>
23+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24+
</PackageReference>
2825
</ItemGroup>
2926

3027
</Project>

0 commit comments

Comments
 (0)