ソースを参照

Analyzer SourceGenerator改成ET打头

tanghai 1 年間 前
コミット
a1208923d0

+ 2 - 2
DotNet/Hotfix/ET.Hotfix.csproj

@@ -51,8 +51,8 @@
         
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-        <ProjectReference Include="..\..\Share\SourceGenerator\Share.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\..\Share\Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\..\Share\SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\Model\ET.Model.csproj" />
     </ItemGroup>
 

+ 2 - 2
DotNet/Model/ET.Model.csproj

@@ -57,8 +57,8 @@
         
     </ItemGroup> 
     <ItemGroup> 
-        <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-        <ProjectReference Include="..\..\Share\SourceGenerator\Share.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\..\Share\Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\..\Share\SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\..\Unity\Packages\com.et.core\DotNet~\ET.Core.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\com.et.dotrecast\DotNet~\ET.DotRecast.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\com.et.loader\DotNet~\ET.Loader.csproj" />

+ 3 - 3
ET.sln

@@ -9,11 +9,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DotNet", "DotNet", "{46008B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Share", "Share", "{1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Share.Analyzer", "Share\Analyzer\Share.Analyzer.csproj", "{FCB2EF97-BA34-49F7-B859-68E1AC98877E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ET.Analyzer", "Share\Analyzer\ET.Analyzer.csproj", "{FCB2EF97-BA34-49F7-B859-68E1AC98877E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Share.Tool", "Share\Tool\Share.Tool.csproj", "{1D028A2B-515C-49E2-923B-094CBD89BE5A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ET.Tool", "Share\Tool\ET.Tool.csproj", "{1D028A2B-515C-49E2-923B-094CBD89BE5A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.SourceGenerator", "Share\SourceGenerator\Share.SourceGenerator.csproj", "{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.SourceGenerator", "Share\SourceGenerator\ET.SourceGenerator.csproj", "{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core", "Unity\ET.Core.csproj", "{357275F9-23B5-ED06-A723-291680D452AA}"
 EndProject

+ 1 - 0
Share/Analyzer/Share.Analyzer.csproj → Share/Analyzer/ET.Analyzer.csproj

@@ -5,6 +5,7 @@
         <IncludeBuildOutput>false</IncludeBuildOutput>
         <Nullable>enable</Nullable>
         <LangVersion>12</LangVersion>
+        <RootNamespace>ET</RootNamespace>
     </PropertyGroup>
 
     <PropertyGroup>

+ 4 - 3
Share/SourceGenerator/Share.SourceGenerator.csproj → Share/SourceGenerator/ET.SourceGenerator.csproj

@@ -11,6 +11,7 @@
         <NoWarn>1701;1702;RS2008</NoWarn>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+        <RootNamespace>ET</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
@@ -30,8 +31,8 @@
         </PackageReference>
     </ItemGroup>
 
-<!--    <Target Name="PostBuild" AfterTargets="PostBuildEvent">-->
-<!--        <Copy SourceFiles="$(TargetDir)/$(TargetName).dll" DestinationFolder="$(ProjectDir)/../../Unity/Packages/com.et.core/Plugins/" ContinueOnError="false" />-->
-<!--    </Target>-->
+<!--    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+        <Copy SourceFiles="$(TargetDir)/$(TargetName).dll" DestinationFolder="$(ProjectDir)/../../Unity/Packages/com.et.core/Plugins/" ContinueOnError="false" />
+    </Target>-->
 
 </Project>

+ 0 - 0
Share/Tool/Share.Tool.csproj → Share/Tool/ET.Tool.csproj


+ 2 - 3
Unity/Packages/com.et.core/DotNet~/ET.Core.csproj

@@ -4,7 +4,6 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>
-        <AssemblyName>Core</AssemblyName>
         <RootNamespace>ET</RootNamespace>
         <LangVersion>12</LangVersion>
     </PropertyGroup>
@@ -38,8 +37,8 @@
     </ItemGroup>
     
     <ItemGroup>
-      <ProjectReference Include="..\..\..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" /> 
-      <ProjectReference Include="..\..\..\..\Share\SourceGenerator\Share.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+      <ProjectReference Include="..\..\..\..\Share\Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" /> 
+      <ProjectReference Include="..\..\..\..\Share\SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 
     <ItemGroup>

BIN
Unity/Packages/com.et.core/Plugins/Share.SourceGenerator.dll → Unity/Packages/com.et.core/Plugins/ET.SourceGenerator.dll


+ 2 - 4
Unity/Packages/com.et.core/Plugins/Share.SourceGenerator.dll.meta → Unity/Packages/com.et.core/Plugins/ET.SourceGenerator.dll.meta

@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: dbed22035f711974b8caf049edbfe8f8
-labels:
-- RoslynAnalyzer
+guid: f9c7e8183c5b945d3b3fb35bf4cfb20a
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
@@ -9,7 +7,7 @@ PluginImporter:
   executionOrder: {}
   defineConstraints: []
   isPreloaded: 0
-  isOverridable: 0
+  isOverridable: 1
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:

+ 2 - 2
Unity/Packages/com.et.loader/DotNet~/ET.Loader.csproj

@@ -25,8 +25,8 @@
     </PropertyGroup>
     
     <ItemGroup>
-      <ProjectReference Include="..\..\..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" /> 
-      <ProjectReference Include="..\..\..\..\Share\SourceGenerator\Share.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+      <ProjectReference Include="..\..\..\..\Share\Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" /> 
+      <ProjectReference Include="..\..\..\..\Share\SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
       <ProjectReference Include="..\..\com.et.core\DotNet~\ET.Core.csproj" />
     </ItemGroup>
 </Project>

+ 1 - 1
Unity/Packages/com.et.loader/Editor/AssetPostProcessor/OnGenerateCSProjectProcessor.cs

@@ -161,7 +161,7 @@ namespace ET
             {
                 XmlElement itemGroup = newDoc.CreateElement("ItemGroup", newDoc.DocumentElement.NamespaceURI);
                 var projectReference = newDoc.CreateElement("ProjectReference", newDoc.DocumentElement.NamespaceURI);
-                projectReference.SetAttribute("Include", @"..\Share\Analyzer\Share.Analyzer.csproj");
+                projectReference.SetAttribute("Include", @"..\Share\Analyzer\ET.Analyzer.csproj");
                 projectReference.SetAttribute("OutputItemType", @"Analyzer");
                 projectReference.SetAttribute("ReferenceOutputAssembly", @"false");