Major: Add support for net10

mingyaulee · mingyaulee · commit a6368b5b6b77 · 2025-11-13T19:31:00.000Z
diff --git a/.github/workflows/WebExtensions.Net-Build.yml b/.github/workflows/WebExtensions.Net-Build.yml
@@ -9,7 +9,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  DOTNET_VERSION: '9.0'
+  DOTNET_VERSION: '10.0'
 
 jobs:
   version:
diff --git a/.github/workflows/WebExtensions.Net-PR-Build.yml b/.github/workflows/WebExtensions.Net-PR-Build.yml
@@ -9,7 +9,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  DOTNET_VERSION: '9.0'
+  DOTNET_VERSION: '10.0'
 
 jobs:
   buildAndTestPR:
diff --git a/.github/workflows/WebExtensions.Net-Release.yml b/.github/workflows/WebExtensions.Net-Release.yml
@@ -5,7 +5,7 @@ on:
     types: [ published ]
 
 env:
-  DOTNET_VERSION: '9.0'
+  DOTNET_VERSION: '10.0'
 
 jobs:
   release:
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(ProjectIsInSrc)' == 'true'">
-    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GenerateDependencyFile>false</GenerateDependencyFile>
@@ -18,13 +18,13 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(ProjectIsInTool)' == 'true'">
-    <TargetFrameworks>net9.0</TargetFrameworks>
+    <TargetFrameworks>net10.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(ProjectIsInTest)' == 'true'">
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,25 +5,24 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(ProjectIsInSrc)' == 'true'">
-    <PackageVersion Include="JsBind.Net" Version="2.2.1" />
-    <PackageVersion Include="JsBind.Net.Extensions.DependencyInjection" Version="2.2.1" />
+    <PackageVersion Include="JsBind.Net" Version="3.0.0" />
+    <PackageVersion Include="JsBind.Net.Extensions.DependencyInjection" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(ProjectIsInTool)' == 'true'">
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(ProjectIsInTest)' == 'true'">
-    <PackageVersion Include="Blazor.BrowserExtension.Build" Version="3.2.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.9" />
+    <PackageVersion Include="Blazor.BrowserExtension.Build" Version="3.2.4" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageVersion Include="Microsoft.Playwright" Version="1.55.0" />
     <PackageVersion Include="MSTest.TestAdapter" Version="4.0.0" />
     <PackageVersion Include="MSTest.TestFramework" Version="4.0.0" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
-    <PackageVersion Include="System.Xml.XmlSerializer" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/WebExtensions.Net/Generated/Manifest/ExtensionID.cs b/src/WebExtensions.Net/Generated/Manifest/ExtensionID.cs
@@ -8,11 +8,9 @@ namespace WebExtensions.Net.Manifest;
 [JsonConverter(typeof(MultiTypeJsonConverter<ExtensionID>))]
 public partial class ExtensionID(string value) : BaseMultiTypeObject(value, typeof(string))
 {
-    private readonly string valueString;
-
     /// <summary>Converts from <see cref="ExtensionID" /> to <see cref="string" />.</summary>
     /// <param name="value">The value to convert from.</param>
-    public static implicit operator string(ExtensionID value) => value.valueString;
+    public static implicit operator string(ExtensionID value) => value.Value as string;
 
     /// <summary>Converts from <see cref="string" /> to <see cref="ExtensionID" />.</summary>
     /// <param name="value">The value to convert from.</param>
diff --git a/src/WebExtensions.Net/Generated/Manifest/MatchPatternRestricted.cs b/src/WebExtensions.Net/Generated/Manifest/MatchPatternRestricted.cs
@@ -8,11 +8,9 @@ namespace WebExtensions.Net.Manifest;
 [JsonConverter(typeof(MultiTypeJsonConverter<MatchPatternRestricted>))]
 public partial class MatchPatternRestricted(string value) : BaseMultiTypeObject(value, typeof(string))
 {
-    private readonly string valueString;
-
     /// <summary>Converts from <see cref="MatchPatternRestricted" /> to <see cref="string" />.</summary>
     /// <param name="value">The value to convert from.</param>
-    public static implicit operator string(MatchPatternRestricted value) => value.valueString;
+    public static implicit operator string(MatchPatternRestricted value) => value.Value as string;
 
     /// <summary>Converts from <see cref="string" /> to <see cref="MatchPatternRestricted" />.</summary>
     /// <param name="value">The value to convert from.</param>
diff --git a/src/WebExtensions.Net/Generated/generated.txt b/src/WebExtensions.Net/Generated/generated.txt
@@ -1 +1 @@
-This file is auto generated at 2025-10-11T16:17:19
+This file is auto generated at 2025-10-12T20:05:14
diff --git a/src/WebExtensions.Net/TypeConstructor.cs b/src/WebExtensions.Net/TypeConstructor.cs
@@ -230,12 +230,15 @@ public static object CreateInstance(Type type, JsonElement value, JsonSerializer
 
     private static TypeConstructor GetOrCreateTypeContructor(Type type)
     {
-        if (!cachedConstructors.TryGetValue(type, out var constructor))
+        lock (cachedConstructors)
         {
-            constructor = new TypeConstructor(type);
-            cachedConstructors.Add(type, constructor);
-        }
+            if (!cachedConstructors.TryGetValue(type, out var constructor))
+            {
+                constructor = new TypeConstructor(type);
+                cachedConstructors.Add(type, constructor);
+            }
 
-        return constructor;
+            return constructor;
+        }
     }
 }
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/wwwroot/index.html b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/wwwroot/index.html
@@ -24,7 +24,6 @@
         <a class="dismiss">🗙</a>
     </div>
     <script src="_framework/blazor.webassembly.js" autostart="false"></script>
-    <script src="_content/JsBind.Net/JsBindNet.js"></script>
     <script src="js/tests.js"></script>
 </body>
 
diff --git a/test/WebExtensions.Net.IntegrationTestsRunner/AssemblyInfo.cs b/test/WebExtensions.Net.IntegrationTestsRunner/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[assembly: Parallelize]
diff --git a/test/WebExtensions.Net.IntegrationTestsRunner/WebExtensions.Net.IntegrationTestsRunner.csproj b/test/WebExtensions.Net.IntegrationTestsRunner/WebExtensions.Net.IntegrationTestsRunner.csproj
@@ -5,7 +5,6 @@
     <PackageReference Include="Microsoft.Playwright" />
     <PackageReference Include="MSTest.TestAdapter" />
     <PackageReference Include="MSTest.TestFramework" />
-    <PackageReference Include="System.Xml.XmlSerializer" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/WebExtensions.Net.Test/AssemblyInfo.cs b/test/WebExtensions.Net.Test/AssemblyInfo.cs
@@ -0,0 +1 @@
+﻿[assembly: Parallelize]
diff --git a/tool/WebExtensions.Net.Generator/CodeGeneration/CodeConverters/MultitypeConstructorCodeConverter.cs b/tool/WebExtensions.Net.Generator/CodeGeneration/CodeConverters/MultitypeConstructorCodeConverter.cs
@@ -101,13 +101,16 @@ private void WriteConstructor(CodeWriter codeWriter, ClrTypeInfo clrTypeInfo, bo
 
         if (privateField is not null)
         {
-            codeWriter.Properties
-                .WriteLine($"private readonly {clrTypeInfo.CSharpName} {privateField};");
+            if (!usePrimaryConstructor)
+            {
+                codeWriter.Properties
+                    .WriteLine($"private readonly {clrTypeInfo.CSharpName} {privateField};");
+            }
 
             codeWriter.PublicMethods
                 .WriteWithConverter(new CommentSummaryCodeConverter($"Converts from <see cref=\"{className}\" /> to <see cref=\"{clrTypeInfo.CSharpName}\" />."))
                 .WriteWithConverter(new CommentParamCodeSectionConverter(valueParameterName, "The value to convert from."))
-                .WriteLine($"public static implicit operator {clrTypeInfo.CSharpName}({className} {valueParameterName}) => {valueParameterName}.{privateField};");
+                .WriteLine($"public static implicit operator {clrTypeInfo.CSharpName}({className} {valueParameterName}) => {valueParameterName}.{(usePrimaryConstructor ? $"Value as {clrTypeInfo.CSharpName}" : privateField)};");
 
             codeWriter.PublicMethods
                 .WriteWithConverter(new CommentSummaryCodeConverter($"Converts from <see cref=\"{clrTypeInfo.CSharpName}\" /> to <see cref=\"{className}\" />."))
diff --git a/tool/WebExtensions.Net.Generator/appsettings.json b/tool/WebExtensions.Net.Generator/appsettings.json
@@ -140,6 +140,7 @@
       "windows"
     ],
     "ExcludeNamespaces": [
+      ""
     ]
   },
   "classTranslationOptions": {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-This file is auto generated at 2025-10-11T16:17:19`
	`1`	`+This file is auto generated at 2025-10-12T20:05:14`
Original file line number	Diff line number	Diff line change
`@@ -230,12 +230,15 @@ public static object CreateInstance(Type type, JsonElement value, JsonSerializer`
`230`	`230`
`231`	`231`	`private static TypeConstructor GetOrCreateTypeContructor(Type type)`
`232`	`232`	`{`
`233`		`- if (!cachedConstructors.TryGetValue(type, out var constructor))`
	`233`	`+ lock (cachedConstructors)`
`234`	`234`	`{`
`235`		`- constructor = new TypeConstructor(type);`
`236`		`- cachedConstructors.Add(type, constructor);`
`237`		`- }`
	`235`	`+ if (!cachedConstructors.TryGetValue(type, out var constructor))`
	`236`	`+ {`
	`237`	`+ constructor = new TypeConstructor(type);`
	`238`	`+ cachedConstructors.Add(type, constructor);`
	`239`	`+ }`
`238`	`240`
`239`		`- return constructor;`
	`241`	`+ return constructor;`
	`242`	`+ }`
`240`	`243`	`}`
`241`	`244`	`}`