test: exclude Microsoft.NET.Test.Sdk from `Microsoft.ComponentDetec…

…tion.TestsUtilities` project (#321)
microsoft · Oct 21, 2022 · 37d4829 · 37d4829
1 parent 7002566
commit 37d4829
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -2,12 +2,7 @@
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
 
-  <PropertyGroup Label="Build">
-    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-  </PropertyGroup>
-
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk"/>
     <PackageReference Include="MSTest.TestAdapter"/>
     <PackageReference Include="MSTest.TestFramework"/>
     <PackageReference Include="Moq"/>

diff --git a/...icrosoft.ComponentDetection.Common.Tests/Microsoft.ComponentDetection.Common.Tests.csproj b/...icrosoft.ComponentDetection.Common.Tests/Microsoft.ComponentDetection.Common.Tests.csproj
@@ -1,7 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
+    <ItemGroup Label="Project References">
         <ProjectReference Include="..\Microsoft.ComponentDetection.TestsUtilities\Microsoft.ComponentDetection.TestsUtilities.csproj"/>
     </ItemGroup>
 
+    <ItemGroup Label="Package References">
+      <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+    </ItemGroup>
+
 </Project>
diff --git a/...ft.ComponentDetection.Contracts.Tests/Microsoft.ComponentDetection.Contracts.Tests.csproj b/...ft.ComponentDetection.Contracts.Tests/Microsoft.ComponentDetection.Contracts.Tests.csproj
@@ -4,7 +4,8 @@
         <ProjectReference Include="..\..\src\Microsoft.ComponentDetection.Contracts\Microsoft.ComponentDetection.Contracts.csproj"/>
     </ItemGroup>
 
-    <ItemGroup>
+    <ItemGroup Label="Package References">
+        <PackageReference Include="Microsoft.NET.Test.Sdk"/>
         <PackageReference Include="System.Reactive"/>
         <PackageReference Include="packageurl-dotnet"/>
     </ItemGroup>

diff --git a/...ft.ComponentDetection.Detectors.Tests/Microsoft.ComponentDetection.Detectors.Tests.csproj b/...ft.ComponentDetection.Detectors.Tests/Microsoft.ComponentDetection.Detectors.Tests.csproj
@@ -4,7 +4,8 @@
         <ProjectReference Include="..\Microsoft.ComponentDetection.TestsUtilities\Microsoft.ComponentDetection.TestsUtilities.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
+    <ItemGroup Label="Package References">
+        <PackageReference Include="Microsoft.NET.Test.Sdk"/>
         <PackageReference Include="NuGet.Versioning" />
         <PackageReference Include="System.Reactive" />
         <PackageReference Include="packageurl-dotnet" />

diff --git a/...ponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj b/...ponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj
@@ -5,4 +5,8 @@
         <ProjectReference Include="..\Microsoft.ComponentDetection.TestsUtilities\Microsoft.ComponentDetection.TestsUtilities.csproj"/>
     </ItemGroup>
 
+    <ItemGroup Label="Package References">
+        <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+    </ItemGroup>
+
 </Project>
diff --git a/...soft.ComponentDetection.TestsUtilities/Microsoft.ComponentDetection.TestsUtilities.csproj b/...soft.ComponentDetection.TestsUtilities/Microsoft.ComponentDetection.TestsUtilities.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <PropertyGroup Label="Build">
+      <IsPackable>true</IsPackable>
+    </PropertyGroup>
+
     <ItemGroup Label="Project References">
         <ProjectReference Include="..\..\src\Microsoft.ComponentDetection.Detectors\Microsoft.ComponentDetection.Detectors.csproj"/>
         <PackageReference Include="System.Reactive"/>
     </ItemGroup>
-    <PropertyGroup>
-        <IsPackable>true</IsPackable>
-    </PropertyGroup>
+
 </Project>