Analyzer跟SourceGenerator放到SourceGenerator包中

DotNet/Hotfix/ET.Hotfix.csproj

@@ -51,6 +51,8 @@
         
     </ItemGroup>
     <ItemGroup>
+        <ProjectReference Include="$(SolutionDir)Unity\Packages\cn.etetet.sourcegenerator\DotNet~\ET.Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="$(SolutionDir)Unity\Packages\cn.etetet.sourcegenerator\DotNet~\ET.SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\Model\ET.Model.csproj" />
     </ItemGroup>
 

DotNet/Model/ET.Model.csproj

@@ -52,7 +52,9 @@
         </Compile>
         
     </ItemGroup> 
-    <ItemGroup> 
+    <ItemGroup>
+        <ProjectReference Include="$(SolutionDir)Unity\Packages\cn.etetet.sourcegenerator\DotNet~\ET.Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="$(SolutionDir)Unity\Packages\cn.etetet.sourcegenerator\DotNet~\ET.SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\..\Unity\Packages\cn.etetet.loader\DotNet~\ET.Loader.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\cn.etetet.mathematics\DotNet~\ET.Mathematics.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\cn.etetet.recast\DotNet~\ET.Recast.csproj" />

ET.sln

@@ -51,7 +51,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ExcelExporter", "Unity\P
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core", "Unity\Packages\cn.etetet.core\DotNet~\ET.Core\ET.Core.csproj", "{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Analyzer", "Unity\Packages\cn.etetet.core\DotNet~\ET.Analyzer\ET.Analyzer.csproj", "{D785575F-FDD1-45D9-AE3B-3810B7DE1541}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Analyzer", "Unity\Packages\cn.etetet.sourcegenerator\DotNet~\ET.Analyzer\ET.Analyzer.csproj", "{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.SourceGenerator", "Unity\Packages\cn.etetet.sourcegenerator\DotNet~\ET.SourceGenerator\ET.SourceGenerator.csproj", "{B8994466-96D7-4777-BE10-85EC5919EA98}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -327,18 +329,30 @@ Global
 		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Release|x64.Build.0 = Release|Any CPU
 		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Release|x86.ActiveCfg = Release|Any CPU
 		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Release|x86.Build.0 = Release|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|x64.Build.0 = Debug|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|x86.Build.0 = Debug|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|x64.ActiveCfg = Release|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|x64.Build.0 = Release|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|x86.ActiveCfg = Release|Any CPU
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|x86.Build.0 = Release|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Debug|x64.Build.0 = Debug|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Debug|x86.Build.0 = Debug|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Release|x64.ActiveCfg = Release|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Release|x64.Build.0 = Release|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Release|x86.ActiveCfg = Release|Any CPU
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC}.Release|x86.Build.0 = Release|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Debug|x64.Build.0 = Debug|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Debug|x86.Build.0 = Debug|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Release|x64.ActiveCfg = Release|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Release|x64.Build.0 = Release|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Release|x86.ActiveCfg = Release|Any CPU
+		{B8994466-96D7-4777-BE10-85EC5919EA98}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -366,7 +380,8 @@ Global
 		{554D108A-1857-4E49-8FB4-C7A2AB7F205D} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{D785575F-FDD1-45D9-AE3B-3810B7DE1541} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{B8994466-96D7-4777-BE10-85EC5919EA98} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

Unity/Packages/cn.etetet.core/DotNet~/ET.Core/ET.Core.csproj

@@ -34,6 +34,9 @@
         <Compile Include="../../Runtime/**/*.cs" xmlns="">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
+
+        <ProjectReference Include="$(SolutionDir)Unity\Packages\cn.etetet.sourcegenerator\DotNet~\ET.Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="$(SolutionDir)Unity\Packages\cn.etetet.sourcegenerator\DotNet~\ET.SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
     
     <ItemGroup>

Unity/Packages/cn.etetet.core/DotNet~/ET.Analyzer/ET.Analyzer.csproj → Unity/Packages/cn.etetet.sourcegenerator/DotNet~/ET.Analyzer/ET.Analyzer.csproj

@@ -26,7 +26,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Compile Include="../../Runtime/Helper/StringHashHelper.cs" />
+        <Compile Include="../StringHashHelper.cs" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" PrivateAssets="all" />

Unity/Packages/cn.etetet.core/DotNet~/ET.SourceGenerator/ET.SourceGenerator.csproj → Unity/Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGenerator/ET.SourceGenerator.csproj

@@ -15,20 +15,20 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <OutputPath>../../Plugins</OutputPath>
+      <OutputPath>./obj</OutputPath>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <OutputPath>../../Plugins</OutputPath>
+      <OutputPath>./obj</OutputPath>
     </PropertyGroup>
 
     <ItemGroup>
-        <Compile Include="../Analyzer/Extension/*.cs">
+        <Compile Include="../ET.Analyzer/Extension/*.cs">
             <Link>Extension\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
-        <Compile Include="../Analyzer/Config/Definition.cs" />
-        <Compile Include="../../Runtime/Helper/StringHashHelper.cs" />
-        <Compile Include="../Analyzer/Config/AnalyzeAssembly.cs" />
+        <Compile Include="../ET.Analyzer/Config/Definition.cs" />
+        <Compile Include="../StringHashHelper.cs" />
+        <Compile Include="../ET.Analyzer/Config/AnalyzeAssembly.cs" />
     </ItemGroup>
 
     <ItemGroup>
@@ -38,9 +38,9 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
-
+<!--注意，复制到unity中需要开启下面的copy,并且关闭ETEntitySerializeFormatterGenerator中的DONET宏-->
 <!--    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-        <Copy SourceFiles="$(TargetDir)/$(TargetName).dll" DestinationFolder="$(ProjectDir)/../../Unity/Packages/cn.etetet.sourcegenerator/" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)/$(TargetName).dll" DestinationFolder="../../" ContinueOnError="false" />
     </Target>-->
 
 </Project>

Unity/Packages/cn.etetet.sourcegenerator/DotNet~/StringHashHelper.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Text;
+
+namespace ET
+{
+    public static class StringHashHelper
+    {
+        // bkdr hash
+        public static long GetLongHashCode(this string str)
+        {
+            const uint seed = 1313; // 31 131 1313 13131 131313 etc..
+            
+            ulong hash = 0;
+            for (int i = 0; i < str.Length; ++i)
+            {
+                char c = str[i];
+                byte high = (byte)(c >> 8);
+                byte low = (byte)(c & byte.MaxValue);
+                hash = hash * seed + high;
+                hash = hash * seed + low;
+            }
+            return (long)hash;
+        }
+
+        public static int Mode(this string strText, int mode)
+        {
+            if (mode <= 0)
+            {
+                throw new Exception($"string mode < 0: {strText} {mode}");
+            }
+            return (int)((ulong)strText.GetLongHashCode() % (uint)mode);
+        }
+    }
+}

Unity/Packages/cn.etetet.sourcegenerator/ET.SourceGenerator.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c7d66580a57c7824da2502ebcd0f33a2
+guid: a6d455015532ece45bb623a7db3b0dc3
 labels:
 - RoslynAnalyzer
 PluginImporter: