Revive E2E tests

Author: psfinaki

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')" />

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