Merge pull request #226 from dotnetcore/any

更新 .NET8 版本并修复 UT 测试
dotnetcore · Nov 15, 2023 · 9bc2ba1 · 9bc2ba1
2 parents 44ca43e + f0dacc1
commit 9bc2ba1
Show file tree

Hide file tree

Showing 55 changed files with 133 additions and 84 deletions.
diff --git a/.github/NMS_TEMPLATE/test.yml.template b/.github/NMS_TEMPLATE/test.yml.template
@@ -21,9 +21,8 @@ jobs:
       with:
         dotnet-version: |
           3.1.x
-          5.0.x
           6.0.x
-          7.0.x
+          8.0.x
 
 ${{nms.tests}}
 

diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
@@ -21,9 +21,8 @@ jobs:
       with:
         dotnet-version: |
           3.1.x
-          5.0.x
           6.0.x
-          7.0.x
+          8.0.x
           
     - name: 🚦 NatashaFunctionUT UT Test
       run: dotnet test './test/ut/NatashaFunctionUT' --nologo -c Release -l "trx;LogFileName=NatashaFunctionUT.trx" --results-directory "TestResults"

diff --git a/...a.CSharp/Natasha.CSharp.Compiler/MultiDomain/CompileUnit/AssemblyCSharpBuilder.Compile.cs b/...a.CSharp/Natasha.CSharp.Compiler/MultiDomain/CompileUnit/AssemblyCSharpBuilder.Compile.cs
@@ -8,7 +8,7 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System.IO;
 using System.Reflection;
 using Natasha.CSharp.Component.Domain;

diff --git a/...ha.CSharp/Natasha.CSharp.Compiler/MultiDomain/CompileUnit/AssemblyCSharpBuilder.Domain.cs b/...ha.CSharp/Natasha.CSharp.Compiler/MultiDomain/CompileUnit/AssemblyCSharpBuilder.Domain.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System.Runtime.Loader;
 
 /// <summary>

diff --git a/...harp/Natasha.CSharp.Compiler/MultiDomain/CompileUnit/AssemblyCSharpBuilder.Ouput.Multi.cs b/...harp/Natasha.CSharp.Compiler/MultiDomain/CompileUnit/AssemblyCSharpBuilder.Ouput.Multi.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System.IO;
 
 /// <summary>

diff --git a/...ha.CSharp/Natasha.CSharp.Compiler/MultiDomain/CompileUnit/AssemblyCSharpBuilder.Syntax.cs b/...ha.CSharp/Natasha.CSharp.Compiler/MultiDomain/CompileUnit/AssemblyCSharpBuilder.Syntax.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System.Text;
 /// <summary>
 /// 程序集编译构建器 - 语法树相关

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/CompileUnit/AssemblyCSharpBuilder.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/CompileUnit/AssemblyCSharpBuilder.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using Natasha.CSharp.Compiler.SemanticAnalaysis;
 using System;
 using System.Runtime.CompilerServices;

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Component/Domain/DomainManagement.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Component/Domain/DomainManagement.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System;
 using System.Collections.Concurrent;
 using static System.Runtime.Loader.AssemblyLoadContext;

diff --git a/...asha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Component/Domain/NatashaReferenceCache.cs b/...asha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Component/Domain/NatashaReferenceCache.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using Microsoft.CodeAnalysis;
 using Natasha.CSharp.Component.Domain;
 using Natasha.Domain.Extension;

diff --git a/...sha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Component/Domain/NatashaReferenceDomain.cs b/...sha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Component/Domain/NatashaReferenceDomain.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using Microsoft.CodeAnalysis;
 using Natasha.CSharp.Component;
 using Natasha.CSharp.Component.Domain;

diff --git a/....CSharp/Natasha.CSharp.Compiler/MultiDomain/Extension/Inner/CSharpCompilationExtension.cs b/....CSharp/Natasha.CSharp.Compiler/MultiDomain/Extension/Inner/CSharpCompilationExtension.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using System;

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Extension/NatashaAssemblyExtension.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Extension/NatashaAssemblyExtension.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System.Reflection;
 using System.Runtime.Loader;
 

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Extension/NatashaDelegateExtension.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Extension/NatashaDelegateExtension.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System;
 
 

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Extension/NatashaDomainExtension.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Extension/NatashaDomainExtension.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System;
 using System.Collections.Generic;
 using System.Reflection;

diff --git a/...atasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Extension/NatashaTypeDomainExtension.cs b/...atasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/Extension/NatashaTypeDomainExtension.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System;
 public static class NatashaTypeDomainExtension
 {

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/NatashaInitializer.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/NatashaInitializer.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.DependencyModel;
 using System;
@@ -25,7 +25,6 @@ public static void Preheating(Func<AssemblyName, string?, bool>? excludeReferenc
         , bool useRuntimeReference = false
         )
     {
-
         if (!_isCompleted)
         {
             lock (_lock)

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/NatashaManagement.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/MultiDomain/NatashaManagement.cs
@@ -1,4 +1,4 @@
-# if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System;
 using System.Threading.Tasks;
 

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/Natasha.CSharp.Compiler.csproj b/src/Natasha.CSharp/Natasha.CSharp.Compiler/Natasha.CSharp.Compiler.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;</TargetFrameworks>
 		<Description>Natasha 的 C# 版编译器</Description>
 		<PackageId>DotNetCore.Natasha.CSharp.Compiler</PackageId>
 		<PackageReleaseNotes>升级到最新版.</PackageReleaseNotes>
@@ -12,17 +12,15 @@
 		<AssemblyVersion>5.2.2.1</AssemblyVersion>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net5.1' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
-		<DefineConstants>MULTI;</DefineConstants>
-	</PropertyGroup>
-
 	<ItemGroup>
-		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
+		<PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0" />
 	</ItemGroup>
-
-	<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net5.1' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
+	<!--<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net5.1' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0'">
+		<ProjectReference Include="..\..\Natasha.Domain\Natasha.Domain.csproj" />
+	</ItemGroup>-->
+	<ItemGroup Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.0')))">
 		<ProjectReference Include="..\..\Natasha.Domain\Natasha.Domain.csproj" />
 	</ItemGroup>
 
@@ -42,5 +40,8 @@
 		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="build\net7.0\DotNetCore.Natasha.CSharp.Compiler.targets" />
 		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildTransitive\net7.0\DotNetCore.Natasha.CSharp.Compiler.targets" />
 		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildMultiTargeting\net7.0\DotNetCore.Natasha.CSharp.Compiler.targets" />
+		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="build\net8.0\DotNetCore.Natasha.CSharp.Compiler.targets" />
+		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildTransitive\net8.0\DotNetCore.Natasha.CSharp.Compiler.targets" />
+		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildMultiTargeting\net8.0\DotNetCore.Natasha.CSharp.Compiler.targets" />
 	</ItemGroup>
 </Project>
diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/Public/Extension/NatashaStringExtension.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/Public/Extension/NatashaStringExtension.cs
@@ -3,9 +3,11 @@
 
     public static string ToReadonlyScript(this string field)
     {
-
+#if NET8_0_OR_GREATER
+        return $"Unsafe.AsRef(ref {field})";
+#else
         return $"Unsafe.AsRef({field})";
-
+#endif
     }
 
 }

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/Public/NatashaManagement.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/Public/NatashaManagement.cs
@@ -3,7 +3,7 @@
 
 public static partial class NatashaManagement
 {
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
     /// <summary>
     /// 和 NatashaInitializer.Preheating(); 一样
     /// </summary>

diff --git a/....CSharp/Natasha.CSharp.Compiler/SingleDomain/CompileUnit/AssemblyCSharpBuilder.Compile.cs b/....CSharp/Natasha.CSharp.Compiler/SingleDomain/CompileUnit/AssemblyCSharpBuilder.Compile.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Emit;

diff --git a/...rp/Natasha.CSharp.Compiler/SingleDomain/CompileUnit/AssemblyCSharpBuilder.Ouput.Single.cs b/...rp/Natasha.CSharp.Compiler/SingleDomain/CompileUnit/AssemblyCSharpBuilder.Ouput.Single.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using System;
 using System.IO;
 

diff --git a/...a.CSharp/Natasha.CSharp.Compiler/SingleDomain/CompileUnit/AssemblyCSharpBuilder.Syntax.cs b/...a.CSharp/Natasha.CSharp.Compiler/SingleDomain/CompileUnit/AssemblyCSharpBuilder.Syntax.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 /// <summary>
 /// 程序集编译构建器 - 语法树相关
 /// </summary>

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/SingleDomain/CompileUnit/AssemblyCSharpBuilder.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/SingleDomain/CompileUnit/AssemblyCSharpBuilder.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using Natasha.CSharp.Compiler.SemanticAnalaysis;
 using System;
 using System.Runtime.CompilerServices;

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/SingleDomain/Component/NatashaReferenceCache.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/SingleDomain/Component/NatashaReferenceCache.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using Microsoft.CodeAnalysis;
 using System.Collections.Generic;
 using System.IO;

diff --git a/...CSharp/Natasha.CSharp.Compiler/SingleDomain/Extension/Inner/CSharpCompilationExtension.cs b/...CSharp/Natasha.CSharp.Compiler/SingleDomain/Extension/Inner/CSharpCompilationExtension.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using System;

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/SingleDomain/NatashaInitializer.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/SingleDomain/NatashaInitializer.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.DependencyModel;
 using Natasha.CSharp;

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/SingleDomain/NatashaManagement.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/SingleDomain/NatashaManagement.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using Natasha.CSharp.Component;
 using System;
 using System.Reflection;

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/API/Builder/OopBuilder.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/API/Builder/OopBuilder.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using Natasha.CSharp.Template;
 
 namespace Natasha.CSharp.Builder

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/API/Level2/NHandler.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/API/Level2/NHandler.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using Natasha.CSharp.Builder;
 using System;
 

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/API/Level3/NInstance.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/API/Level3/NInstance.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System;
 
 namespace Natasha.CSharp

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/Oop/UsingTemplate.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/Oop/UsingTemplate.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 namespace Natasha.CSharp.Template
 {
 

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/Standard/ComplierTemplate.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/Standard/ComplierTemplate.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System;
 
 namespace Natasha.CSharp.Template

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/Standard/GlobalUsingTemplate.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/MultiDomain/Standard/GlobalUsingTemplate.cs
@@ -1,4 +1,4 @@
-#if MULTI
+#if NETCOREAPP3_0_OR_GREATER
 using System.Diagnostics;
 using System.Text;
 

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/Natasha.CSharp.Template.csproj b/src/Natasha.CSharp/Natasha.CSharp.Template/Natasha.CSharp.Template.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;</TargetFrameworks>
 		<Description>Natasha 的编译模板</Description>
 		<PackageId>DotNetCore.Natasha.CSharp.Template</PackageId>
 		<PackageReleaseNotes>升级到最新版.</PackageReleaseNotes>
@@ -12,10 +12,6 @@
 		<AssemblyVersion>5.2.2.1</AssemblyVersion>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net5.1' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
-		<DefineConstants>MULTI;</DefineConstants>
-	</PropertyGroup>
-
 	<ItemGroup>
 	  <ProjectReference Include="..\Natasha.CSharp.Compiler\Natasha.CSharp.Compiler.csproj" />
 	</ItemGroup>
@@ -37,5 +33,8 @@
 		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="build\net7.0\DotNetCore.Natasha.CSharp.Template.targets" />
 		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildTransitive\net7.0\DotNetCore.Natasha.CSharp.Template.targets" />
 		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildMultiTargeting\net7.0\DotNetCore.Natasha.CSharp.Template.targets" />
+		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="build\net8.0\DotNetCore.Natasha.CSharp.Template.targets" />
+		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildTransitive\net8.0\DotNetCore.Natasha.CSharp.Template.targets" />
+		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildMultiTargeting\net8.0\DotNetCore.Natasha.CSharp.Template.targets" />
 	</ItemGroup>
 </Project>
diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/Public/Method/ParameterTemplate.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/Public/Method/ParameterTemplate.cs
@@ -101,10 +101,7 @@ public T Param<S>(string paramName, string keywords = "")
         /// <returns></returns>
         public virtual T Param(string type, string paramName, string keywords = "")
         {
-
-
             return Param($"{keywords}{type} {paramName}");
-
         }
         /// <summary>
         /// 添加参数

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/SingleDomain/API/Builder/OopBuilder.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/SingleDomain/API/Builder/OopBuilder.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using Natasha.CSharp.Template;
 
 namespace Natasha.CSharp.Builder

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/SingleDomain/API/Level2/NHandler.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/SingleDomain/API/Level2/NHandler.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using Natasha.CSharp.Builder;
 using System;
 

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/SingleDomain/API/Level3/NInstance.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/SingleDomain/API/Level3/NInstance.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using System;
 
 namespace Natasha.CSharp

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/SingleDomain/Standard/ComplierTemplate.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/SingleDomain/Standard/ComplierTemplate.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using System;
 
 namespace Natasha.CSharp.Template

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Template/SingleDomain/Standard/GlobalUsingTemplate.cs b/src/Natasha.CSharp/Natasha.CSharp.Template/SingleDomain/Standard/GlobalUsingTemplate.cs
@@ -1,4 +1,4 @@
-#if !MULTI
+#if !NETCOREAPP3_0_OR_GREATER
 using System.Diagnostics;
 using System.Text;
 

diff --git a/src/Natasha.Domain/Core/NatashaDomain.Default.cs b/src/Natasha.Domain/Core/NatashaDomain.Default.cs
@@ -2,14 +2,11 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.Loader;
-using System.Text;
 using System.Threading;
-using System.Xml.Linq;
 
 
 public partial class NatashaDomain : AssemblyLoadContext

diff --git a/src/Natasha.Domain/Core/NatashaDomain.cs b/src/Natasha.Domain/Core/NatashaDomain.cs
@@ -20,7 +20,7 @@ protected NatashaDomain() : base("Default")
         _assemblyLoadBehavior = PluginLoadBehavior.None;
         _excludePluginReferencesFunc = item => false;
         _dependencyResolver = new AssemblyDependencyResolver(AppDomain.CurrentDomain.BaseDirectory!);
-        Unsafe.AsRef(DefaultDomain) = this;
+        Unsafe.AsRef(in DefaultDomain) = this;
 
     }
     public NatashaDomain(string key) : base(key, true)

diff --git a/src/Natasha.Domain/Natasha.Domain.csproj b/src/Natasha.Domain/Natasha.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;</TargetFrameworks>
 		<Description>Natasha 编译域的实现</Description>
 		<PackageId>DotNetCore.Natasha.Domain</PackageId>
 		<PackageReleaseNotes>升级</PackageReleaseNotes>
@@ -25,6 +25,9 @@
 		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="build\net7.0\DotNetCore.Natasha.Domain.targets" />
 		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildTransitive\net7.0\DotNetCore.Natasha.Domain.targets" />
 		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildMultiTargeting\net7.0\DotNetCore.Natasha.Domain.targets" />
+		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="build\net8.0\DotNetCore.Natasha.Domain.targets" />
+		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildTransitive\net8.0\DotNetCore.Natasha.Domain.targets" />
+		<None Include="Targets\Project.Usings.targets" Pack="true" PackagePath="buildMultiTargeting\net8.0\DotNetCore.Natasha.Domain.targets" />
 	</ItemGroup>
 
 </Project>

diff --git a/test/benchmark/BenchmarkProject/BenchmarkProject.csproj b/test/benchmark/BenchmarkProject/BenchmarkProject.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+		<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
 	</ItemGroup>
 </Project>