performance: first check if assetsfile exists with its regular name of before using dotnet build to retrieve its name (#960)

* performance: first check regular name of assetsfile before using dotnet msbuild to retrieve it from

Signed-off-by: MTsfoni <mibau89@gmail.com>

Author: mtsfoni

CycloneDX.Tests/ProjectFileServiceTests.cs

@@ -27,6 +27,8 @@
 using CycloneDX.Services;
 using System.IO.Abstractions;
 using System.Linq;
+using System.IO;
+using System.Xml.Schema;
 
 namespace CycloneDX.Tests
 {
@@ -41,16 +43,44 @@ private ProjectFileService GetInstanceOfProjectFileService()
                 new DotnetUtilsService(fileSystem, dotnetCommandService),
                 new PackagesFileService(fileSystem),
                 new ProjectAssetsFileService(fileSystem, () => new AssetFileReader()));
-
         }
 
         [Theory]
-        [InlineData(@"C:\github\cyclonedx-dotnet\Core\CycloneDX.csproj", "", @"C:\github\cyclonedx-dotnet\Core\obj")]
-        [InlineData(@"C:\github\cyclonedx-dotnet\Core\CycloneDX.csproj", @"C:\github\cyclonedx-dotnet\artifacts", @"C:\github\cyclonedx-dotnet\artifacts\obj\CycloneDX")]
-        public void GetPropertyUseProjectFileName(string projectFilePath, string baseIntermediateOutputPath, string expected)
+        [InlineData("", @"C:\Projects\Foo\obj\project.assets.json", false)] // expected file exists
+        [InlineData("", @"C:\Projects\artifacts\obj\Foo\project.assets.json", true)] // expected missing, service finds it
+        [InlineData(@"C:\build", @"C:\build\obj\Foo\project.assets.json", false)] // using baseIntermediateOutputPath        
+        public void GetProjectAssetsFilePath_CoversAllScenarios(
+            string baseOutputPath, 
+            string assetsPath,
+            bool dotnetServiceShouldBeUsed)
         {
-          string outputPath = ProjectFileService.GetProjectProperty(XFS.Path(projectFilePath), XFS.Path(baseIntermediateOutputPath));
-          Assert.Equal(XFS.Path(expected), outputPath);
+
+            baseOutputPath = XFS.Path(baseOutputPath);
+            assetsPath = XFS.Path(assetsPath);
+
+            var mockFileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
+                {
+                    { XFS.Path(assetsPath), "" }
+                });
+
+            string projectPath = XFS.Path(@"C:\Projects\Foo\Foo.csproj");
+            // Arrange
+            var dotnetMock = new Mock<IDotnetUtilsService>();
+            var service = new ProjectFileService(mockFileSystem, dotnetMock.Object, null, null);
+
+            dotnetMock.Setup(d => d.GetAssetsPath(projectPath))
+                .Returns(new DotnetUtilsResult<string>
+                {
+                    ErrorMessage = null,
+                    Result = assetsPath
+                });            
+
+            // Act
+            var result = service.GetProjectAssetsFilePath(projectPath, baseOutputPath);
+
+            // Assert
+            Assert.Equal(assetsPath, result);
+            dotnetMock.Verify(d => d.GetAssetsPath(It.IsAny<string>()), dotnetServiceShouldBeUsed ? Times.Once : Times.Never);            
         }
 
         [Fact]        

CycloneDX/Services/ProjectFileService.cs

@@ -153,19 +153,6 @@ public bool IsTestProject(string projectFilePath)
             return (name, version);
         }
 
-        static internal string GetProjectProperty(string projectFilePath, string baseIntermediateOutputPath)
-        {
-            if (string.IsNullOrEmpty(baseIntermediateOutputPath))
-            {
-                return Path.Combine(Path.GetDirectoryName(projectFilePath), "obj");
-            }
-            else
-            {
-                string folderName = Path.GetFileNameWithoutExtension(projectFilePath);
-                return Path.Combine(baseIntermediateOutputPath, "obj", folderName);
-            }
-        }
-
         public bool DisablePackageRestore { get; set; }
 
         /// <summary>
@@ -232,21 +219,40 @@ public async Task<HashSet<DotnetDependency>> GetProjectDotnetDependencysAsync(st
             return packages;
         }
 
-        private string GetProjectAssetsFilePath(string projectFilePath, string baseIntermediateOutputPath)
-        {            
-            if (string.IsNullOrEmpty(baseIntermediateOutputPath ))
+        internal string GetProjectAssetsFilePath(string projectFilePath, string baseIntermediateOutputPath)
+        {
+            string assetsPath;
+
+            if (string.IsNullOrEmpty(baseIntermediateOutputPath))
             {
-                var result = _dotnetUtilsService.GetAssetsPath(projectFilePath);
-                if(result.Success && _fileSystem.File.Exists(result.Result))
-                {
-                    Console.WriteLine($"  Found Assetsfile under {result.Result}");
-                    return result.Result;
-                }                
-                
+                // Default to <projectDir>/obj
+                assetsPath = Path.Combine(Path.GetDirectoryName(projectFilePath), "obj", "project.assets.json");
+            }
+            else
+            {
+                // Use <baseIntermediateOutputPath>/obj/<projectName>
+                string projectName = Path.GetFileNameWithoutExtension(projectFilePath);
+                assetsPath = Path.Combine(baseIntermediateOutputPath, "obj", projectName, "project.assets.json");
+            }
+
+            if (_fileSystem.File.Exists(assetsPath))
+            {
+                Console.WriteLine($"  Found Assetsfile under {assetsPath}");
+                return assetsPath;
+            }
+
+            var result = _dotnetUtilsService.GetAssetsPath(projectFilePath);
+            if (result.Success && _fileSystem.File.Exists(result.Result))
+            {
+                Console.WriteLine($"  Found Assetsfile under {result.Result}");
+                return result.Result;
             }
-            return _fileSystem.Path.Combine(GetProjectProperty(projectFilePath, baseIntermediateOutputPath), "project.assets.json");                        
+
+            // Fall back to expected path even if file doesn't exist
+            return assetsPath;
         }
 
+
         /// <summary>
         /// Analyzes all Project file references for NuGet package references.
         /// </summary>