Skip to content

Commit 35b8d69

Browse files
angusmillarangusmillar
committed
Clean up and rename references
1 parent db8c709 commit 35b8d69

8 files changed

Lines changed: 37 additions & 33 deletions

File tree

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SMART Health Card JWS token and QR code generation library #
22

3-
### An open-source *MIT License* .NET 6 library for encoding/decoding/validating FHIR SMART Health Card JWS tokens and generating their QR Codes
3+
### An open-source *MIT License* .NET 8 library for encoding/decoding/validating FHIR SMART Health Card JWS tokens and generating their QR Codes
44

55
 
66

@@ -20,19 +20,19 @@
2020
 
2121

2222
## Nuget Packages in this repository
23-
>SMART Health Card JWS token encoding, decoding & verifying: [SmartHealthCard.Token](https://www.nuget.org/packages/SmartHealthCard.Token/1.0.4)
23+
>SMART Health Card JWS token encoding, decoding & verifying: [SmartHealthCard.Token](https://www.nuget.org/packages/SmartHealthCard.Token)
2424
```
25-
Install-Package SmartHealthCard.Token -Version 6.0.0
25+
Install-Package SmartHealthCard.Token -Version 8.0.0
2626
```
2727

28-
>SMART Health Card QR Code image encoding, decoding to JWS: [SmartHealthCard.QRCode](https://www.nuget.org/packages/SmartHealthCard.QRCode/1.0.1)
28+
>SMART Health Card QR Code image encoding, decoding to JWS: [SmartHealthCard.QRCode](https://www.nuget.org/packages/SmartHealthCard.QRCode)
2929
```
30-
Install-Package SmartHealthCard.QRCode -Version 6.0.0
30+
Install-Package SmartHealthCard.QRCode -Version 8.0.0
3131
```
3232

3333
 
3434

35-
## Switch from Bitmap to SKData datatypes for QR Code image files with .NET 6 update
35+
## From the .NET 6 onward using SKData datatype in place of Bitmap for QR Code image files
3636
As the System.Drawing.Common NuGet package is now attributed as a Windows-specific library, and it can no longer be used in multi-platform libraries. This library's SmartHealthCard.QRCode project has switched to the SkiaSharp library and its SKData datatype for the QR Code images rather than the older Bitmap datatype. You can read more about this change from Microsoft here: [System.Drawing.Common only supported on Windows](https://docs.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/6.0/system-drawing-common-windows-only)
3737
The SHC.EncoderDemo below shows the use of this new datatype.
3838

‎SmartHealthCard.DecoderDemo/SmartHealthCard.DecoderDemo.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<LangVersion>12</LangVersion>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
10+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1011
</ItemGroup>
1112

1213
<ItemGroup>

‎SmartHealthCard.EncoderDemo/SmartHealthCard.EncoderDemo.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<LangVersion>12</LangVersion>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
10-
<PackageReference Include="SkiaSharp" Version="2.80.3" />
10+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
11+
<PackageReference Include="SkiaSharp" Version="2.88.6" />
1112
</ItemGroup>
1213

1314
<ItemGroup>

‎SmartHealthCard.JwksApi/SmartHealthCard.JwksApi.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
7+
<LangVersion>12</LangVersion>
78
</PropertyGroup>
89

910
<ItemGroup>
10-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
11+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
1112
</ItemGroup>
1213

1314
<ItemGroup>

‎SmartHealthCard.QRCode/SmartHealthCard.QRCode.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
6-
<Version>6.0.0</Version>
6+
<Version>8.0.0</Version>
77
<Authors>Angus Millar</Authors>
88
<Description>FHIR SMART Health Card JWS token QR Code encoder libaray</Description>
99
<Company>PyroHealth</Company>
@@ -12,16 +12,17 @@
1212
<RepositoryUrl>https://github.com/angusmillar/SmartHealthCard</RepositoryUrl>
1313
<RepositoryType>git</RepositoryType>
1414
<PackageTags>SmartHealthCard JWS JWT FHIR covid19 immunization laboratory VerifiableCredential</PackageTags>
15-
<PackageReleaseNotes>Update to .NET 6. With .NET 6 the System.Drawing.Common libaray has moved to windows only support. To allow cross-platform support this SmartHealthCare.QRCode libaray now replaced that libaray with SkiaSharp as per the Microsoft advice found here: https://docs.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/6.0/system-drawing-common-windows-only . This now means that Bitmap typed objects are no loner retruned for the QRCode image files, rather SKBitmap types are now retuned. However their use is much the same, see the SmartHealthCard.EncoderDemo for an example of their use. </PackageReleaseNotes>
15+
<PackageReleaseNotes>Dot NET 8 Update</PackageReleaseNotes>
1616
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1717
<PackageIcon>128-x-128-Pyro-Icon.jpg</PackageIcon>
1818
<PackageIconUrl />
19+
<LangVersion>12</LangVersion>
1920
</PropertyGroup>
2021

2122
<ItemGroup>
22-
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.0.1" />
23-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
24-
<PackageReference Include="SkiaSharp" Version="2.80.3" />
23+
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.0.4" />
24+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
25+
<PackageReference Include="SkiaSharp" Version="2.88.6" />
2526
</ItemGroup>
2627

2728
<ItemGroup>

‎SmartHealthCard.Test/SmartHealthCard.Test.csproj‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
7+
8+
<LangVersion>12</LangVersion>
79
</PropertyGroup>
810

911
<ItemGroup>
10-
<PackageReference Include="Hl7.Fhir.R4" Version="3.8.1" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
12-
<PackageReference Include="Moq" Version="4.17.1" />
13-
<PackageReference Include="xunit" Version="2.4.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
12+
<PackageReference Include="Hl7.Fhir.R4" Version="5.4.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
14+
<PackageReference Include="Moq" Version="4.20.69" />
15+
<PackageReference Include="xunit" Version="2.6.2" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
1517
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1618
<PrivateAssets>all</PrivateAssets>
1719
</PackageReference>
18-
<PackageReference Include="coverlet.collector" Version="3.1.2">
20+
<PackageReference Include="coverlet.collector" Version="6.0.0">
1921
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2022
<PrivateAssets>all</PrivateAssets>
2123
</PackageReference>

‎SmartHealthCard.Token/SmartHealthCard.Token.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Project Sdk="Microsoft.NET.Sdk">
44

55
<PropertyGroup>
6-
<TargetFramework>net6.0</TargetFramework>
6+
<TargetFramework>net8.0</TargetFramework>
77
<Nullable>enable</Nullable>
88
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
99
<Authors>Angus Millar</Authors>
@@ -14,16 +14,17 @@
1414
<RepositoryUrl>https://github.com/angusmillar/SmartHealthCard</RepositoryUrl>
1515
<RepositoryType>git</RepositoryType>
1616
<PackageTags>SmartHealthCard Smart Health Card JWS JWT FHIR covid19 immunization laboratory VerifiableCredential Verifiable Credential</PackageTags>
17-
<PackageReleaseNotes>Updated to .NET 6</PackageReleaseNotes>
17+
<PackageReleaseNotes>Dot NET 8 Update</PackageReleaseNotes>
1818
<NeutralLanguage>en</NeutralLanguage>
1919
<AssemblyVersion>1.0.0.0</AssemblyVersion>
2020
<FileVersion>1.0.0.0</FileVersion>
21-
<Version>6.0.0</Version>
21+
<Version>8.0.0</Version>
2222
<PackageIcon>128-x-128-Pyro-Icon.jpg</PackageIcon>
23+
<LangVersion>12</LangVersion>
2324
</PropertyGroup>
2425

2526
<ItemGroup>
26-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
27+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2728
</ItemGroup>
2829

2930
<ItemGroup>

‎SmartHealthCard.sln‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
ProjectSection(SolutionItems) = preProject
1414
.gitignore = .gitignore
1515
128-x-128-Pyro-Icon.jpg = 128-x-128-Pyro-Icon.jpg
16-
ReadMe.angus = ReadMe.angus
1716
README.md = README.md
1817
ReadmeNugetPublish.txt = ReadmeNugetPublish.txt
1918
ReadMeOpenSSLCreateECCkeys.txt = ReadMeOpenSSLCreateECCkeys.txt
20-
RevocationScreenshot 2021-11-24 103711.png = RevocationScreenshot 2021-11-24 103711.png
21-
Todo.txt = Todo.txt
2219
EndProjectSection
2320
EndProject
2421
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartHealthCard.EncoderDemo", "SmartHealthCard.EncoderDemo\SmartHealthCard.EncoderDemo.csproj", "{9207F04B-A1C8-47FE-8F7D-7D6C2780A159}"

0 commit comments

Comments
 (0)