upgrade to .net 8.0

w8tcha · Dec 26, 2023 · 504cb51 · 504cb51
1 parent 50152c0
commit 504cb51
Show file tree

Hide file tree

Showing 45 changed files with 152 additions and 174 deletions.
diff --git a/OEmbed.Core.Tests/GlobalUsings.cs b/OEmbed.Core.Tests/GlobalUsings.cs
@@ -1,5 +1,6 @@
 // Global using directives
 
+#if NET7_0_OR_GREATER
 global using System.Threading.Tasks;
-
+#endif
 global using Xunit;
diff --git a/OEmbed.Core.Tests/OEmbed.Core.Tests.csproj b/OEmbed.Core.Tests/OEmbed.Core.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProductVersion />
-    <TargetFrameworks>net481;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net481;net7.0;net8.0</TargetFrameworks>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-	  <PackageReference Include="xunit" Version="2.5.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
+	  <PackageReference Include="xunit" Version="2.6.4" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	    <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/OEmbed.Core.Tests/ProviderTests/CodePenTests.cs b/OEmbed.Core.Tests/ProviderTests/CodePenTests.cs
@@ -29,7 +29,7 @@ public void EmbedTest(string url)
 
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
   [Theory]
   [InlineData("https://codepen.io/team/HMPD/pen/vjZwwr")]
   [InlineData("https://codepen.io/meodai/pen/GRyjQoZ")]
@@ -42,5 +42,4 @@ public async Task EmbedAsyncTest(string url)
       Assert.NotNull(actual);
   }
 #endif
-
 }
diff --git a/OEmbed.Core.Tests/ProviderTests/DailyMotionTests.cs b/OEmbed.Core.Tests/ProviderTests/DailyMotionTests.cs
@@ -30,7 +30,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://www.dailymotion.com/video/x87cx3z")]
     [InlineData("https://dai.ly/x87cx3z")]

diff --git a/OEmbed.Core.Tests/ProviderTests/DeezerTests.cs b/OEmbed.Core.Tests/ProviderTests/DeezerTests.cs
@@ -2,7 +2,7 @@
 
 public class DeezerTests : IProviderTests
 {
-    [Theory] 
+    [Theory]
     [InlineData("https://www.deezer.com/us/album/217565572")]
     [InlineData("https://www.deezer.com/us/track/1286394242")]
     [InlineData("https://www.deezer.com/us/playlist/8664185942")]
@@ -30,7 +30,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://www.deezer.com/us/album/217565572")]
     [InlineData("https://www.deezer.com/us/track/1286394242")]

diff --git a/OEmbed.Core.Tests/ProviderTests/DeviantArtTests.cs b/OEmbed.Core.Tests/ProviderTests/DeviantArtTests.cs
@@ -28,7 +28,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://www.deviantart.com/wlop/art/Sunshine2-905829772")]
     [InlineData("https://www.deviantart.com/art/Sunshine2-905829772")]

diff --git a/OEmbed.Core.Tests/ProviderTests/FacebookTests.cs b/OEmbed.Core.Tests/ProviderTests/FacebookTests.cs
@@ -35,7 +35,7 @@ public void EmbedTest(string url)
 
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [InlineData("https://www.facebook.com/iu.loen/posts/501755841318628")]
     [InlineData("https://www.facebook.com/iu.loen/photos/281842976643250")]
     [InlineData("https://www.facebook.com/photo.php?fbid=281842976643250&set=pb.100044526485652.-2207520000..&type=3")]

diff --git a/OEmbed.Core.Tests/ProviderTests/FlickrTests.cs b/OEmbed.Core.Tests/ProviderTests/FlickrTests.cs
@@ -27,7 +27,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://flickr.com/photos/josbuurmansphotography/50553575881")]
     public async Task EmbedAsyncTest(string url)

diff --git a/OEmbed.Core.Tests/ProviderTests/GiphyTests.cs b/OEmbed.Core.Tests/ProviderTests/GiphyTests.cs
@@ -37,7 +37,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://giphy.com/gifs/confused-iu-looking-up-l2YWwjl8T5tdGiaf6")]
     [InlineData("https://www.giphy.com/gifs/confused-iu-looking-up-l2YWwjl8T5tdGiaf6")]

diff --git a/OEmbed.Core.Tests/ProviderTests/GitHubGistTests.cs b/OEmbed.Core.Tests/ProviderTests/GitHubGistTests.cs
@@ -27,7 +27,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://gist.github.com/skabber/54099")]
     public async Task EmbedAsyncTest(string url)

diff --git a/OEmbed.Core.Tests/ProviderTests/IProviderTests.cs b/OEmbed.Core.Tests/ProviderTests/IProviderTests.cs
@@ -11,7 +11,7 @@ public interface IProviderTests
     void EmbedTest(string url);
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     Task EmbedAsyncTest(string url);
 #endif
 }
diff --git a/OEmbed.Core.Tests/ProviderTests/InstagramTests.cs b/OEmbed.Core.Tests/ProviderTests/InstagramTests.cs
@@ -41,7 +41,7 @@ public void EmbedTest(string url)
 
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [InlineData("https://www.instagram.com/dlwlrma/")]
     [InlineData("https://www.instagram.com/p/1XSKgBAGz-/")]
     [InlineData("https://www.instagram.com/tv/CHLVnWVAF9I/")]

diff --git a/OEmbed.Core.Tests/ProviderTests/PinterestTests.cs b/OEmbed.Core.Tests/ProviderTests/PinterestTests.cs
@@ -27,7 +27,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://www.pinterest.com/pin/6896205669260457/")]
     public async Task EmbedAsyncTest(string url)

diff --git a/OEmbed.Core.Tests/ProviderTests/RedditTests.cs b/OEmbed.Core.Tests/ProviderTests/RedditTests.cs
@@ -27,7 +27,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://www.reddit.com/r/Showerthoughts/comments/2safxv/we_should_start_keeping_giraffes_a_secret_from/cno7zic")]
     public async Task EmbedAsyncTest(string url)

diff --git a/OEmbed.Core.Tests/ProviderTests/SoundCloudTests.cs b/OEmbed.Core.Tests/ProviderTests/SoundCloudTests.cs
@@ -31,7 +31,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://soundcloud.com/blackpinkofficial")]
     [InlineData("https://soundcloud.com/blackpinkofficial/whistle")]

diff --git a/OEmbed.Core.Tests/ProviderTests/SpotifyTests.cs b/OEmbed.Core.Tests/ProviderTests/SpotifyTests.cs
@@ -39,7 +39,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://open.spotify.com/artist/3HqSLMAZ3g3d5poNaI7GOU")]
     [InlineData("https://open.spotify.com/album/2xEH7SRzJq7LgA0fCtTlxH")]

diff --git a/OEmbed.Core.Tests/ProviderTests/TiktokTests.cs b/OEmbed.Core.Tests/ProviderTests/TiktokTests.cs
@@ -33,7 +33,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://m.tiktok.com/v/6934593663062265094.html")]
     [InlineData("https://www.tiktok.com/@faaaariii_/video/6934593663062265094")]

diff --git a/OEmbed.Core.Tests/ProviderTests/TwitterTests.cs b/OEmbed.Core.Tests/ProviderTests/TwitterTests.cs
@@ -35,7 +35,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("http://twitter.com/panpianoatelier/status/1500450869590241286")]
     [InlineData("http://www.twitter.com/panpianoatelier/status/1500450869590241286")]

diff --git a/OEmbed.Core.Tests/ProviderTests/VimeoTests.cs b/OEmbed.Core.Tests/ProviderTests/VimeoTests.cs
@@ -39,7 +39,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://vimeo.com/22439234")]
     [InlineData("https://vimeo.com/22439234?embedded=true&source=video_title&owner=910279")]

diff --git a/OEmbed.Core.Tests/ProviderTests/YouTubeTests.cs b/OEmbed.Core.Tests/ProviderTests/YouTubeTests.cs
@@ -54,7 +54,7 @@ public void EmbedTest(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     [Theory]
     [InlineData("https://youtu.be/LKWFkELeYwc")]
     [InlineData("http://youtu.be/LKWFkELeYwc")]

diff --git a/OEmbed.Core/Extensions/ServiceCollectionExtensions.cs b/OEmbed.Core/Extensions/ServiceCollectionExtensions.cs
@@ -1,4 +1,4 @@
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 namespace OEmbed.Core.Extensions;
 
 using Microsoft.AspNetCore.Http;

diff --git a/OEmbed.Core/GlobalUsings.cs b/OEmbed.Core/GlobalUsings.cs
@@ -3,4 +3,6 @@
 global using System;
 global using System.Collections.Generic;
 global using System.Text.RegularExpressions;
-global using System.Threading.Tasks;
+#if NET7_0_OR_GREATER
+global using System.Threading.Tasks;
+#endif
diff --git a/OEmbed.Core/Interfaces/IOEmbed.cs b/OEmbed.Core/Interfaces/IOEmbed.cs
@@ -28,7 +28,7 @@ public interface IOEmbed
     Response Embed(string url);
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     /// <summary>
     /// Embeds the specified URL.
     /// </summary>

diff --git a/OEmbed.Core/OEmbed.Core.csproj b/OEmbed.Core/OEmbed.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	  <TargetFrameworks>net481;net6.0;net7.0</TargetFrameworks>
+	  <TargetFrameworks>net481;net7.0;net8.0</TargetFrameworks>
 	  <LangVersion>latest</LangVersion>
 	  <Description>C# oEmbed consumer library for .NET Framwork 4.8.1 and .NET (Core) 6/7</Description>
 	  <PackageTags>oembed;embed</PackageTags>
@@ -10,14 +10,14 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Runtime.Caching" Version="7.0.0" />
+    <PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
   </ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 

diff --git a/OEmbed.Core/OEmbed.cs b/OEmbed.Core/OEmbed.cs
@@ -5,7 +5,7 @@
 #endif
 using System.Linq;
 using System.Net;
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
 using System.Net.Http;
 #endif
 using System.Runtime.Caching;
@@ -14,39 +14,38 @@
 
 using Newtonsoft.Json;
 
-
 public class OEmbed : IOEmbed
 {
     public OEmbed()
     {
         this.Providers = new ProviderList().GetProviders();
 
-        this.options = new Options();
+        this._options = new Options();
 
         var type = typeof(OEmbed);
         var assemblyName = type.Assembly.GetName();
 
         var agent = $"{type.Namespace}/{assemblyName!.Version!.Major}.{assemblyName!.Version!.Minor}";
 
 #if NET481
-        this.userAgent = agent;
+        this._userAgent = agent;
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
         this.httpClient = new HttpClient();
         this.httpClient.DefaultRequestHeaders.UserAgent.ParseAdd(agent);
 #endif
     }
 
 #if NET481
-    private readonly string userAgent;
+    private readonly string _userAgent;
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     private readonly HttpClient httpClient;
 #endif
 
-    private readonly Options options;
+    private readonly Options _options;
 
     private static readonly MemoryCache Cache = MemoryCache.Default;
 
@@ -107,7 +106,7 @@ public Response Embed(string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     /// <summary>
     /// Embeds the specified URL.
     /// </summary>
@@ -168,7 +167,7 @@ private Response GetJson(Provider provider, string url)
 
         var webRequest = (HttpWebRequest)WebRequest.Create(endpoint);
 
-        webRequest.UserAgent = this.userAgent;
+        webRequest.UserAgent = this._userAgent;
 
         try
         {
@@ -187,7 +186,7 @@ private Response GetJson(Provider provider, string url)
 
             var response = JsonConvert.DeserializeObject<Response>(content);
 
-            if (this.options.EnableCache)
+            if (this._options.EnableCache)
             {
                 Cache.Add(url, response, DateTimeOffset.Now.AddDays(1));
             }
@@ -201,7 +200,7 @@ private Response GetJson(Provider provider, string url)
     }
 #endif
 
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
     /// <summary>
     /// Get the oEmbed JSON
     /// </summary>

diff --git a/OEmbed.Core/Provider.cs b/OEmbed.Core/Provider.cs
@@ -20,7 +20,7 @@ public abstract record Provider
     /// Gets or sets the matches.
     /// </summary>
     /// <value>The matches.</value>
-    public List<Regex> Matches { get; set; } = new();
+    public List<Regex> Matches { get; set; } = [];
 
     /// <summary>
     /// Gets or sets the endpoint.

diff --git a/OEmbed.Core/ProviderList.cs b/OEmbed.Core/ProviderList.cs
@@ -10,9 +10,12 @@ public class ProviderList
     /// <returns>List&lt;Provider&gt;.</returns>
     public List<Provider> GetProviders()
     {
-       return new List<Provider>(typeof(Provider)
-           .Assembly.GetTypes()
-           .Where(t => t.IsSubclassOf(typeof(Provider)) && !t.IsAbstract)
-           .Select(t => (Provider)Activator.CreateInstance(t)));
+       return
+       [
+           ..typeof(Provider)
+               .Assembly.GetTypes()
+               .Where(t => t.IsSubclassOf(typeof(Provider)) && !t.IsAbstract)
+               .Select(t => (Provider)Activator.CreateInstance(t))
+       ];
     }
 }
diff --git a/OEmbed.Core/Providers/CodePenProvider.cs b/OEmbed.Core/Providers/CodePenProvider.cs
@@ -8,10 +8,10 @@ public record CodePenProvider : Provider
     public CodePenProvider()
     {
         this.Name = "CodePen";
-        this.Hosts = new List<string> { "codepen.io" };
+        this.Hosts = ["codepen.io"];
 
         this.AddMatches(@"/(?:team/)?(?:[\w]+)/pen/([\w]+)/?");
-        
+
         this.Endpoint = "https://codepen.io/api/oembed";
     }
 }