feat: 强签名程序集; change tfm;

stratosblue · stratosblue · commit cb2194d7222d · 2025-08-10T10:20:43.000+08:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,4 +1,4 @@
-<Project>
+﻿<Project>
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -7,5 +7,7 @@
     <IsPackable>false</IsPackable>
 
     <RootNamespace>System.Text.Json.Dynamic</RootNamespace>
+
+    <UseArtifactsOutput>true</UseArtifactsOutput>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark.csproj b/benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark/GenericBenchmark.cs b/benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark/GenericBenchmark.cs
@@ -1,14 +1,10 @@
-﻿using System.Text.Json;
-using System.Text.Json.Dynamic;
-using BenchmarkDotNet.Attributes;
+﻿using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 
-namespace Cuture.Extensions.SystemTextJson.Dynamic;
+namespace System.Text.Json.Dynamic;
 
-[SimpleJob(RuntimeMoniker.Net472)]
-[SimpleJob(RuntimeMoniker.Net60)]
-[SimpleJob(RuntimeMoniker.Net70)]
 [SimpleJob(RuntimeMoniker.Net80)]
+[SimpleJob(RuntimeMoniker.Net90)]
 [MemoryDiagnoser]
 public class GenericBenchmark
 {
@@ -59,7 +55,7 @@ public void JsonSerializerAccess()
 internal class Address
 {
     public AddressCode? Code { get; set; }
-    public string Name { get; set; }
+    public required string Name { get; set; }
 }
 
 internal class User
@@ -72,5 +68,5 @@ internal class User
 internal class AddressCode
 {
     public int Code { get; set; }
-    public string Name { get; set; }
+    public required string Name { get; set; }
 }
diff --git a/benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark/Program.cs b/benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark/Program.cs
@@ -1,5 +1,4 @@
-﻿using BenchmarkDotNet.Running;
-
-using Cuture.Extensions.SystemTextJson.Dynamic;
+﻿using System.Text.Json.Dynamic;
+using BenchmarkDotNet.Running;
 
 BenchmarkRunner.Run<GenericBenchmark>();
diff --git a/benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark/Properties/launchSettings.json b/benchmark/Cuture.Extensions.SystemTextJson.Dynamic.Benchmark/Properties/launchSettings.json
@@ -0,0 +1,7 @@
+﻿{
+  "profiles": {
+    "RunBenchmark": {
+      "commandName": "Project"
+    }
+  }
+}
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 ﻿{
   "msbuild-sdks": {
-    "MSTest.Sdk": "3.10.0"
+    "MSTest.Sdk": "3.10.1"
   }
 }
diff --git a/src/Cuture.Extensions.SystemTextJson.Dynamic/Cuture.Extensions.SystemTextJson.Dynamic.csproj b/src/Cuture.Extensions.SystemTextJson.Dynamic/Cuture.Extensions.SystemTextJson.Dynamic.csproj
@@ -1,10 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
 
     <IsPackable>true</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>Cuture.Extensions.SystemTextJson.Dynamic.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
@@ -36,7 +39,7 @@
     
     <Authors>Stratos</Authors>
 
-    <Version>1.1.0</Version>
+    <Version>1.1.1</Version>
 
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/cuture/Cuture.Extensions.SystemTextJson.Dynamic</PackageProjectUrl>
diff --git a/src/Cuture.Extensions.SystemTextJson.Dynamic/Cuture.Extensions.SystemTextJson.Dynamic.snk b/src/Cuture.Extensions.SystemTextJson.Dynamic/Cuture.Extensions.SystemTextJson.Dynamic.snk
diff --git a/test/Cuture.Extensions.SystemTextJson.Dynamic.Test/Assembly.cs b/test/Cuture.Extensions.SystemTextJson.Dynamic.Test/Assembly.cs
@@ -0,0 +1 @@
+﻿[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
diff --git a/test/Cuture.Extensions.SystemTextJson.Dynamic.Test/Cuture.Extensions.SystemTextJson.Dynamic.Test.csproj b/test/Cuture.Extensions.SystemTextJson.Dynamic.Test/Cuture.Extensions.SystemTextJson.Dynamic.Test.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="MSTest.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Cuture.Extensions.SystemTextJson.Dynamic.Test/DynamicEnumerableTest.cs b/test/Cuture.Extensions.SystemTextJson.Dynamic.Test/DynamicEnumerableTest.cs
@@ -10,13 +10,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]
diff --git a/test/Cuture.Extensions.SystemTextJson.Dynamic.Test/JSONArrayAccessTest.cs b/test/Cuture.Extensions.SystemTextJson.Dynamic.Test/JSONArrayAccessTest.cs
@@ -107,8 +107,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/test/Cuture.Extensions.SystemTextJson.Dynamic.Test/UndefinedTest.cs b/test/Cuture.Extensions.SystemTextJson.Dynamic.Test/UndefinedTest.cs
@@ -66,18 +66,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);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,10 @@`
`1`		`-using System.Text.Json;`
`2`		`-using System.Text.Json.Dynamic;`
`3`		`-using BenchmarkDotNet.Attributes;`
	`1`	`+using BenchmarkDotNet.Attributes;`
`4`	`2`	`using BenchmarkDotNet.Jobs;`
`5`	`3`
`6`		`-namespace Cuture.Extensions.SystemTextJson.Dynamic;`
	`4`	`+namespace System.Text.Json.Dynamic;`
`7`	`5`
`8`		`-[SimpleJob(RuntimeMoniker.Net472)]`
`9`		`-[SimpleJob(RuntimeMoniker.Net60)]`
`10`		`-[SimpleJob(RuntimeMoniker.Net70)]`
`11`	`6`	`[SimpleJob(RuntimeMoniker.Net80)]`
	`7`	`+[SimpleJob(RuntimeMoniker.Net90)]`
`12`	`8`	`[MemoryDiagnoser]`
`13`	`9`	`public class GenericBenchmark`
`14`	`10`	`{`
`@@ -59,7 +55,7 @@ public void JsonSerializerAccess()`
`59`	`55`	`internal class Address`
`60`	`56`	`{`
`61`	`57`	`public AddressCode? Code { get; set; }`
`62`		`- public string Name { get; set; }`
	`58`	`+ public required string Name { get; set; }`
`63`	`59`	`}`
`64`	`60`
`65`	`61`	`internal class User`
`@@ -72,5 +68,5 @@ internal class User`
`72`	`68`	`internal class AddressCode`
`73`	`69`	`{`
`74`	`70`	`public int Code { get; set; }`
`75`		`- public string Name { get; set; }`
	`71`	`+ public required string Name { get; set; }`
`76`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"msbuild-sdks": {`
`3`		`- "MSTest.Sdk": "3.10.0"`
	`3`	`+ "MSTest.Sdk": "3.10.1"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]`