switch to t4 cli, update country definitions to correspond to code

Author: Filip Staffa

.github/workflows/dotnetcore.yml

@@ -29,6 +29,20 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 8.0.x
+      - name: Setup .NET 9
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 9.0.x
+      - name: Setup .NET 10
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 10.0.x
+      - name: Restore dotnet tools
+        run: dotnet tool restore
+      - name: Regenerate from T4
+        run: dotnet t4 src/PostalCodes/Generated/PostalCodeFactory.gen.tt
+      - name: Verify no drift
+        run: git diff --exit-code
       - name: Build with dotnet
         run: dotnet build --configuration Release /p:ContinuousIntegrationBuild=true
       - name: Test

src/PostalCodes.UnitTests/PostalCodes.UnitTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;netcoreapp3.1;net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />

src/PostalCodes/Generated/PostalCodeFactory.gen.tt

@@ -1,49 +1,50 @@
 <#@ template language="C#" hostspecific="true" #>
 <#@ assembly name="System" #>
 <#@ assembly name="System.Core" #>
-<#@ assembly name="System.Web.Extensions" #>
+<#@ assembly name="System.Text.Json" #>
 <#@ import namespace="System.IO" #>
 <#@ import namespace="System.Linq" #>
 <#@ import namespace="System.Text" #>
 <#@ import namespace="System.Collections.Generic" #>
 <#@ import namespace="System.Text.RegularExpressions" #>
-<#@ import namespace="System.Web.Script.Serialization" #>
+<#@ import namespace="System.Text.Json" #>
 <#
-    var filesForCountries = new Dictionary<string, string[]> { 
+    var filesForCountries = new Dictionary<string, string[]> {
          { "3Digits.json", new [] { "FO", "IS", "LS", "MG", "OM", "PG", "PS" }},
          { "4Digits.json", new [] { "AF", "AL", "AM", "AR", "AT", "AU", "BD", "BE", "BE", "BG", "BO", "CC", "CH", "CV", "CX", "CY", "CY", "DK", "ET", "GE", "GL", "GW", "HM", "HT", "HU", "HU", "LI", "LR", "LU", "MK", "MZ", "NE", "NF", "NO", "NO", "NZ", "PH", "PY", "SI", "SJ", "TN", "ZA" }},
          { "5Digits.json", new [] { "AS", "BA", "BT", "CR", "CU", "CZ", "DE", "DO", "DZ", "EE", "EG", "ES", "FI", "FM", "FR", "GR", "GT", "GU", "HN", "HR", "HR", "ID", "IQ", "IT", "JO", "KE", "KH", "KW", "LA", "LK", "LY", "MA", "MC", "ME", "MH", "MM", "MN", "MP", "MQ", "MU", "MX", "MY", "NA", "NI", "NP", "PE", "PK", "PR", "PW", "RS", "SD", "SE", "SK", "SN", "TD", "TH", "TR", "TW", "UA", "UY", "VI", "YT", "ZM" }},
          { "6Digits.json", new [] { "BY", "CN", "CO", "EC", "IN", "KG", "KZ", "NG", "PA", "RO", "SG", "TJ", "TM", "TT", "VN" }},
          { "7Digits.json", new [] { "IL", "JP" }}
     };
 
-    var js = new System.Web.Script.Serialization.JavaScriptSerializer ();
+    var jsonOptions = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
     var countryList = new HashSet<CountryInfo>();
 
     string templateDirectory = Path.GetDirectoryName(Host.TemplateFile);
-    foreach(var fileType in filesForCountries)
-    {
-        foreach(var countryCode in fileType.Value)
-        {
-                  var ci = js.Deserialize<CountryInfo>(File.ReadAllText(Path.Combine(templateDirectory, "../../countries", fileType.Key)));  
-               ci.CountryCodeAlpha2 = countryCode;     
-               ci.CountryName = countryCode;       
-            countryList.Add( ci );
-        }
-    }    
 
     var jsonFiles = Directory.GetFiles(Path.Combine(templateDirectory, "../../countries/")).Where(a => a.EndsWith(".json"));
     var regex = new Regex(@"^([A-Z]{2})\.json$");
     foreach (var jsonFile in jsonFiles)
     {
-           
+
         var match = regex.Match(Path.GetFileName(jsonFile));
         if (match.Success)
         {
-           var ci = js.Deserialize<CountryInfo>(File.ReadAllText(jsonFile));  
+           var ci = JsonSerializer.Deserialize<CountryInfo>(File.ReadAllText(jsonFile), jsonOptions);
            countryList.Add( ci );
-        } 
-    } 
+        }
+    }
+
+    foreach(var fileType in filesForCountries)
+    {
+        foreach(var countryCode in fileType.Value)
+        {
+                  var ci = JsonSerializer.Deserialize<CountryInfo>(File.ReadAllText(Path.Combine(templateDirectory, "../../countries", fileType.Key)), jsonOptions);
+               ci.CountryCodeAlpha2 = countryCode;
+               ci.CountryName = countryCode;
+            countryList.Add( ci );
+        }
+    }
 
     var countrySortedList = countryList.OrderBy(a => a.CountryCodeAlpha2).ToList();
     foreach(var countryInfo in countryList)