Merge pull request #264 from dotnetcore/any

修复其他工程引用以及UT并发问题
dotnetcore · Jan 6, 2024 · abe9f10 · abe9f10
2 parents ca77236 + 07ac0a2
commit abe9f10
Show file tree

Hide file tree

Showing 17 changed files with 141 additions and 31 deletions.
diff --git a/samples/HotReloadSample/Program.cs b/samples/HotReloadSample/Program.cs
@@ -120,7 +120,7 @@ public static Assembly OldAssembly(NatashaLoadContext domain)
         {
             AssemblyCSharpBuilder builder = new AssemblyCSharpBuilder
             {
-                Domain = domain
+                LoadContext = domain
             };
             builder.Add("public class A{  public int Code = 1; public void Show(){ Console.WriteLine(Code);  }   }", UsingLoadBehavior.WithDefault);
             return builder.GetAssembly();
@@ -129,7 +129,7 @@ public static Assembly OldAssembly(NatashaLoadContext domain)
         public static Assembly NewAssembly(NatashaLoadContext domain)
         {
             AssemblyCSharpBuilder builder = new AssemblyCSharpBuilder();
-            builder.Domain = domain;
+            builder.LoadContext = domain;
             builder.Add("public class A{  public int Code = 2; public void Show(){ Console.WriteLine(Code);  }   }", UsingLoadBehavior.WithDefault);
             return builder.GetAssembly();
         }

diff --git a/samples/ReferenceSample/Program.cs b/samples/ReferenceSample/Program.cs
@@ -36,17 +36,32 @@ static void Main(string[] args)
             //TestMini();
             //var a = Math.Min(1, args.Length);
             NatashaManagement.Preheating<NatashaDomainCreator>(true, true);
+
             //Console.WriteLine("=============================");
-            //AssemblyCSharpBuilder builder = new();
-            //var asm = builder
-            //    .UseRandomDomain()
-            //    .ConfigCompilerOption(item=>item.AddSupperess("CS8019"))
-            //    .WithCombineReferences(item => item.UseDefaultReferences())
-            //    .WithCombineUsingCode(UsingLoadBehavior.WithAll)
-            //    .Add("public class A{}",UsingLoadBehavior.WithAll)
-            //    .GetAssembly();
-            //Console.WriteLine(asm.FullName);
-            //Console.ReadKey();
+            AssemblyCSharpBuilder builder = new();
+            var asm = builder
+                .UseRandomDomain()
+                .UseSmartMode()
+                //.WithoutCombineUsingCode()
+                .WithFileOutput()
+                .WithReleaseCompile()
+                .WithoutInjectToDomain()
+                .OutputAsRefAssembly()
+                .Add(@"
+/// <summary>
+/// 测试类
+/// </summary>
+public class A{ 
+    /// <summary>
+    /// 输出信息
+    /// </summary>
+    public void Show(){ 
+        Console.WriteLine(1); 
+    }
+}")
+                .GetAssembly();
+            Console.WriteLine(asm.FullName);
+            Console.ReadKey();
             //NatashaInitializer.Preheating((asmName, name) => {
             //    if (name != null)
             //    {

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/CompileUnit/AssemblyCSharpBuilder.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/CompileUnit/AssemblyCSharpBuilder.cs
@@ -31,7 +31,7 @@ public AssemblyCSharpBuilder(string assemblyName)
         _loadContext = NatashaLoadContext.DefaultContext;
         if (_loadContext == default!)
         {
-            throw new NullReferenceException("LoadContext 为空！请检查是否调用 NatashaManagement.Preheating 或 NatashaManagement.RegistDomainCreator, 若调用，请检查 Builder 是否创建了域！");
+            throw new NullReferenceException("LoadContext 为空！请检查是否调用 NatashaManagement.Preheating<> 或 NatashaManagement.RegistDomainCreator!");
         }
     }
 

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/Component/Metadata/MetadataHelper.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/Component/Metadata/MetadataHelper.cs
@@ -8,6 +8,7 @@
 using System.Reflection.PortableExecutable;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Xml.Linq;
 
 namespace Natasha.CSharp.Compiler.Component
 {
@@ -18,11 +19,11 @@ public static class MetadataHelper
         public static unsafe (AssemblyName asmName, MetadataReference metadata, HashSet<string> namespaces)? GetMetadataAndNamespaceFromMemory(Assembly assembly, Func<AssemblyName?, string?, bool>? filter = null)
         {
             var asmName = assembly.GetName();
-            if (NatashaLoadContext.Creator.TryGetRawMetadata(assembly ,out var blob, out var length))
+            if (NatashaLoadContext.Creator.TryGetRawMetadata(assembly, out var blob, out var length))
             {
                 if (filter == null || !filter(asmName, asmName.Name))
                 {
-               
+
                     return (asmName
                         , AssemblyMetadata.Create(ModuleMetadata.CreateFromMetadata((IntPtr)blob, length)).GetReference()
                         , GetNamespaceFromMemroy(assembly, filter)
@@ -44,7 +45,8 @@ public static unsafe (AssemblyName asmName, MetadataReference metadata)? GetMeta
             }
             return null;
         }
-        public static HashSet<string> GetNamespaceFromMemroy(Assembly assembly, Func<AssemblyName?, string?, bool>? filter = null)
+
+        public static HashSet<string> GetNamespaceFromMemroyWithoutInternal(Assembly assembly, Func<AssemblyName?, string?, bool>? filter = null)
         {
             HashSet<string> tempSets = [];
             try
@@ -130,6 +132,98 @@ public static HashSet<string> GetNamespaceFromMemroy(Assembly assembly, Func<Ass
             {
 #if DEBUG
                 Console.WriteLine(assembly.FullName + ex.Message);
+#endif
+            }
+            return tempSets;
+        }
+        public static HashSet<string> GetNamespaceFromMemroy(Assembly assembly, Func<AssemblyName?, string?, bool>? filter = null)
+        {
+            if (assembly.FullName.StartsWith("System.Private.CoreLib"))
+            {
+                return GetNamespaceFromMemroyWithoutInternal(assembly, filter);
+            }
+            HashSet<string> tempSets = [];
+            try
+            {
+                var types = assembly.ExportedTypes;
+                if (types.Count() > 16)
+                {
+                    var result = Parallel.ForEach(types, type =>
+                    {
+
+                        if (type.IsNested && !type.IsNestedPublic)
+                        {
+                            return;
+                        }
+
+                        var name = type.Namespace;
+
+                        lock (tempSets)
+                        {
+                            if (tempSets.Contains(name))
+                            {
+                                return;
+                            }
+                        }
+
+                        if (!string.IsNullOrEmpty(name)
+                        && name.IndexOf('<') == -1)
+                        {
+
+                            if (filter == null || !filter(null, name))
+                            {
+                                lock (tempSets)
+                                {
+                                    tempSets.Add(name);
+                                }
+                            }
+#if DEBUG
+                            else
+                            {
+                                System.Diagnostics.Debug.WriteLine("[排除程序集]:" + name);
+                            }
+#endif
+                        }
+                    });
+                    while (!result.IsCompleted)
+                    {
+                        Thread.Sleep(50);
+                    }
+                }
+                else
+                {
+                    foreach (var type in types)
+                    {
+
+                        if (type.IsNested && !type.IsNestedPublic)
+                        {
+                            continue;
+                        }
+
+                        var name = type.Namespace;
+                        if (!string.IsNullOrEmpty(name)
+                            && !tempSets.Contains(name)
+                            && name.IndexOf('<') == -1)
+                        {
+
+                            if (filter == null || !filter(null, name))
+                            {
+                                tempSets.Add(name);
+                            }
+#if DEBUG
+                            else
+                            {
+                                System.Diagnostics.Debug.WriteLine("[排除程序集]:" + name);
+                            }
+#endif
+                        }
+                    }
+                }
+            }
+            catch (System.Exception ex)
+            {
+#if DEBUG
+                Console.WriteLine(assembly.FullName + ex.Message);
 #endif
             }
             return tempSets;

diff --git a/src/Natasha.CSharp/Natasha.CSharp.Compiler/NatashaInitializer.cs b/src/Natasha.CSharp/Natasha.CSharp.Compiler/NatashaInitializer.cs
@@ -157,7 +157,6 @@ public static void Preheating(Func<AssemblyName?, string?, bool>? excludeReferen
                 stopwatch.RestartAndShowCategoreInfo("[  Metadata  ]", "编译缓存初始化", 1);
 #endif
                 AssemblyCSharpBuilder cSharpBuilder = new();
-                cSharpBuilder.ConfigCompilerOption(item => item.AddSupperess("CS8019"));
                 cSharpBuilder
                     .UseRandomDomain()
                     .UseSmartMode()

diff --git a/test/benchmark/NatashaBenchmark/DynamicCallFieldTest.cs b/test/benchmark/NatashaBenchmark/DynamicCallFieldTest.cs
@@ -45,7 +45,7 @@ public class DynamicCallFieldTest
 
         public DynamicCallFieldTest()
         {
-            NatashaInitializer.Preheating();
+            NatashaManagement.Preheating();
             Preheating();
             Precache();
         }

diff --git a/test/benchmark/NatashaBenchmark/NatashaBenchmark.csproj b/test/benchmark/NatashaBenchmark/NatashaBenchmark.csproj
@@ -12,7 +12,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\..\src\Natasha.CSharp\Core\Natasha.CSharp.Template\Natasha.CSharp.Template.csproj" />
-	</ItemGroup>
+		<ProjectReference Include="..\..\..\src\Natasha.CSharp\Component\Core\Natasha.CSharp.Template.Core\Natasha.CSharp.Template.Core.csproj" />
+	</ItemGroup>	  
+
 
 </Project>
diff --git a/test/monitor/ReferenceTest50/Program.cs b/test/monitor/ReferenceTest50/Program.cs
@@ -57,10 +57,10 @@ static void Main(string[] args)
             //Microsoft.CodeAnalysis.Workspaces.ErrorLogger
             Check();
 
-            NatashaInitializer.Preheating((asm,name)=>name.Contains("IO"));
+            NatashaManagement.Preheating((asm,name)=>name.Contains("IO"));
             Check();
             AssemblyCSharpBuilder builder = new();
-            builder.Domain = DomainManagement.Random();
+            builder.LoadContext = DomainManagement.Random();
             builder.Add("public class Abved{ string Name; public int Age;}");
             var asm = builder.GetAssembly();
             Check();

diff --git a/test/monitor/ReferenceTest50/ReferenceTest50.csproj b/test/monitor/ReferenceTest50/ReferenceTest50.csproj
@@ -18,7 +18,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\..\src\Natasha.CSharp\Core\Natasha.CSharp.Template\Natasha.CSharp.Template.csproj" />
+	  <ProjectReference Include="..\..\..\src\Natasha.CSharp\Component\Core\Natasha.CSharp.Template.Core\Natasha.CSharp.Template.Core.csproj" />
 	</ItemGroup>
 
+
 </Project>
diff --git a/test/monitor/UnloadTest31/Program.cs b/test/monitor/UnloadTest31/Program.cs
@@ -18,7 +18,7 @@ static void Main(string[] args)
             Console.WriteLine($"初始内存占用:{Process.GetCurrentProcess().PrivateMemorySize64 / 1024 / 1024}M");
             Console.WriteLine("-----------------------------------------------------------------------------------------");
 
-            ShowTaskResoucesInfomation("Natasha预热", ()=> { NatashaInitializer.Preheating(); }, ConsoleColor.Magenta);
+            ShowTaskResoucesInfomation("Natasha预热", ()=> { NatashaManagement.Preheating(); }, ConsoleColor.Magenta);
             Thread.Sleep(1000);
             Console.WriteLine("-----------------------------------------------------------------------------------------");
             Console.WriteLine($"预热后内存占用:{Process.GetCurrentProcess().PrivateMemorySize64 / 1024 / 1024}M");

diff --git a/test/monitor/UnloadTest31/UnloadTest31.csproj b/test/monitor/UnloadTest31/UnloadTest31.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\..\src\Natasha.CSharp\Core\Natasha.CSharp.Template\Natasha.CSharp.Template.csproj" />
+	  <ProjectReference Include="..\..\..\src\Natasha.CSharp\Component\Core\Natasha.CSharp.Template.Core\Natasha.CSharp.Template.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/test/monitor/UnloadTest50/Program.cs b/test/monitor/UnloadTest50/Program.cs
@@ -76,7 +76,7 @@ public static void Test()
             {
                 var ad = DomainManagement.Create("test" + i.ToString());
                 var builder = FastMethodOperator.DefaultDomain();
-                builder.AssemblyBuilder.Domain = ad;
+                builder.AssemblyBuilder.LoadContext = ad;
                 func[i] = builder.Body($@"
 int[] a = new int[40960];
 for(int i =0;i<40960;i++){{a[i]=i;}}

diff --git a/test/monitor/UnloadTest50/UnloadTest50.csproj b/test/monitor/UnloadTest50/UnloadTest50.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\..\src\Natasha.CSharp\Core\Natasha.CSharp.Template\Natasha.CSharp.Template.csproj" />
+	  <ProjectReference Include="..\..\..\src\Natasha.CSharp\Component\Core\Natasha.CSharp.Template.Core\Natasha.CSharp.Template.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/test/monitor/UnloadTest60/Program.cs b/test/monitor/UnloadTest60/Program.cs
@@ -77,7 +77,7 @@ public static void Test()
             {
                 var ad = DomainManagement.Create("test" + i.ToString());
                 var builder = FastMethodOperator.DefaultDomain();
-                builder.AssemblyBuilder.Domain = ad;
+                builder.AssemblyBuilder.LoadContext = ad;
                 func[i] = builder.Body($@"
 int[] a = new int[40960];
 for(int i =0;i<40960;i++){{a[i]=i;}}

diff --git a/test/monitor/UnloadTest60/UnloadTest60.csproj b/test/monitor/UnloadTest60/UnloadTest60.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\..\src\Natasha.CSharp\Core\Natasha.CSharp.Template\Natasha.CSharp.Template.csproj" />
+	  <ProjectReference Include="..\..\..\src\Natasha.CSharp\Component\Core\Natasha.CSharp.Template.Core\Natasha.CSharp.Template.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/test/ut/NatashaFunctionUT/Template/Script/OopTemplateTest.cs b/test/ut/NatashaFunctionUT/Template/Script/OopTemplateTest.cs
@@ -8,7 +8,7 @@
 namespace NatashaFunctionUT.Template
 {
     [Trait("基础功能测试", "模板")]
-    public class OopTemplateTest 
+    public class OopTemplateTest : DomainPrepareBase
     {
 
         [Fact(DisplayName = "构建类")]

diff --git a/test/ut/NatashaFunctionUT/Template/Script/PropertyTemplateTest.cs b/test/ut/NatashaFunctionUT/Template/Script/PropertyTemplateTest.cs
@@ -6,7 +6,7 @@ namespace NatashaFunctionUT.Template
 {
 
     [Trait("基础功能测试", "模板")]
-    public class PropertyTemplateTest
+    public class PropertyTemplateTest : DomainPrepareBase
     {
         [Fact(DisplayName = "静态属性1")]
         public void Test1()