QRCoder: .NET 10, QRCoder 1.8.0, SVG renderer, thread-safe QrCodesDb

Retarget both projects to net10.0 and bump QRCoder to 1.8.0 and the test
packages. GeneratePng renders black on white again; the coloured call
moves to GeneratePngBranded. Add GenerateQRCodeSvg with SvgQRCode.
QrCodesDb uses ConcurrentDictionary with TryAdd. Drop the stray semicolon
on @model, switch to MapStaticAssets, and add PNG and SVG output tests.

Author: vladimir-pecanac-main

dotnet-client-libraries/QRCoder/QRCodeGeneratorWebSample/Controllers/HomeController.cs

@@ -14,9 +14,11 @@ public IActionResult Index()
         var qrCodes = new Dictionary<string, string>
         {
             { "Basic String", GenerateQRCodeString() },
+            { "SVG", GenerateQRCodeSvg() },
             { "URL", GenerateQRCodeURL() },
             { "Phone Number", GenerateQRCodePhoneNumber() },
-            { "Custom", GenerateQRCodeCustom() }
+            { "Custom", GenerateQRCodeCustom() },
+            { "Branded", GenerateQRCodeBranded() }
         };
 
         var model = new HomeModel(qrCodes);
@@ -25,7 +27,7 @@ public IActionResult Index()
     }
 
     private string GenerateQRCodeCustom()
-    {        
+    {
         const string key = "Custom";
 
         var raw = db.Get(key);
@@ -46,6 +48,15 @@ private string GenerateQRCodeString()
         return GeneratePng(qrCodeData);
     }
 
+    private string GenerateQRCodeSvg()
+    {
+        var qrCodeData = qrGenerator.CreateQrCode("Hello CodeMaze readers", QRCodeGenerator.ECCLevel.Q);
+        using var qrCode = new SvgQRCode(qrCodeData);
+        var svg = qrCode.GetGraphic(20);
+
+        return $"data:image/svg+xml,{Uri.EscapeDataString(svg)}";
+    }
+
     private string GenerateQRCodeURL()
     {
         var qrCodeData = qrGenerator.CreateQrCode(new Url("https://www.code-maze.com"));
@@ -60,7 +71,22 @@ private string GenerateQRCodePhoneNumber()
         return GeneratePng(qrCodeData);
     }
 
+    private string GenerateQRCodeBranded()
+    {
+        var qrCodeData = qrGenerator.CreateQrCode("Hello CodeMaze readers", QRCodeGenerator.ECCLevel.Q);
+
+        return GeneratePngBranded(qrCodeData);
+    }
+
     private static string GeneratePng(QRCodeData data)
+    {
+        using var qrCode = new PngByteQRCode(data);
+        var qrCodeImage = qrCode.GetGraphic(20);
+
+        return $"data:image/png;base64,{Convert.ToBase64String(qrCodeImage)}";
+    }
+
+    private static string GeneratePngBranded(QRCodeData data)
     {
         using var qrCode = new PngByteQRCode(data);
         var qrCodeImage = qrCode.GetGraphic(20, [255, 0, 0], [0, 0, 139]);

dotnet-client-libraries/QRCoder/QRCodeGeneratorWebSample/Program.cs

@@ -13,14 +13,16 @@
 {
     app.UseExceptionHandler("/Home/Error");
 }
-app.UseStaticFiles();
 
 app.UseRouting();
 
 app.UseAuthorization();
 
+app.MapStaticAssets();
+
 app.MapControllerRoute(
     name: "default",
-    pattern: "{controller=Home}/{action=Index}/{id?}");
+    pattern: "{controller=Home}/{action=Index}/{id?}")
+    .WithStaticAssets();
 
 app.Run();

dotnet-client-libraries/QRCoder/QRCodeGeneratorWebSample/QRCodeGeneratorWebSample.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="QRCoder" Version="1.4.1" />
+    <PackageReference Include="QRCoder" Version="1.8.0" />
   </ItemGroup>
 
 </Project>

dotnet-client-libraries/QRCoder/QRCodeGeneratorWebSample/QrCodesDb.cs

@@ -1,17 +1,15 @@
-using QRCoder;
+using System.Collections.Concurrent;
+using QRCoder;
 
 namespace QRCodeGeneratorWebSample;
 
 public class QrCodesDb
 {
-    private readonly Dictionary<string, byte[]> _qrCodes = [];
+    private readonly ConcurrentDictionary<string, byte[]> _qrCodes = new();
 
     public void Add(string key, QRCodeData data)
     {
-        if (!_qrCodes.ContainsKey(key))
-        {
-            _qrCodes.Add(key, data.GetRawData(QRCodeData.Compression.Uncompressed));
-        }
+        _qrCodes.TryAdd(key, data.GetRawData(QRCodeData.Compression.Uncompressed));
     }
 
     public byte[]? Get(string key)

dotnet-client-libraries/QRCoder/QRCodeGeneratorWebSample/Views/Home/Index.cshtml

@@ -1,10 +1,10 @@
-@model HomeModel;
+@model HomeModel
 
 <div class="text-center">
     @foreach (var qr in Model.QRCodes)
     {
         <hr/>
         <h2>@qr.Key</h2>
         <img width="250px" src="@qr.Value" />
-    }    
+    }
 </div>

dotnet-client-libraries/QRCoder/Tests/QRCodeGeneratorWebSampleUnitTest.cs

@@ -6,27 +6,65 @@
 namespace Tests;
 public class QRCodeGeneratorWebSampleUnitTest
 {
-    [Fact]
-    public void GivenARequest_WhenCallingIndex_ThenTheControllerRendersAViewWithQrCodes()
+    private static HomeModel RenderIndex()
     {
-        // Arrange.
         var db = new QrCodesDb();
         var controller = new HomeController(db);
 
-        // Act.
         var viewResult = controller.Index() as ViewResult;
 
-        // Assert.
         Assert.NotNull(viewResult);
         var model = viewResult.Model as HomeModel;
         Assert.NotNull(model);
+
+        return model;
+    }
+
+    [Fact]
+    public void GivenARequest_WhenCallingIndex_ThenTheControllerRendersAViewWithQrCodes()
+    {
+        // Act.
+        var model = RenderIndex();
+
+        // Assert.
         Assert.NotNull(model.QRCodes);
         Assert.NotEmpty(model.QRCodes);
-        foreach (var qrCode in from expectedKey in new[] { "Basic String", "URL", "Phone Number", "Custom" }
+        foreach (var qrCode in from expectedKey in new[] { "Basic String", "SVG", "URL", "Phone Number", "Custom", "Branded" }
                                let qrCode = model.QRCodes[expectedKey]
                                select qrCode)
         {
             Assert.NotNull(qrCode);
         }
     }
-}
+
+    [Fact]
+    public void GivenARequest_WhenCallingIndex_ThenThePngRendererProducesARealPng()
+    {
+        // Arrange.
+        const string prefix = "data:image/png;base64,";
+
+        // Act.
+        var dataUri = RenderIndex().QRCodes["Basic String"];
+
+        // Assert.
+        Assert.StartsWith(prefix, dataUri);
+        var bytes = Convert.FromBase64String(dataUri[prefix.Length..]);
+        Assert.Equal(new byte[] { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A }, bytes[..8]);
+    }
+
+    [Fact]
+    public void GivenARequest_WhenCallingIndex_ThenTheSvgRendererProducesAnSvgDocument()
+    {
+        // Arrange.
+        const string prefix = "data:image/svg+xml,";
+
+        // Act.
+        var dataUri = RenderIndex().QRCodes["SVG"];
+
+        // Assert.
+        Assert.StartsWith(prefix, dataUri);
+        var svg = Uri.UnescapeDataString(dataUri[prefix.Length..]);
+        Assert.Contains("<svg", svg);
+        Assert.Contains("</svg>", svg);
+    }
+}

dotnet-client-libraries/QRCoder/Tests/Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageReference Include="coverlet.collector" Version="10.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>