From a9a89e3246f6f2da030ba1c04187dab9996156b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20St=C3=BChmer?= <me@samtrion.net>
Date: Tue, 21 May 2024 13:49:08 +0200
Subject: [PATCH] chore: Rebuild `Directory.Build.props` and
 `Directory.Build.targets` (#401)

---
 Directory.Build.props                         | 20 ++++++++++++++++++
 Directory.Build.targets                       |  2 ++
 src/Directory.Build.props                     | 21 -------------------
 src/Directory.Build.targets                   |  6 ------
 tests/Directory.Build.props                   | 10 ---------
 tests/Directory.Build.targets                 |  6 ------
 .../AcceptanceTestAttributeTests.cs           |  2 --
 .../AttributeTestsBase.cs                     |  1 -
 8 files changed, 22 insertions(+), 46 deletions(-)
 delete mode 100644 src/Directory.Build.props
 delete mode 100644 src/Directory.Build.targets
 delete mode 100644 tests/Directory.Build.props
 delete mode 100644 tests/Directory.Build.targets

diff --git a/Directory.Build.props b/Directory.Build.props
index 9b8866a..f3a1593 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -6,5 +6,25 @@
   </PropertyGroup>
 
   <Import Project="$(DirEngineeringSettings)sln.build.props" />
+  <Import Project="$(DirEngineeringSettings)src.build.props" Condition=" '$(IsTestableProject)' != 'true' " />
+  <Import Project="$(DirEngineeringSettings)tests.build.props" Condition=" '$(IsTestableProject)' == 'true' " />
 
+  <PropertyGroup Condition=" '$(IsTestableProject)' != 'true' " >
+    <Title>$(PackageId)</Title>
+    <Description>This library provides various compatibility features between `NUnit`, `XUnit` and `MSTest`.</Description>
+
+    <CopyrightYearStart>2023</CopyrightYearStart>
+
+    <PackageProjectUrl>https://github.com/dailydevops/extensions.test</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/dailydevops/extensions.test.git</RepositoryUrl>
+
+    <PackageTags>compatibility;test;category;categories;culture;workitems</PackageTags>
+
+    <!-- Project is not a test project -->
+    <SonarQubeTestProject>false</SonarQubeTestProject>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(IsTestableProject)' == 'true' " >
+    <None Include="..\_snapshot\**\*.*" Link="_snapshot\%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 10933b1..a54343c 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,7 @@
 <Project>
 
   <Import Project="$(DirEngineeringSettings)sln.build.targets" />
+  <Import Project="$(DirEngineeringSettings)src.build.targets" Condition=" '$(IsTestableProject)' != 'true' " />
+  <Import Project="$(DirEngineeringSettings)tests.build.targets" Condition=" '$(IsTestableProject)' == 'true' " />
 
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
deleted file mode 100644
index edf7f10..0000000
--- a/src/Directory.Build.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Project="$(DirEngineeringSettings)src.build.props" />
-
-  <PropertyGroup>
-    <Title>$(PackageId)</Title>
-    <Description>This library provides various compatibility features between `NUnit`, `XUnit` and `MSTest`.</Description>
-
-    <CopyrightYearStart>2023</CopyrightYearStart>
-
-    <PackageProjectUrl>https://github.com/dailydevops/extensions.test</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/dailydevops/extensions.test.git</RepositoryUrl>
-
-    <PackageTags>compatibility;test;category;categories;culture;workitems</PackageTags>
-
-    <!-- Project is not a test project -->
-    <SonarQubeTestProject>false</SonarQubeTestProject>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
deleted file mode 100644
index 64a47f6..0000000
--- a/src/Directory.Build.targets
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Project="$(DirEngineeringSettings)src.build.targets" />
-
-</Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
deleted file mode 100644
index 32e1a4d..0000000
--- a/tests/Directory.Build.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Project="$(DirEngineeringSettings)tests.build.props" />
-
-  <ItemGroup>
-    <None Include="..\_snapshot\**\*.*" Link="_snapshot\%(RecursiveDir)%(Filename)%(Extension)" />
-  </ItemGroup>
-
-</Project>
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
deleted file mode 100644
index d7aa591..0000000
--- a/tests/Directory.Build.targets
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Project="$(DirEngineeringSettings)tests.build.targets" />
-
-</Project>
diff --git a/tests/NetEvolve.Extensions.MSTest.Tests.Unit/AcceptanceTestAttributeTests.cs b/tests/NetEvolve.Extensions.MSTest.Tests.Unit/AcceptanceTestAttributeTests.cs
index afe566d..0011c3e 100644
--- a/tests/NetEvolve.Extensions.MSTest.Tests.Unit/AcceptanceTestAttributeTests.cs
+++ b/tests/NetEvolve.Extensions.MSTest.Tests.Unit/AcceptanceTestAttributeTests.cs
@@ -2,10 +2,8 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using VerifyTests;
 
 /// <summary>
 /// Unit tests for <see cref="AcceptanceTestAttribute"/>.
diff --git a/tests/NetEvolve.Extensions.XUnit.Tests.Unit/AttributeTestsBase.cs b/tests/NetEvolve.Extensions.XUnit.Tests.Unit/AttributeTestsBase.cs
index 460f4b7..bd22185 100644
--- a/tests/NetEvolve.Extensions.XUnit.Tests.Unit/AttributeTestsBase.cs
+++ b/tests/NetEvolve.Extensions.XUnit.Tests.Unit/AttributeTestsBase.cs
@@ -1,6 +1,5 @@
 namespace NetEvolve.Extensions.XUnit.Tests.Unit;
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;