Revive E2E tests, rescue CI (#18384)

* Revive E2E tests

* up

* try this

* Revert "try this"

This reverts commit fea7c91.

* Revert "up"

This reverts commit 39ffc4c.

* Revert "Revive E2E tests"

This reverts commit 7056cb8.

* up

Author: psfinaki

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>

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