Merge pull request #70 from mattjohnsonpint/updates

Updates
mattjohnsonpint · Jan 26, 2025 · d96c340 · d96c340
2 parents deb5e6c + e105ef1
commit d96c340
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 34 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -12,12 +12,20 @@ env:
 
 jobs:
   build:
-    name: Build
+    name: Build / Test
     runs-on: ubuntu-latest
 
     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

diff --git a/.github/workflows/pack-for-release.yaml → .github/workflows/release.yaml b/.github/workflows/pack-for-release.yaml → .github/workflows/release.yaml
@@ -1,4 +1,4 @@
-name: pack-for-release
+name: release
 
 on:
   workflow_dispatch:
@@ -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

diff --git a/Directory.Build.props b/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>
 

diff --git a/src/GeoTimeZone.DataBuilder/GeoTimeZone.DataBuilder.csproj b/src/GeoTimeZone.DataBuilder/GeoTimeZone.DataBuilder.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="NetTopologySuite" Version="2.5.0" />
-    <PackageReference Include="NetTopologySuite.IO.ShapeFile" Version="2.1.0" />
+    <PackageReference Include="NetTopologySuite.IO.Esri.ShapeFile" Version="1.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/GeoTimeZone.DataBuilder/TimeZoneShapeFileReader.cs b/src/GeoTimeZone.DataBuilder/TimeZoneShapeFileReader.cs
@@ -1,6 +1,4 @@
-using NetTopologySuite.Features;
-using NetTopologySuite.Geometries;
-using NetTopologySuite.IO;
+using NetTopologySuite.IO.Esri;
 
 namespace GeoTimeZone.DataBuilder;
 
@@ -15,27 +13,17 @@ public TimeZoneShapeFileReader(string shapeFile)
 
     public IEnumerable<TimeZoneFeature> ReadShapeFile()
     {
-        using var reader = new ShapefileDataReader(_shapeFile, GeometryFactory.Default);
-        var header = reader.DbaseHeader;
-
-        while (reader.Read())
+        foreach (var feature in Shapefile.ReadAllFeatures(_shapeFile))
         {
-            var attributes = new AttributesTable();
-            for (var i = 0; i < header.NumFields; i++)
-            {
-                var name = header.Fields[i].Name;
-                var value = reader.GetValue(i + 1);
-                attributes.Add(name, value);
-            }
+            var zone = (string) feature.Attributes["tzid"];
 
             // skip uninhabited areas
-            var zone = (string) attributes["tzid"];
             if (zone.Equals("uninhabited", StringComparison.OrdinalIgnoreCase))
             {
                 continue;
             }
 
-            yield return new TimeZoneFeature(zone, reader.Geometry);
+            yield return new TimeZoneFeature(zone, feature.Geometry);
         }
     }
 }
diff --git a/src/GeoTimeZone/GeoTimeZone.csproj b/src/GeoTimeZone/GeoTimeZone.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Provides an IANA time zone identifier from latitude and longitude coordinates.</Description>
     <Authors>Matt Johnson-Pint,Simon Bartlett</Authors>
-    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net6.0;net8.0;net9.0</TargetFrameworks>
     <PackageId>GeoTimeZone</PackageId>
     <PackageTags>timezone;time;zone;geolocation;geo;latitude;longitude;coordinates;iana;tzdb</PackageTags>
     <PackageProjectUrl>https://github.com/mattjohnsonpint/GeoTimeZone</PackageProjectUrl>

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -3,23 +3,30 @@
   <Import Project="..\Directory.Build.props" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
-    <PackageReference Include="Verify.Xunit" Version="19.5.0" />
-    <PackageReference Include="Verify.DiffPlex" Version="2.0.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="Xunit.SkippableFact" Version="1.5.23" />
+    <PackageReference Include="Verify.DiffPlex" Version="3.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Verify.Xunit" Version="28.2.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
+    <PackageReference Include="Verify.Xunit" Version="28.9.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/test/GeoTimeZone.DataBuilder.Tests/GeoTimeZone.DataBuilder.Tests.csproj b/test/GeoTimeZone.DataBuilder.Tests/GeoTimeZone.DataBuilder.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/GeoTimeZone.Tests/GeoTimeZone.Tests.csproj b/test/GeoTimeZone.Tests/GeoTimeZone.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>