opt: add tfm net10.0

stratosblue · stratosblue · commit 8343a6ff7c11 · 2025-11-12T21:36:54.000+08:00
diff --git a/.editorconfig b/.editorconfig
@@ -7,11 +7,8 @@ end_of_line = crlf
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
-dotnet_style_qualification_for_field = false:silent
-dotnet_style_qualification_for_property = false:silent
-dotnet_style_qualification_for_method = false:silent
-dotnet_style_qualification_for_event = false:silent
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+indent_size = 2
+tab_width = 2
 
 # c# 文件
 [*.cs]
@@ -116,6 +113,7 @@ csharp_style_prefer_readonly_struct = true
 # 代码块首选项
 csharp_prefer_braces = true:silent
 csharp_prefer_simple_using_statement = true:suggestion
+csharp_prefer_system_threading_lock = true:suggestion
 csharp_style_namespace_declarations = file_scoped:suggestion
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = true:silent
@@ -131,6 +129,7 @@ csharp_style_prefer_null_check_over_type_check = true
 csharp_style_prefer_range_operator = true
 csharp_style_prefer_tuple_swap = true
 csharp_style_prefer_utf8_string_literals = true
+csharp_style_prefer_primary_constructors = true:suggestion
 csharp_style_throw_expression = true
 csharp_style_unused_value_assignment_preference = discard_variable
 csharp_style_unused_value_expression_statement_preference = discard_variable
@@ -297,7 +296,3 @@ dotnet_naming_style.以_为前缀.required_prefix = _
 dotnet_naming_style.以_为前缀.required_suffix = 
 dotnet_naming_style.以_为前缀.word_separator = 
 dotnet_naming_style.以_为前缀.capitalization = camel_case
-
-[*.csproj]
-indent_size = 2
-tab_width = 2
diff --git a/.github/workflows/PublishNugetPackage.yml b/.github/workflows/PublishNugetPackage.yml
@@ -16,8 +16,9 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          8.0.x
+          8.x
           9.x
+          10.x
     - name: restore dependencies
       run: dotnet restore
     - name: build
diff --git a/Cuture.Http.slnx b/Cuture.Http.slnx
@@ -7,7 +7,7 @@
     <File Path="Directory.Build.props" />
     <File Path="global.json" />
     <File Path="LICENSE" />
-    <File Path="readme.md" />
+    <File Path="README.md" />
   </Folder>
   <Folder Name="/src/">
     <Project Path="src/Cuture.Http/Cuture.Http.csproj" />
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 ﻿<Project>
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>true</ImplicitUsings>
@@ -12,12 +12,16 @@
     <McrDotNetVersion>9.0.0</McrDotNetVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$(TargetFramework) == 'net10.0'">
+    <McrDotNetVersion>10.0.0</McrDotNetVersion>
+  </PropertyGroup>
+  
   <!--Package Info-->
   <PropertyGroup>
     <PackageIdPrefix>Cuture.Http</PackageIdPrefix>
     <Authors>Stratos</Authors>
 
-    <Version>2.10.0</Version>
+    <Version>2.11.0</Version>
 
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/cuture/Cuture.Http</PackageProjectUrl>
diff --git a/README.md b/README.md
diff --git a/global.json b/global.json
@@ -1,5 +1,8 @@
 ﻿{
   "msbuild-sdks": {
-    "MSTest.Sdk": "3.8.3"
+    "MSTest.Sdk": "4.0.2"
+  },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
   }
 }
diff --git a/src/Cuture.Http/Cuture.Http.csproj b/src/Cuture.Http/Cuture.Http.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>用于快速进行Http请求的链式拓展方法库</Description>
 
-    <PackageReadmeFile>readme.md</PackageReadmeFile>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
 
     <Nullable>enable</Nullable>
 
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\readme.md" Link="readme.md" Pack="true" PackagePath="/" />
+    <None Include="..\..\README.md" Link="README.md" Pack="true" PackagePath="/" />
 
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>Cuture.Http.Test</_Parameter1>
diff --git a/src/Cuture.Http/DynamicJSON/Undefined.cs b/src/Cuture.Http/DynamicJSON/Undefined.cs
@@ -84,21 +84,21 @@ public static bool IsUndefined(in Func<object?> proprytyAccessDelegate)
     /// <summary>
     ///
     /// </summary>
-    /// <param name="a"></param>
+    /// <param name="_"></param>
     /// <param name="b"></param>
     /// <returns></returns>
-    public static bool operator !=(Undefined a, object b)
+    public static bool operator !=(Undefined _, object b)
     {
         return b is not null && b is not Undefined;
     }
 
     /// <summary>
     ///
     /// </summary>
-    /// <param name="a"></param>
+    /// <param name="_"></param>
     /// <param name="b"></param>
     /// <returns></returns>
-    public static bool operator ==(Undefined a, object b)
+    public static bool operator ==(Undefined _, object b)
     {
         return b is null || b is Undefined;
     }
diff --git a/src/Cuture.Http/Util/RequestBuildTool.Curl.cs b/src/Cuture.Http/Util/RequestBuildTool.Curl.cs
@@ -21,7 +21,7 @@ public static partial class RequestBuildTool
 
     private static readonly FrozenDictionary<ReadOnlyMemory<char>, OrderedOptionDescriptor> s_curlOptionDescriptors = new Dictionary<ReadOnlyMemory<char>, OrderedOptionDescriptor>()
     {
-        { "-X".AsMemory(), new (0, static (IHttpRequest request, in CurlCommandToken token) => request.UseVerb(token.Value.Span)) },
+        { "-X".AsMemory(), new (0, static (request, in token) => request.UseVerb(token.Value.Span)) },
         { "-H".AsMemory(), new(0, SetupRequestHeader) },
         { "--data-raw".AsMemory(), new(100, SetupRequestContentData) },
         { "--compressed".AsMemory(), new(0, NoopRequestSetupDelegate, true) },  //已强制请求需要压缩
diff --git a/tests/Cuture.Http.Test.Server/Cuture.Http.Test.Server.csproj b/tests/Cuture.Http.Test.Server/Cuture.Http.Test.Server.csproj
@@ -20,9 +20,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(McrDotNetVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(McrDotNetVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="$(McrDotNetVersion)" />
-    <PackageReference Include="System.IO.Pipelines" Version="$(McrDotNetVersion)" />
 
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(McrDotNetVersion)" />
   </ItemGroup>
diff --git a/tests/Cuture.Http.Test/Cuture.Http.Test.csproj b/tests/Cuture.Http.Test/Cuture.Http.Test.csproj
@@ -2,12 +2,18 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
+
+    <NoWarn>$(NoWarn);CS8632</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Titanium.Web.Proxy" Version="3.2.*" />
   </ItemGroup>
-  
+
+  <ItemGroup>
+    <AssemblyAttribute Include="Microsoft.VisualStudio.TestTools.UnitTesting.DoNotParallelizeAttribute"/>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\tests\Cuture.Http.Test.Server\Cuture.Http.Test.Server.csproj" />
     <ProjectReference Include="..\..\src\Cuture.Http\Cuture.Http.csproj" />
diff --git a/tests/Cuture.Http.Test/DownloadWithProgressTest.cs b/tests/Cuture.Http.Test/DownloadWithProgressTest.cs
@@ -34,7 +34,7 @@ public DownloadWithProgressTest()
     [TestMethod]
     public async Task DownloadTimeOutTestAsync()
     {
-        await Assert.ThrowsExceptionAsync<OperationCanceledException>(() => GetRequest().TimeOut(750).DownloadWithProgressAsync((count, downloaded) => { }, 40960));
+        await Assert.ThrowsExactlyAsync<OperationCanceledException>(() => GetRequest().TimeOut(750).DownloadWithProgressAsync((count, downloaded) => { }, 40960));
     }
 
     [TestMethod]
@@ -65,7 +65,7 @@ public async Task ParallelRequestTestAsync()
         }, 40960)).ToList();
 
         await Task.WhenAll(tasks);
-        Assert.IsTrue(progressCount > count * 10);
+        Assert.IsGreaterThan(count * 10, progressCount);
 
         tasks.ForEach(m =>
         {
@@ -90,7 +90,7 @@ public async Task SingleDownloadTestAsync()
 
         Debug.WriteLine($"progressCount:{progressCount}");
 
-        Assert.IsTrue(progressCount > 10);
+        Assert.IsGreaterThan(10, progressCount);
         Assert.IsNotNull(result);
 
         using var sha = SHA256.Create();
diff --git a/tests/Cuture.Http.Test/DynamicJSON/DynamicEnumerableTest.cs b/tests/Cuture.Http.Test/DynamicJSON/DynamicEnumerableTest.cs
@@ -14,13 +14,13 @@ public void ShouldCastFail()
     {
         DynamicJSONTestClass.GetTestValue(out var origin, out var json);
 
-        Assert.ThrowsException<InvalidCastException>(() => (IEnumerable<dynamic>)json.MyProperty6);
-        Assert.ThrowsException<InvalidCastException>(() => (IEnumerable<KeyValuePair<string, dynamic?>>)json.MyProperty6);
-        Assert.ThrowsException<InvalidCastException>(() => (IDynamicKeyValueEnumerable)json.MyProperty6);
+        Assert.ThrowsExactly<InvalidCastException>(() => (IEnumerable<dynamic>)json.MyProperty6);
+        Assert.ThrowsExactly<InvalidCastException>(() => (IEnumerable<KeyValuePair<string, dynamic?>>)json.MyProperty6);
+        Assert.ThrowsExactly<InvalidCastException>(() => (IDynamicKeyValueEnumerable)json.MyProperty6);
 
-        Assert.ThrowsException<InvalidCastException>(() => (IEnumerable<dynamic>)json);
-        Assert.ThrowsException<InvalidCastException>(() => (IEnumerable<KeyValuePair<string, dynamic?>>)json);
-        Assert.ThrowsException<InvalidCastException>(() => (IDynamicEnumerable)json);
+        Assert.ThrowsExactly<InvalidCastException>(() => (IEnumerable<dynamic>)json);
+        Assert.ThrowsExactly<InvalidCastException>(() => (IEnumerable<KeyValuePair<string, dynamic?>>)json);
+        Assert.ThrowsExactly<InvalidCastException>(() => (IDynamicEnumerable)json);
     }
 
     [TestMethod]
@@ -94,7 +94,7 @@ public void ShouldEqualLinqOnOrigin()
         var filtered = origin.MyProperty6.Where(m => m[0] > '1').ToArray();
         var dynamicFiltered = enumerable.Where(m => m[0] > '1').ToArray();
 
-        Assert.AreEqual(filtered.Length, dynamicFiltered.Length);
+        Assert.HasCount(filtered.Length, dynamicFiltered);
 
         for (int i = 0; i < filtered.Length; i++)
         {
@@ -111,7 +111,7 @@ public void ShouldEqualOrigin()
 
         var dynamicToArray = enumerable.ToArray();
 
-        Assert.AreEqual(origin.MyProperty6.Length, dynamicToArray.Length);
+        Assert.HasCount(origin.MyProperty6.Length, dynamicToArray);
 
         for (int i = 0; i < origin.MyProperty6.Length; i++)
         {
diff --git a/tests/Cuture.Http.Test/DynamicJSON/JSONArrayAccessTest.cs b/tests/Cuture.Http.Test/DynamicJSON/JSONArrayAccessTest.cs
@@ -103,8 +103,8 @@ public void ShouldThrowOutOfRangeException()
     {
         DynamicJSONTestClass.GetTestValue(out var origin, out var json);
 
-        Assert.ThrowsException<ArgumentOutOfRangeException>(() => Access(json.MyProperty6[json.MyProperty6.length + 1]));
-        Assert.ThrowsException<ArgumentOutOfRangeException>(() => Access(json.MyProperty6[-1]));
+        Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => Access(json.MyProperty6[json.MyProperty6.length + 1]));
+        Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => Access(json.MyProperty6[-1]));
     }
 
     #endregion Public 方法
diff --git a/tests/Cuture.Http.Test/DynamicJSON/UndefinedTest.cs b/tests/Cuture.Http.Test/DynamicJSON/UndefinedTest.cs
@@ -68,18 +68,18 @@ public void ShouldThrowForOperation()
     {
         DynamicJSONTestClass.GetTestValue(out _, out var json);
 
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield[1]);
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield.length);
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield + 1);
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield - 1);
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield * 1);
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield / 1);
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield % 1);
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield ^ 1);
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield | 1);
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield & 1);
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield << 1);
-        Assert.ThrowsException<InvalidOperationException>(() => json.notexistfield >> 1);
-        Assert.ThrowsException<InvalidOperationException>(() => ~json.notexistfield);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield[1]);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield.length);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield + 1);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield - 1);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield * 1);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield / 1);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield % 1);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield ^ 1);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield | 1);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield & 1);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield << 1);
+        Assert.ThrowsExactly<InvalidOperationException>(() => json.notexistfield >> 1);
+        Assert.ThrowsExactly<InvalidOperationException>(() => ~json.notexistfield);
     }
 }
diff --git a/tests/Cuture.Http.Test/HttpMessageInvokerPoolTest.cs b/tests/Cuture.Http.Test/HttpMessageInvokerPoolTest.cs
@@ -145,7 +145,7 @@ public void GetClient()
 
         #endregion 有验证的代理请求2
 
-        Assert.AreEqual(4, hashSet.Count);
+        Assert.HasCount(4, hashSet);
     }
 
     [TestInitialize]
@@ -195,7 +195,7 @@ public void ParallelGetProxyClient()
             LocalRentInvoker(i % proxies.Length, hashSet);
         });
 
-        Assert.AreEqual(7, hashSet.Count);
+        Assert.HasCount(7, hashSet);
 
         void LocalRentInvoker(int index, HashSet<object> hashSet)
         {
diff --git a/tests/Cuture.Http.Test/RequestReuseTest.cs b/tests/Cuture.Http.Test/RequestReuseTest.cs
@@ -24,7 +24,7 @@ public async Task DefaultHttpRequestTest()
 
         Assert.IsTrue(firstRequestResult.IsSuccessStatusCode);
 
-        await Assert.ThrowsExceptionAsync<InvalidOperationException>(() => request.GetAsStringAsync());
+        await Assert.ThrowsExactlyAsync<InvalidOperationException>(() => request.GetAsStringAsync());
     }
 
     [TestMethod]
diff --git a/tests/Cuture.Http.Test/SimpleHttpMessageInvokerPoolTest.cs b/tests/Cuture.Http.Test/SimpleHttpMessageInvokerPoolTest.cs
@@ -55,7 +55,7 @@ public void ShouldThrowArgumentExceptionWithInvalidTime()
                 {
                     continue;
                 }
-                Assert.ThrowsException<ArgumentOutOfRangeException>(() => new SimpleHttpMessageInvokerPool(datas[i][0], datas[j][1]));
+                Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => new SimpleHttpMessageInvokerPool(datas[i][0], datas[j][1]));
             }
         }
     }
diff --git a/tests/Cuture.Http.Test/Util/CookieUtilityTest.cs b/tests/Cuture.Http.Test/Util/CookieUtilityTest.cs
@@ -10,8 +10,8 @@ public class CookieUtilityTest
     [TestMethod]
     public void AnalysisCookieString()
     {
-        Assert.AreEqual(0, CookieUtility.AnalysisCookieString(null).Count);
-        Assert.AreEqual(0, CookieUtility.AnalysisCookieString(string.Empty).Count);
+        Assert.IsEmpty(CookieUtility.AnalysisCookieString(null));
+        Assert.IsEmpty(CookieUtility.AnalysisCookieString(string.Empty));
 
         var cookieText = "BD_NOT_HTTPS=1; path=/; Max-Age=300; BIDUPSID=A6CA0EC8A85503305FD031A7F061057F; expires=Thu, 31-Dec-37 23:55:55 GMT; max-age=2147483647; path=/; domain=.baidu.com; PSTM=1649067919; expires=Thu, 31-Dec-37 23:55:55 GMT; max-age=2147483647; path=/; domain=.baidu.com; BAIDUID=A6CA0EC8A85503306B384002260FDAE3:FG=1; max-age=31536000; expires=Tue, 04-Apr-23 10:25:19 GMT; domain=.baidu.com; path=/; version=1; comment=bd";
 
@@ -27,7 +27,7 @@ public void AnalysisCookieString()
 
         var cookies = CookieUtility.AnalysisCookieString(cookieText);
 
-        Assert.AreEqual(kvs.Count, cookies.Count);
+        Assert.HasCount(kvs.Count, cookies);
 
         foreach (var kv in kvs)
         {
@@ -97,7 +97,7 @@ private static void CheckCookies(Dictionary<string, string> kvs, string cookieTe
                                   .Select(m =>
                                   {
                                       var index = m.IndexOf('=');
-                                      Assert.IsTrue(index > 0);
+                                      Assert.IsGreaterThan(0, index);
                                       return new[] {
                                         m[0..index],
                                         m[(index+1)..],
@@ -106,16 +106,16 @@ private static void CheckCookies(Dictionary<string, string> kvs, string cookieTe
 
         foreach (var kv in cookieKVs)
         {
-            Assert.AreEqual(2, kv.Length);
+            Assert.HasCount(2, kv);
 
             var key = kv[0].Trim();
             var value = kv[1].Trim();
 
             Assert.IsTrue(kvs.TryGetValue(key, out var actualValue), $"{key} not found.");
-            Assert.AreEqual(actualValue, value);
+            Assert.AreEqual(value, actualValue);
 
             kvs.Remove(key);
         }
-        Assert.AreEqual(0, kvs.Count);
+        Assert.IsEmpty(kvs);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"msbuild-sdks": {`
`3`		`- "MSTest.Sdk": "3.8.3"`
	`3`	`+ "MSTest.Sdk": "4.0.2"`
	`4`	`+ },`
	`5`	`+ "test": {`
	`6`	`+ "runner": "Microsoft.Testing.Platform"`
`4`	`7`	`}`
`5`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public static partial class RequestBuildTool`
`21`	`21`
`22`	`22`	`private static readonly FrozenDictionary<ReadOnlyMemory<char>, OrderedOptionDescriptor> s_curlOptionDescriptors = new Dictionary<ReadOnlyMemory<char>, OrderedOptionDescriptor>()`
`23`	`23`	`{`
`24`		`- { "-X".AsMemory(), new (0, static (IHttpRequest request, in CurlCommandToken token) => request.UseVerb(token.Value.Span)) },`
	`24`	`+ { "-X".AsMemory(), new (0, static (request, in token) => request.UseVerb(token.Value.Span)) },`
`25`	`25`	`{ "-H".AsMemory(), new(0, SetupRequestHeader) },`
`26`	`26`	`{ "--data-raw".AsMemory(), new(100, SetupRequestContentData) },`
`27`	`27`	`{ "--compressed".AsMemory(), new(0, NoopRequestSetupDelegate, true) }, //已强制请求需要压缩`