Pranav K 174e53d45c Merge remote-tracking branch 'origin/release/2.1' into release/2.2 ... # Conflicts: # test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs # test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs # test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs # test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs # test/FunctionalTests/DesktopTests/SimpleAppTestWithPlatformx86_Desktop.cs		2018-11-06 15:14:43 -08:00
..
CoreCLRTests	Merge remote-tracking branch 'origin/release/2.1' into release/2.2	2018-11-06 15:14:43 -08:00
DesktopTests	Keep a couple of tests and remove most tests from 2.1	2018-11-06 15:10:33 -08:00
Infrastructure	…
Properties	…
Resources	Keep a couple of tests and remove most tests from 2.1	2018-11-06 15:10:33 -08:00
FunctionalTests.csproj	…