Change generated.cs -> g.cs to make it work with coverlet [coverlet-c…

…overage/coverlet#1164]
Serviceware · Oct 20, 2022 · de2d797 · de2d797
1 parent 71d752a
commit de2d797
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 17 deletions.
diff --git a/src/Dibix.Generators/Dibix.Generators.csproj b/src/Dibix.Generators/Dibix.Generators.csproj
@@ -18,9 +18,10 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
   </ItemGroup>
 
-  <ItemGroup><!-- An instance of analyzer Dibix.Generators.TaskGenerator cannot be created from Dibix.Generators.dll : Exception has been thrown by the target of an invocation.. -->
-    <!--<ProjectReference Include="..\Dibix.Sdk.Abstractions\Dibix.Sdk.Abstractions.csproj" PrivateAssets="all" />-->
-
-    <EmbeddedResource Update="EmbeddedSources\TaskGenerator\TaskPropertySource.cs" Link="EmbeddedSources\TaskGenerator\TaskPropertySource.cs" />
+  <!-- An instance of analyzer Dibix.Generators.TaskGenerator cannot be created from Dibix.Generators.dll : Exception has been thrown by the target of an invocation.. -->
+  <!--
+  <ItemGroup>
+    <ProjectReference Include="..\Dibix.Sdk.Abstractions\Dibix.Sdk.Abstractions.csproj" PrivateAssets="all" />
   </ItemGroup>
+  -->
 </Project>
diff --git a/src/Dibix.Generators/TaskGenerator.cs b/src/Dibix.Generators/TaskGenerator.cs
@@ -126,7 +126,7 @@ public sealed partial class {task.ClassName} : global::Dibix.Sdk.Abstractions.IT
         private partial bool Execute();
     }}
 }}";
-            context.AddSource($"{task.ClassName}.generated.cs", content);
+            context.AddSource($"{task.ClassName}.g.cs", content);
         }
 
         private static void GenerateTaskConfiguration(SourceProductionContext context, Task task, string? @namespace, IDictionary<string, ICollection<TaskProperty>> propertyCategoryMap)
@@ -148,7 +148,7 @@ public sealed class {className}
     {{{propertiesText}
     }}
 }}";
-            context.AddSource($"{className}.generated.cs", content);
+            context.AddSource($"{className}.g.cs", content);
         }
 
         private static IEnumerable<string> CollectTaskConfigurationProperties(string? @namespace, IDictionary<string, ICollection<TaskProperty>> propertyCategoryMap)
@@ -193,7 +193,7 @@ public sealed class {className}
     {{{propertiesText}
     }}
 }}";
-            context.AddSource($"{className}.generated.cs", content);
+            context.AddSource($"{className}.g.cs", content);
         }
 
         private static string GenerateConfigurationProperty(string categoryName, string? @namespace)

diff --git a/src/Dibix.Generators/TestMethodGenerator.cs b/src/Dibix.Generators/TestMethodGenerator.cs
@@ -112,7 +112,7 @@ public sealed partial class {className}
         partial void Execute([global::System.Runtime.CompilerServices.CallerMemberName] string testName = null);
     }}
 }}";
-            context.AddSource($"{className}.generated.cs", source);
+            context.AddSource($"{className}.g.cs", source);
         }
 
         private readonly struct CodeGenerationTask

diff --git a/src/Dibix.Generators/Utilities/GenerationUtility.cs b/src/Dibix.Generators/Utilities/GenerationUtility.cs
@@ -41,7 +41,7 @@ public static void CollectEmbeddedSources(this IncrementalGeneratorPostInitializ
                 if (extensionIndex < 0)
                     extensionIndex = fileName.Length;
 
-                fileName = fileName.Insert(extensionIndex, ".generated");
+                fileName = fileName.Insert(extensionIndex, ".g");
 
                 string content;
                 using (Stream stream = ThisAssembly.GetManifestResourceStream(resourceName)!)

diff --git a/tests/Dibix.Generators.Tests/GeneratorTest.cs b/tests/Dibix.Generators.Tests/GeneratorTest.cs
@@ -48,8 +48,8 @@ public void TestMethodGenerator()
 
             string[] expectedFiles =
             {
-                "TestMethodGenerationAttribute.generated.cs",
-                "SqlCodeAnalysisRuleTests.generated.cs"
+                "TestMethodGenerationAttribute.g.cs",
+                "SqlCodeAnalysisRuleTests.g.cs"
             };
             for (int i = 1; i < syntaxTrees.Count; i++)
             {
@@ -131,12 +131,12 @@ public sealed partial class SqlCoreTask
 
             string[] expectedFiles =
             {
-                "TaskPropertyAttribute.generated.cs",
-                "TaskPropertySource.generated.cs",
-                "TaskPropertyType.generated.cs",
-                "SqlCoreTask.generated.cs",
-                "SqlCoreTaskConfiguration.generated.cs",
-                "EndpointConfiguration.generated.cs"
+                "TaskPropertyAttribute.g.cs",
+                "TaskPropertySource.g.cs",
+                "TaskPropertyType.g.cs",
+                "SqlCoreTask.g.cs",
+                "SqlCoreTaskConfiguration.g.cs",
+                "EndpointConfiguration.g.cs"
             };
             for (int i = 1; i < syntaxTrees.Count; i++)
             {

diff --git a/...ources/EndpointConfiguration.generated.cs → ...ests/Resources/EndpointConfiguration.g.cs b/...ources/EndpointConfiguration.generated.cs → ...ests/Resources/EndpointConfiguration.g.cs
diff --git a/...ces/SqlCodeAnalysisRuleTests.generated.cs → ...s/Resources/SqlCodeAnalysisRuleTests.g.cs b/...ces/SqlCodeAnalysisRuleTests.generated.cs → ...s/Resources/SqlCodeAnalysisRuleTests.g.cs
diff --git a/....Tests/Resources/SqlCoreTask.generated.cs → ...nerators.Tests/Resources/SqlCoreTask.g.cs b/....Tests/Resources/SqlCoreTask.generated.cs → ...nerators.Tests/Resources/SqlCoreTask.g.cs
diff --git a/...ces/SqlCoreTaskConfiguration.generated.cs → ...s/Resources/SqlCoreTaskConfiguration.g.cs b/...ces/SqlCoreTaskConfiguration.generated.cs → ...s/Resources/SqlCoreTaskConfiguration.g.cs
diff --git a/...ources/TaskPropertyAttribute.generated.cs → ...ests/Resources/TaskPropertyAttribute.g.cs b/...ources/TaskPropertyAttribute.generated.cs → ...ests/Resources/TaskPropertyAttribute.g.cs
diff --git a/...Resources/TaskPropertySource.generated.cs → ...s.Tests/Resources/TaskPropertySource.g.cs b/...Resources/TaskPropertySource.generated.cs → ...s.Tests/Resources/TaskPropertySource.g.cs
diff --git a/...s/Resources/TaskPropertyType.generated.cs → ...ors.Tests/Resources/TaskPropertyType.g.cs b/...s/Resources/TaskPropertyType.generated.cs → ...ors.Tests/Resources/TaskPropertyType.g.cs
diff --git a/...estMethodGenerationAttribute.generated.cs → ...ources/TestMethodGenerationAttribute.g.cs b/...estMethodGenerationAttribute.generated.cs → ...ources/TestMethodGenerationAttribute.g.cs