Allure integration with xUnit.net v3 MTP

.github/labeler.yml

@@ -51,3 +51,10 @@
     - any-glob-to-any-file:
       - "src/Allure.TestingPlatform/**"
       - "tests/Allure.TestingPlatform.Tests/**"
+
+"theme:xunit.v3":
+  - changed-files:
+    - any-glob-to-any-file:
+      - "src/Allure.Xunit.v3/**"
+      - "src/Allure.Xunit.v3.Generator/**"
+      - "examples/Allure.Xunit.v3.Mtp.Examples/**"

.github/workflows/test.yml

@@ -3,6 +3,7 @@ name: Test
 env:
   SOLUTION_PATH: allure-csharp.slnx
   BUILD_CONFIGURATION: 'Release'
+  PACK_CONFIGURATION: 'Publish'
 
 on:
   workflow_dispatch:
@@ -53,7 +54,7 @@ jobs:
           dotnet pack ${{ env.SOLUTION_PATH }}\
             --no-restore\
             --no-build\
-            --configuration ${{ env.BUILD_CONFIGURATION }}
+            --configuration ${{ env.PACK_CONFIGURATION }}
 
       - name: Build test samples
         run: |
@@ -62,6 +63,7 @@ jobs:
             -p:Allure_SampleConfiguration=${{ env.BUILD_CONFIGURATION }}
 
       - name: 'Run test samples'
+        continue-on-error: true
         run: |
           dotnet msbuild ${{ env.SOLUTION_PATH }}\
             -t:Allure_RunTestSamples\
@@ -85,6 +87,10 @@ jobs:
             --no-restore\
             --no-build\
             --configuration ${{ env.BUILD_CONFIGURATION }}
+          npx -y allure@3 run --config ./.allurerc.mjs --rerun 2 --environment="${{ env.BUILD_CONFIGURATION }}" --dump="allure-results-xunit-v3" -- dotnet run --project ./tests/Allure.Xunit.v3.Tests\
+            --no-restore\
+            --no-build\
+            --configuration ${{ env.BUILD_CONFIGURATION }}
           npx -y allure@3 run --config ./.allurerc.mjs --rerun 2 --environment="${{ env.BUILD_CONFIGURATION }}" --dump="allure-results-specflow" -- dotnet test ./tests/Allure.SpecFlow.Tests\
             --no-restore\
             --no-build\

allure-csharp.slnx

@@ -67,6 +67,12 @@
     <Project Path="src/Allure.Xunit/Allure.Xunit.csproj">
       <BuildType Solution="Publish|*" Project="Release" />
     </Project>
+    <Project Path="src/Allure.Xunit.v3/Allure.Xunit.v3.csproj">
+      <BuildType Solution="Publish|*" Project="Release" />
+    </Project>
+    <Project Path="src/Allure.Xunit.v3.Generator/Allure.Xunit.v3.Generator.csproj">
+      <BuildType Solution="Publish|*" Project="Release" />
+    </Project>
   </Folder>
   <Folder Name="/tests/">
     <Project Path="tests/Allure.Net.Commons.Tests/Allure.Net.Commons.Tests.csproj">
@@ -96,6 +102,9 @@
     <Project Path="tests/Allure.Xunit.Tests/Allure.Xunit.Tests.csproj">
       <Build Solution="Publish|*" Project="false" />
     </Project>
+    <Project Path="tests/Allure.Xunit.v3.Tests/Allure.Xunit.v3.Tests.csproj">
+      <Build Solution="Publish|*" Project="false" />
+    </Project>
   </Folder>
   <Folder Name="/Solution Items/">
     <File Path=".gitignore" />

build/Allure.Build.Tasks/FillSampleMetadata.cs

@@ -20,6 +20,9 @@ public class FillSampleMetadata : Task
     [Required]
     public string ProjectDirectory { get; set; }
 
+    [Required]
+    public string TestingPlatform { get; set; }
+
     [Required]
     public string SampleSolutionDirectory { get; set; }
 
@@ -145,6 +148,9 @@ void SetResultsDirectory(ITaskItem2 item)
             this.BinDirectory,
             item.GetMetadata("ProjectName"),
             $"{configuration}_{targetFramework}",
+            this.TestingPlatform is "MicrosoftTestingPlatform"
+                ? "TestResults"
+                : "",
             "allure-results"
         );
         item.SetMetadataValueLiteral("ResultsDirectory", defaultResultsDirectory);

build/Allure.Build.Tasks/Functions/Files.cs

@@ -60,6 +60,7 @@ public static GeneratedFileSource DirectoryBuildProps(
         string solutionDir,
         string targetFrameworks,
         string outputType,
+        IEnumerable<(string name, string value)> properties,
         IEnumerable<string> imports,
         IEnumerable<string> packages,
         IEnumerable<string> projects,
@@ -70,6 +71,7 @@ IEnumerable<string> analyzerProjects
                 imports: imports,
                 targetFrameworks: targetFrameworks,
                 outputType: outputType,
+                properties: properties,
                 packages: packages,
                 projects: projects,
                 analyzerProjects: analyzerProjects

build/Allure.Build.Tasks/Functions/XmlDefinitions.cs

@@ -106,6 +106,7 @@ public static XDocument DirectoryBuildProps(
         IEnumerable<string> imports,
         string targetFrameworks,
         string outputType,
+        IEnumerable<(string name, string value)> properties,
         IEnumerable<string> packages,
         IEnumerable<string> projects,
         IEnumerable<string> analyzerProjects
@@ -120,7 +121,8 @@ IEnumerable<string> analyzerProjects
                     ("OutputType", outputType),
                     ("EnableDefaultItems", "false"),
                     ("IsTestProject", "true"),
-                    ("AspectInjector_Enabled", "false")
+                    ("AspectInjector_Enabled", "false"),
+                    ..properties,
                 ]),
                 MsBuild.GetItemGroup("Compile", [("Include", Path.Combine("**", "*.cs"))]),
                 MsBuild.GetItemGroup("Clean", [

build/Allure.Build.Tasks/GenerateSampleSolution.cs

@@ -22,6 +22,9 @@ public class GenerateSampleSolution : Task
     [Required]
     public ITaskItem[] SampleProjectReferences { get; set; }
 
+    [Required]
+    public ITaskItem[] SampleProperties { get; set; }
+
     [Required]
     public string ProjectDirectory { get; set; }
 
@@ -50,6 +53,8 @@ public class GenerateSampleSolution : Task
 
     IEnumerable<ITaskItem2> SampleSources2 => this.SampleSources.Cast<ITaskItem2>();
 
+    IEnumerable<ITaskItem2> SampleProperties2 => this.SampleProperties.Cast<ITaskItem2>();
+
     IEnumerable<ITaskItem2> SamplePackageReferences2 =>
         this.SamplePackageReferences.Cast<ITaskItem2>();
 
@@ -125,6 +130,9 @@ GeneratedFileSource PrepareDirectoryBuildProps(MsBuildImportFiles imports) =>
             solutionDir: this.SampleSolutionDir,
             targetFrameworks: this.SampleTargetFrameworks,
             outputType: Projects.ResolveOutputType(this.TestingPlatform),
+            properties: this.SampleProperties2.Select(
+                (item) => (item.EvaluatedIncludeEscaped, item.GetMetadataValueEscaped("Value"))
+            ),
             imports.PropsFiles,
             packages: this.CommonPackageNames,
             projects: this.SampleProjectReferences.Select((item) =>

src/Allure.TestingPlatform/Functions/ConfigurationFunctions.cs

@@ -48,14 +48,14 @@ public static AllureConfiguration ReadConfiguration<TConfiguration>(
             );
         }
 
+        configPath ??= Path.Combine(
+            AppDomain.CurrentDomain.BaseDirectory,
+            AllureConstants.CONFIG_FILENAME
+        );
+
         JObject configJson = File.Exists(configPath)
             ? JObject.Parse(File.ReadAllText(configPath))
-            : Path.Combine(
-                AppDomain.CurrentDomain.BaseDirectory,
-                AllureConstants.CONFIG_FILENAME
-            ) is { } defaultConfigPath && File.Exists(defaultConfigPath)
-                ? JObject.Parse(File.ReadAllText(defaultConfigPath))
-                : [];
+            : [];
 
         var allureSection = configJson["allure"] is { } allureObject
             ? allureObject

src/Allure.TestingPlatform/Functions/ModelFunctionExtensions.cs

@@ -16,8 +16,7 @@ static class ModelFunctionExtensions
 {
     extension (ModelFunctions)
     {
-        public static TestResult CreateTestResult(AllureConfiguration config) =>
-        new()
+        public static TestResult CreateTestResult(AllureConfiguration config) => new()
         {
             uuid = IdFunctions.CreateUUID(),
             labels = [

src/Allure.TestingPlatform/Registration/IStandaloneAllureRegistrationContext.cs

@@ -3,7 +3,6 @@
 using Allure.Net.Commons;
 using Allure.Net.Commons.Configuration;
 using Allure.Net.Commons.Sdk;
-using Microsoft.Testing.Platform.Logging;
 
 namespace Allure.TestingPlatform.Registration;
 

src/Allure.Xunit.v3.Generator/Allure.Xunit.v3.Generator.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk" TreatAsLocalProperty="WarnOnPackingNonPackableProject">
+
+    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0</TargetFrameworks>
+        <RootNamespace>Allure.Xunit.Generator</RootNamespace>
+        <Nullable>enable</Nullable>
+        <Authors>Qameta Software Inc</Authors>
+        <Description>
+            A source generator that automatically enables Allure.Xunit.v3 for a
+            Microsoft Testing Platform C# project and adds support for Allure test
+            plan pre-filtering.
+        </Description>
+
+        <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <!-- These properties prevent NuGet from packing the source generator as a separate package.
+         Instead, it is packed as a part of Allure.Xunit.v3. -->
+        <IsPackable>false</IsPackable>
+        <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" PrivateAssets="all" />
+    </ItemGroup>
+
+</Project>