From 7056cb8cde2fb06165f2cd9bf143f60950b8aee3 Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Fri, 14 Mar 2025 15:16:58 +0100
Subject: [PATCH 1/7] Revive E2E tests

---
 Directory.Build.props                           | 5 -----
 tests/EndToEndBuildTests/Directory.Build.props  | 1 +
 tests/EndToEndBuildTests/EndToEndBuildTests.cmd | 6 +++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index c4f2bff9287..11d47357eb5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -89,11 +89,6 @@
     </Otherwise>
   </Choose>
 
-  <!-- It's important we set TFM before this, since FSharpTests.Directory.Build.props uses it.
-       TODO(vlza): this build props looks outdated, since we only use $(FSharpTestCompilerVersion) in TP tests or cambridge suite (which we slowly want to migrate to xUnit).
-                   We probably should remove or revisit it. -->
-  <Import Project="FSharpTests.Directory.Build.props" Condition=" '$(FSharpTestCompilerVersion)' != '' " />
-
   <ItemGroup>
     <!-- If there is a README.md next to a project file, include it (for easier access in the IDE) -->
     <None Include="README.md" Condition="Exists('README.md')" />
diff --git a/tests/EndToEndBuildTests/Directory.Build.props b/tests/EndToEndBuildTests/Directory.Build.props
index 7537d3adc6e..4a8f0153de0 100644
--- a/tests/EndToEndBuildTests/Directory.Build.props
+++ b/tests/EndToEndBuildTests/Directory.Build.props
@@ -5,6 +5,7 @@
     <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
 
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharpTests.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
diff --git a/tests/EndToEndBuildTests/EndToEndBuildTests.cmd b/tests/EndToEndBuildTests/EndToEndBuildTests.cmd
index eba1498af91..7613f487e35 100644
--- a/tests/EndToEndBuildTests/EndToEndBuildTests.cmd
+++ b/tests/EndToEndBuildTests/EndToEndBuildTests.cmd
@@ -27,9 +27,9 @@ echo %__scriptpath%BasicProvider\TestBasicProvider.cmd -c %configuration%
 call %__scriptpath%BasicProvider\TestBasicProvider.cmd -c %configuration%
 if ERRORLEVEL 1 echo Error: TestBasicProvider failed  && goto :failure
 
-rem echo %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
-rem call %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
-rem if ERRORLEVEL 1 echo Error: TestComboProvider failed  && goto :failure
+echo %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
+call %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
+if ERRORLEVEL 1 echo Error: TestComboProvider failed  && goto :failure
 
 :success
 endlocal

From 39ffc4c8de8a823c011b330cf08c877dc528bdb4 Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Fri, 14 Mar 2025 16:35:06 +0100
Subject: [PATCH 2/7] up

---
 tests/fsharp/Directory.Build.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/fsharp/Directory.Build.props b/tests/fsharp/Directory.Build.props
index 7cd41381b5d..ef3fc6451f2 100644
--- a/tests/fsharp/Directory.Build.props
+++ b/tests/fsharp/Directory.Build.props
@@ -5,5 +5,6 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharpTests.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
 </Project>

From fea7c9157ff38aa0e65db8eab21575a5f5f12622 Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Fri, 14 Mar 2025 16:49:24 +0100
Subject: [PATCH 3/7] try this

---
 tests/fsharp/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fsharp/Directory.Build.props b/tests/fsharp/Directory.Build.props
index ef3fc6451f2..446dade74ff 100644
--- a/tests/fsharp/Directory.Build.props
+++ b/tests/fsharp/Directory.Build.props
@@ -4,7 +4,7 @@
     <UseFSharpProductVersion>true</UseFSharpProductVersion>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharpTests.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
 </Project>

From de6018bb174ee1ca8e61fe80c2edbb131a3c0b9a Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Fri, 14 Mar 2025 17:40:38 +0100
Subject: [PATCH 4/7] Revert "try this"

This reverts commit fea7c9157ff38aa0e65db8eab21575a5f5f12622.
---
 tests/fsharp/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fsharp/Directory.Build.props b/tests/fsharp/Directory.Build.props
index 446dade74ff..ef3fc6451f2 100644
--- a/tests/fsharp/Directory.Build.props
+++ b/tests/fsharp/Directory.Build.props
@@ -4,7 +4,7 @@
     <UseFSharpProductVersion>true</UseFSharpProductVersion>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharpTests.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharpTests.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
 </Project>

From 8133bfb048765ca9e3bcef722cede6a8bcb97c75 Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Fri, 14 Mar 2025 17:40:42 +0100
Subject: [PATCH 5/7] Revert "up"

This reverts commit 39ffc4c8de8a823c011b330cf08c877dc528bdb4.
---
 tests/fsharp/Directory.Build.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/fsharp/Directory.Build.props b/tests/fsharp/Directory.Build.props
index ef3fc6451f2..7cd41381b5d 100644
--- a/tests/fsharp/Directory.Build.props
+++ b/tests/fsharp/Directory.Build.props
@@ -5,6 +5,5 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharpTests.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
 </Project>

From 519e5c0b3b4f299d1faf2d973e26721aa62beee3 Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Fri, 14 Mar 2025 17:42:21 +0100
Subject: [PATCH 6/7] Revert "Revive E2E tests"

This reverts commit 7056cb8cde2fb06165f2cd9bf143f60950b8aee3.
---
 Directory.Build.props                           | 5 +++++
 tests/EndToEndBuildTests/Directory.Build.props  | 1 -
 tests/EndToEndBuildTests/EndToEndBuildTests.cmd | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 11d47357eb5..c4f2bff9287 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -89,6 +89,11 @@
     </Otherwise>
   </Choose>
 
+  <!-- It's important we set TFM before this, since FSharpTests.Directory.Build.props uses it.
+       TODO(vlza): this build props looks outdated, since we only use $(FSharpTestCompilerVersion) in TP tests or cambridge suite (which we slowly want to migrate to xUnit).
+                   We probably should remove or revisit it. -->
+  <Import Project="FSharpTests.Directory.Build.props" Condition=" '$(FSharpTestCompilerVersion)' != '' " />
+
   <ItemGroup>
     <!-- If there is a README.md next to a project file, include it (for easier access in the IDE) -->
     <None Include="README.md" Condition="Exists('README.md')" />
diff --git a/tests/EndToEndBuildTests/Directory.Build.props b/tests/EndToEndBuildTests/Directory.Build.props
index 4a8f0153de0..7537d3adc6e 100644
--- a/tests/EndToEndBuildTests/Directory.Build.props
+++ b/tests/EndToEndBuildTests/Directory.Build.props
@@ -5,7 +5,6 @@
     <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharpTests.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
diff --git a/tests/EndToEndBuildTests/EndToEndBuildTests.cmd b/tests/EndToEndBuildTests/EndToEndBuildTests.cmd
index 7613f487e35..eba1498af91 100644
--- a/tests/EndToEndBuildTests/EndToEndBuildTests.cmd
+++ b/tests/EndToEndBuildTests/EndToEndBuildTests.cmd
@@ -27,9 +27,9 @@ echo %__scriptpath%BasicProvider\TestBasicProvider.cmd -c %configuration%
 call %__scriptpath%BasicProvider\TestBasicProvider.cmd -c %configuration%
 if ERRORLEVEL 1 echo Error: TestBasicProvider failed  && goto :failure
 
-echo %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
-call %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
-if ERRORLEVEL 1 echo Error: TestComboProvider failed  && goto :failure
+rem echo %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
+rem call %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
+rem if ERRORLEVEL 1 echo Error: TestComboProvider failed  && goto :failure
 
 :success
 endlocal

From 6e75e81ece2e6545abc3bb075da3524cfd989bce Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Fri, 14 Mar 2025 18:08:42 +0100
Subject: [PATCH 7/7] up

---
 tests/EndToEndBuildTests/Directory.Build.props  | 1 +
 tests/EndToEndBuildTests/EndToEndBuildTests.cmd | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/EndToEndBuildTests/Directory.Build.props b/tests/EndToEndBuildTests/Directory.Build.props
index 7537d3adc6e..4a8f0153de0 100644
--- a/tests/EndToEndBuildTests/Directory.Build.props
+++ b/tests/EndToEndBuildTests/Directory.Build.props
@@ -5,6 +5,7 @@
     <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
 
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharpTests.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
diff --git a/tests/EndToEndBuildTests/EndToEndBuildTests.cmd b/tests/EndToEndBuildTests/EndToEndBuildTests.cmd
index eba1498af91..7613f487e35 100644
--- a/tests/EndToEndBuildTests/EndToEndBuildTests.cmd
+++ b/tests/EndToEndBuildTests/EndToEndBuildTests.cmd
@@ -27,9 +27,9 @@ echo %__scriptpath%BasicProvider\TestBasicProvider.cmd -c %configuration%
 call %__scriptpath%BasicProvider\TestBasicProvider.cmd -c %configuration%
 if ERRORLEVEL 1 echo Error: TestBasicProvider failed  && goto :failure
 
-rem echo %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
-rem call %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
-rem if ERRORLEVEL 1 echo Error: TestComboProvider failed  && goto :failure
+echo %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
+call %__scriptpath%ComboProvider\TestComboProvider.cmd -c %configuration%
+if ERRORLEVEL 1 echo Error: TestComboProvider failed  && goto :failure
 
 :success
 endlocal