Updates (#112)

Author: mattjohnsonpint

.github/workflows/build.yaml

@@ -17,7 +17,15 @@ jobs:
 
     steps:
         - name: Checkout
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
+
+        - name: Install .NET SDKs
+          uses: actions/setup-dotnet@v4
+          with:
+            dotnet-version: |
+              6.0.x
+              8.0.x
+              9.0.x
 
         - name: Restore
           run: dotnet restore --nologo

.github/workflows/pack-for-release.yaml renamed to .github/workflows/release.yaml

@@ -13,7 +13,15 @@ jobs:
 
     steps:
         - name: Checkout
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
+
+        - name: Install .NET SDKs
+          uses: actions/setup-dotnet@v4
+          with:
+            dotnet-version: |
+              6.0.x
+              8.0.x
+              9.0.x
 
         - name: Restore
           run: dotnet restore --nologo
@@ -30,8 +38,11 @@ jobs:
         - name: Pack
           run: dotnet pack -c Release --nologo --no-build
 
+        - name: Push to NuGet
+          run: dotnet nuget push -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}} **/*.nupkg
+
         - name: Archive Artifacts
-          uses: actions/upload-artifact@v3
+          uses: actions/upload-artifact@v4
           with:
             name: nuget-packages
             path: src/**/Release/*.*nupkg

Directory.Build.props

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Roslynator.Analyzers" Version="4.2.0" PrivateAssets="All" />
+    <PackageReference Include="Roslynator.Analyzers" Version="4.12.10" PrivateAssets="All" />
     <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="All" />
   </ItemGroup>
 

README.md

@@ -15,9 +15,9 @@ Nuget Installation
 PM> Install-Package TimeZoneNames
 ```
 
-As of version 6.0.0, *TimeZoneConverter* works with all of the following:
+As of version 7.0.0, *TimeZoneConverter* works with all of the following:
 
-- .NET 5 or greater
+- .NET 6 or greater
 - .NET Core 2.0 or greater
 - .NET Framework 4.6.2 and greater
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "9.0.100",
     "rollForward": "latestMinor"
   }
 }

src/TimeZoneNames.DataBuilder/DataExtractor.cs

@@ -12,15 +12,13 @@ public class DataExtractor
 {
     private readonly string _cldrPath;
     private readonly string _nzdPath;
-    private readonly string _tzresPath;
 
     private readonly TimeZoneData _data = new();
 
     private DataExtractor(string dataPath)
     {
         _cldrPath = Path.Combine(dataPath, "cldr");
         _nzdPath = Path.Combine(dataPath, "nzd");
-        _tzresPath = Path.Combine(dataPath, "tzres");
     }
 
     public static DataExtractor Load(string dataPath, bool overwrite)
@@ -75,8 +73,7 @@ private void DownloadData(bool overwrite)
     {
         Task.WaitAll(
             DownloadCldrAsync(overwrite),
-            DownloadNzdAsync(overwrite),
-            DownloadTZResAsync(overwrite));
+            DownloadNzdAsync(overwrite));
     }
 
     private async Task DownloadCldrAsync(bool overwrite)
@@ -107,20 +104,6 @@ private async Task DownloadNzdAsync(bool overwrite)
         }
     }
 
-    private async Task DownloadTZResAsync(bool overwrite)
-    {
-        var exists = Directory.Exists(_tzresPath);
-        if (overwrite || !exists)
-        {
-            if (exists)
-            {
-                Directory.Delete(_tzresPath, true);
-            }
-
-            await Downloader.DownloadTZResAsync(_tzresPath);
-        }
-    }
-
     private void LoadZoneCountries()
     {
         foreach (var location in _tzdbSource.ZoneLocations!.OrderBy(x => GetStandardOffset(x.ZoneId)).ThenBy(x => GetDaylightOffset(x.ZoneId)))
@@ -237,7 +220,13 @@ private IList<string> GetSelectionZones(Instant fromInstant, string[] precedence
                 }
 
                 // use the zone-precedence.txt file when we need a tiebreaker
-                return precedence.Intersect(ids).First();
+                var s = precedence.Intersect(ids).FirstOrDefault();
+                if (s != null)
+                {
+                    return s;
+                } else {
+                    throw new InvalidOperationException("No tiebreaker found for " + string.Join(", ", ids));
+                }
             })
             .ToList();
 
@@ -510,7 +499,7 @@ private static TimeZoneValues GetTimeZoneValues(XContainer element)
 
     private void LoadDisplayNames()
     {
-        using var stream = File.OpenRead(Path.Combine(_tzresPath, "tzinfo.json"));
+        using var stream = File.OpenRead(Path.Combine("data", "windows-displaynames.json"));
         var data = JsonNode.Parse(stream)!;
         var languages = data["Languages"];
         if (languages == null)
@@ -607,4 +596,4 @@ private IList<Instant> GetAllZoneSplitPoints()
 
         return list;
     }
-}
+}

src/TimeZoneNames.DataBuilder/Downloader.cs

@@ -25,12 +25,6 @@ public static async Task DownloadNzdAsync(string dir)
         await DownloadAsync(dataUrl, dir);
     }
 
-    public static async Task DownloadTZResAsync(string dir)
-    {
-        const string url = "https://raw.githubusercontent.com/tomkludy/TimeZoneWindowsResourceExtractor/master/TZResScraper/tzinfo.json";
-        await DownloadAsync(url, dir);
-    }
-
     private static async Task DownloadAsync(string url, string dir)
     {
         if (!Directory.Exists(dir))
@@ -61,7 +55,7 @@ private static async Task DownloadAndExtractAsync(string url, string dir)
                 continue;
             }
 
-            var subPath = entry.Key;
+            var subPath = entry.Key!;
             if (Path.DirectorySeparatorChar != '/')
             {
                 subPath = subPath.Replace('/', Path.DirectorySeparatorChar);
@@ -84,4 +78,4 @@ private static async Task DownloadAndExtractAsync(string url, string dir)
             await stream.CopyToAsync(fs);
         }
     }
-}
+}

src/TimeZoneNames.DataBuilder/TimeZoneNames.DataBuilder.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -19,8 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NodaTime" Version="3.1.5" />
-    <PackageReference Include="SharpCompress" Version="0.32.2" />
+    <PackageReference Include="NodaTime" Version="3.2.1" />
+    <PackageReference Include="SharpCompress" Version="0.39.0" />
   </ItemGroup>
 
 </Project>