重构(project): 调整项目结构并增强功能

RRQM · RRQM · commit a3a1f084cb17 · 2025-09-15T10:25:35.000+08:00
删除使用示例文档，新增模板项目 CodeRegionTemplateConsoleApp，分离示例项目 CodeRegionExamplesConsoleApp。
CodeInject 项目支持多目标框架，新增签名配置和 NuGet 包生成支持，提升诊断信息定位能力。
更新版本号至 0.0.5，扩展代码生成示例，优化开发者体验。
diff --git a/USAGE_EXAMPLE.md b/USAGE_EXAMPLE.md
diff --git a/examples/CodeRegionExamples.slnx b/examples/CodeRegionExamples.slnx
@@ -0,0 +1,4 @@
+<Solution>
+  <Project Path="CodeRegionExamplesConsoleApp/CodeRegionExamplesConsoleApp.csproj" />
+  <Project Path="CodeRegionTemplateConsoleApp/CodeRegionTemplateConsoleApp.csproj" Id="e70f3b90-7ae6-445b-b211-e2fb1fcf0a87" />
+</Solution>
diff --git a/examples/CodeRegionExamples/CodeRegionExamples.slnx b/examples/CodeRegionExamples/CodeRegionExamples.slnx
diff --git a/examples/CodeRegionExamplesConsoleApp/CodeRegionExamplesConsoleApp.csproj b/examples/CodeRegionExamplesConsoleApp/CodeRegionExamplesConsoleApp.csproj
@@ -8,10 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CodeInject" Version="0.0.1">
+    <PackageReference Include="CodeInject" Version="0.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
+	<ItemGroup>
+		<AdditionalFiles Include="../CodeRegionTemplateConsoleApp/Program.cs" />
+	</ItemGroup>
 </Project>
diff --git a/examples/CodeRegionExamplesConsoleApp/Program.cs b/examples/CodeRegionExamplesConsoleApp/Program.cs
@@ -1,4 +1,4 @@
-﻿// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // 此代码版权（除特别声明或在XREF结尾的命名空间的代码）归作者本人若汝棋茗所有
 // 源代码使用协议遵循本仓库的开源协议及附加协议，若本仓库没有设置，则按MIT开源协议授权
 // CSDN博客：https://blog.csdn.net/qq_40374647
@@ -10,12 +10,15 @@
 // 感谢您的下载和使用
 // ------------------------------------------------------------------------------
 
+using CodeRegionSourceGenerator;
+
 namespace CodeRegionExamplesConsoleApp;
 
-internal class Program
+[RegionInject("./CodeRegionTemplateConsoleApp/Program.cs", "Show")]
+internal partial class ExampleProgram
 {
     static void Main(string[] args)
     {
-        Console.WriteLine("Hello, World!");
+        Show();
     }
 }
diff --git a/examples/CodeRegionTemplateConsoleApp/CodeRegionTemplateConsoleApp.csproj b/examples/CodeRegionTemplateConsoleApp/CodeRegionTemplateConsoleApp.csproj
@@ -0,0 +1,10 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/examples/CodeRegionTemplateConsoleApp/Program.cs b/examples/CodeRegionTemplateConsoleApp/Program.cs
@@ -0,0 +1,29 @@
+// ------------------------------------------------------------------------------
+// 此代码版权（除特别声明或在XREF结尾的命名空间的代码）归作者本人若汝棋茗所有
+// 源代码使用协议遵循本仓库的开源协议及附加协议，若本仓库没有设置，则按MIT开源协议授权
+// CSDN博客：https://blog.csdn.net/qq_40374647
+// 哔哩哔哩视频：https://space.bilibili.com/94253567
+// Gitee源代码仓库：https://gitee.com/RRQM_Home
+// Github源代码仓库：https://github.com/RRQM
+// API首页：https://touchsocket.net/
+// 交流QQ群：234762506
+// 感谢您的下载和使用
+// ------------------------------------------------------------------------------
+
+namespace CodeRegionTemplateConsoleApp;
+
+internal class TemplateProgram
+{
+    static void Main(string[] args)
+    {
+        Console.WriteLine("Hello, World!");
+    }
+
+    #region Show
+    public static void Show()
+    {
+        Console.WriteLine("Show");
+    }
+    #endregion
+
+}
diff --git a/src/CodeInject/CodeInject.csproj b/src/CodeInject/CodeInject.csproj
@@ -1,19 +1,38 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
 	  <!-- Development Dependencies Only -->
 	  <DevelopmentDependency>true</DevelopmentDependency>
 	  <IncludeSymbols>false</IncludeSymbols>
+	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\CodeInjectSourceGenerator\CodeInjectSourceGenerator.csproj" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
+    <ProjectReference Include="..\CodeInjectSourceGenerator\CodeInjectSourceGenerator.csproj" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
 	<ItemGroup>
 		<None Include="\tools\*.ps1" PackagePath="tools" Pack="true" Visible="false" />
 		<None Include="..\CodeInjectSourceGenerator\bin\$(Configuration)\netstandard2.0\CodeInjectSourceGenerator.dll" PackagePath="analyzers\dotnet\cs" Pack="true" Visible="false" />
 	</ItemGroup>
 
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<AssemblyOriginatorKeyFile>$(MSBuildProjectName).snk</AssemblyOriginatorKeyFile>
+		<SignAssembly>True</SignAssembly>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="logo.png" Pack="true" PackagePath="\" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="..\..\README.md" Pack="true" PackagePath="\"/>
+	</ItemGroup>
+
+	<Target Name="CopyNuGetPackage" AfterTargets="Pack">
+		<Copy SourceFiles="$(PackageOutputPath)\$(PackageId).$(PackageVersion).nupkg"
+              DestinationFolder="D:\Nuget\local"
+              Condition="Exists('D:\Nuget\local')" />
+	</Target>
 </Project>
diff --git a/src/CodeInject/CodeInject.snk b/src/CodeInject/CodeInject.snk
diff --git a/src/CodeInject/logo.png b/src/CodeInject/logo.png
diff --git a/src/CodeInjectSourceGenerator/CodeInjectIncrementalSourceGenerator.cs b/src/CodeInjectSourceGenerator/CodeInjectIncrementalSourceGenerator.cs
@@ -102,7 +102,10 @@ static ClassToGenerate GetSemanticTargetForGeneration(GeneratorSyntaxContext con
                         }
                     }
 
-                    attributes.Add(new RegionInjectData(filePath, regionName, placeholders.ToArray()));
+                    // 获取属性的位置信息
+                    var attributeLocation = attributeData.ApplicationSyntaxReference?.GetSyntax().GetLocation() ?? Location.None;
+
+                    attributes.Add(new RegionInjectData(filePath, regionName, placeholders.ToArray(), attributeLocation));
                 }
 
                 if (attributes.Count == 0)
@@ -259,9 +262,9 @@ static string ExtractAndProcessRegion(RegionInjectData attribute, ImmutableArray
                             "File read error",
                             $"Error reading additional file '{targetFile.Path}': {ex.Message}",
                             "CodeRegionGenerator",
-                            DiagnosticSeverity.Warning,
+                            DiagnosticSeverity.Error,
                             isEnabledByDefault: true),
-                        Location.None));
+                        attribute.Location));
                     return string.Empty;
                 }
             }
@@ -274,9 +277,9 @@ static string ExtractAndProcessRegion(RegionInjectData attribute, ImmutableArray
                         "Template file not found",
                         $"Could not find template file: {attribute.FilePath}. Make sure the file is included as AdditionalFiles in the project that uses the source generator.",
                         "CodeRegionGenerator",
-                        DiagnosticSeverity.Warning,
+                        DiagnosticSeverity.Error,
                         isEnabledByDefault: true),
-                    Location.None));
+                    attribute.Location));
                 return string.Empty;
             }
 
@@ -289,9 +292,9 @@ static string ExtractAndProcessRegion(RegionInjectData attribute, ImmutableArray
                         "Region not found",
                         $"Could not find region '{attribute.RegionName}' in file '{attribute.FilePath}'",
                         "CodeRegionGenerator",
-                        DiagnosticSeverity.Warning,
+                        DiagnosticSeverity.Error,
                         isEnabledByDefault: true),
-                    Location.None));
+                    attribute.Location));
                 return string.Empty;
             }
 
@@ -428,12 +431,14 @@ internal class RegionInjectData
             public string FilePath { get; }
             public string RegionName { get; }
             public string[] Placeholders { get; }
+            public Location Location { get; }
 
-            public RegionInjectData(string filePath, string regionName, string[] placeholders)
+            public RegionInjectData(string filePath, string regionName, string[] placeholders, Location location)
             {
                 FilePath = filePath;
                 RegionName = regionName;
                 Placeholders = placeholders;
+                Location = location;
             }
         }
     }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 ﻿<Project>
 	<PropertyGroup>
-		<Version>0.0.1</Version>
+		<Version>0.0.5</Version>
 		<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<LangVersion>preview</LangVersion>
@@ -20,10 +20,4 @@
 		<ReadmeFile>Readme.md</ReadmeFile>
 		<!--<Nullable>enable</Nullable>-->
 	</PropertyGroup>
-
-	<Target Name="CopyNuGetPackage" AfterTargets="Pack">
-		<Copy SourceFiles="$(PackageOutputPath)\$(PackageId).$(PackageVersion).nupkg"
-              DestinationFolder="D:\Nuget\local"
-              Condition="Exists('D:\Nuget\local')" />
-	</Target>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// ------------------------------------------------------------------------------`
	`1`	`+// ------------------------------------------------------------------------------`
`2`	`2`	`// 此代码版权（除特别声明或在XREF结尾的命名空间的代码）归作者本人若汝棋茗所有`
`3`	`3`	`// 源代码使用协议遵循本仓库的开源协议及附加协议，若本仓库没有设置，则按MIT开源协议授权`
`4`	`4`	`// CSDN博客：https://blog.csdn.net/qq_40374647`
`@@ -10,12 +10,15 @@`
`10`	`10`	`// 感谢您的下载和使用`
`11`	`11`	`// ------------------------------------------------------------------------------`
`12`	`12`
	`13`	`+using CodeRegionSourceGenerator;`
	`14`	`+`
`13`	`15`	`namespace CodeRegionExamplesConsoleApp;`
`14`	`16`
`15`		`-internal class Program`
	`17`	`+[RegionInject("./CodeRegionTemplateConsoleApp/Program.cs", "Show")]`
	`18`	`+internal partial class ExampleProgram`
`16`	`19`	`{`
`17`	`20`	`static void Main(string[] args)`
`18`	`21`	`{`
`19`		`- Console.WriteLine("Hello, World!");`
	`22`	`+ Show();`
`20`	`23`	`}`
`21`	`24`	`}`