[wasm] Add Timezone data generator as build task

eng/testing/tests.mobile.targets

@@ -165,10 +165,13 @@
   <UsingTask TaskName="TimeZoneLoader"
              AssemblyFile="$(WasmBundleTaskTasksAssemblyPath)" />
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="LoadTimeZone" >
+    <PropertyGroup>
+      <TimeZoneDataVersion>2020a</TimeZoneDataVersion>
+    </PropertyGroup>
     <TimeZoneLoader
       InputDirectory="$(BundleDir)obj/data/input"
       OutputDirectory="$(BundleDir)obj/data/output"
-      Version="2020a"/>
+      Version="$(TimeZoneDataVersion)"/>
   </Target>
 
   <UsingTask TaskName="WasmBundleTask"

tools-local/tasks/mobile.tasks/WasmBundleTask/TimeZoneLoader.cs

@@ -14,70 +14,80 @@
 
 public class TimeZoneLoader : Task
 {
+    [Required]
     public string? InputDirectory { get; set; }
+
+    [Required]
     public string? OutputDirectory { get; set; }
+
+    [Required]
     public string? Version { get; set; }
 
-    private void DownloadTimeZoneData() {
+    private void DownloadTimeZoneData() 
+    {
         List<string> files = new List<string>() {"africa", "antarctica", "asia", "australasia", "etcetera", "europe", "northamerica", "southamerica", "zone1970.tab"};
         using (var client = new WebClient())
         {
-            foreach (var file in files) {
-                client.DownloadFile($"https://data.iana.org/time-zones/tzdb-{Version}/{file}", $"{InputDirectory}/{file}");
+            foreach (var file in files) 
+            {
+                client.DownloadFile($"https://data.iana.org/time-zones/tzdb-{Version}/{file}", $"{Path.Combine(InputDirectory!, file)}");
             }
         }
 
         files.Remove("zone1970.tab");        
 
-        using (Process process = new Process()) {
+        using (Process process = new Process()) 
+        {
             process.StartInfo.UseShellExecute = false;
             process.StartInfo.FileName = "zic";
-            foreach (var f in files) {
-                process.StartInfo.Arguments = $"-d \"{OutputDirectory}\" \"{InputDirectory}/{f}\"";
+            foreach (var f in files) 
+            {
+                process.StartInfo.Arguments = $"-d \"{OutputDirectory}\" \"{Path.Combine(InputDirectory!, f)}\"";
                 process.Start();
                 process.WaitForExit();
             }
         }
         File.Copy(Path.Combine(InputDirectory!,"zone1970.tab"), Path.Combine(OutputDirectory!,"zone1970.tab"));
     }
 
-    private void FilterTimeZoneData(string[] areas) {
+    private void FilterTimeZoneData(string[] areas) 
+    {
         var directoryInfo = new DirectoryInfo (OutputDirectory!);
-        foreach (var entry in directoryInfo.EnumerateDirectories()) {
-            if (Array.IndexOf(areas, entry.Name) == -1) {
+        foreach (var entry in directoryInfo.EnumerateDirectories()) 
+        {
+            if (Array.IndexOf(areas, entry.Name) == -1) 
+            {
                 Directory.Delete(entry.FullName, true);
             }
         }
     }
 
-    private void FilterZoneTab(string[] filters) {
+    private void FilterZoneTab(string[] filters) 
+    {
         var oldPath = Path.Combine(OutputDirectory!, "zone1970.tab");
         var path = Path.Combine(OutputDirectory!, "zone.tab");
-        var fileInfo = new FileInfo(oldPath);
-        using (var readStream = fileInfo.OpenRead())
-        using (StreamReader sr = new StreamReader(readStream))
-        using (FileStream fs = File.OpenWrite(path)) 
-        using (StreamWriter sw = new StreamWriter(fs)){
+        using (StreamReader sr = new StreamReader(oldPath))
+        using (StreamWriter sw = new StreamWriter(path))
+        {
             string? line;
             while ((line = sr.ReadLine()) != null) {
-                if (filters.Any(x => Regex.IsMatch(line, $@"\b{x}\b"))) {
+                if (filters.Any(x => Regex.IsMatch(line, $@"\b{x}\b"))) 
+                {
                     sw.WriteLine(line);
                 }
             }
         }
         File.Delete(oldPath);
     }
 
-    public override bool Execute() {
-        if (InputDirectory == null) {
-            InputDirectory = Path.Combine(Directory.GetCurrentDirectory(), "obj", "data", "input");
-        }
-        Directory.CreateDirectory(InputDirectory);
+    public override bool Execute() 
+    {
 
-        if (OutputDirectory == null) {
-            OutputDirectory = Path.Combine(Directory.GetCurrentDirectory(), "obj", "data", "output");
-        }
-        Directory.CreateDirectory(OutputDirectory);
+        if (!Directory.Exists(InputDirectory))
+            Directory.CreateDirectory(InputDirectory!);
+
+        if (!Directory.Exists(OutputDirectory))
+            Directory.CreateDirectory(OutputDirectory!);
 
         DownloadTimeZoneData();
 

tools-local/tasks/mobile.tasks/WasmBundleTask/WasmBundleTask.cs

@@ -12,21 +12,25 @@
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
-
 public class WasmBundleTask : Task
 {
+    [Required]
     public string? InputDirectory { get; set; }
+
+    [Required]
     public string? FileName { get; set; } 
 
-    private (byte[] json_bytes, MemoryStream stream) EnumerateData() {
+    private (byte[] json_bytes, MemoryStream stream) EnumerateData() 
+    {
         var indices = new List<object[]>();
         var stream = new MemoryStream();
 
         var directoryInfo = new DirectoryInfo(InputDirectory!);
 
-        foreach (var entry in directoryInfo.EnumerateFiles("*", SearchOption.AllDirectories)) {
+        foreach (var entry in directoryInfo.EnumerateFiles("*", SearchOption.AllDirectories)) 
+        {
 
-            var relativePath = entry.FullName.Substring(InputDirectory!.Length).Trim('/');
+            var relativePath = Path.GetRelativePath(InputDirectory!, entry.FullName);
             indices.Add(new object[] { relativePath, entry.Length });
 
             using (var readStream = entry.OpenRead())
@@ -43,27 +47,27 @@ public override bool Execute()
     {
         (byte[] json_bytes, MemoryStream stream) data;
 
-        if (InputDirectory == null) {
+        if (InputDirectory == null) 
+        {
             throw new ArgumentException("Input directory doesn't exist.");
         }
 
         data = EnumerateData();
 
-        if (FileName == null) {
+        if (FileName == null) 
+        {
             throw new ArgumentException($"Invalid file name");
         }
         using (var file = File.Open(FileName, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite))
         {
-            var jsonBytes = data.json_bytes;
-            var stream = data.stream;
             var bytes = new byte[4];
             var magicBytes = Encoding.ASCII.GetBytes("talb");
-            BinaryPrimitives.WriteInt32LittleEndian(bytes, jsonBytes.Length);
+            BinaryPrimitives.WriteInt32LittleEndian(bytes, data.json_bytes.Length);
             file.Write(magicBytes);
             file.Write(bytes);
-            file.Write(jsonBytes);
+            file.Write(data.json_bytes);
 
-            stream.CopyTo(file);
+            data.stream.CopyTo(file);
         }
 
         return true;