Skip to content

Commit

Permalink
Showing 12 changed files with 35 additions and 28 deletions.
4 changes: 2 additions & 2 deletions TUnit.Analyzers/TUnit.Analyzers.csproj
Original file line number Diff line number Diff line change
@@ -49,11 +49,11 @@
</Compile>
</ItemGroup>

<ItemGroup Condition="'$(Target)' != 'Pack'">
<ItemGroup Condition="'$(IsPackTarget)' != 'true'">
<ProjectReference Include="..\TUnit.Core\TUnit.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
</ItemGroup>

<ItemGroup Condition="'$(Target)' == 'Pack'">
<ItemGroup Condition="'$(IsPackTarget)' == 'true'">
<ProjectReference Include="..\TUnit.Core\TUnit.Core.csproj" />
</ItemGroup>

Original file line number Diff line number Diff line change
@@ -67,7 +67,8 @@ private void Execute(SourceProductionContext context, InheritsTestsDataModel? mo

foreach (var modelTestSourceDataModel in model.TestSourceDataModels)
{
var className = $"{model.MinimalTypeName}_Inherited_{Guid.NewGuid():N}";
var className = $"{model.MinimalTypeName}_Inherited";
var fileName = $"{className}_{Guid.NewGuid():N}";

using var sourceBuilder = new SourceCodeWriter();

@@ -78,7 +79,7 @@ private void Execute(SourceProductionContext context, InheritsTestsDataModel? mo
sourceBuilder.WriteLine("namespace TUnit.Engine;");
sourceBuilder.WriteLine();
sourceBuilder.WriteLine("[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]");
sourceBuilder.WriteLine($"file class {className}");
sourceBuilder.WriteLine($"file partial class {className}");
sourceBuilder.WriteLine("{");
sourceBuilder.WriteLine("[global::System.Runtime.CompilerServices.ModuleInitializer]");
sourceBuilder.WriteLine("public static void Initialise()");
@@ -106,7 +107,7 @@ private void Execute(SourceProductionContext context, InheritsTestsDataModel? mo
sourceBuilder.WriteLine("}");
sourceBuilder.WriteLine("}");

context.AddSource($"{className}.Generated.cs", sourceBuilder.ToString());
context.AddSource($"{fileName}.Generated.cs", sourceBuilder.ToString());
}
}
}
7 changes: 4 additions & 3 deletions TUnit.Engine.SourceGenerator/CodeGenerators/TestsGenerator.cs
Original file line number Diff line number Diff line change
@@ -59,7 +59,8 @@ private void Execute(SourceProductionContext context, TestCollectionDataModel te
{
foreach (var model in testCollection.TestSourceDataModels)
{
var className = $"{model.MethodName}_{model.MinimalTypeName}_{Guid.NewGuid():N}";
var className = $"{model.MethodName}_{model.MinimalTypeName}";
var fileName = $"{className}_{Guid.NewGuid():N}";

using var sourceBuilder = new SourceCodeWriter();

@@ -70,7 +71,7 @@ private void Execute(SourceProductionContext context, TestCollectionDataModel te
sourceBuilder.WriteLine("namespace TUnit.Engine;");
sourceBuilder.WriteLine();
sourceBuilder.WriteLine("[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]");
sourceBuilder.WriteLine($"file class {className}");
sourceBuilder.WriteLine($"file partial class {className}");
sourceBuilder.WriteLine("{");
sourceBuilder.WriteLine("[global::System.Runtime.CompilerServices.ModuleInitializer]");
sourceBuilder.WriteLine("public static void Initialise()");
@@ -98,7 +99,7 @@ private void Execute(SourceProductionContext context, TestCollectionDataModel te
sourceBuilder.WriteLine("}");
sourceBuilder.WriteLine("}");

context.AddSource($"{className}.Generated.cs", sourceBuilder.ToString());
context.AddSource($"{fileName}.Generated.cs", sourceBuilder.ToString());
}
}
}
Original file line number Diff line number Diff line change
@@ -13,7 +13,8 @@ public static void Execute(SourceProductionContext context, HooksDataModel? mode
return;
}

var className = $"AssemblyHooks_{model.MinimalTypeName}_{Guid.NewGuid():N}";
var className = $"AssemblyHooks_{model.MinimalTypeName}";
var fileName = $"{className}_{Guid.NewGuid():N}";

using var sourceBuilder = new SourceCodeWriter();

@@ -30,7 +31,7 @@ public static void Execute(SourceProductionContext context, HooksDataModel? mode
sourceBuilder.WriteLine("namespace TUnit.Engine;");
sourceBuilder.WriteLine();
sourceBuilder.WriteLine("[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]");
sourceBuilder.WriteLine($"file class {className}");
sourceBuilder.WriteLine($"file partial class {className}");
sourceBuilder.WriteLine("{");
sourceBuilder.WriteLine("[ModuleInitializer]");
sourceBuilder.WriteLine("public static void Initialise()");
@@ -62,7 +63,7 @@ public static void Execute(SourceProductionContext context, HooksDataModel? mode
sourceBuilder.WriteLine("}");
sourceBuilder.WriteLine("}");

context.AddSource($"{className}.Generated.cs", sourceBuilder.ToString());
context.AddSource($"{fileName}.Generated.cs", sourceBuilder.ToString());
}

private static string GenerateContextObject(HooksDataModel model)
Original file line number Diff line number Diff line change
@@ -8,7 +8,8 @@ internal static class ClassHooksWriter
{
public static void Execute(SourceProductionContext context, HooksDataModel model, HookType hookType)
{
var className = $"ClassHooks_{model.MinimalTypeName}_{Guid.NewGuid():N}";
var className = $"ClassHooks_{model.MinimalTypeName}";
var fileName = $"{className}_{Guid.NewGuid():N}";

using var sourceBuilder = new SourceCodeWriter();

@@ -25,7 +26,7 @@ public static void Execute(SourceProductionContext context, HooksDataModel model
sourceBuilder.WriteLine("namespace TUnit.Engine;");
sourceBuilder.WriteLine();
sourceBuilder.WriteLine("[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]");
sourceBuilder.WriteLine($"file class {className}");
sourceBuilder.WriteLine($"file partial class {className}");
sourceBuilder.WriteLine("{");
sourceBuilder.WriteLine("[ModuleInitializer]");
sourceBuilder.WriteLine("public static void Initialise()");
@@ -57,7 +58,7 @@ public static void Execute(SourceProductionContext context, HooksDataModel model
sourceBuilder.WriteLine("}");
sourceBuilder.WriteLine("}");

context.AddSource($"{className}.Generated.cs", sourceBuilder.ToString());
context.AddSource($"{fileName}.Generated.cs", sourceBuilder.ToString());
}

private static string GenerateContextObject(HooksDataModel model)
Original file line number Diff line number Diff line change
@@ -8,7 +8,8 @@ internal static class GlobalTestHooksWriter
{
public static void Execute(SourceProductionContext context, HooksDataModel model, HookType hookType)
{
var className = $"GlobalStaticTestHooks_{model.MinimalTypeName}_{Guid.NewGuid():N}";
var className = $"GlobalStaticTestHooks_{model.MinimalTypeName}";
var fileName = $"{className}_{Guid.NewGuid():N}";

using var sourceBuilder = new SourceCodeWriter();

@@ -25,7 +26,7 @@ public static void Execute(SourceProductionContext context, HooksDataModel model
sourceBuilder.WriteLine("namespace TUnit.Engine;");
sourceBuilder.WriteLine();
sourceBuilder.WriteLine("[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]");
sourceBuilder.WriteLine($"file class {className}");
sourceBuilder.WriteLine($"file partial class {className}");
sourceBuilder.WriteLine("{");
sourceBuilder.WriteLine("[ModuleInitializer]");
sourceBuilder.WriteLine("public static void Initialise()");
@@ -57,7 +58,7 @@ public static void Execute(SourceProductionContext context, HooksDataModel model
sourceBuilder.WriteLine("}");
sourceBuilder.WriteLine("}");

context.AddSource($"{className}.Generated.cs", sourceBuilder.ToString());
context.AddSource($"{fileName}.Generated.cs", sourceBuilder.ToString());
}

private static string GetArgs(HooksDataModel model)
Original file line number Diff line number Diff line change
@@ -8,7 +8,8 @@ internal static class TestHooksWriter
{
public static void Execute(SourceProductionContext context, HooksDataModel model, HookType hookType)
{
var className = $"TestHooks_{model.MinimalTypeName}_{Guid.NewGuid():N}";
var className = $"TestHooks_{model.MinimalTypeName}";
var fileName = $"{className}_{Guid.NewGuid():N}";

using var sourceBuilder = new SourceCodeWriter();

@@ -25,7 +26,7 @@ public static void Execute(SourceProductionContext context, HooksDataModel model
sourceBuilder.WriteLine("namespace TUnit.Engine;");
sourceBuilder.WriteLine();
sourceBuilder.WriteLine("[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]");
sourceBuilder.WriteLine($"file class {className}");
sourceBuilder.WriteLine($"file partial class {className}");
sourceBuilder.WriteLine("{");
sourceBuilder.WriteLine("[ModuleInitializer]");
sourceBuilder.WriteLine("public static void Initialise()");
@@ -57,7 +58,7 @@ public static void Execute(SourceProductionContext context, HooksDataModel model
sourceBuilder.WriteLine("}");
sourceBuilder.WriteLine("}");

context.AddSource($"{className}.Generated.cs", sourceBuilder.ToString());
context.AddSource($"{fileName}.Generated.cs", sourceBuilder.ToString());
}

private static string GenerateContextObject(HooksDataModel model)
Original file line number Diff line number Diff line change
@@ -36,11 +36,11 @@
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
</ItemGroup>

<ItemGroup Condition="'$(Target)' != 'Pack'">
<ItemGroup Condition="'$(IsPackTarget)' != 'true'">
<ProjectReference Include="..\TUnit.Core\TUnit.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
</ItemGroup>

<ItemGroup Condition="'$(Target)' == 'Pack'">
<ItemGroup Condition="'$(IsPackTarget)' == 'true'">
<ProjectReference Include="..\TUnit.Core\TUnit.Core.csproj" />
</ItemGroup>

4 changes: 2 additions & 2 deletions TUnit.Engine/TUnit.Engine.csproj
Original file line number Diff line number Diff line change
@@ -28,12 +28,12 @@
<ProjectReference Include="..\TUnit.Core\TUnit.Core.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(Target)' != 'Pack'">
<ItemGroup Condition="'$(IsPackTarget)' != 'true'">
<ProjectReference Include="..\TUnit.Engine.SourceGenerator\TUnit.Engine.SourceGenerator.csproj"
OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
</ItemGroup>

<ItemGroup Condition="'$(Target)' == 'Pack'">
<ItemGroup Condition="'$(IsPackTarget)' == 'true'">
<ProjectReference Include="..\TUnit.Engine.SourceGenerator\TUnit.Engine.SourceGenerator.csproj" />
<PackageReference Include="Microsoft.Testing.Platform.MSBuild" Version="1.3.2" />
</ItemGroup>
3 changes: 2 additions & 1 deletion TUnit.Pipeline/Modules/PackTUnitFilesModule.cs
Original file line number Diff line number Diff line change
@@ -32,7 +32,8 @@ public class PackTUnitFilesModule : Module<List<PackedProject>>
Properties =
[
new KeyValue("Version", version.SemVer!),
new KeyValue("PackageVersion", packageVersion!)
new KeyValue("PackageVersion", packageVersion!),
new KeyValue("IsPackTarget", "true")
],
NoBuild = true,
IncludeSource = true,
4 changes: 2 additions & 2 deletions TUnit/TUnit.csproj
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@
<ProjectReference Include="..\TUnit.Engine\TUnit.Engine.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(Target)' != 'Pack'">
<ItemGroup Condition="'$(IsPackTarget)' != 'true'">
<ProjectReference Include="..\TUnit.Analyzers\TUnit.Analyzers.csproj"
OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
</ItemGroup>

<ItemGroup Condition="'$(Target)' == 'Pack'">
<ItemGroup Condition="'$(IsPackTarget)' == 'true'">
<ProjectReference Include="..\TUnit.Analyzers\TUnit.Analyzers.csproj" />
</ItemGroup>

Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="TUnit" Version="0.1.467" />
<PackageReference Include="TUnit" Version="0.1.469" />
</ItemGroup>

</Project>

0 comments on commit 9fe3832

Please sign in to comment.