V4

.github/workflows/ci.yml

@@ -14,11 +14,11 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - uses: actions/checkout@v3
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 7.0.x
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
     - name: Install dependencies

BooruSharp.Others/BooruSharp.Others.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.2.1</Version>
+    <Version>3.0.0</Version>
     <Authors>Xwilarg</Authors>
     <Company>Xwilarg</Company>
     <Description>Extension of BooruSharp to handle non-booru websites and handle them like the others</Description>
@@ -23,7 +23,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <ProjectReference Include="..\BooruSharp\BooruSharp.csproj" />
   </ItemGroup>
 

BooruSharp.Others/Pixiv.cs

@@ -1,8 +1,6 @@
 using BooruSharp.Booru;
 using BooruSharp.Search;
 using BooruSharp.Search.Post;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,7 +9,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
-
+/*
 namespace BooruSharp.Others
 {
     /// <summary>
@@ -451,3 +449,4 @@ private static void AddUserAgentHeader(HttpRequestMessage request)
         private readonly string _hashSecret = "28c1fdd170a5204386cb1313c7077b34f83e4aaf4aa829ce78c231e05b0bae2c";
     }
 }
+*/

BooruSharp.UnitTests/BooruSharp.UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
@@ -11,18 +11,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
-    <ProjectReference Include="..\BooruSharp.Others\BooruSharp.Others.csproj" />
-    <ProjectReference Include="..\BooruSharp\BooruSharp.csproj" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BooruSharp\BooruSharp.csproj" />
   </ItemGroup>
 
 </Project>

BooruSharp.UnitTests/BooruTestData.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace BooruSharp.UnitTests
+{
+    public record BooruTestData
+    {
+        public required Type BooruType;
+        public required string[] Tags;
+        public required int ValidPostId;
+        public required string ExplicitTag;
+    }
+}