#Issue 669 - Evaluation of project properties with the help of Microsoft.Build.Eva…

CycloneDX.Tests/CycloneDX.Tests.csproj

@@ -51,6 +51,15 @@
     <None Update="FunctionalTests\IPR-TwoLevelTree\project3csproj.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="FunctionalTests\Issue669-IsTestProjectEvaluation\makeMeTestProject.props">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="FunctionalTests\Issue669-IsTestProjectEvaluation\nontestproject.csproj.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="FunctionalTests\Issue669-IsTestProjectEvaluation\testproject.csproj.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="FunctionalTests\Issue826-ProjectFileDoesntExist\project1csproj.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

CycloneDX.Tests/FunctionalTests/Issue669-IsTestProjectEvaluation/Issue669.cs

@@ -0,0 +1,40 @@
+using System.IO;
+using System.IO.Abstractions;
+using System.Reflection;
+using CycloneDX.Interfaces;
+using CycloneDX.Models;
+using CycloneDX.Services;
+using Moq;
+using Xunit;
+
+namespace CycloneDX.Tests.FunctionalTests
+{
+    public sealed class Issue669
+    {
+        [Theory]
+        [InlineData("testproject.csproj.xml", true)]
+        [InlineData("nontestproject.csproj.xml", false)]
+        public void IsTestProjectTrueWithImportedPropsTargets(string projectFile, bool expectedIsTestProject)
+        {
+            var mockDotnetUtilsService = new Mock<IDotnetUtilsService>();
+            mockDotnetUtilsService
+                .Setup(s => s.Restore(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+                .Returns(new DotnetUtilsResult());
+            mockDotnetUtilsService
+                 .Setup(s => s.GetAssetsPath(It.IsAny<string>()))
+                 .Returns(new DotnetUtilsResult<string>() { Result = "" });
+            var mockPackageFileService = new Mock<IPackagesFileService>();
+            var mockProjectAssetsFileService = new Mock<IProjectAssetsFileService>();
+
+            var projectFileService = new ProjectFileService(
+                new FileSystem(),
+                mockDotnetUtilsService.Object,
+                mockPackageFileService.Object,
+                mockProjectAssetsFileService.Object);
+
+            string physicalProjectPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "FunctionalTests", "Issue669-IsTestProjectEvaluation", projectFile);
+
+            Assert.Equal(projectFileService.IsTestProject(physicalProjectPath), expectedIsTestProject);
+        }
+    }
+}

CycloneDX.Tests/FunctionalTests/Issue669-IsTestProjectEvaluation/makeMeTestProject.props

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+</Project>

CycloneDX.Tests/FunctionalTests/Issue669-IsTestProjectEvaluation/nontestproject.csproj.xml

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="FunctionalTests/Issue669-IsTestProjectEvaluation/makeMeTestProject.props" />
+
+  <PropertyGroup>
+    <IsTestProject>false</IsTestProject>
+  </PropertyGroup>
+
+</Project>

CycloneDX.Tests/FunctionalTests/Issue669-IsTestProjectEvaluation/testproject.csproj.xml

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <IsTestProject>false</IsTestProject>
+  </PropertyGroup>
+
+  <Import Project="FunctionalTests/Issue669-IsTestProjectEvaluation/makeMeTestProject.props" />
+
+</Project>

CycloneDX/CycloneDX.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -36,6 +36,8 @@
     <PackageReference Include="NuGet.ProjectModel" />
     <PackageReference Include="System.IO.Abstractions" />
     <PackageReference Include="System.CommandLine" />
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime"/>
+    <PackageReference Include="Microsoft.Build.Locator" />
   </ItemGroup>
 
   <ItemGroup>

CycloneDX/Services/ProjectFileService.cs

@@ -17,15 +17,16 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Xml;
 using System.IO;
 using System.IO.Abstractions;
+using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using System.Xml;
 using CycloneDX.Interfaces;
 using CycloneDX.Models;
-using System.Text.RegularExpressions;
-using System.Reflection;
+using Microsoft.Build.Evaluation;
+using Microsoft.Build.Locator;
 
 namespace CycloneDX.Services
 {
@@ -38,6 +39,12 @@ public DotnetRestoreException(string message, Exception innerException) : base(m
 
     public class ProjectFileService : IProjectFileService
     {
+        static ProjectFileService()
+        {
+            // Register the MSBuild instance (do this once per process)
+            MSBuildLocator.RegisterDefaults();
+        }
+
         private XmlReaderSettings _xmlReaderSettings = new XmlReaderSettings
         {
             Async = true
@@ -67,18 +74,17 @@ public bool IsTestProject(string projectFilePath)
                 return false;
             }
 
-            XmlDocument xmldoc = new XmlDocument();
             using var fileStream = _fileSystem.FileStream.New(projectFilePath, FileMode.Open, FileAccess.Read);
-            xmldoc.Load(fileStream);
+            using var xmlReader = XmlReader.Create(fileStream);
 
-            XmlElement testSdkReference = xmldoc.SelectSingleNode("/Project/ItemGroup/PackageReference[@Include='Microsoft.NET.Test.Sdk']") as XmlElement;
-            if (testSdkReference != null)
-            {
-                return true;
-            }
-            // if this is meant for old csproj file format, then it's probably not working because there is no namespace given
-            XmlElement testProjectPropertyGroup = xmldoc.SelectSingleNode("/Project/PropertyGroup[IsTestProject='true']") as XmlElement;
-            return testProjectPropertyGroup != null;
+            // load the project (all imports and SDKs are processed)
+            var project = new Project(xmlReader);
+
+            // get property value after evaluation
+            string propertyValue = project.GetPropertyValue("IsTestProject");
+
+            //return is expected parsed boolean value, default false
+            return bool.TryParse(propertyValue, out bool isTestProject) && isTestProject;
         }
 
         private (string name, string version) GetAssemblyNameAndVersion(string projectFilePath)

Directory.Packages.props

@@ -5,7 +5,7 @@
   <ItemGroup>
     <PackageVersion Include="CycloneDX.Core" Version="9.0.2" />
     <PackageVersion Include="Microsoft.Build" Version="17.3.2" />
-    <PackageVersion Include="Microsoft.Build.Engine" Version="17.8.3" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="1.9.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="NuGet.ProjectModel" Version="6.9.1" />
     <PackageVersion Include="NuGet.Protocol" Version="6.9.1" />