chore: Add GH action if after merge conflict again

.cake-scripts/parameters.cake

@@ -29,7 +29,6 @@ internal sealed class BuildParameters
  public NuGetCredentials NuGetCredentials { get; private set; }
  public BuildProjects Projects { get; private set; }
  public BuildPaths Paths { get; private set; }
- public DotNetMSBuildSettings MSBuildSettings { get; private set; }
 
  public static BuildParameters Instance(ICakeContext context)
  {
@@ -60,7 +59,6 @@ internal sealed class BuildParameters
  NuGetCredentials = NuGetCredentials.GetNuGetCredentials(context),
  Projects = BuildProjects.Instance(context, solutionFilePath),
  Paths = BuildPaths.Instance(context, buildInformation.Version),
- MSBuildSettings = new DotNetMSBuildSettings()
  };
  }
 }

.github/workflows/cicd.yml

@@ -80,6 +80,7 @@ jobs:
 
  - name: Upload Test And Coverage Results
  uses: actions/upload-artifact@v4
+ if: true
  with:
  name: ${{ matrix.os }}
  path: test-results

.github/workflows/test-report.yml

@@ -1,30 +1,30 @@
-name: 'Test Report'
+name: Test Report
 
 on:
  workflow_run:
  workflows: ['Continuous Integration & Delivery']
  types:
  - completed
 
-permissions:
- contents: read
- actions: read
- checks: write
-
 jobs:
  report:
  strategy:
  fail-fast: false
  matrix:
  os: [ ubuntu-22.04, windows-2022 ]
 
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
+
+ permissions:
+ actions: read
+ checks: write
+ contents: read
 
  steps:
- - name: Publish ${{ matrix.os }} Test Results
- uses: dorny/test-reporter@v1
- with:
- artifact: ${{ matrix.os }}
- name: Test Results (${{ matrix.os }})
- path: '*.trx'
- reporter: dotnet-trx
+  - name: Publish '${{ matrix.os }}' Test Report
+  uses: dorny/test-reporter@v1
+  with:
+  artifact: ${{ matrix.os }}
+  name: ${{ matrix.os }}
+  path: '*.trx'
+  reporter: dotnet-trx

build.cake

@@ -80,7 +80,6 @@ Task("Tests")
  NoRestore = true,
  NoBuild = true,
  Collectors = new[] { "XPlat Code Coverage;Format=opencover" },
- MSBuildSettings = param.MSBuildSettings.WithProperty("UseTrxLogger", "true"),
  Filter = param.TestFilter,
  ResultsDirectory = param.Paths.Directories.TestResultsDirectoryPath,
  ArgumentCustomization = args => args

tests/Directory.Build.props

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
- <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
- <PropertyGroup>
- <SignAssembly>false</SignAssembly>
- </PropertyGroup>
- <ItemGroup>
- <VSTestLogger Include="trx%3BLogFileName=$(MSBuildProjectName).trx" Condition="$(UseTrxLogger) == 'true'" />
- </ItemGroup>
- <PropertyGroup>
- <VSTestLogger>@(VSTestLogger)</VSTestLogger>
- </PropertyGroup>
-</Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
+ <PropertyGroup>
+ <SignAssembly>false</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <VSTestLogger>trx%3BLogFileName=$(MSBuildProjectName).trx</VSTestLogger>
+ </PropertyGroup>
+</Project>