懒得勤快 10 月之前
父节点
当前提交
eee49bfc86

+ 1 - 1
Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 <Project>
  <PropertyGroup>
  <PropertyGroup>
-   <Version>2024.6.1</Version>
+   <Version>2024.7</Version>
    <Deterministic>true</Deterministic>
    <Deterministic>true</Deterministic>
  </PropertyGroup>
  </PropertyGroup>
 </Project>
 </Project>

+ 1 - 1
NetCoreTest/NetCoreTest.csproj

@@ -6,7 +6,7 @@
     <ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>
     <ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>
   </PropertyGroup>
   </PropertyGroup>
   <ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Folder Include="Controllers\" />
     <Folder Include="Controllers\" />

+ 1 - 1
Test/Masuit.Tools.AspNetCore.ResumeFileResults.WebTest/Masuit.Tools.AspNetCore.ResumeFileResults.WebTest.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>

+ 3 - 5
Test/Masuit.Tools.Core.Test/AspNetCore/ObjectExtensionTests.cs

@@ -27,7 +27,7 @@ namespace Masuit.Tools.Core.Test.AspNetCore
                 remarks = new List<string> { "Deep  Dark  Fantastic", "爱玩游戏♂" },
                 remarks = new List<string> { "Deep  Dark  Fantastic", "爱玩游戏♂" },
             };
             };
 
 
-            var json = obj.ToJson();
+            var json = obj.ToJsonString(new JsonSerializerOptions() { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
 
 
             Assert.Equal(
             Assert.Equal(
                 "{\"Id\":1,\"name\":\"van\",\"addressInfo\":{\"street\":\"123 Main St\",\"city\":\"zcvz\"},\"remarks\":[\"Deep  Dark  Fantastic\",\"爱玩游戏\u2642\"]}",
                 "{\"Id\":1,\"name\":\"van\",\"addressInfo\":{\"street\":\"123 Main St\",\"city\":\"zcvz\"},\"remarks\":[\"Deep  Dark  Fantastic\",\"爱玩游戏\u2642\"]}",
@@ -55,14 +55,13 @@ namespace Masuit.Tools.Core.Test.AspNetCore
         {
         {
             var json = "{\"Name\":\"van\",\"Age\":52}";
             var json = "{\"Name\":\"van\",\"Age\":52}";
 
 
-            var obj = json.ToObject<People>();
+            var obj = json.FromJson<People>(new JsonSerializerOptions() { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
 
 
             Assert.Equal(
             Assert.Equal(
                 "van",
                 "van",
                 obj.Name);
                 obj.Name);
         }
         }
 
 
-
         [Fact]
         [Fact]
         public void SerializeSortByNameTest()
         public void SerializeSortByNameTest()
         {
         {
@@ -72,7 +71,7 @@ namespace Masuit.Tools.Core.Test.AspNetCore
                 Age = 52,
                 Age = 52,
             };
             };
 
 
-            var json = obj.ToJson(new JsonSerializerOptions
+            var json = obj.ToJsonString(new JsonSerializerOptions
             {
             {
                 Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
                 Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
                 TypeInfoResolver = new SerializeSortByNameResolver()
                 TypeInfoResolver = new SerializeSortByNameResolver()
@@ -83,7 +82,6 @@ namespace Masuit.Tools.Core.Test.AspNetCore
                 json);
                 json);
         }
         }
 
 
-
         private class People
         private class People
         {
         {
             public string Name { get; set; }
             public string Name { get; set; }