From 9190303df24efea78d928c49853c7d08dfb02ed4 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Tue, 1 Oct 2024 14:49:19 +0200
Subject: [PATCH 1/2] fix tests running on version freeze

---
 .../Microsoft.Build.BuildCheck.UnitTests.csproj        | 10 ++++++++++
 .../TestAssets/Common/CommonTest.props                 |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/BuildCheck.UnitTests/Microsoft.Build.BuildCheck.UnitTests.csproj b/src/BuildCheck.UnitTests/Microsoft.Build.BuildCheck.UnitTests.csproj
index 27bf2a1542b..7e26e8ebb45 100644
--- a/src/BuildCheck.UnitTests/Microsoft.Build.BuildCheck.UnitTests.csproj
+++ b/src/BuildCheck.UnitTests/Microsoft.Build.BuildCheck.UnitTests.csproj
@@ -15,6 +15,10 @@
     <ProjectReference Include="..\UnitTests.Shared\Microsoft.Build.UnitTests.Shared.csproj" />
     <ProjectReference Include="..\Xunit.NetCore.Extensions\Xunit.NetCore.Extensions.csproj" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <ArtifactsNonShippingPackagesDir>$(ArtifactsBinDir)Microsoft.Build.BuildCheck.UnitTests\CustomChecks</ArtifactsNonShippingPackagesDir>
+  </PropertyGroup>
   
   <ItemGroup Label="TestAssests">
     <ProjectReference Include=".\TestAssets\CustomCheck\CustomCheck.csproj" />
@@ -46,4 +50,10 @@
     </None>
   </ItemGroup>
 
+  <Target Name="MSBuildPackagesForTests" AfterTargets="Build">
+    <Exec Command="dotnet pack &quot;..\Build\Microsoft.Build.csproj&quot; -o &quot;$(ArtifactsNonShippingPackagesDir)&quot;" />
+    <Exec Command="dotnet pack &quot;..\Framework\Microsoft.Build.Framework.csproj&quot; -o &quot;$(ArtifactsNonShippingPackagesDir)&quot;"/>
+    <Exec Command="dotnet pack &quot;..\StringTools\StringTools.csproj&quot; -o &quot;$(ArtifactsNonShippingPackagesDir)&quot;"/>
+  </Target>
+
 </Project>
diff --git a/src/BuildCheck.UnitTests/TestAssets/Common/CommonTest.props b/src/BuildCheck.UnitTests/TestAssets/Common/CommonTest.props
index d79475be5f0..989cfa9c609 100644
--- a/src/BuildCheck.UnitTests/TestAssets/Common/CommonTest.props
+++ b/src/BuildCheck.UnitTests/TestAssets/Common/CommonTest.props
@@ -11,7 +11,7 @@
 
   <!-- In the real world scenario, the dependencies are added as Nuget PackageReference, modified for test purposes only. -->
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Build\Microsoft.Build.csproj" IncludeInPackage="true" />
+    <ProjectReference Include="..\..\..\Build\Microsoft.Build.csproj" />
   </ItemGroup>
 
 </Project>

From 5c23af822a6fa074df1da60c6b63a75bd183587e Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Wed, 2 Oct 2024 12:05:17 +0200
Subject: [PATCH 2/2] add incrementality checks

---
 ...icrosoft.Build.BuildCheck.UnitTests.csproj | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/BuildCheck.UnitTests/Microsoft.Build.BuildCheck.UnitTests.csproj b/src/BuildCheck.UnitTests/Microsoft.Build.BuildCheck.UnitTests.csproj
index 7e26e8ebb45..e13e446d0bd 100644
--- a/src/BuildCheck.UnitTests/Microsoft.Build.BuildCheck.UnitTests.csproj
+++ b/src/BuildCheck.UnitTests/Microsoft.Build.BuildCheck.UnitTests.csproj
@@ -15,10 +15,6 @@
     <ProjectReference Include="..\UnitTests.Shared\Microsoft.Build.UnitTests.Shared.csproj" />
     <ProjectReference Include="..\Xunit.NetCore.Extensions\Xunit.NetCore.Extensions.csproj" />
   </ItemGroup>
-
-  <PropertyGroup>
-    <ArtifactsNonShippingPackagesDir>$(ArtifactsBinDir)Microsoft.Build.BuildCheck.UnitTests\CustomChecks</ArtifactsNonShippingPackagesDir>
-  </PropertyGroup>
   
   <ItemGroup Label="TestAssests">
     <ProjectReference Include=".\TestAssets\CustomCheck\CustomCheck.csproj" />
@@ -50,10 +46,30 @@
     </None>
   </ItemGroup>
 
-  <Target Name="MSBuildPackagesForTests" AfterTargets="Build">
-    <Exec Command="dotnet pack &quot;..\Build\Microsoft.Build.csproj&quot; -o &quot;$(ArtifactsNonShippingPackagesDir)&quot;" />
-    <Exec Command="dotnet pack &quot;..\Framework\Microsoft.Build.Framework.csproj&quot; -o &quot;$(ArtifactsNonShippingPackagesDir)&quot;"/>
-    <Exec Command="dotnet pack &quot;..\StringTools\StringTools.csproj&quot; -o &quot;$(ArtifactsNonShippingPackagesDir)&quot;"/>
+  <!-- This target creates packages needed for e2e testing. Inputs and outputs are defined to enable incremental builds. -->
+
+  <PropertyGroup Label="TestAssests">
+    <ArtifactsNonShippingPackagesDir>$(ArtifactsBinDir)Microsoft.Build.BuildCheck.UnitTests\CustomChecks</ArtifactsNonShippingPackagesDir>
+  </PropertyGroup>
+
+  <ItemGroup Label="TestAssets">
+    <ProjectsToPack Include="..\Build\Microsoft.Build.csproj" />
+    <ProjectsToPack Include="..\Framework\Microsoft.Build.Framework.csproj" />
+    <ProjectsToPack Include="..\StringTools\StringTools.csproj" />
+  </ItemGroup>
+
+  <Target Name="GetSourceFilesForPacking">
+    <ItemGroup>
+      <SourceFilesForPacking Include="%(ProjectsToPack.RootDir)%(ProjectsToPack.Directory)**\*.cs" />
+    </ItemGroup>
   </Target>
 
+  <Target Name="MSBuildPackagesForTests"
+          AfterTargets="Build"
+          DependsOnTargets="GetSourceFilesForPacking"
+          Inputs="@(ProjectsToPack);@(SourceFilesForPacking)"
+          Outputs="$(ArtifactsNonShippingPackagesDir)\Microsoft.Build.$(Version).nupkg;$(ArtifactsNonShippingPackagesDir)\Microsoft.Build.Framework.$(Version).nupkg;$(ArtifactsNonShippingPackagesDir)\Microsoft.NET.StringTools.$(Version).nupkg">
+    <Exec Command="dotnet pack &quot;%(ProjectsToPack.Identity)&quot; -o &quot;$(ArtifactsNonShippingPackagesDir)&quot; -p:PackageVersion=$(PackageVersion)" />
+  </Target>
+  
 </Project>