From 5c391fe820318a2785888b4537cbaf6f575a5866 Mon Sep 17 00:00:00 2001
From: Cole Carter <colecarter@microsoft.com>
Date: Wed, 30 Aug 2023 12:57:26 -0700
Subject: [PATCH 1/8] Adds MSBuildRunTests target

---
 .../Microsoft.Common.CurrentVersion.targets   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/Tasks/Microsoft.Common.CurrentVersion.targets b/src/Tasks/Microsoft.Common.CurrentVersion.targets
index ad309e55ee2..802164a6dc4 100644
--- a/src/Tasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/Tasks/Microsoft.Common.CurrentVersion.targets
@@ -5739,6 +5739,27 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
   </Target>
 
+  <!--
+    ***********************************************************************************************
+    ***********************************************************************************************
+                                                                Test Section
+    ***********************************************************************************************
+    ***********************************************************************************************
+  -->
+  <!--
+    ============================================================
+    This stub `MSBuildRunTests` target allows for targets implementing Test execution functionality
+    to run after it.
+    
+    For example:
+    <Target Name="ExecuteTests" AfterTargets="MSBuildRunTests">
+     (implementation)
+    </Target>
+    ============================================================
+  -->
+
+  <Target Name="MSBuildRunTests"></Target>
+
   <!--
     ***********************************************************************************************
     ***********************************************************************************************

From 697489bead0f7a080c62a2c85b0c15e9f3dc22bd Mon Sep 17 00:00:00 2001
From: Cole Carter <colecarter@microsoft.com>
Date: Mon, 6 Nov 2023 08:02:09 -0800
Subject: [PATCH 2/8] Update Microsoft.Common.CurrentVersion.targets

Update target name, as requested by Test team
---
 src/Tasks/Microsoft.Common.CurrentVersion.targets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Tasks/Microsoft.Common.CurrentVersion.targets b/src/Tasks/Microsoft.Common.CurrentVersion.targets
index 802164a6dc4..188351d7f89 100644
--- a/src/Tasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/Tasks/Microsoft.Common.CurrentVersion.targets
@@ -5748,17 +5748,17 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   -->
   <!--
     ============================================================
-    This stub `MSBuildRunTests` target allows for targets implementing Test execution functionality
+    This stub `VSTest` target allows for targets implementing Test execution functionality
     to run after it.
     
     For example:
-    <Target Name="ExecuteTests" AfterTargets="MSBuildRunTests">
+    <Target Name="RunVSTest" AfterTargets="VSTest">
      (implementation)
     </Target>
     ============================================================
   -->
 
-  <Target Name="MSBuildRunTests"></Target>
+  <Target Name="VSTest"></Target>
 
   <!--
     ***********************************************************************************************

From 19afa545181e573a87734b9c21b1c91d53d05fc2 Mon Sep 17 00:00:00 2001
From: Cole Carter <colecarter@microsoft.com>
Date: Tue, 14 Nov 2023 15:18:03 -0800
Subject: [PATCH 3/8] move test target to its own file. update test target name

---
 .../Microsoft.Common.CurrentVersion.targets   | 26 ++---------------
 src/Tasks/Microsoft.Common.Test.targets       | 28 +++++++++++++++++++
 2 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 src/Tasks/Microsoft.Common.Test.targets

diff --git a/src/Tasks/Microsoft.Common.CurrentVersion.targets b/src/Tasks/Microsoft.Common.CurrentVersion.targets
index 188351d7f89..5fdfbfe9db4 100644
--- a/src/Tasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/Tasks/Microsoft.Common.CurrentVersion.targets
@@ -5739,27 +5739,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
   </Target>
 
-  <!--
-    ***********************************************************************************************
-    ***********************************************************************************************
-                                                                Test Section
-    ***********************************************************************************************
-    ***********************************************************************************************
-  -->
-  <!--
-    ============================================================
-    This stub `VSTest` target allows for targets implementing Test execution functionality
-    to run after it.
-    
-    For example:
-    <Target Name="RunVSTest" AfterTargets="VSTest">
-     (implementation)
-    </Target>
-    ============================================================
-  -->
-
-  <Target Name="VSTest"></Target>
-
   <!--
     ***********************************************************************************************
     ***********************************************************************************************
@@ -6728,7 +6707,8 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   </PropertyGroup>
 
   <Import Project="$(MsTestToolsTargets)" Condition="Exists('$(MsTestToolsTargets)')" />
-
+  
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.Test.targets" />
   <!-- App packaging support -->
 
   <!--
@@ -6761,5 +6741,5 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter\*" Condition="'$(ImportByWildcardAfterMicrosoftCommonTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter')"/>
   <Import Project="$(MSBuildUserExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter\*" Condition="'$(ImportUserLocationsByWildcardAfterMicrosoftCommonTargets)' == 'true' and exists('$(MSBuildUserExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter')"/>
-
+  
 </Project>
diff --git a/src/Tasks/Microsoft.Common.Test.targets b/src/Tasks/Microsoft.Common.Test.targets
new file mode 100644
index 00000000000..9922c1a477a
--- /dev/null
+++ b/src/Tasks/Microsoft.Common.Test.targets
@@ -0,0 +1,28 @@
+<!--
+***********************************************************************************************
+Microsoft.Common.Test.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (C) Microsoft Corporation. All rights reserved.
+***********************************************************************************************
+-->
+<!--
+    ============================================================
+    This stub `Test` target allows for targets implementing Test execution functionality
+    to run after it.
+    
+    For example:
+    <Target Name="RunVSTest" AfterTargets="Test">
+     (implementation)
+    </Target>
+    ============================================================
+  -->
+<Project>
+    <PropertyGroup>
+        <UseMSBuildTestInfrastructure>false</UseMSBuildTestInfrastructure>
+    </PropertyGroup>
+    <Target Name="Test" Condition="$(UseMSBuildTestInfrastructure) == 'true'"></Target>
+</Project>
\ No newline at end of file

From f0e9f6e96a36b72fb446d0af3f1f7b7ef3d4af85 Mon Sep 17 00:00:00 2001
From: Cole Carter <colecarter@microsoft.com>
Date: Wed, 15 Nov 2023 09:21:58 -0800
Subject: [PATCH 4/8] move condition to import

---
 src/Tasks/Microsoft.Common.CurrentVersion.targets | 5 ++++-
 src/Tasks/Microsoft.Common.Test.targets           | 5 +----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Tasks/Microsoft.Common.CurrentVersion.targets b/src/Tasks/Microsoft.Common.CurrentVersion.targets
index 5fdfbfe9db4..cbb7f227f43 100644
--- a/src/Tasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/Tasks/Microsoft.Common.CurrentVersion.targets
@@ -6708,7 +6708,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
   <Import Project="$(MsTestToolsTargets)" Condition="Exists('$(MsTestToolsTargets)')" />
   
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.Test.targets" />
+  <PropertyGroup>
+    <UseMSBuildTestInfrastructure>false</UseMSBuildTestInfrastructure>
+  </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.Test.targets" Condition="$(UseMSBuildTestInfrastructure) == 'true'"/>
   <!-- App packaging support -->
 
   <!--
diff --git a/src/Tasks/Microsoft.Common.Test.targets b/src/Tasks/Microsoft.Common.Test.targets
index 9922c1a477a..39ac95cbfaa 100644
--- a/src/Tasks/Microsoft.Common.Test.targets
+++ b/src/Tasks/Microsoft.Common.Test.targets
@@ -21,8 +21,5 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     ============================================================
   -->
 <Project>
-    <PropertyGroup>
-        <UseMSBuildTestInfrastructure>false</UseMSBuildTestInfrastructure>
-    </PropertyGroup>
-    <Target Name="Test" Condition="$(UseMSBuildTestInfrastructure) == 'true'"></Target>
+    <Target Name="Test"></Target>
 </Project>
\ No newline at end of file

From 2201fdee0ac3c27245c5a10d5a7d0e488d6023c8 Mon Sep 17 00:00:00 2001
From: Cole Carter <colecarter@microsoft.com>
Date: Wed, 15 Nov 2023 09:42:49 -0800
Subject: [PATCH 5/8] add property condition

---
 src/Tasks/Microsoft.Common.CurrentVersion.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.Common.CurrentVersion.targets b/src/Tasks/Microsoft.Common.CurrentVersion.targets
index cbb7f227f43..cf32c9088f6 100644
--- a/src/Tasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/Tasks/Microsoft.Common.CurrentVersion.targets
@@ -6709,7 +6709,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   <Import Project="$(MsTestToolsTargets)" Condition="Exists('$(MsTestToolsTargets)')" />
   
   <PropertyGroup>
-    <UseMSBuildTestInfrastructure>false</UseMSBuildTestInfrastructure>
+    <UseMSBuildTestInfrastructure Condition="$(UseMSBuildTestInfrastructure) == ''">false</UseMSBuildTestInfrastructure>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.Test.targets" Condition="$(UseMSBuildTestInfrastructure) == 'true'"/>
   <!-- App packaging support -->

From 8ef1a2f3ed45f08904e6e2e5697574629a2d3c53 Mon Sep 17 00:00:00 2001
From: Cole Carter <colecarter@microsoft.com>
Date: Tue, 21 Nov 2023 11:31:34 -0800
Subject: [PATCH 6/8] addresses pr comments

---
 src/Tasks/Microsoft.Common.CurrentVersion.targets | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Tasks/Microsoft.Common.CurrentVersion.targets b/src/Tasks/Microsoft.Common.CurrentVersion.targets
index cf32c9088f6..f100f8bc871 100644
--- a/src/Tasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/Tasks/Microsoft.Common.CurrentVersion.targets
@@ -6709,9 +6709,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   <Import Project="$(MsTestToolsTargets)" Condition="Exists('$(MsTestToolsTargets)')" />
   
   <PropertyGroup>
-    <UseMSBuildTestInfrastructure Condition="$(UseMSBuildTestInfrastructure) == ''">false</UseMSBuildTestInfrastructure>
+    <UseMSBuildTestInfrastructure Condition="'$(UseMSBuildTestInfrastructure)' == ''">false</UseMSBuildTestInfrastructure>
   </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.Test.targets" Condition="$(UseMSBuildTestInfrastructure) == 'true'"/>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.Test.targets" Condition="'$(UseMSBuildTestInfrastructure)' == 'true'"/>
   <!-- App packaging support -->
 
   <!--
@@ -6744,5 +6744,4 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter\*" Condition="'$(ImportByWildcardAfterMicrosoftCommonTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter')"/>
   <Import Project="$(MSBuildUserExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter\*" Condition="'$(ImportUserLocationsByWildcardAfterMicrosoftCommonTargets)' == 'true' and exists('$(MSBuildUserExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.targets\ImportAfter')"/>
-  
 </Project>

From 08c3511508fb01cbc1f8a7567c71da61be5b9bf8 Mon Sep 17 00:00:00 2001
From: Cole Carter <colecarter@microsoft.com>
Date: Wed, 22 Nov 2023 09:16:57 -0800
Subject: [PATCH 7/8] add spec doc

---
 documentation/specs/test-target.md | 61 ++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 documentation/specs/test-target.md

diff --git a/documentation/specs/test-target.md b/documentation/specs/test-target.md
new file mode 100644
index 00000000000..475a07f2ea6
--- /dev/null
+++ b/documentation/specs/test-target.md
@@ -0,0 +1,61 @@
+## MSBuild Test Target and Task 
+See: [MSBuild Test Target](https://github.com/dotnet/msbuild/pull/9193)
+### Motivation
+The primary motivation of the MSBuild Test Target is to offer a convienent and standardardized way for executing tests within the msbuild environment. This is inspired by the simplicity of the `dotnet test` command. The proposed command for initiating test within MSBuild would be `msbuild /t:Test`
+
+Another significatnt benefit of integrating this target is to faciliatet the caching of test executions, using MSBuild project caching capabilities. This enhancement will optimize the testing process by reducing test runs which could significantly reduce time spent building and testing, as tests would only execute, (after the initial run) if there are changes to those tests. As an example running with [MSBuildCache](https://github.com/microsoft/MSBuildCache) we can cache both build and test executions. Functionally, this means skipping test executions that have been determined to have not changed.
+Example usage:
+`msbuild /graph /restore:false /m /nr:false /reportfileaccesses /t:"Build;Test"`
+
+### Design Overview
+The 'Microsoft.Common.Test.targets' file contains a stub test target.
+```
+<Project>
+    <Target Name="Test"></Target>
+</Project>
+```
+This target serves a placeholder and entry point for test target implementations.
+
+#### Conditional Import
+* This stub target is conditionally imported, determined by a condition named 
+`$(UseMSBuildTestInfrastructure)`.
+* This condition allows for users to opt-in to this test target, which helps to prevent breaking changes, with respect the the target name, since there are likely 'Test' targets that exist in the wild already.
+
+The 'Microsoft.Common.CurrentVersion.targets' file contains.
+```
+  <PropertyGroup>
+    <UseMSBuildTestInfrastructure Condition="'$(UseMSBuildTestInfrastructure)' == ''">false</UseMSBuildTestInfrastructure>
+  </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.Test.targets" Condition="'$(UseMSBuildTestInfrastructure)' == 'true'"/>
+
+```
+#### Extensibility for Test Runners
+* Test runner implemenations can hook into the provided stub using the `AfterTargets` property.
+* This approach enables different test runners to extend the basic funcionarlity of the test target.
+
+For instance, an implementation for running VSTest would look like:
+```
+<Target Name="RunVSTest" AfterTargets="Test">
+  <!-- Implementation details here -->
+</Target>
+```
+
+#### Usage Scenario
+* Users who wish to utilize this target will set the `$(UseMSBuildTestInfrastructure)` condition in their project file, rsp or via the command line.
+* By executing `msbuild /t:Test`, the MSBuild engine will envoke the `Test` taget, which in turn triggers any test runner targets defined to run after it.
+
+### Default Task Implementation
+See: [MSBuild Test Task](https://github.com/microsoft/MSBuildSdks/pull/473)
+
+#### Nuget package for default implementaion
+* The default implementation will be provided through a nuget package
+* This package will contain an MSBuild Task deigned to execute `vstest.console.exe`
+
+#### MSBuild Task Functionality
+* The core of this implemenation is an MSBuild task that interfaces with `vstest.console.exe`.
+* This task will accept arguments as properties and pass them directly into the command line test runner.
+
+#### Using The Default Implementation
+* Users would install the provided Nuget Package to incorporate it into their projects
+* Add the package to their GlobalPackageReferences or specific projects
+* Once integrated, executing `msbuild /t:Test` would trigger the MSBuild Task, ultimately executing `vstest.console.exe`

From 8a28ae5717b7b98e18d137af7be055819e1df50c Mon Sep 17 00:00:00 2001
From: Jan Krivanek <jankrivanek@microsoft.com>
Date: Mon, 27 Nov 2023 20:42:09 +0100
Subject: [PATCH 8/8] No-op doc changes

---
 documentation/specs/test-target.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/documentation/specs/test-target.md b/documentation/specs/test-target.md
index 475a07f2ea6..7726f1f6971 100644
--- a/documentation/specs/test-target.md
+++ b/documentation/specs/test-target.md
@@ -1,5 +1,6 @@
 ## MSBuild Test Target and Task 
 See: [MSBuild Test Target](https://github.com/dotnet/msbuild/pull/9193)
+
 ### Motivation
 The primary motivation of the MSBuild Test Target is to offer a convienent and standardardized way for executing tests within the msbuild environment. This is inspired by the simplicity of the `dotnet test` command. The proposed command for initiating test within MSBuild would be `msbuild /t:Test`
 
@@ -48,14 +49,14 @@ For instance, an implementation for running VSTest would look like:
 See: [MSBuild Test Task](https://github.com/microsoft/MSBuildSdks/pull/473)
 
 #### Nuget package for default implementaion
-* The default implementation will be provided through a nuget package
-* This package will contain an MSBuild Task deigned to execute `vstest.console.exe`
+* The default implementation will be provided through a nuget package.
+* This package will contain an MSBuild Task deigned to execute `vstest.console.exe`.
 
 #### MSBuild Task Functionality
 * The core of this implemenation is an MSBuild task that interfaces with `vstest.console.exe`.
 * This task will accept arguments as properties and pass them directly into the command line test runner.
 
 #### Using The Default Implementation
-* Users would install the provided Nuget Package to incorporate it into their projects
-* Add the package to their GlobalPackageReferences or specific projects
-* Once integrated, executing `msbuild /t:Test` would trigger the MSBuild Task, ultimately executing `vstest.console.exe`
+* Users would install the provided Nuget Package to incorporate it into their projects.
+* Add the package to their GlobalPackageReferences or specific projects.
+* Once integrated, executing `msbuild /t:Test` would trigger the MSBuild Task, ultimately executing `vstest.console.exe`.