From fc76c9b0c1742f518239ed5d70381e0e92c9e792 Mon Sep 17 00:00:00 2001 From: CodeTiger Date: Sat, 14 Oct 2023 22:38:22 +0200 Subject: [PATCH] Revert "Trying things to figure out why linux unit test fails" This reverts commit 4d4059bdb3bd28e508336e5937e942a5ffc6eeca. Signed-off-by: CodeTiger --- .github/workflows/dotnetcore.yml | 2 +- CycloneDX/Runner.cs | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index bde14740..e0dedead 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -42,7 +42,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, ubuntu-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-latest] framework: ['net6.0','net7.0'] timeout-minutes: 30 diff --git a/CycloneDX/Runner.cs b/CycloneDX/Runner.cs index ddd8eca7..72388001 100644 --- a/CycloneDX/Runner.cs +++ b/CycloneDX/Runner.cs @@ -46,15 +46,13 @@ public Runner(IFileSystem fileSystem = null, IProjectFileService projectFileService = null, ISolutionFileService solutionFileService = null) { - var testfileSystem = new FileSystem(); - this.fileSystem = fileSystem ?? new FileSystem() ; this.dotnetCommandService = dotnetCommandService ?? new DotnetCommandService(); - this.projectAssetsFileService = projectAssetsFileService ?? new ProjectAssetsFileService(testfileSystem, this.dotnetCommandService, () => new AssetFileReader()); - this.dotnetUtilsService = dotnetUtilsService ?? new DotnetUtilsService(testfileSystem, this.dotnetCommandService); - this.packagesFileService = packagesFileService ?? new PackagesFileService(testfileSystem); - this.projectFileService = projectFileService ?? new ProjectFileService(testfileSystem, this.dotnetUtilsService, this.packagesFileService, this.projectAssetsFileService); - this.solutionFileService = solutionFileService ?? new SolutionFileService(testfileSystem, this.projectFileService); + this.projectAssetsFileService = projectAssetsFileService ?? new ProjectAssetsFileService(this.fileSystem, this.dotnetCommandService, () => new AssetFileReader()); + this.dotnetUtilsService = dotnetUtilsService ?? new DotnetUtilsService(this.fileSystem, this.dotnetCommandService); + this.packagesFileService = packagesFileService ?? new PackagesFileService(this.fileSystem); + this.projectFileService = projectFileService ?? new ProjectFileService(this.fileSystem, this.dotnetUtilsService, this.packagesFileService, this.projectAssetsFileService); + this.solutionFileService = solutionFileService ?? new SolutionFileService(this.fileSystem, this.projectFileService); } public async Task HandleCommandAsync(string outputDirectory, string SolutionOrProjectFile = default,