From deea78375bb32d486ab56d506b9350e8807d58e8 Mon Sep 17 00:00:00 2001
From: Arjan Mels <github@mels.email>
Date: Sat, 7 Sep 2024 21:36:58 +0200
Subject: [PATCH 1/2] Fixed tests on windows

---
 lib/src/tzdata/zone_tab.dart | 2 +-
 test/zicfile_test.dart       | 2 +-
 test/zone_tab_test.dart      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/tzdata/zone_tab.dart b/lib/src/tzdata/zone_tab.dart
index 5cc7bd1..9902885 100644
--- a/lib/src/tzdata/zone_tab.dart
+++ b/lib/src/tzdata/zone_tab.dart
@@ -56,7 +56,7 @@ class LocationDescriptionDatabase {
   LocationDescriptionDatabase(this.locations);
 
   factory LocationDescriptionDatabase.fromString(String data) {
-    final lines = data.split('\n');
+    final lines = data.replaceAll('\r\n', '\n').split('\n');
     final locations = <LocationDescription>[];
     for (final line in lines) {
       if (line.isEmpty || line[0].startsWith('#')) {
diff --git a/test/zicfile_test.dart b/test/zicfile_test.dart
index 77ae3c7..5208399 100644
--- a/test/zicfile_test.dart
+++ b/test/zicfile_test.dart
@@ -12,7 +12,7 @@ void main() {
   test('Read US/Eastern 2014h tzfile', () async {
     var packageUri = Uri(scheme: 'package', path: 'timezone/timezone.dart');
     var packagePath = p.dirname(
-        p.dirname((await Isolate.resolvePackageUri(packageUri))!.path));
+        p.dirname((await Isolate.resolvePackageUri(packageUri))!.toFilePath()));
     var locationDir = p.join(packagePath, 'test');
     var rawData =
         await File(p.join(locationDir, 'data/US/Eastern')).readAsBytes();
diff --git a/test/zone_tab_test.dart b/test/zone_tab_test.dart
index b3dc375..857ac4e 100644
--- a/test/zone_tab_test.dart
+++ b/test/zone_tab_test.dart
@@ -12,7 +12,7 @@ void main() {
   test('Read zone1970.tab file', () async {
     var packageUri = Uri(scheme: 'package', path: 'timezone/timezone.dart');
     var packagePath = p.dirname(
-        p.dirname((await Isolate.resolvePackageUri(packageUri))!.path));
+        p.dirname((await Isolate.resolvePackageUri(packageUri))!.toFilePath()));
     var locationDir = p.join(packagePath, 'test');
     var rawData =
         await File(p.join(locationDir, 'data/zone1970.tab')).readAsString();

From 726201aa39e55f8b448771d2c9f9b2a5c0d32a48 Mon Sep 17 00:00:00 2001
From: Arjan Mels <github@mels.email>
Date: Sun, 8 Sep 2024 10:26:35 +0200
Subject: [PATCH 2/2] Fix locale names in encode_tzf for windows

---
 tool/encode_tzf.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tool/encode_tzf.dart b/tool/encode_tzf.dart
index 5a1f13e..8444820 100644
--- a/tool/encode_tzf.dart
+++ b/tool/encode_tzf.dart
@@ -48,7 +48,7 @@ Future<void> main(List<String> arguments) async {
   final files = await Glob('**').list(root: zoneinfoPath).toList();
   for (final f in files) {
     if (f is pkg_file.File) {
-      final name = p.relative(f.path, from: zoneinfoPath);
+      final name = p.relative(f.path, from: zoneinfoPath).replaceAll('\\', '/');
       log.info('- $name');
       db.add(tzfileLocationToNativeLocation(
           tzfile.Location.fromBytes(name, await f.readAsBytes())));