Cleanup and SDK update (#117)

* Cleanup and SDK update * Bump setup dotnet action version * Remove errant space
TurnerSoftware · Apr 29, 2024 · 4ac4cdb · 4ac4cdb
1 parent 1f1e72e
commit 4ac4cdb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,13 +28,12 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Setup dotnet 3.1 5.0 6.0
-      uses: actions/setup-dotnet@v1
+    - name: Setup dotnet SDKs
+      uses: actions/setup-dotnet@v1.9.0
       with:
         dotnet-version: |
-          3.1.x
-          5.0.x
-          6.0.x 
+          6.0.x
+          8.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build
@@ -63,7 +62,7 @@ jobs:
     - name: Prepare coverage reports
       run: reportgenerator -reports:*/coverage/*/coverage.cobertura.xml -targetdir:./ -reporttypes:Cobertura
     - name: Upload coverage report
-      uses: codecov/codecov-action@v1.0.13
+      uses: codecov/codecov-action@v4.3.0
       with:
         file: Cobertura.xml
         fail_ci_if_error: false

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 
 A sitemap (sitemap.xml) querying and parsing library for .NET
 
-![Build](https://img.shields.io/github/workflow/status/TurnerSoftware/sitemaptools/Build)
+![Build](https://img.shields.io/github/actions/workflow/status/TurnerSoftware/sitemaptools/build.yml?branch=main)
 [![Codecov](https://img.shields.io/codecov/c/github/turnersoftware/sitemaptools/master.svg)](https://codecov.io/gh/TurnerSoftware/SitemapTools)
 [![NuGet](https://img.shields.io/nuget/v/TurnerSoftware.SitemapTools.svg)](https://www.nuget.org/packages/TurnerSoftware.SitemapTools)
 </div>

diff --git a/src/TurnerSoftware.SitemapTools/SitemapQuery.cs b/src/TurnerSoftware.SitemapTools/SitemapQuery.cs
@@ -130,7 +130,11 @@ public async Task<IEnumerable<Uri>> DiscoverSitemapsAsync(string domainName, Can
 
 		return result;
 	}
-
+
+	private static bool IsCompressedStream(string contentType) =>
+		contentType.Equals("application/x-gzip", StringComparison.InvariantCultureIgnoreCase) ||
+		contentType.Equals("application/octet-stream", StringComparison.InvariantCultureIgnoreCase);
+
 	/// <summary>
 	/// Retrieves a sitemap at the given URI, converting it to a <see cref="SitemapFile"/>.
 	/// </summary>
@@ -147,8 +151,7 @@ public async Task<IEnumerable<Uri>> DiscoverSitemapsAsync(string domainName, Can
 				var contentType = response.Content.Headers.ContentType.MediaType;
 				var requiresManualDecompression = false;
 
-				if (contentType.Equals("application/x-gzip", StringComparison.InvariantCultureIgnoreCase)||
-                    		    contentType.Equals("application/octet-stream", StringComparison.InvariantCultureIgnoreCase))
+				if (IsCompressedStream(contentType))
 				{
 					requiresManualDecompression = true;
 					var baseFileName = Path.GetFileNameWithoutExtension(sitemapUrl.AbsolutePath);

diff --git a/tests/TurnerSoftware.SitemapTools.Tests/TurnerSoftware.SitemapTools.Tests.csproj b/tests/TurnerSoftware.SitemapTools.Tests/TurnerSoftware.SitemapTools.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net461;netcoreapp3.1;net6.0</TargetFrameworks>
+		<TargetFrameworks>net461;net6.0;net8.0</TargetFrameworks>
 
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>